Improvements for i18n file generation