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

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