am da646ac6: (-s ours) am 531ffb58: am 9c1d7d01: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit 'da646ac63099afa684a845b8932b1d8b3043c6c2'

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