- updated the translation files

- changed the line endings for Makefile and setup_ubuntu.sh files

CHANGELOG.md

@@ -14,6 +14,7 @@ CHANGELOG for FlatCAM beta
 - added more examples in the scripts Examples: isolate and cutout examples
 - updated the Italian translation
 - updated the translation files
+- changed the line endings for Makefile and setup_ubuntu.sh files
 
 2.05.2020
 
@@ -29,7 +30,7 @@ CHANGELOG for FlatCAM beta
 - modified the Cutout Tool to generate multi-geo objects therefore the set geometry parameters will populate the Geometry Object UI
 - modified the Panelize Tool to optimize the output from Cutout Tool such that there are no longer overlapping cuts
 - some string corrections
-- updated the Italian translation done by user @pcb-hobbyst
+- updated the Italian translation done by user @pcb-hobbyst (Golfetto Massimiliano)
 - RELEASE 8.992
 
 01.05.2020

FlatCAMApp.py

@@ -162,7 +162,6 @@ class App(QtCore.QObject):
     # ###############################################################################################################
     # ################################### Version and VERSION DATE ##################################################
     # ###############################################################################################################
-
     version = 8.993
     version_date = "2020/08/01"
     beta = True

locale/it/LC_MESSAGES/strings.po

@@ -6,11 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: 2020-05-02 23:49+0300\n"
-<<<<<<< HEAD
 "PO-Revision-Date: 2020-05-03 12:06+0200\n"
-=======
-"PO-Revision-Date: 2020-05-02 23:50+0300\n"
->>>>>>> remotes/jpcgt/flatcam/Beta
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: it\n"