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

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