i18n fixes
Merge pull request #19 from YaanaLabs/i18n-issues

i18n fixes