am cbcbd89f: (-s ours) Import translations. DO NOT MERGE

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