am 8499ddf2: (-s ours) am c86df7b9: (-s ours) am 2e59fdd3: (-s ours) Import translations. DO NOT MERGE

* commit '8499ddf24f14127f0e237540b5a33fde386eb369':
  Import translations. DO NOT MERGE