am b5d18ea3: (-s ours) am 6bc6b227: (-s ours) Import translations. DO NOT MERGE

* commit 'b5d18ea3c3b2a14b1de673a5f44065446ae5199b':
  Import translations. DO NOT MERGE