[TIMOB-11869] i18n updates and some small tweaks.