[WIP] l10n support added