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

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