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

* commit '17f221043d27d617ceb7f0915c0daace40160946':
  Import translations. DO NOT MERGE