am 9acca15d: (-s ours) am 96f9a830: Import revised translations.  DO NOT MERGE

Merge commit '9acca15d763d11b4aa4f1c2366aeec4f1e6a34d7'

* commit '9acca15d763d11b4aa4f1c2366aeec4f1e6a34d7':
  Import revised translations.  DO NOT MERGE