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

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