am 6584b9f1: (-s ours) am 6dd42b33: (-s ours) am 03a215b0: (-s ours) am cb4a3c04: (-s ours) am 090e6396: (-s ours) Import translations. DO NOT MERGE

* commit '6584b9f129d511265d9665d54729d7373fd84b7e':
  Import translations. DO NOT MERGE