Needs more fixing/unification with the proper way of doing it,
but for now let these strings trickle through the translation
machinery for maximum effect.

(cherry picked from commit 0c1e5723)