am c61b024a: (-s ours) am 3709ffc4: (-s ours) Import translations. DO NOT MERGE

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