-- fixed l10n issues