Fix i18n support (issue #266)