am 525c2ff9: (-s ours) Import translations. DO NOT MERGE

* commit '525c2ff9c3b80f9ea7f90716501a04396e0062ab':
  Import translations. DO NOT MERGE