am 07d18c73: (-s ours) am 7faf89f8: Import revised translations.  DO NOT MERGE

Merge commit '07d18c73afb001720de6c228c3a80f47c6f11d7e'

* commit '07d18c73afb001720de6c228c3a80f47c6f11d7e':
  Import revised translations.  DO NOT MERGE