Import translations. DO NOT MERGE automerge: 60d2ee8  -s ours
automerge: 96a90af  -s ours

* commit '96a90af83bddfec535bc4ebe96545145d0b33285':
  Import translations. DO NOT MERGE