Continued several i18n adaptations