fixup! Fix i18n translation issues