am 6e90ac85: (-s ours) am c60170b9: (-s ours) am b3024901: (-s ours) Import translations. DO NOT MERGE

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