am d9e86354: (-s ours) am 6fde6e27: (-s ours) Import translations. DO NOT MERGE

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