am d3dc4f65: (-s ours) am 01ab41dd: (-s ours) Import translations. DO NOT MERGE

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