more i18n changes