Minor improvements
Inverted i18n template file with actual translations
Merge pull request #1 from amol-/master

Minor improvements