am 04a25289: (-s ours) Import translations. DO NOT MERGE

* commit '04a252899bdd8a798d1a9c90c2ab45f9efdba5a8':
  Import translations. DO NOT MERGE