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

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