Pulled changes from transifex for testing
i18n scripting improvements