- updated the translation files

- changed the line endings for Makefile and setup_ubuntu.sh files
2020-05-03 16:48:17 +03:00
parent 83a515eeee
commit 17a2c0e4c1
11 changed files with 315 additions and 37967 deletions
--- a/locale/it/LC_MESSAGES/strings.po
+++ b/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"