am b2149f4a: (-s ours) am 1d104476: (-s ours) am a4e7353d: Import revised translations.  DO NOT MERGE

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