am e05eb5c9: (-s ours) am 8efa766c: am 1852d75b: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit 'e05eb5c9777a2a93509a74556a12327c2c0ab889'

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