am c6defdf4: am 9dca896a: (-s ours) Import revised translations.  DO NOT MERGE

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