VIVO-300: some i18n cleanup