am 80e57590: (-s ours) am 2cfdc1a3: Import revised translations.  DO NOT MERGE

Merge commit '80e57590768131e8c7bbca021755d10e0c1247e4'

* commit '80e57590768131e8c7bbca021755d10e0c1247e4':
  Import revised translations.  DO NOT MERGE