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

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