generic i18n improvements