(Already had issues in the code that were obvious, some may still
linger in there.  Also uselessly confuses our dedicated translators.)

(cherry picked from commit 50d01bec)