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

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