am 6f0e78f1: (-s ours) Import translations. DO NOT MERGE

* commit '6f0e78f1a98bc6fd701948bb18d2bc2ad1130a3a':
  Import translations. DO NOT MERGE