am f04362e2: (-s ours) am 1027ee3f: Import revised translations.  DO NOT MERGE

Merge commit 'f04362e2fbd95d208b80af35466f0988681b369a'

* commit 'f04362e2fbd95d208b80af35466f0988681b369a':
  Import revised translations.  DO NOT MERGE