am 1400e609: (-s ours) am 6ea611df: (-s ours) Import translations. DO NOT MERGE

* commit '1400e609691f3bd963c28c4aac7f46e92a09224c':
  Import translations. DO NOT MERGE