am d65040f2: (-s ours) am b9f6019f: (-s ours) Import translations. DO NOT MERGE

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