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

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