i18n: cleanup and fix