Fixes #7262 - avoid locale domain name conflict
Merge pull request #151 from tstrachota/i18n

Fixes #7262 - avoid locale domain name conflict