camellan 41bcc135ff Merge remote-tracking branch 'remotes/jpcgt/flatcam/Beta' into Beta 6 lat temu
..
de 3c991e1c2d - updated all the translations files 6 lat temu
en 3c991e1c2d - updated all the translations files 6 lat temu
es 3c991e1c2d - updated all the translations files 6 lat temu
fr 3c991e1c2d - updated all the translations files 6 lat temu
it 3c991e1c2d - updated all the translations files 6 lat temu
pt_BR ab9db619ee - fix the conflicts 6 lat temu
ro 3c991e1c2d - updated all the translations files 6 lat temu
ru 41bcc135ff Merge remote-tracking branch 'remotes/jpcgt/flatcam/Beta' into Beta 6 lat temu