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

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