i18n script improvements