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

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