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

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