Merge "i18n: consistency tweaks"