some fixes
Merge pull request #1513 from conejoninja/i18nfix

I18nfix