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

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