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

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