am 10c20324: (-s ours) am e3e6b8b7: (-s ours) Import translations. DO NOT MERGE

* commit '10c20324d725902f24e1b01930097e5c9be27ffd':
  Import translations. DO NOT MERGE