am a6b490e2: (-s ours) am a03c39aa: (-s ours) Import translations. DO NOT MERGE

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