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

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