am 1ff01964: (-s ours) am 346e1e7d: (-s ours) Import translations. DO NOT MERGE

* commit '1ff019649dac2f69f965064749fc5510593dedc6':
  Import translations. DO NOT MERGE