am 6e7f74b7: (-s ours) am b34cc743: (-s ours) Import translations. DO NOT MERGE

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