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

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