Ned/use ugettext lazy

Sorry, a new pull request against the correct base, and avoiding ugettext_lazy for those files that don't need it.