am 6b79a084: (-s ours) am 8609c70a: (-s ours) am 91b90c09: (-s ours) Import translations. DO NOT MERGE

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