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

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