am dd1a2917: (-s ours) am 8d761ffd: (-s ours) Import translations. DO NOT MERGE

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