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

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