am 584ac4c5: (-s ours) am f39672bf: (-s ours) am 3a9b49f9: (-s ours) Import translations. DO NOT MERGE

* commit '584ac4c525d45dfdc61f3f9db746582622e2ab5b':
  Import translations. DO NOT MERGE