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

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