am 6384e648: (-s ours) Import translations. DO NOT MERGE

* commit '6384e648b4f6b41fd12e2dc651a931b9bd642bd2':
  Import translations. DO NOT MERGE