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

* commit 'd6a99860f81211cb1afa4d6933d333907d6f1b79':
  Import translations. DO NOT MERGE