am 42c03c21: (-s ours) am 1ccf8779: (-s ours) am dde10165: (-s ours) am 86799f35: (-s ours) Import translations. DO NOT MERGE

* commit '42c03c213fddaa75e759ddea186bb28236ec80b1':
  Import translations. DO NOT MERGE