am 25a64ced: (-s ours) Import translations. DO NOT MERGE

* commit '25a64ced3b5d8d820b59dab82c0513d954dfe223':
  Import translations. DO NOT MERGE