i18n: further fixes and progress