i18n - fixing merge issue introduced by 2cee9ef0d7ee53
Merge pull request #1634 from lzap/i18n-merge-fix

i18n - fixing merge issue introduced by 2cee9ef0d7ee53