am 35f097a7: (-s ours) Import translations. DO NOT MERGE

* commit '35f097a7bf4f30d0006221e9ae376ab85ab6937a':
  Import translations. DO NOT MERGE