am b1082705: (-s ours) am 7b906e4f: (-s ours) Import translations. DO NOT MERGE

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