Fixes #4473 - i18n support
Merge pull request #96 from tstrachota/i18n

Fixes #4473 - i18n support