am 025c6955: (-s ours) am 377d3f82: (-s ours) Import translations. DO NOT MERGE

* commit '025c6955c306014d5f27b941f04a090985c90283':
  Import translations. DO NOT MERGE