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

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