am 18ab4870: (-s ours) am a0960e75: (-s ours) Import translations. DO NOT MERGE

* commit '18ab48703c61071328a149eaff328e878e73b370':
  Import translations. DO NOT MERGE