am 6edd7628: (-s ours) Import translations. DO NOT MERGE

* commit '6edd7628fa4786c09c35222b490fae29fafd4181':
  Import translations. DO NOT MERGE