fixed translation related issues
Merge pull request #236 from Nayan/i18nfixs

fixed translation related issues