This change set removes an earlier change that caused problems. It
addresses the original symptoms by fixing awkward English grammar in
several places, and adds #translated where appropriate. Looks good,
works well. If this can still be included in 3.7, I recommend doing so.