Fixes #4474 - i18n support
Merge pull request #98 from tstrachota/i18n

Fixes #4474 - i18n support