Improving i18n translation