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

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