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

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