am 8cd002e2: (-s ours) am e314ac4f: Import revised translations.  DO NOT MERGE

Merge commit '8cd002e279431727f38e77870a3d0a67e96db023'

* commit '8cd002e279431727f38e77870a3d0a67e96db023':
  Import revised translations.  DO NOT MERGE