Improve i18n translation