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

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