am d64bbff9: (-s ours) am f17a6d3c: (-s ours) am 2f19129d: (-s ours) Import translations. DO NOT MERGE

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