am b6422e1e: (-s ours) am 4a2e6b38: (-s ours) am d8c14af3: Import revised translations.  DO NOT MERGE

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