use correct ugettext and change fields