Localisation updates from https://translatewiki.net.
Fixing template related issues
Merge pull request #848 from lingalamadhukar/bug_fixes

Fixing template related issues
Merge remote-tracking branch 'upstream/master' into develop
Merge remote-tracking branch 'upstream/develop' into develop