am f80b655f: (-s ours) am c0460579: Import revised translations.  DO NOT MERGE

Merge commit 'f80b655f8b9058a2501476e5c8cc9b9743d4e132'

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