diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00b493a2..05673c1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@ CHANGELOG for FlatCAM beta
 8.06.2020
 
 - minor changes in the way that the tools are installed and connected
+- renamed the GeoEditor class/file to appGeoEditor from FlatCAMGeoEditor making it easier to see in the IDE tree structure
+- some refactoring that lead to a working solution when using the Python 3.8 + PyQt 5.15
 
 7.06.2020
 
diff --git a/appEditors/FlatCAMExcEditor.py b/appEditors/FlatCAMExcEditor.py
index ca253072..d79e242b 100644
--- a/appEditors/FlatCAMExcEditor.py
+++ b/appEditors/FlatCAMExcEditor.py
@@ -10,7 +10,7 @@ from PyQt5.QtCore import Qt, QSettings
 
 from camlib import distance, arc, FlatCAMRTreeStorage
 from appGUI.GUIElements import FCEntry, FCComboBox, FCTable, FCDoubleSpinner, RadioSet, FCSpinner
-from appEditors.FlatCAMGeoEditor import FCShapeTool, DrawTool, DrawToolShape, DrawToolUtilityShape, FlatCAMGeoEditor
+from appEditors.appGeoEditor import FCShapeTool, DrawTool, DrawToolShape, DrawToolUtilityShape, appGeoEditor
 from appParsers.ParseExcellon import Excellon
 
 from shapely.geometry import LineString, LinearRing, MultiLineString, Polygon, MultiPolygon, Point
@@ -935,7 +935,7 @@ class FCDrillResize(FCShapeTool):
             return
 
         if new_dia not in self.draw_app.olddia_newdia:
-            self.destination_storage = FlatCAMGeoEditor.make_storage()
+            self.destination_storage = appGeoEditor.make_storage()
             self.draw_app.storage_dict[new_dia] = self.destination_storage
 
             # self.olddia_newdia dict keeps the evidence on current tools diameters as keys and gets updated on values
@@ -2560,7 +2560,7 @@ class FlatCAMExcEditor(QtCore.QObject):
                     return
 
         if tool_dia not in self.olddia_newdia:
-            storage_elem = FlatCAMGeoEditor.make_storage()
+            storage_elem = appGeoEditor.make_storage()
             self.storage_dict[tool_dia] = storage_elem
 
             # self.olddia_newdia dict keeps the evidence on current tools diameters as keys and gets updated on values
@@ -2615,7 +2615,7 @@ class FlatCAMExcEditor(QtCore.QObject):
         for deleted_tool_dia in deleted_tool_dia_list:
 
             # delete the storage used for that tool
-            storage_elem = FlatCAMGeoEditor.make_storage()
+            storage_elem = appGeoEditor.make_storage()
             self.storage_dict[deleted_tool_dia] = storage_elem
             self.storage_dict.pop(deleted_tool_dia, None)
 
@@ -2679,7 +2679,7 @@ class FlatCAMExcEditor(QtCore.QObject):
         # DESTINATION storage
         # tool diameter is not used so we create a new tool with the desired diameter
         if new_dia not in self.olddia_newdia:
-            destination_storage = FlatCAMGeoEditor.make_storage()
+            destination_storage = appGeoEditor.make_storage()
             self.storage_dict[new_dia] = destination_storage
 
             # self.olddia_newdia dict keeps the evidence on current tools diameters as keys and gets updated on values
@@ -2910,7 +2910,7 @@ class FlatCAMExcEditor(QtCore.QObject):
         self.mr = self.canvas.graph_event_connect('mouse_release', self.on_exc_click_release)
 
         # make sure that the shortcuts key and mouse events will no longer be linked to the methods from FlatCAMApp
-        # but those from FlatCAMGeoEditor
+        # but those from appGeoEditor
         if self.app.is_legacy is False:
             self.app.plotcanvas.graph_event_disconnect('mouse_press', self.app.on_mouse_click_over_plot)
             self.app.plotcanvas.graph_event_disconnect('mouse_move', self.app.on_mouse_move_over_plot)
@@ -3052,7 +3052,7 @@ class FlatCAMExcEditor(QtCore.QObject):
         # build the geometry for each tool-diameter, each drill will be represented by a '+' symbol
         # and then add it to the storage elements (each storage elements is a member of a list
         for tool_dia in self.points_edit:
-            storage_elem = FlatCAMGeoEditor.make_storage()
+            storage_elem = appGeoEditor.make_storage()
             for point in self.points_edit[tool_dia]:
                 # make a '+' sign, the line length is the tool diameter
                 start_hor_line = ((point.x - (tool_dia / 2)), point.y)
@@ -3073,7 +3073,7 @@ class FlatCAMExcEditor(QtCore.QObject):
                 shape_geo = line_geo.buffer(buf_value)
 
                 if tool_dia not in self.storage_dict:
-                    storage_elem = FlatCAMGeoEditor.make_storage()
+                    storage_elem = appGeoEditor.make_storage()
                     self.storage_dict[tool_dia] = storage_elem
 
                 if shape_geo is not None:
diff --git a/appEditors/FlatCAMGrbEditor.py b/appEditors/FlatCAMGrbEditor.py
index d0907371..2af9d3a8 100644
--- a/appEditors/FlatCAMGrbEditor.py
+++ b/appEditors/FlatCAMGrbEditor.py
@@ -3778,7 +3778,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
         # Canvas events
 
         # make sure that the shortcuts key and mouse events will no longer be linked to the methods from FlatCAMApp
-        # but those from FlatCAMGeoEditor
+        # but those from appGeoEditor
 
         # first connect to new, then disconnect the old handlers
         # don't ask why but if there is nothing connected I've seen issues
diff --git a/appEditors/FlatCAMGeoEditor.py b/appEditors/appGeoEditor.py
similarity index 99%
rename from appEditors/FlatCAMGeoEditor.py
rename to appEditors/appGeoEditor.py
index d488ec33..9fc61db2 100644
--- a/appEditors/FlatCAMGeoEditor.py
+++ b/appEditors/appGeoEditor.py
@@ -2523,12 +2523,12 @@ class FCSelect(DrawTool):
             # it will not work for 3rd method of click selection
             if not over_shape_list:
                 self.draw_app.selected = []
-                FlatCAMGeoEditor.draw_shape_idx = -1
+                appGeoEditor.draw_shape_idx = -1
             else:
                 # if there are shapes under our click then advance through the list of them, one at the time in a
                 # circular way
-                FlatCAMGeoEditor.draw_shape_idx = (FlatCAMGeoEditor.draw_shape_idx + 1) % len(over_shape_list)
-                obj_to_add = over_shape_list[int(FlatCAMGeoEditor.draw_shape_idx)]
+                appGeoEditor.draw_shape_idx = (appGeoEditor.draw_shape_idx + 1) % len(over_shape_list)
+                obj_to_add = over_shape_list[int(appGeoEditor.draw_shape_idx)]
 
                 key_modifier = QtWidgets.QApplication.keyboardModifiers()
 
@@ -2550,7 +2550,7 @@ class FCSelect(DrawTool):
                     self.draw_app.selected = []
                     self.draw_app.selected.append(obj_to_add)
         except Exception as e:
-            log.error("[ERROR] FlatCAMGeoEditor.FCSelect.click_release() -> Something went bad. %s" % str(e))
+            log.error("[ERROR] appGeoEditor.FCSelect.click_release() -> Something went bad. %s" % str(e))
 
         # if selection is done on canvas update the Tree in Selected Tab with the selection
         try:
@@ -2788,9 +2788,9 @@ class FCMove(FCShapeTool):
             else:
                 # if there are shapes under our click then advance through the list of them, one at the time in a
                 # circular way
-                self.draw_app.draw_shape_idx = (FlatCAMGeoEditor.draw_shape_idx + 1) % len(over_shape_list)
+                self.draw_app.draw_shape_idx = (appGeoEditor.draw_shape_idx + 1) % len(over_shape_list)
                 try:
-                    obj_to_add = over_shape_list[int(FlatCAMGeoEditor.draw_shape_idx)]
+                    obj_to_add = over_shape_list[int(appGeoEditor.draw_shape_idx)]
                 except IndexError:
                     return
 
@@ -3230,7 +3230,7 @@ class FCTransform(FCShapeTool):
 # ###############################################
 # ################ Main Application #############
 # ###############################################
-class FlatCAMGeoEditor(QtCore.QObject):
+class appGeoEditor(QtCore.QObject):
 
     # will emit the name of the object that was just selected
     item_selected = QtCore.pyqtSignal(str)
@@ -3243,7 +3243,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
         # assert isinstance(app, FlatCAMApp.App), \
         #     "Expected the app to be a FlatCAMApp.App, got %s" % type(app)
 
-        super(FlatCAMGeoEditor, self).__init__()
+        super(appGeoEditor, self).__init__()
 
         self.app = app
         self.canvas = app.plotcanvas
@@ -3316,7 +3316,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
         # # ## Data
         self.active_tool = None
 
-        self.storage = FlatCAMGeoEditor.make_storage()
+        self.storage = appGeoEditor.make_storage()
         self.utility = []
 
         # VisPy visuals
@@ -3415,7 +3415,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
                 self.options[opt] = float(text_value)
             except Exception as e:
                 entry.set_value(self.app.defaults[opt])
-                log.debug("FlatCAMGeoEditor.__init__().entry2option() --> %s" % str(e))
+                log.debug("appGeoEditor.__init__().entry2option() --> %s" % str(e))
                 return
 
         def grid_changed(goption, gentry):
@@ -3588,7 +3588,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
         self.connect_canvas_event_handlers()
 
         # initialize working objects
-        self.storage = FlatCAMGeoEditor.make_storage()
+        self.storage = appGeoEditor.make_storage()
         self.utility = []
         self.selected = []
 
@@ -3701,7 +3701,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
         #     for w in sel_tab_widget_list:
         #         w.setEnabled(True)
         # except Exception as e:
-        #     log.debug("FlatCAMGeoEditor.deactivate() --> %s" % str(e))
+        #     log.debug("appGeoEditor.deactivate() --> %s" % str(e))
 
         # Show original geometry
         if self.fcgeometry:
@@ -3727,7 +3727,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
 
         if self.app.is_legacy is False:
             # make sure that the shortcuts key and mouse events will no longer be linked to the methods from FlatCAMApp
-            # but those from FlatCAMGeoEditor
+            # but those from appGeoEditor
             self.app.plotcanvas.graph_event_disconnect('mouse_press', self.app.on_mouse_click_over_plot)
             self.app.plotcanvas.graph_event_disconnect('mouse_move', self.app.on_mouse_move_over_plot)
             self.app.plotcanvas.graph_event_disconnect('mouse_release', self.app.on_mouse_click_release_over_plot)
@@ -3958,7 +3958,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
         self.shapes.clear(update=True)
         self.tool_shape.clear(update=True)
 
-        # self.storage = FlatCAMGeoEditor.make_storage()
+        # self.storage = appGeoEditor.make_storage()
         self.replot()
 
     def edit_fcgeometry(self, fcgeometry, multigeo_tool=None):
@@ -4567,10 +4567,10 @@ class FlatCAMGeoEditor(QtCore.QObject):
                 elif isinstance(geom, LineString) and geom is not None:
                     geom = LineString(geom.coords[::-1])
                 else:
-                    log.debug("FlatCAMGeoEditor.on_shape_complete() Error --> Unexpected Geometry %s" %
+                    log.debug("appGeoEditor.on_shape_complete() Error --> Unexpected Geometry %s" %
                               type(geom))
             except Exception as e:
-                log.debug("FlatCAMGeoEditor.on_shape_complete() Error --> %s" % str(e))
+                log.debug("appGeoEditor.on_shape_complete() Error --> %s" % str(e))
                 return 'fail'
 
         shape_list = []
@@ -4757,7 +4757,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
         try:
             results = geo_shapes[0].geo
         except Exception as e:
-            log.debug("FlatCAMGeoEditor.intersection() --> %s" % str(e))
+            log.debug("appGeoEditor.intersection() --> %s" % str(e))
             self.app.inform.emit('[WARNING_NOTCL] %s' %
                                  _("A selection of at least 2 geo items is required to do Intersection."))
             self.select_tool('select')
@@ -4792,7 +4792,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
         try:
             intersector = geo_shapes[0].geo
         except Exception as e:
-            log.debug("FlatCAMGeoEditor.intersection() --> %s" % str(e))
+            log.debug("appGeoEditor.intersection() --> %s" % str(e))
             self.app.inform.emit('[WARNING_NOTCL] %s' %
                                  _("A selection of at least 2 geo items is required to do Intersection."))
             self.select_tool('select')
diff --git a/appGUI/MainGUI.py b/appGUI/MainGUI.py
index 6caa69fd..53e95d0e 100644
--- a/appGUI/MainGUI.py
+++ b/appGUI/MainGUI.py
@@ -19,7 +19,7 @@ from appGUI.preferences.excellon.ExcellonPreferencesUI import ExcellonPreference
 from appGUI.preferences.general.GeneralPreferencesUI import GeneralPreferencesUI
 from appGUI.preferences.geometry.GeometryPreferencesUI import GeometryPreferencesUI
 from appGUI.preferences.gerber.GerberPreferencesUI import GerberPreferencesUI
-from appEditors.FlatCAMGeoEditor import FCShapeTool
+from appEditors.appGeoEditor import FCShapeTool
 from matplotlib.backend_bases import KeyEvent as mpl_key_event
 
 import webbrowser
diff --git a/appTools/ToolDistance.py b/appTools/ToolDistance.py
index ba660075..e0ce772b 100644
--- a/appTools/ToolDistance.py
+++ b/appTools/ToolDistance.py
@@ -15,7 +15,7 @@ from shapely.geometry import Point, MultiLineString, Polygon
 
 import appTranslation as fcTranslate
 from camlib import FlatCAMRTreeStorage
-from appEditors.FlatCAMGeoEditor import DrawToolShape
+from appEditors.appGeoEditor import DrawToolShape
 
 from copy import copy
 import math
diff --git a/app_Main.py b/app_Main.py
index 1f3825ea..7b7542d7 100644
--- a/app_Main.py
+++ b/app_Main.py
@@ -78,7 +78,7 @@ from appGUI.GUIElements import FCFileSaveDialog, message_dialog, FlatCAMSystemTr
 from appPreProcessor import load_preprocessors
 
 # FlatCAM appEditors
-from appEditors.FlatCAMGeoEditor import FlatCAMGeoEditor
+from appEditors.appGeoEditor import appGeoEditor
 from appEditors.FlatCAMExcEditor import FlatCAMExcEditor
 from appEditors.FlatCAMGrbEditor import FlatCAMGrbEditor
 from appEditors.FlatCAMTextEditor import TextEditor
@@ -1321,7 +1321,6 @@ class App(QtCore.QObject):
         # ########################################## Tools and Plugins ##############################################
         # ###########################################################################################################
 
-
         self.shell = None
         self.dblsidedtool = None
         self.distance_tool = None
@@ -1553,7 +1552,7 @@ class App(QtCore.QObject):
         # watch out for the position of the editors instantiation ... if it is done before a save of the default values
         # at the first launch of the App , the editors will not be functional.
         try:
-            self.geo_editor = FlatCAMGeoEditor(self)
+            self.geo_editor = appGeoEditor(self)
         except Exception as es:
             log.debug("app_Main.__init__() --> Geo Editor Error: %s" % str(es))
 
@@ -3396,12 +3395,12 @@ class App(QtCore.QObject):
 
         # When the main event loop is not started yet in which case the qApp.quit() will do nothing
         # we use the following command
-        minor_v = sys.version_info.minor
-        if minor_v < 8:
-            # make sure that the app closes
-            sys.exit(0)
-        else:
-            os._exit(0)  # fix to work with Python 3.8
+        # minor_v = sys.version_info.minor
+        # if minor_v < 8:
+        #     # make sure that the app closes
+        #     sys.exit(0)
+        # else:
+        #     os._exit(0)  # fix to work with Python 3.8
 
     @staticmethod
     def kill_app():
@@ -6594,7 +6593,7 @@ class App(QtCore.QObject):
         if self.call_source != 'app':
             self.editor2object(cleanup=True)
             # ## EDITOR section
-            self.geo_editor = FlatCAMGeoEditor(self)
+            self.geo_editor = appGeoEditor(self)
             self.exc_editor = FlatCAMExcEditor(self)
             self.grb_editor = FlatCAMGrbEditor(self)
 
diff --git a/locale/de/LC_MESSAGES/strings.po b/locale/de/LC_MESSAGES/strings.po
index 5153c2c9..6fc3596f 100644
--- a/locale/de/LC_MESSAGES/strings.po
+++ b/locale/de/LC_MESSAGES/strings.po
@@ -174,7 +174,7 @@ msgstr ""
 "Zone hinzugefügt. Klicken Sie, um die nächste Zone hinzuzufügen, oder "
 "klicken Sie mit der rechten Maustaste, um den Vorgang abzuschließen."
 
-#: Common.py:322 appEditors/FlatCAMGeoEditor.py:2352
+#: Common.py:322 appEditors/appGeoEditor.py:2352
 #: appTools/ToolIsolation.py:2584 appTools/ToolNCC.py:1754
 #: appTools/ToolPaint.py:1647
 msgid "Click on next Point or click right mouse button to complete ..."
@@ -900,7 +900,7 @@ msgid "Conventional"
 msgstr "Konventionell"
 
 #: appDatabase.py:1456 appDatabase.py:1565 appDatabase.py:1667
-#: appEditors/FlatCAMGeoEditor.py:450
+#: appEditors/appGeoEditor.py:450
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:167
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:182
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:163
@@ -930,7 +930,7 @@ msgstr ""
 "Höhere Werte = langsame Verarbeitung und langsame Ausführung auf CNC\n"
 "wegen zu vieler Wege."
 
-#: appDatabase.py:1477 appDatabase.py:1586 appEditors/FlatCAMGeoEditor.py:470
+#: appDatabase.py:1477 appDatabase.py:1586 appEditors/appGeoEditor.py:470
 #: appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py:72
 #: appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py:229
 #: appGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py:59
@@ -959,7 +959,7 @@ msgstr "Marge"
 msgid "Bounding box margin."
 msgstr "Begrenzungsrahmenrand."
 
-#: appDatabase.py:1490 appDatabase.py:1601 appEditors/FlatCAMGeoEditor.py:484
+#: appDatabase.py:1490 appDatabase.py:1601 appEditors/appGeoEditor.py:484
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:105
 #: appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py:106
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:215
@@ -982,7 +982,7 @@ msgstr ""
 "- Samenbasiert: Aus dem Samen heraus.\n"
 "- Linienbasiert: Parallele Linien."
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2232 appTools/ToolNCC.py:2764
@@ -992,8 +992,8 @@ msgstr ""
 msgid "Standard"
 msgstr "Standard"
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
-#: appEditors/FlatCAMGeoEditor.py:568 appEditors/FlatCAMGeoEditor.py:5091
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
+#: appEditors/appGeoEditor.py:568 appEditors/appGeoEditor.py:5091
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2243 appTools/ToolNCC.py:2770
@@ -1004,8 +1004,8 @@ msgstr "Standard"
 msgid "Seed"
 msgstr "Keim"
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
-#: appEditors/FlatCAMGeoEditor.py:5095
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
+#: appEditors/appGeoEditor.py:5095
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2254 appTools/ToolPaint.py:389
@@ -1029,7 +1029,7 @@ msgstr "Combo"
 msgid "Connect"
 msgstr "Verbinden"
 
-#: appDatabase.py:1512 appDatabase.py:1629 appEditors/FlatCAMGeoEditor.py:507
+#: appDatabase.py:1512 appDatabase.py:1629 appEditors/appGeoEditor.py:507
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:239
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:226
 #: appTools/ToolNCC.py:443 appTools/ToolPaint.py:403
@@ -1047,7 +1047,7 @@ msgstr ""
 msgid "Contour"
 msgstr "Kontur"
 
-#: appDatabase.py:1522 appDatabase.py:1636 appEditors/FlatCAMGeoEditor.py:517
+#: appDatabase.py:1522 appDatabase.py:1636 appEditors/appGeoEditor.py:517
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:248
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:234
 #: appTools/ToolNCC.py:453 appTools/ToolPaint.py:410
@@ -1058,7 +1058,7 @@ msgstr ""
 "Schneiden Sie um den Umfang des Polygons herum\n"
 "Ecken und Kanten schneiden."
 
-#: appDatabase.py:1528 appEditors/FlatCAMGeoEditor.py:611
+#: appDatabase.py:1528 appEditors/appGeoEditor.py:611
 #: appEditors/FlatCAMGrbEditor.py:5304 appGUI/ObjectUI.py:143
 #: appGUI/ObjectUI.py:1394 appGUI/ObjectUI.py:2256
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:255
@@ -1082,7 +1082,7 @@ msgstr ""
 "Der Wert kann zwischen 0 und 10 FlatCAM-Einheiten liegen."
 
 # 3rd Time
-#: appDatabase.py:1567 appEditors/FlatCAMGeoEditor.py:452
+#: appDatabase.py:1567 appEditors/appGeoEditor.py:452
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:165
 #: appTools/ToolPaint.py:330
 msgid ""
@@ -1104,7 +1104,7 @@ msgstr ""
 "Höhere Werte = langsame Verarbeitung und langsame Ausführung auf CNC\n"
 "wegen zu vieler Wege."
 
-#: appDatabase.py:1588 appEditors/FlatCAMGeoEditor.py:472
+#: appDatabase.py:1588 appEditors/appGeoEditor.py:472
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:185
 #: appTools/ToolPaint.py:351
 msgid ""
@@ -1566,7 +1566,7 @@ msgstr "Y"
 #: appEditors/FlatCAMExcEditor.py:1800 appEditors/FlatCAMExcEditor.py:1871
 #: appEditors/FlatCAMExcEditor.py:1875 appEditors/FlatCAMExcEditor.py:1964
 #: appEditors/FlatCAMExcEditor.py:1982 appEditors/FlatCAMExcEditor.py:2016
-#: appEditors/FlatCAMGeoEditor.py:683 appEditors/FlatCAMGrbEditor.py:2822
+#: appEditors/appGeoEditor.py:683 appEditors/FlatCAMGrbEditor.py:2822
 #: appEditors/FlatCAMGrbEditor.py:2839 appEditors/FlatCAMGrbEditor.py:2875
 #: appEditors/FlatCAMGrbEditor.py:5376
 #: appGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py:94
@@ -1795,7 +1795,7 @@ msgid "Cancelled. There is no Tool/Drill selected"
 msgstr "Abgebrochen. Es ist kein Werkzeug / Bohrer ausgewählt"
 
 #: appEditors/FlatCAMExcEditor.py:3601 appEditors/FlatCAMExcEditor.py:3609
-#: appEditors/FlatCAMGeoEditor.py:4286 appEditors/FlatCAMGeoEditor.py:4300
+#: appEditors/appGeoEditor.py:4286 appEditors/appGeoEditor.py:4300
 #: appEditors/FlatCAMGrbEditor.py:1085 appEditors/FlatCAMGrbEditor.py:1312
 #: appEditors/FlatCAMGrbEditor.py:1497 appEditors/FlatCAMGrbEditor.py:1766
 #: appEditors/FlatCAMGrbEditor.py:4608 appEditors/FlatCAMGrbEditor.py:4625
@@ -1814,15 +1814,15 @@ msgstr "Erledigt. Bohrer gelöscht."
 msgid "Click on the circular array Center position"
 msgstr "Klicken Sie auf die kreisförmige Anordnung in der Mitte"
 
-#: appEditors/FlatCAMGeoEditor.py:84
+#: appEditors/appGeoEditor.py:84
 msgid "Buffer distance:"
 msgstr "Pufferabstand:"
 
-#: appEditors/FlatCAMGeoEditor.py:85
+#: appEditors/appGeoEditor.py:85
 msgid "Buffer corner:"
 msgstr "Pufferecke:"
 
-#: appEditors/FlatCAMGeoEditor.py:87
+#: appEditors/appGeoEditor.py:87
 msgid ""
 "There are 3 types of corners:\n"
 " - 'Round': the corner is rounded for exterior buffer.\n"
@@ -1837,11 +1837,11 @@ msgstr ""
 "- 'Abgeschrägt:' Die Ecke ist eine Linie, die die Features, die sich in der "
 "Ecke treffen, direkt verbindet"
 
-#: appEditors/FlatCAMGeoEditor.py:93 appEditors/FlatCAMGrbEditor.py:2638
+#: appEditors/appGeoEditor.py:93 appEditors/FlatCAMGrbEditor.py:2638
 msgid "Round"
 msgstr "Runden"
 
-#: appEditors/FlatCAMGeoEditor.py:94 appEditors/FlatCAMGrbEditor.py:2639
+#: appEditors/appGeoEditor.py:94 appEditors/FlatCAMGrbEditor.py:2639
 #: appGUI/ObjectUI.py:1149 appGUI/ObjectUI.py:2004
 #: appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py:225
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:68
@@ -1859,50 +1859,50 @@ msgstr "Runden"
 msgid "Square"
 msgstr "Quadrat"
 
-#: appEditors/FlatCAMGeoEditor.py:95 appEditors/FlatCAMGrbEditor.py:2640
+#: appEditors/appGeoEditor.py:95 appEditors/FlatCAMGrbEditor.py:2640
 msgid "Beveled"
 msgstr "Abgeschrägt"
 
-#: appEditors/FlatCAMGeoEditor.py:102
+#: appEditors/appGeoEditor.py:102
 msgid "Buffer Interior"
 msgstr "Pufferinnenraum"
 
-#: appEditors/FlatCAMGeoEditor.py:104
+#: appEditors/appGeoEditor.py:104
 msgid "Buffer Exterior"
 msgstr "Puffer außen"
 
-#: appEditors/FlatCAMGeoEditor.py:110
+#: appEditors/appGeoEditor.py:110
 msgid "Full Buffer"
 msgstr "Voller Puffer"
 
-#: appEditors/FlatCAMGeoEditor.py:131 appEditors/FlatCAMGeoEditor.py:2959
+#: appEditors/appGeoEditor.py:131 appEditors/appGeoEditor.py:2959
 #: appGUI/MainGUI.py:4301
 #: appGUI/preferences/gerber/GerberEditorPrefGroupUI.py:191
 msgid "Buffer Tool"
 msgstr "Pufferwerkzeug"
 
-#: appEditors/FlatCAMGeoEditor.py:143 appEditors/FlatCAMGeoEditor.py:160
-#: appEditors/FlatCAMGeoEditor.py:177 appEditors/FlatCAMGeoEditor.py:2978
-#: appEditors/FlatCAMGeoEditor.py:3006 appEditors/FlatCAMGeoEditor.py:3034
+#: appEditors/appGeoEditor.py:143 appEditors/appGeoEditor.py:160
+#: appEditors/appGeoEditor.py:177 appEditors/appGeoEditor.py:2978
+#: appEditors/appGeoEditor.py:3006 appEditors/appGeoEditor.py:3034
 #: appEditors/FlatCAMGrbEditor.py:5109
 msgid "Buffer distance value is missing or wrong format. Add it and retry."
 msgstr ""
 "Pufferabstandswert fehlt oder falsches Format. Fügen Sie es hinzu und "
 "versuchen Sie es erneut."
 
-#: appEditors/FlatCAMGeoEditor.py:241
+#: appEditors/appGeoEditor.py:241
 msgid "Font"
 msgstr "Schrift"
 
-#: appEditors/FlatCAMGeoEditor.py:322 appGUI/MainGUI.py:1452
+#: appEditors/appGeoEditor.py:322 appGUI/MainGUI.py:1452
 msgid "Text"
 msgstr "Text"
 
-#: appEditors/FlatCAMGeoEditor.py:348
+#: appEditors/appGeoEditor.py:348
 msgid "Text Tool"
 msgstr "Textwerkzeug"
 
-#: appEditors/FlatCAMGeoEditor.py:404 appGUI/MainGUI.py:502
+#: appEditors/appGeoEditor.py:404 appGUI/MainGUI.py:502
 #: appGUI/MainGUI.py:1199 appGUI/ObjectUI.py:597 appGUI/ObjectUI.py:1564
 #: appObjects/FlatCAMExcellon.py:852 appObjects/FlatCAMExcellon.py:1242
 #: appObjects/FlatCAMGeometry.py:825 appTools/ToolIsolation.py:313
@@ -1911,15 +1911,15 @@ msgstr "Textwerkzeug"
 msgid "Tool"
 msgstr "Werkzeug"
 
-#: appEditors/FlatCAMGeoEditor.py:438
+#: appEditors/appGeoEditor.py:438
 msgid "Tool dia"
 msgstr "Werkzeugdurchmesser"
 
-#: appEditors/FlatCAMGeoEditor.py:440
+#: appEditors/appGeoEditor.py:440
 msgid "Diameter of the tool to be used in the operation."
 msgstr "Durchmesser des im Betrieb zu verwendenden Werkzeugs."
 
-#: appEditors/FlatCAMGeoEditor.py:486
+#: appEditors/appGeoEditor.py:486
 msgid ""
 "Algorithm to paint the polygons:\n"
 "- Standard: Fixed step inwards.\n"
@@ -1931,57 +1931,57 @@ msgstr ""
 "- Samenbasiert: Aus dem Samen heraus.\n"
 "- Linienbasiert: Parallele Linien."
 
-#: appEditors/FlatCAMGeoEditor.py:505
+#: appEditors/appGeoEditor.py:505
 msgid "Connect:"
 msgstr "Verbinden:"
 
-#: appEditors/FlatCAMGeoEditor.py:515
+#: appEditors/appGeoEditor.py:515
 msgid "Contour:"
 msgstr "Kontur:"
 
-#: appEditors/FlatCAMGeoEditor.py:528 appGUI/MainGUI.py:1456
+#: appEditors/appGeoEditor.py:528 appGUI/MainGUI.py:1456
 msgid "Paint"
 msgstr "Malen"
 
-#: appEditors/FlatCAMGeoEditor.py:546 appGUI/MainGUI.py:912
+#: appEditors/appGeoEditor.py:546 appGUI/MainGUI.py:912
 #: appGUI/MainGUI.py:1944 appGUI/ObjectUI.py:2069 appTools/ToolPaint.py:42
 #: appTools/ToolPaint.py:737
 msgid "Paint Tool"
 msgstr "Werkzeug Malen"
 
-#: appEditors/FlatCAMGeoEditor.py:582 appEditors/FlatCAMGeoEditor.py:1071
-#: appEditors/FlatCAMGeoEditor.py:2966 appEditors/FlatCAMGeoEditor.py:2994
-#: appEditors/FlatCAMGeoEditor.py:3022 appEditors/FlatCAMGeoEditor.py:4439
+#: appEditors/appGeoEditor.py:582 appEditors/appGeoEditor.py:1071
+#: appEditors/appGeoEditor.py:2966 appEditors/appGeoEditor.py:2994
+#: appEditors/appGeoEditor.py:3022 appEditors/appGeoEditor.py:4439
 #: appEditors/FlatCAMGrbEditor.py:5764
 msgid "Cancelled. No shape selected."
 msgstr "Abgebrochen. Keine Form ausgewählt."
 
-#: appEditors/FlatCAMGeoEditor.py:595 appEditors/FlatCAMGeoEditor.py:2984
-#: appEditors/FlatCAMGeoEditor.py:3012 appEditors/FlatCAMGeoEditor.py:3040
+#: appEditors/appGeoEditor.py:595 appEditors/appGeoEditor.py:2984
+#: appEditors/appGeoEditor.py:3012 appEditors/appGeoEditor.py:3040
 #: appGUI/preferences/geometry/GeometryGenPrefGroupUI.py:69
 #: appTools/ToolProperties.py:117 appTools/ToolProperties.py:162
 msgid "Tools"
 msgstr "Werkzeuge"
 
-#: appEditors/FlatCAMGeoEditor.py:606 appEditors/FlatCAMGeoEditor.py:1035
+#: appEditors/appGeoEditor.py:606 appEditors/appGeoEditor.py:1035
 #: appEditors/FlatCAMGrbEditor.py:5299 appEditors/FlatCAMGrbEditor.py:5728
 #: appGUI/MainGUI.py:935 appGUI/MainGUI.py:1967 appTools/ToolTransform.py:494
 msgid "Transform Tool"
 msgstr "Werkzeug Umwandeln"
 
-#: appEditors/FlatCAMGeoEditor.py:607 appEditors/FlatCAMGeoEditor.py:699
+#: appEditors/appGeoEditor.py:607 appEditors/appGeoEditor.py:699
 #: appEditors/FlatCAMGrbEditor.py:5300 appEditors/FlatCAMGrbEditor.py:5392
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:88
 #: appTools/ToolTransform.py:27 appTools/ToolTransform.py:146
 msgid "Rotate"
 msgstr "Drehen"
 
-#: appEditors/FlatCAMGeoEditor.py:608 appEditors/FlatCAMGrbEditor.py:5301
+#: appEditors/appGeoEditor.py:608 appEditors/FlatCAMGrbEditor.py:5301
 #: appTools/ToolTransform.py:28
 msgid "Skew/Shear"
 msgstr "Neigung/Schere"
 
-#: appEditors/FlatCAMGeoEditor.py:609 appEditors/FlatCAMGrbEditor.py:2687
+#: appEditors/appGeoEditor.py:609 appEditors/FlatCAMGrbEditor.py:2687
 #: appEditors/FlatCAMGrbEditor.py:5302 appGUI/MainGUI.py:1057
 #: appGUI/MainGUI.py:1499 appGUI/MainGUI.py:2089 appGUI/MainGUI.py:4513
 #: appGUI/ObjectUI.py:125
@@ -1990,12 +1990,12 @@ msgstr "Neigung/Schere"
 msgid "Scale"
 msgstr "Skalieren"
 
-#: appEditors/FlatCAMGeoEditor.py:610 appEditors/FlatCAMGrbEditor.py:5303
+#: appEditors/appGeoEditor.py:610 appEditors/FlatCAMGrbEditor.py:5303
 #: appTools/ToolTransform.py:30
 msgid "Mirror (Flip)"
 msgstr "Spiegeln (Flip)"
 
-#: appEditors/FlatCAMGeoEditor.py:612 appEditors/FlatCAMGrbEditor.py:2647
+#: appEditors/appGeoEditor.py:612 appEditors/FlatCAMGrbEditor.py:2647
 #: appEditors/FlatCAMGrbEditor.py:5305 appGUI/MainGUI.py:1055
 #: appGUI/MainGUI.py:1454 appGUI/MainGUI.py:1497 appGUI/MainGUI.py:2087
 #: appGUI/MainGUI.py:4511
@@ -2004,7 +2004,7 @@ msgstr "Spiegeln (Flip)"
 msgid "Buffer"
 msgstr "Puffer"
 
-#: appEditors/FlatCAMGeoEditor.py:643 appEditors/FlatCAMGrbEditor.py:5336
+#: appEditors/appGeoEditor.py:643 appEditors/FlatCAMGrbEditor.py:5336
 #: appGUI/GUIElements.py:2701
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:169
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:44
@@ -2013,7 +2013,7 @@ msgstr "Puffer"
 msgid "Reference"
 msgstr "Referenz"
 
-#: appEditors/FlatCAMGeoEditor.py:645 appEditors/FlatCAMGrbEditor.py:5338
+#: appEditors/appGeoEditor.py:645 appEditors/FlatCAMGrbEditor.py:5338
 msgid ""
 "The reference point for Rotate, Skew, Scale, Mirror.\n"
 "Can be:\n"
@@ -2031,14 +2031,14 @@ msgstr ""
 "definiert ist\n"
 "- Min. Auswahl -> der Punkt (minx, miny) des Begrenzungsrahmens der Auswahl"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
 #: appTools/ToolCalibration.py:770 appTools/ToolCalibration.py:771
 #: appTools/ToolTransform.py:70
 msgid "Origin"
 msgstr "Ursprung"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGeoEditor.py:1044
+#: appEditors/appGeoEditor.py:653 appEditors/appGeoEditor.py:1044
 #: appEditors/FlatCAMGrbEditor.py:5346 appEditors/FlatCAMGrbEditor.py:5737
 #: appGUI/preferences/general/GeneralGUIPrefGroupUI.py:250
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:275
@@ -2050,7 +2050,7 @@ msgstr "Ursprung"
 msgid "Selection"
 msgstr "Auswahl"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 #: appGUI/preferences/tools/Tools2sidedPrefGroupUI.py:80
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:60
@@ -2058,11 +2058,11 @@ msgstr "Auswahl"
 msgid "Point"
 msgstr "Punkt"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 msgid "Minimum"
 msgstr "Minimum"
 
-#: appEditors/FlatCAMGeoEditor.py:659 appEditors/FlatCAMGeoEditor.py:955
+#: appEditors/appGeoEditor.py:659 appEditors/appGeoEditor.py:955
 #: appEditors/FlatCAMGrbEditor.py:5352 appEditors/FlatCAMGrbEditor.py:5648
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:131
 #: appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py:133
@@ -2073,13 +2073,13 @@ msgstr "Minimum"
 msgid "Value"
 msgstr "Wert"
 
-#: appEditors/FlatCAMGeoEditor.py:661 appEditors/FlatCAMGrbEditor.py:5354
+#: appEditors/appGeoEditor.py:661 appEditors/FlatCAMGrbEditor.py:5354
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:62
 #: appTools/ToolTransform.py:78
 msgid "A point of reference in format X,Y."
 msgstr "Ein Bezugspunkt im Format X, Y."
 
-#: appEditors/FlatCAMGeoEditor.py:668 appEditors/FlatCAMGrbEditor.py:2590
+#: appEditors/appGeoEditor.py:668 appEditors/FlatCAMGrbEditor.py:2590
 #: appEditors/FlatCAMGrbEditor.py:5361 appGUI/ObjectUI.py:1494
 #: appTools/ToolDblSided.py:192 appTools/ToolDblSided.py:425
 #: appTools/ToolIsolation.py:276 appTools/ToolIsolation.py:631
@@ -2090,12 +2090,12 @@ msgstr "Ein Bezugspunkt im Format X, Y."
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: appEditors/FlatCAMGeoEditor.py:670 appEditors/FlatCAMGrbEditor.py:5363
+#: appEditors/appGeoEditor.py:670 appEditors/FlatCAMGrbEditor.py:5363
 #: appTools/ToolTransform.py:87
 msgid "Add point coordinates from clipboard."
 msgstr "Punktkoordinaten aus der Zwischenablage hinzufügen."
 
-#: appEditors/FlatCAMGeoEditor.py:685 appEditors/FlatCAMGrbEditor.py:5378
+#: appEditors/appGeoEditor.py:685 appEditors/FlatCAMGrbEditor.py:5378
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:98
 #: appTools/ToolTransform.py:132
 msgid ""
@@ -2109,7 +2109,7 @@ msgstr ""
 "Positive Zahlen für CW-Bewegung.\n"
 "Negative Zahlen für CCW-Bewegung."
 
-#: appEditors/FlatCAMGeoEditor.py:701 appEditors/FlatCAMGrbEditor.py:5394
+#: appEditors/appGeoEditor.py:701 appEditors/FlatCAMGrbEditor.py:5394
 #: appTools/ToolTransform.py:148
 msgid ""
 "Rotate the selected object(s).\n"
@@ -2120,7 +2120,7 @@ msgstr ""
 "Der Bezugspunkt ist die Mitte von\n"
 "der Begrenzungsrahmen für alle ausgewählten Objekte."
 
-#: appEditors/FlatCAMGeoEditor.py:721 appEditors/FlatCAMGeoEditor.py:783
+#: appEditors/appGeoEditor.py:721 appEditors/appGeoEditor.py:783
 #: appEditors/FlatCAMGrbEditor.py:5414 appEditors/FlatCAMGrbEditor.py:5476
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:112
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:151
@@ -2128,7 +2128,7 @@ msgstr ""
 msgid "Link"
 msgstr "Verknüpfung"
 
-#: appEditors/FlatCAMGeoEditor.py:723 appEditors/FlatCAMGeoEditor.py:785
+#: appEditors/appGeoEditor.py:723 appEditors/appGeoEditor.py:785
 #: appEditors/FlatCAMGrbEditor.py:5416 appEditors/FlatCAMGrbEditor.py:5478
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:114
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:153
@@ -2138,14 +2138,14 @@ msgstr ""
 "Verknüpfen Sie den Y-Eintrag mit dem X-Eintrag und kopieren Sie dessen "
 "Inhalt."
 
-#: appEditors/FlatCAMGeoEditor.py:728 appEditors/FlatCAMGrbEditor.py:5421
+#: appEditors/appGeoEditor.py:728 appEditors/FlatCAMGrbEditor.py:5421
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:151
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:124
 #: appTools/ToolFilm.py:184 appTools/ToolTransform.py:175
 msgid "X angle"
 msgstr "X Winkel"
 
-#: appEditors/FlatCAMGeoEditor.py:730 appEditors/FlatCAMGeoEditor.py:751
+#: appEditors/appGeoEditor.py:730 appEditors/appGeoEditor.py:751
 #: appEditors/FlatCAMGrbEditor.py:5423 appEditors/FlatCAMGrbEditor.py:5444
 #: appTools/ToolTransform.py:177 appTools/ToolTransform.py:198
 msgid ""
@@ -2155,12 +2155,12 @@ msgstr ""
 "Winkel für Schrägstellung in Grad.\n"
 "Gleitkommazahl zwischen -360 und 360."
 
-#: appEditors/FlatCAMGeoEditor.py:738 appEditors/FlatCAMGrbEditor.py:5431
+#: appEditors/appGeoEditor.py:738 appEditors/FlatCAMGrbEditor.py:5431
 #: appTools/ToolTransform.py:185
 msgid "Skew X"
 msgstr "Neigung X"
 
-#: appEditors/FlatCAMGeoEditor.py:740 appEditors/FlatCAMGeoEditor.py:761
+#: appEditors/appGeoEditor.py:740 appEditors/appGeoEditor.py:761
 #: appEditors/FlatCAMGrbEditor.py:5433 appEditors/FlatCAMGrbEditor.py:5454
 #: appTools/ToolTransform.py:187 appTools/ToolTransform.py:208
 msgid ""
@@ -2172,37 +2172,37 @@ msgstr ""
 "Der Bezugspunkt ist die Mitte von\n"
 "der Begrenzungsrahmen für alle ausgewählten Objekte."
 
-#: appEditors/FlatCAMGeoEditor.py:749 appEditors/FlatCAMGrbEditor.py:5442
+#: appEditors/appGeoEditor.py:749 appEditors/FlatCAMGrbEditor.py:5442
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:160
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:138
 #: appTools/ToolFilm.py:193 appTools/ToolTransform.py:196
 msgid "Y angle"
 msgstr "Y Winkel"
 
-#: appEditors/FlatCAMGeoEditor.py:759 appEditors/FlatCAMGrbEditor.py:5452
+#: appEditors/appGeoEditor.py:759 appEditors/FlatCAMGrbEditor.py:5452
 #: appTools/ToolTransform.py:206
 msgid "Skew Y"
 msgstr "Neigung Y"
 
-#: appEditors/FlatCAMGeoEditor.py:790 appEditors/FlatCAMGrbEditor.py:5483
+#: appEditors/appGeoEditor.py:790 appEditors/FlatCAMGrbEditor.py:5483
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:120
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:162
 #: appTools/ToolFilm.py:145 appTools/ToolTransform.py:237
 msgid "X factor"
 msgstr "X Faktor"
 
-#: appEditors/FlatCAMGeoEditor.py:792 appEditors/FlatCAMGrbEditor.py:5485
+#: appEditors/appGeoEditor.py:792 appEditors/FlatCAMGrbEditor.py:5485
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:164
 #: appTools/ToolTransform.py:239
 msgid "Factor for scaling on X axis."
 msgstr "Faktor für die Skalierung auf der X-Achse."
 
-#: appEditors/FlatCAMGeoEditor.py:799 appEditors/FlatCAMGrbEditor.py:5492
+#: appEditors/appGeoEditor.py:799 appEditors/FlatCAMGrbEditor.py:5492
 #: appTools/ToolTransform.py:246
 msgid "Scale X"
 msgstr "Maßstab X"
 
-#: appEditors/FlatCAMGeoEditor.py:801 appEditors/FlatCAMGeoEditor.py:821
+#: appEditors/appGeoEditor.py:801 appEditors/appGeoEditor.py:821
 #: appEditors/FlatCAMGrbEditor.py:5494 appEditors/FlatCAMGrbEditor.py:5514
 #: appTools/ToolTransform.py:248 appTools/ToolTransform.py:268
 msgid ""
@@ -2214,58 +2214,58 @@ msgstr ""
 "Der Bezugspunkt hängt von ab\n"
 "das Kontrollkästchen Skalenreferenz."
 
-#: appEditors/FlatCAMGeoEditor.py:810 appEditors/FlatCAMGrbEditor.py:5503
+#: appEditors/appGeoEditor.py:810 appEditors/FlatCAMGrbEditor.py:5503
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:129
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:175
 #: appTools/ToolFilm.py:154 appTools/ToolTransform.py:257
 msgid "Y factor"
 msgstr "Y Faktor"
 
-#: appEditors/FlatCAMGeoEditor.py:812 appEditors/FlatCAMGrbEditor.py:5505
+#: appEditors/appGeoEditor.py:812 appEditors/FlatCAMGrbEditor.py:5505
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:177
 #: appTools/ToolTransform.py:259
 msgid "Factor for scaling on Y axis."
 msgstr "Faktor für die Skalierung auf der Y-Achse."
 
-#: appEditors/FlatCAMGeoEditor.py:819 appEditors/FlatCAMGrbEditor.py:5512
+#: appEditors/appGeoEditor.py:819 appEditors/FlatCAMGrbEditor.py:5512
 #: appTools/ToolTransform.py:266
 msgid "Scale Y"
 msgstr "Maßstab Y"
 
-#: appEditors/FlatCAMGeoEditor.py:846 appEditors/FlatCAMGrbEditor.py:5539
+#: appEditors/appGeoEditor.py:846 appEditors/FlatCAMGrbEditor.py:5539
 #: appTools/ToolTransform.py:293
 msgid "Flip on X"
 msgstr "Flip auf X"
 
-#: appEditors/FlatCAMGeoEditor.py:848 appEditors/FlatCAMGeoEditor.py:853
+#: appEditors/appGeoEditor.py:848 appEditors/appGeoEditor.py:853
 #: appEditors/FlatCAMGrbEditor.py:5541 appEditors/FlatCAMGrbEditor.py:5546
 #: appTools/ToolTransform.py:295 appTools/ToolTransform.py:300
 msgid "Flip the selected object(s) over the X axis."
 msgstr "Drehen Sie die ausgewählten Objekte über die X-Achse."
 
-#: appEditors/FlatCAMGeoEditor.py:851 appEditors/FlatCAMGrbEditor.py:5544
+#: appEditors/appGeoEditor.py:851 appEditors/FlatCAMGrbEditor.py:5544
 #: appTools/ToolTransform.py:298
 msgid "Flip on Y"
 msgstr "Flip auf Y"
 
-#: appEditors/FlatCAMGeoEditor.py:871 appEditors/FlatCAMGrbEditor.py:5564
+#: appEditors/appGeoEditor.py:871 appEditors/FlatCAMGrbEditor.py:5564
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:191
 #: appTools/ToolTransform.py:318
 msgid "X val"
 msgstr "X-Wert"
 
-#: appEditors/FlatCAMGeoEditor.py:873 appEditors/FlatCAMGrbEditor.py:5566
+#: appEditors/appGeoEditor.py:873 appEditors/FlatCAMGrbEditor.py:5566
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:193
 #: appTools/ToolTransform.py:320
 msgid "Distance to offset on X axis. In current units."
 msgstr "Abstand zum Offset auf der X-Achse. In aktuellen Einheiten."
 
-#: appEditors/FlatCAMGeoEditor.py:880 appEditors/FlatCAMGrbEditor.py:5573
+#: appEditors/appGeoEditor.py:880 appEditors/FlatCAMGrbEditor.py:5573
 #: appTools/ToolTransform.py:327
 msgid "Offset X"
 msgstr "Versatz X"
 
-#: appEditors/FlatCAMGeoEditor.py:882 appEditors/FlatCAMGeoEditor.py:902
+#: appEditors/appGeoEditor.py:882 appEditors/appGeoEditor.py:902
 #: appEditors/FlatCAMGrbEditor.py:5575 appEditors/FlatCAMGrbEditor.py:5595
 #: appTools/ToolTransform.py:329 appTools/ToolTransform.py:349
 msgid ""
@@ -2277,31 +2277,31 @@ msgstr ""
 "Der Bezugspunkt ist die Mitte von\n"
 "der Begrenzungsrahmen für alle ausgewählten Objekte.\n"
 
-#: appEditors/FlatCAMGeoEditor.py:891 appEditors/FlatCAMGrbEditor.py:5584
+#: appEditors/appGeoEditor.py:891 appEditors/FlatCAMGrbEditor.py:5584
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:204
 #: appTools/ToolTransform.py:338
 msgid "Y val"
 msgstr "Y-Wert"
 
-#: appEditors/FlatCAMGeoEditor.py:893 appEditors/FlatCAMGrbEditor.py:5586
+#: appEditors/appGeoEditor.py:893 appEditors/FlatCAMGrbEditor.py:5586
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:206
 #: appTools/ToolTransform.py:340
 msgid "Distance to offset on Y axis. In current units."
 msgstr "Abstand zum Offset auf der Y-Achse. In aktuellen Einheiten."
 
-#: appEditors/FlatCAMGeoEditor.py:900 appEditors/FlatCAMGrbEditor.py:5593
+#: appEditors/appGeoEditor.py:900 appEditors/FlatCAMGrbEditor.py:5593
 #: appTools/ToolTransform.py:347
 msgid "Offset Y"
 msgstr "Versatz Y"
 
-#: appEditors/FlatCAMGeoEditor.py:920 appEditors/FlatCAMGrbEditor.py:5613
+#: appEditors/appGeoEditor.py:920 appEditors/FlatCAMGrbEditor.py:5613
 #: appGUI/preferences/tools/Tools2QRCodePrefGroupUI.py:142
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:216
 #: appTools/ToolQRCode.py:206 appTools/ToolTransform.py:367
 msgid "Rounded"
 msgstr "Agberundet"
 
-#: appEditors/FlatCAMGeoEditor.py:922 appEditors/FlatCAMGrbEditor.py:5615
+#: appEditors/appGeoEditor.py:922 appEditors/FlatCAMGrbEditor.py:5615
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:218
 #: appTools/ToolTransform.py:369
 msgid ""
@@ -2315,14 +2315,14 @@ msgstr ""
 "Wenn nicht markiert, folgt der Puffer der exakten Geometrie\n"
 "der gepufferten Form."
 
-#: appEditors/FlatCAMGeoEditor.py:930 appEditors/FlatCAMGrbEditor.py:5623
+#: appEditors/appGeoEditor.py:930 appEditors/FlatCAMGrbEditor.py:5623
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:226
 #: appTools/ToolDistance.py:505 appTools/ToolDistanceMin.py:286
 #: appTools/ToolTransform.py:377
 msgid "Distance"
 msgstr "Entfernung"
 
-#: appEditors/FlatCAMGeoEditor.py:932 appEditors/FlatCAMGrbEditor.py:5625
+#: appEditors/appGeoEditor.py:932 appEditors/FlatCAMGrbEditor.py:5625
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:228
 #: appTools/ToolTransform.py:379
 msgid ""
@@ -2336,12 +2336,12 @@ msgstr ""
 "Jedes Geometrieelement des Objekts wird vergrößert\n"
 "oder mit der \"Entfernung\" verringert."
 
-#: appEditors/FlatCAMGeoEditor.py:944 appEditors/FlatCAMGrbEditor.py:5637
+#: appEditors/appGeoEditor.py:944 appEditors/FlatCAMGrbEditor.py:5637
 #: appTools/ToolTransform.py:391
 msgid "Buffer D"
 msgstr "Puffer E"
 
-#: appEditors/FlatCAMGeoEditor.py:946 appEditors/FlatCAMGrbEditor.py:5639
+#: appEditors/appGeoEditor.py:946 appEditors/FlatCAMGrbEditor.py:5639
 #: appTools/ToolTransform.py:393
 msgid ""
 "Create the buffer effect on each geometry,\n"
@@ -2350,7 +2350,7 @@ msgstr ""
 "Erstellen Sie den Puffereffekt für jede Geometrie.\n"
 "Element aus dem ausgewählten Objekt unter Verwendung des Abstands."
 
-#: appEditors/FlatCAMGeoEditor.py:957 appEditors/FlatCAMGrbEditor.py:5650
+#: appEditors/appGeoEditor.py:957 appEditors/FlatCAMGrbEditor.py:5650
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:245
 #: appTools/ToolTransform.py:404
 msgid ""
@@ -2366,12 +2366,12 @@ msgstr ""
 "oder verringert, um dem 'Wert' zu entsprechen. Wert ist ein Prozentsatz\n"
 "der ursprünglichen Dimension."
 
-#: appEditors/FlatCAMGeoEditor.py:970 appEditors/FlatCAMGrbEditor.py:5663
+#: appEditors/appGeoEditor.py:970 appEditors/FlatCAMGrbEditor.py:5663
 #: appTools/ToolTransform.py:417
 msgid "Buffer F"
 msgstr "Puffer F"
 
-#: appEditors/FlatCAMGeoEditor.py:972 appEditors/FlatCAMGrbEditor.py:5665
+#: appEditors/appGeoEditor.py:972 appEditors/FlatCAMGrbEditor.py:5665
 #: appTools/ToolTransform.py:419
 msgid ""
 "Create the buffer effect on each geometry,\n"
@@ -2380,7 +2380,7 @@ msgstr ""
 "Erstellen Sie den Puffereffekt für jede Geometrie.\n"
 "Element aus dem ausgewählten Objekt unter Verwendung des Faktors."
 
-#: appEditors/FlatCAMGeoEditor.py:1043 appEditors/FlatCAMGrbEditor.py:5736
+#: appEditors/appGeoEditor.py:1043 appEditors/FlatCAMGrbEditor.py:5736
 #: appGUI/ObjectUI.py:1103 appGUI/ObjectUI.py:1958
 #: appGUI/preferences/tools/Tools2CalPrefGroupUI.py:48
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
@@ -2391,28 +2391,28 @@ msgstr ""
 msgid "Object"
 msgstr "Objekt"
 
-#: appEditors/FlatCAMGeoEditor.py:1107 appEditors/FlatCAMGeoEditor.py:1130
-#: appEditors/FlatCAMGeoEditor.py:1276 appEditors/FlatCAMGeoEditor.py:1301
-#: appEditors/FlatCAMGeoEditor.py:1335 appEditors/FlatCAMGeoEditor.py:1370
-#: appEditors/FlatCAMGeoEditor.py:1401 appEditors/FlatCAMGrbEditor.py:5800
+#: appEditors/appGeoEditor.py:1107 appEditors/appGeoEditor.py:1130
+#: appEditors/appGeoEditor.py:1276 appEditors/appGeoEditor.py:1301
+#: appEditors/appGeoEditor.py:1335 appEditors/appGeoEditor.py:1370
+#: appEditors/appGeoEditor.py:1401 appEditors/FlatCAMGrbEditor.py:5800
 #: appEditors/FlatCAMGrbEditor.py:5823 appEditors/FlatCAMGrbEditor.py:5968
 #: appEditors/FlatCAMGrbEditor.py:6001 appEditors/FlatCAMGrbEditor.py:6044
 #: appEditors/FlatCAMGrbEditor.py:6085 appEditors/FlatCAMGrbEditor.py:6121
 msgid "No shape selected."
 msgstr "Keine Form ausgewählt."
 
-#: appEditors/FlatCAMGeoEditor.py:1115 appEditors/FlatCAMGrbEditor.py:5808
+#: appEditors/appGeoEditor.py:1115 appEditors/FlatCAMGrbEditor.py:5808
 #: appTools/ToolTransform.py:585
 msgid "Incorrect format for Point value. Needs format X,Y"
 msgstr "Falsches Format für Punktwert. Benötigt Format X, Y."
 
-#: appEditors/FlatCAMGeoEditor.py:1140 appEditors/FlatCAMGrbEditor.py:5833
+#: appEditors/appGeoEditor.py:1140 appEditors/FlatCAMGrbEditor.py:5833
 #: appTools/ToolTransform.py:602
 msgid "Rotate transformation can not be done for a value of 0."
 msgstr ""
 "Bei einem Wert von 0 kann keine Rotationstransformation durchgeführt werden."
 
-#: appEditors/FlatCAMGeoEditor.py:1198 appEditors/FlatCAMGeoEditor.py:1219
+#: appEditors/appGeoEditor.py:1198 appEditors/appGeoEditor.py:1219
 #: appEditors/FlatCAMGrbEditor.py:5891 appEditors/FlatCAMGrbEditor.py:5912
 #: appTools/ToolTransform.py:660 appTools/ToolTransform.py:681
 msgid "Scale transformation can not be done for a factor of 0 or 1."
@@ -2420,303 +2420,303 @@ msgstr ""
 "Eine Skalentransformation kann für einen Faktor von 0 oder 1 nicht "
 "durchgeführt werden."
 
-#: appEditors/FlatCAMGeoEditor.py:1232 appEditors/FlatCAMGeoEditor.py:1241
+#: appEditors/appGeoEditor.py:1232 appEditors/appGeoEditor.py:1241
 #: appEditors/FlatCAMGrbEditor.py:5925 appEditors/FlatCAMGrbEditor.py:5934
 #: appTools/ToolTransform.py:694 appTools/ToolTransform.py:703
 msgid "Offset transformation can not be done for a value of 0."
 msgstr ""
 "Bei einem Wert von 0 kann keine Offset-Transformation durchgeführt werden."
 
-#: appEditors/FlatCAMGeoEditor.py:1271 appEditors/FlatCAMGrbEditor.py:5971
+#: appEditors/appGeoEditor.py:1271 appEditors/FlatCAMGrbEditor.py:5971
 #: appTools/ToolTransform.py:731
 msgid "Appying Rotate"
 msgstr "Anwenden Drehen"
 
-#: appEditors/FlatCAMGeoEditor.py:1284 appEditors/FlatCAMGrbEditor.py:5983
+#: appEditors/appGeoEditor.py:1284 appEditors/FlatCAMGrbEditor.py:5983
 msgid "Done. Rotate completed."
 msgstr "Erledigt. Drehen abgeschlossen."
 
-#: appEditors/FlatCAMGeoEditor.py:1286
+#: appEditors/appGeoEditor.py:1286
 msgid "Rotation action was not executed"
 msgstr "Rotationsaktion wurde nicht ausgeführt"
 
-#: appEditors/FlatCAMGeoEditor.py:1304 appEditors/FlatCAMGrbEditor.py:6004
+#: appEditors/appGeoEditor.py:1304 appEditors/FlatCAMGrbEditor.py:6004
 #: appTools/ToolTransform.py:757
 msgid "Applying Flip"
 msgstr "Flip anwenden"
 
-#: appEditors/FlatCAMGeoEditor.py:1312 appEditors/FlatCAMGrbEditor.py:6016
+#: appEditors/appGeoEditor.py:1312 appEditors/FlatCAMGrbEditor.py:6016
 #: appTools/ToolTransform.py:774
 msgid "Flip on the Y axis done"
 msgstr "Spiegeln Sie die Y-Achse bereit"
 
-#: appEditors/FlatCAMGeoEditor.py:1315 appEditors/FlatCAMGrbEditor.py:6024
+#: appEditors/appGeoEditor.py:1315 appEditors/FlatCAMGrbEditor.py:6024
 #: appTools/ToolTransform.py:783
 msgid "Flip on the X axis done"
 msgstr "Spiegeln Sie die X-Achse bereit"
 
-#: appEditors/FlatCAMGeoEditor.py:1319
+#: appEditors/appGeoEditor.py:1319
 msgid "Flip action was not executed"
 msgstr "Spiegeln-Aktion wurde nicht ausgeführt"
 
-#: appEditors/FlatCAMGeoEditor.py:1338 appEditors/FlatCAMGrbEditor.py:6047
+#: appEditors/appGeoEditor.py:1338 appEditors/FlatCAMGrbEditor.py:6047
 #: appTools/ToolTransform.py:804
 msgid "Applying Skew"
 msgstr "Schräglauf anwenden"
 
-#: appEditors/FlatCAMGeoEditor.py:1347 appEditors/FlatCAMGrbEditor.py:6063
+#: appEditors/appGeoEditor.py:1347 appEditors/FlatCAMGrbEditor.py:6063
 msgid "Skew on the X axis done"
 msgstr "Schrägstellung auf der X-Achse erfolgt"
 
-#: appEditors/FlatCAMGeoEditor.py:1349 appEditors/FlatCAMGrbEditor.py:6065
+#: appEditors/appGeoEditor.py:1349 appEditors/FlatCAMGrbEditor.py:6065
 msgid "Skew on the Y axis done"
 msgstr "Schrägstellung auf der Y-Achse erfolgt"
 
-#: appEditors/FlatCAMGeoEditor.py:1352
+#: appEditors/appGeoEditor.py:1352
 msgid "Skew action was not executed"
 msgstr "Die Versatzaktion wurde nicht ausgeführt"
 
-#: appEditors/FlatCAMGeoEditor.py:1373 appEditors/FlatCAMGrbEditor.py:6088
+#: appEditors/appGeoEditor.py:1373 appEditors/FlatCAMGrbEditor.py:6088
 #: appTools/ToolTransform.py:831
 msgid "Applying Scale"
 msgstr "Maßstab anwenden"
 
-#: appEditors/FlatCAMGeoEditor.py:1382 appEditors/FlatCAMGrbEditor.py:6101
+#: appEditors/appGeoEditor.py:1382 appEditors/FlatCAMGrbEditor.py:6101
 msgid "Scale on the X axis done"
 msgstr "Skalieren auf der X-Achse erledigt"
 
-#: appEditors/FlatCAMGeoEditor.py:1384 appEditors/FlatCAMGrbEditor.py:6103
+#: appEditors/appGeoEditor.py:1384 appEditors/FlatCAMGrbEditor.py:6103
 msgid "Scale on the Y axis done"
 msgstr "Skalieren auf der Y-Achse erledigt"
 
-#: appEditors/FlatCAMGeoEditor.py:1386
+#: appEditors/appGeoEditor.py:1386
 msgid "Scale action was not executed"
 msgstr "Skalierungsaktion wurde nicht ausgeführt"
 
-#: appEditors/FlatCAMGeoEditor.py:1404 appEditors/FlatCAMGrbEditor.py:6124
+#: appEditors/appGeoEditor.py:1404 appEditors/FlatCAMGrbEditor.py:6124
 #: appTools/ToolTransform.py:859
 msgid "Applying Offset"
 msgstr "Offsetdruck anwenden"
 
-#: appEditors/FlatCAMGeoEditor.py:1414 appEditors/FlatCAMGrbEditor.py:6145
+#: appEditors/appGeoEditor.py:1414 appEditors/FlatCAMGrbEditor.py:6145
 msgid "Offset on the X axis done"
 msgstr "Versatz auf der X-Achse erfolgt"
 
-#: appEditors/FlatCAMGeoEditor.py:1416 appEditors/FlatCAMGrbEditor.py:6147
+#: appEditors/appGeoEditor.py:1416 appEditors/FlatCAMGrbEditor.py:6147
 msgid "Offset on the Y axis done"
 msgstr "Versatz auf der Y-Achse erfolgt"
 
-#: appEditors/FlatCAMGeoEditor.py:1419
+#: appEditors/appGeoEditor.py:1419
 msgid "Offset action was not executed"
 msgstr "Offsetaktion wurde nicht ausgeführt"
 
-#: appEditors/FlatCAMGeoEditor.py:1426 appEditors/FlatCAMGrbEditor.py:6157
+#: appEditors/appGeoEditor.py:1426 appEditors/FlatCAMGrbEditor.py:6157
 msgid "No shape selected"
 msgstr "Keine Form ausgewählt"
 
-#: appEditors/FlatCAMGeoEditor.py:1429 appEditors/FlatCAMGrbEditor.py:6160
+#: appEditors/appGeoEditor.py:1429 appEditors/FlatCAMGrbEditor.py:6160
 #: appTools/ToolTransform.py:889
 msgid "Applying Buffer"
 msgstr "Anwenden von Puffer"
 
-#: appEditors/FlatCAMGeoEditor.py:1436 appEditors/FlatCAMGrbEditor.py:6182
+#: appEditors/appGeoEditor.py:1436 appEditors/FlatCAMGrbEditor.py:6182
 #: appTools/ToolTransform.py:910
 msgid "Buffer done"
 msgstr "Puffer fertig"
 
-#: appEditors/FlatCAMGeoEditor.py:1440 appEditors/FlatCAMGrbEditor.py:6186
+#: appEditors/appGeoEditor.py:1440 appEditors/FlatCAMGrbEditor.py:6186
 #: appTools/ToolTransform.py:879 appTools/ToolTransform.py:915
 msgid "Action was not executed, due of"
 msgstr "Aktion wurde nicht ausgeführt, weil"
 
-#: appEditors/FlatCAMGeoEditor.py:1444 appEditors/FlatCAMGrbEditor.py:6190
+#: appEditors/appGeoEditor.py:1444 appEditors/FlatCAMGrbEditor.py:6190
 msgid "Rotate ..."
 msgstr "Drehen ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1445 appEditors/FlatCAMGeoEditor.py:1494
-#: appEditors/FlatCAMGeoEditor.py:1509 appEditors/FlatCAMGrbEditor.py:6191
+#: appEditors/appGeoEditor.py:1445 appEditors/appGeoEditor.py:1494
+#: appEditors/appGeoEditor.py:1509 appEditors/FlatCAMGrbEditor.py:6191
 #: appEditors/FlatCAMGrbEditor.py:6240 appEditors/FlatCAMGrbEditor.py:6255
 msgid "Enter an Angle Value (degrees)"
 msgstr "Geben Sie einen Winkelwert (Grad) ein"
 
-#: appEditors/FlatCAMGeoEditor.py:1453 appEditors/FlatCAMGrbEditor.py:6199
+#: appEditors/appGeoEditor.py:1453 appEditors/FlatCAMGrbEditor.py:6199
 msgid "Geometry shape rotate done"
 msgstr "Geometrieform drehen fertig"
 
-#: appEditors/FlatCAMGeoEditor.py:1456 appEditors/FlatCAMGrbEditor.py:6202
+#: appEditors/appGeoEditor.py:1456 appEditors/FlatCAMGrbEditor.py:6202
 msgid "Geometry shape rotate cancelled"
 msgstr "Geometrieform drehen abgebrochen"
 
-#: appEditors/FlatCAMGeoEditor.py:1461 appEditors/FlatCAMGrbEditor.py:6207
+#: appEditors/appGeoEditor.py:1461 appEditors/FlatCAMGrbEditor.py:6207
 msgid "Offset on X axis ..."
 msgstr "Versatz auf der X-Achse ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1462 appEditors/FlatCAMGeoEditor.py:1479
+#: appEditors/appGeoEditor.py:1462 appEditors/appGeoEditor.py:1479
 #: appEditors/FlatCAMGrbEditor.py:6208 appEditors/FlatCAMGrbEditor.py:6225
 msgid "Enter a distance Value"
 msgstr "Geben Sie einen Abstandswert ein"
 
-#: appEditors/FlatCAMGeoEditor.py:1470 appEditors/FlatCAMGrbEditor.py:6216
+#: appEditors/appGeoEditor.py:1470 appEditors/FlatCAMGrbEditor.py:6216
 msgid "Geometry shape offset on X axis done"
 msgstr "Geometrieformversatz auf der X-Achse erfolgt"
 
-#: appEditors/FlatCAMGeoEditor.py:1473 appEditors/FlatCAMGrbEditor.py:6219
+#: appEditors/appGeoEditor.py:1473 appEditors/FlatCAMGrbEditor.py:6219
 msgid "Geometry shape offset X cancelled"
 msgstr "[WARNING_NOTCL] Geometrieformversatz X abgebrochen"
 
-#: appEditors/FlatCAMGeoEditor.py:1478 appEditors/FlatCAMGrbEditor.py:6224
+#: appEditors/appGeoEditor.py:1478 appEditors/FlatCAMGrbEditor.py:6224
 msgid "Offset on Y axis ..."
 msgstr "Versatz auf der Y-Achse ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1487 appEditors/FlatCAMGrbEditor.py:6233
+#: appEditors/appGeoEditor.py:1487 appEditors/FlatCAMGrbEditor.py:6233
 msgid "Geometry shape offset on Y axis done"
 msgstr "Geometrieformversatz auf Y-Achse erfolgt"
 
-#: appEditors/FlatCAMGeoEditor.py:1490
+#: appEditors/appGeoEditor.py:1490
 msgid "Geometry shape offset on Y axis canceled"
 msgstr "Geometrieformversatz auf Y-Achse erfolgt"
 
-#: appEditors/FlatCAMGeoEditor.py:1493 appEditors/FlatCAMGrbEditor.py:6239
+#: appEditors/appGeoEditor.py:1493 appEditors/FlatCAMGrbEditor.py:6239
 msgid "Skew on X axis ..."
 msgstr "Neigung auf der X-Achse ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1502 appEditors/FlatCAMGrbEditor.py:6248
+#: appEditors/appGeoEditor.py:1502 appEditors/FlatCAMGrbEditor.py:6248
 msgid "Geometry shape skew on X axis done"
 msgstr "Geometrieformversatz auf X-Achse"
 
-#: appEditors/FlatCAMGeoEditor.py:1505
+#: appEditors/appGeoEditor.py:1505
 msgid "Geometry shape skew on X axis canceled"
 msgstr "Geometrieformversatz auf X-Achse"
 
-#: appEditors/FlatCAMGeoEditor.py:1508 appEditors/FlatCAMGrbEditor.py:6254
+#: appEditors/appGeoEditor.py:1508 appEditors/FlatCAMGrbEditor.py:6254
 msgid "Skew on Y axis ..."
 msgstr "Neigung auf der Y-Achse ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1517 appEditors/FlatCAMGrbEditor.py:6263
+#: appEditors/appGeoEditor.py:1517 appEditors/FlatCAMGrbEditor.py:6263
 msgid "Geometry shape skew on Y axis done"
 msgstr "Geometrieformversatz auf Y-Achse erfolgt"
 
-#: appEditors/FlatCAMGeoEditor.py:1520
+#: appEditors/appGeoEditor.py:1520
 msgid "Geometry shape skew on Y axis canceled"
 msgstr "Geometrieformversatz auf Y-Achse erfolgt"
 
-#: appEditors/FlatCAMGeoEditor.py:1950 appEditors/FlatCAMGeoEditor.py:2021
+#: appEditors/appGeoEditor.py:1950 appEditors/appGeoEditor.py:2021
 #: appEditors/FlatCAMGrbEditor.py:1444 appEditors/FlatCAMGrbEditor.py:1522
 msgid "Click on Center point ..."
 msgstr "Klicken Sie auf Mittelpunkt."
 
-#: appEditors/FlatCAMGeoEditor.py:1963 appEditors/FlatCAMGrbEditor.py:1454
+#: appEditors/appGeoEditor.py:1963 appEditors/FlatCAMGrbEditor.py:1454
 msgid "Click on Perimeter point to complete ..."
 msgstr "Klicken Sie auf Umfangspunkt, um den Vorgang abzuschließen."
 
-#: appEditors/FlatCAMGeoEditor.py:1995
+#: appEditors/appGeoEditor.py:1995
 msgid "Done. Adding Circle completed."
 msgstr "Erledigt. Hinzufügen des Kreises abgeschlossen."
 
-#: appEditors/FlatCAMGeoEditor.py:2049 appEditors/FlatCAMGrbEditor.py:1555
+#: appEditors/appGeoEditor.py:2049 appEditors/FlatCAMGrbEditor.py:1555
 msgid "Click on Start point ..."
 msgstr "Klicken Sie auf Startpunkt ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2051 appEditors/FlatCAMGrbEditor.py:1557
+#: appEditors/appGeoEditor.py:2051 appEditors/FlatCAMGrbEditor.py:1557
 msgid "Click on Point3 ..."
 msgstr "Klicken Sie auf Punkt3 ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2053 appEditors/FlatCAMGrbEditor.py:1559
+#: appEditors/appGeoEditor.py:2053 appEditors/FlatCAMGrbEditor.py:1559
 msgid "Click on Stop point ..."
 msgstr "Klicken Sie auf Haltepunkt ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2058 appEditors/FlatCAMGrbEditor.py:1564
+#: appEditors/appGeoEditor.py:2058 appEditors/FlatCAMGrbEditor.py:1564
 msgid "Click on Stop point to complete ..."
 msgstr "Klicken Sie auf Stopp, um den Vorgang abzuschließen."
 
-#: appEditors/FlatCAMGeoEditor.py:2060 appEditors/FlatCAMGrbEditor.py:1566
+#: appEditors/appGeoEditor.py:2060 appEditors/FlatCAMGrbEditor.py:1566
 msgid "Click on Point2 to complete ..."
 msgstr "Klicken Sie auf Punkt2, um den Vorgang abzuschließen."
 
-#: appEditors/FlatCAMGeoEditor.py:2062 appEditors/FlatCAMGrbEditor.py:1568
+#: appEditors/appGeoEditor.py:2062 appEditors/FlatCAMGrbEditor.py:1568
 msgid "Click on Center point to complete ..."
 msgstr "Klicken Sie auf Mittelpunkt, um den Vorgang abzuschließen."
 
-#: appEditors/FlatCAMGeoEditor.py:2074
+#: appEditors/appGeoEditor.py:2074
 #, python-format
 msgid "Direction: %s"
 msgstr "Richtung: %s"
 
-#: appEditors/FlatCAMGeoEditor.py:2088 appEditors/FlatCAMGrbEditor.py:1594
+#: appEditors/appGeoEditor.py:2088 appEditors/FlatCAMGrbEditor.py:1594
 msgid "Mode: Start -> Stop -> Center. Click on Start point ..."
 msgstr "Modus: Start -> Stopp -> Zentrieren. Klicken Sie auf Startpunkt ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2091 appEditors/FlatCAMGrbEditor.py:1597
+#: appEditors/appGeoEditor.py:2091 appEditors/FlatCAMGrbEditor.py:1597
 msgid "Mode: Point1 -> Point3 -> Point2. Click on Point1 ..."
 msgstr "Modus: Punkt 1 -> Punkt 3 -> Punkt 2. Klicken Sie auf Punkt1 ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2094 appEditors/FlatCAMGrbEditor.py:1600
+#: appEditors/appGeoEditor.py:2094 appEditors/FlatCAMGrbEditor.py:1600
 msgid "Mode: Center -> Start -> Stop. Click on Center point ..."
 msgstr "Modus: Mitte -> Start -> Stopp. Klicken Sie auf Mittelpunkt."
 
-#: appEditors/FlatCAMGeoEditor.py:2235
+#: appEditors/appGeoEditor.py:2235
 msgid "Done. Arc completed."
 msgstr "Erledigt. Arc abgeschlossen."
 
-#: appEditors/FlatCAMGeoEditor.py:2266 appEditors/FlatCAMGeoEditor.py:2339
+#: appEditors/appGeoEditor.py:2266 appEditors/appGeoEditor.py:2339
 msgid "Click on 1st corner ..."
 msgstr "Klicken Sie auf die 1. Ecke ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2278
+#: appEditors/appGeoEditor.py:2278
 msgid "Click on opposite corner to complete ..."
 msgstr ""
 "Klicken Sie auf die gegenüberliegende Ecke, um den Vorgang abzuschließen."
 
-#: appEditors/FlatCAMGeoEditor.py:2308
+#: appEditors/appGeoEditor.py:2308
 msgid "Done. Rectangle completed."
 msgstr "Erledigt. Rechteck fertiggestellt."
 
-#: appEditors/FlatCAMGeoEditor.py:2383
+#: appEditors/appGeoEditor.py:2383
 msgid "Done. Polygon completed."
 msgstr "Erledigt. Polygon fertiggestellt."
 
-#: appEditors/FlatCAMGeoEditor.py:2397 appEditors/FlatCAMGeoEditor.py:2462
+#: appEditors/appGeoEditor.py:2397 appEditors/appGeoEditor.py:2462
 #: appEditors/FlatCAMGrbEditor.py:1102 appEditors/FlatCAMGrbEditor.py:1322
 msgid "Backtracked one point ..."
 msgstr "Einen Punkt zurückverfolgt ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2440
+#: appEditors/appGeoEditor.py:2440
 msgid "Done. Path completed."
 msgstr "Getan. Pfad abgeschlossen."
 
-#: appEditors/FlatCAMGeoEditor.py:2599
+#: appEditors/appGeoEditor.py:2599
 msgid "No shape selected. Select a shape to explode"
 msgstr "Keine Form ausgewählt. Wählen Sie eine Form zum Auflösen aus"
 
-#: appEditors/FlatCAMGeoEditor.py:2632
+#: appEditors/appGeoEditor.py:2632
 msgid "Done. Polygons exploded into lines."
 msgstr "Getan. Polygone explodierten in Linien."
 
-#: appEditors/FlatCAMGeoEditor.py:2664
+#: appEditors/appGeoEditor.py:2664
 msgid "MOVE: No shape selected. Select a shape to move"
 msgstr "Bewegen: Keine Form ausgewählt. Wähle eine Form zum Bewegen aus"
 
-#: appEditors/FlatCAMGeoEditor.py:2667 appEditors/FlatCAMGeoEditor.py:2687
+#: appEditors/appGeoEditor.py:2667 appEditors/appGeoEditor.py:2687
 msgid " MOVE: Click on reference point ..."
 msgstr " Bewegen: Referenzpunkt anklicken ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2672
+#: appEditors/appGeoEditor.py:2672
 msgid " Click on destination point ..."
 msgstr " Klicken Sie auf den Zielpunkt ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2712
+#: appEditors/appGeoEditor.py:2712
 msgid "Done. Geometry(s) Move completed."
 msgstr "Erledigt. Geometrie(n) Bewegung abgeschlossen."
 
-#: appEditors/FlatCAMGeoEditor.py:2845
+#: appEditors/appGeoEditor.py:2845
 msgid "Done. Geometry(s) Copy completed."
 msgstr "Erledigt. Geometrie(n) Kopieren abgeschlossen."
 
-#: appEditors/FlatCAMGeoEditor.py:2876 appEditors/FlatCAMGrbEditor.py:897
+#: appEditors/appGeoEditor.py:2876 appEditors/FlatCAMGrbEditor.py:897
 msgid "Click on 1st point ..."
 msgstr "Klicken Sie auf den 1. Punkt ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2900
+#: appEditors/appGeoEditor.py:2900
 msgid ""
 "Font not supported. Only Regular, Bold, Italic and BoldItalic are supported. "
 "Error"
@@ -2724,83 +2724,83 @@ msgstr ""
 "Schrift wird nicht unterstützt. Es werden nur Regular, Bold, Italic und "
 "BoldItalic unterstützt. Error"
 
-#: appEditors/FlatCAMGeoEditor.py:2908
+#: appEditors/appGeoEditor.py:2908
 msgid "No text to add."
 msgstr "Kein Text zum Hinzufügen."
 
-#: appEditors/FlatCAMGeoEditor.py:2918
+#: appEditors/appGeoEditor.py:2918
 msgid " Done. Adding Text completed."
 msgstr " Erledigt. Hinzufügen von Text abgeschlossen."
 
-#: appEditors/FlatCAMGeoEditor.py:2955
+#: appEditors/appGeoEditor.py:2955
 msgid "Create buffer geometry ..."
 msgstr "Puffergeometrie erstellen ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2990 appEditors/FlatCAMGrbEditor.py:5153
+#: appEditors/appGeoEditor.py:2990 appEditors/FlatCAMGrbEditor.py:5153
 msgid "Done. Buffer Tool completed."
 msgstr "Erledigt. Pufferwerkzeug abgeschlossen."
 
-#: appEditors/FlatCAMGeoEditor.py:3018
+#: appEditors/appGeoEditor.py:3018
 msgid "Done. Buffer Int Tool completed."
 msgstr "Erledigt. Innenpufferwerkzeug abgeschlossen."
 
-#: appEditors/FlatCAMGeoEditor.py:3046
+#: appEditors/appGeoEditor.py:3046
 msgid "Done. Buffer Ext Tool completed."
 msgstr "Erledigt. Außenpufferwerkzeug abgeschlossen."
 
-#: appEditors/FlatCAMGeoEditor.py:3095 appEditors/FlatCAMGrbEditor.py:2160
+#: appEditors/appGeoEditor.py:3095 appEditors/FlatCAMGrbEditor.py:2160
 msgid "Select a shape to act as deletion area ..."
 msgstr "Wählen Sie eine Form als Löschbereich aus ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3097 appEditors/FlatCAMGeoEditor.py:3123
-#: appEditors/FlatCAMGeoEditor.py:3129 appEditors/FlatCAMGrbEditor.py:2162
+#: appEditors/appGeoEditor.py:3097 appEditors/appGeoEditor.py:3123
+#: appEditors/appGeoEditor.py:3129 appEditors/FlatCAMGrbEditor.py:2162
 msgid "Click to pick-up the erase shape..."
 msgstr "Klicken Sie, um die Löschform aufzunehmen ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3133 appEditors/FlatCAMGrbEditor.py:2221
+#: appEditors/appGeoEditor.py:3133 appEditors/FlatCAMGrbEditor.py:2221
 msgid "Click to erase ..."
 msgstr "Klicken zum Löschen ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3162 appEditors/FlatCAMGrbEditor.py:2254
+#: appEditors/appGeoEditor.py:3162 appEditors/FlatCAMGrbEditor.py:2254
 msgid "Done. Eraser tool action completed."
 msgstr "Erledigt. Radiergummi-Aktion abgeschlossen."
 
-#: appEditors/FlatCAMGeoEditor.py:3212
+#: appEditors/appGeoEditor.py:3212
 msgid "Create Paint geometry ..."
 msgstr "Malen geometrie erstellen ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3225 appEditors/FlatCAMGrbEditor.py:2417
+#: appEditors/appGeoEditor.py:3225 appEditors/FlatCAMGrbEditor.py:2417
 msgid "Shape transformations ..."
 msgstr "Formtransformationen ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3281
+#: appEditors/appGeoEditor.py:3281
 #: appGUI/preferences/geometry/GeometryEditorPrefGroupUI.py:27
 msgid "Geometry Editor"
 msgstr "Geo-Editor"
 
-#: appEditors/FlatCAMGeoEditor.py:3287 appEditors/FlatCAMGrbEditor.py:2495
+#: appEditors/appGeoEditor.py:3287 appEditors/FlatCAMGrbEditor.py:2495
 #: appEditors/FlatCAMGrbEditor.py:3951 appGUI/ObjectUI.py:282
 #: appGUI/ObjectUI.py:1394 appGUI/ObjectUI.py:2256 appTools/ToolCutOut.py:95
 #: appTools/ToolTransform.py:92
 msgid "Type"
 msgstr "Typ"
 
-#: appEditors/FlatCAMGeoEditor.py:3287 appGUI/ObjectUI.py:221
+#: appEditors/appGeoEditor.py:3287 appGUI/ObjectUI.py:221
 #: appGUI/ObjectUI.py:521 appGUI/ObjectUI.py:1330 appGUI/ObjectUI.py:2165
 #: appGUI/ObjectUI.py:2469 appGUI/ObjectUI.py:2536
 #: appTools/ToolCalibration.py:234 appTools/ToolFiducials.py:70
 msgid "Name"
 msgstr "Name"
 
-#: appEditors/FlatCAMGeoEditor.py:3539
+#: appEditors/appGeoEditor.py:3539
 msgid "Ring"
 msgstr "Ring"
 
-#: appEditors/FlatCAMGeoEditor.py:3541
+#: appEditors/appGeoEditor.py:3541
 msgid "Line"
 msgstr "Linie"
 
-#: appEditors/FlatCAMGeoEditor.py:3543 appGUI/MainGUI.py:1446
+#: appEditors/appGeoEditor.py:3543 appGUI/MainGUI.py:1446
 #: appGUI/ObjectUI.py:1150 appGUI/ObjectUI.py:2005
 #: appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py:226
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:299
@@ -2811,47 +2811,47 @@ msgstr "Linie"
 msgid "Polygon"
 msgstr "Polygon"
 
-#: appEditors/FlatCAMGeoEditor.py:3545
+#: appEditors/appGeoEditor.py:3545
 msgid "Multi-Line"
 msgstr "Mehrzeilig"
 
-#: appEditors/FlatCAMGeoEditor.py:3547
+#: appEditors/appGeoEditor.py:3547
 msgid "Multi-Polygon"
 msgstr "Multi-Polygon"
 
-#: appEditors/FlatCAMGeoEditor.py:3554
+#: appEditors/appGeoEditor.py:3554
 msgid "Geo Elem"
 msgstr "Geoelement"
 
-#: appEditors/FlatCAMGeoEditor.py:4007
+#: appEditors/appGeoEditor.py:4007
 msgid "Editing MultiGeo Geometry, tool"
 msgstr "Bearbeiten von MultiGeo Geometry, Werkzeug"
 
-#: appEditors/FlatCAMGeoEditor.py:4009
+#: appEditors/appGeoEditor.py:4009
 msgid "with diameter"
 msgstr "mit Durchmesser"
 
-#: appEditors/FlatCAMGeoEditor.py:4081
+#: appEditors/appGeoEditor.py:4081
 msgid "Grid Snap enabled."
 msgstr "Rasterfang aktiviert."
 
-#: appEditors/FlatCAMGeoEditor.py:4085
+#: appEditors/appGeoEditor.py:4085
 msgid "Grid Snap disabled."
 msgstr "Rasterfang deaktiviert."
 
-#: appEditors/FlatCAMGeoEditor.py:4446 appGUI/MainGUI.py:3046
+#: appEditors/appGeoEditor.py:4446 appGUI/MainGUI.py:3046
 #: appGUI/MainGUI.py:3092 appGUI/MainGUI.py:3110 appGUI/MainGUI.py:3254
 #: appGUI/MainGUI.py:3293 appGUI/MainGUI.py:3305 appGUI/MainGUI.py:3322
 msgid "Click on target point."
 msgstr "Klicken Sie auf den Zielpunkt."
 
-#: appEditors/FlatCAMGeoEditor.py:4762 appEditors/FlatCAMGeoEditor.py:4797
+#: appEditors/appGeoEditor.py:4762 appEditors/appGeoEditor.py:4797
 msgid "A selection of at least 2 geo items is required to do Intersection."
 msgstr ""
 "Eine Auswahl von mindestens 2 Geo-Elementen ist erforderlich, um die "
 "Kreuzung durchzuführen."
 
-#: appEditors/FlatCAMGeoEditor.py:4883 appEditors/FlatCAMGeoEditor.py:4987
+#: appEditors/appGeoEditor.py:4883 appEditors/appGeoEditor.py:4987
 msgid ""
 "Negative buffer value is not accepted. Use Buffer interior to generate an "
 "'inside' shape"
@@ -2859,56 +2859,56 @@ msgstr ""
 "Negativer Pufferwert wird nicht akzeptiert. Verwenden Sie den "
 "Pufferinnenraum, um eine Innenform zu erzeugen"
 
-#: appEditors/FlatCAMGeoEditor.py:4893 appEditors/FlatCAMGeoEditor.py:4946
-#: appEditors/FlatCAMGeoEditor.py:4996
+#: appEditors/appGeoEditor.py:4893 appEditors/appGeoEditor.py:4946
+#: appEditors/appGeoEditor.py:4996
 msgid "Nothing selected for buffering."
 msgstr "Nichts ist für die Pufferung ausgewählt."
 
-#: appEditors/FlatCAMGeoEditor.py:4898 appEditors/FlatCAMGeoEditor.py:4950
-#: appEditors/FlatCAMGeoEditor.py:5001
+#: appEditors/appGeoEditor.py:4898 appEditors/appGeoEditor.py:4950
+#: appEditors/appGeoEditor.py:5001
 msgid "Invalid distance for buffering."
 msgstr "Ungültige Entfernung zum Puffern."
 
-#: appEditors/FlatCAMGeoEditor.py:4922 appEditors/FlatCAMGeoEditor.py:5021
+#: appEditors/appGeoEditor.py:4922 appEditors/appGeoEditor.py:5021
 msgid "Failed, the result is empty. Choose a different buffer value."
 msgstr ""
 "Fehlgeschlagen, das Ergebnis ist leer. Wählen Sie einen anderen Pufferwert."
 
-#: appEditors/FlatCAMGeoEditor.py:4933
+#: appEditors/appGeoEditor.py:4933
 msgid "Full buffer geometry created."
 msgstr "Volle Puffergeometrie erstellt."
 
-#: appEditors/FlatCAMGeoEditor.py:4939
+#: appEditors/appGeoEditor.py:4939
 msgid "Negative buffer value is not accepted."
 msgstr "Negativer Pufferwert wird nicht akzeptiert."
 
-#: appEditors/FlatCAMGeoEditor.py:4970
+#: appEditors/appGeoEditor.py:4970
 msgid "Failed, the result is empty. Choose a smaller buffer value."
 msgstr ""
 "Fehlgeschlagen, das Ergebnis ist leer. Wählen Sie einen kleineren Pufferwert."
 
-#: appEditors/FlatCAMGeoEditor.py:4980
+#: appEditors/appGeoEditor.py:4980
 msgid "Interior buffer geometry created."
 msgstr "Innere Puffergeometrie erstellt."
 
-#: appEditors/FlatCAMGeoEditor.py:5031
+#: appEditors/appGeoEditor.py:5031
 msgid "Exterior buffer geometry created."
 msgstr "Außenpuffergeometrie erstellt."
 
-#: appEditors/FlatCAMGeoEditor.py:5037
+#: appEditors/appGeoEditor.py:5037
 #, python-format
 msgid "Could not do Paint. Overlap value has to be less than 100%%."
 msgstr "Konnte nicht Malen. Der Überlappungswert muss kleiner als 100 %% sein."
 
-#: appEditors/FlatCAMGeoEditor.py:5044
+#: appEditors/appGeoEditor.py:5044
 msgid "Nothing selected for painting."
 msgstr "Nichts zum Malen ausgewählt."
 
-#: appEditors/FlatCAMGeoEditor.py:5050
+#: appEditors/appGeoEditor.py:5050
 msgid "Invalid value for"
 msgstr "Ungültiger Wert für"
 
-#: appEditors/FlatCAMGeoEditor.py:5109
+#: appEditors/appGeoEditor.py:5109
 msgid ""
 "Could not do Paint. Try a different combination of parameters. Or a "
 "different method of Paint"
@@ -2916,7 +2916,7 @@ msgstr ""
 "Konnte nicht malen. Probieren Sie eine andere Kombination von Parametern "
 "aus. Oder eine andere Malmethode"
 
-#: appEditors/FlatCAMGeoEditor.py:5120
+#: appEditors/appGeoEditor.py:5120
 msgid "Paint done."
 msgstr "Malen fertig."
 
diff --git a/locale/en/LC_MESSAGES/strings.po b/locale/en/LC_MESSAGES/strings.po
index a3b38486..6fcd2807 100644
--- a/locale/en/LC_MESSAGES/strings.po
+++ b/locale/en/LC_MESSAGES/strings.po
@@ -174,7 +174,7 @@ msgstr "Click the end point of the area."
 msgid "Zone added. Click to start adding next zone or right click to finish."
 msgstr "Zone added. Click to start adding next zone or right click to finish."
 
-#: Common.py:322 appEditors/FlatCAMGeoEditor.py:2352
+#: Common.py:322 appEditors/appGeoEditor.py:2352
 #: appTools/ToolIsolation.py:2584 appTools/ToolNCC.py:1754
 #: appTools/ToolPaint.py:1647
 msgid "Click on next Point or click right mouse button to complete ..."
@@ -885,7 +885,7 @@ msgid "Conventional"
 msgstr "Conventional"
 
 #: appDatabase.py:1456 appDatabase.py:1565 appDatabase.py:1667
-#: appEditors/FlatCAMGeoEditor.py:450
+#: appEditors/appGeoEditor.py:450
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:167
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:182
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:163
@@ -913,7 +913,7 @@ msgstr ""
 "Higher values = slow processing and slow execution on CNC\n"
 "due of too many paths."
 
-#: appDatabase.py:1477 appDatabase.py:1586 appEditors/FlatCAMGeoEditor.py:470
+#: appDatabase.py:1477 appDatabase.py:1586 appEditors/appGeoEditor.py:470
 #: appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py:72
 #: appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py:229
 #: appGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py:59
@@ -942,7 +942,7 @@ msgstr "Margin"
 msgid "Bounding box margin."
 msgstr "Bounding box margin."
 
-#: appDatabase.py:1490 appDatabase.py:1601 appEditors/FlatCAMGeoEditor.py:484
+#: appDatabase.py:1490 appDatabase.py:1601 appEditors/appGeoEditor.py:484
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:105
 #: appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py:106
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:215
@@ -965,7 +965,7 @@ msgstr ""
 "- Seed-based: Outwards from seed.\n"
 "- Line-based: Parallel lines."
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2232 appTools/ToolNCC.py:2764
@@ -975,8 +975,8 @@ msgstr ""
 msgid "Standard"
 msgstr "Standard"
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
-#: appEditors/FlatCAMGeoEditor.py:568 appEditors/FlatCAMGeoEditor.py:5091
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
+#: appEditors/appGeoEditor.py:568 appEditors/appGeoEditor.py:5091
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2243 appTools/ToolNCC.py:2770
@@ -987,8 +987,8 @@ msgstr "Standard"
 msgid "Seed"
 msgstr "Seed"
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
-#: appEditors/FlatCAMGeoEditor.py:5095
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
+#: appEditors/appGeoEditor.py:5095
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2254 appTools/ToolPaint.py:389
@@ -1012,7 +1012,7 @@ msgstr "Combo"
 msgid "Connect"
 msgstr "Connect"
 
-#: appDatabase.py:1512 appDatabase.py:1629 appEditors/FlatCAMGeoEditor.py:507
+#: appDatabase.py:1512 appDatabase.py:1629 appEditors/appGeoEditor.py:507
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:239
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:226
 #: appTools/ToolNCC.py:443 appTools/ToolPaint.py:403
@@ -1030,7 +1030,7 @@ msgstr ""
 msgid "Contour"
 msgstr "Contour"
 
-#: appDatabase.py:1522 appDatabase.py:1636 appEditors/FlatCAMGeoEditor.py:517
+#: appDatabase.py:1522 appDatabase.py:1636 appEditors/appGeoEditor.py:517
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:248
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:234
 #: appTools/ToolNCC.py:453 appTools/ToolPaint.py:410
@@ -1041,7 +1041,7 @@ msgstr ""
 "Cut around the perimeter of the polygon\n"
 "to trim rough edges."
 
-#: appDatabase.py:1528 appEditors/FlatCAMGeoEditor.py:611
+#: appDatabase.py:1528 appEditors/appGeoEditor.py:611
 #: appEditors/FlatCAMGrbEditor.py:5304 appGUI/ObjectUI.py:143
 #: appGUI/ObjectUI.py:1394 appGUI/ObjectUI.py:2256
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:255
@@ -1064,7 +1064,7 @@ msgstr ""
 "from the copper features.\n"
 "The value can be between 0 and 10 FlatCAM units."
 
-#: appDatabase.py:1567 appEditors/FlatCAMGeoEditor.py:452
+#: appDatabase.py:1567 appEditors/appGeoEditor.py:452
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:165
 #: appTools/ToolPaint.py:330
 msgid ""
@@ -1084,7 +1084,7 @@ msgstr ""
 "Higher values = slow processing and slow execution on CNC\n"
 "due of too many paths."
 
-#: appDatabase.py:1588 appEditors/FlatCAMGeoEditor.py:472
+#: appDatabase.py:1588 appEditors/appGeoEditor.py:472
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:185
 #: appTools/ToolPaint.py:351
 msgid ""
@@ -1534,7 +1534,7 @@ msgstr "Y"
 #: appEditors/FlatCAMExcEditor.py:1800 appEditors/FlatCAMExcEditor.py:1871
 #: appEditors/FlatCAMExcEditor.py:1875 appEditors/FlatCAMExcEditor.py:1964
 #: appEditors/FlatCAMExcEditor.py:1982 appEditors/FlatCAMExcEditor.py:2016
-#: appEditors/FlatCAMGeoEditor.py:683 appEditors/FlatCAMGrbEditor.py:2822
+#: appEditors/appGeoEditor.py:683 appEditors/FlatCAMGrbEditor.py:2822
 #: appEditors/FlatCAMGrbEditor.py:2839 appEditors/FlatCAMGrbEditor.py:2875
 #: appEditors/FlatCAMGrbEditor.py:5376
 #: appGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py:94
@@ -1757,7 +1757,7 @@ msgid "Cancelled. There is no Tool/Drill selected"
 msgstr "Cancelled. There is no Tool/Drill selected"
 
 #: appEditors/FlatCAMExcEditor.py:3601 appEditors/FlatCAMExcEditor.py:3609
-#: appEditors/FlatCAMGeoEditor.py:4286 appEditors/FlatCAMGeoEditor.py:4300
+#: appEditors/appGeoEditor.py:4286 appEditors/appGeoEditor.py:4300
 #: appEditors/FlatCAMGrbEditor.py:1085 appEditors/FlatCAMGrbEditor.py:1312
 #: appEditors/FlatCAMGrbEditor.py:1497 appEditors/FlatCAMGrbEditor.py:1766
 #: appEditors/FlatCAMGrbEditor.py:4608 appEditors/FlatCAMGrbEditor.py:4625
@@ -1776,15 +1776,15 @@ msgstr "Done. Drill(s) deleted."
 msgid "Click on the circular array Center position"
 msgstr "Click on the circular array Center position"
 
-#: appEditors/FlatCAMGeoEditor.py:84
+#: appEditors/appGeoEditor.py:84
 msgid "Buffer distance:"
 msgstr "Buffer distance:"
 
-#: appEditors/FlatCAMGeoEditor.py:85
+#: appEditors/appGeoEditor.py:85
 msgid "Buffer corner:"
 msgstr "Buffer corner:"
 
-#: appEditors/FlatCAMGeoEditor.py:87
+#: appEditors/appGeoEditor.py:87
 msgid ""
 "There are 3 types of corners:\n"
 " - 'Round': the corner is rounded for exterior buffer.\n"
@@ -1798,11 +1798,11 @@ msgstr ""
 " - 'Beveled': the corner is a line that directly connects the features "
 "meeting in the corner"
 
-#: appEditors/FlatCAMGeoEditor.py:93 appEditors/FlatCAMGrbEditor.py:2638
+#: appEditors/appGeoEditor.py:93 appEditors/FlatCAMGrbEditor.py:2638
 msgid "Round"
 msgstr "Round"
 
-#: appEditors/FlatCAMGeoEditor.py:94 appEditors/FlatCAMGrbEditor.py:2639
+#: appEditors/appGeoEditor.py:94 appEditors/FlatCAMGrbEditor.py:2639
 #: appGUI/ObjectUI.py:1149 appGUI/ObjectUI.py:2004
 #: appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py:225
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:68
@@ -1820,48 +1820,48 @@ msgstr "Round"
 msgid "Square"
 msgstr "Square"
 
-#: appEditors/FlatCAMGeoEditor.py:95 appEditors/FlatCAMGrbEditor.py:2640
+#: appEditors/appGeoEditor.py:95 appEditors/FlatCAMGrbEditor.py:2640
 msgid "Beveled"
 msgstr "Beveled"
 
-#: appEditors/FlatCAMGeoEditor.py:102
+#: appEditors/appGeoEditor.py:102
 msgid "Buffer Interior"
 msgstr "Buffer Interior"
 
-#: appEditors/FlatCAMGeoEditor.py:104
+#: appEditors/appGeoEditor.py:104
 msgid "Buffer Exterior"
 msgstr "Buffer Exterior"
 
-#: appEditors/FlatCAMGeoEditor.py:110
+#: appEditors/appGeoEditor.py:110
 msgid "Full Buffer"
 msgstr "Full Buffer"
 
-#: appEditors/FlatCAMGeoEditor.py:131 appEditors/FlatCAMGeoEditor.py:2959
+#: appEditors/appGeoEditor.py:131 appEditors/appGeoEditor.py:2959
 #: appGUI/MainGUI.py:4301
 #: appGUI/preferences/gerber/GerberEditorPrefGroupUI.py:191
 msgid "Buffer Tool"
 msgstr "Buffer Tool"
 
-#: appEditors/FlatCAMGeoEditor.py:143 appEditors/FlatCAMGeoEditor.py:160
-#: appEditors/FlatCAMGeoEditor.py:177 appEditors/FlatCAMGeoEditor.py:2978
-#: appEditors/FlatCAMGeoEditor.py:3006 appEditors/FlatCAMGeoEditor.py:3034
+#: appEditors/appGeoEditor.py:143 appEditors/appGeoEditor.py:160
+#: appEditors/appGeoEditor.py:177 appEditors/appGeoEditor.py:2978
+#: appEditors/appGeoEditor.py:3006 appEditors/appGeoEditor.py:3034
 #: appEditors/FlatCAMGrbEditor.py:5109
 msgid "Buffer distance value is missing or wrong format. Add it and retry."
 msgstr "Buffer distance value is missing or wrong format. Add it and retry."
 
-#: appEditors/FlatCAMGeoEditor.py:241
+#: appEditors/appGeoEditor.py:241
 msgid "Font"
 msgstr "Font"
 
-#: appEditors/FlatCAMGeoEditor.py:322 appGUI/MainGUI.py:1452
+#: appEditors/appGeoEditor.py:322 appGUI/MainGUI.py:1452
 msgid "Text"
 msgstr "Text"
 
-#: appEditors/FlatCAMGeoEditor.py:348
+#: appEditors/appGeoEditor.py:348
 msgid "Text Tool"
 msgstr "Text Tool"
 
-#: appEditors/FlatCAMGeoEditor.py:404 appGUI/MainGUI.py:502
+#: appEditors/appGeoEditor.py:404 appGUI/MainGUI.py:502
 #: appGUI/MainGUI.py:1199 appGUI/ObjectUI.py:597 appGUI/ObjectUI.py:1564
 #: appObjects/FlatCAMExcellon.py:852 appObjects/FlatCAMExcellon.py:1242
 #: appObjects/FlatCAMGeometry.py:825 appTools/ToolIsolation.py:313
@@ -1870,15 +1870,15 @@ msgstr "Text Tool"
 msgid "Tool"
 msgstr "Tool"
 
-#: appEditors/FlatCAMGeoEditor.py:438
+#: appEditors/appGeoEditor.py:438
 msgid "Tool dia"
 msgstr "Tool dia"
 
-#: appEditors/FlatCAMGeoEditor.py:440
+#: appEditors/appGeoEditor.py:440
 msgid "Diameter of the tool to be used in the operation."
 msgstr "Diameter of the tool to be used in the operation."
 
-#: appEditors/FlatCAMGeoEditor.py:486
+#: appEditors/appGeoEditor.py:486
 msgid ""
 "Algorithm to paint the polygons:\n"
 "- Standard: Fixed step inwards.\n"
@@ -1890,57 +1890,57 @@ msgstr ""
 "- Seed-based: Outwards from seed.\n"
 "- Line-based: Parallel lines."
 
-#: appEditors/FlatCAMGeoEditor.py:505
+#: appEditors/appGeoEditor.py:505
 msgid "Connect:"
 msgstr "Connect:"
 
-#: appEditors/FlatCAMGeoEditor.py:515
+#: appEditors/appGeoEditor.py:515
 msgid "Contour:"
 msgstr "Contour:"
 
-#: appEditors/FlatCAMGeoEditor.py:528 appGUI/MainGUI.py:1456
+#: appEditors/appGeoEditor.py:528 appGUI/MainGUI.py:1456
 msgid "Paint"
 msgstr "Paint"
 
-#: appEditors/FlatCAMGeoEditor.py:546 appGUI/MainGUI.py:912
+#: appEditors/appGeoEditor.py:546 appGUI/MainGUI.py:912
 #: appGUI/MainGUI.py:1944 appGUI/ObjectUI.py:2069 appTools/ToolPaint.py:42
 #: appTools/ToolPaint.py:737
 msgid "Paint Tool"
 msgstr "Paint Tool"
 
-#: appEditors/FlatCAMGeoEditor.py:582 appEditors/FlatCAMGeoEditor.py:1071
-#: appEditors/FlatCAMGeoEditor.py:2966 appEditors/FlatCAMGeoEditor.py:2994
-#: appEditors/FlatCAMGeoEditor.py:3022 appEditors/FlatCAMGeoEditor.py:4439
+#: appEditors/appGeoEditor.py:582 appEditors/appGeoEditor.py:1071
+#: appEditors/appGeoEditor.py:2966 appEditors/appGeoEditor.py:2994
+#: appEditors/appGeoEditor.py:3022 appEditors/appGeoEditor.py:4439
 #: appEditors/FlatCAMGrbEditor.py:5764
 msgid "Cancelled. No shape selected."
 msgstr "Cancelled. No shape selected."
 
-#: appEditors/FlatCAMGeoEditor.py:595 appEditors/FlatCAMGeoEditor.py:2984
-#: appEditors/FlatCAMGeoEditor.py:3012 appEditors/FlatCAMGeoEditor.py:3040
+#: appEditors/appGeoEditor.py:595 appEditors/appGeoEditor.py:2984
+#: appEditors/appGeoEditor.py:3012 appEditors/appGeoEditor.py:3040
 #: appGUI/preferences/geometry/GeometryGenPrefGroupUI.py:69
 #: appTools/ToolProperties.py:117 appTools/ToolProperties.py:162
 msgid "Tools"
 msgstr "Tools"
 
-#: appEditors/FlatCAMGeoEditor.py:606 appEditors/FlatCAMGeoEditor.py:1035
+#: appEditors/appGeoEditor.py:606 appEditors/appGeoEditor.py:1035
 #: appEditors/FlatCAMGrbEditor.py:5299 appEditors/FlatCAMGrbEditor.py:5728
 #: appGUI/MainGUI.py:935 appGUI/MainGUI.py:1967 appTools/ToolTransform.py:494
 msgid "Transform Tool"
 msgstr "Transform Tool"
 
-#: appEditors/FlatCAMGeoEditor.py:607 appEditors/FlatCAMGeoEditor.py:699
+#: appEditors/appGeoEditor.py:607 appEditors/appGeoEditor.py:699
 #: appEditors/FlatCAMGrbEditor.py:5300 appEditors/FlatCAMGrbEditor.py:5392
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:88
 #: appTools/ToolTransform.py:27 appTools/ToolTransform.py:146
 msgid "Rotate"
 msgstr "Rotate"
 
-#: appEditors/FlatCAMGeoEditor.py:608 appEditors/FlatCAMGrbEditor.py:5301
+#: appEditors/appGeoEditor.py:608 appEditors/FlatCAMGrbEditor.py:5301
 #: appTools/ToolTransform.py:28
 msgid "Skew/Shear"
 msgstr "Skew/Shear"
 
-#: appEditors/FlatCAMGeoEditor.py:609 appEditors/FlatCAMGrbEditor.py:2687
+#: appEditors/appGeoEditor.py:609 appEditors/FlatCAMGrbEditor.py:2687
 #: appEditors/FlatCAMGrbEditor.py:5302 appGUI/MainGUI.py:1057
 #: appGUI/MainGUI.py:1499 appGUI/MainGUI.py:2089 appGUI/MainGUI.py:4513
 #: appGUI/ObjectUI.py:125
@@ -1949,12 +1949,12 @@ msgstr "Skew/Shear"
 msgid "Scale"
 msgstr "Scale"
 
-#: appEditors/FlatCAMGeoEditor.py:610 appEditors/FlatCAMGrbEditor.py:5303
+#: appEditors/appGeoEditor.py:610 appEditors/FlatCAMGrbEditor.py:5303
 #: appTools/ToolTransform.py:30
 msgid "Mirror (Flip)"
 msgstr "Mirror (Flip)"
 
-#: appEditors/FlatCAMGeoEditor.py:612 appEditors/FlatCAMGrbEditor.py:2647
+#: appEditors/appGeoEditor.py:612 appEditors/FlatCAMGrbEditor.py:2647
 #: appEditors/FlatCAMGrbEditor.py:5305 appGUI/MainGUI.py:1055
 #: appGUI/MainGUI.py:1454 appGUI/MainGUI.py:1497 appGUI/MainGUI.py:2087
 #: appGUI/MainGUI.py:4511
@@ -1963,7 +1963,7 @@ msgstr "Mirror (Flip)"
 msgid "Buffer"
 msgstr "Buffer"
 
-#: appEditors/FlatCAMGeoEditor.py:643 appEditors/FlatCAMGrbEditor.py:5336
+#: appEditors/appGeoEditor.py:643 appEditors/FlatCAMGrbEditor.py:5336
 #: appGUI/GUIElements.py:2701
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:169
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:44
@@ -1972,7 +1972,7 @@ msgstr "Buffer"
 msgid "Reference"
 msgstr "Reference"
 
-#: appEditors/FlatCAMGeoEditor.py:645 appEditors/FlatCAMGrbEditor.py:5338
+#: appEditors/appGeoEditor.py:645 appEditors/FlatCAMGrbEditor.py:5338
 msgid ""
 "The reference point for Rotate, Skew, Scale, Mirror.\n"
 "Can be:\n"
@@ -1990,14 +1990,14 @@ msgstr ""
 "- Min Selection -> the point (minx, miny) of the bounding box of the "
 "selection"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
 #: appTools/ToolCalibration.py:770 appTools/ToolCalibration.py:771
 #: appTools/ToolTransform.py:70
 msgid "Origin"
 msgstr "Origin"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGeoEditor.py:1044
+#: appEditors/appGeoEditor.py:653 appEditors/appGeoEditor.py:1044
 #: appEditors/FlatCAMGrbEditor.py:5346 appEditors/FlatCAMGrbEditor.py:5737
 #: appGUI/preferences/general/GeneralGUIPrefGroupUI.py:250
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:275
@@ -2009,7 +2009,7 @@ msgstr "Origin"
 msgid "Selection"
 msgstr "Selection"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 #: appGUI/preferences/tools/Tools2sidedPrefGroupUI.py:80
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:60
@@ -2017,11 +2017,11 @@ msgstr "Selection"
 msgid "Point"
 msgstr "Point"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 msgid "Minimum"
 msgstr "Minimum"
 
-#: appEditors/FlatCAMGeoEditor.py:659 appEditors/FlatCAMGeoEditor.py:955
+#: appEditors/appGeoEditor.py:659 appEditors/appGeoEditor.py:955
 #: appEditors/FlatCAMGrbEditor.py:5352 appEditors/FlatCAMGrbEditor.py:5648
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:131
 #: appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py:133
@@ -2032,13 +2032,13 @@ msgstr "Minimum"
 msgid "Value"
 msgstr "Value"
 
-#: appEditors/FlatCAMGeoEditor.py:661 appEditors/FlatCAMGrbEditor.py:5354
+#: appEditors/appGeoEditor.py:661 appEditors/FlatCAMGrbEditor.py:5354
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:62
 #: appTools/ToolTransform.py:78
 msgid "A point of reference in format X,Y."
 msgstr "A point of reference in format X,Y."
 
-#: appEditors/FlatCAMGeoEditor.py:668 appEditors/FlatCAMGrbEditor.py:2590
+#: appEditors/appGeoEditor.py:668 appEditors/FlatCAMGrbEditor.py:2590
 #: appEditors/FlatCAMGrbEditor.py:5361 appGUI/ObjectUI.py:1494
 #: appTools/ToolDblSided.py:192 appTools/ToolDblSided.py:425
 #: appTools/ToolIsolation.py:276 appTools/ToolIsolation.py:631
@@ -2049,12 +2049,12 @@ msgstr "A point of reference in format X,Y."
 msgid "Add"
 msgstr "Add"
 
-#: appEditors/FlatCAMGeoEditor.py:670 appEditors/FlatCAMGrbEditor.py:5363
+#: appEditors/appGeoEditor.py:670 appEditors/FlatCAMGrbEditor.py:5363
 #: appTools/ToolTransform.py:87
 msgid "Add point coordinates from clipboard."
 msgstr "Add point coordinates from clipboard."
 
-#: appEditors/FlatCAMGeoEditor.py:685 appEditors/FlatCAMGrbEditor.py:5378
+#: appEditors/appGeoEditor.py:685 appEditors/FlatCAMGrbEditor.py:5378
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:98
 #: appTools/ToolTransform.py:132
 msgid ""
@@ -2068,7 +2068,7 @@ msgstr ""
 "Positive numbers for CW motion.\n"
 "Negative numbers for CCW motion."
 
-#: appEditors/FlatCAMGeoEditor.py:701 appEditors/FlatCAMGrbEditor.py:5394
+#: appEditors/appGeoEditor.py:701 appEditors/FlatCAMGrbEditor.py:5394
 #: appTools/ToolTransform.py:148
 msgid ""
 "Rotate the selected object(s).\n"
@@ -2079,7 +2079,7 @@ msgstr ""
 "The point of reference is the middle of\n"
 "the bounding box for all selected objects."
 
-#: appEditors/FlatCAMGeoEditor.py:721 appEditors/FlatCAMGeoEditor.py:783
+#: appEditors/appGeoEditor.py:721 appEditors/appGeoEditor.py:783
 #: appEditors/FlatCAMGrbEditor.py:5414 appEditors/FlatCAMGrbEditor.py:5476
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:112
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:151
@@ -2087,7 +2087,7 @@ msgstr ""
 msgid "Link"
 msgstr "Link"
 
-#: appEditors/FlatCAMGeoEditor.py:723 appEditors/FlatCAMGeoEditor.py:785
+#: appEditors/appGeoEditor.py:723 appEditors/appGeoEditor.py:785
 #: appEditors/FlatCAMGrbEditor.py:5416 appEditors/FlatCAMGrbEditor.py:5478
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:114
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:153
@@ -2095,14 +2095,14 @@ msgstr "Link"
 msgid "Link the Y entry to X entry and copy its content."
 msgstr "Link the Y entry to X entry and copy its content."
 
-#: appEditors/FlatCAMGeoEditor.py:728 appEditors/FlatCAMGrbEditor.py:5421
+#: appEditors/appGeoEditor.py:728 appEditors/FlatCAMGrbEditor.py:5421
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:151
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:124
 #: appTools/ToolFilm.py:184 appTools/ToolTransform.py:175
 msgid "X angle"
 msgstr "X angle"
 
-#: appEditors/FlatCAMGeoEditor.py:730 appEditors/FlatCAMGeoEditor.py:751
+#: appEditors/appGeoEditor.py:730 appEditors/appGeoEditor.py:751
 #: appEditors/FlatCAMGrbEditor.py:5423 appEditors/FlatCAMGrbEditor.py:5444
 #: appTools/ToolTransform.py:177 appTools/ToolTransform.py:198
 msgid ""
@@ -2112,12 +2112,12 @@ msgstr ""
 "Angle for Skew action, in degrees.\n"
 "Float number between -360 and 360."
 
-#: appEditors/FlatCAMGeoEditor.py:738 appEditors/FlatCAMGrbEditor.py:5431
+#: appEditors/appGeoEditor.py:738 appEditors/FlatCAMGrbEditor.py:5431
 #: appTools/ToolTransform.py:185
 msgid "Skew X"
 msgstr "Skew X"
 
-#: appEditors/FlatCAMGeoEditor.py:740 appEditors/FlatCAMGeoEditor.py:761
+#: appEditors/appGeoEditor.py:740 appEditors/appGeoEditor.py:761
 #: appEditors/FlatCAMGrbEditor.py:5433 appEditors/FlatCAMGrbEditor.py:5454
 #: appTools/ToolTransform.py:187 appTools/ToolTransform.py:208
 msgid ""
@@ -2129,37 +2129,37 @@ msgstr ""
 "The point of reference is the middle of\n"
 "the bounding box for all selected objects."
 
-#: appEditors/FlatCAMGeoEditor.py:749 appEditors/FlatCAMGrbEditor.py:5442
+#: appEditors/appGeoEditor.py:749 appEditors/FlatCAMGrbEditor.py:5442
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:160
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:138
 #: appTools/ToolFilm.py:193 appTools/ToolTransform.py:196
 msgid "Y angle"
 msgstr "Y angle"
 
-#: appEditors/FlatCAMGeoEditor.py:759 appEditors/FlatCAMGrbEditor.py:5452
+#: appEditors/appGeoEditor.py:759 appEditors/FlatCAMGrbEditor.py:5452
 #: appTools/ToolTransform.py:206
 msgid "Skew Y"
 msgstr "Skew Y"
 
-#: appEditors/FlatCAMGeoEditor.py:790 appEditors/FlatCAMGrbEditor.py:5483
+#: appEditors/appGeoEditor.py:790 appEditors/FlatCAMGrbEditor.py:5483
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:120
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:162
 #: appTools/ToolFilm.py:145 appTools/ToolTransform.py:237
 msgid "X factor"
 msgstr "X factor"
 
-#: appEditors/FlatCAMGeoEditor.py:792 appEditors/FlatCAMGrbEditor.py:5485
+#: appEditors/appGeoEditor.py:792 appEditors/FlatCAMGrbEditor.py:5485
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:164
 #: appTools/ToolTransform.py:239
 msgid "Factor for scaling on X axis."
 msgstr "Factor for scaling on X axis."
 
-#: appEditors/FlatCAMGeoEditor.py:799 appEditors/FlatCAMGrbEditor.py:5492
+#: appEditors/appGeoEditor.py:799 appEditors/FlatCAMGrbEditor.py:5492
 #: appTools/ToolTransform.py:246
 msgid "Scale X"
 msgstr "Scale X"
 
-#: appEditors/FlatCAMGeoEditor.py:801 appEditors/FlatCAMGeoEditor.py:821
+#: appEditors/appGeoEditor.py:801 appEditors/appGeoEditor.py:821
 #: appEditors/FlatCAMGrbEditor.py:5494 appEditors/FlatCAMGrbEditor.py:5514
 #: appTools/ToolTransform.py:248 appTools/ToolTransform.py:268
 msgid ""
@@ -2171,58 +2171,58 @@ msgstr ""
 "The point of reference depends on \n"
 "the Scale reference checkbox state."
 
-#: appEditors/FlatCAMGeoEditor.py:810 appEditors/FlatCAMGrbEditor.py:5503
+#: appEditors/appGeoEditor.py:810 appEditors/FlatCAMGrbEditor.py:5503
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:129
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:175
 #: appTools/ToolFilm.py:154 appTools/ToolTransform.py:257
 msgid "Y factor"
 msgstr "Y factor"
 
-#: appEditors/FlatCAMGeoEditor.py:812 appEditors/FlatCAMGrbEditor.py:5505
+#: appEditors/appGeoEditor.py:812 appEditors/FlatCAMGrbEditor.py:5505
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:177
 #: appTools/ToolTransform.py:259
 msgid "Factor for scaling on Y axis."
 msgstr "Factor for scaling on Y axis."
 
-#: appEditors/FlatCAMGeoEditor.py:819 appEditors/FlatCAMGrbEditor.py:5512
+#: appEditors/appGeoEditor.py:819 appEditors/FlatCAMGrbEditor.py:5512
 #: appTools/ToolTransform.py:266
 msgid "Scale Y"
 msgstr "Scale Y"
 
-#: appEditors/FlatCAMGeoEditor.py:846 appEditors/FlatCAMGrbEditor.py:5539
+#: appEditors/appGeoEditor.py:846 appEditors/FlatCAMGrbEditor.py:5539
 #: appTools/ToolTransform.py:293
 msgid "Flip on X"
 msgstr "Flip on X"
 
-#: appEditors/FlatCAMGeoEditor.py:848 appEditors/FlatCAMGeoEditor.py:853
+#: appEditors/appGeoEditor.py:848 appEditors/appGeoEditor.py:853
 #: appEditors/FlatCAMGrbEditor.py:5541 appEditors/FlatCAMGrbEditor.py:5546
 #: appTools/ToolTransform.py:295 appTools/ToolTransform.py:300
 msgid "Flip the selected object(s) over the X axis."
 msgstr "Flip the selected object(s) over the X axis."
 
-#: appEditors/FlatCAMGeoEditor.py:851 appEditors/FlatCAMGrbEditor.py:5544
+#: appEditors/appGeoEditor.py:851 appEditors/FlatCAMGrbEditor.py:5544
 #: appTools/ToolTransform.py:298
 msgid "Flip on Y"
 msgstr "Flip on Y"
 
-#: appEditors/FlatCAMGeoEditor.py:871 appEditors/FlatCAMGrbEditor.py:5564
+#: appEditors/appGeoEditor.py:871 appEditors/FlatCAMGrbEditor.py:5564
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:191
 #: appTools/ToolTransform.py:318
 msgid "X val"
 msgstr "X val"
 
-#: appEditors/FlatCAMGeoEditor.py:873 appEditors/FlatCAMGrbEditor.py:5566
+#: appEditors/appGeoEditor.py:873 appEditors/FlatCAMGrbEditor.py:5566
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:193
 #: appTools/ToolTransform.py:320
 msgid "Distance to offset on X axis. In current units."
 msgstr "Distance to offset on X axis. In current units."
 
-#: appEditors/FlatCAMGeoEditor.py:880 appEditors/FlatCAMGrbEditor.py:5573
+#: appEditors/appGeoEditor.py:880 appEditors/FlatCAMGrbEditor.py:5573
 #: appTools/ToolTransform.py:327
 msgid "Offset X"
 msgstr "Offset X"
 
-#: appEditors/FlatCAMGeoEditor.py:882 appEditors/FlatCAMGeoEditor.py:902
+#: appEditors/appGeoEditor.py:882 appEditors/appGeoEditor.py:902
 #: appEditors/FlatCAMGrbEditor.py:5575 appEditors/FlatCAMGrbEditor.py:5595
 #: appTools/ToolTransform.py:329 appTools/ToolTransform.py:349
 msgid ""
@@ -2234,31 +2234,31 @@ msgstr ""
 "The point of reference is the middle of\n"
 "the bounding box for all selected objects.\n"
 
-#: appEditors/FlatCAMGeoEditor.py:891 appEditors/FlatCAMGrbEditor.py:5584
+#: appEditors/appGeoEditor.py:891 appEditors/FlatCAMGrbEditor.py:5584
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:204
 #: appTools/ToolTransform.py:338
 msgid "Y val"
 msgstr "Y val"
 
-#: appEditors/FlatCAMGeoEditor.py:893 appEditors/FlatCAMGrbEditor.py:5586
+#: appEditors/appGeoEditor.py:893 appEditors/FlatCAMGrbEditor.py:5586
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:206
 #: appTools/ToolTransform.py:340
 msgid "Distance to offset on Y axis. In current units."
 msgstr "Distance to offset on Y axis. In current units."
 
-#: appEditors/FlatCAMGeoEditor.py:900 appEditors/FlatCAMGrbEditor.py:5593
+#: appEditors/appGeoEditor.py:900 appEditors/FlatCAMGrbEditor.py:5593
 #: appTools/ToolTransform.py:347
 msgid "Offset Y"
 msgstr "Offset Y"
 
-#: appEditors/FlatCAMGeoEditor.py:920 appEditors/FlatCAMGrbEditor.py:5613
+#: appEditors/appGeoEditor.py:920 appEditors/FlatCAMGrbEditor.py:5613
 #: appGUI/preferences/tools/Tools2QRCodePrefGroupUI.py:142
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:216
 #: appTools/ToolQRCode.py:206 appTools/ToolTransform.py:367
 msgid "Rounded"
 msgstr "Rounded"
 
-#: appEditors/FlatCAMGeoEditor.py:922 appEditors/FlatCAMGrbEditor.py:5615
+#: appEditors/appGeoEditor.py:922 appEditors/FlatCAMGrbEditor.py:5615
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:218
 #: appTools/ToolTransform.py:369
 msgid ""
@@ -2272,14 +2272,14 @@ msgstr ""
 "If not checked then the buffer will follow the exact geometry\n"
 "of the buffered shape."
 
-#: appEditors/FlatCAMGeoEditor.py:930 appEditors/FlatCAMGrbEditor.py:5623
+#: appEditors/appGeoEditor.py:930 appEditors/FlatCAMGrbEditor.py:5623
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:226
 #: appTools/ToolDistance.py:505 appTools/ToolDistanceMin.py:286
 #: appTools/ToolTransform.py:377
 msgid "Distance"
 msgstr "Distance"
 
-#: appEditors/FlatCAMGeoEditor.py:932 appEditors/FlatCAMGrbEditor.py:5625
+#: appEditors/appGeoEditor.py:932 appEditors/FlatCAMGrbEditor.py:5625
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:228
 #: appTools/ToolTransform.py:379
 msgid ""
@@ -2293,12 +2293,12 @@ msgstr ""
 "Each geometry element of the object will be increased\n"
 "or decreased with the 'distance'."
 
-#: appEditors/FlatCAMGeoEditor.py:944 appEditors/FlatCAMGrbEditor.py:5637
+#: appEditors/appGeoEditor.py:944 appEditors/FlatCAMGrbEditor.py:5637
 #: appTools/ToolTransform.py:391
 msgid "Buffer D"
 msgstr "Buffer D"
 
-#: appEditors/FlatCAMGeoEditor.py:946 appEditors/FlatCAMGrbEditor.py:5639
+#: appEditors/appGeoEditor.py:946 appEditors/FlatCAMGrbEditor.py:5639
 #: appTools/ToolTransform.py:393
 msgid ""
 "Create the buffer effect on each geometry,\n"
@@ -2307,7 +2307,7 @@ msgstr ""
 "Create the buffer effect on each geometry,\n"
 "element from the selected object, using the distance."
 
-#: appEditors/FlatCAMGeoEditor.py:957 appEditors/FlatCAMGrbEditor.py:5650
+#: appEditors/appGeoEditor.py:957 appEditors/FlatCAMGrbEditor.py:5650
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:245
 #: appTools/ToolTransform.py:404
 msgid ""
@@ -2323,12 +2323,12 @@ msgstr ""
 "or decreased to fit the 'Value'. Value is a percentage\n"
 "of the initial dimension."
 
-#: appEditors/FlatCAMGeoEditor.py:970 appEditors/FlatCAMGrbEditor.py:5663
+#: appEditors/appGeoEditor.py:970 appEditors/FlatCAMGrbEditor.py:5663
 #: appTools/ToolTransform.py:417
 msgid "Buffer F"
 msgstr "Buffer F"
 
-#: appEditors/FlatCAMGeoEditor.py:972 appEditors/FlatCAMGrbEditor.py:5665
+#: appEditors/appGeoEditor.py:972 appEditors/FlatCAMGrbEditor.py:5665
 #: appTools/ToolTransform.py:419
 msgid ""
 "Create the buffer effect on each geometry,\n"
@@ -2337,7 +2337,7 @@ msgstr ""
 "Create the buffer effect on each geometry,\n"
 "element from the selected object, using the factor."
 
-#: appEditors/FlatCAMGeoEditor.py:1043 appEditors/FlatCAMGrbEditor.py:5736
+#: appEditors/appGeoEditor.py:1043 appEditors/FlatCAMGrbEditor.py:5736
 #: appGUI/ObjectUI.py:1103 appGUI/ObjectUI.py:1958
 #: appGUI/preferences/tools/Tools2CalPrefGroupUI.py:48
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
@@ -2348,327 +2348,327 @@ msgstr ""
 msgid "Object"
 msgstr "Object"
 
-#: appEditors/FlatCAMGeoEditor.py:1107 appEditors/FlatCAMGeoEditor.py:1130
-#: appEditors/FlatCAMGeoEditor.py:1276 appEditors/FlatCAMGeoEditor.py:1301
-#: appEditors/FlatCAMGeoEditor.py:1335 appEditors/FlatCAMGeoEditor.py:1370
-#: appEditors/FlatCAMGeoEditor.py:1401 appEditors/FlatCAMGrbEditor.py:5800
+#: appEditors/appGeoEditor.py:1107 appEditors/appGeoEditor.py:1130
+#: appEditors/appGeoEditor.py:1276 appEditors/appGeoEditor.py:1301
+#: appEditors/appGeoEditor.py:1335 appEditors/appGeoEditor.py:1370
+#: appEditors/appGeoEditor.py:1401 appEditors/FlatCAMGrbEditor.py:5800
 #: appEditors/FlatCAMGrbEditor.py:5823 appEditors/FlatCAMGrbEditor.py:5968
 #: appEditors/FlatCAMGrbEditor.py:6001 appEditors/FlatCAMGrbEditor.py:6044
 #: appEditors/FlatCAMGrbEditor.py:6085 appEditors/FlatCAMGrbEditor.py:6121
 msgid "No shape selected."
 msgstr "No shape selected."
 
-#: appEditors/FlatCAMGeoEditor.py:1115 appEditors/FlatCAMGrbEditor.py:5808
+#: appEditors/appGeoEditor.py:1115 appEditors/FlatCAMGrbEditor.py:5808
 #: appTools/ToolTransform.py:585
 msgid "Incorrect format for Point value. Needs format X,Y"
 msgstr "Incorrect format for Point value. Needs format X,Y"
 
-#: appEditors/FlatCAMGeoEditor.py:1140 appEditors/FlatCAMGrbEditor.py:5833
+#: appEditors/appGeoEditor.py:1140 appEditors/FlatCAMGrbEditor.py:5833
 #: appTools/ToolTransform.py:602
 msgid "Rotate transformation can not be done for a value of 0."
 msgstr "Rotate transformation can not be done for a value of 0."
 
-#: appEditors/FlatCAMGeoEditor.py:1198 appEditors/FlatCAMGeoEditor.py:1219
+#: appEditors/appGeoEditor.py:1198 appEditors/appGeoEditor.py:1219
 #: appEditors/FlatCAMGrbEditor.py:5891 appEditors/FlatCAMGrbEditor.py:5912
 #: appTools/ToolTransform.py:660 appTools/ToolTransform.py:681
 msgid "Scale transformation can not be done for a factor of 0 or 1."
 msgstr "Scale transformation can not be done for a factor of 0 or 1."
 
-#: appEditors/FlatCAMGeoEditor.py:1232 appEditors/FlatCAMGeoEditor.py:1241
+#: appEditors/appGeoEditor.py:1232 appEditors/appGeoEditor.py:1241
 #: appEditors/FlatCAMGrbEditor.py:5925 appEditors/FlatCAMGrbEditor.py:5934
 #: appTools/ToolTransform.py:694 appTools/ToolTransform.py:703
 msgid "Offset transformation can not be done for a value of 0."
 msgstr "Offset transformation can not be done for a value of 0."
 
-#: appEditors/FlatCAMGeoEditor.py:1271 appEditors/FlatCAMGrbEditor.py:5971
+#: appEditors/appGeoEditor.py:1271 appEditors/FlatCAMGrbEditor.py:5971
 #: appTools/ToolTransform.py:731
 msgid "Appying Rotate"
 msgstr "Appying Rotate"
 
-#: appEditors/FlatCAMGeoEditor.py:1284 appEditors/FlatCAMGrbEditor.py:5983
+#: appEditors/appGeoEditor.py:1284 appEditors/FlatCAMGrbEditor.py:5983
 msgid "Done. Rotate completed."
 msgstr "Done. Rotate completed."
 
-#: appEditors/FlatCAMGeoEditor.py:1286
+#: appEditors/appGeoEditor.py:1286
 msgid "Rotation action was not executed"
 msgstr "Rotation action was not executed"
 
-#: appEditors/FlatCAMGeoEditor.py:1304 appEditors/FlatCAMGrbEditor.py:6004
+#: appEditors/appGeoEditor.py:1304 appEditors/FlatCAMGrbEditor.py:6004
 #: appTools/ToolTransform.py:757
 msgid "Applying Flip"
 msgstr "Applying Flip"
 
-#: appEditors/FlatCAMGeoEditor.py:1312 appEditors/FlatCAMGrbEditor.py:6016
+#: appEditors/appGeoEditor.py:1312 appEditors/FlatCAMGrbEditor.py:6016
 #: appTools/ToolTransform.py:774
 msgid "Flip on the Y axis done"
 msgstr "Flip on the Y axis done"
 
-#: appEditors/FlatCAMGeoEditor.py:1315 appEditors/FlatCAMGrbEditor.py:6024
+#: appEditors/appGeoEditor.py:1315 appEditors/FlatCAMGrbEditor.py:6024
 #: appTools/ToolTransform.py:783
 msgid "Flip on the X axis done"
 msgstr "Flip on the X axis done"
 
-#: appEditors/FlatCAMGeoEditor.py:1319
+#: appEditors/appGeoEditor.py:1319
 msgid "Flip action was not executed"
 msgstr "Flip action was not executed"
 
-#: appEditors/FlatCAMGeoEditor.py:1338 appEditors/FlatCAMGrbEditor.py:6047
+#: appEditors/appGeoEditor.py:1338 appEditors/FlatCAMGrbEditor.py:6047
 #: appTools/ToolTransform.py:804
 msgid "Applying Skew"
 msgstr "Applying Skew"
 
-#: appEditors/FlatCAMGeoEditor.py:1347 appEditors/FlatCAMGrbEditor.py:6063
+#: appEditors/appGeoEditor.py:1347 appEditors/FlatCAMGrbEditor.py:6063
 msgid "Skew on the X axis done"
 msgstr "Skew on the X axis done"
 
-#: appEditors/FlatCAMGeoEditor.py:1349 appEditors/FlatCAMGrbEditor.py:6065
+#: appEditors/appGeoEditor.py:1349 appEditors/FlatCAMGrbEditor.py:6065
 msgid "Skew on the Y axis done"
 msgstr "Skew on the Y axis done"
 
-#: appEditors/FlatCAMGeoEditor.py:1352
+#: appEditors/appGeoEditor.py:1352
 msgid "Skew action was not executed"
 msgstr "Skew action was not executed"
 
-#: appEditors/FlatCAMGeoEditor.py:1373 appEditors/FlatCAMGrbEditor.py:6088
+#: appEditors/appGeoEditor.py:1373 appEditors/FlatCAMGrbEditor.py:6088
 #: appTools/ToolTransform.py:831
 msgid "Applying Scale"
 msgstr "Applying Scale"
 
-#: appEditors/FlatCAMGeoEditor.py:1382 appEditors/FlatCAMGrbEditor.py:6101
+#: appEditors/appGeoEditor.py:1382 appEditors/FlatCAMGrbEditor.py:6101
 msgid "Scale on the X axis done"
 msgstr "Scale on the X axis done"
 
-#: appEditors/FlatCAMGeoEditor.py:1384 appEditors/FlatCAMGrbEditor.py:6103
+#: appEditors/appGeoEditor.py:1384 appEditors/FlatCAMGrbEditor.py:6103
 msgid "Scale on the Y axis done"
 msgstr "Scale on the Y axis done"
 
-#: appEditors/FlatCAMGeoEditor.py:1386
+#: appEditors/appGeoEditor.py:1386
 msgid "Scale action was not executed"
 msgstr "Scale action was not executed"
 
-#: appEditors/FlatCAMGeoEditor.py:1404 appEditors/FlatCAMGrbEditor.py:6124
+#: appEditors/appGeoEditor.py:1404 appEditors/FlatCAMGrbEditor.py:6124
 #: appTools/ToolTransform.py:859
 msgid "Applying Offset"
 msgstr "Applying Offset"
 
-#: appEditors/FlatCAMGeoEditor.py:1414 appEditors/FlatCAMGrbEditor.py:6145
+#: appEditors/appGeoEditor.py:1414 appEditors/FlatCAMGrbEditor.py:6145
 msgid "Offset on the X axis done"
 msgstr "Offset on the X axis done"
 
-#: appEditors/FlatCAMGeoEditor.py:1416 appEditors/FlatCAMGrbEditor.py:6147
+#: appEditors/appGeoEditor.py:1416 appEditors/FlatCAMGrbEditor.py:6147
 msgid "Offset on the Y axis done"
 msgstr "Offset on the Y axis done"
 
-#: appEditors/FlatCAMGeoEditor.py:1419
+#: appEditors/appGeoEditor.py:1419
 msgid "Offset action was not executed"
 msgstr "Offset action was not executed"
 
-#: appEditors/FlatCAMGeoEditor.py:1426 appEditors/FlatCAMGrbEditor.py:6157
+#: appEditors/appGeoEditor.py:1426 appEditors/FlatCAMGrbEditor.py:6157
 msgid "No shape selected"
 msgstr "No shape selected"
 
-#: appEditors/FlatCAMGeoEditor.py:1429 appEditors/FlatCAMGrbEditor.py:6160
+#: appEditors/appGeoEditor.py:1429 appEditors/FlatCAMGrbEditor.py:6160
 #: appTools/ToolTransform.py:889
 msgid "Applying Buffer"
 msgstr "Applying Buffer"
 
-#: appEditors/FlatCAMGeoEditor.py:1436 appEditors/FlatCAMGrbEditor.py:6182
+#: appEditors/appGeoEditor.py:1436 appEditors/FlatCAMGrbEditor.py:6182
 #: appTools/ToolTransform.py:910
 msgid "Buffer done"
 msgstr "Buffer done"
 
-#: appEditors/FlatCAMGeoEditor.py:1440 appEditors/FlatCAMGrbEditor.py:6186
+#: appEditors/appGeoEditor.py:1440 appEditors/FlatCAMGrbEditor.py:6186
 #: appTools/ToolTransform.py:879 appTools/ToolTransform.py:915
 msgid "Action was not executed, due of"
 msgstr "Action was not executed, due of"
 
-#: appEditors/FlatCAMGeoEditor.py:1444 appEditors/FlatCAMGrbEditor.py:6190
+#: appEditors/appGeoEditor.py:1444 appEditors/FlatCAMGrbEditor.py:6190
 msgid "Rotate ..."
 msgstr "Rotate ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1445 appEditors/FlatCAMGeoEditor.py:1494
-#: appEditors/FlatCAMGeoEditor.py:1509 appEditors/FlatCAMGrbEditor.py:6191
+#: appEditors/appGeoEditor.py:1445 appEditors/appGeoEditor.py:1494
+#: appEditors/appGeoEditor.py:1509 appEditors/FlatCAMGrbEditor.py:6191
 #: appEditors/FlatCAMGrbEditor.py:6240 appEditors/FlatCAMGrbEditor.py:6255
 msgid "Enter an Angle Value (degrees)"
 msgstr "Enter an Angle Value (degrees)"
 
-#: appEditors/FlatCAMGeoEditor.py:1453 appEditors/FlatCAMGrbEditor.py:6199
+#: appEditors/appGeoEditor.py:1453 appEditors/FlatCAMGrbEditor.py:6199
 msgid "Geometry shape rotate done"
 msgstr "Geometry shape rotate done"
 
-#: appEditors/FlatCAMGeoEditor.py:1456 appEditors/FlatCAMGrbEditor.py:6202
+#: appEditors/appGeoEditor.py:1456 appEditors/FlatCAMGrbEditor.py:6202
 msgid "Geometry shape rotate cancelled"
 msgstr "Geometry shape rotate cancelled"
 
-#: appEditors/FlatCAMGeoEditor.py:1461 appEditors/FlatCAMGrbEditor.py:6207
+#: appEditors/appGeoEditor.py:1461 appEditors/FlatCAMGrbEditor.py:6207
 msgid "Offset on X axis ..."
 msgstr "Offset on X axis ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1462 appEditors/FlatCAMGeoEditor.py:1479
+#: appEditors/appGeoEditor.py:1462 appEditors/appGeoEditor.py:1479
 #: appEditors/FlatCAMGrbEditor.py:6208 appEditors/FlatCAMGrbEditor.py:6225
 msgid "Enter a distance Value"
 msgstr "Enter a distance Value"
 
-#: appEditors/FlatCAMGeoEditor.py:1470 appEditors/FlatCAMGrbEditor.py:6216
+#: appEditors/appGeoEditor.py:1470 appEditors/FlatCAMGrbEditor.py:6216
 msgid "Geometry shape offset on X axis done"
 msgstr "Geometry shape offset on X axis done"
 
-#: appEditors/FlatCAMGeoEditor.py:1473 appEditors/FlatCAMGrbEditor.py:6219
+#: appEditors/appGeoEditor.py:1473 appEditors/FlatCAMGrbEditor.py:6219
 msgid "Geometry shape offset X cancelled"
 msgstr "Geometry shape offset X cancelled"
 
-#: appEditors/FlatCAMGeoEditor.py:1478 appEditors/FlatCAMGrbEditor.py:6224
+#: appEditors/appGeoEditor.py:1478 appEditors/FlatCAMGrbEditor.py:6224
 msgid "Offset on Y axis ..."
 msgstr "Offset on Y axis ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1487 appEditors/FlatCAMGrbEditor.py:6233
+#: appEditors/appGeoEditor.py:1487 appEditors/FlatCAMGrbEditor.py:6233
 msgid "Geometry shape offset on Y axis done"
 msgstr "Geometry shape offset on Y axis done"
 
-#: appEditors/FlatCAMGeoEditor.py:1490
+#: appEditors/appGeoEditor.py:1490
 msgid "Geometry shape offset on Y axis canceled"
 msgstr "Geometry shape offset on Y axis canceled"
 
-#: appEditors/FlatCAMGeoEditor.py:1493 appEditors/FlatCAMGrbEditor.py:6239
+#: appEditors/appGeoEditor.py:1493 appEditors/FlatCAMGrbEditor.py:6239
 msgid "Skew on X axis ..."
 msgstr "Skew on X axis ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1502 appEditors/FlatCAMGrbEditor.py:6248
+#: appEditors/appGeoEditor.py:1502 appEditors/FlatCAMGrbEditor.py:6248
 msgid "Geometry shape skew on X axis done"
 msgstr "Geometry shape skew on X axis done"
 
-#: appEditors/FlatCAMGeoEditor.py:1505
+#: appEditors/appGeoEditor.py:1505
 msgid "Geometry shape skew on X axis canceled"
 msgstr "Geometry shape skew on X axis canceled"
 
-#: appEditors/FlatCAMGeoEditor.py:1508 appEditors/FlatCAMGrbEditor.py:6254
+#: appEditors/appGeoEditor.py:1508 appEditors/FlatCAMGrbEditor.py:6254
 msgid "Skew on Y axis ..."
 msgstr "Skew on Y axis ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1517 appEditors/FlatCAMGrbEditor.py:6263
+#: appEditors/appGeoEditor.py:1517 appEditors/FlatCAMGrbEditor.py:6263
 msgid "Geometry shape skew on Y axis done"
 msgstr "Geometry shape skew on Y axis done"
 
-#: appEditors/FlatCAMGeoEditor.py:1520
+#: appEditors/appGeoEditor.py:1520
 msgid "Geometry shape skew on Y axis canceled"
 msgstr "Geometry shape skew on Y axis canceled"
 
-#: appEditors/FlatCAMGeoEditor.py:1950 appEditors/FlatCAMGeoEditor.py:2021
+#: appEditors/appGeoEditor.py:1950 appEditors/appGeoEditor.py:2021
 #: appEditors/FlatCAMGrbEditor.py:1444 appEditors/FlatCAMGrbEditor.py:1522
 msgid "Click on Center point ..."
 msgstr "Click on Center point ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1963 appEditors/FlatCAMGrbEditor.py:1454
+#: appEditors/appGeoEditor.py:1963 appEditors/FlatCAMGrbEditor.py:1454
 msgid "Click on Perimeter point to complete ..."
 msgstr "Click on Perimeter point to complete ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1995
+#: appEditors/appGeoEditor.py:1995
 msgid "Done. Adding Circle completed."
 msgstr "Done. Adding Circle completed."
 
-#: appEditors/FlatCAMGeoEditor.py:2049 appEditors/FlatCAMGrbEditor.py:1555
+#: appEditors/appGeoEditor.py:2049 appEditors/FlatCAMGrbEditor.py:1555
 msgid "Click on Start point ..."
 msgstr "Click on Start point ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2051 appEditors/FlatCAMGrbEditor.py:1557
+#: appEditors/appGeoEditor.py:2051 appEditors/FlatCAMGrbEditor.py:1557
 msgid "Click on Point3 ..."
 msgstr "Click on Point3 ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2053 appEditors/FlatCAMGrbEditor.py:1559
+#: appEditors/appGeoEditor.py:2053 appEditors/FlatCAMGrbEditor.py:1559
 msgid "Click on Stop point ..."
 msgstr "Click on Stop point ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2058 appEditors/FlatCAMGrbEditor.py:1564
+#: appEditors/appGeoEditor.py:2058 appEditors/FlatCAMGrbEditor.py:1564
 msgid "Click on Stop point to complete ..."
 msgstr "Click on Stop point to complete ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2060 appEditors/FlatCAMGrbEditor.py:1566
+#: appEditors/appGeoEditor.py:2060 appEditors/FlatCAMGrbEditor.py:1566
 msgid "Click on Point2 to complete ..."
 msgstr "Click on Point2 to complete ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2062 appEditors/FlatCAMGrbEditor.py:1568
+#: appEditors/appGeoEditor.py:2062 appEditors/FlatCAMGrbEditor.py:1568
 msgid "Click on Center point to complete ..."
 msgstr "Click on Center point to complete ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2074
+#: appEditors/appGeoEditor.py:2074
 #, python-format
 msgid "Direction: %s"
 msgstr "Direction: %s"
 
-#: appEditors/FlatCAMGeoEditor.py:2088 appEditors/FlatCAMGrbEditor.py:1594
+#: appEditors/appGeoEditor.py:2088 appEditors/FlatCAMGrbEditor.py:1594
 msgid "Mode: Start -> Stop -> Center. Click on Start point ..."
 msgstr "Mode: Start -> Stop -> Center. Click on Start point ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2091 appEditors/FlatCAMGrbEditor.py:1597
+#: appEditors/appGeoEditor.py:2091 appEditors/FlatCAMGrbEditor.py:1597
 msgid "Mode: Point1 -> Point3 -> Point2. Click on Point1 ..."
 msgstr "Mode: Point1 -> Point3 -> Point2. Click on Point1 ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2094 appEditors/FlatCAMGrbEditor.py:1600
+#: appEditors/appGeoEditor.py:2094 appEditors/FlatCAMGrbEditor.py:1600
 msgid "Mode: Center -> Start -> Stop. Click on Center point ..."
 msgstr "Mode: Center -> Start -> Stop. Click on Center point ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2235
+#: appEditors/appGeoEditor.py:2235
 msgid "Done. Arc completed."
 msgstr "Done. Arc completed."
 
-#: appEditors/FlatCAMGeoEditor.py:2266 appEditors/FlatCAMGeoEditor.py:2339
+#: appEditors/appGeoEditor.py:2266 appEditors/appGeoEditor.py:2339
 msgid "Click on 1st corner ..."
 msgstr "Click on 1st corner ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2278
+#: appEditors/appGeoEditor.py:2278
 msgid "Click on opposite corner to complete ..."
 msgstr "Click on opposite corner to complete ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2308
+#: appEditors/appGeoEditor.py:2308
 msgid "Done. Rectangle completed."
 msgstr "Done. Rectangle completed."
 
-#: appEditors/FlatCAMGeoEditor.py:2383
+#: appEditors/appGeoEditor.py:2383
 msgid "Done. Polygon completed."
 msgstr "Done. Polygon completed."
 
-#: appEditors/FlatCAMGeoEditor.py:2397 appEditors/FlatCAMGeoEditor.py:2462
+#: appEditors/appGeoEditor.py:2397 appEditors/appGeoEditor.py:2462
 #: appEditors/FlatCAMGrbEditor.py:1102 appEditors/FlatCAMGrbEditor.py:1322
 msgid "Backtracked one point ..."
 msgstr "Backtracked one point ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2440
+#: appEditors/appGeoEditor.py:2440
 msgid "Done. Path completed."
 msgstr "Done. Path completed."
 
-#: appEditors/FlatCAMGeoEditor.py:2599
+#: appEditors/appGeoEditor.py:2599
 msgid "No shape selected. Select a shape to explode"
 msgstr "No shape selected. Select a shape to explode"
 
-#: appEditors/FlatCAMGeoEditor.py:2632
+#: appEditors/appGeoEditor.py:2632
 msgid "Done. Polygons exploded into lines."
 msgstr "Done. Polygons exploded into lines."
 
-#: appEditors/FlatCAMGeoEditor.py:2664
+#: appEditors/appGeoEditor.py:2664
 msgid "MOVE: No shape selected. Select a shape to move"
 msgstr "MOVE: No shape selected. Select a shape to move"
 
-#: appEditors/FlatCAMGeoEditor.py:2667 appEditors/FlatCAMGeoEditor.py:2687
+#: appEditors/appGeoEditor.py:2667 appEditors/appGeoEditor.py:2687
 msgid " MOVE: Click on reference point ..."
 msgstr " MOVE: Click on reference point ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2672
+#: appEditors/appGeoEditor.py:2672
 msgid " Click on destination point ..."
 msgstr " Click on destination point ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2712
+#: appEditors/appGeoEditor.py:2712
 msgid "Done. Geometry(s) Move completed."
 msgstr "Done. Geometry(s) Move completed."
 
-#: appEditors/FlatCAMGeoEditor.py:2845
+#: appEditors/appGeoEditor.py:2845
 msgid "Done. Geometry(s) Copy completed."
 msgstr "Done. Geometry(s) Copy completed."
 
-#: appEditors/FlatCAMGeoEditor.py:2876 appEditors/FlatCAMGrbEditor.py:897
+#: appEditors/appGeoEditor.py:2876 appEditors/FlatCAMGrbEditor.py:897
 msgid "Click on 1st point ..."
 msgstr "Click on 1st point ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2900
+#: appEditors/appGeoEditor.py:2900
 msgid ""
 "Font not supported. Only Regular, Bold, Italic and BoldItalic are supported. "
 "Error"
@@ -2676,83 +2676,83 @@ msgstr ""
 "Font not supported. Only Regular, Bold, Italic and BoldItalic are supported. "
 "Error"
 
-#: appEditors/FlatCAMGeoEditor.py:2908
+#: appEditors/appGeoEditor.py:2908
 msgid "No text to add."
 msgstr "No text to add."
 
-#: appEditors/FlatCAMGeoEditor.py:2918
+#: appEditors/appGeoEditor.py:2918
 msgid " Done. Adding Text completed."
 msgstr " Done. Adding Text completed."
 
-#: appEditors/FlatCAMGeoEditor.py:2955
+#: appEditors/appGeoEditor.py:2955
 msgid "Create buffer geometry ..."
 msgstr "Create buffer geometry ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2990 appEditors/FlatCAMGrbEditor.py:5153
+#: appEditors/appGeoEditor.py:2990 appEditors/FlatCAMGrbEditor.py:5153
 msgid "Done. Buffer Tool completed."
 msgstr "Done. Buffer Tool completed."
 
-#: appEditors/FlatCAMGeoEditor.py:3018
+#: appEditors/appGeoEditor.py:3018
 msgid "Done. Buffer Int Tool completed."
 msgstr "Done. Buffer Int Tool completed."
 
-#: appEditors/FlatCAMGeoEditor.py:3046
+#: appEditors/appGeoEditor.py:3046
 msgid "Done. Buffer Ext Tool completed."
 msgstr "Done. Buffer Ext Tool completed."
 
-#: appEditors/FlatCAMGeoEditor.py:3095 appEditors/FlatCAMGrbEditor.py:2160
+#: appEditors/appGeoEditor.py:3095 appEditors/FlatCAMGrbEditor.py:2160
 msgid "Select a shape to act as deletion area ..."
 msgstr "Select a shape to act as deletion area ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3097 appEditors/FlatCAMGeoEditor.py:3123
-#: appEditors/FlatCAMGeoEditor.py:3129 appEditors/FlatCAMGrbEditor.py:2162
+#: appEditors/appGeoEditor.py:3097 appEditors/appGeoEditor.py:3123
+#: appEditors/appGeoEditor.py:3129 appEditors/FlatCAMGrbEditor.py:2162
 msgid "Click to pick-up the erase shape..."
 msgstr "Click to pick-up the erase shape..."
 
-#: appEditors/FlatCAMGeoEditor.py:3133 appEditors/FlatCAMGrbEditor.py:2221
+#: appEditors/appGeoEditor.py:3133 appEditors/FlatCAMGrbEditor.py:2221
 msgid "Click to erase ..."
 msgstr "Click to erase ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3162 appEditors/FlatCAMGrbEditor.py:2254
+#: appEditors/appGeoEditor.py:3162 appEditors/FlatCAMGrbEditor.py:2254
 msgid "Done. Eraser tool action completed."
 msgstr "Done. Eraser tool action completed."
 
-#: appEditors/FlatCAMGeoEditor.py:3212
+#: appEditors/appGeoEditor.py:3212
 msgid "Create Paint geometry ..."
 msgstr "Create Paint geometry ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3225 appEditors/FlatCAMGrbEditor.py:2417
+#: appEditors/appGeoEditor.py:3225 appEditors/FlatCAMGrbEditor.py:2417
 msgid "Shape transformations ..."
 msgstr "Shape transformations ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3281
+#: appEditors/appGeoEditor.py:3281
 #: appGUI/preferences/geometry/GeometryEditorPrefGroupUI.py:27
 msgid "Geometry Editor"
 msgstr "Geometry Editor"
 
-#: appEditors/FlatCAMGeoEditor.py:3287 appEditors/FlatCAMGrbEditor.py:2495
+#: appEditors/appGeoEditor.py:3287 appEditors/FlatCAMGrbEditor.py:2495
 #: appEditors/FlatCAMGrbEditor.py:3951 appGUI/ObjectUI.py:282
 #: appGUI/ObjectUI.py:1394 appGUI/ObjectUI.py:2256 appTools/ToolCutOut.py:95
 #: appTools/ToolTransform.py:92
 msgid "Type"
 msgstr "Type"
 
-#: appEditors/FlatCAMGeoEditor.py:3287 appGUI/ObjectUI.py:221
+#: appEditors/appGeoEditor.py:3287 appGUI/ObjectUI.py:221
 #: appGUI/ObjectUI.py:521 appGUI/ObjectUI.py:1330 appGUI/ObjectUI.py:2165
 #: appGUI/ObjectUI.py:2469 appGUI/ObjectUI.py:2536
 #: appTools/ToolCalibration.py:234 appTools/ToolFiducials.py:70
 msgid "Name"
 msgstr "Name"
 
-#: appEditors/FlatCAMGeoEditor.py:3539
+#: appEditors/appGeoEditor.py:3539
 msgid "Ring"
 msgstr "Ring"
 
-#: appEditors/FlatCAMGeoEditor.py:3541
+#: appEditors/appGeoEditor.py:3541
 msgid "Line"
 msgstr "Line"
 
-#: appEditors/FlatCAMGeoEditor.py:3543 appGUI/MainGUI.py:1446
+#: appEditors/appGeoEditor.py:3543 appGUI/MainGUI.py:1446
 #: appGUI/ObjectUI.py:1150 appGUI/ObjectUI.py:2005
 #: appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py:226
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:299
@@ -2763,45 +2763,45 @@ msgstr "Line"
 msgid "Polygon"
 msgstr "Polygon"
 
-#: appEditors/FlatCAMGeoEditor.py:3545
+#: appEditors/appGeoEditor.py:3545
 msgid "Multi-Line"
 msgstr "Multi-Line"
 
-#: appEditors/FlatCAMGeoEditor.py:3547
+#: appEditors/appGeoEditor.py:3547
 msgid "Multi-Polygon"
 msgstr "Multi-Polygon"
 
-#: appEditors/FlatCAMGeoEditor.py:3554
+#: appEditors/appGeoEditor.py:3554
 msgid "Geo Elem"
 msgstr "Geo Elem"
 
-#: appEditors/FlatCAMGeoEditor.py:4007
+#: appEditors/appGeoEditor.py:4007
 msgid "Editing MultiGeo Geometry, tool"
 msgstr "Editing MultiGeo Geometry, tool"
 
-#: appEditors/FlatCAMGeoEditor.py:4009
+#: appEditors/appGeoEditor.py:4009
 msgid "with diameter"
 msgstr "with diameter"
 
-#: appEditors/FlatCAMGeoEditor.py:4081
+#: appEditors/appGeoEditor.py:4081
 msgid "Grid Snap enabled."
 msgstr "Grid Snap enabled."
 
-#: appEditors/FlatCAMGeoEditor.py:4085
+#: appEditors/appGeoEditor.py:4085
 msgid "Grid Snap disabled."
 msgstr "Grid Snap disabled."
 
-#: appEditors/FlatCAMGeoEditor.py:4446 appGUI/MainGUI.py:3046
+#: appEditors/appGeoEditor.py:4446 appGUI/MainGUI.py:3046
 #: appGUI/MainGUI.py:3092 appGUI/MainGUI.py:3110 appGUI/MainGUI.py:3254
 #: appGUI/MainGUI.py:3293 appGUI/MainGUI.py:3305 appGUI/MainGUI.py:3322
 msgid "Click on target point."
 msgstr "Click on target point."
 
-#: appEditors/FlatCAMGeoEditor.py:4762 appEditors/FlatCAMGeoEditor.py:4797
+#: appEditors/appGeoEditor.py:4762 appEditors/appGeoEditor.py:4797
 msgid "A selection of at least 2 geo items is required to do Intersection."
 msgstr "A selection of at least 2 geo items is required to do Intersection."
 
-#: appEditors/FlatCAMGeoEditor.py:4883 appEditors/FlatCAMGeoEditor.py:4987
+#: appEditors/appGeoEditor.py:4883 appEditors/appGeoEditor.py:4987
 msgid ""
 "Negative buffer value is not accepted. Use Buffer interior to generate an "
 "'inside' shape"
@@ -2809,54 +2809,54 @@ msgstr ""
 "Negative buffer value is not accepted. Use Buffer interior to generate an "
 "'inside' shape"
 
-#: appEditors/FlatCAMGeoEditor.py:4893 appEditors/FlatCAMGeoEditor.py:4946
-#: appEditors/FlatCAMGeoEditor.py:4996
+#: appEditors/appGeoEditor.py:4893 appEditors/appGeoEditor.py:4946
+#: appEditors/appGeoEditor.py:4996
 msgid "Nothing selected for buffering."
 msgstr "Nothing selected for buffering."
 
-#: appEditors/FlatCAMGeoEditor.py:4898 appEditors/FlatCAMGeoEditor.py:4950
-#: appEditors/FlatCAMGeoEditor.py:5001
+#: appEditors/appGeoEditor.py:4898 appEditors/appGeoEditor.py:4950
+#: appEditors/appGeoEditor.py:5001
 msgid "Invalid distance for buffering."
 msgstr "Invalid distance for buffering."
 
-#: appEditors/FlatCAMGeoEditor.py:4922 appEditors/FlatCAMGeoEditor.py:5021
+#: appEditors/appGeoEditor.py:4922 appEditors/appGeoEditor.py:5021
 msgid "Failed, the result is empty. Choose a different buffer value."
 msgstr "Failed, the result is empty. Choose a different buffer value."
 
-#: appEditors/FlatCAMGeoEditor.py:4933
+#: appEditors/appGeoEditor.py:4933
 msgid "Full buffer geometry created."
 msgstr "Full buffer geometry created."
 
-#: appEditors/FlatCAMGeoEditor.py:4939
+#: appEditors/appGeoEditor.py:4939
 msgid "Negative buffer value is not accepted."
 msgstr "Negative buffer value is not accepted."
 
-#: appEditors/FlatCAMGeoEditor.py:4970
+#: appEditors/appGeoEditor.py:4970
 msgid "Failed, the result is empty. Choose a smaller buffer value."
 msgstr "Failed, the result is empty. Choose a smaller buffer value."
 
-#: appEditors/FlatCAMGeoEditor.py:4980
+#: appEditors/appGeoEditor.py:4980
 msgid "Interior buffer geometry created."
 msgstr "Interior buffer geometry created."
 
-#: appEditors/FlatCAMGeoEditor.py:5031
+#: appEditors/appGeoEditor.py:5031
 msgid "Exterior buffer geometry created."
 msgstr "Exterior buffer geometry created."
 
-#: appEditors/FlatCAMGeoEditor.py:5037
+#: appEditors/appGeoEditor.py:5037
 #, python-format
 msgid "Could not do Paint. Overlap value has to be less than 100%%."
 msgstr "Could not do Paint. Overlap value has to be less than 100%%."
 
-#: appEditors/FlatCAMGeoEditor.py:5044
+#: appEditors/appGeoEditor.py:5044
 msgid "Nothing selected for painting."
 msgstr "Nothing selected for painting."
 
-#: appEditors/FlatCAMGeoEditor.py:5050
+#: appEditors/appGeoEditor.py:5050
 msgid "Invalid value for"
 msgstr "Invalid value for"
 
-#: appEditors/FlatCAMGeoEditor.py:5109
+#: appEditors/appGeoEditor.py:5109
 msgid ""
 "Could not do Paint. Try a different combination of parameters. Or a "
 "different method of Paint"
@@ -2864,7 +2864,7 @@ msgstr ""
 "Could not do Paint. Try a different combination of parameters. Or a "
 "different method of Paint"
 
-#: appEditors/FlatCAMGeoEditor.py:5120
+#: appEditors/appGeoEditor.py:5120
 msgid "Paint done."
 msgstr "Paint done."
 
diff --git a/locale/es/LC_MESSAGES/strings.po b/locale/es/LC_MESSAGES/strings.po
index 8f9cdef2..8aab182f 100644
--- a/locale/es/LC_MESSAGES/strings.po
+++ b/locale/es/LC_MESSAGES/strings.po
@@ -177,7 +177,7 @@ msgstr ""
 "Zona agregada. Haga clic para comenzar a agregar la siguiente zona o haga "
 "clic con el botón derecho para finalizar."
 
-#: Common.py:322 appEditors/FlatCAMGeoEditor.py:2352
+#: Common.py:322 appEditors/appGeoEditor.py:2352
 #: appTools/ToolIsolation.py:2584 appTools/ToolNCC.py:1754
 #: appTools/ToolPaint.py:1647
 msgid "Click on next Point or click right mouse button to complete ..."
@@ -904,7 +904,7 @@ msgid "Conventional"
 msgstr "Convencional"
 
 #: appDatabase.py:1456 appDatabase.py:1565 appDatabase.py:1667
-#: appEditors/FlatCAMGeoEditor.py:450
+#: appEditors/appGeoEditor.py:450
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:167
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:182
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:163
@@ -933,7 +933,7 @@ msgstr ""
 "Valores más altos = procesamiento lento y ejecución lenta en CNC\n"
 "debido a demasiados caminos."
 
-#: appDatabase.py:1477 appDatabase.py:1586 appEditors/FlatCAMGeoEditor.py:470
+#: appDatabase.py:1477 appDatabase.py:1586 appEditors/appGeoEditor.py:470
 #: appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py:72
 #: appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py:229
 #: appGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py:59
@@ -962,7 +962,7 @@ msgstr "Margen"
 msgid "Bounding box margin."
 msgstr "Margen de cuadro delimitador."
 
-#: appDatabase.py:1490 appDatabase.py:1601 appEditors/FlatCAMGeoEditor.py:484
+#: appDatabase.py:1490 appDatabase.py:1601 appEditors/appGeoEditor.py:484
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:105
 #: appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py:106
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:215
@@ -985,7 +985,7 @@ msgstr ""
 "- Basado en semillas: hacia afuera de la semilla.\n"
 "- Basado en líneas: líneas paralelas."
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2232 appTools/ToolNCC.py:2764
@@ -995,8 +995,8 @@ msgstr ""
 msgid "Standard"
 msgstr "Estándar"
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
-#: appEditors/FlatCAMGeoEditor.py:568 appEditors/FlatCAMGeoEditor.py:5091
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
+#: appEditors/appGeoEditor.py:568 appEditors/appGeoEditor.py:5091
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2243 appTools/ToolNCC.py:2770
@@ -1007,8 +1007,8 @@ msgstr "Estándar"
 msgid "Seed"
 msgstr "Semilla"
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
-#: appEditors/FlatCAMGeoEditor.py:5095
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
+#: appEditors/appGeoEditor.py:5095
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2254 appTools/ToolPaint.py:389
@@ -1032,7 +1032,7 @@ msgstr "Combo"
 msgid "Connect"
 msgstr "Conectar"
 
-#: appDatabase.py:1512 appDatabase.py:1629 appEditors/FlatCAMGeoEditor.py:507
+#: appDatabase.py:1512 appDatabase.py:1629 appEditors/appGeoEditor.py:507
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:239
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:226
 #: appTools/ToolNCC.py:443 appTools/ToolPaint.py:403
@@ -1050,7 +1050,7 @@ msgstr ""
 msgid "Contour"
 msgstr "Contorno"
 
-#: appDatabase.py:1522 appDatabase.py:1636 appEditors/FlatCAMGeoEditor.py:517
+#: appDatabase.py:1522 appDatabase.py:1636 appEditors/appGeoEditor.py:517
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:248
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:234
 #: appTools/ToolNCC.py:453 appTools/ToolPaint.py:410
@@ -1061,7 +1061,7 @@ msgstr ""
 "Corta todo el perímetro del polígono.\n"
 "Para recortar los bordes ásperos."
 
-#: appDatabase.py:1528 appEditors/FlatCAMGeoEditor.py:611
+#: appDatabase.py:1528 appEditors/appGeoEditor.py:611
 #: appEditors/FlatCAMGrbEditor.py:5304 appGUI/ObjectUI.py:143
 #: appGUI/ObjectUI.py:1394 appGUI/ObjectUI.py:2256
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:255
@@ -1084,7 +1084,7 @@ msgstr ""
 "de las características de cobre.\n"
 "El valor puede estar entre 0 y 10 unidades FlatCAM."
 
-#: appDatabase.py:1567 appEditors/FlatCAMGeoEditor.py:452
+#: appDatabase.py:1567 appEditors/appGeoEditor.py:452
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:165
 #: appTools/ToolPaint.py:330
 msgid ""
@@ -1105,7 +1105,7 @@ msgstr ""
 "Valores más altos = procesamiento lento y ejecución lenta en CNC\n"
 "debido a demasiados caminos."
 
-#: appDatabase.py:1588 appEditors/FlatCAMGeoEditor.py:472
+#: appDatabase.py:1588 appEditors/appGeoEditor.py:472
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:185
 #: appTools/ToolPaint.py:351
 msgid ""
@@ -1567,7 +1567,7 @@ msgstr "Y"
 #: appEditors/FlatCAMExcEditor.py:1800 appEditors/FlatCAMExcEditor.py:1871
 #: appEditors/FlatCAMExcEditor.py:1875 appEditors/FlatCAMExcEditor.py:1964
 #: appEditors/FlatCAMExcEditor.py:1982 appEditors/FlatCAMExcEditor.py:2016
-#: appEditors/FlatCAMGeoEditor.py:683 appEditors/FlatCAMGrbEditor.py:2822
+#: appEditors/appGeoEditor.py:683 appEditors/FlatCAMGrbEditor.py:2822
 #: appEditors/FlatCAMGrbEditor.py:2839 appEditors/FlatCAMGrbEditor.py:2875
 #: appEditors/FlatCAMGrbEditor.py:5376
 #: appGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py:94
@@ -1791,7 +1791,7 @@ msgid "Cancelled. There is no Tool/Drill selected"
 msgstr "Cancelado. No hay herramienta / taladro seleccionado"
 
 #: appEditors/FlatCAMExcEditor.py:3601 appEditors/FlatCAMExcEditor.py:3609
-#: appEditors/FlatCAMGeoEditor.py:4286 appEditors/FlatCAMGeoEditor.py:4300
+#: appEditors/appGeoEditor.py:4286 appEditors/appGeoEditor.py:4300
 #: appEditors/FlatCAMGrbEditor.py:1085 appEditors/FlatCAMGrbEditor.py:1312
 #: appEditors/FlatCAMGrbEditor.py:1497 appEditors/FlatCAMGrbEditor.py:1766
 #: appEditors/FlatCAMGrbEditor.py:4608 appEditors/FlatCAMGrbEditor.py:4625
@@ -1810,15 +1810,15 @@ msgstr "Hecho. Taladro (s) eliminado (s)."
 msgid "Click on the circular array Center position"
 msgstr "Haga clic en la posición del centro matriz circular"
 
-#: appEditors/FlatCAMGeoEditor.py:84
+#: appEditors/appGeoEditor.py:84
 msgid "Buffer distance:"
 msgstr "Dist. de amortiguación:"
 
-#: appEditors/FlatCAMGeoEditor.py:85
+#: appEditors/appGeoEditor.py:85
 msgid "Buffer corner:"
 msgstr "Rincón del búfer:"
 
-#: appEditors/FlatCAMGeoEditor.py:87
+#: appEditors/appGeoEditor.py:87
 msgid ""
 "There are 3 types of corners:\n"
 " - 'Round': the corner is rounded for exterior buffer.\n"
@@ -1833,11 +1833,11 @@ msgstr ""
 " - 'Biselado:' la esquina es una línea que conecta directamente las "
 "funciones que se encuentran en la esquina"
 
-#: appEditors/FlatCAMGeoEditor.py:93 appEditors/FlatCAMGrbEditor.py:2638
+#: appEditors/appGeoEditor.py:93 appEditors/FlatCAMGrbEditor.py:2638
 msgid "Round"
 msgstr "Redondo"
 
-#: appEditors/FlatCAMGeoEditor.py:94 appEditors/FlatCAMGrbEditor.py:2639
+#: appEditors/appGeoEditor.py:94 appEditors/FlatCAMGrbEditor.py:2639
 #: appGUI/ObjectUI.py:1149 appGUI/ObjectUI.py:2004
 #: appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py:225
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:68
@@ -1855,50 +1855,50 @@ msgstr "Redondo"
 msgid "Square"
 msgstr "Cuadrado"
 
-#: appEditors/FlatCAMGeoEditor.py:95 appEditors/FlatCAMGrbEditor.py:2640
+#: appEditors/appGeoEditor.py:95 appEditors/FlatCAMGrbEditor.py:2640
 msgid "Beveled"
 msgstr "Biselado"
 
-#: appEditors/FlatCAMGeoEditor.py:102
+#: appEditors/appGeoEditor.py:102
 msgid "Buffer Interior"
 msgstr "Interior del amortiguador"
 
-#: appEditors/FlatCAMGeoEditor.py:104
+#: appEditors/appGeoEditor.py:104
 msgid "Buffer Exterior"
 msgstr "Amortiguador exterior"
 
-#: appEditors/FlatCAMGeoEditor.py:110
+#: appEditors/appGeoEditor.py:110
 msgid "Full Buffer"
 msgstr "Buffer lleno"
 
-#: appEditors/FlatCAMGeoEditor.py:131 appEditors/FlatCAMGeoEditor.py:2959
+#: appEditors/appGeoEditor.py:131 appEditors/appGeoEditor.py:2959
 #: appGUI/MainGUI.py:4301
 #: appGUI/preferences/gerber/GerberEditorPrefGroupUI.py:191
 msgid "Buffer Tool"
 msgstr "Herramienta Buffer"
 
-#: appEditors/FlatCAMGeoEditor.py:143 appEditors/FlatCAMGeoEditor.py:160
-#: appEditors/FlatCAMGeoEditor.py:177 appEditors/FlatCAMGeoEditor.py:2978
-#: appEditors/FlatCAMGeoEditor.py:3006 appEditors/FlatCAMGeoEditor.py:3034
+#: appEditors/appGeoEditor.py:143 appEditors/appGeoEditor.py:160
+#: appEditors/appGeoEditor.py:177 appEditors/appGeoEditor.py:2978
+#: appEditors/appGeoEditor.py:3006 appEditors/appGeoEditor.py:3034
 #: appEditors/FlatCAMGrbEditor.py:5109
 msgid "Buffer distance value is missing or wrong format. Add it and retry."
 msgstr ""
 "Falta el valor de la distancia del búfer o el formato es incorrecto. "
 "Agrégalo y vuelve a intentarlo."
 
-#: appEditors/FlatCAMGeoEditor.py:241
+#: appEditors/appGeoEditor.py:241
 msgid "Font"
 msgstr "Font"
 
-#: appEditors/FlatCAMGeoEditor.py:322 appGUI/MainGUI.py:1452
+#: appEditors/appGeoEditor.py:322 appGUI/MainGUI.py:1452
 msgid "Text"
 msgstr "Texto"
 
-#: appEditors/FlatCAMGeoEditor.py:348
+#: appEditors/appGeoEditor.py:348
 msgid "Text Tool"
 msgstr "Herramienta de texto"
 
-#: appEditors/FlatCAMGeoEditor.py:404 appGUI/MainGUI.py:502
+#: appEditors/appGeoEditor.py:404 appGUI/MainGUI.py:502
 #: appGUI/MainGUI.py:1199 appGUI/ObjectUI.py:597 appGUI/ObjectUI.py:1564
 #: appObjects/FlatCAMExcellon.py:852 appObjects/FlatCAMExcellon.py:1242
 #: appObjects/FlatCAMGeometry.py:825 appTools/ToolIsolation.py:313
@@ -1907,15 +1907,15 @@ msgstr "Herramienta de texto"
 msgid "Tool"
 msgstr "Herramienta"
 
-#: appEditors/FlatCAMGeoEditor.py:438
+#: appEditors/appGeoEditor.py:438
 msgid "Tool dia"
 msgstr "Diá. de la herramienta"
 
-#: appEditors/FlatCAMGeoEditor.py:440
+#: appEditors/appGeoEditor.py:440
 msgid "Diameter of the tool to be used in the operation."
 msgstr "Diámetro de la herramienta a utilizar en la operación."
 
-#: appEditors/FlatCAMGeoEditor.py:486
+#: appEditors/appGeoEditor.py:486
 msgid ""
 "Algorithm to paint the polygons:\n"
 "- Standard: Fixed step inwards.\n"
@@ -1927,57 +1927,57 @@ msgstr ""
 "- Basado en semillas: hacia afuera de la semilla.\n"
 "- Basado en líneas: líneas paralelas."
 
-#: appEditors/FlatCAMGeoEditor.py:505
+#: appEditors/appGeoEditor.py:505
 msgid "Connect:"
 msgstr "Conectar:"
 
-#: appEditors/FlatCAMGeoEditor.py:515
+#: appEditors/appGeoEditor.py:515
 msgid "Contour:"
 msgstr "Contorno:"
 
-#: appEditors/FlatCAMGeoEditor.py:528 appGUI/MainGUI.py:1456
+#: appEditors/appGeoEditor.py:528 appGUI/MainGUI.py:1456
 msgid "Paint"
 msgstr "Pintar"
 
-#: appEditors/FlatCAMGeoEditor.py:546 appGUI/MainGUI.py:912
+#: appEditors/appGeoEditor.py:546 appGUI/MainGUI.py:912
 #: appGUI/MainGUI.py:1944 appGUI/ObjectUI.py:2069 appTools/ToolPaint.py:42
 #: appTools/ToolPaint.py:737
 msgid "Paint Tool"
 msgstr "Herramienta de pintura"
 
-#: appEditors/FlatCAMGeoEditor.py:582 appEditors/FlatCAMGeoEditor.py:1071
-#: appEditors/FlatCAMGeoEditor.py:2966 appEditors/FlatCAMGeoEditor.py:2994
-#: appEditors/FlatCAMGeoEditor.py:3022 appEditors/FlatCAMGeoEditor.py:4439
+#: appEditors/appGeoEditor.py:582 appEditors/appGeoEditor.py:1071
+#: appEditors/appGeoEditor.py:2966 appEditors/appGeoEditor.py:2994
+#: appEditors/appGeoEditor.py:3022 appEditors/appGeoEditor.py:4439
 #: appEditors/FlatCAMGrbEditor.py:5764
 msgid "Cancelled. No shape selected."
 msgstr "Cancelado. Ninguna forma seleccionada."
 
-#: appEditors/FlatCAMGeoEditor.py:595 appEditors/FlatCAMGeoEditor.py:2984
-#: appEditors/FlatCAMGeoEditor.py:3012 appEditors/FlatCAMGeoEditor.py:3040
+#: appEditors/appGeoEditor.py:595 appEditors/appGeoEditor.py:2984
+#: appEditors/appGeoEditor.py:3012 appEditors/appGeoEditor.py:3040
 #: appGUI/preferences/geometry/GeometryGenPrefGroupUI.py:69
 #: appTools/ToolProperties.py:117 appTools/ToolProperties.py:162
 msgid "Tools"
 msgstr "Herramientas"
 
-#: appEditors/FlatCAMGeoEditor.py:606 appEditors/FlatCAMGeoEditor.py:1035
+#: appEditors/appGeoEditor.py:606 appEditors/appGeoEditor.py:1035
 #: appEditors/FlatCAMGrbEditor.py:5299 appEditors/FlatCAMGrbEditor.py:5728
 #: appGUI/MainGUI.py:935 appGUI/MainGUI.py:1967 appTools/ToolTransform.py:494
 msgid "Transform Tool"
 msgstr "Herramienta de transformación"
 
-#: appEditors/FlatCAMGeoEditor.py:607 appEditors/FlatCAMGeoEditor.py:699
+#: appEditors/appGeoEditor.py:607 appEditors/appGeoEditor.py:699
 #: appEditors/FlatCAMGrbEditor.py:5300 appEditors/FlatCAMGrbEditor.py:5392
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:88
 #: appTools/ToolTransform.py:27 appTools/ToolTransform.py:146
 msgid "Rotate"
 msgstr "Girar"
 
-#: appEditors/FlatCAMGeoEditor.py:608 appEditors/FlatCAMGrbEditor.py:5301
+#: appEditors/appGeoEditor.py:608 appEditors/FlatCAMGrbEditor.py:5301
 #: appTools/ToolTransform.py:28
 msgid "Skew/Shear"
 msgstr "Sesgo / cizalla"
 
-#: appEditors/FlatCAMGeoEditor.py:609 appEditors/FlatCAMGrbEditor.py:2687
+#: appEditors/appGeoEditor.py:609 appEditors/FlatCAMGrbEditor.py:2687
 #: appEditors/FlatCAMGrbEditor.py:5302 appGUI/MainGUI.py:1057
 #: appGUI/MainGUI.py:1499 appGUI/MainGUI.py:2089 appGUI/MainGUI.py:4513
 #: appGUI/ObjectUI.py:125
@@ -1986,12 +1986,12 @@ msgstr "Sesgo / cizalla"
 msgid "Scale"
 msgstr "Escala"
 
-#: appEditors/FlatCAMGeoEditor.py:610 appEditors/FlatCAMGrbEditor.py:5303
+#: appEditors/appGeoEditor.py:610 appEditors/FlatCAMGrbEditor.py:5303
 #: appTools/ToolTransform.py:30
 msgid "Mirror (Flip)"
 msgstr "Espejo (Flip)"
 
-#: appEditors/FlatCAMGeoEditor.py:612 appEditors/FlatCAMGrbEditor.py:2647
+#: appEditors/appGeoEditor.py:612 appEditors/FlatCAMGrbEditor.py:2647
 #: appEditors/FlatCAMGrbEditor.py:5305 appGUI/MainGUI.py:1055
 #: appGUI/MainGUI.py:1454 appGUI/MainGUI.py:1497 appGUI/MainGUI.py:2087
 #: appGUI/MainGUI.py:4511
@@ -2000,7 +2000,7 @@ msgstr "Espejo (Flip)"
 msgid "Buffer"
 msgstr "Buffer"
 
-#: appEditors/FlatCAMGeoEditor.py:643 appEditors/FlatCAMGrbEditor.py:5336
+#: appEditors/appGeoEditor.py:643 appEditors/FlatCAMGrbEditor.py:5336
 #: appGUI/GUIElements.py:2701
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:169
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:44
@@ -2009,7 +2009,7 @@ msgstr "Buffer"
 msgid "Reference"
 msgstr "Referencia"
 
-#: appEditors/FlatCAMGeoEditor.py:645 appEditors/FlatCAMGrbEditor.py:5338
+#: appEditors/appGeoEditor.py:645 appEditors/FlatCAMGrbEditor.py:5338
 msgid ""
 "The reference point for Rotate, Skew, Scale, Mirror.\n"
 "Can be:\n"
@@ -2028,14 +2028,14 @@ msgstr ""
 "- Min Selection -> el punto (minx, miny) del cuadro delimitador de la "
 "selección"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
 #: appTools/ToolCalibration.py:770 appTools/ToolCalibration.py:771
 #: appTools/ToolTransform.py:70
 msgid "Origin"
 msgstr "Origen"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGeoEditor.py:1044
+#: appEditors/appGeoEditor.py:653 appEditors/appGeoEditor.py:1044
 #: appEditors/FlatCAMGrbEditor.py:5346 appEditors/FlatCAMGrbEditor.py:5737
 #: appGUI/preferences/general/GeneralGUIPrefGroupUI.py:250
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:275
@@ -2047,7 +2047,7 @@ msgstr "Origen"
 msgid "Selection"
 msgstr "Selección"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 #: appGUI/preferences/tools/Tools2sidedPrefGroupUI.py:80
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:60
@@ -2055,11 +2055,11 @@ msgstr "Selección"
 msgid "Point"
 msgstr "Punto"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 msgid "Minimum"
 msgstr "Mínimo"
 
-#: appEditors/FlatCAMGeoEditor.py:659 appEditors/FlatCAMGeoEditor.py:955
+#: appEditors/appGeoEditor.py:659 appEditors/appGeoEditor.py:955
 #: appEditors/FlatCAMGrbEditor.py:5352 appEditors/FlatCAMGrbEditor.py:5648
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:131
 #: appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py:133
@@ -2070,13 +2070,13 @@ msgstr "Mínimo"
 msgid "Value"
 msgstr "Valor"
 
-#: appEditors/FlatCAMGeoEditor.py:661 appEditors/FlatCAMGrbEditor.py:5354
+#: appEditors/appGeoEditor.py:661 appEditors/FlatCAMGrbEditor.py:5354
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:62
 #: appTools/ToolTransform.py:78
 msgid "A point of reference in format X,Y."
 msgstr "Un punto de referencia en formato X, Y."
 
-#: appEditors/FlatCAMGeoEditor.py:668 appEditors/FlatCAMGrbEditor.py:2590
+#: appEditors/appGeoEditor.py:668 appEditors/FlatCAMGrbEditor.py:2590
 #: appEditors/FlatCAMGrbEditor.py:5361 appGUI/ObjectUI.py:1494
 #: appTools/ToolDblSided.py:192 appTools/ToolDblSided.py:425
 #: appTools/ToolIsolation.py:276 appTools/ToolIsolation.py:631
@@ -2087,12 +2087,12 @@ msgstr "Un punto de referencia en formato X, Y."
 msgid "Add"
 msgstr "Añadir"
 
-#: appEditors/FlatCAMGeoEditor.py:670 appEditors/FlatCAMGrbEditor.py:5363
+#: appEditors/appGeoEditor.py:670 appEditors/FlatCAMGrbEditor.py:5363
 #: appTools/ToolTransform.py:87
 msgid "Add point coordinates from clipboard."
 msgstr "Agregar coordenadas de puntos desde el portapapeles."
 
-#: appEditors/FlatCAMGeoEditor.py:685 appEditors/FlatCAMGrbEditor.py:5378
+#: appEditors/appGeoEditor.py:685 appEditors/FlatCAMGrbEditor.py:5378
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:98
 #: appTools/ToolTransform.py:132
 msgid ""
@@ -2106,7 +2106,7 @@ msgstr ""
 "Números positivos para movimiento CW.\n"
 "Números negativos para movimiento CCW."
 
-#: appEditors/FlatCAMGeoEditor.py:701 appEditors/FlatCAMGrbEditor.py:5394
+#: appEditors/appGeoEditor.py:701 appEditors/FlatCAMGrbEditor.py:5394
 #: appTools/ToolTransform.py:148
 msgid ""
 "Rotate the selected object(s).\n"
@@ -2117,7 +2117,7 @@ msgstr ""
 "El punto de referencia es el medio de\n"
 "el cuadro delimitador para todos los objetos seleccionados."
 
-#: appEditors/FlatCAMGeoEditor.py:721 appEditors/FlatCAMGeoEditor.py:783
+#: appEditors/appGeoEditor.py:721 appEditors/appGeoEditor.py:783
 #: appEditors/FlatCAMGrbEditor.py:5414 appEditors/FlatCAMGrbEditor.py:5476
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:112
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:151
@@ -2125,7 +2125,7 @@ msgstr ""
 msgid "Link"
 msgstr "Enlazar"
 
-#: appEditors/FlatCAMGeoEditor.py:723 appEditors/FlatCAMGeoEditor.py:785
+#: appEditors/appGeoEditor.py:723 appEditors/appGeoEditor.py:785
 #: appEditors/FlatCAMGrbEditor.py:5416 appEditors/FlatCAMGrbEditor.py:5478
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:114
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:153
@@ -2133,14 +2133,14 @@ msgstr "Enlazar"
 msgid "Link the Y entry to X entry and copy its content."
 msgstr "Enlace la entrada Y a la entrada X y copie su contenido."
 
-#: appEditors/FlatCAMGeoEditor.py:728 appEditors/FlatCAMGrbEditor.py:5421
+#: appEditors/appGeoEditor.py:728 appEditors/FlatCAMGrbEditor.py:5421
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:151
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:124
 #: appTools/ToolFilm.py:184 appTools/ToolTransform.py:175
 msgid "X angle"
 msgstr "Ángulo X"
 
-#: appEditors/FlatCAMGeoEditor.py:730 appEditors/FlatCAMGeoEditor.py:751
+#: appEditors/appGeoEditor.py:730 appEditors/appGeoEditor.py:751
 #: appEditors/FlatCAMGrbEditor.py:5423 appEditors/FlatCAMGrbEditor.py:5444
 #: appTools/ToolTransform.py:177 appTools/ToolTransform.py:198
 msgid ""
@@ -2150,12 +2150,12 @@ msgstr ""
 "Ángulo para sesgo de acción, en grados.\n"
 "Número de flotación entre -360 y 360."
 
-#: appEditors/FlatCAMGeoEditor.py:738 appEditors/FlatCAMGrbEditor.py:5431
+#: appEditors/appGeoEditor.py:738 appEditors/FlatCAMGrbEditor.py:5431
 #: appTools/ToolTransform.py:185
 msgid "Skew X"
 msgstr "Sesgo x"
 
-#: appEditors/FlatCAMGeoEditor.py:740 appEditors/FlatCAMGeoEditor.py:761
+#: appEditors/appGeoEditor.py:740 appEditors/appGeoEditor.py:761
 #: appEditors/FlatCAMGrbEditor.py:5433 appEditors/FlatCAMGrbEditor.py:5454
 #: appTools/ToolTransform.py:187 appTools/ToolTransform.py:208
 msgid ""
@@ -2167,37 +2167,37 @@ msgstr ""
 "El punto de referencia es el medio de\n"
 "el cuadro delimitador para todos los objetos seleccionados."
 
-#: appEditors/FlatCAMGeoEditor.py:749 appEditors/FlatCAMGrbEditor.py:5442
+#: appEditors/appGeoEditor.py:749 appEditors/FlatCAMGrbEditor.py:5442
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:160
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:138
 #: appTools/ToolFilm.py:193 appTools/ToolTransform.py:196
 msgid "Y angle"
 msgstr "Ángulo Y"
 
-#: appEditors/FlatCAMGeoEditor.py:759 appEditors/FlatCAMGrbEditor.py:5452
+#: appEditors/appGeoEditor.py:759 appEditors/FlatCAMGrbEditor.py:5452
 #: appTools/ToolTransform.py:206
 msgid "Skew Y"
 msgstr "Sesgo y"
 
-#: appEditors/FlatCAMGeoEditor.py:790 appEditors/FlatCAMGrbEditor.py:5483
+#: appEditors/appGeoEditor.py:790 appEditors/FlatCAMGrbEditor.py:5483
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:120
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:162
 #: appTools/ToolFilm.py:145 appTools/ToolTransform.py:237
 msgid "X factor"
 msgstr "Factor X"
 
-#: appEditors/FlatCAMGeoEditor.py:792 appEditors/FlatCAMGrbEditor.py:5485
+#: appEditors/appGeoEditor.py:792 appEditors/FlatCAMGrbEditor.py:5485
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:164
 #: appTools/ToolTransform.py:239
 msgid "Factor for scaling on X axis."
 msgstr "Factor de escalado en eje X."
 
-#: appEditors/FlatCAMGeoEditor.py:799 appEditors/FlatCAMGrbEditor.py:5492
+#: appEditors/appGeoEditor.py:799 appEditors/FlatCAMGrbEditor.py:5492
 #: appTools/ToolTransform.py:246
 msgid "Scale X"
 msgstr "Escala x"
 
-#: appEditors/FlatCAMGeoEditor.py:801 appEditors/FlatCAMGeoEditor.py:821
+#: appEditors/appGeoEditor.py:801 appEditors/appGeoEditor.py:821
 #: appEditors/FlatCAMGrbEditor.py:5494 appEditors/FlatCAMGrbEditor.py:5514
 #: appTools/ToolTransform.py:248 appTools/ToolTransform.py:268
 msgid ""
@@ -2209,58 +2209,58 @@ msgstr ""
 "El punto de referencia depende de\n"
 "el estado de la casilla de verificación Escalar referencia."
 
-#: appEditors/FlatCAMGeoEditor.py:810 appEditors/FlatCAMGrbEditor.py:5503
+#: appEditors/appGeoEditor.py:810 appEditors/FlatCAMGrbEditor.py:5503
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:129
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:175
 #: appTools/ToolFilm.py:154 appTools/ToolTransform.py:257
 msgid "Y factor"
 msgstr "Factor Y"
 
-#: appEditors/FlatCAMGeoEditor.py:812 appEditors/FlatCAMGrbEditor.py:5505
+#: appEditors/appGeoEditor.py:812 appEditors/FlatCAMGrbEditor.py:5505
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:177
 #: appTools/ToolTransform.py:259
 msgid "Factor for scaling on Y axis."
 msgstr "Factor de escalado en eje Y."
 
-#: appEditors/FlatCAMGeoEditor.py:819 appEditors/FlatCAMGrbEditor.py:5512
+#: appEditors/appGeoEditor.py:819 appEditors/FlatCAMGrbEditor.py:5512
 #: appTools/ToolTransform.py:266
 msgid "Scale Y"
 msgstr "Escala Y"
 
-#: appEditors/FlatCAMGeoEditor.py:846 appEditors/FlatCAMGrbEditor.py:5539
+#: appEditors/appGeoEditor.py:846 appEditors/FlatCAMGrbEditor.py:5539
 #: appTools/ToolTransform.py:293
 msgid "Flip on X"
 msgstr "Voltear en X"
 
-#: appEditors/FlatCAMGeoEditor.py:848 appEditors/FlatCAMGeoEditor.py:853
+#: appEditors/appGeoEditor.py:848 appEditors/appGeoEditor.py:853
 #: appEditors/FlatCAMGrbEditor.py:5541 appEditors/FlatCAMGrbEditor.py:5546
 #: appTools/ToolTransform.py:295 appTools/ToolTransform.py:300
 msgid "Flip the selected object(s) over the X axis."
 msgstr "Voltee los objetos seleccionados sobre el eje X."
 
-#: appEditors/FlatCAMGeoEditor.py:851 appEditors/FlatCAMGrbEditor.py:5544
+#: appEditors/appGeoEditor.py:851 appEditors/FlatCAMGrbEditor.py:5544
 #: appTools/ToolTransform.py:298
 msgid "Flip on Y"
 msgstr "Voltear en Y"
 
-#: appEditors/FlatCAMGeoEditor.py:871 appEditors/FlatCAMGrbEditor.py:5564
+#: appEditors/appGeoEditor.py:871 appEditors/FlatCAMGrbEditor.py:5564
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:191
 #: appTools/ToolTransform.py:318
 msgid "X val"
 msgstr "Valor X"
 
-#: appEditors/FlatCAMGeoEditor.py:873 appEditors/FlatCAMGrbEditor.py:5566
+#: appEditors/appGeoEditor.py:873 appEditors/FlatCAMGrbEditor.py:5566
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:193
 #: appTools/ToolTransform.py:320
 msgid "Distance to offset on X axis. In current units."
 msgstr "Distancia a desplazamiento en el eje X. En unidades actuales."
 
-#: appEditors/FlatCAMGeoEditor.py:880 appEditors/FlatCAMGrbEditor.py:5573
+#: appEditors/appGeoEditor.py:880 appEditors/FlatCAMGrbEditor.py:5573
 #: appTools/ToolTransform.py:327
 msgid "Offset X"
 msgstr "Offset X"
 
-#: appEditors/FlatCAMGeoEditor.py:882 appEditors/FlatCAMGeoEditor.py:902
+#: appEditors/appGeoEditor.py:882 appEditors/appGeoEditor.py:902
 #: appEditors/FlatCAMGrbEditor.py:5575 appEditors/FlatCAMGrbEditor.py:5595
 #: appTools/ToolTransform.py:329 appTools/ToolTransform.py:349
 msgid ""
@@ -2272,31 +2272,31 @@ msgstr ""
 "El punto de referencia es el medio de\n"
 "el cuadro delimitador para todos los objetos seleccionados.\n"
 
-#: appEditors/FlatCAMGeoEditor.py:891 appEditors/FlatCAMGrbEditor.py:5584
+#: appEditors/appGeoEditor.py:891 appEditors/FlatCAMGrbEditor.py:5584
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:204
 #: appTools/ToolTransform.py:338
 msgid "Y val"
 msgstr "Valor Y"
 
-#: appEditors/FlatCAMGeoEditor.py:893 appEditors/FlatCAMGrbEditor.py:5586
+#: appEditors/appGeoEditor.py:893 appEditors/FlatCAMGrbEditor.py:5586
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:206
 #: appTools/ToolTransform.py:340
 msgid "Distance to offset on Y axis. In current units."
 msgstr "Distancia a desplazamiento en el eje Y. En unidades actuales."
 
-#: appEditors/FlatCAMGeoEditor.py:900 appEditors/FlatCAMGrbEditor.py:5593
+#: appEditors/appGeoEditor.py:900 appEditors/FlatCAMGrbEditor.py:5593
 #: appTools/ToolTransform.py:347
 msgid "Offset Y"
 msgstr "Offset Y"
 
-#: appEditors/FlatCAMGeoEditor.py:920 appEditors/FlatCAMGrbEditor.py:5613
+#: appEditors/appGeoEditor.py:920 appEditors/FlatCAMGrbEditor.py:5613
 #: appGUI/preferences/tools/Tools2QRCodePrefGroupUI.py:142
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:216
 #: appTools/ToolQRCode.py:206 appTools/ToolTransform.py:367
 msgid "Rounded"
 msgstr "Redondeado"
 
-#: appEditors/FlatCAMGeoEditor.py:922 appEditors/FlatCAMGrbEditor.py:5615
+#: appEditors/appGeoEditor.py:922 appEditors/FlatCAMGrbEditor.py:5615
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:218
 #: appTools/ToolTransform.py:369
 msgid ""
@@ -2310,14 +2310,14 @@ msgstr ""
 "Si no está marcado, el búfer seguirá la geometría exacta\n"
 "de la forma amortiguada."
 
-#: appEditors/FlatCAMGeoEditor.py:930 appEditors/FlatCAMGrbEditor.py:5623
+#: appEditors/appGeoEditor.py:930 appEditors/FlatCAMGrbEditor.py:5623
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:226
 #: appTools/ToolDistance.py:505 appTools/ToolDistanceMin.py:286
 #: appTools/ToolTransform.py:377
 msgid "Distance"
 msgstr "Distancia"
 
-#: appEditors/FlatCAMGeoEditor.py:932 appEditors/FlatCAMGrbEditor.py:5625
+#: appEditors/appGeoEditor.py:932 appEditors/FlatCAMGrbEditor.py:5625
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:228
 #: appTools/ToolTransform.py:379
 msgid ""
@@ -2331,12 +2331,12 @@ msgstr ""
 "Cada elemento de geometría del objeto se incrementará\n"
 "o disminuido con la 'distancia'."
 
-#: appEditors/FlatCAMGeoEditor.py:944 appEditors/FlatCAMGrbEditor.py:5637
+#: appEditors/appGeoEditor.py:944 appEditors/FlatCAMGrbEditor.py:5637
 #: appTools/ToolTransform.py:391
 msgid "Buffer D"
 msgstr "Buffer D"
 
-#: appEditors/FlatCAMGeoEditor.py:946 appEditors/FlatCAMGrbEditor.py:5639
+#: appEditors/appGeoEditor.py:946 appEditors/FlatCAMGrbEditor.py:5639
 #: appTools/ToolTransform.py:393
 msgid ""
 "Create the buffer effect on each geometry,\n"
@@ -2345,7 +2345,7 @@ msgstr ""
 "Crea el efecto de amortiguación en cada geometría,\n"
 "elemento del objeto seleccionado, utilizando la distancia."
 
-#: appEditors/FlatCAMGeoEditor.py:957 appEditors/FlatCAMGrbEditor.py:5650
+#: appEditors/appGeoEditor.py:957 appEditors/FlatCAMGrbEditor.py:5650
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:245
 #: appTools/ToolTransform.py:404
 msgid ""
@@ -2361,12 +2361,12 @@ msgstr ""
 "o disminuido para ajustarse al 'Valor'. El Valor es un porcentaje\n"
 "de la dimensión inicial."
 
-#: appEditors/FlatCAMGeoEditor.py:970 appEditors/FlatCAMGrbEditor.py:5663
+#: appEditors/appGeoEditor.py:970 appEditors/FlatCAMGrbEditor.py:5663
 #: appTools/ToolTransform.py:417
 msgid "Buffer F"
 msgstr "Buffer F"
 
-#: appEditors/FlatCAMGeoEditor.py:972 appEditors/FlatCAMGrbEditor.py:5665
+#: appEditors/appGeoEditor.py:972 appEditors/FlatCAMGrbEditor.py:5665
 #: appTools/ToolTransform.py:419
 msgid ""
 "Create the buffer effect on each geometry,\n"
@@ -2375,7 +2375,7 @@ msgstr ""
 "Crea el efecto de amortiguación en cada geometría,\n"
 "elemento del objeto seleccionado, utilizando el factor."
 
-#: appEditors/FlatCAMGeoEditor.py:1043 appEditors/FlatCAMGrbEditor.py:5736
+#: appEditors/appGeoEditor.py:1043 appEditors/FlatCAMGrbEditor.py:5736
 #: appGUI/ObjectUI.py:1103 appGUI/ObjectUI.py:1958
 #: appGUI/preferences/tools/Tools2CalPrefGroupUI.py:48
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
@@ -2386,328 +2386,328 @@ msgstr ""
 msgid "Object"
 msgstr "Objeto"
 
-#: appEditors/FlatCAMGeoEditor.py:1107 appEditors/FlatCAMGeoEditor.py:1130
-#: appEditors/FlatCAMGeoEditor.py:1276 appEditors/FlatCAMGeoEditor.py:1301
-#: appEditors/FlatCAMGeoEditor.py:1335 appEditors/FlatCAMGeoEditor.py:1370
-#: appEditors/FlatCAMGeoEditor.py:1401 appEditors/FlatCAMGrbEditor.py:5800
+#: appEditors/appGeoEditor.py:1107 appEditors/appGeoEditor.py:1130
+#: appEditors/appGeoEditor.py:1276 appEditors/appGeoEditor.py:1301
+#: appEditors/appGeoEditor.py:1335 appEditors/appGeoEditor.py:1370
+#: appEditors/appGeoEditor.py:1401 appEditors/FlatCAMGrbEditor.py:5800
 #: appEditors/FlatCAMGrbEditor.py:5823 appEditors/FlatCAMGrbEditor.py:5968
 #: appEditors/FlatCAMGrbEditor.py:6001 appEditors/FlatCAMGrbEditor.py:6044
 #: appEditors/FlatCAMGrbEditor.py:6085 appEditors/FlatCAMGrbEditor.py:6121
 msgid "No shape selected."
 msgstr "Ninguna forma seleccionada."
 
-#: appEditors/FlatCAMGeoEditor.py:1115 appEditors/FlatCAMGrbEditor.py:5808
+#: appEditors/appGeoEditor.py:1115 appEditors/FlatCAMGrbEditor.py:5808
 #: appTools/ToolTransform.py:585
 msgid "Incorrect format for Point value. Needs format X,Y"
 msgstr "Formato incorrecto para el valor del punto. Necesita formato X, Y"
 
-#: appEditors/FlatCAMGeoEditor.py:1140 appEditors/FlatCAMGrbEditor.py:5833
+#: appEditors/appGeoEditor.py:1140 appEditors/FlatCAMGrbEditor.py:5833
 #: appTools/ToolTransform.py:602
 msgid "Rotate transformation can not be done for a value of 0."
 msgstr "La transformación de rotación no se puede hacer para un valor de 0."
 
-#: appEditors/FlatCAMGeoEditor.py:1198 appEditors/FlatCAMGeoEditor.py:1219
+#: appEditors/appGeoEditor.py:1198 appEditors/appGeoEditor.py:1219
 #: appEditors/FlatCAMGrbEditor.py:5891 appEditors/FlatCAMGrbEditor.py:5912
 #: appTools/ToolTransform.py:660 appTools/ToolTransform.py:681
 msgid "Scale transformation can not be done for a factor of 0 or 1."
 msgstr "La transformación de escala no se puede hacer para un factor de 0 o 1."
 
-#: appEditors/FlatCAMGeoEditor.py:1232 appEditors/FlatCAMGeoEditor.py:1241
+#: appEditors/appGeoEditor.py:1232 appEditors/appGeoEditor.py:1241
 #: appEditors/FlatCAMGrbEditor.py:5925 appEditors/FlatCAMGrbEditor.py:5934
 #: appTools/ToolTransform.py:694 appTools/ToolTransform.py:703
 msgid "Offset transformation can not be done for a value of 0."
 msgstr ""
 "La transformación de compensación no se puede hacer para un valor de 0."
 
-#: appEditors/FlatCAMGeoEditor.py:1271 appEditors/FlatCAMGrbEditor.py:5971
+#: appEditors/appGeoEditor.py:1271 appEditors/FlatCAMGrbEditor.py:5971
 #: appTools/ToolTransform.py:731
 msgid "Appying Rotate"
 msgstr "Aplicando rotar"
 
-#: appEditors/FlatCAMGeoEditor.py:1284 appEditors/FlatCAMGrbEditor.py:5983
+#: appEditors/appGeoEditor.py:1284 appEditors/FlatCAMGrbEditor.py:5983
 msgid "Done. Rotate completed."
 msgstr "Hecho. Rotación completada."
 
-#: appEditors/FlatCAMGeoEditor.py:1286
+#: appEditors/appGeoEditor.py:1286
 msgid "Rotation action was not executed"
 msgstr "La acción de rotación no se ejecutó"
 
-#: appEditors/FlatCAMGeoEditor.py:1304 appEditors/FlatCAMGrbEditor.py:6004
+#: appEditors/appGeoEditor.py:1304 appEditors/FlatCAMGrbEditor.py:6004
 #: appTools/ToolTransform.py:757
 msgid "Applying Flip"
 msgstr "Aplicando Voltear"
 
-#: appEditors/FlatCAMGeoEditor.py:1312 appEditors/FlatCAMGrbEditor.py:6016
+#: appEditors/appGeoEditor.py:1312 appEditors/FlatCAMGrbEditor.py:6016
 #: appTools/ToolTransform.py:774
 msgid "Flip on the Y axis done"
 msgstr "Voltear sobre el eje Y hecho"
 
-#: appEditors/FlatCAMGeoEditor.py:1315 appEditors/FlatCAMGrbEditor.py:6024
+#: appEditors/appGeoEditor.py:1315 appEditors/FlatCAMGrbEditor.py:6024
 #: appTools/ToolTransform.py:783
 msgid "Flip on the X axis done"
 msgstr "Voltear en el eje X hecho"
 
-#: appEditors/FlatCAMGeoEditor.py:1319
+#: appEditors/appGeoEditor.py:1319
 msgid "Flip action was not executed"
 msgstr "La acción de voltear no se ejecutó"
 
-#: appEditors/FlatCAMGeoEditor.py:1338 appEditors/FlatCAMGrbEditor.py:6047
+#: appEditors/appGeoEditor.py:1338 appEditors/FlatCAMGrbEditor.py:6047
 #: appTools/ToolTransform.py:804
 msgid "Applying Skew"
 msgstr "Aplicando Sesgo"
 
-#: appEditors/FlatCAMGeoEditor.py:1347 appEditors/FlatCAMGrbEditor.py:6063
+#: appEditors/appGeoEditor.py:1347 appEditors/FlatCAMGrbEditor.py:6063
 msgid "Skew on the X axis done"
 msgstr "Sesgar sobre el eje X hecho"
 
-#: appEditors/FlatCAMGeoEditor.py:1349 appEditors/FlatCAMGrbEditor.py:6065
+#: appEditors/appGeoEditor.py:1349 appEditors/FlatCAMGrbEditor.py:6065
 msgid "Skew on the Y axis done"
 msgstr "Sesgar sobre el eje Y hecho"
 
-#: appEditors/FlatCAMGeoEditor.py:1352
+#: appEditors/appGeoEditor.py:1352
 msgid "Skew action was not executed"
 msgstr "La acción sesgada no se ejecutó"
 
-#: appEditors/FlatCAMGeoEditor.py:1373 appEditors/FlatCAMGrbEditor.py:6088
+#: appEditors/appGeoEditor.py:1373 appEditors/FlatCAMGrbEditor.py:6088
 #: appTools/ToolTransform.py:831
 msgid "Applying Scale"
 msgstr "Aplicando la escala"
 
-#: appEditors/FlatCAMGeoEditor.py:1382 appEditors/FlatCAMGrbEditor.py:6101
+#: appEditors/appGeoEditor.py:1382 appEditors/FlatCAMGrbEditor.py:6101
 msgid "Scale on the X axis done"
 msgstr "Escala en el eje X hecho"
 
-#: appEditors/FlatCAMGeoEditor.py:1384 appEditors/FlatCAMGrbEditor.py:6103
+#: appEditors/appGeoEditor.py:1384 appEditors/FlatCAMGrbEditor.py:6103
 msgid "Scale on the Y axis done"
 msgstr "Escala en el eje Y hecho"
 
-#: appEditors/FlatCAMGeoEditor.py:1386
+#: appEditors/appGeoEditor.py:1386
 msgid "Scale action was not executed"
 msgstr "La acción de escala no se ejecutó"
 
-#: appEditors/FlatCAMGeoEditor.py:1404 appEditors/FlatCAMGrbEditor.py:6124
+#: appEditors/appGeoEditor.py:1404 appEditors/FlatCAMGrbEditor.py:6124
 #: appTools/ToolTransform.py:859
 msgid "Applying Offset"
 msgstr "Aplicando Offset"
 
-#: appEditors/FlatCAMGeoEditor.py:1414 appEditors/FlatCAMGrbEditor.py:6145
+#: appEditors/appGeoEditor.py:1414 appEditors/FlatCAMGrbEditor.py:6145
 msgid "Offset on the X axis done"
 msgstr "Offset en el eje X hecho"
 
-#: appEditors/FlatCAMGeoEditor.py:1416 appEditors/FlatCAMGrbEditor.py:6147
+#: appEditors/appGeoEditor.py:1416 appEditors/FlatCAMGrbEditor.py:6147
 msgid "Offset on the Y axis done"
 msgstr "Offset en el eje Y hecho"
 
-#: appEditors/FlatCAMGeoEditor.py:1419
+#: appEditors/appGeoEditor.py:1419
 msgid "Offset action was not executed"
 msgstr "La acción de desplazamiento no se ejecutó"
 
-#: appEditors/FlatCAMGeoEditor.py:1426 appEditors/FlatCAMGrbEditor.py:6157
+#: appEditors/appGeoEditor.py:1426 appEditors/FlatCAMGrbEditor.py:6157
 msgid "No shape selected"
 msgstr "Ninguna forma seleccionada"
 
-#: appEditors/FlatCAMGeoEditor.py:1429 appEditors/FlatCAMGrbEditor.py:6160
+#: appEditors/appGeoEditor.py:1429 appEditors/FlatCAMGrbEditor.py:6160
 #: appTools/ToolTransform.py:889
 msgid "Applying Buffer"
 msgstr "Aplicando Tampón"
 
-#: appEditors/FlatCAMGeoEditor.py:1436 appEditors/FlatCAMGrbEditor.py:6182
+#: appEditors/appGeoEditor.py:1436 appEditors/FlatCAMGrbEditor.py:6182
 #: appTools/ToolTransform.py:910
 msgid "Buffer done"
 msgstr "Tampón hecho"
 
-#: appEditors/FlatCAMGeoEditor.py:1440 appEditors/FlatCAMGrbEditor.py:6186
+#: appEditors/appGeoEditor.py:1440 appEditors/FlatCAMGrbEditor.py:6186
 #: appTools/ToolTransform.py:879 appTools/ToolTransform.py:915
 msgid "Action was not executed, due of"
 msgstr "La acción no se ejecutó debido a"
 
-#: appEditors/FlatCAMGeoEditor.py:1444 appEditors/FlatCAMGrbEditor.py:6190
+#: appEditors/appGeoEditor.py:1444 appEditors/FlatCAMGrbEditor.py:6190
 msgid "Rotate ..."
 msgstr "Girar ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1445 appEditors/FlatCAMGeoEditor.py:1494
-#: appEditors/FlatCAMGeoEditor.py:1509 appEditors/FlatCAMGrbEditor.py:6191
+#: appEditors/appGeoEditor.py:1445 appEditors/appGeoEditor.py:1494
+#: appEditors/appGeoEditor.py:1509 appEditors/FlatCAMGrbEditor.py:6191
 #: appEditors/FlatCAMGrbEditor.py:6240 appEditors/FlatCAMGrbEditor.py:6255
 msgid "Enter an Angle Value (degrees)"
 msgstr "Ingrese un valor de ángulo (grados)"
 
-#: appEditors/FlatCAMGeoEditor.py:1453 appEditors/FlatCAMGrbEditor.py:6199
+#: appEditors/appGeoEditor.py:1453 appEditors/FlatCAMGrbEditor.py:6199
 msgid "Geometry shape rotate done"
 msgstr "Forma de geometría rotar hecho"
 
-#: appEditors/FlatCAMGeoEditor.py:1456 appEditors/FlatCAMGrbEditor.py:6202
+#: appEditors/appGeoEditor.py:1456 appEditors/FlatCAMGrbEditor.py:6202
 msgid "Geometry shape rotate cancelled"
 msgstr "Rotación de forma de geometría cancelada"
 
-#: appEditors/FlatCAMGeoEditor.py:1461 appEditors/FlatCAMGrbEditor.py:6207
+#: appEditors/appGeoEditor.py:1461 appEditors/FlatCAMGrbEditor.py:6207
 msgid "Offset on X axis ..."
 msgstr "Offset en el eje X ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1462 appEditors/FlatCAMGeoEditor.py:1479
+#: appEditors/appGeoEditor.py:1462 appEditors/appGeoEditor.py:1479
 #: appEditors/FlatCAMGrbEditor.py:6208 appEditors/FlatCAMGrbEditor.py:6225
 msgid "Enter a distance Value"
 msgstr "Ingrese un valor de distancia"
 
-#: appEditors/FlatCAMGeoEditor.py:1470 appEditors/FlatCAMGrbEditor.py:6216
+#: appEditors/appGeoEditor.py:1470 appEditors/FlatCAMGrbEditor.py:6216
 msgid "Geometry shape offset on X axis done"
 msgstr "Forma de geometría compensada en el eje X hecho"
 
-#: appEditors/FlatCAMGeoEditor.py:1473 appEditors/FlatCAMGrbEditor.py:6219
+#: appEditors/appGeoEditor.py:1473 appEditors/FlatCAMGrbEditor.py:6219
 msgid "Geometry shape offset X cancelled"
 msgstr "Desplazamiento de forma de geometría X cancelado"
 
-#: appEditors/FlatCAMGeoEditor.py:1478 appEditors/FlatCAMGrbEditor.py:6224
+#: appEditors/appGeoEditor.py:1478 appEditors/FlatCAMGrbEditor.py:6224
 msgid "Offset on Y axis ..."
 msgstr "Offset en eje Y ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1487 appEditors/FlatCAMGrbEditor.py:6233
+#: appEditors/appGeoEditor.py:1487 appEditors/FlatCAMGrbEditor.py:6233
 msgid "Geometry shape offset on Y axis done"
 msgstr "Desplazamiento de forma de geometría en el eje Y hecho"
 
-#: appEditors/FlatCAMGeoEditor.py:1490
+#: appEditors/appGeoEditor.py:1490
 msgid "Geometry shape offset on Y axis canceled"
 msgstr "Desplazamiento de forma de geometría en eje Y cancelado"
 
-#: appEditors/FlatCAMGeoEditor.py:1493 appEditors/FlatCAMGrbEditor.py:6239
+#: appEditors/appGeoEditor.py:1493 appEditors/FlatCAMGrbEditor.py:6239
 msgid "Skew on X axis ..."
 msgstr "Sesgar en el eje X ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1502 appEditors/FlatCAMGrbEditor.py:6248
+#: appEditors/appGeoEditor.py:1502 appEditors/FlatCAMGrbEditor.py:6248
 msgid "Geometry shape skew on X axis done"
 msgstr "Forma de geometría sesgada en el eje X hecho"
 
-#: appEditors/FlatCAMGeoEditor.py:1505
+#: appEditors/appGeoEditor.py:1505
 msgid "Geometry shape skew on X axis canceled"
 msgstr "Forma geométrica sesgada en el eje X cancelada"
 
-#: appEditors/FlatCAMGeoEditor.py:1508 appEditors/FlatCAMGrbEditor.py:6254
+#: appEditors/appGeoEditor.py:1508 appEditors/FlatCAMGrbEditor.py:6254
 msgid "Skew on Y axis ..."
 msgstr "Sesgar en el eje Y ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1517 appEditors/FlatCAMGrbEditor.py:6263
+#: appEditors/appGeoEditor.py:1517 appEditors/FlatCAMGrbEditor.py:6263
 msgid "Geometry shape skew on Y axis done"
 msgstr "Forma de geometría sesgada en el eje Y hecho"
 
-#: appEditors/FlatCAMGeoEditor.py:1520
+#: appEditors/appGeoEditor.py:1520
 msgid "Geometry shape skew on Y axis canceled"
 msgstr "Forma geométrica sesgada en el eje Y cancelada"
 
-#: appEditors/FlatCAMGeoEditor.py:1950 appEditors/FlatCAMGeoEditor.py:2021
+#: appEditors/appGeoEditor.py:1950 appEditors/appGeoEditor.py:2021
 #: appEditors/FlatCAMGrbEditor.py:1444 appEditors/FlatCAMGrbEditor.py:1522
 msgid "Click on Center point ..."
 msgstr "Haga clic en el punto central ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1963 appEditors/FlatCAMGrbEditor.py:1454
+#: appEditors/appGeoEditor.py:1963 appEditors/FlatCAMGrbEditor.py:1454
 msgid "Click on Perimeter point to complete ..."
 msgstr "Haga clic en el punto del perímetro para completar ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1995
+#: appEditors/appGeoEditor.py:1995
 msgid "Done. Adding Circle completed."
 msgstr "Hecho. Añadiendo círculo completado."
 
-#: appEditors/FlatCAMGeoEditor.py:2049 appEditors/FlatCAMGrbEditor.py:1555
+#: appEditors/appGeoEditor.py:2049 appEditors/FlatCAMGrbEditor.py:1555
 msgid "Click on Start point ..."
 msgstr "Haga clic en el punto de inicio ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2051 appEditors/FlatCAMGrbEditor.py:1557
+#: appEditors/appGeoEditor.py:2051 appEditors/FlatCAMGrbEditor.py:1557
 msgid "Click on Point3 ..."
 msgstr "Haga clic en el punto 3 ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2053 appEditors/FlatCAMGrbEditor.py:1559
+#: appEditors/appGeoEditor.py:2053 appEditors/FlatCAMGrbEditor.py:1559
 msgid "Click on Stop point ..."
 msgstr "Haga clic en el punto de parada ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2058 appEditors/FlatCAMGrbEditor.py:1564
+#: appEditors/appGeoEditor.py:2058 appEditors/FlatCAMGrbEditor.py:1564
 msgid "Click on Stop point to complete ..."
 msgstr "Haga clic en el punto de parada para completar ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2060 appEditors/FlatCAMGrbEditor.py:1566
+#: appEditors/appGeoEditor.py:2060 appEditors/FlatCAMGrbEditor.py:1566
 msgid "Click on Point2 to complete ..."
 msgstr "Haga clic en el punto 2 para completar ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2062 appEditors/FlatCAMGrbEditor.py:1568
+#: appEditors/appGeoEditor.py:2062 appEditors/FlatCAMGrbEditor.py:1568
 msgid "Click on Center point to complete ..."
 msgstr "Haga clic en el punto central para completar ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2074
+#: appEditors/appGeoEditor.py:2074
 #, python-format
 msgid "Direction: %s"
 msgstr "Direccion: %s"
 
-#: appEditors/FlatCAMGeoEditor.py:2088 appEditors/FlatCAMGrbEditor.py:1594
+#: appEditors/appGeoEditor.py:2088 appEditors/FlatCAMGrbEditor.py:1594
 msgid "Mode: Start -> Stop -> Center. Click on Start point ..."
 msgstr "Modo: Inicio -> Detener -> Centro. Haga clic en el punto de inicio ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2091 appEditors/FlatCAMGrbEditor.py:1597
+#: appEditors/appGeoEditor.py:2091 appEditors/FlatCAMGrbEditor.py:1597
 msgid "Mode: Point1 -> Point3 -> Point2. Click on Point1 ..."
 msgstr "Modo: Punto1 -> Punto3 -> Punto2. Haga clic en el punto 1 ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2094 appEditors/FlatCAMGrbEditor.py:1600
+#: appEditors/appGeoEditor.py:2094 appEditors/FlatCAMGrbEditor.py:1600
 msgid "Mode: Center -> Start -> Stop. Click on Center point ..."
 msgstr "Modo: Centro -> Iniciar -> Detener. Haga clic en el punto central ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2235
+#: appEditors/appGeoEditor.py:2235
 msgid "Done. Arc completed."
 msgstr "Hecho. Arco completado."
 
-#: appEditors/FlatCAMGeoEditor.py:2266 appEditors/FlatCAMGeoEditor.py:2339
+#: appEditors/appGeoEditor.py:2266 appEditors/appGeoEditor.py:2339
 msgid "Click on 1st corner ..."
 msgstr "Haga clic en la primera esquina ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2278
+#: appEditors/appGeoEditor.py:2278
 msgid "Click on opposite corner to complete ..."
 msgstr "Haga clic en la esquina opuesta para completar ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2308
+#: appEditors/appGeoEditor.py:2308
 msgid "Done. Rectangle completed."
 msgstr "Hecho. Rectángulo completado."
 
-#: appEditors/FlatCAMGeoEditor.py:2383
+#: appEditors/appGeoEditor.py:2383
 msgid "Done. Polygon completed."
 msgstr "Hecho. Polígono completado."
 
-#: appEditors/FlatCAMGeoEditor.py:2397 appEditors/FlatCAMGeoEditor.py:2462
+#: appEditors/appGeoEditor.py:2397 appEditors/appGeoEditor.py:2462
 #: appEditors/FlatCAMGrbEditor.py:1102 appEditors/FlatCAMGrbEditor.py:1322
 msgid "Backtracked one point ..."
 msgstr "Retrocedido un punto ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2440
+#: appEditors/appGeoEditor.py:2440
 msgid "Done. Path completed."
 msgstr "Hecho. Camino completado."
 
-#: appEditors/FlatCAMGeoEditor.py:2599
+#: appEditors/appGeoEditor.py:2599
 msgid "No shape selected. Select a shape to explode"
 msgstr "Ninguna forma seleccionada. Selecciona una forma para explotar"
 
-#: appEditors/FlatCAMGeoEditor.py:2632
+#: appEditors/appGeoEditor.py:2632
 msgid "Done. Polygons exploded into lines."
 msgstr "Hecho. Los polígonos explotaron en líneas."
 
-#: appEditors/FlatCAMGeoEditor.py:2664
+#: appEditors/appGeoEditor.py:2664
 msgid "MOVE: No shape selected. Select a shape to move"
 msgstr "MOVER: No se seleccionó la forma. Selecciona una forma para mover"
 
-#: appEditors/FlatCAMGeoEditor.py:2667 appEditors/FlatCAMGeoEditor.py:2687
+#: appEditors/appGeoEditor.py:2667 appEditors/appGeoEditor.py:2687
 msgid " MOVE: Click on reference point ..."
 msgstr " MOVER: haga clic en el punto de referencia ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2672
+#: appEditors/appGeoEditor.py:2672
 msgid " Click on destination point ..."
 msgstr " Haga clic en el punto de destino ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2712
+#: appEditors/appGeoEditor.py:2712
 msgid "Done. Geometry(s) Move completed."
 msgstr "Hecho. Geometría (s) Movimiento completado."
 
-#: appEditors/FlatCAMGeoEditor.py:2845
+#: appEditors/appGeoEditor.py:2845
 msgid "Done. Geometry(s) Copy completed."
 msgstr "Hecho. Geometría (s) Copia completada."
 
-#: appEditors/FlatCAMGeoEditor.py:2876 appEditors/FlatCAMGrbEditor.py:897
+#: appEditors/appGeoEditor.py:2876 appEditors/FlatCAMGrbEditor.py:897
 msgid "Click on 1st point ..."
 msgstr "Haga clic en el primer punto ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2900
+#: appEditors/appGeoEditor.py:2900
 msgid ""
 "Font not supported. Only Regular, Bold, Italic and BoldItalic are supported. "
 "Error"
@@ -2715,83 +2715,83 @@ msgstr ""
 "Fuente no soportada. Solo se admiten las versiones Regular, Bold, Italic y "
 "BoldItalic. Error"
 
-#: appEditors/FlatCAMGeoEditor.py:2908
+#: appEditors/appGeoEditor.py:2908
 msgid "No text to add."
 msgstr "No hay texto para agregar."
 
-#: appEditors/FlatCAMGeoEditor.py:2918
+#: appEditors/appGeoEditor.py:2918
 msgid " Done. Adding Text completed."
 msgstr " Hecho. Agregando texto completado."
 
-#: appEditors/FlatCAMGeoEditor.py:2955
+#: appEditors/appGeoEditor.py:2955
 msgid "Create buffer geometry ..."
 msgstr "Crear geometría de búfer ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2990 appEditors/FlatCAMGrbEditor.py:5153
+#: appEditors/appGeoEditor.py:2990 appEditors/FlatCAMGrbEditor.py:5153
 msgid "Done. Buffer Tool completed."
 msgstr "Hecho. Herramienta de amortiguación completada."
 
-#: appEditors/FlatCAMGeoEditor.py:3018
+#: appEditors/appGeoEditor.py:3018
 msgid "Done. Buffer Int Tool completed."
 msgstr "Hecho. Herramienta interna de búfer completada."
 
-#: appEditors/FlatCAMGeoEditor.py:3046
+#: appEditors/appGeoEditor.py:3046
 msgid "Done. Buffer Ext Tool completed."
 msgstr "Hecho. Herramienta externa de búfer completada."
 
-#: appEditors/FlatCAMGeoEditor.py:3095 appEditors/FlatCAMGrbEditor.py:2160
+#: appEditors/appGeoEditor.py:3095 appEditors/FlatCAMGrbEditor.py:2160
 msgid "Select a shape to act as deletion area ..."
 msgstr "Seleccione una forma para que actúe como área de eliminación ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3097 appEditors/FlatCAMGeoEditor.py:3123
-#: appEditors/FlatCAMGeoEditor.py:3129 appEditors/FlatCAMGrbEditor.py:2162
+#: appEditors/appGeoEditor.py:3097 appEditors/appGeoEditor.py:3123
+#: appEditors/appGeoEditor.py:3129 appEditors/FlatCAMGrbEditor.py:2162
 msgid "Click to pick-up the erase shape..."
 msgstr "Haga clic para recoger la forma de borrar ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3133 appEditors/FlatCAMGrbEditor.py:2221
+#: appEditors/appGeoEditor.py:3133 appEditors/FlatCAMGrbEditor.py:2221
 msgid "Click to erase ..."
 msgstr "Haga clic para borrar ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3162 appEditors/FlatCAMGrbEditor.py:2254
+#: appEditors/appGeoEditor.py:3162 appEditors/FlatCAMGrbEditor.py:2254
 msgid "Done. Eraser tool action completed."
 msgstr "Hecho. Se ha completado la acción de la herramienta de borrador."
 
-#: appEditors/FlatCAMGeoEditor.py:3212
+#: appEditors/appGeoEditor.py:3212
 msgid "Create Paint geometry ..."
 msgstr "Crear geometría de pintura ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3225 appEditors/FlatCAMGrbEditor.py:2417
+#: appEditors/appGeoEditor.py:3225 appEditors/FlatCAMGrbEditor.py:2417
 msgid "Shape transformations ..."
 msgstr "Transformaciones de formas ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3281
+#: appEditors/appGeoEditor.py:3281
 #: appGUI/preferences/geometry/GeometryEditorPrefGroupUI.py:27
 msgid "Geometry Editor"
 msgstr "Editor de geometría"
 
-#: appEditors/FlatCAMGeoEditor.py:3287 appEditors/FlatCAMGrbEditor.py:2495
+#: appEditors/appGeoEditor.py:3287 appEditors/FlatCAMGrbEditor.py:2495
 #: appEditors/FlatCAMGrbEditor.py:3951 appGUI/ObjectUI.py:282
 #: appGUI/ObjectUI.py:1394 appGUI/ObjectUI.py:2256 appTools/ToolCutOut.py:95
 #: appTools/ToolTransform.py:92
 msgid "Type"
 msgstr "Tipo"
 
-#: appEditors/FlatCAMGeoEditor.py:3287 appGUI/ObjectUI.py:221
+#: appEditors/appGeoEditor.py:3287 appGUI/ObjectUI.py:221
 #: appGUI/ObjectUI.py:521 appGUI/ObjectUI.py:1330 appGUI/ObjectUI.py:2165
 #: appGUI/ObjectUI.py:2469 appGUI/ObjectUI.py:2536
 #: appTools/ToolCalibration.py:234 appTools/ToolFiducials.py:70
 msgid "Name"
 msgstr "Nombre"
 
-#: appEditors/FlatCAMGeoEditor.py:3539
+#: appEditors/appGeoEditor.py:3539
 msgid "Ring"
 msgstr "Anillo"
 
-#: appEditors/FlatCAMGeoEditor.py:3541
+#: appEditors/appGeoEditor.py:3541
 msgid "Line"
 msgstr "Línea"
 
-#: appEditors/FlatCAMGeoEditor.py:3543 appGUI/MainGUI.py:1446
+#: appEditors/appGeoEditor.py:3543 appGUI/MainGUI.py:1446
 #: appGUI/ObjectUI.py:1150 appGUI/ObjectUI.py:2005
 #: appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py:226
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:299
@@ -2802,47 +2802,47 @@ msgstr "Línea"
 msgid "Polygon"
 msgstr "Polígono"
 
-#: appEditors/FlatCAMGeoEditor.py:3545
+#: appEditors/appGeoEditor.py:3545
 msgid "Multi-Line"
 msgstr "Multilínea"
 
-#: appEditors/FlatCAMGeoEditor.py:3547
+#: appEditors/appGeoEditor.py:3547
 msgid "Multi-Polygon"
 msgstr "Multi-polígono"
 
-#: appEditors/FlatCAMGeoEditor.py:3554
+#: appEditors/appGeoEditor.py:3554
 msgid "Geo Elem"
 msgstr "Elemento de Geo"
 
-#: appEditors/FlatCAMGeoEditor.py:4007
+#: appEditors/appGeoEditor.py:4007
 msgid "Editing MultiGeo Geometry, tool"
 msgstr "Edición de Geometría MultiGeo, herramienta"
 
-#: appEditors/FlatCAMGeoEditor.py:4009
+#: appEditors/appGeoEditor.py:4009
 msgid "with diameter"
 msgstr "con diámetro"
 
-#: appEditors/FlatCAMGeoEditor.py:4081
+#: appEditors/appGeoEditor.py:4081
 msgid "Grid Snap enabled."
 msgstr "Ajuste de rejilla habilitado."
 
-#: appEditors/FlatCAMGeoEditor.py:4085
+#: appEditors/appGeoEditor.py:4085
 msgid "Grid Snap disabled."
 msgstr "Ajuste de rejilla deshabilitado."
 
-#: appEditors/FlatCAMGeoEditor.py:4446 appGUI/MainGUI.py:3046
+#: appEditors/appGeoEditor.py:4446 appGUI/MainGUI.py:3046
 #: appGUI/MainGUI.py:3092 appGUI/MainGUI.py:3110 appGUI/MainGUI.py:3254
 #: appGUI/MainGUI.py:3293 appGUI/MainGUI.py:3305 appGUI/MainGUI.py:3322
 msgid "Click on target point."
 msgstr "Haga clic en el punto de destino."
 
-#: appEditors/FlatCAMGeoEditor.py:4762 appEditors/FlatCAMGeoEditor.py:4797
+#: appEditors/appGeoEditor.py:4762 appEditors/appGeoEditor.py:4797
 msgid "A selection of at least 2 geo items is required to do Intersection."
 msgstr ""
 "Se requiere una selección de al menos 2 elementos geo para hacer "
 "Intersección."
 
-#: appEditors/FlatCAMGeoEditor.py:4883 appEditors/FlatCAMGeoEditor.py:4987
+#: appEditors/appGeoEditor.py:4883 appEditors/appGeoEditor.py:4987
 msgid ""
 "Negative buffer value is not accepted. Use Buffer interior to generate an "
 "'inside' shape"
@@ -2850,55 +2850,55 @@ msgstr ""
 "No se acepta el valor de búfer negativo. Usa el interior del amortiguador "
 "para generar una forma 'interior'"
 
-#: appEditors/FlatCAMGeoEditor.py:4893 appEditors/FlatCAMGeoEditor.py:4946
-#: appEditors/FlatCAMGeoEditor.py:4996
+#: appEditors/appGeoEditor.py:4893 appEditors/appGeoEditor.py:4946
+#: appEditors/appGeoEditor.py:4996
 msgid "Nothing selected for buffering."
 msgstr "Nada seleccionado para el almacenamiento en búfer."
 
-#: appEditors/FlatCAMGeoEditor.py:4898 appEditors/FlatCAMGeoEditor.py:4950
-#: appEditors/FlatCAMGeoEditor.py:5001
+#: appEditors/appGeoEditor.py:4898 appEditors/appGeoEditor.py:4950
+#: appEditors/appGeoEditor.py:5001
 msgid "Invalid distance for buffering."
 msgstr "Distancia no válida para el almacenamiento en búfer."
 
-#: appEditors/FlatCAMGeoEditor.py:4922 appEditors/FlatCAMGeoEditor.py:5021
+#: appEditors/appGeoEditor.py:4922 appEditors/appGeoEditor.py:5021
 msgid "Failed, the result is empty. Choose a different buffer value."
 msgstr "Falló, el resultado está vacío. Elija un valor de búfer diferente."
 
-#: appEditors/FlatCAMGeoEditor.py:4933
+#: appEditors/appGeoEditor.py:4933
 msgid "Full buffer geometry created."
 msgstr "Geometría de búfer completa creada."
 
-#: appEditors/FlatCAMGeoEditor.py:4939
+#: appEditors/appGeoEditor.py:4939
 msgid "Negative buffer value is not accepted."
 msgstr "No se acepta el valor negativo del búfer."
 
-#: appEditors/FlatCAMGeoEditor.py:4970
+#: appEditors/appGeoEditor.py:4970
 msgid "Failed, the result is empty. Choose a smaller buffer value."
 msgstr "Falló, el resultado está vacío. Elija un valor de búfer más pequeño."
 
-#: appEditors/FlatCAMGeoEditor.py:4980
+#: appEditors/appGeoEditor.py:4980
 msgid "Interior buffer geometry created."
 msgstr "Geometría de búfer interior creada."
 
-#: appEditors/FlatCAMGeoEditor.py:5031
+#: appEditors/appGeoEditor.py:5031
 msgid "Exterior buffer geometry created."
 msgstr "Geometría de búfer exterior creada."
 
-#: appEditors/FlatCAMGeoEditor.py:5037
+#: appEditors/appGeoEditor.py:5037
 #, python-format
 msgid "Could not do Paint. Overlap value has to be less than 100%%."
 msgstr ""
 "No se pudo pintar. El valor de superposición debe ser inferior al 100 %%."
 
-#: appEditors/FlatCAMGeoEditor.py:5044
+#: appEditors/appGeoEditor.py:5044
 msgid "Nothing selected for painting."
 msgstr "Nada seleccionado para pintar."
 
-#: appEditors/FlatCAMGeoEditor.py:5050
+#: appEditors/appGeoEditor.py:5050
 msgid "Invalid value for"
 msgstr "Valor no válido para"
 
-#: appEditors/FlatCAMGeoEditor.py:5109
+#: appEditors/appGeoEditor.py:5109
 msgid ""
 "Could not do Paint. Try a different combination of parameters. Or a "
 "different method of Paint"
@@ -2906,7 +2906,7 @@ msgstr ""
 "No se pudo pintar. Pruebe con una combinación diferente de parámetros. O un "
 "método diferente de pintura"
 
-#: appEditors/FlatCAMGeoEditor.py:5120
+#: appEditors/appGeoEditor.py:5120
 msgid "Paint done."
 msgstr "Pintura hecha."
 
diff --git a/locale/fr/LC_MESSAGES/strings.po b/locale/fr/LC_MESSAGES/strings.po
index 6899c0ae..425c08da 100644
--- a/locale/fr/LC_MESSAGES/strings.po
+++ b/locale/fr/LC_MESSAGES/strings.po
@@ -177,7 +177,7 @@ msgstr ""
 "Zone ajoutée. Cliquez pour commencer à ajouter la zone suivante ou faites un "
 "clic droit pour terminer."
 
-#: Common.py:322 appEditors/FlatCAMGeoEditor.py:2352
+#: Common.py:322 appEditors/appGeoEditor.py:2352
 #: appTools/ToolIsolation.py:2584 appTools/ToolNCC.py:1754
 #: appTools/ToolPaint.py:1647
 msgid "Click on next Point or click right mouse button to complete ..."
@@ -896,7 +896,7 @@ msgid "Conventional"
 msgstr "Conventionnel"
 
 #: appDatabase.py:1456 appDatabase.py:1565 appDatabase.py:1667
-#: appEditors/FlatCAMGeoEditor.py:450
+#: appEditors/appGeoEditor.py:450
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:167
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:182
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:163
@@ -925,7 +925,7 @@ msgstr ""
 "Valeurs supérieures = traitement lent et exécution lente sur CNC\n"
 "en raison de trop de chemins."
 
-#: appDatabase.py:1477 appDatabase.py:1586 appEditors/FlatCAMGeoEditor.py:470
+#: appDatabase.py:1477 appDatabase.py:1586 appEditors/appGeoEditor.py:470
 #: appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py:72
 #: appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py:229
 #: appGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py:59
@@ -954,7 +954,7 @@ msgstr "Marge"
 msgid "Bounding box margin."
 msgstr "Marge du cadre de sélection."
 
-#: appDatabase.py:1490 appDatabase.py:1601 appEditors/FlatCAMGeoEditor.py:484
+#: appDatabase.py:1490 appDatabase.py:1601 appEditors/appGeoEditor.py:484
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:105
 #: appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py:106
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:215
@@ -977,7 +977,7 @@ msgstr ""
 "- À base de graines: à l'extérieur des graines.\n"
 "- Ligne: lignes parallèles."
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2232 appTools/ToolNCC.py:2764
@@ -987,8 +987,8 @@ msgstr ""
 msgid "Standard"
 msgstr "Standard"
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
-#: appEditors/FlatCAMGeoEditor.py:568 appEditors/FlatCAMGeoEditor.py:5091
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
+#: appEditors/appGeoEditor.py:568 appEditors/appGeoEditor.py:5091
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2243 appTools/ToolNCC.py:2770
@@ -999,8 +999,8 @@ msgstr "Standard"
 msgid "Seed"
 msgstr "La graine"
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
-#: appEditors/FlatCAMGeoEditor.py:5095
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
+#: appEditors/appGeoEditor.py:5095
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2254 appTools/ToolPaint.py:389
@@ -1024,7 +1024,7 @@ msgstr "Combo"
 msgid "Connect"
 msgstr "Relier"
 
-#: appDatabase.py:1512 appDatabase.py:1629 appEditors/FlatCAMGeoEditor.py:507
+#: appDatabase.py:1512 appDatabase.py:1629 appEditors/appGeoEditor.py:507
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:239
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:226
 #: appTools/ToolNCC.py:443 appTools/ToolPaint.py:403
@@ -1042,7 +1042,7 @@ msgstr ""
 msgid "Contour"
 msgstr "Contour"
 
-#: appDatabase.py:1522 appDatabase.py:1636 appEditors/FlatCAMGeoEditor.py:517
+#: appDatabase.py:1522 appDatabase.py:1636 appEditors/appGeoEditor.py:517
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:248
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:234
 #: appTools/ToolNCC.py:453 appTools/ToolPaint.py:410
@@ -1053,7 +1053,7 @@ msgstr ""
 "Couper autour du périmètre du polygone\n"
 "pour couper les bords rugueux."
 
-#: appDatabase.py:1528 appEditors/FlatCAMGeoEditor.py:611
+#: appDatabase.py:1528 appEditors/appGeoEditor.py:611
 #: appEditors/FlatCAMGrbEditor.py:5304 appGUI/ObjectUI.py:143
 #: appGUI/ObjectUI.py:1394 appGUI/ObjectUI.py:2256
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:255
@@ -1076,7 +1076,7 @@ msgstr ""
 "des caractéristiques de cuivre.\n"
 "La valeur peut être comprise entre 0 et 10 unités FlatCAM."
 
-#: appDatabase.py:1567 appEditors/FlatCAMGeoEditor.py:452
+#: appDatabase.py:1567 appEditors/appGeoEditor.py:452
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:165
 #: appTools/ToolPaint.py:330
 msgid ""
@@ -1097,7 +1097,7 @@ msgstr ""
 "Valeurs supérieures = traitement lent et exécution lente sur CNC\n"
 "en raison de plus de chemins."
 
-#: appDatabase.py:1588 appEditors/FlatCAMGeoEditor.py:472
+#: appDatabase.py:1588 appEditors/appGeoEditor.py:472
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:185
 #: appTools/ToolPaint.py:351
 msgid ""
@@ -1563,7 +1563,7 @@ msgstr "Y"
 #: appEditors/FlatCAMExcEditor.py:1800 appEditors/FlatCAMExcEditor.py:1871
 #: appEditors/FlatCAMExcEditor.py:1875 appEditors/FlatCAMExcEditor.py:1964
 #: appEditors/FlatCAMExcEditor.py:1982 appEditors/FlatCAMExcEditor.py:2016
-#: appEditors/FlatCAMGeoEditor.py:683 appEditors/FlatCAMGrbEditor.py:2822
+#: appEditors/appGeoEditor.py:683 appEditors/FlatCAMGrbEditor.py:2822
 #: appEditors/FlatCAMGrbEditor.py:2839 appEditors/FlatCAMGrbEditor.py:2875
 #: appEditors/FlatCAMGrbEditor.py:5376
 #: appGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py:94
@@ -1787,7 +1787,7 @@ msgid "Cancelled. There is no Tool/Drill selected"
 msgstr "Annulé. Aucun Outil/Foret sélectionné"
 
 #: appEditors/FlatCAMExcEditor.py:3601 appEditors/FlatCAMExcEditor.py:3609
-#: appEditors/FlatCAMGeoEditor.py:4286 appEditors/FlatCAMGeoEditor.py:4300
+#: appEditors/appGeoEditor.py:4286 appEditors/appGeoEditor.py:4300
 #: appEditors/FlatCAMGrbEditor.py:1085 appEditors/FlatCAMGrbEditor.py:1312
 #: appEditors/FlatCAMGrbEditor.py:1497 appEditors/FlatCAMGrbEditor.py:1766
 #: appEditors/FlatCAMGrbEditor.py:4608 appEditors/FlatCAMGrbEditor.py:4625
@@ -1806,15 +1806,15 @@ msgstr "Terminé. Percer des trous supprimés."
 msgid "Click on the circular array Center position"
 msgstr "Cliquez sur le tableau circulaire Position centrale"
 
-#: appEditors/FlatCAMGeoEditor.py:84
+#: appEditors/appGeoEditor.py:84
 msgid "Buffer distance:"
 msgstr "Distance tampon:"
 
-#: appEditors/FlatCAMGeoEditor.py:85
+#: appEditors/appGeoEditor.py:85
 msgid "Buffer corner:"
 msgstr "Coin tampon:"
 
-#: appEditors/FlatCAMGeoEditor.py:87
+#: appEditors/appGeoEditor.py:87
 msgid ""
 "There are 3 types of corners:\n"
 " - 'Round': the corner is rounded for exterior buffer.\n"
@@ -1828,11 +1828,11 @@ msgstr ""
 " - \"Biseauté:\" le coin est une ligne qui relie directement les "
 "fonctionnalités réunies dans le coin"
 
-#: appEditors/FlatCAMGeoEditor.py:93 appEditors/FlatCAMGrbEditor.py:2638
+#: appEditors/appGeoEditor.py:93 appEditors/FlatCAMGrbEditor.py:2638
 msgid "Round"
 msgstr "Rond"
 
-#: appEditors/FlatCAMGeoEditor.py:94 appEditors/FlatCAMGrbEditor.py:2639
+#: appEditors/appGeoEditor.py:94 appEditors/FlatCAMGrbEditor.py:2639
 #: appGUI/ObjectUI.py:1149 appGUI/ObjectUI.py:2004
 #: appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py:225
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:68
@@ -1850,50 +1850,50 @@ msgstr "Rond"
 msgid "Square"
 msgstr "Carré"
 
-#: appEditors/FlatCAMGeoEditor.py:95 appEditors/FlatCAMGrbEditor.py:2640
+#: appEditors/appGeoEditor.py:95 appEditors/FlatCAMGrbEditor.py:2640
 msgid "Beveled"
 msgstr "Biseauté"
 
-#: appEditors/FlatCAMGeoEditor.py:102
+#: appEditors/appGeoEditor.py:102
 msgid "Buffer Interior"
 msgstr "Tampon Intérieur"
 
-#: appEditors/FlatCAMGeoEditor.py:104
+#: appEditors/appGeoEditor.py:104
 msgid "Buffer Exterior"
 msgstr "Tampon Extérieur"
 
-#: appEditors/FlatCAMGeoEditor.py:110
+#: appEditors/appGeoEditor.py:110
 msgid "Full Buffer"
 msgstr "Plein tampon"
 
-#: appEditors/FlatCAMGeoEditor.py:131 appEditors/FlatCAMGeoEditor.py:2959
+#: appEditors/appGeoEditor.py:131 appEditors/appGeoEditor.py:2959
 #: appGUI/MainGUI.py:4301
 #: appGUI/preferences/gerber/GerberEditorPrefGroupUI.py:191
 msgid "Buffer Tool"
 msgstr "Outil Tampon"
 
-#: appEditors/FlatCAMGeoEditor.py:143 appEditors/FlatCAMGeoEditor.py:160
-#: appEditors/FlatCAMGeoEditor.py:177 appEditors/FlatCAMGeoEditor.py:2978
-#: appEditors/FlatCAMGeoEditor.py:3006 appEditors/FlatCAMGeoEditor.py:3034
+#: appEditors/appGeoEditor.py:143 appEditors/appGeoEditor.py:160
+#: appEditors/appGeoEditor.py:177 appEditors/appGeoEditor.py:2978
+#: appEditors/appGeoEditor.py:3006 appEditors/appGeoEditor.py:3034
 #: appEditors/FlatCAMGrbEditor.py:5109
 msgid "Buffer distance value is missing or wrong format. Add it and retry."
 msgstr ""
 "La valeur de la distance tampon est un format manquant ou incorrect. Ajoutez-"
 "le et réessayez."
 
-#: appEditors/FlatCAMGeoEditor.py:241
+#: appEditors/appGeoEditor.py:241
 msgid "Font"
 msgstr "Police"
 
-#: appEditors/FlatCAMGeoEditor.py:322 appGUI/MainGUI.py:1452
+#: appEditors/appGeoEditor.py:322 appGUI/MainGUI.py:1452
 msgid "Text"
 msgstr "Texte"
 
-#: appEditors/FlatCAMGeoEditor.py:348
+#: appEditors/appGeoEditor.py:348
 msgid "Text Tool"
 msgstr "Outil Texte"
 
-#: appEditors/FlatCAMGeoEditor.py:404 appGUI/MainGUI.py:502
+#: appEditors/appGeoEditor.py:404 appGUI/MainGUI.py:502
 #: appGUI/MainGUI.py:1199 appGUI/ObjectUI.py:597 appGUI/ObjectUI.py:1564
 #: appObjects/FlatCAMExcellon.py:852 appObjects/FlatCAMExcellon.py:1242
 #: appObjects/FlatCAMGeometry.py:825 appTools/ToolIsolation.py:313
@@ -1902,15 +1902,15 @@ msgstr "Outil Texte"
 msgid "Tool"
 msgstr "Outil"
 
-#: appEditors/FlatCAMGeoEditor.py:438
+#: appEditors/appGeoEditor.py:438
 msgid "Tool dia"
 msgstr "Diam Outil"
 
-#: appEditors/FlatCAMGeoEditor.py:440
+#: appEditors/appGeoEditor.py:440
 msgid "Diameter of the tool to be used in the operation."
 msgstr "Diamètre de l'outil à utiliser dans l'opération."
 
-#: appEditors/FlatCAMGeoEditor.py:486
+#: appEditors/appGeoEditor.py:486
 msgid ""
 "Algorithm to paint the polygons:\n"
 "- Standard: Fixed step inwards.\n"
@@ -1922,57 +1922,57 @@ msgstr ""
 "- À base de graines: à l'extérieur des graines.\n"
 "- Ligne: lignes parallèles."
 
-#: appEditors/FlatCAMGeoEditor.py:505
+#: appEditors/appGeoEditor.py:505
 msgid "Connect:"
 msgstr "Relier:"
 
-#: appEditors/FlatCAMGeoEditor.py:515
+#: appEditors/appGeoEditor.py:515
 msgid "Contour:"
 msgstr "Contour:"
 
-#: appEditors/FlatCAMGeoEditor.py:528 appGUI/MainGUI.py:1456
+#: appEditors/appGeoEditor.py:528 appGUI/MainGUI.py:1456
 msgid "Paint"
 msgstr "Peindre"
 
-#: appEditors/FlatCAMGeoEditor.py:546 appGUI/MainGUI.py:912
+#: appEditors/appGeoEditor.py:546 appGUI/MainGUI.py:912
 #: appGUI/MainGUI.py:1944 appGUI/ObjectUI.py:2069 appTools/ToolPaint.py:42
 #: appTools/ToolPaint.py:737
 msgid "Paint Tool"
 msgstr "Outil de Peinture"
 
-#: appEditors/FlatCAMGeoEditor.py:582 appEditors/FlatCAMGeoEditor.py:1071
-#: appEditors/FlatCAMGeoEditor.py:2966 appEditors/FlatCAMGeoEditor.py:2994
-#: appEditors/FlatCAMGeoEditor.py:3022 appEditors/FlatCAMGeoEditor.py:4439
+#: appEditors/appGeoEditor.py:582 appEditors/appGeoEditor.py:1071
+#: appEditors/appGeoEditor.py:2966 appEditors/appGeoEditor.py:2994
+#: appEditors/appGeoEditor.py:3022 appEditors/appGeoEditor.py:4439
 #: appEditors/FlatCAMGrbEditor.py:5764
 msgid "Cancelled. No shape selected."
 msgstr "Annulé. Aucune forme sélectionnée."
 
-#: appEditors/FlatCAMGeoEditor.py:595 appEditors/FlatCAMGeoEditor.py:2984
-#: appEditors/FlatCAMGeoEditor.py:3012 appEditors/FlatCAMGeoEditor.py:3040
+#: appEditors/appGeoEditor.py:595 appEditors/appGeoEditor.py:2984
+#: appEditors/appGeoEditor.py:3012 appEditors/appGeoEditor.py:3040
 #: appGUI/preferences/geometry/GeometryGenPrefGroupUI.py:69
 #: appTools/ToolProperties.py:117 appTools/ToolProperties.py:162
 msgid "Tools"
 msgstr "Outils"
 
-#: appEditors/FlatCAMGeoEditor.py:606 appEditors/FlatCAMGeoEditor.py:1035
+#: appEditors/appGeoEditor.py:606 appEditors/appGeoEditor.py:1035
 #: appEditors/FlatCAMGrbEditor.py:5299 appEditors/FlatCAMGrbEditor.py:5728
 #: appGUI/MainGUI.py:935 appGUI/MainGUI.py:1967 appTools/ToolTransform.py:494
 msgid "Transform Tool"
 msgstr "Outil de Transformation"
 
-#: appEditors/FlatCAMGeoEditor.py:607 appEditors/FlatCAMGeoEditor.py:699
+#: appEditors/appGeoEditor.py:607 appEditors/appGeoEditor.py:699
 #: appEditors/FlatCAMGrbEditor.py:5300 appEditors/FlatCAMGrbEditor.py:5392
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:88
 #: appTools/ToolTransform.py:27 appTools/ToolTransform.py:146
 msgid "Rotate"
 msgstr "Tourner"
 
-#: appEditors/FlatCAMGeoEditor.py:608 appEditors/FlatCAMGrbEditor.py:5301
+#: appEditors/appGeoEditor.py:608 appEditors/FlatCAMGrbEditor.py:5301
 #: appTools/ToolTransform.py:28
 msgid "Skew/Shear"
 msgstr "Inclinaison/Cisaillement"
 
-#: appEditors/FlatCAMGeoEditor.py:609 appEditors/FlatCAMGrbEditor.py:2687
+#: appEditors/appGeoEditor.py:609 appEditors/FlatCAMGrbEditor.py:2687
 #: appEditors/FlatCAMGrbEditor.py:5302 appGUI/MainGUI.py:1057
 #: appGUI/MainGUI.py:1499 appGUI/MainGUI.py:2089 appGUI/MainGUI.py:4513
 #: appGUI/ObjectUI.py:125
@@ -1981,12 +1981,12 @@ msgstr "Inclinaison/Cisaillement"
 msgid "Scale"
 msgstr "Mise à l'échelle"
 
-#: appEditors/FlatCAMGeoEditor.py:610 appEditors/FlatCAMGrbEditor.py:5303
+#: appEditors/appGeoEditor.py:610 appEditors/FlatCAMGrbEditor.py:5303
 #: appTools/ToolTransform.py:30
 msgid "Mirror (Flip)"
 msgstr "Miroir (flip)"
 
-#: appEditors/FlatCAMGeoEditor.py:612 appEditors/FlatCAMGrbEditor.py:2647
+#: appEditors/appGeoEditor.py:612 appEditors/FlatCAMGrbEditor.py:2647
 #: appEditors/FlatCAMGrbEditor.py:5305 appGUI/MainGUI.py:1055
 #: appGUI/MainGUI.py:1454 appGUI/MainGUI.py:1497 appGUI/MainGUI.py:2087
 #: appGUI/MainGUI.py:4511
@@ -1995,7 +1995,7 @@ msgstr "Miroir (flip)"
 msgid "Buffer"
 msgstr "Tampon"
 
-#: appEditors/FlatCAMGeoEditor.py:643 appEditors/FlatCAMGrbEditor.py:5336
+#: appEditors/appGeoEditor.py:643 appEditors/FlatCAMGrbEditor.py:5336
 #: appGUI/GUIElements.py:2701
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:169
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:44
@@ -2004,7 +2004,7 @@ msgstr "Tampon"
 msgid "Reference"
 msgstr "Référence"
 
-#: appEditors/FlatCAMGeoEditor.py:645 appEditors/FlatCAMGrbEditor.py:5338
+#: appEditors/appGeoEditor.py:645 appEditors/FlatCAMGrbEditor.py:5338
 msgid ""
 "The reference point for Rotate, Skew, Scale, Mirror.\n"
 "Can be:\n"
@@ -2022,14 +2022,14 @@ msgstr ""
 "- Sélection min.-> le point (minx, miny) de la boîte englobante de la "
 "sélection"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
 #: appTools/ToolCalibration.py:770 appTools/ToolCalibration.py:771
 #: appTools/ToolTransform.py:70
 msgid "Origin"
 msgstr "Origine"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGeoEditor.py:1044
+#: appEditors/appGeoEditor.py:653 appEditors/appGeoEditor.py:1044
 #: appEditors/FlatCAMGrbEditor.py:5346 appEditors/FlatCAMGrbEditor.py:5737
 #: appGUI/preferences/general/GeneralGUIPrefGroupUI.py:250
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:275
@@ -2041,7 +2041,7 @@ msgstr "Origine"
 msgid "Selection"
 msgstr "Sélection"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 #: appGUI/preferences/tools/Tools2sidedPrefGroupUI.py:80
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:60
@@ -2049,11 +2049,11 @@ msgstr "Sélection"
 msgid "Point"
 msgstr "Point"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 msgid "Minimum"
 msgstr "Le minimum"
 
-#: appEditors/FlatCAMGeoEditor.py:659 appEditors/FlatCAMGeoEditor.py:955
+#: appEditors/appGeoEditor.py:659 appEditors/appGeoEditor.py:955
 #: appEditors/FlatCAMGrbEditor.py:5352 appEditors/FlatCAMGrbEditor.py:5648
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:131
 #: appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py:133
@@ -2064,13 +2064,13 @@ msgstr "Le minimum"
 msgid "Value"
 msgstr "Valeur"
 
-#: appEditors/FlatCAMGeoEditor.py:661 appEditors/FlatCAMGrbEditor.py:5354
+#: appEditors/appGeoEditor.py:661 appEditors/FlatCAMGrbEditor.py:5354
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:62
 #: appTools/ToolTransform.py:78
 msgid "A point of reference in format X,Y."
 msgstr "Un point de référence au format X, Y."
 
-#: appEditors/FlatCAMGeoEditor.py:668 appEditors/FlatCAMGrbEditor.py:2590
+#: appEditors/appGeoEditor.py:668 appEditors/FlatCAMGrbEditor.py:2590
 #: appEditors/FlatCAMGrbEditor.py:5361 appGUI/ObjectUI.py:1494
 #: appTools/ToolDblSided.py:192 appTools/ToolDblSided.py:425
 #: appTools/ToolIsolation.py:276 appTools/ToolIsolation.py:631
@@ -2081,12 +2081,12 @@ msgstr "Un point de référence au format X, Y."
 msgid "Add"
 msgstr "Ajouter"
 
-#: appEditors/FlatCAMGeoEditor.py:670 appEditors/FlatCAMGrbEditor.py:5363
+#: appEditors/appGeoEditor.py:670 appEditors/FlatCAMGrbEditor.py:5363
 #: appTools/ToolTransform.py:87
 msgid "Add point coordinates from clipboard."
 msgstr "Ajoutez des coordonnées de point à partir du presse-papiers."
 
-#: appEditors/FlatCAMGeoEditor.py:685 appEditors/FlatCAMGrbEditor.py:5378
+#: appEditors/appGeoEditor.py:685 appEditors/FlatCAMGrbEditor.py:5378
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:98
 #: appTools/ToolTransform.py:132
 msgid ""
@@ -2100,7 +2100,7 @@ msgstr ""
 "Nombres positifs pour le mouvement en CW.\n"
 "Nombres négatifs pour le mouvement CCW."
 
-#: appEditors/FlatCAMGeoEditor.py:701 appEditors/FlatCAMGrbEditor.py:5394
+#: appEditors/appGeoEditor.py:701 appEditors/FlatCAMGrbEditor.py:5394
 #: appTools/ToolTransform.py:148
 msgid ""
 "Rotate the selected object(s).\n"
@@ -2111,7 +2111,7 @@ msgstr ""
 "Le point de référence est le milieu de\n"
 "le cadre de sélection pour tous les objets sélectionnés."
 
-#: appEditors/FlatCAMGeoEditor.py:721 appEditors/FlatCAMGeoEditor.py:783
+#: appEditors/appGeoEditor.py:721 appEditors/appGeoEditor.py:783
 #: appEditors/FlatCAMGrbEditor.py:5414 appEditors/FlatCAMGrbEditor.py:5476
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:112
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:151
@@ -2119,7 +2119,7 @@ msgstr ""
 msgid "Link"
 msgstr "Lien"
 
-#: appEditors/FlatCAMGeoEditor.py:723 appEditors/FlatCAMGeoEditor.py:785
+#: appEditors/appGeoEditor.py:723 appEditors/appGeoEditor.py:785
 #: appEditors/FlatCAMGrbEditor.py:5416 appEditors/FlatCAMGrbEditor.py:5478
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:114
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:153
@@ -2127,14 +2127,14 @@ msgstr "Lien"
 msgid "Link the Y entry to X entry and copy its content."
 msgstr "Liez l'entrée Y à l'entrée X et copiez son contenu."
 
-#: appEditors/FlatCAMGeoEditor.py:728 appEditors/FlatCAMGrbEditor.py:5421
+#: appEditors/appGeoEditor.py:728 appEditors/FlatCAMGrbEditor.py:5421
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:151
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:124
 #: appTools/ToolFilm.py:184 appTools/ToolTransform.py:175
 msgid "X angle"
 msgstr "Angle X"
 
-#: appEditors/FlatCAMGeoEditor.py:730 appEditors/FlatCAMGeoEditor.py:751
+#: appEditors/appGeoEditor.py:730 appEditors/appGeoEditor.py:751
 #: appEditors/FlatCAMGrbEditor.py:5423 appEditors/FlatCAMGrbEditor.py:5444
 #: appTools/ToolTransform.py:177 appTools/ToolTransform.py:198
 msgid ""
@@ -2144,12 +2144,12 @@ msgstr ""
 "Angle pour l'action asymétrique, en degrés.\n"
 "Nombre flottant entre -360 et 360."
 
-#: appEditors/FlatCAMGeoEditor.py:738 appEditors/FlatCAMGrbEditor.py:5431
+#: appEditors/appGeoEditor.py:738 appEditors/FlatCAMGrbEditor.py:5431
 #: appTools/ToolTransform.py:185
 msgid "Skew X"
 msgstr "Inclinaison X"
 
-#: appEditors/FlatCAMGeoEditor.py:740 appEditors/FlatCAMGeoEditor.py:761
+#: appEditors/appGeoEditor.py:740 appEditors/appGeoEditor.py:761
 #: appEditors/FlatCAMGrbEditor.py:5433 appEditors/FlatCAMGrbEditor.py:5454
 #: appTools/ToolTransform.py:187 appTools/ToolTransform.py:208
 msgid ""
@@ -2161,37 +2161,37 @@ msgstr ""
 "Le point de référence est le milieu de\n"
 "le cadre de sélection pour tous les objets sélectionnés."
 
-#: appEditors/FlatCAMGeoEditor.py:749 appEditors/FlatCAMGrbEditor.py:5442
+#: appEditors/appGeoEditor.py:749 appEditors/FlatCAMGrbEditor.py:5442
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:160
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:138
 #: appTools/ToolFilm.py:193 appTools/ToolTransform.py:196
 msgid "Y angle"
 msgstr "Angle Y"
 
-#: appEditors/FlatCAMGeoEditor.py:759 appEditors/FlatCAMGrbEditor.py:5452
+#: appEditors/appGeoEditor.py:759 appEditors/FlatCAMGrbEditor.py:5452
 #: appTools/ToolTransform.py:206
 msgid "Skew Y"
 msgstr "Inclinaison Y"
 
-#: appEditors/FlatCAMGeoEditor.py:790 appEditors/FlatCAMGrbEditor.py:5483
+#: appEditors/appGeoEditor.py:790 appEditors/FlatCAMGrbEditor.py:5483
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:120
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:162
 #: appTools/ToolFilm.py:145 appTools/ToolTransform.py:237
 msgid "X factor"
 msgstr "Facteur X"
 
-#: appEditors/FlatCAMGeoEditor.py:792 appEditors/FlatCAMGrbEditor.py:5485
+#: appEditors/appGeoEditor.py:792 appEditors/FlatCAMGrbEditor.py:5485
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:164
 #: appTools/ToolTransform.py:239
 msgid "Factor for scaling on X axis."
 msgstr "Facteur de mise à l'échelle sur l'axe X."
 
-#: appEditors/FlatCAMGeoEditor.py:799 appEditors/FlatCAMGrbEditor.py:5492
+#: appEditors/appGeoEditor.py:799 appEditors/FlatCAMGrbEditor.py:5492
 #: appTools/ToolTransform.py:246
 msgid "Scale X"
 msgstr "Mise à l'échelle X"
 
-#: appEditors/FlatCAMGeoEditor.py:801 appEditors/FlatCAMGeoEditor.py:821
+#: appEditors/appGeoEditor.py:801 appEditors/appGeoEditor.py:821
 #: appEditors/FlatCAMGrbEditor.py:5494 appEditors/FlatCAMGrbEditor.py:5514
 #: appTools/ToolTransform.py:248 appTools/ToolTransform.py:268
 msgid ""
@@ -2203,58 +2203,58 @@ msgstr ""
 "Le point de référence dépend de\n"
 "l'état de la case à cocher référence d'échelle."
 
-#: appEditors/FlatCAMGeoEditor.py:810 appEditors/FlatCAMGrbEditor.py:5503
+#: appEditors/appGeoEditor.py:810 appEditors/FlatCAMGrbEditor.py:5503
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:129
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:175
 #: appTools/ToolFilm.py:154 appTools/ToolTransform.py:257
 msgid "Y factor"
 msgstr "Facteur Y"
 
-#: appEditors/FlatCAMGeoEditor.py:812 appEditors/FlatCAMGrbEditor.py:5505
+#: appEditors/appGeoEditor.py:812 appEditors/FlatCAMGrbEditor.py:5505
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:177
 #: appTools/ToolTransform.py:259
 msgid "Factor for scaling on Y axis."
 msgstr "Facteur de mise à l'échelle sur l'axe Y."
 
-#: appEditors/FlatCAMGeoEditor.py:819 appEditors/FlatCAMGrbEditor.py:5512
+#: appEditors/appGeoEditor.py:819 appEditors/FlatCAMGrbEditor.py:5512
 #: appTools/ToolTransform.py:266
 msgid "Scale Y"
 msgstr "Mise à l'échelle Y"
 
-#: appEditors/FlatCAMGeoEditor.py:846 appEditors/FlatCAMGrbEditor.py:5539
+#: appEditors/appGeoEditor.py:846 appEditors/FlatCAMGrbEditor.py:5539
 #: appTools/ToolTransform.py:293
 msgid "Flip on X"
 msgstr "Miroir sur X"
 
-#: appEditors/FlatCAMGeoEditor.py:848 appEditors/FlatCAMGeoEditor.py:853
+#: appEditors/appGeoEditor.py:848 appEditors/appGeoEditor.py:853
 #: appEditors/FlatCAMGrbEditor.py:5541 appEditors/FlatCAMGrbEditor.py:5546
 #: appTools/ToolTransform.py:295 appTools/ToolTransform.py:300
 msgid "Flip the selected object(s) over the X axis."
 msgstr "Retournez le ou les objets sélectionnés sur l’axe X."
 
-#: appEditors/FlatCAMGeoEditor.py:851 appEditors/FlatCAMGrbEditor.py:5544
+#: appEditors/appGeoEditor.py:851 appEditors/FlatCAMGrbEditor.py:5544
 #: appTools/ToolTransform.py:298
 msgid "Flip on Y"
 msgstr "Miroir sur Y"
 
-#: appEditors/FlatCAMGeoEditor.py:871 appEditors/FlatCAMGrbEditor.py:5564
+#: appEditors/appGeoEditor.py:871 appEditors/FlatCAMGrbEditor.py:5564
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:191
 #: appTools/ToolTransform.py:318
 msgid "X val"
 msgstr "Valeur X"
 
-#: appEditors/FlatCAMGeoEditor.py:873 appEditors/FlatCAMGrbEditor.py:5566
+#: appEditors/appGeoEditor.py:873 appEditors/FlatCAMGrbEditor.py:5566
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:193
 #: appTools/ToolTransform.py:320
 msgid "Distance to offset on X axis. In current units."
 msgstr "Distance à compenser sur l'axe X. En unités actuelles."
 
-#: appEditors/FlatCAMGeoEditor.py:880 appEditors/FlatCAMGrbEditor.py:5573
+#: appEditors/appGeoEditor.py:880 appEditors/FlatCAMGrbEditor.py:5573
 #: appTools/ToolTransform.py:327
 msgid "Offset X"
 msgstr "Décalage X"
 
-#: appEditors/FlatCAMGeoEditor.py:882 appEditors/FlatCAMGeoEditor.py:902
+#: appEditors/appGeoEditor.py:882 appEditors/appGeoEditor.py:902
 #: appEditors/FlatCAMGrbEditor.py:5575 appEditors/FlatCAMGrbEditor.py:5595
 #: appTools/ToolTransform.py:329 appTools/ToolTransform.py:349
 msgid ""
@@ -2266,31 +2266,31 @@ msgstr ""
 "Le point de référence est le milieu de\n"
 "le cadre de sélection pour tous les objets sélectionnés.\n"
 
-#: appEditors/FlatCAMGeoEditor.py:891 appEditors/FlatCAMGrbEditor.py:5584
+#: appEditors/appGeoEditor.py:891 appEditors/FlatCAMGrbEditor.py:5584
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:204
 #: appTools/ToolTransform.py:338
 msgid "Y val"
 msgstr "Valeur Y"
 
-#: appEditors/FlatCAMGeoEditor.py:893 appEditors/FlatCAMGrbEditor.py:5586
+#: appEditors/appGeoEditor.py:893 appEditors/FlatCAMGrbEditor.py:5586
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:206
 #: appTools/ToolTransform.py:340
 msgid "Distance to offset on Y axis. In current units."
 msgstr "Distance à compenser sur l'axe X. En unités actuelles."
 
-#: appEditors/FlatCAMGeoEditor.py:900 appEditors/FlatCAMGrbEditor.py:5593
+#: appEditors/appGeoEditor.py:900 appEditors/FlatCAMGrbEditor.py:5593
 #: appTools/ToolTransform.py:347
 msgid "Offset Y"
 msgstr "Décalage Y"
 
-#: appEditors/FlatCAMGeoEditor.py:920 appEditors/FlatCAMGrbEditor.py:5613
+#: appEditors/appGeoEditor.py:920 appEditors/FlatCAMGrbEditor.py:5613
 #: appGUI/preferences/tools/Tools2QRCodePrefGroupUI.py:142
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:216
 #: appTools/ToolQRCode.py:206 appTools/ToolTransform.py:367
 msgid "Rounded"
 msgstr "Arrondi"
 
-#: appEditors/FlatCAMGeoEditor.py:922 appEditors/FlatCAMGrbEditor.py:5615
+#: appEditors/appGeoEditor.py:922 appEditors/FlatCAMGrbEditor.py:5615
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:218
 #: appTools/ToolTransform.py:369
 msgid ""
@@ -2304,14 +2304,14 @@ msgstr ""
 "S'il n'est pas coché, le tampon suivra la géométrie exacte\n"
 "de la forme tamponnée."
 
-#: appEditors/FlatCAMGeoEditor.py:930 appEditors/FlatCAMGrbEditor.py:5623
+#: appEditors/appGeoEditor.py:930 appEditors/FlatCAMGrbEditor.py:5623
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:226
 #: appTools/ToolDistance.py:505 appTools/ToolDistanceMin.py:286
 #: appTools/ToolTransform.py:377
 msgid "Distance"
 msgstr "Distance"
 
-#: appEditors/FlatCAMGeoEditor.py:932 appEditors/FlatCAMGrbEditor.py:5625
+#: appEditors/appGeoEditor.py:932 appEditors/FlatCAMGrbEditor.py:5625
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:228
 #: appTools/ToolTransform.py:379
 msgid ""
@@ -2325,12 +2325,12 @@ msgstr ""
 "Chaque élément de géométrie de l'objet sera augmenté\n"
 "ou diminué avec la «distance»."
 
-#: appEditors/FlatCAMGeoEditor.py:944 appEditors/FlatCAMGrbEditor.py:5637
+#: appEditors/appGeoEditor.py:944 appEditors/FlatCAMGrbEditor.py:5637
 #: appTools/ToolTransform.py:391
 msgid "Buffer D"
 msgstr "Tampon D"
 
-#: appEditors/FlatCAMGeoEditor.py:946 appEditors/FlatCAMGrbEditor.py:5639
+#: appEditors/appGeoEditor.py:946 appEditors/FlatCAMGrbEditor.py:5639
 #: appTools/ToolTransform.py:393
 msgid ""
 "Create the buffer effect on each geometry,\n"
@@ -2339,7 +2339,7 @@ msgstr ""
 "Créez l'effet tampon sur chaque géométrie,\n"
 "élément de l'objet sélectionné, en utilisant la distance."
 
-#: appEditors/FlatCAMGeoEditor.py:957 appEditors/FlatCAMGrbEditor.py:5650
+#: appEditors/appGeoEditor.py:957 appEditors/FlatCAMGrbEditor.py:5650
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:245
 #: appTools/ToolTransform.py:404
 msgid ""
@@ -2355,12 +2355,12 @@ msgstr ""
 "ou diminué pour correspondre à la «valeur». La valeur est un pourcentage\n"
 "de la dimension initiale."
 
-#: appEditors/FlatCAMGeoEditor.py:970 appEditors/FlatCAMGrbEditor.py:5663
+#: appEditors/appGeoEditor.py:970 appEditors/FlatCAMGrbEditor.py:5663
 #: appTools/ToolTransform.py:417
 msgid "Buffer F"
 msgstr "Tampon F"
 
-#: appEditors/FlatCAMGeoEditor.py:972 appEditors/FlatCAMGrbEditor.py:5665
+#: appEditors/appGeoEditor.py:972 appEditors/FlatCAMGrbEditor.py:5665
 #: appTools/ToolTransform.py:419
 msgid ""
 "Create the buffer effect on each geometry,\n"
@@ -2369,7 +2369,7 @@ msgstr ""
 "Créez l'effet tampon sur chaque géométrie,\n"
 "élément de l'objet sélectionné, en utilisant le facteur."
 
-#: appEditors/FlatCAMGeoEditor.py:1043 appEditors/FlatCAMGrbEditor.py:5736
+#: appEditors/appGeoEditor.py:1043 appEditors/FlatCAMGrbEditor.py:5736
 #: appGUI/ObjectUI.py:1103 appGUI/ObjectUI.py:1958
 #: appGUI/preferences/tools/Tools2CalPrefGroupUI.py:48
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
@@ -2380,29 +2380,29 @@ msgstr ""
 msgid "Object"
 msgstr "Objet"
 
-#: appEditors/FlatCAMGeoEditor.py:1107 appEditors/FlatCAMGeoEditor.py:1130
-#: appEditors/FlatCAMGeoEditor.py:1276 appEditors/FlatCAMGeoEditor.py:1301
-#: appEditors/FlatCAMGeoEditor.py:1335 appEditors/FlatCAMGeoEditor.py:1370
-#: appEditors/FlatCAMGeoEditor.py:1401 appEditors/FlatCAMGrbEditor.py:5800
+#: appEditors/appGeoEditor.py:1107 appEditors/appGeoEditor.py:1130
+#: appEditors/appGeoEditor.py:1276 appEditors/appGeoEditor.py:1301
+#: appEditors/appGeoEditor.py:1335 appEditors/appGeoEditor.py:1370
+#: appEditors/appGeoEditor.py:1401 appEditors/FlatCAMGrbEditor.py:5800
 #: appEditors/FlatCAMGrbEditor.py:5823 appEditors/FlatCAMGrbEditor.py:5968
 #: appEditors/FlatCAMGrbEditor.py:6001 appEditors/FlatCAMGrbEditor.py:6044
 #: appEditors/FlatCAMGrbEditor.py:6085 appEditors/FlatCAMGrbEditor.py:6121
 msgid "No shape selected."
 msgstr "Aucune forme sélectionnée."
 
-#: appEditors/FlatCAMGeoEditor.py:1115 appEditors/FlatCAMGrbEditor.py:5808
+#: appEditors/appGeoEditor.py:1115 appEditors/FlatCAMGrbEditor.py:5808
 #: appTools/ToolTransform.py:585
 msgid "Incorrect format for Point value. Needs format X,Y"
 msgstr "Format incorrect pour la valeur de point. Nécessite le format X, Y"
 
-#: appEditors/FlatCAMGeoEditor.py:1140 appEditors/FlatCAMGrbEditor.py:5833
+#: appEditors/appGeoEditor.py:1140 appEditors/FlatCAMGrbEditor.py:5833
 #: appTools/ToolTransform.py:602
 msgid "Rotate transformation can not be done for a value of 0."
 msgstr ""
 "La transformation par rotation ne peut pas être effectuée pour une valeur de "
 "0."
 
-#: appEditors/FlatCAMGeoEditor.py:1198 appEditors/FlatCAMGeoEditor.py:1219
+#: appEditors/appGeoEditor.py:1198 appEditors/appGeoEditor.py:1219
 #: appEditors/FlatCAMGrbEditor.py:5891 appEditors/FlatCAMGrbEditor.py:5912
 #: appTools/ToolTransform.py:660 appTools/ToolTransform.py:681
 msgid "Scale transformation can not be done for a factor of 0 or 1."
@@ -2410,7 +2410,7 @@ msgstr ""
 "La transformation d'échelle ne peut pas être effectuée pour un facteur de 0 "
 "ou 1."
 
-#: appEditors/FlatCAMGeoEditor.py:1232 appEditors/FlatCAMGeoEditor.py:1241
+#: appEditors/appGeoEditor.py:1232 appEditors/appGeoEditor.py:1241
 #: appEditors/FlatCAMGrbEditor.py:5925 appEditors/FlatCAMGrbEditor.py:5934
 #: appTools/ToolTransform.py:694 appTools/ToolTransform.py:703
 msgid "Offset transformation can not be done for a value of 0."
@@ -2418,296 +2418,296 @@ msgstr ""
 "La transformation de décalage ne peut pas être effectuée pour une valeur de "
 "0."
 
-#: appEditors/FlatCAMGeoEditor.py:1271 appEditors/FlatCAMGrbEditor.py:5971
+#: appEditors/appGeoEditor.py:1271 appEditors/FlatCAMGrbEditor.py:5971
 #: appTools/ToolTransform.py:731
 msgid "Appying Rotate"
 msgstr "Appliquer la Rotation"
 
-#: appEditors/FlatCAMGeoEditor.py:1284 appEditors/FlatCAMGrbEditor.py:5983
+#: appEditors/appGeoEditor.py:1284 appEditors/FlatCAMGrbEditor.py:5983
 msgid "Done. Rotate completed."
 msgstr "Terminé. Rotation terminée."
 
-#: appEditors/FlatCAMGeoEditor.py:1286
+#: appEditors/appGeoEditor.py:1286
 msgid "Rotation action was not executed"
 msgstr "L'action de rotation n'a pas été exécutée"
 
-#: appEditors/FlatCAMGeoEditor.py:1304 appEditors/FlatCAMGrbEditor.py:6004
+#: appEditors/appGeoEditor.py:1304 appEditors/FlatCAMGrbEditor.py:6004
 #: appTools/ToolTransform.py:757
 msgid "Applying Flip"
 msgstr "Appliquer Flip"
 
-#: appEditors/FlatCAMGeoEditor.py:1312 appEditors/FlatCAMGrbEditor.py:6016
+#: appEditors/appGeoEditor.py:1312 appEditors/FlatCAMGrbEditor.py:6016
 #: appTools/ToolTransform.py:774
 msgid "Flip on the Y axis done"
 msgstr "Tournez sur l'axe des Y fait"
 
-#: appEditors/FlatCAMGeoEditor.py:1315 appEditors/FlatCAMGrbEditor.py:6024
+#: appEditors/appGeoEditor.py:1315 appEditors/FlatCAMGrbEditor.py:6024
 #: appTools/ToolTransform.py:783
 msgid "Flip on the X axis done"
 msgstr "Tournez sur l'axe X terminé"
 
-#: appEditors/FlatCAMGeoEditor.py:1319
+#: appEditors/appGeoEditor.py:1319
 msgid "Flip action was not executed"
 msgstr "L'action Flip n'a pas été exécutée"
 
-#: appEditors/FlatCAMGeoEditor.py:1338 appEditors/FlatCAMGrbEditor.py:6047
+#: appEditors/appGeoEditor.py:1338 appEditors/FlatCAMGrbEditor.py:6047
 #: appTools/ToolTransform.py:804
 msgid "Applying Skew"
 msgstr "Application de l'inclinaison"
 
-#: appEditors/FlatCAMGeoEditor.py:1347 appEditors/FlatCAMGrbEditor.py:6063
+#: appEditors/appGeoEditor.py:1347 appEditors/FlatCAMGrbEditor.py:6063
 msgid "Skew on the X axis done"
 msgstr "Inclinaison sur l'axe X terminée"
 
-#: appEditors/FlatCAMGeoEditor.py:1349 appEditors/FlatCAMGrbEditor.py:6065
+#: appEditors/appGeoEditor.py:1349 appEditors/FlatCAMGrbEditor.py:6065
 msgid "Skew on the Y axis done"
 msgstr "Inclinaison sur l'axe des Y faite"
 
-#: appEditors/FlatCAMGeoEditor.py:1352
+#: appEditors/appGeoEditor.py:1352
 msgid "Skew action was not executed"
 msgstr "L'action de biais n'a pas été exécutée"
 
-#: appEditors/FlatCAMGeoEditor.py:1373 appEditors/FlatCAMGrbEditor.py:6088
+#: appEditors/appGeoEditor.py:1373 appEditors/FlatCAMGrbEditor.py:6088
 #: appTools/ToolTransform.py:831
 msgid "Applying Scale"
 msgstr "Échelle d'application"
 
-#: appEditors/FlatCAMGeoEditor.py:1382 appEditors/FlatCAMGrbEditor.py:6101
+#: appEditors/appGeoEditor.py:1382 appEditors/FlatCAMGrbEditor.py:6101
 msgid "Scale on the X axis done"
 msgstr "Échelle terminée sur l'axe X"
 
-#: appEditors/FlatCAMGeoEditor.py:1384 appEditors/FlatCAMGrbEditor.py:6103
+#: appEditors/appGeoEditor.py:1384 appEditors/FlatCAMGrbEditor.py:6103
 msgid "Scale on the Y axis done"
 msgstr "Echelle terminée sur l'axe des Y"
 
-#: appEditors/FlatCAMGeoEditor.py:1386
+#: appEditors/appGeoEditor.py:1386
 msgid "Scale action was not executed"
 msgstr "L'action d'échelle n'a pas été exécutée"
 
-#: appEditors/FlatCAMGeoEditor.py:1404 appEditors/FlatCAMGrbEditor.py:6124
+#: appEditors/appGeoEditor.py:1404 appEditors/FlatCAMGrbEditor.py:6124
 #: appTools/ToolTransform.py:859
 msgid "Applying Offset"
 msgstr "Appliquer un Décalage"
 
-#: appEditors/FlatCAMGeoEditor.py:1414 appEditors/FlatCAMGrbEditor.py:6145
+#: appEditors/appGeoEditor.py:1414 appEditors/FlatCAMGrbEditor.py:6145
 msgid "Offset on the X axis done"
 msgstr "Décalage sur l'axe X terminé"
 
-#: appEditors/FlatCAMGeoEditor.py:1416 appEditors/FlatCAMGrbEditor.py:6147
+#: appEditors/appGeoEditor.py:1416 appEditors/FlatCAMGrbEditor.py:6147
 msgid "Offset on the Y axis done"
 msgstr "Décalage sur l'axe Y terminé"
 
-#: appEditors/FlatCAMGeoEditor.py:1419
+#: appEditors/appGeoEditor.py:1419
 msgid "Offset action was not executed"
 msgstr "L'action offset n'a pas été exécutée"
 
-#: appEditors/FlatCAMGeoEditor.py:1426 appEditors/FlatCAMGrbEditor.py:6157
+#: appEditors/appGeoEditor.py:1426 appEditors/FlatCAMGrbEditor.py:6157
 msgid "No shape selected"
 msgstr "Aucune forme sélectionnée"
 
-#: appEditors/FlatCAMGeoEditor.py:1429 appEditors/FlatCAMGrbEditor.py:6160
+#: appEditors/appGeoEditor.py:1429 appEditors/FlatCAMGrbEditor.py:6160
 #: appTools/ToolTransform.py:889
 msgid "Applying Buffer"
 msgstr "Application du tampon"
 
-#: appEditors/FlatCAMGeoEditor.py:1436 appEditors/FlatCAMGrbEditor.py:6182
+#: appEditors/appGeoEditor.py:1436 appEditors/FlatCAMGrbEditor.py:6182
 #: appTools/ToolTransform.py:910
 msgid "Buffer done"
 msgstr "Tampon terminé"
 
-#: appEditors/FlatCAMGeoEditor.py:1440 appEditors/FlatCAMGrbEditor.py:6186
+#: appEditors/appGeoEditor.py:1440 appEditors/FlatCAMGrbEditor.py:6186
 #: appTools/ToolTransform.py:879 appTools/ToolTransform.py:915
 msgid "Action was not executed, due of"
 msgstr "L'action n'a pas été exécutée en raison de"
 
-#: appEditors/FlatCAMGeoEditor.py:1444 appEditors/FlatCAMGrbEditor.py:6190
+#: appEditors/appGeoEditor.py:1444 appEditors/FlatCAMGrbEditor.py:6190
 msgid "Rotate ..."
 msgstr "Tourner ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1445 appEditors/FlatCAMGeoEditor.py:1494
-#: appEditors/FlatCAMGeoEditor.py:1509 appEditors/FlatCAMGrbEditor.py:6191
+#: appEditors/appGeoEditor.py:1445 appEditors/appGeoEditor.py:1494
+#: appEditors/appGeoEditor.py:1509 appEditors/FlatCAMGrbEditor.py:6191
 #: appEditors/FlatCAMGrbEditor.py:6240 appEditors/FlatCAMGrbEditor.py:6255
 msgid "Enter an Angle Value (degrees)"
 msgstr "Entrer une valeur d'angle (degrés)"
 
-#: appEditors/FlatCAMGeoEditor.py:1453 appEditors/FlatCAMGrbEditor.py:6199
+#: appEditors/appGeoEditor.py:1453 appEditors/FlatCAMGrbEditor.py:6199
 msgid "Geometry shape rotate done"
 msgstr "Rotation de la forme géométrique effectuée"
 
-#: appEditors/FlatCAMGeoEditor.py:1456 appEditors/FlatCAMGrbEditor.py:6202
+#: appEditors/appGeoEditor.py:1456 appEditors/FlatCAMGrbEditor.py:6202
 msgid "Geometry shape rotate cancelled"
 msgstr "Rotation de la forme géométrique annulée"
 
-#: appEditors/FlatCAMGeoEditor.py:1461 appEditors/FlatCAMGrbEditor.py:6207
+#: appEditors/appGeoEditor.py:1461 appEditors/FlatCAMGrbEditor.py:6207
 msgid "Offset on X axis ..."
 msgstr "Décalage sur l'axe des X ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1462 appEditors/FlatCAMGeoEditor.py:1479
+#: appEditors/appGeoEditor.py:1462 appEditors/appGeoEditor.py:1479
 #: appEditors/FlatCAMGrbEditor.py:6208 appEditors/FlatCAMGrbEditor.py:6225
 msgid "Enter a distance Value"
 msgstr "Entrez une valeur de distance"
 
-#: appEditors/FlatCAMGeoEditor.py:1470 appEditors/FlatCAMGrbEditor.py:6216
+#: appEditors/appGeoEditor.py:1470 appEditors/FlatCAMGrbEditor.py:6216
 msgid "Geometry shape offset on X axis done"
 msgstr "Géométrie décalée sur l'axe des X effectuée"
 
-#: appEditors/FlatCAMGeoEditor.py:1473 appEditors/FlatCAMGrbEditor.py:6219
+#: appEditors/appGeoEditor.py:1473 appEditors/FlatCAMGrbEditor.py:6219
 msgid "Geometry shape offset X cancelled"
 msgstr "Décalage géométrique X annulé"
 
-#: appEditors/FlatCAMGeoEditor.py:1478 appEditors/FlatCAMGrbEditor.py:6224
+#: appEditors/appGeoEditor.py:1478 appEditors/FlatCAMGrbEditor.py:6224
 msgid "Offset on Y axis ..."
 msgstr "Décalage sur l'axe Y ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1487 appEditors/FlatCAMGrbEditor.py:6233
+#: appEditors/appGeoEditor.py:1487 appEditors/FlatCAMGrbEditor.py:6233
 msgid "Geometry shape offset on Y axis done"
 msgstr "Géométrie décalée sur l'axe des Y effectuée"
 
-#: appEditors/FlatCAMGeoEditor.py:1490
+#: appEditors/appGeoEditor.py:1490
 msgid "Geometry shape offset on Y axis canceled"
 msgstr "Décalage de la forme de la géométrie sur l'axe des Y"
 
-#: appEditors/FlatCAMGeoEditor.py:1493 appEditors/FlatCAMGrbEditor.py:6239
+#: appEditors/appGeoEditor.py:1493 appEditors/FlatCAMGrbEditor.py:6239
 msgid "Skew on X axis ..."
 msgstr "Skew on X axis ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1502 appEditors/FlatCAMGrbEditor.py:6248
+#: appEditors/appGeoEditor.py:1502 appEditors/FlatCAMGrbEditor.py:6248
 msgid "Geometry shape skew on X axis done"
 msgstr "Forme de la géométrie inclinée sur l'axe X terminée"
 
-#: appEditors/FlatCAMGeoEditor.py:1505
+#: appEditors/appGeoEditor.py:1505
 msgid "Geometry shape skew on X axis canceled"
 msgstr "Géométrie inclinée sur l'axe X annulée"
 
-#: appEditors/FlatCAMGeoEditor.py:1508 appEditors/FlatCAMGrbEditor.py:6254
+#: appEditors/appGeoEditor.py:1508 appEditors/FlatCAMGrbEditor.py:6254
 msgid "Skew on Y axis ..."
 msgstr "Inclinez sur l'axe Y ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1517 appEditors/FlatCAMGrbEditor.py:6263
+#: appEditors/appGeoEditor.py:1517 appEditors/FlatCAMGrbEditor.py:6263
 msgid "Geometry shape skew on Y axis done"
 msgstr "Géométrie inclinée sur l'axe des Y"
 
-#: appEditors/FlatCAMGeoEditor.py:1520
+#: appEditors/appGeoEditor.py:1520
 msgid "Geometry shape skew on Y axis canceled"
 msgstr "Géométrie inclinée sur l'axe des Y oblitérée"
 
-#: appEditors/FlatCAMGeoEditor.py:1950 appEditors/FlatCAMGeoEditor.py:2021
+#: appEditors/appGeoEditor.py:1950 appEditors/appGeoEditor.py:2021
 #: appEditors/FlatCAMGrbEditor.py:1444 appEditors/FlatCAMGrbEditor.py:1522
 msgid "Click on Center point ..."
 msgstr "Cliquez sur Point central ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1963 appEditors/FlatCAMGrbEditor.py:1454
+#: appEditors/appGeoEditor.py:1963 appEditors/FlatCAMGrbEditor.py:1454
 msgid "Click on Perimeter point to complete ..."
 msgstr "Cliquez sur le point du périmètre pour terminer ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1995
+#: appEditors/appGeoEditor.py:1995
 msgid "Done. Adding Circle completed."
 msgstr "Terminé. Ajout du cercle terminé."
 
-#: appEditors/FlatCAMGeoEditor.py:2049 appEditors/FlatCAMGrbEditor.py:1555
+#: appEditors/appGeoEditor.py:2049 appEditors/FlatCAMGrbEditor.py:1555
 msgid "Click on Start point ..."
 msgstr "Cliquez sur le point de départ ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2051 appEditors/FlatCAMGrbEditor.py:1557
+#: appEditors/appGeoEditor.py:2051 appEditors/FlatCAMGrbEditor.py:1557
 msgid "Click on Point3 ..."
 msgstr "Cliquez sur le point 3 ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2053 appEditors/FlatCAMGrbEditor.py:1559
+#: appEditors/appGeoEditor.py:2053 appEditors/FlatCAMGrbEditor.py:1559
 msgid "Click on Stop point ..."
 msgstr "Cliquez sur le point d'arrêt ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2058 appEditors/FlatCAMGrbEditor.py:1564
+#: appEditors/appGeoEditor.py:2058 appEditors/FlatCAMGrbEditor.py:1564
 msgid "Click on Stop point to complete ..."
 msgstr "Cliquez sur le point d'arrêt pour terminer ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2060 appEditors/FlatCAMGrbEditor.py:1566
+#: appEditors/appGeoEditor.py:2060 appEditors/FlatCAMGrbEditor.py:1566
 msgid "Click on Point2 to complete ..."
 msgstr "Cliquez sur le point 2 pour compléter ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2062 appEditors/FlatCAMGrbEditor.py:1568
+#: appEditors/appGeoEditor.py:2062 appEditors/FlatCAMGrbEditor.py:1568
 msgid "Click on Center point to complete ..."
 msgstr "Cliquez sur le point central pour terminer ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2074
+#: appEditors/appGeoEditor.py:2074
 #, python-format
 msgid "Direction: %s"
 msgstr "Direction: %s"
 
-#: appEditors/FlatCAMGeoEditor.py:2088 appEditors/FlatCAMGrbEditor.py:1594
+#: appEditors/appGeoEditor.py:2088 appEditors/FlatCAMGrbEditor.py:1594
 msgid "Mode: Start -> Stop -> Center. Click on Start point ..."
 msgstr ""
 "Mode: Démarrer -> Arrêter -> Centre. Cliquez sur le point de départ ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2091 appEditors/FlatCAMGrbEditor.py:1597
+#: appEditors/appGeoEditor.py:2091 appEditors/FlatCAMGrbEditor.py:1597
 msgid "Mode: Point1 -> Point3 -> Point2. Click on Point1 ..."
 msgstr "Mode: Point 1 -> Point 3 -> Point 2. Cliquez sur Point 1 ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2094 appEditors/FlatCAMGrbEditor.py:1600
+#: appEditors/appGeoEditor.py:2094 appEditors/FlatCAMGrbEditor.py:1600
 msgid "Mode: Center -> Start -> Stop. Click on Center point ..."
 msgstr "Mode: Centre -> Démarrer -> Arrêter. Cliquez sur Point central ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2235
+#: appEditors/appGeoEditor.py:2235
 msgid "Done. Arc completed."
 msgstr "Terminé. Arc terminé."
 
-#: appEditors/FlatCAMGeoEditor.py:2266 appEditors/FlatCAMGeoEditor.py:2339
+#: appEditors/appGeoEditor.py:2266 appEditors/appGeoEditor.py:2339
 msgid "Click on 1st corner ..."
 msgstr "Cliquez sur le 1er coin ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2278
+#: appEditors/appGeoEditor.py:2278
 msgid "Click on opposite corner to complete ..."
 msgstr "Cliquez sur le coin opposé pour terminer ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2308
+#: appEditors/appGeoEditor.py:2308
 msgid "Done. Rectangle completed."
 msgstr "Terminé. Rectangle complété."
 
-#: appEditors/FlatCAMGeoEditor.py:2383
+#: appEditors/appGeoEditor.py:2383
 msgid "Done. Polygon completed."
 msgstr "Terminé. Le polygone est terminé."
 
-#: appEditors/FlatCAMGeoEditor.py:2397 appEditors/FlatCAMGeoEditor.py:2462
+#: appEditors/appGeoEditor.py:2397 appEditors/appGeoEditor.py:2462
 #: appEditors/FlatCAMGrbEditor.py:1102 appEditors/FlatCAMGrbEditor.py:1322
 msgid "Backtracked one point ..."
 msgstr "Retracé un point ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2440
+#: appEditors/appGeoEditor.py:2440
 msgid "Done. Path completed."
 msgstr "Terminé. Chemin complété."
 
-#: appEditors/FlatCAMGeoEditor.py:2599
+#: appEditors/appGeoEditor.py:2599
 msgid "No shape selected. Select a shape to explode"
 msgstr "Aucune forme sélectionnée. Sélectionnez une forme à exploser"
 
-#: appEditors/FlatCAMGeoEditor.py:2632
+#: appEditors/appGeoEditor.py:2632
 msgid "Done. Polygons exploded into lines."
 msgstr "Terminé. Les polygones ont explosé en lignes."
 
-#: appEditors/FlatCAMGeoEditor.py:2664
+#: appEditors/appGeoEditor.py:2664
 msgid "MOVE: No shape selected. Select a shape to move"
 msgstr "Déplacer: Aucune forme sélectionnée. Sélectionnez une forme à déplacer"
 
-#: appEditors/FlatCAMGeoEditor.py:2667 appEditors/FlatCAMGeoEditor.py:2687
+#: appEditors/appGeoEditor.py:2667 appEditors/appGeoEditor.py:2687
 msgid " MOVE: Click on reference point ..."
 msgstr " Déplacer: Cliquez sur le point de référence ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2672
+#: appEditors/appGeoEditor.py:2672
 msgid " Click on destination point ..."
 msgstr " Cliquez sur le point de destination ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2712
+#: appEditors/appGeoEditor.py:2712
 msgid "Done. Geometry(s) Move completed."
 msgstr "Terminé. Géométrie (s) Déplacement terminé."
 
-#: appEditors/FlatCAMGeoEditor.py:2845
+#: appEditors/appGeoEditor.py:2845
 msgid "Done. Geometry(s) Copy completed."
 msgstr "Terminé. Géométrie (s) Copie terminée."
 
-#: appEditors/FlatCAMGeoEditor.py:2876 appEditors/FlatCAMGrbEditor.py:897
+#: appEditors/appGeoEditor.py:2876 appEditors/FlatCAMGrbEditor.py:897
 msgid "Click on 1st point ..."
 msgstr "Cliquez sur le 1er point ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2900
+#: appEditors/appGeoEditor.py:2900
 msgid ""
 "Font not supported. Only Regular, Bold, Italic and BoldItalic are supported. "
 "Error"
@@ -2715,83 +2715,83 @@ msgstr ""
 "Police non supportée. Seuls les formats Normal, Gras, Italique et "
 "GrasItalique sont pris en charge. Erreur"
 
-#: appEditors/FlatCAMGeoEditor.py:2908
+#: appEditors/appGeoEditor.py:2908
 msgid "No text to add."
 msgstr "Pas de texte à ajouter."
 
-#: appEditors/FlatCAMGeoEditor.py:2918
+#: appEditors/appGeoEditor.py:2918
 msgid " Done. Adding Text completed."
 msgstr " Terminé. Ajout de texte terminé."
 
-#: appEditors/FlatCAMGeoEditor.py:2955
+#: appEditors/appGeoEditor.py:2955
 msgid "Create buffer geometry ..."
 msgstr "Créer une géométrie tampon ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2990 appEditors/FlatCAMGrbEditor.py:5153
+#: appEditors/appGeoEditor.py:2990 appEditors/FlatCAMGrbEditor.py:5153
 msgid "Done. Buffer Tool completed."
 msgstr "Terminé. L'outil Tampon est terminé."
 
-#: appEditors/FlatCAMGeoEditor.py:3018
+#: appEditors/appGeoEditor.py:3018
 msgid "Done. Buffer Int Tool completed."
 msgstr "Terminé. L'outil Intérieur du Tampon est terminé."
 
-#: appEditors/FlatCAMGeoEditor.py:3046
+#: appEditors/appGeoEditor.py:3046
 msgid "Done. Buffer Ext Tool completed."
 msgstr "Terminé. L'outil Extérieur du Tampon est terminé."
 
-#: appEditors/FlatCAMGeoEditor.py:3095 appEditors/FlatCAMGrbEditor.py:2160
+#: appEditors/appGeoEditor.py:3095 appEditors/FlatCAMGrbEditor.py:2160
 msgid "Select a shape to act as deletion area ..."
 msgstr "Sélectionnez une forme pour agir comme zone de suppression ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3097 appEditors/FlatCAMGeoEditor.py:3123
-#: appEditors/FlatCAMGeoEditor.py:3129 appEditors/FlatCAMGrbEditor.py:2162
+#: appEditors/appGeoEditor.py:3097 appEditors/appGeoEditor.py:3123
+#: appEditors/appGeoEditor.py:3129 appEditors/FlatCAMGrbEditor.py:2162
 msgid "Click to pick-up the erase shape..."
 msgstr "Cliquez pour récupérer la forme à effacer ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3133 appEditors/FlatCAMGrbEditor.py:2221
+#: appEditors/appGeoEditor.py:3133 appEditors/FlatCAMGrbEditor.py:2221
 msgid "Click to erase ..."
 msgstr "Cliquez pour effacer ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3162 appEditors/FlatCAMGrbEditor.py:2254
+#: appEditors/appGeoEditor.py:3162 appEditors/FlatCAMGrbEditor.py:2254
 msgid "Done. Eraser tool action completed."
 msgstr "Terminé. Action de l’outil gomme terminée."
 
-#: appEditors/FlatCAMGeoEditor.py:3212
+#: appEditors/appGeoEditor.py:3212
 msgid "Create Paint geometry ..."
 msgstr "Créer une géométrie de peinture ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3225 appEditors/FlatCAMGrbEditor.py:2417
+#: appEditors/appGeoEditor.py:3225 appEditors/FlatCAMGrbEditor.py:2417
 msgid "Shape transformations ..."
 msgstr "Transformations de forme ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3281
+#: appEditors/appGeoEditor.py:3281
 #: appGUI/preferences/geometry/GeometryEditorPrefGroupUI.py:27
 msgid "Geometry Editor"
 msgstr "Éditeur de Géométrie"
 
-#: appEditors/FlatCAMGeoEditor.py:3287 appEditors/FlatCAMGrbEditor.py:2495
+#: appEditors/appGeoEditor.py:3287 appEditors/FlatCAMGrbEditor.py:2495
 #: appEditors/FlatCAMGrbEditor.py:3951 appGUI/ObjectUI.py:282
 #: appGUI/ObjectUI.py:1394 appGUI/ObjectUI.py:2256 appTools/ToolCutOut.py:95
 #: appTools/ToolTransform.py:92
 msgid "Type"
 msgstr "Type"
 
-#: appEditors/FlatCAMGeoEditor.py:3287 appGUI/ObjectUI.py:221
+#: appEditors/appGeoEditor.py:3287 appGUI/ObjectUI.py:221
 #: appGUI/ObjectUI.py:521 appGUI/ObjectUI.py:1330 appGUI/ObjectUI.py:2165
 #: appGUI/ObjectUI.py:2469 appGUI/ObjectUI.py:2536
 #: appTools/ToolCalibration.py:234 appTools/ToolFiducials.py:70
 msgid "Name"
 msgstr "Nom"
 
-#: appEditors/FlatCAMGeoEditor.py:3539
+#: appEditors/appGeoEditor.py:3539
 msgid "Ring"
 msgstr "L'anneau"
 
-#: appEditors/FlatCAMGeoEditor.py:3541
+#: appEditors/appGeoEditor.py:3541
 msgid "Line"
 msgstr "Ligne"
 
-#: appEditors/FlatCAMGeoEditor.py:3543 appGUI/MainGUI.py:1446
+#: appEditors/appGeoEditor.py:3543 appGUI/MainGUI.py:1446
 #: appGUI/ObjectUI.py:1150 appGUI/ObjectUI.py:2005
 #: appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py:226
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:299
@@ -2802,47 +2802,47 @@ msgstr "Ligne"
 msgid "Polygon"
 msgstr "Polygone"
 
-#: appEditors/FlatCAMGeoEditor.py:3545
+#: appEditors/appGeoEditor.py:3545
 msgid "Multi-Line"
 msgstr "Multi-ligne"
 
-#: appEditors/FlatCAMGeoEditor.py:3547
+#: appEditors/appGeoEditor.py:3547
 msgid "Multi-Polygon"
 msgstr "Multi-polygone"
 
-#: appEditors/FlatCAMGeoEditor.py:3554
+#: appEditors/appGeoEditor.py:3554
 msgid "Geo Elem"
 msgstr "Élém. de Géo"
 
-#: appEditors/FlatCAMGeoEditor.py:4007
+#: appEditors/appGeoEditor.py:4007
 msgid "Editing MultiGeo Geometry, tool"
 msgstr "Modification de la géométrie MultiGeo, outil"
 
-#: appEditors/FlatCAMGeoEditor.py:4009
+#: appEditors/appGeoEditor.py:4009
 msgid "with diameter"
 msgstr "avec diamètre"
 
-#: appEditors/FlatCAMGeoEditor.py:4081
+#: appEditors/appGeoEditor.py:4081
 msgid "Grid Snap enabled."
 msgstr "Accrochage à la grille activé."
 
-#: appEditors/FlatCAMGeoEditor.py:4085
+#: appEditors/appGeoEditor.py:4085
 msgid "Grid Snap disabled."
 msgstr "Accrochage à la grille désactivé."
 
-#: appEditors/FlatCAMGeoEditor.py:4446 appGUI/MainGUI.py:3046
+#: appEditors/appGeoEditor.py:4446 appGUI/MainGUI.py:3046
 #: appGUI/MainGUI.py:3092 appGUI/MainGUI.py:3110 appGUI/MainGUI.py:3254
 #: appGUI/MainGUI.py:3293 appGUI/MainGUI.py:3305 appGUI/MainGUI.py:3322
 msgid "Click on target point."
 msgstr "Cliquez sur le point cible."
 
-#: appEditors/FlatCAMGeoEditor.py:4762 appEditors/FlatCAMGeoEditor.py:4797
+#: appEditors/appGeoEditor.py:4762 appEditors/appGeoEditor.py:4797
 msgid "A selection of at least 2 geo items is required to do Intersection."
 msgstr ""
 "Une sélection d'au moins 2 éléments géographiques est requise pour effectuer "
 "Intersection."
 
-#: appEditors/FlatCAMGeoEditor.py:4883 appEditors/FlatCAMGeoEditor.py:4987
+#: appEditors/appGeoEditor.py:4883 appEditors/appGeoEditor.py:4987
 msgid ""
 "Negative buffer value is not accepted. Use Buffer interior to generate an "
 "'inside' shape"
@@ -2850,58 +2850,58 @@ msgstr ""
 "La valeur de tampon négative n'est pas acceptée. Utiliser l'intérieur du "
 "tampon pour générer une forme «intérieure»"
 
-#: appEditors/FlatCAMGeoEditor.py:4893 appEditors/FlatCAMGeoEditor.py:4946
-#: appEditors/FlatCAMGeoEditor.py:4996
+#: appEditors/appGeoEditor.py:4893 appEditors/appGeoEditor.py:4946
+#: appEditors/appGeoEditor.py:4996
 msgid "Nothing selected for buffering."
 msgstr "Aucune sélection pour la mise en mémoire tampon."
 
-#: appEditors/FlatCAMGeoEditor.py:4898 appEditors/FlatCAMGeoEditor.py:4950
-#: appEditors/FlatCAMGeoEditor.py:5001
+#: appEditors/appGeoEditor.py:4898 appEditors/appGeoEditor.py:4950
+#: appEditors/appGeoEditor.py:5001
 msgid "Invalid distance for buffering."
 msgstr "Distance non valide pour la mise en mémoire tampon."
 
-#: appEditors/FlatCAMGeoEditor.py:4922 appEditors/FlatCAMGeoEditor.py:5021
+#: appEditors/appGeoEditor.py:4922 appEditors/appGeoEditor.py:5021
 msgid "Failed, the result is empty. Choose a different buffer value."
 msgstr ""
 "Echec, le résultat est vide. Choisissez une valeur de tampon différente."
 
-#: appEditors/FlatCAMGeoEditor.py:4933
+#: appEditors/appGeoEditor.py:4933
 msgid "Full buffer geometry created."
 msgstr "Géométrie de tampon complète créée."
 
-#: appEditors/FlatCAMGeoEditor.py:4939
+#: appEditors/appGeoEditor.py:4939
 msgid "Negative buffer value is not accepted."
 msgstr "La valeur de tampon négative n'est pas acceptée."
 
-#: appEditors/FlatCAMGeoEditor.py:4970
+#: appEditors/appGeoEditor.py:4970
 msgid "Failed, the result is empty. Choose a smaller buffer value."
 msgstr ""
 "Echec, le résultat est vide. Choisissez une valeur de tampon plus petite."
 
-#: appEditors/FlatCAMGeoEditor.py:4980
+#: appEditors/appGeoEditor.py:4980
 msgid "Interior buffer geometry created."
 msgstr "Géométrie du tampon intérieur créée."
 
-#: appEditors/FlatCAMGeoEditor.py:5031
+#: appEditors/appGeoEditor.py:5031
 msgid "Exterior buffer geometry created."
 msgstr "Géométrie tampon externe créée."
 
-#: appEditors/FlatCAMGeoEditor.py:5037
+#: appEditors/appGeoEditor.py:5037
 #, python-format
 msgid "Could not do Paint. Overlap value has to be less than 100%%."
 msgstr ""
 "Impossible de peindre. La valeur de chevauchement doit être inférieure à 100 "
 "%%."
 
-#: appEditors/FlatCAMGeoEditor.py:5044
+#: appEditors/appGeoEditor.py:5044
 msgid "Nothing selected for painting."
 msgstr "Rien de sélectionné pour la peinture."
 
-#: appEditors/FlatCAMGeoEditor.py:5050
+#: appEditors/appGeoEditor.py:5050
 msgid "Invalid value for"
 msgstr "Invalid value for"
 
-#: appEditors/FlatCAMGeoEditor.py:5109
+#: appEditors/appGeoEditor.py:5109
 msgid ""
 "Could not do Paint. Try a different combination of parameters. Or a "
 "different method of Paint"
@@ -2909,7 +2909,7 @@ msgstr ""
 "Impossible de faire de la peinture. Essayez une combinaison de paramètres "
 "différente. Ou une autre méthode de peinture"
 
-#: appEditors/FlatCAMGeoEditor.py:5120
+#: appEditors/appGeoEditor.py:5120
 msgid "Paint done."
 msgstr "Peinture faite."
 
diff --git a/locale/hu/LC_MESSAGES/strings.po b/locale/hu/LC_MESSAGES/strings.po
index 19a75b62..2a4820da 100644
--- a/locale/hu/LC_MESSAGES/strings.po
+++ b/locale/hu/LC_MESSAGES/strings.po
@@ -167,7 +167,7 @@ msgstr ""
 msgid "Zone added. Click to start adding next zone or right click to finish."
 msgstr ""
 
-#: Common.py:322 appEditors/FlatCAMGeoEditor.py:2352
+#: Common.py:322 appEditors/appGeoEditor.py:2352
 #: appTools/ToolIsolation.py:2584 appTools/ToolNCC.py:1754
 #: appTools/ToolPaint.py:1647
 msgid "Click on next Point or click right mouse button to complete ..."
@@ -781,7 +781,7 @@ msgid "Conventional"
 msgstr ""
 
 #: appDatabase.py:1456 appDatabase.py:1565 appDatabase.py:1667
-#: appEditors/FlatCAMGeoEditor.py:450
+#: appEditors/appGeoEditor.py:450
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:167
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:182
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:163
@@ -802,7 +802,7 @@ msgid ""
 "due of too many paths."
 msgstr ""
 
-#: appDatabase.py:1477 appDatabase.py:1586 appEditors/FlatCAMGeoEditor.py:470
+#: appDatabase.py:1477 appDatabase.py:1586 appEditors/appGeoEditor.py:470
 #: appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py:72
 #: appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py:229
 #: appGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py:59
@@ -831,7 +831,7 @@ msgstr ""
 msgid "Bounding box margin."
 msgstr ""
 
-#: appDatabase.py:1490 appDatabase.py:1601 appEditors/FlatCAMGeoEditor.py:484
+#: appDatabase.py:1490 appDatabase.py:1601 appEditors/appGeoEditor.py:484
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:105
 #: appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py:106
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:215
@@ -850,7 +850,7 @@ msgid ""
 "- Line-based: Parallel lines."
 msgstr ""
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2232 appTools/ToolNCC.py:2764
@@ -860,8 +860,8 @@ msgstr ""
 msgid "Standard"
 msgstr ""
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
-#: appEditors/FlatCAMGeoEditor.py:568 appEditors/FlatCAMGeoEditor.py:5091
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
+#: appEditors/appGeoEditor.py:568 appEditors/appGeoEditor.py:5091
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2243 appTools/ToolNCC.py:2770
@@ -872,8 +872,8 @@ msgstr ""
 msgid "Seed"
 msgstr ""
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
-#: appEditors/FlatCAMGeoEditor.py:5095
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
+#: appEditors/appGeoEditor.py:5095
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2254 appTools/ToolPaint.py:389
@@ -897,7 +897,7 @@ msgstr ""
 msgid "Connect"
 msgstr ""
 
-#: appDatabase.py:1512 appDatabase.py:1629 appEditors/FlatCAMGeoEditor.py:507
+#: appDatabase.py:1512 appDatabase.py:1629 appEditors/appGeoEditor.py:507
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:239
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:226
 #: appTools/ToolNCC.py:443 appTools/ToolPaint.py:403
@@ -913,7 +913,7 @@ msgstr ""
 msgid "Contour"
 msgstr ""
 
-#: appDatabase.py:1522 appDatabase.py:1636 appEditors/FlatCAMGeoEditor.py:517
+#: appDatabase.py:1522 appDatabase.py:1636 appEditors/appGeoEditor.py:517
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:248
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:234
 #: appTools/ToolNCC.py:453 appTools/ToolPaint.py:410
@@ -922,7 +922,7 @@ msgid ""
 "to trim rough edges."
 msgstr ""
 
-#: appDatabase.py:1528 appEditors/FlatCAMGeoEditor.py:611
+#: appDatabase.py:1528 appEditors/appGeoEditor.py:611
 #: appEditors/FlatCAMGrbEditor.py:5304 appGUI/ObjectUI.py:143
 #: appGUI/ObjectUI.py:1394 appGUI/ObjectUI.py:2256
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:255
@@ -941,7 +941,7 @@ msgid ""
 "The value can be between 0 and 10 FlatCAM units."
 msgstr ""
 
-#: appDatabase.py:1567 appEditors/FlatCAMGeoEditor.py:452
+#: appDatabase.py:1567 appEditors/appGeoEditor.py:452
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:165
 #: appTools/ToolPaint.py:330
 msgid ""
@@ -954,7 +954,7 @@ msgid ""
 "due of too many paths."
 msgstr ""
 
-#: appDatabase.py:1588 appEditors/FlatCAMGeoEditor.py:472
+#: appDatabase.py:1588 appEditors/appGeoEditor.py:472
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:185
 #: appTools/ToolPaint.py:351
 msgid ""
@@ -1363,7 +1363,7 @@ msgstr ""
 #: appEditors/FlatCAMExcEditor.py:1800 appEditors/FlatCAMExcEditor.py:1871
 #: appEditors/FlatCAMExcEditor.py:1875 appEditors/FlatCAMExcEditor.py:1964
 #: appEditors/FlatCAMExcEditor.py:1982 appEditors/FlatCAMExcEditor.py:2016
-#: appEditors/FlatCAMGeoEditor.py:683 appEditors/FlatCAMGrbEditor.py:2822
+#: appEditors/appGeoEditor.py:683 appEditors/FlatCAMGrbEditor.py:2822
 #: appEditors/FlatCAMGrbEditor.py:2839 appEditors/FlatCAMGrbEditor.py:2875
 #: appEditors/FlatCAMGrbEditor.py:5376
 #: appGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py:94
@@ -1565,7 +1565,7 @@ msgid "Cancelled. There is no Tool/Drill selected"
 msgstr ""
 
 #: appEditors/FlatCAMExcEditor.py:3601 appEditors/FlatCAMExcEditor.py:3609
-#: appEditors/FlatCAMGeoEditor.py:4286 appEditors/FlatCAMGeoEditor.py:4300
+#: appEditors/appGeoEditor.py:4286 appEditors/appGeoEditor.py:4300
 #: appEditors/FlatCAMGrbEditor.py:1085 appEditors/FlatCAMGrbEditor.py:1312
 #: appEditors/FlatCAMGrbEditor.py:1497 appEditors/FlatCAMGrbEditor.py:1766
 #: appEditors/FlatCAMGrbEditor.py:4608 appEditors/FlatCAMGrbEditor.py:4625
@@ -1584,15 +1584,15 @@ msgstr ""
 msgid "Click on the circular array Center position"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:84
+#: appEditors/appGeoEditor.py:84
 msgid "Buffer distance:"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:85
+#: appEditors/appGeoEditor.py:85
 msgid "Buffer corner:"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:87
+#: appEditors/appGeoEditor.py:87
 msgid ""
 "There are 3 types of corners:\n"
 " - 'Round': the corner is rounded for exterior buffer.\n"
@@ -1601,11 +1601,11 @@ msgid ""
 "meeting in the corner"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:93 appEditors/FlatCAMGrbEditor.py:2638
+#: appEditors/appGeoEditor.py:93 appEditors/FlatCAMGrbEditor.py:2638
 msgid "Round"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:94 appEditors/FlatCAMGrbEditor.py:2639
+#: appEditors/appGeoEditor.py:94 appEditors/FlatCAMGrbEditor.py:2639
 #: appGUI/ObjectUI.py:1149 appGUI/ObjectUI.py:2004
 #: appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py:225
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:68
@@ -1623,48 +1623,48 @@ msgstr ""
 msgid "Square"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:95 appEditors/FlatCAMGrbEditor.py:2640
+#: appEditors/appGeoEditor.py:95 appEditors/FlatCAMGrbEditor.py:2640
 msgid "Beveled"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:102
+#: appEditors/appGeoEditor.py:102
 msgid "Buffer Interior"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:104
+#: appEditors/appGeoEditor.py:104
 msgid "Buffer Exterior"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:110
+#: appEditors/appGeoEditor.py:110
 msgid "Full Buffer"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:131 appEditors/FlatCAMGeoEditor.py:2959
+#: appEditors/appGeoEditor.py:131 appEditors/appGeoEditor.py:2959
 #: appGUI/MainGUI.py:4301
 #: appGUI/preferences/gerber/GerberEditorPrefGroupUI.py:191
 msgid "Buffer Tool"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:143 appEditors/FlatCAMGeoEditor.py:160
-#: appEditors/FlatCAMGeoEditor.py:177 appEditors/FlatCAMGeoEditor.py:2978
-#: appEditors/FlatCAMGeoEditor.py:3006 appEditors/FlatCAMGeoEditor.py:3034
+#: appEditors/appGeoEditor.py:143 appEditors/appGeoEditor.py:160
+#: appEditors/appGeoEditor.py:177 appEditors/appGeoEditor.py:2978
+#: appEditors/appGeoEditor.py:3006 appEditors/appGeoEditor.py:3034
 #: appEditors/FlatCAMGrbEditor.py:5109
 msgid "Buffer distance value is missing or wrong format. Add it and retry."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:241
+#: appEditors/appGeoEditor.py:241
 msgid "Font"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:322 appGUI/MainGUI.py:1452
+#: appEditors/appGeoEditor.py:322 appGUI/MainGUI.py:1452
 msgid "Text"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:348
+#: appEditors/appGeoEditor.py:348
 msgid "Text Tool"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:404 appGUI/MainGUI.py:502
+#: appEditors/appGeoEditor.py:404 appGUI/MainGUI.py:502
 #: appGUI/MainGUI.py:1199 appGUI/ObjectUI.py:597 appGUI/ObjectUI.py:1564
 #: appObjects/FlatCAMExcellon.py:852 appObjects/FlatCAMExcellon.py:1242
 #: appObjects/FlatCAMGeometry.py:825 appTools/ToolIsolation.py:313
@@ -1673,15 +1673,15 @@ msgstr ""
 msgid "Tool"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:438
+#: appEditors/appGeoEditor.py:438
 msgid "Tool dia"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:440
+#: appEditors/appGeoEditor.py:440
 msgid "Diameter of the tool to be used in the operation."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:486
+#: appEditors/appGeoEditor.py:486
 msgid ""
 "Algorithm to paint the polygons:\n"
 "- Standard: Fixed step inwards.\n"
@@ -1689,57 +1689,57 @@ msgid ""
 "- Line-based: Parallel lines."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:505
+#: appEditors/appGeoEditor.py:505
 msgid "Connect:"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:515
+#: appEditors/appGeoEditor.py:515
 msgid "Contour:"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:528 appGUI/MainGUI.py:1456
+#: appEditors/appGeoEditor.py:528 appGUI/MainGUI.py:1456
 msgid "Paint"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:546 appGUI/MainGUI.py:912
+#: appEditors/appGeoEditor.py:546 appGUI/MainGUI.py:912
 #: appGUI/MainGUI.py:1944 appGUI/ObjectUI.py:2069 appTools/ToolPaint.py:42
 #: appTools/ToolPaint.py:737
 msgid "Paint Tool"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:582 appEditors/FlatCAMGeoEditor.py:1071
-#: appEditors/FlatCAMGeoEditor.py:2966 appEditors/FlatCAMGeoEditor.py:2994
-#: appEditors/FlatCAMGeoEditor.py:3022 appEditors/FlatCAMGeoEditor.py:4439
+#: appEditors/appGeoEditor.py:582 appEditors/appGeoEditor.py:1071
+#: appEditors/appGeoEditor.py:2966 appEditors/appGeoEditor.py:2994
+#: appEditors/appGeoEditor.py:3022 appEditors/appGeoEditor.py:4439
 #: appEditors/FlatCAMGrbEditor.py:5764
 msgid "Cancelled. No shape selected."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:595 appEditors/FlatCAMGeoEditor.py:2984
-#: appEditors/FlatCAMGeoEditor.py:3012 appEditors/FlatCAMGeoEditor.py:3040
+#: appEditors/appGeoEditor.py:595 appEditors/appGeoEditor.py:2984
+#: appEditors/appGeoEditor.py:3012 appEditors/appGeoEditor.py:3040
 #: appGUI/preferences/geometry/GeometryGenPrefGroupUI.py:69
 #: appTools/ToolProperties.py:117 appTools/ToolProperties.py:162
 msgid "Tools"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:606 appEditors/FlatCAMGeoEditor.py:1035
+#: appEditors/appGeoEditor.py:606 appEditors/appGeoEditor.py:1035
 #: appEditors/FlatCAMGrbEditor.py:5299 appEditors/FlatCAMGrbEditor.py:5728
 #: appGUI/MainGUI.py:935 appGUI/MainGUI.py:1967 appTools/ToolTransform.py:494
 msgid "Transform Tool"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:607 appEditors/FlatCAMGeoEditor.py:699
+#: appEditors/appGeoEditor.py:607 appEditors/appGeoEditor.py:699
 #: appEditors/FlatCAMGrbEditor.py:5300 appEditors/FlatCAMGrbEditor.py:5392
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:88
 #: appTools/ToolTransform.py:27 appTools/ToolTransform.py:146
 msgid "Rotate"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:608 appEditors/FlatCAMGrbEditor.py:5301
+#: appEditors/appGeoEditor.py:608 appEditors/FlatCAMGrbEditor.py:5301
 #: appTools/ToolTransform.py:28
 msgid "Skew/Shear"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:609 appEditors/FlatCAMGrbEditor.py:2687
+#: appEditors/appGeoEditor.py:609 appEditors/FlatCAMGrbEditor.py:2687
 #: appEditors/FlatCAMGrbEditor.py:5302 appGUI/MainGUI.py:1057
 #: appGUI/MainGUI.py:1499 appGUI/MainGUI.py:2089 appGUI/MainGUI.py:4513
 #: appGUI/ObjectUI.py:125
@@ -1748,12 +1748,12 @@ msgstr ""
 msgid "Scale"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:610 appEditors/FlatCAMGrbEditor.py:5303
+#: appEditors/appGeoEditor.py:610 appEditors/FlatCAMGrbEditor.py:5303
 #: appTools/ToolTransform.py:30
 msgid "Mirror (Flip)"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:612 appEditors/FlatCAMGrbEditor.py:2647
+#: appEditors/appGeoEditor.py:612 appEditors/FlatCAMGrbEditor.py:2647
 #: appEditors/FlatCAMGrbEditor.py:5305 appGUI/MainGUI.py:1055
 #: appGUI/MainGUI.py:1454 appGUI/MainGUI.py:1497 appGUI/MainGUI.py:2087
 #: appGUI/MainGUI.py:4511
@@ -1762,7 +1762,7 @@ msgstr ""
 msgid "Buffer"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:643 appEditors/FlatCAMGrbEditor.py:5336
+#: appEditors/appGeoEditor.py:643 appEditors/FlatCAMGrbEditor.py:5336
 #: appGUI/GUIElements.py:2701
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:169
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:44
@@ -1771,7 +1771,7 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:645 appEditors/FlatCAMGrbEditor.py:5338
+#: appEditors/appGeoEditor.py:645 appEditors/FlatCAMGrbEditor.py:5338
 msgid ""
 "The reference point for Rotate, Skew, Scale, Mirror.\n"
 "Can be:\n"
@@ -1782,14 +1782,14 @@ msgid ""
 "selection"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
 #: appTools/ToolCalibration.py:770 appTools/ToolCalibration.py:771
 #: appTools/ToolTransform.py:70
 msgid "Origin"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGeoEditor.py:1044
+#: appEditors/appGeoEditor.py:653 appEditors/appGeoEditor.py:1044
 #: appEditors/FlatCAMGrbEditor.py:5346 appEditors/FlatCAMGrbEditor.py:5737
 #: appGUI/preferences/general/GeneralGUIPrefGroupUI.py:250
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:275
@@ -1801,7 +1801,7 @@ msgstr ""
 msgid "Selection"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 #: appGUI/preferences/tools/Tools2sidedPrefGroupUI.py:80
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:60
@@ -1809,11 +1809,11 @@ msgstr ""
 msgid "Point"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 msgid "Minimum"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:659 appEditors/FlatCAMGeoEditor.py:955
+#: appEditors/appGeoEditor.py:659 appEditors/appGeoEditor.py:955
 #: appEditors/FlatCAMGrbEditor.py:5352 appEditors/FlatCAMGrbEditor.py:5648
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:131
 #: appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py:133
@@ -1824,13 +1824,13 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:661 appEditors/FlatCAMGrbEditor.py:5354
+#: appEditors/appGeoEditor.py:661 appEditors/FlatCAMGrbEditor.py:5354
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:62
 #: appTools/ToolTransform.py:78
 msgid "A point of reference in format X,Y."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:668 appEditors/FlatCAMGrbEditor.py:2590
+#: appEditors/appGeoEditor.py:668 appEditors/FlatCAMGrbEditor.py:2590
 #: appEditors/FlatCAMGrbEditor.py:5361 appGUI/ObjectUI.py:1494
 #: appTools/ToolDblSided.py:192 appTools/ToolDblSided.py:425
 #: appTools/ToolIsolation.py:276 appTools/ToolIsolation.py:631
@@ -1841,12 +1841,12 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:670 appEditors/FlatCAMGrbEditor.py:5363
+#: appEditors/appGeoEditor.py:670 appEditors/FlatCAMGrbEditor.py:5363
 #: appTools/ToolTransform.py:87
 msgid "Add point coordinates from clipboard."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:685 appEditors/FlatCAMGrbEditor.py:5378
+#: appEditors/appGeoEditor.py:685 appEditors/FlatCAMGrbEditor.py:5378
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:98
 #: appTools/ToolTransform.py:132
 msgid ""
@@ -1856,7 +1856,7 @@ msgid ""
 "Negative numbers for CCW motion."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:701 appEditors/FlatCAMGrbEditor.py:5394
+#: appEditors/appGeoEditor.py:701 appEditors/FlatCAMGrbEditor.py:5394
 #: appTools/ToolTransform.py:148
 msgid ""
 "Rotate the selected object(s).\n"
@@ -1864,7 +1864,7 @@ msgid ""
 "the bounding box for all selected objects."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:721 appEditors/FlatCAMGeoEditor.py:783
+#: appEditors/appGeoEditor.py:721 appEditors/appGeoEditor.py:783
 #: appEditors/FlatCAMGrbEditor.py:5414 appEditors/FlatCAMGrbEditor.py:5476
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:112
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:151
@@ -1872,7 +1872,7 @@ msgstr ""
 msgid "Link"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:723 appEditors/FlatCAMGeoEditor.py:785
+#: appEditors/appGeoEditor.py:723 appEditors/appGeoEditor.py:785
 #: appEditors/FlatCAMGrbEditor.py:5416 appEditors/FlatCAMGrbEditor.py:5478
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:114
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:153
@@ -1880,14 +1880,14 @@ msgstr ""
 msgid "Link the Y entry to X entry and copy its content."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:728 appEditors/FlatCAMGrbEditor.py:5421
+#: appEditors/appGeoEditor.py:728 appEditors/FlatCAMGrbEditor.py:5421
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:151
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:124
 #: appTools/ToolFilm.py:184 appTools/ToolTransform.py:175
 msgid "X angle"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:730 appEditors/FlatCAMGeoEditor.py:751
+#: appEditors/appGeoEditor.py:730 appEditors/appGeoEditor.py:751
 #: appEditors/FlatCAMGrbEditor.py:5423 appEditors/FlatCAMGrbEditor.py:5444
 #: appTools/ToolTransform.py:177 appTools/ToolTransform.py:198
 msgid ""
@@ -1895,12 +1895,12 @@ msgid ""
 "Float number between -360 and 360."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:738 appEditors/FlatCAMGrbEditor.py:5431
+#: appEditors/appGeoEditor.py:738 appEditors/FlatCAMGrbEditor.py:5431
 #: appTools/ToolTransform.py:185
 msgid "Skew X"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:740 appEditors/FlatCAMGeoEditor.py:761
+#: appEditors/appGeoEditor.py:740 appEditors/appGeoEditor.py:761
 #: appEditors/FlatCAMGrbEditor.py:5433 appEditors/FlatCAMGrbEditor.py:5454
 #: appTools/ToolTransform.py:187 appTools/ToolTransform.py:208
 msgid ""
@@ -1909,37 +1909,37 @@ msgid ""
 "the bounding box for all selected objects."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:749 appEditors/FlatCAMGrbEditor.py:5442
+#: appEditors/appGeoEditor.py:749 appEditors/FlatCAMGrbEditor.py:5442
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:160
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:138
 #: appTools/ToolFilm.py:193 appTools/ToolTransform.py:196
 msgid "Y angle"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:759 appEditors/FlatCAMGrbEditor.py:5452
+#: appEditors/appGeoEditor.py:759 appEditors/FlatCAMGrbEditor.py:5452
 #: appTools/ToolTransform.py:206
 msgid "Skew Y"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:790 appEditors/FlatCAMGrbEditor.py:5483
+#: appEditors/appGeoEditor.py:790 appEditors/FlatCAMGrbEditor.py:5483
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:120
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:162
 #: appTools/ToolFilm.py:145 appTools/ToolTransform.py:237
 msgid "X factor"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:792 appEditors/FlatCAMGrbEditor.py:5485
+#: appEditors/appGeoEditor.py:792 appEditors/FlatCAMGrbEditor.py:5485
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:164
 #: appTools/ToolTransform.py:239
 msgid "Factor for scaling on X axis."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:799 appEditors/FlatCAMGrbEditor.py:5492
+#: appEditors/appGeoEditor.py:799 appEditors/FlatCAMGrbEditor.py:5492
 #: appTools/ToolTransform.py:246
 msgid "Scale X"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:801 appEditors/FlatCAMGeoEditor.py:821
+#: appEditors/appGeoEditor.py:801 appEditors/appGeoEditor.py:821
 #: appEditors/FlatCAMGrbEditor.py:5494 appEditors/FlatCAMGrbEditor.py:5514
 #: appTools/ToolTransform.py:248 appTools/ToolTransform.py:268
 msgid ""
@@ -1948,58 +1948,58 @@ msgid ""
 "the Scale reference checkbox state."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:810 appEditors/FlatCAMGrbEditor.py:5503
+#: appEditors/appGeoEditor.py:810 appEditors/FlatCAMGrbEditor.py:5503
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:129
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:175
 #: appTools/ToolFilm.py:154 appTools/ToolTransform.py:257
 msgid "Y factor"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:812 appEditors/FlatCAMGrbEditor.py:5505
+#: appEditors/appGeoEditor.py:812 appEditors/FlatCAMGrbEditor.py:5505
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:177
 #: appTools/ToolTransform.py:259
 msgid "Factor for scaling on Y axis."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:819 appEditors/FlatCAMGrbEditor.py:5512
+#: appEditors/appGeoEditor.py:819 appEditors/FlatCAMGrbEditor.py:5512
 #: appTools/ToolTransform.py:266
 msgid "Scale Y"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:846 appEditors/FlatCAMGrbEditor.py:5539
+#: appEditors/appGeoEditor.py:846 appEditors/FlatCAMGrbEditor.py:5539
 #: appTools/ToolTransform.py:293
 msgid "Flip on X"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:848 appEditors/FlatCAMGeoEditor.py:853
+#: appEditors/appGeoEditor.py:848 appEditors/appGeoEditor.py:853
 #: appEditors/FlatCAMGrbEditor.py:5541 appEditors/FlatCAMGrbEditor.py:5546
 #: appTools/ToolTransform.py:295 appTools/ToolTransform.py:300
 msgid "Flip the selected object(s) over the X axis."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:851 appEditors/FlatCAMGrbEditor.py:5544
+#: appEditors/appGeoEditor.py:851 appEditors/FlatCAMGrbEditor.py:5544
 #: appTools/ToolTransform.py:298
 msgid "Flip on Y"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:871 appEditors/FlatCAMGrbEditor.py:5564
+#: appEditors/appGeoEditor.py:871 appEditors/FlatCAMGrbEditor.py:5564
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:191
 #: appTools/ToolTransform.py:318
 msgid "X val"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:873 appEditors/FlatCAMGrbEditor.py:5566
+#: appEditors/appGeoEditor.py:873 appEditors/FlatCAMGrbEditor.py:5566
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:193
 #: appTools/ToolTransform.py:320
 msgid "Distance to offset on X axis. In current units."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:880 appEditors/FlatCAMGrbEditor.py:5573
+#: appEditors/appGeoEditor.py:880 appEditors/FlatCAMGrbEditor.py:5573
 #: appTools/ToolTransform.py:327
 msgid "Offset X"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:882 appEditors/FlatCAMGeoEditor.py:902
+#: appEditors/appGeoEditor.py:882 appEditors/appGeoEditor.py:902
 #: appEditors/FlatCAMGrbEditor.py:5575 appEditors/FlatCAMGrbEditor.py:5595
 #: appTools/ToolTransform.py:329 appTools/ToolTransform.py:349
 msgid ""
@@ -2008,31 +2008,31 @@ msgid ""
 "the bounding box for all selected objects.\n"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:891 appEditors/FlatCAMGrbEditor.py:5584
+#: appEditors/appGeoEditor.py:891 appEditors/FlatCAMGrbEditor.py:5584
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:204
 #: appTools/ToolTransform.py:338
 msgid "Y val"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:893 appEditors/FlatCAMGrbEditor.py:5586
+#: appEditors/appGeoEditor.py:893 appEditors/FlatCAMGrbEditor.py:5586
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:206
 #: appTools/ToolTransform.py:340
 msgid "Distance to offset on Y axis. In current units."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:900 appEditors/FlatCAMGrbEditor.py:5593
+#: appEditors/appGeoEditor.py:900 appEditors/FlatCAMGrbEditor.py:5593
 #: appTools/ToolTransform.py:347
 msgid "Offset Y"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:920 appEditors/FlatCAMGrbEditor.py:5613
+#: appEditors/appGeoEditor.py:920 appEditors/FlatCAMGrbEditor.py:5613
 #: appGUI/preferences/tools/Tools2QRCodePrefGroupUI.py:142
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:216
 #: appTools/ToolQRCode.py:206 appTools/ToolTransform.py:367
 msgid "Rounded"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:922 appEditors/FlatCAMGrbEditor.py:5615
+#: appEditors/appGeoEditor.py:922 appEditors/FlatCAMGrbEditor.py:5615
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:218
 #: appTools/ToolTransform.py:369
 msgid ""
@@ -2042,14 +2042,14 @@ msgid ""
 "of the buffered shape."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:930 appEditors/FlatCAMGrbEditor.py:5623
+#: appEditors/appGeoEditor.py:930 appEditors/FlatCAMGrbEditor.py:5623
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:226
 #: appTools/ToolDistance.py:505 appTools/ToolDistanceMin.py:286
 #: appTools/ToolTransform.py:377
 msgid "Distance"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:932 appEditors/FlatCAMGrbEditor.py:5625
+#: appEditors/appGeoEditor.py:932 appEditors/FlatCAMGrbEditor.py:5625
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:228
 #: appTools/ToolTransform.py:379
 msgid ""
@@ -2059,19 +2059,19 @@ msgid ""
 "or decreased with the 'distance'."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:944 appEditors/FlatCAMGrbEditor.py:5637
+#: appEditors/appGeoEditor.py:944 appEditors/FlatCAMGrbEditor.py:5637
 #: appTools/ToolTransform.py:391
 msgid "Buffer D"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:946 appEditors/FlatCAMGrbEditor.py:5639
+#: appEditors/appGeoEditor.py:946 appEditors/FlatCAMGrbEditor.py:5639
 #: appTools/ToolTransform.py:393
 msgid ""
 "Create the buffer effect on each geometry,\n"
 "element from the selected object, using the distance."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:957 appEditors/FlatCAMGrbEditor.py:5650
+#: appEditors/appGeoEditor.py:957 appEditors/FlatCAMGrbEditor.py:5650
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:245
 #: appTools/ToolTransform.py:404
 msgid ""
@@ -2082,19 +2082,19 @@ msgid ""
 "of the initial dimension."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:970 appEditors/FlatCAMGrbEditor.py:5663
+#: appEditors/appGeoEditor.py:970 appEditors/FlatCAMGrbEditor.py:5663
 #: appTools/ToolTransform.py:417
 msgid "Buffer F"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:972 appEditors/FlatCAMGrbEditor.py:5665
+#: appEditors/appGeoEditor.py:972 appEditors/FlatCAMGrbEditor.py:5665
 #: appTools/ToolTransform.py:419
 msgid ""
 "Create the buffer effect on each geometry,\n"
 "element from the selected object, using the factor."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1043 appEditors/FlatCAMGrbEditor.py:5736
+#: appEditors/appGeoEditor.py:1043 appEditors/FlatCAMGrbEditor.py:5736
 #: appGUI/ObjectUI.py:1103 appGUI/ObjectUI.py:1958
 #: appGUI/preferences/tools/Tools2CalPrefGroupUI.py:48
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
@@ -2105,409 +2105,409 @@ msgstr ""
 msgid "Object"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1107 appEditors/FlatCAMGeoEditor.py:1130
-#: appEditors/FlatCAMGeoEditor.py:1276 appEditors/FlatCAMGeoEditor.py:1301
-#: appEditors/FlatCAMGeoEditor.py:1335 appEditors/FlatCAMGeoEditor.py:1370
-#: appEditors/FlatCAMGeoEditor.py:1401 appEditors/FlatCAMGrbEditor.py:5800
+#: appEditors/appGeoEditor.py:1107 appEditors/appGeoEditor.py:1130
+#: appEditors/appGeoEditor.py:1276 appEditors/appGeoEditor.py:1301
+#: appEditors/appGeoEditor.py:1335 appEditors/appGeoEditor.py:1370
+#: appEditors/appGeoEditor.py:1401 appEditors/FlatCAMGrbEditor.py:5800
 #: appEditors/FlatCAMGrbEditor.py:5823 appEditors/FlatCAMGrbEditor.py:5968
 #: appEditors/FlatCAMGrbEditor.py:6001 appEditors/FlatCAMGrbEditor.py:6044
 #: appEditors/FlatCAMGrbEditor.py:6085 appEditors/FlatCAMGrbEditor.py:6121
 msgid "No shape selected."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1115 appEditors/FlatCAMGrbEditor.py:5808
+#: appEditors/appGeoEditor.py:1115 appEditors/FlatCAMGrbEditor.py:5808
 #: appTools/ToolTransform.py:585
 msgid "Incorrect format for Point value. Needs format X,Y"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1140 appEditors/FlatCAMGrbEditor.py:5833
+#: appEditors/appGeoEditor.py:1140 appEditors/FlatCAMGrbEditor.py:5833
 #: appTools/ToolTransform.py:602
 msgid "Rotate transformation can not be done for a value of 0."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1198 appEditors/FlatCAMGeoEditor.py:1219
+#: appEditors/appGeoEditor.py:1198 appEditors/appGeoEditor.py:1219
 #: appEditors/FlatCAMGrbEditor.py:5891 appEditors/FlatCAMGrbEditor.py:5912
 #: appTools/ToolTransform.py:660 appTools/ToolTransform.py:681
 msgid "Scale transformation can not be done for a factor of 0 or 1."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1232 appEditors/FlatCAMGeoEditor.py:1241
+#: appEditors/appGeoEditor.py:1232 appEditors/appGeoEditor.py:1241
 #: appEditors/FlatCAMGrbEditor.py:5925 appEditors/FlatCAMGrbEditor.py:5934
 #: appTools/ToolTransform.py:694 appTools/ToolTransform.py:703
 msgid "Offset transformation can not be done for a value of 0."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1271 appEditors/FlatCAMGrbEditor.py:5971
+#: appEditors/appGeoEditor.py:1271 appEditors/FlatCAMGrbEditor.py:5971
 #: appTools/ToolTransform.py:731
 msgid "Appying Rotate"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1284 appEditors/FlatCAMGrbEditor.py:5983
+#: appEditors/appGeoEditor.py:1284 appEditors/FlatCAMGrbEditor.py:5983
 msgid "Done. Rotate completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1286
+#: appEditors/appGeoEditor.py:1286
 msgid "Rotation action was not executed"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1304 appEditors/FlatCAMGrbEditor.py:6004
+#: appEditors/appGeoEditor.py:1304 appEditors/FlatCAMGrbEditor.py:6004
 #: appTools/ToolTransform.py:757
 msgid "Applying Flip"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1312 appEditors/FlatCAMGrbEditor.py:6016
+#: appEditors/appGeoEditor.py:1312 appEditors/FlatCAMGrbEditor.py:6016
 #: appTools/ToolTransform.py:774
 msgid "Flip on the Y axis done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1315 appEditors/FlatCAMGrbEditor.py:6024
+#: appEditors/appGeoEditor.py:1315 appEditors/FlatCAMGrbEditor.py:6024
 #: appTools/ToolTransform.py:783
 msgid "Flip on the X axis done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1319
+#: appEditors/appGeoEditor.py:1319
 msgid "Flip action was not executed"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1338 appEditors/FlatCAMGrbEditor.py:6047
+#: appEditors/appGeoEditor.py:1338 appEditors/FlatCAMGrbEditor.py:6047
 #: appTools/ToolTransform.py:804
 msgid "Applying Skew"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1347 appEditors/FlatCAMGrbEditor.py:6063
+#: appEditors/appGeoEditor.py:1347 appEditors/FlatCAMGrbEditor.py:6063
 msgid "Skew on the X axis done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1349 appEditors/FlatCAMGrbEditor.py:6065
+#: appEditors/appGeoEditor.py:1349 appEditors/FlatCAMGrbEditor.py:6065
 msgid "Skew on the Y axis done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1352
+#: appEditors/appGeoEditor.py:1352
 msgid "Skew action was not executed"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1373 appEditors/FlatCAMGrbEditor.py:6088
+#: appEditors/appGeoEditor.py:1373 appEditors/FlatCAMGrbEditor.py:6088
 #: appTools/ToolTransform.py:831
 msgid "Applying Scale"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1382 appEditors/FlatCAMGrbEditor.py:6101
+#: appEditors/appGeoEditor.py:1382 appEditors/FlatCAMGrbEditor.py:6101
 msgid "Scale on the X axis done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1384 appEditors/FlatCAMGrbEditor.py:6103
+#: appEditors/appGeoEditor.py:1384 appEditors/FlatCAMGrbEditor.py:6103
 msgid "Scale on the Y axis done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1386
+#: appEditors/appGeoEditor.py:1386
 msgid "Scale action was not executed"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1404 appEditors/FlatCAMGrbEditor.py:6124
+#: appEditors/appGeoEditor.py:1404 appEditors/FlatCAMGrbEditor.py:6124
 #: appTools/ToolTransform.py:859
 msgid "Applying Offset"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1414 appEditors/FlatCAMGrbEditor.py:6145
+#: appEditors/appGeoEditor.py:1414 appEditors/FlatCAMGrbEditor.py:6145
 msgid "Offset on the X axis done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1416 appEditors/FlatCAMGrbEditor.py:6147
+#: appEditors/appGeoEditor.py:1416 appEditors/FlatCAMGrbEditor.py:6147
 msgid "Offset on the Y axis done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1419
+#: appEditors/appGeoEditor.py:1419
 msgid "Offset action was not executed"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1426 appEditors/FlatCAMGrbEditor.py:6157
+#: appEditors/appGeoEditor.py:1426 appEditors/FlatCAMGrbEditor.py:6157
 msgid "No shape selected"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1429 appEditors/FlatCAMGrbEditor.py:6160
+#: appEditors/appGeoEditor.py:1429 appEditors/FlatCAMGrbEditor.py:6160
 #: appTools/ToolTransform.py:889
 msgid "Applying Buffer"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1436 appEditors/FlatCAMGrbEditor.py:6182
+#: appEditors/appGeoEditor.py:1436 appEditors/FlatCAMGrbEditor.py:6182
 #: appTools/ToolTransform.py:910
 msgid "Buffer done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1440 appEditors/FlatCAMGrbEditor.py:6186
+#: appEditors/appGeoEditor.py:1440 appEditors/FlatCAMGrbEditor.py:6186
 #: appTools/ToolTransform.py:879 appTools/ToolTransform.py:915
 msgid "Action was not executed, due of"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1444 appEditors/FlatCAMGrbEditor.py:6190
+#: appEditors/appGeoEditor.py:1444 appEditors/FlatCAMGrbEditor.py:6190
 msgid "Rotate ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1445 appEditors/FlatCAMGeoEditor.py:1494
-#: appEditors/FlatCAMGeoEditor.py:1509 appEditors/FlatCAMGrbEditor.py:6191
+#: appEditors/appGeoEditor.py:1445 appEditors/appGeoEditor.py:1494
+#: appEditors/appGeoEditor.py:1509 appEditors/FlatCAMGrbEditor.py:6191
 #: appEditors/FlatCAMGrbEditor.py:6240 appEditors/FlatCAMGrbEditor.py:6255
 msgid "Enter an Angle Value (degrees)"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1453 appEditors/FlatCAMGrbEditor.py:6199
+#: appEditors/appGeoEditor.py:1453 appEditors/FlatCAMGrbEditor.py:6199
 msgid "Geometry shape rotate done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1456 appEditors/FlatCAMGrbEditor.py:6202
+#: appEditors/appGeoEditor.py:1456 appEditors/FlatCAMGrbEditor.py:6202
 msgid "Geometry shape rotate cancelled"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1461 appEditors/FlatCAMGrbEditor.py:6207
+#: appEditors/appGeoEditor.py:1461 appEditors/FlatCAMGrbEditor.py:6207
 msgid "Offset on X axis ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1462 appEditors/FlatCAMGeoEditor.py:1479
+#: appEditors/appGeoEditor.py:1462 appEditors/appGeoEditor.py:1479
 #: appEditors/FlatCAMGrbEditor.py:6208 appEditors/FlatCAMGrbEditor.py:6225
 msgid "Enter a distance Value"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1470 appEditors/FlatCAMGrbEditor.py:6216
+#: appEditors/appGeoEditor.py:1470 appEditors/FlatCAMGrbEditor.py:6216
 msgid "Geometry shape offset on X axis done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1473 appEditors/FlatCAMGrbEditor.py:6219
+#: appEditors/appGeoEditor.py:1473 appEditors/FlatCAMGrbEditor.py:6219
 msgid "Geometry shape offset X cancelled"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1478 appEditors/FlatCAMGrbEditor.py:6224
+#: appEditors/appGeoEditor.py:1478 appEditors/FlatCAMGrbEditor.py:6224
 msgid "Offset on Y axis ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1487 appEditors/FlatCAMGrbEditor.py:6233
+#: appEditors/appGeoEditor.py:1487 appEditors/FlatCAMGrbEditor.py:6233
 msgid "Geometry shape offset on Y axis done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1490
+#: appEditors/appGeoEditor.py:1490
 msgid "Geometry shape offset on Y axis canceled"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1493 appEditors/FlatCAMGrbEditor.py:6239
+#: appEditors/appGeoEditor.py:1493 appEditors/FlatCAMGrbEditor.py:6239
 msgid "Skew on X axis ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1502 appEditors/FlatCAMGrbEditor.py:6248
+#: appEditors/appGeoEditor.py:1502 appEditors/FlatCAMGrbEditor.py:6248
 msgid "Geometry shape skew on X axis done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1505
+#: appEditors/appGeoEditor.py:1505
 msgid "Geometry shape skew on X axis canceled"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1508 appEditors/FlatCAMGrbEditor.py:6254
+#: appEditors/appGeoEditor.py:1508 appEditors/FlatCAMGrbEditor.py:6254
 msgid "Skew on Y axis ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1517 appEditors/FlatCAMGrbEditor.py:6263
+#: appEditors/appGeoEditor.py:1517 appEditors/FlatCAMGrbEditor.py:6263
 msgid "Geometry shape skew on Y axis done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1520
+#: appEditors/appGeoEditor.py:1520
 msgid "Geometry shape skew on Y axis canceled"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1950 appEditors/FlatCAMGeoEditor.py:2021
+#: appEditors/appGeoEditor.py:1950 appEditors/appGeoEditor.py:2021
 #: appEditors/FlatCAMGrbEditor.py:1444 appEditors/FlatCAMGrbEditor.py:1522
 msgid "Click on Center point ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1963 appEditors/FlatCAMGrbEditor.py:1454
+#: appEditors/appGeoEditor.py:1963 appEditors/FlatCAMGrbEditor.py:1454
 msgid "Click on Perimeter point to complete ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1995
+#: appEditors/appGeoEditor.py:1995
 msgid "Done. Adding Circle completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2049 appEditors/FlatCAMGrbEditor.py:1555
+#: appEditors/appGeoEditor.py:2049 appEditors/FlatCAMGrbEditor.py:1555
 msgid "Click on Start point ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2051 appEditors/FlatCAMGrbEditor.py:1557
+#: appEditors/appGeoEditor.py:2051 appEditors/FlatCAMGrbEditor.py:1557
 msgid "Click on Point3 ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2053 appEditors/FlatCAMGrbEditor.py:1559
+#: appEditors/appGeoEditor.py:2053 appEditors/FlatCAMGrbEditor.py:1559
 msgid "Click on Stop point ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2058 appEditors/FlatCAMGrbEditor.py:1564
+#: appEditors/appGeoEditor.py:2058 appEditors/FlatCAMGrbEditor.py:1564
 msgid "Click on Stop point to complete ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2060 appEditors/FlatCAMGrbEditor.py:1566
+#: appEditors/appGeoEditor.py:2060 appEditors/FlatCAMGrbEditor.py:1566
 msgid "Click on Point2 to complete ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2062 appEditors/FlatCAMGrbEditor.py:1568
+#: appEditors/appGeoEditor.py:2062 appEditors/FlatCAMGrbEditor.py:1568
 msgid "Click on Center point to complete ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2074
+#: appEditors/appGeoEditor.py:2074
 #, python-format
 msgid "Direction: %s"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2088 appEditors/FlatCAMGrbEditor.py:1594
+#: appEditors/appGeoEditor.py:2088 appEditors/FlatCAMGrbEditor.py:1594
 msgid "Mode: Start -> Stop -> Center. Click on Start point ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2091 appEditors/FlatCAMGrbEditor.py:1597
+#: appEditors/appGeoEditor.py:2091 appEditors/FlatCAMGrbEditor.py:1597
 msgid "Mode: Point1 -> Point3 -> Point2. Click on Point1 ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2094 appEditors/FlatCAMGrbEditor.py:1600
+#: appEditors/appGeoEditor.py:2094 appEditors/FlatCAMGrbEditor.py:1600
 msgid "Mode: Center -> Start -> Stop. Click on Center point ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2235
+#: appEditors/appGeoEditor.py:2235
 msgid "Done. Arc completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2266 appEditors/FlatCAMGeoEditor.py:2339
+#: appEditors/appGeoEditor.py:2266 appEditors/appGeoEditor.py:2339
 msgid "Click on 1st corner ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2278
+#: appEditors/appGeoEditor.py:2278
 msgid "Click on opposite corner to complete ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2308
+#: appEditors/appGeoEditor.py:2308
 msgid "Done. Rectangle completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2383
+#: appEditors/appGeoEditor.py:2383
 msgid "Done. Polygon completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2397 appEditors/FlatCAMGeoEditor.py:2462
+#: appEditors/appGeoEditor.py:2397 appEditors/appGeoEditor.py:2462
 #: appEditors/FlatCAMGrbEditor.py:1102 appEditors/FlatCAMGrbEditor.py:1322
 msgid "Backtracked one point ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2440
+#: appEditors/appGeoEditor.py:2440
 msgid "Done. Path completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2599
+#: appEditors/appGeoEditor.py:2599
 msgid "No shape selected. Select a shape to explode"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2632
+#: appEditors/appGeoEditor.py:2632
 msgid "Done. Polygons exploded into lines."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2664
+#: appEditors/appGeoEditor.py:2664
 msgid "MOVE: No shape selected. Select a shape to move"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2667 appEditors/FlatCAMGeoEditor.py:2687
+#: appEditors/appGeoEditor.py:2667 appEditors/appGeoEditor.py:2687
 msgid " MOVE: Click on reference point ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2672
+#: appEditors/appGeoEditor.py:2672
 msgid " Click on destination point ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2712
+#: appEditors/appGeoEditor.py:2712
 msgid "Done. Geometry(s) Move completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2845
+#: appEditors/appGeoEditor.py:2845
 msgid "Done. Geometry(s) Copy completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2876 appEditors/FlatCAMGrbEditor.py:897
+#: appEditors/appGeoEditor.py:2876 appEditors/FlatCAMGrbEditor.py:897
 msgid "Click on 1st point ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2900
+#: appEditors/appGeoEditor.py:2900
 msgid ""
 "Font not supported. Only Regular, Bold, Italic and BoldItalic are supported. "
 "Error"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2908
+#: appEditors/appGeoEditor.py:2908
 msgid "No text to add."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2918
+#: appEditors/appGeoEditor.py:2918
 msgid " Done. Adding Text completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2955
+#: appEditors/appGeoEditor.py:2955
 msgid "Create buffer geometry ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2990 appEditors/FlatCAMGrbEditor.py:5153
+#: appEditors/appGeoEditor.py:2990 appEditors/FlatCAMGrbEditor.py:5153
 msgid "Done. Buffer Tool completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3018
+#: appEditors/appGeoEditor.py:3018
 msgid "Done. Buffer Int Tool completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3046
+#: appEditors/appGeoEditor.py:3046
 msgid "Done. Buffer Ext Tool completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3095 appEditors/FlatCAMGrbEditor.py:2160
+#: appEditors/appGeoEditor.py:3095 appEditors/FlatCAMGrbEditor.py:2160
 msgid "Select a shape to act as deletion area ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3097 appEditors/FlatCAMGeoEditor.py:3123
-#: appEditors/FlatCAMGeoEditor.py:3129 appEditors/FlatCAMGrbEditor.py:2162
+#: appEditors/appGeoEditor.py:3097 appEditors/appGeoEditor.py:3123
+#: appEditors/appGeoEditor.py:3129 appEditors/FlatCAMGrbEditor.py:2162
 msgid "Click to pick-up the erase shape..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3133 appEditors/FlatCAMGrbEditor.py:2221
+#: appEditors/appGeoEditor.py:3133 appEditors/FlatCAMGrbEditor.py:2221
 msgid "Click to erase ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3162 appEditors/FlatCAMGrbEditor.py:2254
+#: appEditors/appGeoEditor.py:3162 appEditors/FlatCAMGrbEditor.py:2254
 msgid "Done. Eraser tool action completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3212
+#: appEditors/appGeoEditor.py:3212
 msgid "Create Paint geometry ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3225 appEditors/FlatCAMGrbEditor.py:2417
+#: appEditors/appGeoEditor.py:3225 appEditors/FlatCAMGrbEditor.py:2417
 msgid "Shape transformations ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3281
+#: appEditors/appGeoEditor.py:3281
 #: appGUI/preferences/geometry/GeometryEditorPrefGroupUI.py:27
 msgid "Geometry Editor"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3287 appEditors/FlatCAMGrbEditor.py:2495
+#: appEditors/appGeoEditor.py:3287 appEditors/FlatCAMGrbEditor.py:2495
 #: appEditors/FlatCAMGrbEditor.py:3951 appGUI/ObjectUI.py:282
 #: appGUI/ObjectUI.py:1394 appGUI/ObjectUI.py:2256 appTools/ToolCutOut.py:95
 #: appTools/ToolTransform.py:92
 msgid "Type"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3287 appGUI/ObjectUI.py:221
+#: appEditors/appGeoEditor.py:3287 appGUI/ObjectUI.py:221
 #: appGUI/ObjectUI.py:521 appGUI/ObjectUI.py:1330 appGUI/ObjectUI.py:2165
 #: appGUI/ObjectUI.py:2469 appGUI/ObjectUI.py:2536
 #: appTools/ToolCalibration.py:234 appTools/ToolFiducials.py:70
 msgid "Name"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3539
+#: appEditors/appGeoEditor.py:3539
 msgid "Ring"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3541
+#: appEditors/appGeoEditor.py:3541
 msgid "Line"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3543 appGUI/MainGUI.py:1446
+#: appEditors/appGeoEditor.py:3543 appGUI/MainGUI.py:1446
 #: appGUI/ObjectUI.py:1150 appGUI/ObjectUI.py:2005
 #: appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py:226
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:299
@@ -2518,104 +2518,104 @@ msgstr ""
 msgid "Polygon"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3545
+#: appEditors/appGeoEditor.py:3545
 msgid "Multi-Line"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3547
+#: appEditors/appGeoEditor.py:3547
 msgid "Multi-Polygon"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3554
+#: appEditors/appGeoEditor.py:3554
 msgid "Geo Elem"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4007
+#: appEditors/appGeoEditor.py:4007
 msgid "Editing MultiGeo Geometry, tool"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4009
+#: appEditors/appGeoEditor.py:4009
 msgid "with diameter"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4081
+#: appEditors/appGeoEditor.py:4081
 msgid "Grid Snap enabled."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4085
+#: appEditors/appGeoEditor.py:4085
 msgid "Grid Snap disabled."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4446 appGUI/MainGUI.py:3046
+#: appEditors/appGeoEditor.py:4446 appGUI/MainGUI.py:3046
 #: appGUI/MainGUI.py:3092 appGUI/MainGUI.py:3110 appGUI/MainGUI.py:3254
 #: appGUI/MainGUI.py:3293 appGUI/MainGUI.py:3305 appGUI/MainGUI.py:3322
 msgid "Click on target point."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4762 appEditors/FlatCAMGeoEditor.py:4797
+#: appEditors/appGeoEditor.py:4762 appEditors/appGeoEditor.py:4797
 msgid "A selection of at least 2 geo items is required to do Intersection."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4883 appEditors/FlatCAMGeoEditor.py:4987
+#: appEditors/appGeoEditor.py:4883 appEditors/appGeoEditor.py:4987
 msgid ""
 "Negative buffer value is not accepted. Use Buffer interior to generate an "
 "'inside' shape"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4893 appEditors/FlatCAMGeoEditor.py:4946
-#: appEditors/FlatCAMGeoEditor.py:4996
+#: appEditors/appGeoEditor.py:4893 appEditors/appGeoEditor.py:4946
+#: appEditors/appGeoEditor.py:4996
 msgid "Nothing selected for buffering."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4898 appEditors/FlatCAMGeoEditor.py:4950
-#: appEditors/FlatCAMGeoEditor.py:5001
+#: appEditors/appGeoEditor.py:4898 appEditors/appGeoEditor.py:4950
+#: appEditors/appGeoEditor.py:5001
 msgid "Invalid distance for buffering."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4922 appEditors/FlatCAMGeoEditor.py:5021
+#: appEditors/appGeoEditor.py:4922 appEditors/appGeoEditor.py:5021
 msgid "Failed, the result is empty. Choose a different buffer value."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4933
+#: appEditors/appGeoEditor.py:4933
 msgid "Full buffer geometry created."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4939
+#: appEditors/appGeoEditor.py:4939
 msgid "Negative buffer value is not accepted."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4970
+#: appEditors/appGeoEditor.py:4970
 msgid "Failed, the result is empty. Choose a smaller buffer value."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4980
+#: appEditors/appGeoEditor.py:4980
 msgid "Interior buffer geometry created."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:5031
+#: appEditors/appGeoEditor.py:5031
 msgid "Exterior buffer geometry created."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:5037
+#: appEditors/appGeoEditor.py:5037
 #, python-format
 msgid "Could not do Paint. Overlap value has to be less than 100%%."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:5044
+#: appEditors/appGeoEditor.py:5044
 msgid "Nothing selected for painting."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:5050
+#: appEditors/appGeoEditor.py:5050
 msgid "Invalid value for"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:5109
+#: appEditors/appGeoEditor.py:5109
 msgid ""
 "Could not do Paint. Try a different combination of parameters. Or a "
 "different method of Paint"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:5120
+#: appEditors/appGeoEditor.py:5120
 msgid "Paint done."
 msgstr ""
 
diff --git a/locale/it/LC_MESSAGES/strings.po b/locale/it/LC_MESSAGES/strings.po
index e518d04e..686856d4 100644
--- a/locale/it/LC_MESSAGES/strings.po
+++ b/locale/it/LC_MESSAGES/strings.po
@@ -176,7 +176,7 @@ msgstr ""
 "Zona aggiunta. Fare clic per iniziare ad aggiungere la zona successiva o "
 "fare clic con il tasto destro per terminare."
 
-#: Common.py:322 appEditors/FlatCAMGeoEditor.py:2352
+#: Common.py:322 appEditors/appGeoEditor.py:2352
 #: appTools/ToolIsolation.py:2584 appTools/ToolNCC.py:1754
 #: appTools/ToolPaint.py:1647
 msgid "Click on next Point or click right mouse button to complete ..."
@@ -890,7 +890,7 @@ msgid "Conventional"
 msgstr "Convenzionale"
 
 #: appDatabase.py:1456 appDatabase.py:1565 appDatabase.py:1667
-#: appEditors/FlatCAMGeoEditor.py:450
+#: appEditors/appGeoEditor.py:450
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:167
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:182
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:163
@@ -918,7 +918,7 @@ msgstr ""
 "Valori più alti = elaborazione lenta ed esecuzione lenta su CNC\n"
 "per i molti percorsi."
 
-#: appDatabase.py:1477 appDatabase.py:1586 appEditors/FlatCAMGeoEditor.py:470
+#: appDatabase.py:1477 appDatabase.py:1586 appEditors/appGeoEditor.py:470
 #: appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py:72
 #: appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py:229
 #: appGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py:59
@@ -947,7 +947,7 @@ msgstr "Margine"
 msgid "Bounding box margin."
 msgstr "Margine del riquadro di delimitazione."
 
-#: appDatabase.py:1490 appDatabase.py:1601 appEditors/FlatCAMGeoEditor.py:484
+#: appDatabase.py:1490 appDatabase.py:1601 appEditors/appGeoEditor.py:484
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:105
 #: appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py:106
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:215
@@ -970,7 +970,7 @@ msgstr ""
 "- A base di semi: verso l'esterno dal seme.\n"
 "- Basato su linee: linee parallele."
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2232 appTools/ToolNCC.py:2764
@@ -980,8 +980,8 @@ msgstr ""
 msgid "Standard"
 msgstr "Standard"
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
-#: appEditors/FlatCAMGeoEditor.py:568 appEditors/FlatCAMGeoEditor.py:5091
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
+#: appEditors/appGeoEditor.py:568 appEditors/appGeoEditor.py:5091
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2243 appTools/ToolNCC.py:2770
@@ -992,8 +992,8 @@ msgstr "Standard"
 msgid "Seed"
 msgstr "Seme"
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
-#: appEditors/FlatCAMGeoEditor.py:5095
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
+#: appEditors/appGeoEditor.py:5095
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2254 appTools/ToolPaint.py:389
@@ -1017,7 +1017,7 @@ msgstr "Combinata"
 msgid "Connect"
 msgstr "Connetti"
 
-#: appDatabase.py:1512 appDatabase.py:1629 appEditors/FlatCAMGeoEditor.py:507
+#: appDatabase.py:1512 appDatabase.py:1629 appEditors/appGeoEditor.py:507
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:239
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:226
 #: appTools/ToolNCC.py:443 appTools/ToolPaint.py:403
@@ -1035,7 +1035,7 @@ msgstr ""
 msgid "Contour"
 msgstr "Controno"
 
-#: appDatabase.py:1522 appDatabase.py:1636 appEditors/FlatCAMGeoEditor.py:517
+#: appDatabase.py:1522 appDatabase.py:1636 appEditors/appGeoEditor.py:517
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:248
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:234
 #: appTools/ToolNCC.py:453 appTools/ToolPaint.py:410
@@ -1046,7 +1046,7 @@ msgstr ""
 "Taglia attorno al perimetro del poligono\n"
 "per rifinire bordi grezzi."
 
-#: appDatabase.py:1528 appEditors/FlatCAMGeoEditor.py:611
+#: appDatabase.py:1528 appEditors/appGeoEditor.py:611
 #: appEditors/FlatCAMGrbEditor.py:5304 appGUI/ObjectUI.py:143
 #: appGUI/ObjectUI.py:1394 appGUI/ObjectUI.py:2256
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:255
@@ -1069,7 +1069,7 @@ msgstr ""
 "dalle lavorazioni sul rame.\n"
 "Il valore può essere compreso tra 0 e 10 unità FlatCAM."
 
-#: appDatabase.py:1567 appEditors/FlatCAMGeoEditor.py:452
+#: appDatabase.py:1567 appEditors/appGeoEditor.py:452
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:165
 #: appTools/ToolPaint.py:330
 msgid ""
@@ -1089,7 +1089,7 @@ msgstr ""
 "esecuzione su CNC\n"
 "causata dai troppo percorsi."
 
-#: appDatabase.py:1588 appEditors/FlatCAMGeoEditor.py:472
+#: appDatabase.py:1588 appEditors/appGeoEditor.py:472
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:185
 #: appTools/ToolPaint.py:351
 msgid ""
@@ -1544,7 +1544,7 @@ msgstr "Y"
 #: appEditors/FlatCAMExcEditor.py:1800 appEditors/FlatCAMExcEditor.py:1871
 #: appEditors/FlatCAMExcEditor.py:1875 appEditors/FlatCAMExcEditor.py:1964
 #: appEditors/FlatCAMExcEditor.py:1982 appEditors/FlatCAMExcEditor.py:2016
-#: appEditors/FlatCAMGeoEditor.py:683 appEditors/FlatCAMGrbEditor.py:2822
+#: appEditors/appGeoEditor.py:683 appEditors/FlatCAMGrbEditor.py:2822
 #: appEditors/FlatCAMGrbEditor.py:2839 appEditors/FlatCAMGrbEditor.py:2875
 #: appEditors/FlatCAMGrbEditor.py:5376
 #: appGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py:94
@@ -1767,7 +1767,7 @@ msgid "Cancelled. There is no Tool/Drill selected"
 msgstr "Errore: Nessun utensile/Foro selezionato"
 
 #: appEditors/FlatCAMExcEditor.py:3601 appEditors/FlatCAMExcEditor.py:3609
-#: appEditors/FlatCAMGeoEditor.py:4286 appEditors/FlatCAMGeoEditor.py:4300
+#: appEditors/appGeoEditor.py:4286 appEditors/appGeoEditor.py:4300
 #: appEditors/FlatCAMGrbEditor.py:1085 appEditors/FlatCAMGrbEditor.py:1312
 #: appEditors/FlatCAMGrbEditor.py:1497 appEditors/FlatCAMGrbEditor.py:1766
 #: appEditors/FlatCAMGrbEditor.py:4608 appEditors/FlatCAMGrbEditor.py:4625
@@ -1786,15 +1786,15 @@ msgstr "Fatto. Foro(i) cancellato(i)."
 msgid "Click on the circular array Center position"
 msgstr "Clicca sulla posizione centrale della matrice circolare"
 
-#: appEditors/FlatCAMGeoEditor.py:84
+#: appEditors/appGeoEditor.py:84
 msgid "Buffer distance:"
 msgstr "Riempimento distanza:"
 
-#: appEditors/FlatCAMGeoEditor.py:85
+#: appEditors/appGeoEditor.py:85
 msgid "Buffer corner:"
 msgstr "Riempimento angolo:"
 
-#: appEditors/FlatCAMGeoEditor.py:87
+#: appEditors/appGeoEditor.py:87
 msgid ""
 "There are 3 types of corners:\n"
 " - 'Round': the corner is rounded for exterior buffer.\n"
@@ -1807,11 +1807,11 @@ msgstr ""
 "- 'Squadrato': l'angolo fiene raggiunto con un angolo acuto.\n"
 "- 'Smussato': l'angolo è una linea che connette direttamente le varie sezioni"
 
-#: appEditors/FlatCAMGeoEditor.py:93 appEditors/FlatCAMGrbEditor.py:2638
+#: appEditors/appGeoEditor.py:93 appEditors/FlatCAMGrbEditor.py:2638
 msgid "Round"
 msgstr "Arrotondato"
 
-#: appEditors/FlatCAMGeoEditor.py:94 appEditors/FlatCAMGrbEditor.py:2639
+#: appEditors/appGeoEditor.py:94 appEditors/FlatCAMGrbEditor.py:2639
 #: appGUI/ObjectUI.py:1149 appGUI/ObjectUI.py:2004
 #: appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py:225
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:68
@@ -1829,50 +1829,50 @@ msgstr "Arrotondato"
 msgid "Square"
 msgstr "Squadrato"
 
-#: appEditors/FlatCAMGeoEditor.py:95 appEditors/FlatCAMGrbEditor.py:2640
+#: appEditors/appGeoEditor.py:95 appEditors/FlatCAMGrbEditor.py:2640
 msgid "Beveled"
 msgstr "Smussato"
 
-#: appEditors/FlatCAMGeoEditor.py:102
+#: appEditors/appGeoEditor.py:102
 msgid "Buffer Interior"
 msgstr "Buffer Interiore"
 
-#: appEditors/FlatCAMGeoEditor.py:104
+#: appEditors/appGeoEditor.py:104
 msgid "Buffer Exterior"
 msgstr "Buffer Esteriore"
 
-#: appEditors/FlatCAMGeoEditor.py:110
+#: appEditors/appGeoEditor.py:110
 msgid "Full Buffer"
 msgstr "Buffer completo"
 
-#: appEditors/FlatCAMGeoEditor.py:131 appEditors/FlatCAMGeoEditor.py:2959
+#: appEditors/appGeoEditor.py:131 appEditors/appGeoEditor.py:2959
 #: appGUI/MainGUI.py:4301
 #: appGUI/preferences/gerber/GerberEditorPrefGroupUI.py:191
 msgid "Buffer Tool"
 msgstr "Utensile buffer"
 
-#: appEditors/FlatCAMGeoEditor.py:143 appEditors/FlatCAMGeoEditor.py:160
-#: appEditors/FlatCAMGeoEditor.py:177 appEditors/FlatCAMGeoEditor.py:2978
-#: appEditors/FlatCAMGeoEditor.py:3006 appEditors/FlatCAMGeoEditor.py:3034
+#: appEditors/appGeoEditor.py:143 appEditors/appGeoEditor.py:160
+#: appEditors/appGeoEditor.py:177 appEditors/appGeoEditor.py:2978
+#: appEditors/appGeoEditor.py:3006 appEditors/appGeoEditor.py:3034
 #: appEditors/FlatCAMGrbEditor.py:5109
 msgid "Buffer distance value is missing or wrong format. Add it and retry."
 msgstr ""
 "Valore per la distanza buffer mancante o del formato errato. Aggiungilo e "
 "riprova."
 
-#: appEditors/FlatCAMGeoEditor.py:241
+#: appEditors/appGeoEditor.py:241
 msgid "Font"
 msgstr "Font"
 
-#: appEditors/FlatCAMGeoEditor.py:322 appGUI/MainGUI.py:1452
+#: appEditors/appGeoEditor.py:322 appGUI/MainGUI.py:1452
 msgid "Text"
 msgstr "Testo"
 
-#: appEditors/FlatCAMGeoEditor.py:348
+#: appEditors/appGeoEditor.py:348
 msgid "Text Tool"
 msgstr "Utensile testo"
 
-#: appEditors/FlatCAMGeoEditor.py:404 appGUI/MainGUI.py:502
+#: appEditors/appGeoEditor.py:404 appGUI/MainGUI.py:502
 #: appGUI/MainGUI.py:1199 appGUI/ObjectUI.py:597 appGUI/ObjectUI.py:1564
 #: appObjects/FlatCAMExcellon.py:852 appObjects/FlatCAMExcellon.py:1242
 #: appObjects/FlatCAMGeometry.py:825 appTools/ToolIsolation.py:313
@@ -1881,15 +1881,15 @@ msgstr "Utensile testo"
 msgid "Tool"
 msgstr "Strumenti"
 
-#: appEditors/FlatCAMGeoEditor.py:438
+#: appEditors/appGeoEditor.py:438
 msgid "Tool dia"
 msgstr "Diametro utensile"
 
-#: appEditors/FlatCAMGeoEditor.py:440
+#: appEditors/appGeoEditor.py:440
 msgid "Diameter of the tool to be used in the operation."
 msgstr "Diametro dell'utensile da usare per questa operazione."
 
-#: appEditors/FlatCAMGeoEditor.py:486
+#: appEditors/appGeoEditor.py:486
 msgid ""
 "Algorithm to paint the polygons:\n"
 "- Standard: Fixed step inwards.\n"
@@ -1901,57 +1901,57 @@ msgstr ""
 "- A base di semi: verso l'esterno dal seme.\n"
 "- Basato su linee: linee parallele."
 
-#: appEditors/FlatCAMGeoEditor.py:505
+#: appEditors/appGeoEditor.py:505
 msgid "Connect:"
 msgstr "Connetti:"
 
-#: appEditors/FlatCAMGeoEditor.py:515
+#: appEditors/appGeoEditor.py:515
 msgid "Contour:"
 msgstr "Contorno:"
 
-#: appEditors/FlatCAMGeoEditor.py:528 appGUI/MainGUI.py:1456
+#: appEditors/appGeoEditor.py:528 appGUI/MainGUI.py:1456
 msgid "Paint"
 msgstr "Disegno"
 
-#: appEditors/FlatCAMGeoEditor.py:546 appGUI/MainGUI.py:912
+#: appEditors/appGeoEditor.py:546 appGUI/MainGUI.py:912
 #: appGUI/MainGUI.py:1944 appGUI/ObjectUI.py:2069 appTools/ToolPaint.py:42
 #: appTools/ToolPaint.py:737
 msgid "Paint Tool"
 msgstr "Strumento disegno"
 
-#: appEditors/FlatCAMGeoEditor.py:582 appEditors/FlatCAMGeoEditor.py:1071
-#: appEditors/FlatCAMGeoEditor.py:2966 appEditors/FlatCAMGeoEditor.py:2994
-#: appEditors/FlatCAMGeoEditor.py:3022 appEditors/FlatCAMGeoEditor.py:4439
+#: appEditors/appGeoEditor.py:582 appEditors/appGeoEditor.py:1071
+#: appEditors/appGeoEditor.py:2966 appEditors/appGeoEditor.py:2994
+#: appEditors/appGeoEditor.py:3022 appEditors/appGeoEditor.py:4439
 #: appEditors/FlatCAMGrbEditor.py:5764
 msgid "Cancelled. No shape selected."
 msgstr "Cancellato. Nessuna forma selezionata."
 
-#: appEditors/FlatCAMGeoEditor.py:595 appEditors/FlatCAMGeoEditor.py:2984
-#: appEditors/FlatCAMGeoEditor.py:3012 appEditors/FlatCAMGeoEditor.py:3040
+#: appEditors/appGeoEditor.py:595 appEditors/appGeoEditor.py:2984
+#: appEditors/appGeoEditor.py:3012 appEditors/appGeoEditor.py:3040
 #: appGUI/preferences/geometry/GeometryGenPrefGroupUI.py:69
 #: appTools/ToolProperties.py:117 appTools/ToolProperties.py:162
 msgid "Tools"
 msgstr "Strumento"
 
-#: appEditors/FlatCAMGeoEditor.py:606 appEditors/FlatCAMGeoEditor.py:1035
+#: appEditors/appGeoEditor.py:606 appEditors/appGeoEditor.py:1035
 #: appEditors/FlatCAMGrbEditor.py:5299 appEditors/FlatCAMGrbEditor.py:5728
 #: appGUI/MainGUI.py:935 appGUI/MainGUI.py:1967 appTools/ToolTransform.py:494
 msgid "Transform Tool"
 msgstr "Strumento trasformazione"
 
-#: appEditors/FlatCAMGeoEditor.py:607 appEditors/FlatCAMGeoEditor.py:699
+#: appEditors/appGeoEditor.py:607 appEditors/appGeoEditor.py:699
 #: appEditors/FlatCAMGrbEditor.py:5300 appEditors/FlatCAMGrbEditor.py:5392
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:88
 #: appTools/ToolTransform.py:27 appTools/ToolTransform.py:146
 msgid "Rotate"
 msgstr "Ruota"
 
-#: appEditors/FlatCAMGeoEditor.py:608 appEditors/FlatCAMGrbEditor.py:5301
+#: appEditors/appGeoEditor.py:608 appEditors/FlatCAMGrbEditor.py:5301
 #: appTools/ToolTransform.py:28
 msgid "Skew/Shear"
 msgstr "Inclina/Taglia"
 
-#: appEditors/FlatCAMGeoEditor.py:609 appEditors/FlatCAMGrbEditor.py:2687
+#: appEditors/appGeoEditor.py:609 appEditors/FlatCAMGrbEditor.py:2687
 #: appEditors/FlatCAMGrbEditor.py:5302 appGUI/MainGUI.py:1057
 #: appGUI/MainGUI.py:1499 appGUI/MainGUI.py:2089 appGUI/MainGUI.py:4513
 #: appGUI/ObjectUI.py:125
@@ -1960,12 +1960,12 @@ msgstr "Inclina/Taglia"
 msgid "Scale"
 msgstr "Scala"
 
-#: appEditors/FlatCAMGeoEditor.py:610 appEditors/FlatCAMGrbEditor.py:5303
+#: appEditors/appGeoEditor.py:610 appEditors/FlatCAMGrbEditor.py:5303
 #: appTools/ToolTransform.py:30
 msgid "Mirror (Flip)"
 msgstr "Specchia"
 
-#: appEditors/FlatCAMGeoEditor.py:612 appEditors/FlatCAMGrbEditor.py:2647
+#: appEditors/appGeoEditor.py:612 appEditors/FlatCAMGrbEditor.py:2647
 #: appEditors/FlatCAMGrbEditor.py:5305 appGUI/MainGUI.py:1055
 #: appGUI/MainGUI.py:1454 appGUI/MainGUI.py:1497 appGUI/MainGUI.py:2087
 #: appGUI/MainGUI.py:4511
@@ -1974,7 +1974,7 @@ msgstr "Specchia"
 msgid "Buffer"
 msgstr "Buffer"
 
-#: appEditors/FlatCAMGeoEditor.py:643 appEditors/FlatCAMGrbEditor.py:5336
+#: appEditors/appGeoEditor.py:643 appEditors/FlatCAMGrbEditor.py:5336
 #: appGUI/GUIElements.py:2701
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:169
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:44
@@ -1983,7 +1983,7 @@ msgstr "Buffer"
 msgid "Reference"
 msgstr "Riferimento"
 
-#: appEditors/FlatCAMGeoEditor.py:645 appEditors/FlatCAMGrbEditor.py:5338
+#: appEditors/appGeoEditor.py:645 appEditors/FlatCAMGrbEditor.py:5338
 msgid ""
 "The reference point for Rotate, Skew, Scale, Mirror.\n"
 "Can be:\n"
@@ -2000,14 +2000,14 @@ msgstr ""
 "- Punto -> un punto custom definito dalle coordinate X,Y\n"
 "- Selezione Min -> il punto (minx, miny) del contenitore della selezione"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
 #: appTools/ToolCalibration.py:770 appTools/ToolCalibration.py:771
 #: appTools/ToolTransform.py:70
 msgid "Origin"
 msgstr "Origine"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGeoEditor.py:1044
+#: appEditors/appGeoEditor.py:653 appEditors/appGeoEditor.py:1044
 #: appEditors/FlatCAMGrbEditor.py:5346 appEditors/FlatCAMGrbEditor.py:5737
 #: appGUI/preferences/general/GeneralGUIPrefGroupUI.py:250
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:275
@@ -2019,7 +2019,7 @@ msgstr "Origine"
 msgid "Selection"
 msgstr "Selezione"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 #: appGUI/preferences/tools/Tools2sidedPrefGroupUI.py:80
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:60
@@ -2027,11 +2027,11 @@ msgstr "Selezione"
 msgid "Point"
 msgstr "Punto"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 msgid "Minimum"
 msgstr "Minimo"
 
-#: appEditors/FlatCAMGeoEditor.py:659 appEditors/FlatCAMGeoEditor.py:955
+#: appEditors/appGeoEditor.py:659 appEditors/appGeoEditor.py:955
 #: appEditors/FlatCAMGrbEditor.py:5352 appEditors/FlatCAMGrbEditor.py:5648
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:131
 #: appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py:133
@@ -2042,13 +2042,13 @@ msgstr "Minimo"
 msgid "Value"
 msgstr "Valore"
 
-#: appEditors/FlatCAMGeoEditor.py:661 appEditors/FlatCAMGrbEditor.py:5354
+#: appEditors/appGeoEditor.py:661 appEditors/FlatCAMGrbEditor.py:5354
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:62
 #: appTools/ToolTransform.py:78
 msgid "A point of reference in format X,Y."
 msgstr "Un punto di riferimento nel formato X,Y."
 
-#: appEditors/FlatCAMGeoEditor.py:668 appEditors/FlatCAMGrbEditor.py:2590
+#: appEditors/appGeoEditor.py:668 appEditors/FlatCAMGrbEditor.py:2590
 #: appEditors/FlatCAMGrbEditor.py:5361 appGUI/ObjectUI.py:1494
 #: appTools/ToolDblSided.py:192 appTools/ToolDblSided.py:425
 #: appTools/ToolIsolation.py:276 appTools/ToolIsolation.py:631
@@ -2059,12 +2059,12 @@ msgstr "Un punto di riferimento nel formato X,Y."
 msgid "Add"
 msgstr "Aggiungi"
 
-#: appEditors/FlatCAMGeoEditor.py:670 appEditors/FlatCAMGrbEditor.py:5363
+#: appEditors/appGeoEditor.py:670 appEditors/FlatCAMGrbEditor.py:5363
 #: appTools/ToolTransform.py:87
 msgid "Add point coordinates from clipboard."
 msgstr "Aggiungi coordinate del punto dagli appunti."
 
-#: appEditors/FlatCAMGeoEditor.py:685 appEditors/FlatCAMGrbEditor.py:5378
+#: appEditors/appGeoEditor.py:685 appEditors/FlatCAMGrbEditor.py:5378
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:98
 #: appTools/ToolTransform.py:132
 msgid ""
@@ -2078,7 +2078,7 @@ msgstr ""
 "Numeri positivi per il senso orario.\n"
 "Numeri negativi per il senso antiorario."
 
-#: appEditors/FlatCAMGeoEditor.py:701 appEditors/FlatCAMGrbEditor.py:5394
+#: appEditors/appGeoEditor.py:701 appEditors/FlatCAMGrbEditor.py:5394
 #: appTools/ToolTransform.py:148
 msgid ""
 "Rotate the selected object(s).\n"
@@ -2089,7 +2089,7 @@ msgstr ""
 "Il punto di riferimento è il centro del\n"
 "rettangolo di selezione per tutti gli oggetti selezionati."
 
-#: appEditors/FlatCAMGeoEditor.py:721 appEditors/FlatCAMGeoEditor.py:783
+#: appEditors/appGeoEditor.py:721 appEditors/appGeoEditor.py:783
 #: appEditors/FlatCAMGrbEditor.py:5414 appEditors/FlatCAMGrbEditor.py:5476
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:112
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:151
@@ -2097,7 +2097,7 @@ msgstr ""
 msgid "Link"
 msgstr "Collegamento"
 
-#: appEditors/FlatCAMGeoEditor.py:723 appEditors/FlatCAMGeoEditor.py:785
+#: appEditors/appGeoEditor.py:723 appEditors/appGeoEditor.py:785
 #: appEditors/FlatCAMGrbEditor.py:5416 appEditors/FlatCAMGrbEditor.py:5478
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:114
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:153
@@ -2105,14 +2105,14 @@ msgstr "Collegamento"
 msgid "Link the Y entry to X entry and copy its content."
 msgstr "Collega il valore di Y a quello di X e copia il contenuto."
 
-#: appEditors/FlatCAMGeoEditor.py:728 appEditors/FlatCAMGrbEditor.py:5421
+#: appEditors/appGeoEditor.py:728 appEditors/FlatCAMGrbEditor.py:5421
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:151
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:124
 #: appTools/ToolFilm.py:184 appTools/ToolTransform.py:175
 msgid "X angle"
 msgstr "Angolo X"
 
-#: appEditors/FlatCAMGeoEditor.py:730 appEditors/FlatCAMGeoEditor.py:751
+#: appEditors/appGeoEditor.py:730 appEditors/appGeoEditor.py:751
 #: appEditors/FlatCAMGrbEditor.py:5423 appEditors/FlatCAMGrbEditor.py:5444
 #: appTools/ToolTransform.py:177 appTools/ToolTransform.py:198
 msgid ""
@@ -2122,12 +2122,12 @@ msgstr ""
 "Angolo per l'azione di inclinazione, in gradi.\n"
 "Numero float compreso tra -360 e 360."
 
-#: appEditors/FlatCAMGeoEditor.py:738 appEditors/FlatCAMGrbEditor.py:5431
+#: appEditors/appGeoEditor.py:738 appEditors/FlatCAMGrbEditor.py:5431
 #: appTools/ToolTransform.py:185
 msgid "Skew X"
 msgstr "Inclinazione X"
 
-#: appEditors/FlatCAMGeoEditor.py:740 appEditors/FlatCAMGeoEditor.py:761
+#: appEditors/appGeoEditor.py:740 appEditors/appGeoEditor.py:761
 #: appEditors/FlatCAMGrbEditor.py:5433 appEditors/FlatCAMGrbEditor.py:5454
 #: appTools/ToolTransform.py:187 appTools/ToolTransform.py:208
 msgid ""
@@ -2139,37 +2139,37 @@ msgstr ""
 "Il punto di riferimento è il centro del\n"
 "rettangolo di selezione per tutti gli oggetti selezionati."
 
-#: appEditors/FlatCAMGeoEditor.py:749 appEditors/FlatCAMGrbEditor.py:5442
+#: appEditors/appGeoEditor.py:749 appEditors/FlatCAMGrbEditor.py:5442
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:160
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:138
 #: appTools/ToolFilm.py:193 appTools/ToolTransform.py:196
 msgid "Y angle"
 msgstr "Angolo Y"
 
-#: appEditors/FlatCAMGeoEditor.py:759 appEditors/FlatCAMGrbEditor.py:5452
+#: appEditors/appGeoEditor.py:759 appEditors/FlatCAMGrbEditor.py:5452
 #: appTools/ToolTransform.py:206
 msgid "Skew Y"
 msgstr "Inclina Y"
 
-#: appEditors/FlatCAMGeoEditor.py:790 appEditors/FlatCAMGrbEditor.py:5483
+#: appEditors/appGeoEditor.py:790 appEditors/FlatCAMGrbEditor.py:5483
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:120
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:162
 #: appTools/ToolFilm.py:145 appTools/ToolTransform.py:237
 msgid "X factor"
 msgstr "Fattore X"
 
-#: appEditors/FlatCAMGeoEditor.py:792 appEditors/FlatCAMGrbEditor.py:5485
+#: appEditors/appGeoEditor.py:792 appEditors/FlatCAMGrbEditor.py:5485
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:164
 #: appTools/ToolTransform.py:239
 msgid "Factor for scaling on X axis."
 msgstr "Fattore di scala sull'asse X."
 
-#: appEditors/FlatCAMGeoEditor.py:799 appEditors/FlatCAMGrbEditor.py:5492
+#: appEditors/appGeoEditor.py:799 appEditors/FlatCAMGrbEditor.py:5492
 #: appTools/ToolTransform.py:246
 msgid "Scale X"
 msgstr "Scala X"
 
-#: appEditors/FlatCAMGeoEditor.py:801 appEditors/FlatCAMGeoEditor.py:821
+#: appEditors/appGeoEditor.py:801 appEditors/appGeoEditor.py:821
 #: appEditors/FlatCAMGrbEditor.py:5494 appEditors/FlatCAMGrbEditor.py:5514
 #: appTools/ToolTransform.py:248 appTools/ToolTransform.py:268
 msgid ""
@@ -2181,58 +2181,58 @@ msgstr ""
 "Il punto di riferimento dipende\n"
 "dallo stato della casella di controllo Riferimento scala."
 
-#: appEditors/FlatCAMGeoEditor.py:810 appEditors/FlatCAMGrbEditor.py:5503
+#: appEditors/appGeoEditor.py:810 appEditors/FlatCAMGrbEditor.py:5503
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:129
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:175
 #: appTools/ToolFilm.py:154 appTools/ToolTransform.py:257
 msgid "Y factor"
 msgstr "Fattore Y"
 
-#: appEditors/FlatCAMGeoEditor.py:812 appEditors/FlatCAMGrbEditor.py:5505
+#: appEditors/appGeoEditor.py:812 appEditors/FlatCAMGrbEditor.py:5505
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:177
 #: appTools/ToolTransform.py:259
 msgid "Factor for scaling on Y axis."
 msgstr "Fattore di scala sull'asse Y."
 
-#: appEditors/FlatCAMGeoEditor.py:819 appEditors/FlatCAMGrbEditor.py:5512
+#: appEditors/appGeoEditor.py:819 appEditors/FlatCAMGrbEditor.py:5512
 #: appTools/ToolTransform.py:266
 msgid "Scale Y"
 msgstr "Scala Y"
 
-#: appEditors/FlatCAMGeoEditor.py:846 appEditors/FlatCAMGrbEditor.py:5539
+#: appEditors/appGeoEditor.py:846 appEditors/FlatCAMGrbEditor.py:5539
 #: appTools/ToolTransform.py:293
 msgid "Flip on X"
 msgstr "Capovolgi in X"
 
-#: appEditors/FlatCAMGeoEditor.py:848 appEditors/FlatCAMGeoEditor.py:853
+#: appEditors/appGeoEditor.py:848 appEditors/appGeoEditor.py:853
 #: appEditors/FlatCAMGrbEditor.py:5541 appEditors/FlatCAMGrbEditor.py:5546
 #: appTools/ToolTransform.py:295 appTools/ToolTransform.py:300
 msgid "Flip the selected object(s) over the X axis."
 msgstr "Capovolgi gli oggetti selezionati sull'asse X."
 
-#: appEditors/FlatCAMGeoEditor.py:851 appEditors/FlatCAMGrbEditor.py:5544
+#: appEditors/appGeoEditor.py:851 appEditors/FlatCAMGrbEditor.py:5544
 #: appTools/ToolTransform.py:298
 msgid "Flip on Y"
 msgstr "Capovolgi in Y"
 
-#: appEditors/FlatCAMGeoEditor.py:871 appEditors/FlatCAMGrbEditor.py:5564
+#: appEditors/appGeoEditor.py:871 appEditors/FlatCAMGrbEditor.py:5564
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:191
 #: appTools/ToolTransform.py:318
 msgid "X val"
 msgstr "Valore X"
 
-#: appEditors/FlatCAMGeoEditor.py:873 appEditors/FlatCAMGrbEditor.py:5566
+#: appEditors/appGeoEditor.py:873 appEditors/FlatCAMGrbEditor.py:5566
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:193
 #: appTools/ToolTransform.py:320
 msgid "Distance to offset on X axis. In current units."
 msgstr "Distanza da applicare sull'asse X. In unità correnti."
 
-#: appEditors/FlatCAMGeoEditor.py:880 appEditors/FlatCAMGrbEditor.py:5573
+#: appEditors/appGeoEditor.py:880 appEditors/FlatCAMGrbEditor.py:5573
 #: appTools/ToolTransform.py:327
 msgid "Offset X"
 msgstr "Offset X"
 
-#: appEditors/FlatCAMGeoEditor.py:882 appEditors/FlatCAMGeoEditor.py:902
+#: appEditors/appGeoEditor.py:882 appEditors/appGeoEditor.py:902
 #: appEditors/FlatCAMGrbEditor.py:5575 appEditors/FlatCAMGrbEditor.py:5595
 #: appTools/ToolTransform.py:329 appTools/ToolTransform.py:349
 msgid ""
@@ -2244,31 +2244,31 @@ msgstr ""
 "Il punto di riferimento è il centro del\n"
 "rettangolo di selezione per tutti gli oggetti selezionati.\n"
 
-#: appEditors/FlatCAMGeoEditor.py:891 appEditors/FlatCAMGrbEditor.py:5584
+#: appEditors/appGeoEditor.py:891 appEditors/FlatCAMGrbEditor.py:5584
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:204
 #: appTools/ToolTransform.py:338
 msgid "Y val"
 msgstr "Valore Y"
 
-#: appEditors/FlatCAMGeoEditor.py:893 appEditors/FlatCAMGrbEditor.py:5586
+#: appEditors/appGeoEditor.py:893 appEditors/FlatCAMGrbEditor.py:5586
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:206
 #: appTools/ToolTransform.py:340
 msgid "Distance to offset on Y axis. In current units."
 msgstr "Distanza da applicare sull'asse Y. In unità correnti."
 
-#: appEditors/FlatCAMGeoEditor.py:900 appEditors/FlatCAMGrbEditor.py:5593
+#: appEditors/appGeoEditor.py:900 appEditors/FlatCAMGrbEditor.py:5593
 #: appTools/ToolTransform.py:347
 msgid "Offset Y"
 msgstr "Offset X"
 
-#: appEditors/FlatCAMGeoEditor.py:920 appEditors/FlatCAMGrbEditor.py:5613
+#: appEditors/appGeoEditor.py:920 appEditors/FlatCAMGrbEditor.py:5613
 #: appGUI/preferences/tools/Tools2QRCodePrefGroupUI.py:142
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:216
 #: appTools/ToolQRCode.py:206 appTools/ToolTransform.py:367
 msgid "Rounded"
 msgstr "Arrotondato"
 
-#: appEditors/FlatCAMGeoEditor.py:922 appEditors/FlatCAMGrbEditor.py:5615
+#: appEditors/appGeoEditor.py:922 appEditors/FlatCAMGrbEditor.py:5615
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:218
 #: appTools/ToolTransform.py:369
 msgid ""
@@ -2282,14 +2282,14 @@ msgstr ""
 "Se non selezionato, il buffer seguirà l'esatta geometria\n"
 "della forma bufferizzata."
 
-#: appEditors/FlatCAMGeoEditor.py:930 appEditors/FlatCAMGrbEditor.py:5623
+#: appEditors/appGeoEditor.py:930 appEditors/FlatCAMGrbEditor.py:5623
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:226
 #: appTools/ToolDistance.py:505 appTools/ToolDistanceMin.py:286
 #: appTools/ToolTransform.py:377
 msgid "Distance"
 msgstr "Distanza"
 
-#: appEditors/FlatCAMGeoEditor.py:932 appEditors/FlatCAMGrbEditor.py:5625
+#: appEditors/appGeoEditor.py:932 appEditors/FlatCAMGrbEditor.py:5625
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:228
 #: appTools/ToolTransform.py:379
 msgid ""
@@ -2303,12 +2303,12 @@ msgstr ""
 "Ogni elemento della geometria dell'oggetto verrà aumentato\n"
 "o diminuito con la 'distanza'."
 
-#: appEditors/FlatCAMGeoEditor.py:944 appEditors/FlatCAMGrbEditor.py:5637
+#: appEditors/appGeoEditor.py:944 appEditors/FlatCAMGrbEditor.py:5637
 #: appTools/ToolTransform.py:391
 msgid "Buffer D"
 msgstr "Buffer D"
 
-#: appEditors/FlatCAMGeoEditor.py:946 appEditors/FlatCAMGrbEditor.py:5639
+#: appEditors/appGeoEditor.py:946 appEditors/FlatCAMGrbEditor.py:5639
 #: appTools/ToolTransform.py:393
 msgid ""
 "Create the buffer effect on each geometry,\n"
@@ -2317,7 +2317,7 @@ msgstr ""
 "Crea l'effetto buffer su ogni geometria,\n"
 "elemento dall'oggetto selezionato, usando la distanza."
 
-#: appEditors/FlatCAMGeoEditor.py:957 appEditors/FlatCAMGrbEditor.py:5650
+#: appEditors/appGeoEditor.py:957 appEditors/FlatCAMGrbEditor.py:5650
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:245
 #: appTools/ToolTransform.py:404
 msgid ""
@@ -2332,12 +2332,12 @@ msgstr ""
 "Ogni elemento della geometria dell'oggetto verrà aumentato\n"
 "o diminuito in base al 'Valore'."
 
-#: appEditors/FlatCAMGeoEditor.py:970 appEditors/FlatCAMGrbEditor.py:5663
+#: appEditors/appGeoEditor.py:970 appEditors/FlatCAMGrbEditor.py:5663
 #: appTools/ToolTransform.py:417
 msgid "Buffer F"
 msgstr "Buffer F"
 
-#: appEditors/FlatCAMGeoEditor.py:972 appEditors/FlatCAMGrbEditor.py:5665
+#: appEditors/appGeoEditor.py:972 appEditors/FlatCAMGrbEditor.py:5665
 #: appTools/ToolTransform.py:419
 msgid ""
 "Create the buffer effect on each geometry,\n"
@@ -2346,7 +2346,7 @@ msgstr ""
 "Crea l'effetto buffer su ogni geometria,\n"
 "elemento dall'oggetto selezionato, usando il fattore."
 
-#: appEditors/FlatCAMGeoEditor.py:1043 appEditors/FlatCAMGrbEditor.py:5736
+#: appEditors/appGeoEditor.py:1043 appEditors/FlatCAMGrbEditor.py:5736
 #: appGUI/ObjectUI.py:1103 appGUI/ObjectUI.py:1958
 #: appGUI/preferences/tools/Tools2CalPrefGroupUI.py:48
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
@@ -2357,331 +2357,331 @@ msgstr ""
 msgid "Object"
 msgstr "Oggetto"
 
-#: appEditors/FlatCAMGeoEditor.py:1107 appEditors/FlatCAMGeoEditor.py:1130
-#: appEditors/FlatCAMGeoEditor.py:1276 appEditors/FlatCAMGeoEditor.py:1301
-#: appEditors/FlatCAMGeoEditor.py:1335 appEditors/FlatCAMGeoEditor.py:1370
-#: appEditors/FlatCAMGeoEditor.py:1401 appEditors/FlatCAMGrbEditor.py:5800
+#: appEditors/appGeoEditor.py:1107 appEditors/appGeoEditor.py:1130
+#: appEditors/appGeoEditor.py:1276 appEditors/appGeoEditor.py:1301
+#: appEditors/appGeoEditor.py:1335 appEditors/appGeoEditor.py:1370
+#: appEditors/appGeoEditor.py:1401 appEditors/FlatCAMGrbEditor.py:5800
 #: appEditors/FlatCAMGrbEditor.py:5823 appEditors/FlatCAMGrbEditor.py:5968
 #: appEditors/FlatCAMGrbEditor.py:6001 appEditors/FlatCAMGrbEditor.py:6044
 #: appEditors/FlatCAMGrbEditor.py:6085 appEditors/FlatCAMGrbEditor.py:6121
 msgid "No shape selected."
 msgstr "Nessuna forma selezionata."
 
-#: appEditors/FlatCAMGeoEditor.py:1115 appEditors/FlatCAMGrbEditor.py:5808
+#: appEditors/appGeoEditor.py:1115 appEditors/FlatCAMGrbEditor.py:5808
 #: appTools/ToolTransform.py:585
 msgid "Incorrect format for Point value. Needs format X,Y"
 msgstr "Valori del formato punto non corrette. Il formato è X,Y"
 
-#: appEditors/FlatCAMGeoEditor.py:1140 appEditors/FlatCAMGrbEditor.py:5833
+#: appEditors/appGeoEditor.py:1140 appEditors/FlatCAMGrbEditor.py:5833
 #: appTools/ToolTransform.py:602
 msgid "Rotate transformation can not be done for a value of 0."
 msgstr ""
 "La trasformazione di rotazione non può essere eseguita per un valore pari a "
 "0."
 
-#: appEditors/FlatCAMGeoEditor.py:1198 appEditors/FlatCAMGeoEditor.py:1219
+#: appEditors/appGeoEditor.py:1198 appEditors/appGeoEditor.py:1219
 #: appEditors/FlatCAMGrbEditor.py:5891 appEditors/FlatCAMGrbEditor.py:5912
 #: appTools/ToolTransform.py:660 appTools/ToolTransform.py:681
 msgid "Scale transformation can not be done for a factor of 0 or 1."
 msgstr ""
 "La trasformazione in scala non può essere eseguita per un fattore 0 o 1."
 
-#: appEditors/FlatCAMGeoEditor.py:1232 appEditors/FlatCAMGeoEditor.py:1241
+#: appEditors/appGeoEditor.py:1232 appEditors/appGeoEditor.py:1241
 #: appEditors/FlatCAMGrbEditor.py:5925 appEditors/FlatCAMGrbEditor.py:5934
 #: appTools/ToolTransform.py:694 appTools/ToolTransform.py:703
 msgid "Offset transformation can not be done for a value of 0."
 msgstr ""
 "La trasformazione offset non può essere eseguita per un valore pari a 0."
 
-#: appEditors/FlatCAMGeoEditor.py:1271 appEditors/FlatCAMGrbEditor.py:5971
+#: appEditors/appGeoEditor.py:1271 appEditors/FlatCAMGrbEditor.py:5971
 #: appTools/ToolTransform.py:731
 msgid "Appying Rotate"
 msgstr "Applico Rotazione"
 
-#: appEditors/FlatCAMGeoEditor.py:1284 appEditors/FlatCAMGrbEditor.py:5983
+#: appEditors/appGeoEditor.py:1284 appEditors/FlatCAMGrbEditor.py:5983
 msgid "Done. Rotate completed."
 msgstr "Fatto. Rotazione completata."
 
-#: appEditors/FlatCAMGeoEditor.py:1286
+#: appEditors/appGeoEditor.py:1286
 msgid "Rotation action was not executed"
 msgstr "Azione rotazione non effettuata"
 
-#: appEditors/FlatCAMGeoEditor.py:1304 appEditors/FlatCAMGrbEditor.py:6004
+#: appEditors/appGeoEditor.py:1304 appEditors/FlatCAMGrbEditor.py:6004
 #: appTools/ToolTransform.py:757
 msgid "Applying Flip"
 msgstr "Applico il capovolgimento"
 
-#: appEditors/FlatCAMGeoEditor.py:1312 appEditors/FlatCAMGrbEditor.py:6016
+#: appEditors/appGeoEditor.py:1312 appEditors/FlatCAMGrbEditor.py:6016
 #: appTools/ToolTransform.py:774
 msgid "Flip on the Y axis done"
 msgstr "Capovolgimento sull'asse Y effettuato"
 
-#: appEditors/FlatCAMGeoEditor.py:1315 appEditors/FlatCAMGrbEditor.py:6024
+#: appEditors/appGeoEditor.py:1315 appEditors/FlatCAMGrbEditor.py:6024
 #: appTools/ToolTransform.py:783
 msgid "Flip on the X axis done"
 msgstr "Capovolgimento sull'asse X effettuato"
 
-#: appEditors/FlatCAMGeoEditor.py:1319
+#: appEditors/appGeoEditor.py:1319
 msgid "Flip action was not executed"
 msgstr "Azione capovolgimento non effettuata"
 
-#: appEditors/FlatCAMGeoEditor.py:1338 appEditors/FlatCAMGrbEditor.py:6047
+#: appEditors/appGeoEditor.py:1338 appEditors/FlatCAMGrbEditor.py:6047
 #: appTools/ToolTransform.py:804
 msgid "Applying Skew"
 msgstr "Applico inclinazione"
 
-#: appEditors/FlatCAMGeoEditor.py:1347 appEditors/FlatCAMGrbEditor.py:6063
+#: appEditors/appGeoEditor.py:1347 appEditors/FlatCAMGrbEditor.py:6063
 msgid "Skew on the X axis done"
 msgstr "Inclinazione sull'asse X effettuata"
 
-#: appEditors/FlatCAMGeoEditor.py:1349 appEditors/FlatCAMGrbEditor.py:6065
+#: appEditors/appGeoEditor.py:1349 appEditors/FlatCAMGrbEditor.py:6065
 msgid "Skew on the Y axis done"
 msgstr "Inclinazione sull'asse Y effettuata"
 
-#: appEditors/FlatCAMGeoEditor.py:1352
+#: appEditors/appGeoEditor.py:1352
 msgid "Skew action was not executed"
 msgstr "Azione inclinazione non effettuata"
 
-#: appEditors/FlatCAMGeoEditor.py:1373 appEditors/FlatCAMGrbEditor.py:6088
+#: appEditors/appGeoEditor.py:1373 appEditors/FlatCAMGrbEditor.py:6088
 #: appTools/ToolTransform.py:831
 msgid "Applying Scale"
 msgstr "Applicare scala"
 
-#: appEditors/FlatCAMGeoEditor.py:1382 appEditors/FlatCAMGrbEditor.py:6101
+#: appEditors/appGeoEditor.py:1382 appEditors/FlatCAMGrbEditor.py:6101
 msgid "Scale on the X axis done"
 msgstr "Riscalatura su asse X effettuata"
 
-#: appEditors/FlatCAMGeoEditor.py:1384 appEditors/FlatCAMGrbEditor.py:6103
+#: appEditors/appGeoEditor.py:1384 appEditors/FlatCAMGrbEditor.py:6103
 msgid "Scale on the Y axis done"
 msgstr "Riscalatura su asse Y effettuata"
 
-#: appEditors/FlatCAMGeoEditor.py:1386
+#: appEditors/appGeoEditor.py:1386
 msgid "Scale action was not executed"
 msgstr "Azione riscalatura non effettuata"
 
-#: appEditors/FlatCAMGeoEditor.py:1404 appEditors/FlatCAMGrbEditor.py:6124
+#: appEditors/appGeoEditor.py:1404 appEditors/FlatCAMGrbEditor.py:6124
 #: appTools/ToolTransform.py:859
 msgid "Applying Offset"
 msgstr "Applicazione offset"
 
-#: appEditors/FlatCAMGeoEditor.py:1414 appEditors/FlatCAMGrbEditor.py:6145
+#: appEditors/appGeoEditor.py:1414 appEditors/FlatCAMGrbEditor.py:6145
 msgid "Offset on the X axis done"
 msgstr "Offset sull'asse X applicato"
 
-#: appEditors/FlatCAMGeoEditor.py:1416 appEditors/FlatCAMGrbEditor.py:6147
+#: appEditors/appGeoEditor.py:1416 appEditors/FlatCAMGrbEditor.py:6147
 msgid "Offset on the Y axis done"
 msgstr "Offset sull'asse Y applicato"
 
-#: appEditors/FlatCAMGeoEditor.py:1419
+#: appEditors/appGeoEditor.py:1419
 msgid "Offset action was not executed"
 msgstr "Offset non applicato"
 
-#: appEditors/FlatCAMGeoEditor.py:1426 appEditors/FlatCAMGrbEditor.py:6157
+#: appEditors/appGeoEditor.py:1426 appEditors/FlatCAMGrbEditor.py:6157
 msgid "No shape selected"
 msgstr "Nessuna forma selezionata"
 
-#: appEditors/FlatCAMGeoEditor.py:1429 appEditors/FlatCAMGrbEditor.py:6160
+#: appEditors/appGeoEditor.py:1429 appEditors/FlatCAMGrbEditor.py:6160
 #: appTools/ToolTransform.py:889
 msgid "Applying Buffer"
 msgstr "Applicazione del buffer"
 
-#: appEditors/FlatCAMGeoEditor.py:1436 appEditors/FlatCAMGrbEditor.py:6182
+#: appEditors/appGeoEditor.py:1436 appEditors/FlatCAMGrbEditor.py:6182
 #: appTools/ToolTransform.py:910
 msgid "Buffer done"
 msgstr "Bugger applicato"
 
-#: appEditors/FlatCAMGeoEditor.py:1440 appEditors/FlatCAMGrbEditor.py:6186
+#: appEditors/appGeoEditor.py:1440 appEditors/FlatCAMGrbEditor.py:6186
 #: appTools/ToolTransform.py:879 appTools/ToolTransform.py:915
 msgid "Action was not executed, due of"
 msgstr "L'azione non è stata eseguita a causa di"
 
-#: appEditors/FlatCAMGeoEditor.py:1444 appEditors/FlatCAMGrbEditor.py:6190
+#: appEditors/appGeoEditor.py:1444 appEditors/FlatCAMGrbEditor.py:6190
 msgid "Rotate ..."
 msgstr "Ruota ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1445 appEditors/FlatCAMGeoEditor.py:1494
-#: appEditors/FlatCAMGeoEditor.py:1509 appEditors/FlatCAMGrbEditor.py:6191
+#: appEditors/appGeoEditor.py:1445 appEditors/appGeoEditor.py:1494
+#: appEditors/appGeoEditor.py:1509 appEditors/FlatCAMGrbEditor.py:6191
 #: appEditors/FlatCAMGrbEditor.py:6240 appEditors/FlatCAMGrbEditor.py:6255
 msgid "Enter an Angle Value (degrees)"
 msgstr "Inserire un angolo (in gradi)"
 
-#: appEditors/FlatCAMGeoEditor.py:1453 appEditors/FlatCAMGrbEditor.py:6199
+#: appEditors/appGeoEditor.py:1453 appEditors/FlatCAMGrbEditor.py:6199
 msgid "Geometry shape rotate done"
 msgstr "Forme geometriche ruotate"
 
-#: appEditors/FlatCAMGeoEditor.py:1456 appEditors/FlatCAMGrbEditor.py:6202
+#: appEditors/appGeoEditor.py:1456 appEditors/FlatCAMGrbEditor.py:6202
 msgid "Geometry shape rotate cancelled"
 msgstr "Forme geometriche NON ruotate"
 
-#: appEditors/FlatCAMGeoEditor.py:1461 appEditors/FlatCAMGrbEditor.py:6207
+#: appEditors/appGeoEditor.py:1461 appEditors/FlatCAMGrbEditor.py:6207
 msgid "Offset on X axis ..."
 msgstr "Offset su asse X ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1462 appEditors/FlatCAMGeoEditor.py:1479
+#: appEditors/appGeoEditor.py:1462 appEditors/appGeoEditor.py:1479
 #: appEditors/FlatCAMGrbEditor.py:6208 appEditors/FlatCAMGrbEditor.py:6225
 msgid "Enter a distance Value"
 msgstr "Valore di distanza"
 
-#: appEditors/FlatCAMGeoEditor.py:1470 appEditors/FlatCAMGrbEditor.py:6216
+#: appEditors/appGeoEditor.py:1470 appEditors/FlatCAMGrbEditor.py:6216
 msgid "Geometry shape offset on X axis done"
 msgstr "Offset su forme geometria su asse X applicato"
 
-#: appEditors/FlatCAMGeoEditor.py:1473 appEditors/FlatCAMGrbEditor.py:6219
+#: appEditors/appGeoEditor.py:1473 appEditors/FlatCAMGrbEditor.py:6219
 msgid "Geometry shape offset X cancelled"
 msgstr "Offset su forme geometria su asse X annullato"
 
-#: appEditors/FlatCAMGeoEditor.py:1478 appEditors/FlatCAMGrbEditor.py:6224
+#: appEditors/appGeoEditor.py:1478 appEditors/FlatCAMGrbEditor.py:6224
 msgid "Offset on Y axis ..."
 msgstr "Offset su asse Y ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1487 appEditors/FlatCAMGrbEditor.py:6233
+#: appEditors/appGeoEditor.py:1487 appEditors/FlatCAMGrbEditor.py:6233
 msgid "Geometry shape offset on Y axis done"
 msgstr "Offset su forme geometria su asse Y applicato"
 
-#: appEditors/FlatCAMGeoEditor.py:1490
+#: appEditors/appGeoEditor.py:1490
 msgid "Geometry shape offset on Y axis canceled"
 msgstr "Offset su forme geometria su asse Y annullato"
 
-#: appEditors/FlatCAMGeoEditor.py:1493 appEditors/FlatCAMGrbEditor.py:6239
+#: appEditors/appGeoEditor.py:1493 appEditors/FlatCAMGrbEditor.py:6239
 msgid "Skew on X axis ..."
 msgstr "Inclinazione su asse Y ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1502 appEditors/FlatCAMGrbEditor.py:6248
+#: appEditors/appGeoEditor.py:1502 appEditors/FlatCAMGrbEditor.py:6248
 msgid "Geometry shape skew on X axis done"
 msgstr "Inclinazione su asse X effettuato"
 
-#: appEditors/FlatCAMGeoEditor.py:1505
+#: appEditors/appGeoEditor.py:1505
 msgid "Geometry shape skew on X axis canceled"
 msgstr "Inclinazione su asse X annullata"
 
-#: appEditors/FlatCAMGeoEditor.py:1508 appEditors/FlatCAMGrbEditor.py:6254
+#: appEditors/appGeoEditor.py:1508 appEditors/FlatCAMGrbEditor.py:6254
 msgid "Skew on Y axis ..."
 msgstr "Inclinazione su asse Y ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1517 appEditors/FlatCAMGrbEditor.py:6263
+#: appEditors/appGeoEditor.py:1517 appEditors/FlatCAMGrbEditor.py:6263
 msgid "Geometry shape skew on Y axis done"
 msgstr "Inclinazione su asse Y effettuato"
 
-#: appEditors/FlatCAMGeoEditor.py:1520
+#: appEditors/appGeoEditor.py:1520
 msgid "Geometry shape skew on Y axis canceled"
 msgstr "Inclinazione su asse Y annullata"
 
-#: appEditors/FlatCAMGeoEditor.py:1950 appEditors/FlatCAMGeoEditor.py:2021
+#: appEditors/appGeoEditor.py:1950 appEditors/appGeoEditor.py:2021
 #: appEditors/FlatCAMGrbEditor.py:1444 appEditors/FlatCAMGrbEditor.py:1522
 msgid "Click on Center point ..."
 msgstr "Clicca sul punto centrale ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1963 appEditors/FlatCAMGrbEditor.py:1454
+#: appEditors/appGeoEditor.py:1963 appEditors/FlatCAMGrbEditor.py:1454
 msgid "Click on Perimeter point to complete ..."
 msgstr "Fare clic sul punto perimetrale per completare ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1995
+#: appEditors/appGeoEditor.py:1995
 msgid "Done. Adding Circle completed."
 msgstr "Fatto. Aggiungi cerchio completato."
 
-#: appEditors/FlatCAMGeoEditor.py:2049 appEditors/FlatCAMGrbEditor.py:1555
+#: appEditors/appGeoEditor.py:2049 appEditors/FlatCAMGrbEditor.py:1555
 msgid "Click on Start point ..."
 msgstr "Fare clic sul punto iniziale ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2051 appEditors/FlatCAMGrbEditor.py:1557
+#: appEditors/appGeoEditor.py:2051 appEditors/FlatCAMGrbEditor.py:1557
 msgid "Click on Point3 ..."
 msgstr "Clicca sul punto 3 ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2053 appEditors/FlatCAMGrbEditor.py:1559
+#: appEditors/appGeoEditor.py:2053 appEditors/FlatCAMGrbEditor.py:1559
 msgid "Click on Stop point ..."
 msgstr "Clicca sul punto di stop ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2058 appEditors/FlatCAMGrbEditor.py:1564
+#: appEditors/appGeoEditor.py:2058 appEditors/FlatCAMGrbEditor.py:1564
 msgid "Click on Stop point to complete ..."
 msgstr "Clicca sul punto di stop per completare ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2060 appEditors/FlatCAMGrbEditor.py:1566
+#: appEditors/appGeoEditor.py:2060 appEditors/FlatCAMGrbEditor.py:1566
 msgid "Click on Point2 to complete ..."
 msgstr "Clicca sul punto 2 per completare ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2062 appEditors/FlatCAMGrbEditor.py:1568
+#: appEditors/appGeoEditor.py:2062 appEditors/FlatCAMGrbEditor.py:1568
 msgid "Click on Center point to complete ..."
 msgstr "Clicca sul punto centrale per completare ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2074
+#: appEditors/appGeoEditor.py:2074
 #, python-format
 msgid "Direction: %s"
 msgstr "Direzione: %s"
 
-#: appEditors/FlatCAMGeoEditor.py:2088 appEditors/FlatCAMGrbEditor.py:1594
+#: appEditors/appGeoEditor.py:2088 appEditors/FlatCAMGrbEditor.py:1594
 msgid "Mode: Start -> Stop -> Center. Click on Start point ..."
 msgstr "Modo: Start -> Stop -> Centro. Clicca sul punto di partenza ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2091 appEditors/FlatCAMGrbEditor.py:1597
+#: appEditors/appGeoEditor.py:2091 appEditors/FlatCAMGrbEditor.py:1597
 msgid "Mode: Point1 -> Point3 -> Point2. Click on Point1 ..."
 msgstr "Modo: Punto1 -> Punto3 -> Punto2. Clicca sul punto1 ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2094 appEditors/FlatCAMGrbEditor.py:1600
+#: appEditors/appGeoEditor.py:2094 appEditors/FlatCAMGrbEditor.py:1600
 msgid "Mode: Center -> Start -> Stop. Click on Center point ..."
 msgstr "Modo: Centro -> Start -> Stop. Clicca sul punto centrale ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2235
+#: appEditors/appGeoEditor.py:2235
 msgid "Done. Arc completed."
 msgstr "Fatto. Arco completato."
 
-#: appEditors/FlatCAMGeoEditor.py:2266 appEditors/FlatCAMGeoEditor.py:2339
+#: appEditors/appGeoEditor.py:2266 appEditors/appGeoEditor.py:2339
 msgid "Click on 1st corner ..."
 msgstr "Clicca sul primo angolo ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2278
+#: appEditors/appGeoEditor.py:2278
 msgid "Click on opposite corner to complete ..."
 msgstr "Clicca sull'angolo opposto per completare ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2308
+#: appEditors/appGeoEditor.py:2308
 msgid "Done. Rectangle completed."
 msgstr "Fatto. Rettangolo completato."
 
-#: appEditors/FlatCAMGeoEditor.py:2383
+#: appEditors/appGeoEditor.py:2383
 msgid "Done. Polygon completed."
 msgstr "Fatto. Poligono completato."
 
-#: appEditors/FlatCAMGeoEditor.py:2397 appEditors/FlatCAMGeoEditor.py:2462
+#: appEditors/appGeoEditor.py:2397 appEditors/appGeoEditor.py:2462
 #: appEditors/FlatCAMGrbEditor.py:1102 appEditors/FlatCAMGrbEditor.py:1322
 msgid "Backtracked one point ..."
 msgstr "Indietro di un punto ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2440
+#: appEditors/appGeoEditor.py:2440
 msgid "Done. Path completed."
 msgstr "Fatto. Percorso completato."
 
-#: appEditors/FlatCAMGeoEditor.py:2599
+#: appEditors/appGeoEditor.py:2599
 msgid "No shape selected. Select a shape to explode"
 msgstr "Nessuna forma selezionata. Seleziona una forma da esplodere"
 
-#: appEditors/FlatCAMGeoEditor.py:2632
+#: appEditors/appGeoEditor.py:2632
 msgid "Done. Polygons exploded into lines."
 msgstr "Fatto. Poligono esploso in linee."
 
-#: appEditors/FlatCAMGeoEditor.py:2664
+#: appEditors/appGeoEditor.py:2664
 msgid "MOVE: No shape selected. Select a shape to move"
 msgstr "SPOSTA: nessuna forma selezionata. Seleziona una forma da spostare"
 
-#: appEditors/FlatCAMGeoEditor.py:2667 appEditors/FlatCAMGeoEditor.py:2687
+#: appEditors/appGeoEditor.py:2667 appEditors/appGeoEditor.py:2687
 msgid " MOVE: Click on reference point ..."
 msgstr " SPOSTA: fare clic sul punto di riferimento ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2672
+#: appEditors/appGeoEditor.py:2672
 msgid " Click on destination point ..."
 msgstr " Clicca sul punto di riferimento ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2712
+#: appEditors/appGeoEditor.py:2712
 msgid "Done. Geometry(s) Move completed."
 msgstr "Fatto. Spostamento geometria(e) completato."
 
-#: appEditors/FlatCAMGeoEditor.py:2845
+#: appEditors/appGeoEditor.py:2845
 msgid "Done. Geometry(s) Copy completed."
 msgstr "Fatto. Copia geometria(e) completata."
 
-#: appEditors/FlatCAMGeoEditor.py:2876 appEditors/FlatCAMGrbEditor.py:897
+#: appEditors/appGeoEditor.py:2876 appEditors/FlatCAMGrbEditor.py:897
 msgid "Click on 1st point ..."
 msgstr "Clicca sul primo punto ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2900
+#: appEditors/appGeoEditor.py:2900
 msgid ""
 "Font not supported. Only Regular, Bold, Italic and BoldItalic are supported. "
 "Error"
@@ -2689,83 +2689,83 @@ msgstr ""
 "Font (carattere) non supportato. Sono supportati solo Regular, Bold, Italic "
 "e BoldItalic. Errore"
 
-#: appEditors/FlatCAMGeoEditor.py:2908
+#: appEditors/appGeoEditor.py:2908
 msgid "No text to add."
 msgstr "Nessun testo da aggiungere."
 
-#: appEditors/FlatCAMGeoEditor.py:2918
+#: appEditors/appGeoEditor.py:2918
 msgid " Done. Adding Text completed."
 msgstr " Fatto. Testo aggiunto."
 
-#: appEditors/FlatCAMGeoEditor.py:2955
+#: appEditors/appGeoEditor.py:2955
 msgid "Create buffer geometry ..."
 msgstr "Crea geometria buffer ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2990 appEditors/FlatCAMGrbEditor.py:5153
+#: appEditors/appGeoEditor.py:2990 appEditors/FlatCAMGrbEditor.py:5153
 msgid "Done. Buffer Tool completed."
 msgstr "Fatto. Strumento buffer completato."
 
-#: appEditors/FlatCAMGeoEditor.py:3018
+#: appEditors/appGeoEditor.py:3018
 msgid "Done. Buffer Int Tool completed."
 msgstr "Fatto. Strumento buffer interno completato."
 
-#: appEditors/FlatCAMGeoEditor.py:3046
+#: appEditors/appGeoEditor.py:3046
 msgid "Done. Buffer Ext Tool completed."
 msgstr "Fatto. Strumento buffer esterno completato."
 
-#: appEditors/FlatCAMGeoEditor.py:3095 appEditors/FlatCAMGrbEditor.py:2160
+#: appEditors/appGeoEditor.py:3095 appEditors/FlatCAMGrbEditor.py:2160
 msgid "Select a shape to act as deletion area ..."
 msgstr "Seleziona una forma da utilizzare come area di eliminazione ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3097 appEditors/FlatCAMGeoEditor.py:3123
-#: appEditors/FlatCAMGeoEditor.py:3129 appEditors/FlatCAMGrbEditor.py:2162
+#: appEditors/appGeoEditor.py:3097 appEditors/appGeoEditor.py:3123
+#: appEditors/appGeoEditor.py:3129 appEditors/FlatCAMGrbEditor.py:2162
 msgid "Click to pick-up the erase shape..."
 msgstr "Fai clic per selezionare la forma di cancellazione ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3133 appEditors/FlatCAMGrbEditor.py:2221
+#: appEditors/appGeoEditor.py:3133 appEditors/FlatCAMGrbEditor.py:2221
 msgid "Click to erase ..."
 msgstr "Clicca per cancellare ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3162 appEditors/FlatCAMGrbEditor.py:2254
+#: appEditors/appGeoEditor.py:3162 appEditors/FlatCAMGrbEditor.py:2254
 msgid "Done. Eraser tool action completed."
 msgstr "Fatto. Azione dello strumento gomma completata."
 
-#: appEditors/FlatCAMGeoEditor.py:3212
+#: appEditors/appGeoEditor.py:3212
 msgid "Create Paint geometry ..."
 msgstr "Crea geometria di disegno ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3225 appEditors/FlatCAMGrbEditor.py:2417
+#: appEditors/appGeoEditor.py:3225 appEditors/FlatCAMGrbEditor.py:2417
 msgid "Shape transformations ..."
 msgstr "Trasformazioni di forma ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3281
+#: appEditors/appGeoEditor.py:3281
 #: appGUI/preferences/geometry/GeometryEditorPrefGroupUI.py:27
 msgid "Geometry Editor"
 msgstr "Editor Geometrie"
 
-#: appEditors/FlatCAMGeoEditor.py:3287 appEditors/FlatCAMGrbEditor.py:2495
+#: appEditors/appGeoEditor.py:3287 appEditors/FlatCAMGrbEditor.py:2495
 #: appEditors/FlatCAMGrbEditor.py:3951 appGUI/ObjectUI.py:282
 #: appGUI/ObjectUI.py:1394 appGUI/ObjectUI.py:2256 appTools/ToolCutOut.py:95
 #: appTools/ToolTransform.py:92
 msgid "Type"
 msgstr "Tipo"
 
-#: appEditors/FlatCAMGeoEditor.py:3287 appGUI/ObjectUI.py:221
+#: appEditors/appGeoEditor.py:3287 appGUI/ObjectUI.py:221
 #: appGUI/ObjectUI.py:521 appGUI/ObjectUI.py:1330 appGUI/ObjectUI.py:2165
 #: appGUI/ObjectUI.py:2469 appGUI/ObjectUI.py:2536
 #: appTools/ToolCalibration.py:234 appTools/ToolFiducials.py:70
 msgid "Name"
 msgstr "Nome"
 
-#: appEditors/FlatCAMGeoEditor.py:3539
+#: appEditors/appGeoEditor.py:3539
 msgid "Ring"
 msgstr "Anello"
 
-#: appEditors/FlatCAMGeoEditor.py:3541
+#: appEditors/appGeoEditor.py:3541
 msgid "Line"
 msgstr "Linea"
 
-#: appEditors/FlatCAMGeoEditor.py:3543 appGUI/MainGUI.py:1446
+#: appEditors/appGeoEditor.py:3543 appGUI/MainGUI.py:1446
 #: appGUI/ObjectUI.py:1150 appGUI/ObjectUI.py:2005
 #: appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py:226
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:299
@@ -2776,47 +2776,47 @@ msgstr "Linea"
 msgid "Polygon"
 msgstr "Poligono"
 
-#: appEditors/FlatCAMGeoEditor.py:3545
+#: appEditors/appGeoEditor.py:3545
 msgid "Multi-Line"
 msgstr "Multi-Linea"
 
-#: appEditors/FlatCAMGeoEditor.py:3547
+#: appEditors/appGeoEditor.py:3547
 msgid "Multi-Polygon"
 msgstr "Multi-Poligono"
 
-#: appEditors/FlatCAMGeoEditor.py:3554
+#: appEditors/appGeoEditor.py:3554
 msgid "Geo Elem"
 msgstr "Elemento Geom"
 
-#: appEditors/FlatCAMGeoEditor.py:4007
+#: appEditors/appGeoEditor.py:4007
 msgid "Editing MultiGeo Geometry, tool"
 msgstr "Modifica di Geometria MultiGeo, strumento"
 
-#: appEditors/FlatCAMGeoEditor.py:4009
+#: appEditors/appGeoEditor.py:4009
 msgid "with diameter"
 msgstr "con diametro"
 
-#: appEditors/FlatCAMGeoEditor.py:4081
+#: appEditors/appGeoEditor.py:4081
 msgid "Grid Snap enabled."
 msgstr "Snap alla griglia abilitato."
 
-#: appEditors/FlatCAMGeoEditor.py:4085
+#: appEditors/appGeoEditor.py:4085
 msgid "Grid Snap disabled."
 msgstr "Snap alla griglia disabilitato."
 
-#: appEditors/FlatCAMGeoEditor.py:4446 appGUI/MainGUI.py:3046
+#: appEditors/appGeoEditor.py:4446 appGUI/MainGUI.py:3046
 #: appGUI/MainGUI.py:3092 appGUI/MainGUI.py:3110 appGUI/MainGUI.py:3254
 #: appGUI/MainGUI.py:3293 appGUI/MainGUI.py:3305 appGUI/MainGUI.py:3322
 msgid "Click on target point."
 msgstr "Fai clic sul punto target."
 
-#: appEditors/FlatCAMGeoEditor.py:4762 appEditors/FlatCAMGeoEditor.py:4797
+#: appEditors/appGeoEditor.py:4762 appEditors/appGeoEditor.py:4797
 msgid "A selection of at least 2 geo items is required to do Intersection."
 msgstr ""
 "Per effettuare l'intersezione è necessaria una selezione di almeno 2 "
 "elementi geometrici."
 
-#: appEditors/FlatCAMGeoEditor.py:4883 appEditors/FlatCAMGeoEditor.py:4987
+#: appEditors/appGeoEditor.py:4883 appEditors/appGeoEditor.py:4987
 msgid ""
 "Negative buffer value is not accepted. Use Buffer interior to generate an "
 "'inside' shape"
@@ -2824,56 +2824,56 @@ msgstr ""
 "Valore di buffer negativi non accettati. Usa l'interno del buffer per "
 "generare una forma \"interna\""
 
-#: appEditors/FlatCAMGeoEditor.py:4893 appEditors/FlatCAMGeoEditor.py:4946
-#: appEditors/FlatCAMGeoEditor.py:4996
+#: appEditors/appGeoEditor.py:4893 appEditors/appGeoEditor.py:4946
+#: appEditors/appGeoEditor.py:4996
 msgid "Nothing selected for buffering."
 msgstr "Niente di selezionato per il buffering."
 
-#: appEditors/FlatCAMGeoEditor.py:4898 appEditors/FlatCAMGeoEditor.py:4950
-#: appEditors/FlatCAMGeoEditor.py:5001
+#: appEditors/appGeoEditor.py:4898 appEditors/appGeoEditor.py:4950
+#: appEditors/appGeoEditor.py:5001
 msgid "Invalid distance for buffering."
 msgstr "Distanza non valida per il buffering."
 
-#: appEditors/FlatCAMGeoEditor.py:4922 appEditors/FlatCAMGeoEditor.py:5021
+#: appEditors/appGeoEditor.py:4922 appEditors/appGeoEditor.py:5021
 msgid "Failed, the result is empty. Choose a different buffer value."
 msgstr "Fallito, il risultato è vuoto. Scegli un valore di buffer diverso."
 
-#: appEditors/FlatCAMGeoEditor.py:4933
+#: appEditors/appGeoEditor.py:4933
 msgid "Full buffer geometry created."
 msgstr "Geometria buffer completa creata."
 
-#: appEditors/FlatCAMGeoEditor.py:4939
+#: appEditors/appGeoEditor.py:4939
 msgid "Negative buffer value is not accepted."
 msgstr "Il valore negativo del buffer non è accettato."
 
-#: appEditors/FlatCAMGeoEditor.py:4970
+#: appEditors/appGeoEditor.py:4970
 msgid "Failed, the result is empty. Choose a smaller buffer value."
 msgstr "Fallito, il risultato è vuoto. Scegli un valore di buffer più piccolo."
 
-#: appEditors/FlatCAMGeoEditor.py:4980
+#: appEditors/appGeoEditor.py:4980
 msgid "Interior buffer geometry created."
 msgstr "Geometria del buffer interno creata."
 
-#: appEditors/FlatCAMGeoEditor.py:5031
+#: appEditors/appGeoEditor.py:5031
 msgid "Exterior buffer geometry created."
 msgstr "Geometria del buffer esterno creata."
 
-#: appEditors/FlatCAMGeoEditor.py:5037
+#: appEditors/appGeoEditor.py:5037
 #, python-format
 msgid "Could not do Paint. Overlap value has to be less than 100%%."
 msgstr ""
 "Impossibile fare Paint. Il valore di sovrapposizione deve essere inferiore a "
 "100%%."
 
-#: appEditors/FlatCAMGeoEditor.py:5044
+#: appEditors/appGeoEditor.py:5044
 msgid "Nothing selected for painting."
 msgstr "Nulla di selezionato per Paint."
 
-#: appEditors/FlatCAMGeoEditor.py:5050
+#: appEditors/appGeoEditor.py:5050
 msgid "Invalid value for"
 msgstr "Valore non valido per"
 
-#: appEditors/FlatCAMGeoEditor.py:5109
+#: appEditors/appGeoEditor.py:5109
 msgid ""
 "Could not do Paint. Try a different combination of parameters. Or a "
 "different method of Paint"
@@ -2881,7 +2881,7 @@ msgstr ""
 "Impossibile fare Paint. Prova una diversa combinazione di parametri. O un "
 "metodo diverso di Paint"
 
-#: appEditors/FlatCAMGeoEditor.py:5120
+#: appEditors/appGeoEditor.py:5120
 msgid "Paint done."
 msgstr "Paint fatto."
 
diff --git a/locale/pt_BR/LC_MESSAGES/strings.po b/locale/pt_BR/LC_MESSAGES/strings.po
index 86af8579..a0c5b555 100644
--- a/locale/pt_BR/LC_MESSAGES/strings.po
+++ b/locale/pt_BR/LC_MESSAGES/strings.po
@@ -173,7 +173,7 @@ msgstr ""
 "Zona adicionada. Clique para iniciar a adição da próxima zona ou clique com "
 "o botão direito para terminar."
 
-#: Common.py:322 appEditors/FlatCAMGeoEditor.py:2352
+#: Common.py:322 appEditors/appGeoEditor.py:2352
 #: appTools/ToolIsolation.py:2584 appTools/ToolNCC.py:1754
 #: appTools/ToolPaint.py:1647
 msgid "Click on next Point or click right mouse button to complete ..."
@@ -893,7 +893,7 @@ msgid "Conventional"
 msgstr "Convencional"
 
 #: appDatabase.py:1456 appDatabase.py:1565 appDatabase.py:1667
-#: appEditors/FlatCAMGeoEditor.py:450
+#: appEditors/appGeoEditor.py:450
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:167
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:182
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:163
@@ -921,7 +921,7 @@ msgstr ""
 "Valores maiores = processamento lento e execução lenta no CNC devido\n"
 "ao número de caminhos."
 
-#: appDatabase.py:1477 appDatabase.py:1586 appEditors/FlatCAMGeoEditor.py:470
+#: appDatabase.py:1477 appDatabase.py:1586 appEditors/appGeoEditor.py:470
 #: appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py:72
 #: appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py:229
 #: appGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py:59
@@ -950,7 +950,7 @@ msgstr "Margem"
 msgid "Bounding box margin."
 msgstr "Margem da caixa delimitadora."
 
-#: appDatabase.py:1490 appDatabase.py:1601 appEditors/FlatCAMGeoEditor.py:484
+#: appDatabase.py:1490 appDatabase.py:1601 appEditors/appGeoEditor.py:484
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:105
 #: appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py:106
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:215
@@ -973,7 +973,7 @@ msgstr ""
 "- Baseado em semente: Para fora a partir de uma semente.\n"
 "- Linhas retas: Linhas paralelas."
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2232 appTools/ToolNCC.py:2764
@@ -983,8 +983,8 @@ msgstr ""
 msgid "Standard"
 msgstr "Padrão"
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
-#: appEditors/FlatCAMGeoEditor.py:568 appEditors/FlatCAMGeoEditor.py:5091
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
+#: appEditors/appGeoEditor.py:568 appEditors/appGeoEditor.py:5091
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2243 appTools/ToolNCC.py:2770
@@ -995,8 +995,8 @@ msgstr "Padrão"
 msgid "Seed"
 msgstr "Semente"
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
-#: appEditors/FlatCAMGeoEditor.py:5095
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
+#: appEditors/appGeoEditor.py:5095
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2254 appTools/ToolPaint.py:389
@@ -1020,7 +1020,7 @@ msgstr "Combo"
 msgid "Connect"
 msgstr "Conectar"
 
-#: appDatabase.py:1512 appDatabase.py:1629 appEditors/FlatCAMGeoEditor.py:507
+#: appDatabase.py:1512 appDatabase.py:1629 appEditors/appGeoEditor.py:507
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:239
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:226
 #: appTools/ToolNCC.py:443 appTools/ToolPaint.py:403
@@ -1038,7 +1038,7 @@ msgstr ""
 msgid "Contour"
 msgstr "Contorno"
 
-#: appDatabase.py:1522 appDatabase.py:1636 appEditors/FlatCAMGeoEditor.py:517
+#: appDatabase.py:1522 appDatabase.py:1636 appEditors/appGeoEditor.py:517
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:248
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:234
 #: appTools/ToolNCC.py:453 appTools/ToolPaint.py:410
@@ -1047,7 +1047,7 @@ msgid ""
 "to trim rough edges."
 msgstr "Corta no perímetro do polígono para retirar as arestas."
 
-#: appDatabase.py:1528 appEditors/FlatCAMGeoEditor.py:611
+#: appDatabase.py:1528 appEditors/appGeoEditor.py:611
 #: appEditors/FlatCAMGrbEditor.py:5304 appGUI/ObjectUI.py:143
 #: appGUI/ObjectUI.py:1394 appGUI/ObjectUI.py:2256
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:255
@@ -1069,7 +1069,7 @@ msgstr ""
 "A retirada de cobre terminará a uma distância dos recursos de cobre.\n"
 "O valor pode estar entre 0 e 10 unidades FlatCAM."
 
-#: appDatabase.py:1567 appEditors/FlatCAMGeoEditor.py:452
+#: appDatabase.py:1567 appEditors/appGeoEditor.py:452
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:165
 #: appTools/ToolPaint.py:330
 msgid ""
@@ -1089,7 +1089,7 @@ msgstr ""
 "Valores maiores = processamento lento e execução lenta no CNC \n"
 "devido ao número de caminhos."
 
-#: appDatabase.py:1588 appEditors/FlatCAMGeoEditor.py:472
+#: appDatabase.py:1588 appEditors/appGeoEditor.py:472
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:185
 #: appTools/ToolPaint.py:351
 msgid ""
@@ -1549,7 +1549,7 @@ msgstr "Y"
 #: appEditors/FlatCAMExcEditor.py:1800 appEditors/FlatCAMExcEditor.py:1871
 #: appEditors/FlatCAMExcEditor.py:1875 appEditors/FlatCAMExcEditor.py:1964
 #: appEditors/FlatCAMExcEditor.py:1982 appEditors/FlatCAMExcEditor.py:2016
-#: appEditors/FlatCAMGeoEditor.py:683 appEditors/FlatCAMGrbEditor.py:2822
+#: appEditors/appGeoEditor.py:683 appEditors/FlatCAMGrbEditor.py:2822
 #: appEditors/FlatCAMGrbEditor.py:2839 appEditors/FlatCAMGrbEditor.py:2875
 #: appEditors/FlatCAMGrbEditor.py:5376
 #: appGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py:94
@@ -1771,7 +1771,7 @@ msgid "Cancelled. There is no Tool/Drill selected"
 msgstr "Cancelado. Não há ferramenta/broca selecionada"
 
 #: appEditors/FlatCAMExcEditor.py:3601 appEditors/FlatCAMExcEditor.py:3609
-#: appEditors/FlatCAMGeoEditor.py:4286 appEditors/FlatCAMGeoEditor.py:4300
+#: appEditors/appGeoEditor.py:4286 appEditors/appGeoEditor.py:4300
 #: appEditors/FlatCAMGrbEditor.py:1085 appEditors/FlatCAMGrbEditor.py:1312
 #: appEditors/FlatCAMGrbEditor.py:1497 appEditors/FlatCAMGrbEditor.py:1766
 #: appEditors/FlatCAMGrbEditor.py:4608 appEditors/FlatCAMGrbEditor.py:4625
@@ -1790,15 +1790,15 @@ msgstr "Furo(s) excluída(s)."
 msgid "Click on the circular array Center position"
 msgstr "Clique na posição central da matriz circular"
 
-#: appEditors/FlatCAMGeoEditor.py:84
+#: appEditors/appGeoEditor.py:84
 msgid "Buffer distance:"
 msgstr "Distância do buffer:"
 
-#: appEditors/FlatCAMGeoEditor.py:85
+#: appEditors/appGeoEditor.py:85
 msgid "Buffer corner:"
 msgstr "Canto do buffer:"
 
-#: appEditors/FlatCAMGeoEditor.py:87
+#: appEditors/appGeoEditor.py:87
 msgid ""
 "There are 3 types of corners:\n"
 " - 'Round': the corner is rounded for exterior buffer.\n"
@@ -1812,11 +1812,11 @@ msgstr ""
 "- 'Chanfrado:' o canto é uma linha que conecta diretamente os recursos "
 "encontrados no canto"
 
-#: appEditors/FlatCAMGeoEditor.py:93 appEditors/FlatCAMGrbEditor.py:2638
+#: appEditors/appGeoEditor.py:93 appEditors/FlatCAMGrbEditor.py:2638
 msgid "Round"
 msgstr "Redondo"
 
-#: appEditors/FlatCAMGeoEditor.py:94 appEditors/FlatCAMGrbEditor.py:2639
+#: appEditors/appGeoEditor.py:94 appEditors/FlatCAMGrbEditor.py:2639
 #: appGUI/ObjectUI.py:1149 appGUI/ObjectUI.py:2004
 #: appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py:225
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:68
@@ -1834,50 +1834,50 @@ msgstr "Redondo"
 msgid "Square"
 msgstr "Quadrado"
 
-#: appEditors/FlatCAMGeoEditor.py:95 appEditors/FlatCAMGrbEditor.py:2640
+#: appEditors/appGeoEditor.py:95 appEditors/FlatCAMGrbEditor.py:2640
 msgid "Beveled"
 msgstr "Chanfrado"
 
-#: appEditors/FlatCAMGeoEditor.py:102
+#: appEditors/appGeoEditor.py:102
 msgid "Buffer Interior"
 msgstr "Buffer Interior"
 
-#: appEditors/FlatCAMGeoEditor.py:104
+#: appEditors/appGeoEditor.py:104
 msgid "Buffer Exterior"
 msgstr "Buffer Exterior"
 
-#: appEditors/FlatCAMGeoEditor.py:110
+#: appEditors/appGeoEditor.py:110
 msgid "Full Buffer"
 msgstr "Buffer Completo"
 
-#: appEditors/FlatCAMGeoEditor.py:131 appEditors/FlatCAMGeoEditor.py:2959
+#: appEditors/appGeoEditor.py:131 appEditors/appGeoEditor.py:2959
 #: appGUI/MainGUI.py:4301
 #: appGUI/preferences/gerber/GerberEditorPrefGroupUI.py:191
 msgid "Buffer Tool"
 msgstr "Ferramenta Buffer"
 
-#: appEditors/FlatCAMGeoEditor.py:143 appEditors/FlatCAMGeoEditor.py:160
-#: appEditors/FlatCAMGeoEditor.py:177 appEditors/FlatCAMGeoEditor.py:2978
-#: appEditors/FlatCAMGeoEditor.py:3006 appEditors/FlatCAMGeoEditor.py:3034
+#: appEditors/appGeoEditor.py:143 appEditors/appGeoEditor.py:160
+#: appEditors/appGeoEditor.py:177 appEditors/appGeoEditor.py:2978
+#: appEditors/appGeoEditor.py:3006 appEditors/appGeoEditor.py:3034
 #: appEditors/FlatCAMGrbEditor.py:5109
 msgid "Buffer distance value is missing or wrong format. Add it and retry."
 msgstr ""
 "O valor da distância do buffer está ausente ou em formato incorreto. Altere "
 "e tente novamente."
 
-#: appEditors/FlatCAMGeoEditor.py:241
+#: appEditors/appGeoEditor.py:241
 msgid "Font"
 msgstr "Fonte"
 
-#: appEditors/FlatCAMGeoEditor.py:322 appGUI/MainGUI.py:1452
+#: appEditors/appGeoEditor.py:322 appGUI/MainGUI.py:1452
 msgid "Text"
 msgstr "Texto"
 
-#: appEditors/FlatCAMGeoEditor.py:348
+#: appEditors/appGeoEditor.py:348
 msgid "Text Tool"
 msgstr "Ferramenta de Texto"
 
-#: appEditors/FlatCAMGeoEditor.py:404 appGUI/MainGUI.py:502
+#: appEditors/appGeoEditor.py:404 appGUI/MainGUI.py:502
 #: appGUI/MainGUI.py:1199 appGUI/ObjectUI.py:597 appGUI/ObjectUI.py:1564
 #: appObjects/FlatCAMExcellon.py:852 appObjects/FlatCAMExcellon.py:1242
 #: appObjects/FlatCAMGeometry.py:825 appTools/ToolIsolation.py:313
@@ -1886,15 +1886,15 @@ msgstr "Ferramenta de Texto"
 msgid "Tool"
 msgstr "Ferramenta"
 
-#: appEditors/FlatCAMGeoEditor.py:438
+#: appEditors/appGeoEditor.py:438
 msgid "Tool dia"
 msgstr "Diâmetro da Ferramenta"
 
-#: appEditors/FlatCAMGeoEditor.py:440
+#: appEditors/appGeoEditor.py:440
 msgid "Diameter of the tool to be used in the operation."
 msgstr "Diâmetro da ferramenta para usar na operação."
 
-#: appEditors/FlatCAMGeoEditor.py:486
+#: appEditors/appGeoEditor.py:486
 msgid ""
 "Algorithm to paint the polygons:\n"
 "- Standard: Fixed step inwards.\n"
@@ -1906,57 +1906,57 @@ msgstr ""
 "- Baseado em semeste: Para fora a partir de uma semente.\n"
 "- Linhas retas: Linhas paralelas."
 
-#: appEditors/FlatCAMGeoEditor.py:505
+#: appEditors/appGeoEditor.py:505
 msgid "Connect:"
 msgstr "Conectar:"
 
-#: appEditors/FlatCAMGeoEditor.py:515
+#: appEditors/appGeoEditor.py:515
 msgid "Contour:"
 msgstr "Contorno:"
 
-#: appEditors/FlatCAMGeoEditor.py:528 appGUI/MainGUI.py:1456
+#: appEditors/appGeoEditor.py:528 appGUI/MainGUI.py:1456
 msgid "Paint"
 msgstr "Pintura"
 
-#: appEditors/FlatCAMGeoEditor.py:546 appGUI/MainGUI.py:912
+#: appEditors/appGeoEditor.py:546 appGUI/MainGUI.py:912
 #: appGUI/MainGUI.py:1944 appGUI/ObjectUI.py:2069 appTools/ToolPaint.py:42
 #: appTools/ToolPaint.py:737
 msgid "Paint Tool"
 msgstr "Ferramenta de Pintura"
 
-#: appEditors/FlatCAMGeoEditor.py:582 appEditors/FlatCAMGeoEditor.py:1071
-#: appEditors/FlatCAMGeoEditor.py:2966 appEditors/FlatCAMGeoEditor.py:2994
-#: appEditors/FlatCAMGeoEditor.py:3022 appEditors/FlatCAMGeoEditor.py:4439
+#: appEditors/appGeoEditor.py:582 appEditors/appGeoEditor.py:1071
+#: appEditors/appGeoEditor.py:2966 appEditors/appGeoEditor.py:2994
+#: appEditors/appGeoEditor.py:3022 appEditors/appGeoEditor.py:4439
 #: appEditors/FlatCAMGrbEditor.py:5764
 msgid "Cancelled. No shape selected."
 msgstr "Cancelado. Nenhuma forma selecionada."
 
-#: appEditors/FlatCAMGeoEditor.py:595 appEditors/FlatCAMGeoEditor.py:2984
-#: appEditors/FlatCAMGeoEditor.py:3012 appEditors/FlatCAMGeoEditor.py:3040
+#: appEditors/appGeoEditor.py:595 appEditors/appGeoEditor.py:2984
+#: appEditors/appGeoEditor.py:3012 appEditors/appGeoEditor.py:3040
 #: appGUI/preferences/geometry/GeometryGenPrefGroupUI.py:69
 #: appTools/ToolProperties.py:117 appTools/ToolProperties.py:162
 msgid "Tools"
 msgstr "Ferramentas"
 
-#: appEditors/FlatCAMGeoEditor.py:606 appEditors/FlatCAMGeoEditor.py:1035
+#: appEditors/appGeoEditor.py:606 appEditors/appGeoEditor.py:1035
 #: appEditors/FlatCAMGrbEditor.py:5299 appEditors/FlatCAMGrbEditor.py:5728
 #: appGUI/MainGUI.py:935 appGUI/MainGUI.py:1967 appTools/ToolTransform.py:494
 msgid "Transform Tool"
 msgstr "Ferramenta Transformar"
 
-#: appEditors/FlatCAMGeoEditor.py:607 appEditors/FlatCAMGeoEditor.py:699
+#: appEditors/appGeoEditor.py:607 appEditors/appGeoEditor.py:699
 #: appEditors/FlatCAMGrbEditor.py:5300 appEditors/FlatCAMGrbEditor.py:5392
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:88
 #: appTools/ToolTransform.py:27 appTools/ToolTransform.py:146
 msgid "Rotate"
 msgstr "Girar"
 
-#: appEditors/FlatCAMGeoEditor.py:608 appEditors/FlatCAMGrbEditor.py:5301
+#: appEditors/appGeoEditor.py:608 appEditors/FlatCAMGrbEditor.py:5301
 #: appTools/ToolTransform.py:28
 msgid "Skew/Shear"
 msgstr "Inclinar"
 
-#: appEditors/FlatCAMGeoEditor.py:609 appEditors/FlatCAMGrbEditor.py:2687
+#: appEditors/appGeoEditor.py:609 appEditors/FlatCAMGrbEditor.py:2687
 #: appEditors/FlatCAMGrbEditor.py:5302 appGUI/MainGUI.py:1057
 #: appGUI/MainGUI.py:1499 appGUI/MainGUI.py:2089 appGUI/MainGUI.py:4513
 #: appGUI/ObjectUI.py:125
@@ -1965,12 +1965,12 @@ msgstr "Inclinar"
 msgid "Scale"
 msgstr "Redimensionar"
 
-#: appEditors/FlatCAMGeoEditor.py:610 appEditors/FlatCAMGrbEditor.py:5303
+#: appEditors/appGeoEditor.py:610 appEditors/FlatCAMGrbEditor.py:5303
 #: appTools/ToolTransform.py:30
 msgid "Mirror (Flip)"
 msgstr "Espelhar (Flip)"
 
-#: appEditors/FlatCAMGeoEditor.py:612 appEditors/FlatCAMGrbEditor.py:2647
+#: appEditors/appGeoEditor.py:612 appEditors/FlatCAMGrbEditor.py:2647
 #: appEditors/FlatCAMGrbEditor.py:5305 appGUI/MainGUI.py:1055
 #: appGUI/MainGUI.py:1454 appGUI/MainGUI.py:1497 appGUI/MainGUI.py:2087
 #: appGUI/MainGUI.py:4511
@@ -1979,7 +1979,7 @@ msgstr "Espelhar (Flip)"
 msgid "Buffer"
 msgstr "Buffer"
 
-#: appEditors/FlatCAMGeoEditor.py:643 appEditors/FlatCAMGrbEditor.py:5336
+#: appEditors/appGeoEditor.py:643 appEditors/FlatCAMGrbEditor.py:5336
 #: appGUI/GUIElements.py:2701
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:169
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:44
@@ -1988,7 +1988,7 @@ msgstr "Buffer"
 msgid "Reference"
 msgstr "Referência"
 
-#: appEditors/FlatCAMGeoEditor.py:645 appEditors/FlatCAMGrbEditor.py:5338
+#: appEditors/appGeoEditor.py:645 appEditors/FlatCAMGrbEditor.py:5338
 msgid ""
 "The reference point for Rotate, Skew, Scale, Mirror.\n"
 "Can be:\n"
@@ -2005,14 +2005,14 @@ msgstr ""
 "- Ponto -> um ponto personalizado definido pelas coordenadas X, Y\n"
 "- Seleção mínima -> o ponto (minx, miny) da caixa delimitadora da seleção"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
 #: appTools/ToolCalibration.py:770 appTools/ToolCalibration.py:771
 #: appTools/ToolTransform.py:70
 msgid "Origin"
 msgstr "Origem"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGeoEditor.py:1044
+#: appEditors/appGeoEditor.py:653 appEditors/appGeoEditor.py:1044
 #: appEditors/FlatCAMGrbEditor.py:5346 appEditors/FlatCAMGrbEditor.py:5737
 #: appGUI/preferences/general/GeneralGUIPrefGroupUI.py:250
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:275
@@ -2024,7 +2024,7 @@ msgstr "Origem"
 msgid "Selection"
 msgstr "Seleção"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 #: appGUI/preferences/tools/Tools2sidedPrefGroupUI.py:80
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:60
@@ -2032,11 +2032,11 @@ msgstr "Seleção"
 msgid "Point"
 msgstr "Ponto"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 msgid "Minimum"
 msgstr "Mínimo"
 
-#: appEditors/FlatCAMGeoEditor.py:659 appEditors/FlatCAMGeoEditor.py:955
+#: appEditors/appGeoEditor.py:659 appEditors/appGeoEditor.py:955
 #: appEditors/FlatCAMGrbEditor.py:5352 appEditors/FlatCAMGrbEditor.py:5648
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:131
 #: appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py:133
@@ -2047,13 +2047,13 @@ msgstr "Mínimo"
 msgid "Value"
 msgstr "Valor"
 
-#: appEditors/FlatCAMGeoEditor.py:661 appEditors/FlatCAMGrbEditor.py:5354
+#: appEditors/appGeoEditor.py:661 appEditors/FlatCAMGrbEditor.py:5354
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:62
 #: appTools/ToolTransform.py:78
 msgid "A point of reference in format X,Y."
 msgstr "Um ponto de referência no formato X,Y."
 
-#: appEditors/FlatCAMGeoEditor.py:668 appEditors/FlatCAMGrbEditor.py:2590
+#: appEditors/appGeoEditor.py:668 appEditors/FlatCAMGrbEditor.py:2590
 #: appEditors/FlatCAMGrbEditor.py:5361 appGUI/ObjectUI.py:1494
 #: appTools/ToolDblSided.py:192 appTools/ToolDblSided.py:425
 #: appTools/ToolIsolation.py:276 appTools/ToolIsolation.py:631
@@ -2064,12 +2064,12 @@ msgstr "Um ponto de referência no formato X,Y."
 msgid "Add"
 msgstr "Adicionar"
 
-#: appEditors/FlatCAMGeoEditor.py:670 appEditors/FlatCAMGrbEditor.py:5363
+#: appEditors/appGeoEditor.py:670 appEditors/FlatCAMGrbEditor.py:5363
 #: appTools/ToolTransform.py:87
 msgid "Add point coordinates from clipboard."
 msgstr "Coordenadas copiadas da área de transferência."
 
-#: appEditors/FlatCAMGeoEditor.py:685 appEditors/FlatCAMGrbEditor.py:5378
+#: appEditors/appGeoEditor.py:685 appEditors/FlatCAMGrbEditor.py:5378
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:98
 #: appTools/ToolTransform.py:132
 msgid ""
@@ -2083,7 +2083,7 @@ msgstr ""
 "Números positivos para movimento horário. \n"
 "Números negativos para movimento anti-horário."
 
-#: appEditors/FlatCAMGeoEditor.py:701 appEditors/FlatCAMGrbEditor.py:5394
+#: appEditors/appGeoEditor.py:701 appEditors/FlatCAMGrbEditor.py:5394
 #: appTools/ToolTransform.py:148
 msgid ""
 "Rotate the selected object(s).\n"
@@ -2094,7 +2094,7 @@ msgstr ""
 "O ponto de referência é o meio da\n"
 "caixa delimitadora para todos os objetos selecionados."
 
-#: appEditors/FlatCAMGeoEditor.py:721 appEditors/FlatCAMGeoEditor.py:783
+#: appEditors/appGeoEditor.py:721 appEditors/appGeoEditor.py:783
 #: appEditors/FlatCAMGrbEditor.py:5414 appEditors/FlatCAMGrbEditor.py:5476
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:112
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:151
@@ -2102,7 +2102,7 @@ msgstr ""
 msgid "Link"
 msgstr "Fixar Taxa"
 
-#: appEditors/FlatCAMGeoEditor.py:723 appEditors/FlatCAMGeoEditor.py:785
+#: appEditors/appGeoEditor.py:723 appEditors/appGeoEditor.py:785
 #: appEditors/FlatCAMGrbEditor.py:5416 appEditors/FlatCAMGrbEditor.py:5478
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:114
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:153
@@ -2110,14 +2110,14 @@ msgstr "Fixar Taxa"
 msgid "Link the Y entry to X entry and copy its content."
 msgstr "Vincula a entrada Y à entrada X e copia seu conteúdo."
 
-#: appEditors/FlatCAMGeoEditor.py:728 appEditors/FlatCAMGrbEditor.py:5421
+#: appEditors/appGeoEditor.py:728 appEditors/FlatCAMGrbEditor.py:5421
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:151
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:124
 #: appTools/ToolFilm.py:184 appTools/ToolTransform.py:175
 msgid "X angle"
 msgstr "Ângulo X"
 
-#: appEditors/FlatCAMGeoEditor.py:730 appEditors/FlatCAMGeoEditor.py:751
+#: appEditors/appGeoEditor.py:730 appEditors/appGeoEditor.py:751
 #: appEditors/FlatCAMGrbEditor.py:5423 appEditors/FlatCAMGrbEditor.py:5444
 #: appTools/ToolTransform.py:177 appTools/ToolTransform.py:198
 msgid ""
@@ -2127,12 +2127,12 @@ msgstr ""
 "Ângulo de inclinação, em graus.\n"
 "Número flutuante entre -360 e 360."
 
-#: appEditors/FlatCAMGeoEditor.py:738 appEditors/FlatCAMGrbEditor.py:5431
+#: appEditors/appGeoEditor.py:738 appEditors/FlatCAMGrbEditor.py:5431
 #: appTools/ToolTransform.py:185
 msgid "Skew X"
 msgstr "Inclinar X"
 
-#: appEditors/FlatCAMGeoEditor.py:740 appEditors/FlatCAMGeoEditor.py:761
+#: appEditors/appGeoEditor.py:740 appEditors/appGeoEditor.py:761
 #: appEditors/FlatCAMGrbEditor.py:5433 appEditors/FlatCAMGrbEditor.py:5454
 #: appTools/ToolTransform.py:187 appTools/ToolTransform.py:208
 msgid ""
@@ -2144,37 +2144,37 @@ msgstr ""
 "O ponto de referência é o meio da\n"
 "caixa delimitadora para todos os objetos selecionados."
 
-#: appEditors/FlatCAMGeoEditor.py:749 appEditors/FlatCAMGrbEditor.py:5442
+#: appEditors/appGeoEditor.py:749 appEditors/FlatCAMGrbEditor.py:5442
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:160
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:138
 #: appTools/ToolFilm.py:193 appTools/ToolTransform.py:196
 msgid "Y angle"
 msgstr "Ângulo Y"
 
-#: appEditors/FlatCAMGeoEditor.py:759 appEditors/FlatCAMGrbEditor.py:5452
+#: appEditors/appGeoEditor.py:759 appEditors/FlatCAMGrbEditor.py:5452
 #: appTools/ToolTransform.py:206
 msgid "Skew Y"
 msgstr "Inclinar Y"
 
-#: appEditors/FlatCAMGeoEditor.py:790 appEditors/FlatCAMGrbEditor.py:5483
+#: appEditors/appGeoEditor.py:790 appEditors/FlatCAMGrbEditor.py:5483
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:120
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:162
 #: appTools/ToolFilm.py:145 appTools/ToolTransform.py:237
 msgid "X factor"
 msgstr "Fator X"
 
-#: appEditors/FlatCAMGeoEditor.py:792 appEditors/FlatCAMGrbEditor.py:5485
+#: appEditors/appGeoEditor.py:792 appEditors/FlatCAMGrbEditor.py:5485
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:164
 #: appTools/ToolTransform.py:239
 msgid "Factor for scaling on X axis."
 msgstr "Fator para redimensionamento no eixo X."
 
-#: appEditors/FlatCAMGeoEditor.py:799 appEditors/FlatCAMGrbEditor.py:5492
+#: appEditors/appGeoEditor.py:799 appEditors/FlatCAMGrbEditor.py:5492
 #: appTools/ToolTransform.py:246
 msgid "Scale X"
 msgstr "Redimensionar X"
 
-#: appEditors/FlatCAMGeoEditor.py:801 appEditors/FlatCAMGeoEditor.py:821
+#: appEditors/appGeoEditor.py:801 appEditors/appGeoEditor.py:821
 #: appEditors/FlatCAMGrbEditor.py:5494 appEditors/FlatCAMGrbEditor.py:5514
 #: appTools/ToolTransform.py:248 appTools/ToolTransform.py:268
 msgid ""
@@ -2186,58 +2186,58 @@ msgstr ""
 "O ponto de referência depende\n"
 "do estado da caixa de seleção Escala de referência."
 
-#: appEditors/FlatCAMGeoEditor.py:810 appEditors/FlatCAMGrbEditor.py:5503
+#: appEditors/appGeoEditor.py:810 appEditors/FlatCAMGrbEditor.py:5503
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:129
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:175
 #: appTools/ToolFilm.py:154 appTools/ToolTransform.py:257
 msgid "Y factor"
 msgstr "Fator Y"
 
-#: appEditors/FlatCAMGeoEditor.py:812 appEditors/FlatCAMGrbEditor.py:5505
+#: appEditors/appGeoEditor.py:812 appEditors/FlatCAMGrbEditor.py:5505
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:177
 #: appTools/ToolTransform.py:259
 msgid "Factor for scaling on Y axis."
 msgstr "Fator para redimensionamento no eixo Y."
 
-#: appEditors/FlatCAMGeoEditor.py:819 appEditors/FlatCAMGrbEditor.py:5512
+#: appEditors/appGeoEditor.py:819 appEditors/FlatCAMGrbEditor.py:5512
 #: appTools/ToolTransform.py:266
 msgid "Scale Y"
 msgstr "Redimensionar Y"
 
-#: appEditors/FlatCAMGeoEditor.py:846 appEditors/FlatCAMGrbEditor.py:5539
+#: appEditors/appGeoEditor.py:846 appEditors/FlatCAMGrbEditor.py:5539
 #: appTools/ToolTransform.py:293
 msgid "Flip on X"
 msgstr "Espelhar no X"
 
-#: appEditors/FlatCAMGeoEditor.py:848 appEditors/FlatCAMGeoEditor.py:853
+#: appEditors/appGeoEditor.py:848 appEditors/appGeoEditor.py:853
 #: appEditors/FlatCAMGrbEditor.py:5541 appEditors/FlatCAMGrbEditor.py:5546
 #: appTools/ToolTransform.py:295 appTools/ToolTransform.py:300
 msgid "Flip the selected object(s) over the X axis."
 msgstr "Espelha o(s) objeto(s) selecionado(s) no eixo X."
 
-#: appEditors/FlatCAMGeoEditor.py:851 appEditors/FlatCAMGrbEditor.py:5544
+#: appEditors/appGeoEditor.py:851 appEditors/FlatCAMGrbEditor.py:5544
 #: appTools/ToolTransform.py:298
 msgid "Flip on Y"
 msgstr "Espelhar no Y"
 
-#: appEditors/FlatCAMGeoEditor.py:871 appEditors/FlatCAMGrbEditor.py:5564
+#: appEditors/appGeoEditor.py:871 appEditors/FlatCAMGrbEditor.py:5564
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:191
 #: appTools/ToolTransform.py:318
 msgid "X val"
 msgstr "X"
 
-#: appEditors/FlatCAMGeoEditor.py:873 appEditors/FlatCAMGrbEditor.py:5566
+#: appEditors/appGeoEditor.py:873 appEditors/FlatCAMGrbEditor.py:5566
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:193
 #: appTools/ToolTransform.py:320
 msgid "Distance to offset on X axis. In current units."
 msgstr "Distância para deslocar no eixo X, nas unidades atuais."
 
-#: appEditors/FlatCAMGeoEditor.py:880 appEditors/FlatCAMGrbEditor.py:5573
+#: appEditors/appGeoEditor.py:880 appEditors/FlatCAMGrbEditor.py:5573
 #: appTools/ToolTransform.py:327
 msgid "Offset X"
 msgstr "Deslocar X"
 
-#: appEditors/FlatCAMGeoEditor.py:882 appEditors/FlatCAMGeoEditor.py:902
+#: appEditors/appGeoEditor.py:882 appEditors/appGeoEditor.py:902
 #: appEditors/FlatCAMGrbEditor.py:5575 appEditors/FlatCAMGrbEditor.py:5595
 #: appTools/ToolTransform.py:329 appTools/ToolTransform.py:349
 msgid ""
@@ -2249,31 +2249,31 @@ msgstr ""
 "O ponto de referência é o meio da\n"
 "caixa delimitadora para todos os objetos selecionados.\n"
 
-#: appEditors/FlatCAMGeoEditor.py:891 appEditors/FlatCAMGrbEditor.py:5584
+#: appEditors/appGeoEditor.py:891 appEditors/FlatCAMGrbEditor.py:5584
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:204
 #: appTools/ToolTransform.py:338
 msgid "Y val"
 msgstr "Y"
 
-#: appEditors/FlatCAMGeoEditor.py:893 appEditors/FlatCAMGrbEditor.py:5586
+#: appEditors/appGeoEditor.py:893 appEditors/FlatCAMGrbEditor.py:5586
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:206
 #: appTools/ToolTransform.py:340
 msgid "Distance to offset on Y axis. In current units."
 msgstr "Distância para deslocar no eixo Y, nas unidades atuais."
 
-#: appEditors/FlatCAMGeoEditor.py:900 appEditors/FlatCAMGrbEditor.py:5593
+#: appEditors/appGeoEditor.py:900 appEditors/FlatCAMGrbEditor.py:5593
 #: appTools/ToolTransform.py:347
 msgid "Offset Y"
 msgstr "Deslocar Y"
 
-#: appEditors/FlatCAMGeoEditor.py:920 appEditors/FlatCAMGrbEditor.py:5613
+#: appEditors/appGeoEditor.py:920 appEditors/FlatCAMGrbEditor.py:5613
 #: appGUI/preferences/tools/Tools2QRCodePrefGroupUI.py:142
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:216
 #: appTools/ToolQRCode.py:206 appTools/ToolTransform.py:367
 msgid "Rounded"
 msgstr "Arredondado"
 
-#: appEditors/FlatCAMGeoEditor.py:922 appEditors/FlatCAMGrbEditor.py:5615
+#: appEditors/appGeoEditor.py:922 appEditors/FlatCAMGrbEditor.py:5615
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:218
 #: appTools/ToolTransform.py:369
 msgid ""
@@ -2287,14 +2287,14 @@ msgstr ""
 "Se não marcado, o buffer seguirá a geometria exata\n"
 "da forma em buffer."
 
-#: appEditors/FlatCAMGeoEditor.py:930 appEditors/FlatCAMGrbEditor.py:5623
+#: appEditors/appGeoEditor.py:930 appEditors/FlatCAMGrbEditor.py:5623
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:226
 #: appTools/ToolDistance.py:505 appTools/ToolDistanceMin.py:286
 #: appTools/ToolTransform.py:377
 msgid "Distance"
 msgstr "Distância"
 
-#: appEditors/FlatCAMGeoEditor.py:932 appEditors/FlatCAMGrbEditor.py:5625
+#: appEditors/appGeoEditor.py:932 appEditors/FlatCAMGrbEditor.py:5625
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:228
 #: appTools/ToolTransform.py:379
 msgid ""
@@ -2308,12 +2308,12 @@ msgstr ""
 "Cada elemento geométrico do objeto será aumentado\n"
 "ou diminuiu com a 'distância'."
 
-#: appEditors/FlatCAMGeoEditor.py:944 appEditors/FlatCAMGrbEditor.py:5637
+#: appEditors/appGeoEditor.py:944 appEditors/FlatCAMGrbEditor.py:5637
 #: appTools/ToolTransform.py:391
 msgid "Buffer D"
 msgstr "Buffer D"
 
-#: appEditors/FlatCAMGeoEditor.py:946 appEditors/FlatCAMGrbEditor.py:5639
+#: appEditors/appGeoEditor.py:946 appEditors/FlatCAMGrbEditor.py:5639
 #: appTools/ToolTransform.py:393
 msgid ""
 "Create the buffer effect on each geometry,\n"
@@ -2322,7 +2322,7 @@ msgstr ""
 "Crie o efeito de buffer em cada geometria,\n"
 "elemento do objeto selecionado, usando a distância."
 
-#: appEditors/FlatCAMGeoEditor.py:957 appEditors/FlatCAMGrbEditor.py:5650
+#: appEditors/appGeoEditor.py:957 appEditors/FlatCAMGrbEditor.py:5650
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:245
 #: appTools/ToolTransform.py:404
 msgid ""
@@ -2338,12 +2338,12 @@ msgstr ""
 "ou diminuído com a 'distância'. Esse valor é um\n"
 "percentual da dimensão inicial."
 
-#: appEditors/FlatCAMGeoEditor.py:970 appEditors/FlatCAMGrbEditor.py:5663
+#: appEditors/appGeoEditor.py:970 appEditors/FlatCAMGrbEditor.py:5663
 #: appTools/ToolTransform.py:417
 msgid "Buffer F"
 msgstr "Buffer F"
 
-#: appEditors/FlatCAMGeoEditor.py:972 appEditors/FlatCAMGrbEditor.py:5665
+#: appEditors/appGeoEditor.py:972 appEditors/FlatCAMGrbEditor.py:5665
 #: appTools/ToolTransform.py:419
 msgid ""
 "Create the buffer effect on each geometry,\n"
@@ -2352,7 +2352,7 @@ msgstr ""
 "Crie o efeito de buffer em cada geometria,\n"
 "elemento do objeto selecionado, usando o fator."
 
-#: appEditors/FlatCAMGeoEditor.py:1043 appEditors/FlatCAMGrbEditor.py:5736
+#: appEditors/appGeoEditor.py:1043 appEditors/FlatCAMGrbEditor.py:5736
 #: appGUI/ObjectUI.py:1103 appGUI/ObjectUI.py:1958
 #: appGUI/preferences/tools/Tools2CalPrefGroupUI.py:48
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
@@ -2363,327 +2363,327 @@ msgstr ""
 msgid "Object"
 msgstr "Objeto"
 
-#: appEditors/FlatCAMGeoEditor.py:1107 appEditors/FlatCAMGeoEditor.py:1130
-#: appEditors/FlatCAMGeoEditor.py:1276 appEditors/FlatCAMGeoEditor.py:1301
-#: appEditors/FlatCAMGeoEditor.py:1335 appEditors/FlatCAMGeoEditor.py:1370
-#: appEditors/FlatCAMGeoEditor.py:1401 appEditors/FlatCAMGrbEditor.py:5800
+#: appEditors/appGeoEditor.py:1107 appEditors/appGeoEditor.py:1130
+#: appEditors/appGeoEditor.py:1276 appEditors/appGeoEditor.py:1301
+#: appEditors/appGeoEditor.py:1335 appEditors/appGeoEditor.py:1370
+#: appEditors/appGeoEditor.py:1401 appEditors/FlatCAMGrbEditor.py:5800
 #: appEditors/FlatCAMGrbEditor.py:5823 appEditors/FlatCAMGrbEditor.py:5968
 #: appEditors/FlatCAMGrbEditor.py:6001 appEditors/FlatCAMGrbEditor.py:6044
 #: appEditors/FlatCAMGrbEditor.py:6085 appEditors/FlatCAMGrbEditor.py:6121
 msgid "No shape selected."
 msgstr "Nenhuma forma selecionada."
 
-#: appEditors/FlatCAMGeoEditor.py:1115 appEditors/FlatCAMGrbEditor.py:5808
+#: appEditors/appGeoEditor.py:1115 appEditors/FlatCAMGrbEditor.py:5808
 #: appTools/ToolTransform.py:585
 msgid "Incorrect format for Point value. Needs format X,Y"
 msgstr "Formato incorreto para o ponto. Precisa ser no formato X, Y"
 
-#: appEditors/FlatCAMGeoEditor.py:1140 appEditors/FlatCAMGrbEditor.py:5833
+#: appEditors/appGeoEditor.py:1140 appEditors/FlatCAMGrbEditor.py:5833
 #: appTools/ToolTransform.py:602
 msgid "Rotate transformation can not be done for a value of 0."
 msgstr "A rotação não pode ser feita para um valor 0."
 
-#: appEditors/FlatCAMGeoEditor.py:1198 appEditors/FlatCAMGeoEditor.py:1219
+#: appEditors/appGeoEditor.py:1198 appEditors/appGeoEditor.py:1219
 #: appEditors/FlatCAMGrbEditor.py:5891 appEditors/FlatCAMGrbEditor.py:5912
 #: appTools/ToolTransform.py:660 appTools/ToolTransform.py:681
 msgid "Scale transformation can not be done for a factor of 0 or 1."
 msgstr "O redimensionamento não pode ser feito para um fator 0 ou 1."
 
-#: appEditors/FlatCAMGeoEditor.py:1232 appEditors/FlatCAMGeoEditor.py:1241
+#: appEditors/appGeoEditor.py:1232 appEditors/appGeoEditor.py:1241
 #: appEditors/FlatCAMGrbEditor.py:5925 appEditors/FlatCAMGrbEditor.py:5934
 #: appTools/ToolTransform.py:694 appTools/ToolTransform.py:703
 msgid "Offset transformation can not be done for a value of 0."
 msgstr "O deslocamento não pode ser feito para um valor 0."
 
-#: appEditors/FlatCAMGeoEditor.py:1271 appEditors/FlatCAMGrbEditor.py:5971
+#: appEditors/appGeoEditor.py:1271 appEditors/FlatCAMGrbEditor.py:5971
 #: appTools/ToolTransform.py:731
 msgid "Appying Rotate"
 msgstr "Aplicando Girar"
 
-#: appEditors/FlatCAMGeoEditor.py:1284 appEditors/FlatCAMGrbEditor.py:5983
+#: appEditors/appGeoEditor.py:1284 appEditors/FlatCAMGrbEditor.py:5983
 msgid "Done. Rotate completed."
 msgstr "Girar concluído."
 
-#: appEditors/FlatCAMGeoEditor.py:1286
+#: appEditors/appGeoEditor.py:1286
 msgid "Rotation action was not executed"
 msgstr "O giro não foi executado"
 
-#: appEditors/FlatCAMGeoEditor.py:1304 appEditors/FlatCAMGrbEditor.py:6004
+#: appEditors/appGeoEditor.py:1304 appEditors/FlatCAMGrbEditor.py:6004
 #: appTools/ToolTransform.py:757
 msgid "Applying Flip"
 msgstr "Aplicando Espelhamento"
 
-#: appEditors/FlatCAMGeoEditor.py:1312 appEditors/FlatCAMGrbEditor.py:6016
+#: appEditors/appGeoEditor.py:1312 appEditors/FlatCAMGrbEditor.py:6016
 #: appTools/ToolTransform.py:774
 msgid "Flip on the Y axis done"
 msgstr "Concluído o espelhamento no eixo Y"
 
-#: appEditors/FlatCAMGeoEditor.py:1315 appEditors/FlatCAMGrbEditor.py:6024
+#: appEditors/appGeoEditor.py:1315 appEditors/FlatCAMGrbEditor.py:6024
 #: appTools/ToolTransform.py:783
 msgid "Flip on the X axis done"
 msgstr "Concluído o espelhamento no eixo Y"
 
-#: appEditors/FlatCAMGeoEditor.py:1319
+#: appEditors/appGeoEditor.py:1319
 msgid "Flip action was not executed"
 msgstr "O espelhamento não foi executado"
 
-#: appEditors/FlatCAMGeoEditor.py:1338 appEditors/FlatCAMGrbEditor.py:6047
+#: appEditors/appGeoEditor.py:1338 appEditors/FlatCAMGrbEditor.py:6047
 #: appTools/ToolTransform.py:804
 msgid "Applying Skew"
 msgstr "Inclinando"
 
-#: appEditors/FlatCAMGeoEditor.py:1347 appEditors/FlatCAMGrbEditor.py:6063
+#: appEditors/appGeoEditor.py:1347 appEditors/FlatCAMGrbEditor.py:6063
 msgid "Skew on the X axis done"
 msgstr "Inclinação no eixo X concluída"
 
-#: appEditors/FlatCAMGeoEditor.py:1349 appEditors/FlatCAMGrbEditor.py:6065
+#: appEditors/appGeoEditor.py:1349 appEditors/FlatCAMGrbEditor.py:6065
 msgid "Skew on the Y axis done"
 msgstr "Inclinação no eixo Y concluída"
 
-#: appEditors/FlatCAMGeoEditor.py:1352
+#: appEditors/appGeoEditor.py:1352
 msgid "Skew action was not executed"
 msgstr "A inclinação não foi executada"
 
-#: appEditors/FlatCAMGeoEditor.py:1373 appEditors/FlatCAMGrbEditor.py:6088
+#: appEditors/appGeoEditor.py:1373 appEditors/FlatCAMGrbEditor.py:6088
 #: appTools/ToolTransform.py:831
 msgid "Applying Scale"
 msgstr "Redimensionando"
 
-#: appEditors/FlatCAMGeoEditor.py:1382 appEditors/FlatCAMGrbEditor.py:6101
+#: appEditors/appGeoEditor.py:1382 appEditors/FlatCAMGrbEditor.py:6101
 msgid "Scale on the X axis done"
 msgstr "Redimensionamento no eixo X concluído"
 
-#: appEditors/FlatCAMGeoEditor.py:1384 appEditors/FlatCAMGrbEditor.py:6103
+#: appEditors/appGeoEditor.py:1384 appEditors/FlatCAMGrbEditor.py:6103
 msgid "Scale on the Y axis done"
 msgstr "Redimensionamento no eixo Y concluído"
 
-#: appEditors/FlatCAMGeoEditor.py:1386
+#: appEditors/appGeoEditor.py:1386
 msgid "Scale action was not executed"
 msgstr "O redimensionamento não foi executado"
 
-#: appEditors/FlatCAMGeoEditor.py:1404 appEditors/FlatCAMGrbEditor.py:6124
+#: appEditors/appGeoEditor.py:1404 appEditors/FlatCAMGrbEditor.py:6124
 #: appTools/ToolTransform.py:859
 msgid "Applying Offset"
 msgstr "Deslocando"
 
-#: appEditors/FlatCAMGeoEditor.py:1414 appEditors/FlatCAMGrbEditor.py:6145
+#: appEditors/appGeoEditor.py:1414 appEditors/FlatCAMGrbEditor.py:6145
 msgid "Offset on the X axis done"
 msgstr "Deslocamento no eixo X concluído"
 
-#: appEditors/FlatCAMGeoEditor.py:1416 appEditors/FlatCAMGrbEditor.py:6147
+#: appEditors/appGeoEditor.py:1416 appEditors/FlatCAMGrbEditor.py:6147
 msgid "Offset on the Y axis done"
 msgstr "Deslocamento no eixo Y concluído"
 
-#: appEditors/FlatCAMGeoEditor.py:1419
+#: appEditors/appGeoEditor.py:1419
 msgid "Offset action was not executed"
 msgstr "O deslocamento não foi executado"
 
-#: appEditors/FlatCAMGeoEditor.py:1426 appEditors/FlatCAMGrbEditor.py:6157
+#: appEditors/appGeoEditor.py:1426 appEditors/FlatCAMGrbEditor.py:6157
 msgid "No shape selected"
 msgstr "Nenhuma forma selecionada"
 
-#: appEditors/FlatCAMGeoEditor.py:1429 appEditors/FlatCAMGrbEditor.py:6160
+#: appEditors/appGeoEditor.py:1429 appEditors/FlatCAMGrbEditor.py:6160
 #: appTools/ToolTransform.py:889
 msgid "Applying Buffer"
 msgstr "Aplicando Buffer"
 
-#: appEditors/FlatCAMGeoEditor.py:1436 appEditors/FlatCAMGrbEditor.py:6182
+#: appEditors/appGeoEditor.py:1436 appEditors/FlatCAMGrbEditor.py:6182
 #: appTools/ToolTransform.py:910
 msgid "Buffer done"
 msgstr "Buffer concluído"
 
-#: appEditors/FlatCAMGeoEditor.py:1440 appEditors/FlatCAMGrbEditor.py:6186
+#: appEditors/appGeoEditor.py:1440 appEditors/FlatCAMGrbEditor.py:6186
 #: appTools/ToolTransform.py:879 appTools/ToolTransform.py:915
 msgid "Action was not executed, due of"
 msgstr "A ação não foi realizada. devido"
 
-#: appEditors/FlatCAMGeoEditor.py:1444 appEditors/FlatCAMGrbEditor.py:6190
+#: appEditors/appGeoEditor.py:1444 appEditors/FlatCAMGrbEditor.py:6190
 msgid "Rotate ..."
 msgstr "Girar ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1445 appEditors/FlatCAMGeoEditor.py:1494
-#: appEditors/FlatCAMGeoEditor.py:1509 appEditors/FlatCAMGrbEditor.py:6191
+#: appEditors/appGeoEditor.py:1445 appEditors/appGeoEditor.py:1494
+#: appEditors/appGeoEditor.py:1509 appEditors/FlatCAMGrbEditor.py:6191
 #: appEditors/FlatCAMGrbEditor.py:6240 appEditors/FlatCAMGrbEditor.py:6255
 msgid "Enter an Angle Value (degrees)"
 msgstr "Digite um valor para o ângulo (graus)"
 
-#: appEditors/FlatCAMGeoEditor.py:1453 appEditors/FlatCAMGrbEditor.py:6199
+#: appEditors/appGeoEditor.py:1453 appEditors/FlatCAMGrbEditor.py:6199
 msgid "Geometry shape rotate done"
 msgstr "Rotação da geometria concluída"
 
-#: appEditors/FlatCAMGeoEditor.py:1456 appEditors/FlatCAMGrbEditor.py:6202
+#: appEditors/appGeoEditor.py:1456 appEditors/FlatCAMGrbEditor.py:6202
 msgid "Geometry shape rotate cancelled"
 msgstr "Rotação da geometria cancelada"
 
-#: appEditors/FlatCAMGeoEditor.py:1461 appEditors/FlatCAMGrbEditor.py:6207
+#: appEditors/appGeoEditor.py:1461 appEditors/FlatCAMGrbEditor.py:6207
 msgid "Offset on X axis ..."
 msgstr "Deslocamento no eixo X ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1462 appEditors/FlatCAMGeoEditor.py:1479
+#: appEditors/appGeoEditor.py:1462 appEditors/appGeoEditor.py:1479
 #: appEditors/FlatCAMGrbEditor.py:6208 appEditors/FlatCAMGrbEditor.py:6225
 msgid "Enter a distance Value"
 msgstr "Digite um valor para a distância"
 
-#: appEditors/FlatCAMGeoEditor.py:1470 appEditors/FlatCAMGrbEditor.py:6216
+#: appEditors/appGeoEditor.py:1470 appEditors/FlatCAMGrbEditor.py:6216
 msgid "Geometry shape offset on X axis done"
 msgstr "Deslocamento da forma no eixo X concluído"
 
-#: appEditors/FlatCAMGeoEditor.py:1473 appEditors/FlatCAMGrbEditor.py:6219
+#: appEditors/appGeoEditor.py:1473 appEditors/FlatCAMGrbEditor.py:6219
 msgid "Geometry shape offset X cancelled"
 msgstr "Deslocamento da forma no eixo X cancelado"
 
-#: appEditors/FlatCAMGeoEditor.py:1478 appEditors/FlatCAMGrbEditor.py:6224
+#: appEditors/appGeoEditor.py:1478 appEditors/FlatCAMGrbEditor.py:6224
 msgid "Offset on Y axis ..."
 msgstr "Deslocamento no eixo Y ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1487 appEditors/FlatCAMGrbEditor.py:6233
+#: appEditors/appGeoEditor.py:1487 appEditors/FlatCAMGrbEditor.py:6233
 msgid "Geometry shape offset on Y axis done"
 msgstr "Deslocamento da forma no eixo Y concluído"
 
-#: appEditors/FlatCAMGeoEditor.py:1490
+#: appEditors/appGeoEditor.py:1490
 msgid "Geometry shape offset on Y axis canceled"
 msgstr "Deslocamento da forma no eixo Y cancelado"
 
-#: appEditors/FlatCAMGeoEditor.py:1493 appEditors/FlatCAMGrbEditor.py:6239
+#: appEditors/appGeoEditor.py:1493 appEditors/FlatCAMGrbEditor.py:6239
 msgid "Skew on X axis ..."
 msgstr "Inclinação no eixo X ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1502 appEditors/FlatCAMGrbEditor.py:6248
+#: appEditors/appGeoEditor.py:1502 appEditors/FlatCAMGrbEditor.py:6248
 msgid "Geometry shape skew on X axis done"
 msgstr "Inclinação no eixo X concluída"
 
-#: appEditors/FlatCAMGeoEditor.py:1505
+#: appEditors/appGeoEditor.py:1505
 msgid "Geometry shape skew on X axis canceled"
 msgstr "Inclinação no eixo X cancelada"
 
-#: appEditors/FlatCAMGeoEditor.py:1508 appEditors/FlatCAMGrbEditor.py:6254
+#: appEditors/appGeoEditor.py:1508 appEditors/FlatCAMGrbEditor.py:6254
 msgid "Skew on Y axis ..."
 msgstr "Inclinação no eixo Y ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1517 appEditors/FlatCAMGrbEditor.py:6263
+#: appEditors/appGeoEditor.py:1517 appEditors/FlatCAMGrbEditor.py:6263
 msgid "Geometry shape skew on Y axis done"
 msgstr "Inclinação no eixo Y concluída"
 
-#: appEditors/FlatCAMGeoEditor.py:1520
+#: appEditors/appGeoEditor.py:1520
 msgid "Geometry shape skew on Y axis canceled"
 msgstr "Inclinação no eixo Y cancelada"
 
-#: appEditors/FlatCAMGeoEditor.py:1950 appEditors/FlatCAMGeoEditor.py:2021
+#: appEditors/appGeoEditor.py:1950 appEditors/appGeoEditor.py:2021
 #: appEditors/FlatCAMGrbEditor.py:1444 appEditors/FlatCAMGrbEditor.py:1522
 msgid "Click on Center point ..."
 msgstr "Clique no ponto central ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1963 appEditors/FlatCAMGrbEditor.py:1454
+#: appEditors/appGeoEditor.py:1963 appEditors/FlatCAMGrbEditor.py:1454
 msgid "Click on Perimeter point to complete ..."
 msgstr "Clique no ponto Perímetro para completar ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1995
+#: appEditors/appGeoEditor.py:1995
 msgid "Done. Adding Circle completed."
 msgstr "Círculo adicionado."
 
-#: appEditors/FlatCAMGeoEditor.py:2049 appEditors/FlatCAMGrbEditor.py:1555
+#: appEditors/appGeoEditor.py:2049 appEditors/FlatCAMGrbEditor.py:1555
 msgid "Click on Start point ..."
 msgstr "Clique no ponto inicial ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2051 appEditors/FlatCAMGrbEditor.py:1557
+#: appEditors/appGeoEditor.py:2051 appEditors/FlatCAMGrbEditor.py:1557
 msgid "Click on Point3 ..."
 msgstr "Clique no ponto 3 ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2053 appEditors/FlatCAMGrbEditor.py:1559
+#: appEditors/appGeoEditor.py:2053 appEditors/FlatCAMGrbEditor.py:1559
 msgid "Click on Stop point ..."
 msgstr "Clique no ponto de parada ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2058 appEditors/FlatCAMGrbEditor.py:1564
+#: appEditors/appGeoEditor.py:2058 appEditors/FlatCAMGrbEditor.py:1564
 msgid "Click on Stop point to complete ..."
 msgstr "Clique no ponto de parada para completar ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2060 appEditors/FlatCAMGrbEditor.py:1566
+#: appEditors/appGeoEditor.py:2060 appEditors/FlatCAMGrbEditor.py:1566
 msgid "Click on Point2 to complete ..."
 msgstr "Clique no ponto 2 para completar ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2062 appEditors/FlatCAMGrbEditor.py:1568
+#: appEditors/appGeoEditor.py:2062 appEditors/FlatCAMGrbEditor.py:1568
 msgid "Click on Center point to complete ..."
 msgstr "Clique no ponto central para completar ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2074
+#: appEditors/appGeoEditor.py:2074
 #, python-format
 msgid "Direction: %s"
 msgstr "Direção: %s"
 
-#: appEditors/FlatCAMGeoEditor.py:2088 appEditors/FlatCAMGrbEditor.py:1594
+#: appEditors/appGeoEditor.py:2088 appEditors/FlatCAMGrbEditor.py:1594
 msgid "Mode: Start -> Stop -> Center. Click on Start point ..."
 msgstr "Modo: Iniciar -> Parar -> Centro. Clique no ponto inicial ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2091 appEditors/FlatCAMGrbEditor.py:1597
+#: appEditors/appGeoEditor.py:2091 appEditors/FlatCAMGrbEditor.py:1597
 msgid "Mode: Point1 -> Point3 -> Point2. Click on Point1 ..."
 msgstr "Modo: Ponto 1 -> Ponto 3 -> Ponto 2. Clique no Ponto 1 ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2094 appEditors/FlatCAMGrbEditor.py:1600
+#: appEditors/appGeoEditor.py:2094 appEditors/FlatCAMGrbEditor.py:1600
 msgid "Mode: Center -> Start -> Stop. Click on Center point ..."
 msgstr "Modo: Centro -> Iniciar -> Parar. Clique no ponto central ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2235
+#: appEditors/appGeoEditor.py:2235
 msgid "Done. Arc completed."
 msgstr "Arco adicionado."
 
-#: appEditors/FlatCAMGeoEditor.py:2266 appEditors/FlatCAMGeoEditor.py:2339
+#: appEditors/appGeoEditor.py:2266 appEditors/appGeoEditor.py:2339
 msgid "Click on 1st corner ..."
 msgstr "Clique no primeiro canto ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2278
+#: appEditors/appGeoEditor.py:2278
 msgid "Click on opposite corner to complete ..."
 msgstr "Clique no canto oposto para completar ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2308
+#: appEditors/appGeoEditor.py:2308
 msgid "Done. Rectangle completed."
 msgstr "Retângulo adicionado."
 
-#: appEditors/FlatCAMGeoEditor.py:2383
+#: appEditors/appGeoEditor.py:2383
 msgid "Done. Polygon completed."
 msgstr "Polígono adicionado."
 
-#: appEditors/FlatCAMGeoEditor.py:2397 appEditors/FlatCAMGeoEditor.py:2462
+#: appEditors/appGeoEditor.py:2397 appEditors/appGeoEditor.py:2462
 #: appEditors/FlatCAMGrbEditor.py:1102 appEditors/FlatCAMGrbEditor.py:1322
 msgid "Backtracked one point ..."
 msgstr "Retrocedeu um ponto ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2440
+#: appEditors/appGeoEditor.py:2440
 msgid "Done. Path completed."
 msgstr "Caminho concluído."
 
-#: appEditors/FlatCAMGeoEditor.py:2599
+#: appEditors/appGeoEditor.py:2599
 msgid "No shape selected. Select a shape to explode"
 msgstr "Nenhuma forma selecionada. Selecione uma forma para explodir"
 
-#: appEditors/FlatCAMGeoEditor.py:2632
+#: appEditors/appGeoEditor.py:2632
 msgid "Done. Polygons exploded into lines."
 msgstr "Polígono explodido em linhas."
 
-#: appEditors/FlatCAMGeoEditor.py:2664
+#: appEditors/appGeoEditor.py:2664
 msgid "MOVE: No shape selected. Select a shape to move"
 msgstr "MOVER: Nenhuma forma selecionada. Selecione uma forma para mover"
 
-#: appEditors/FlatCAMGeoEditor.py:2667 appEditors/FlatCAMGeoEditor.py:2687
+#: appEditors/appGeoEditor.py:2667 appEditors/appGeoEditor.py:2687
 msgid " MOVE: Click on reference point ..."
 msgstr " MOVER: Clique no ponto de referência ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2672
+#: appEditors/appGeoEditor.py:2672
 msgid " Click on destination point ..."
 msgstr " Clique no ponto de destino ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2712
+#: appEditors/appGeoEditor.py:2712
 msgid "Done. Geometry(s) Move completed."
 msgstr "Movimento de Geometria(s) concluído."
 
-#: appEditors/FlatCAMGeoEditor.py:2845
+#: appEditors/appGeoEditor.py:2845
 msgid "Done. Geometry(s) Copy completed."
 msgstr "Geometria(s) copiada(s)."
 
-#: appEditors/FlatCAMGeoEditor.py:2876 appEditors/FlatCAMGrbEditor.py:897
+#: appEditors/appGeoEditor.py:2876 appEditors/FlatCAMGrbEditor.py:897
 msgid "Click on 1st point ..."
 msgstr "Clique no primeiro ponto ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2900
+#: appEditors/appGeoEditor.py:2900
 msgid ""
 "Font not supported. Only Regular, Bold, Italic and BoldItalic are supported. "
 "Error"
@@ -2691,83 +2691,83 @@ msgstr ""
 "Fonte não suportada. Apenas Regular, Bold, Italic e BoldItalic são "
 "suportados. Erro"
 
-#: appEditors/FlatCAMGeoEditor.py:2908
+#: appEditors/appGeoEditor.py:2908
 msgid "No text to add."
 msgstr "Nenhum texto para adicionar."
 
-#: appEditors/FlatCAMGeoEditor.py:2918
+#: appEditors/appGeoEditor.py:2918
 msgid " Done. Adding Text completed."
 msgstr " Texto adicionado."
 
-#: appEditors/FlatCAMGeoEditor.py:2955
+#: appEditors/appGeoEditor.py:2955
 msgid "Create buffer geometry ..."
 msgstr "Criar buffer de geometria ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2990 appEditors/FlatCAMGrbEditor.py:5153
+#: appEditors/appGeoEditor.py:2990 appEditors/FlatCAMGrbEditor.py:5153
 msgid "Done. Buffer Tool completed."
 msgstr "Buffer concluído."
 
-#: appEditors/FlatCAMGeoEditor.py:3018
+#: appEditors/appGeoEditor.py:3018
 msgid "Done. Buffer Int Tool completed."
 msgstr "Buffer Interno concluído."
 
-#: appEditors/FlatCAMGeoEditor.py:3046
+#: appEditors/appGeoEditor.py:3046
 msgid "Done. Buffer Ext Tool completed."
 msgstr "Buffer Externo concluído."
 
-#: appEditors/FlatCAMGeoEditor.py:3095 appEditors/FlatCAMGrbEditor.py:2160
+#: appEditors/appGeoEditor.py:3095 appEditors/FlatCAMGrbEditor.py:2160
 msgid "Select a shape to act as deletion area ..."
 msgstr "Selecione uma forma para atuar como área de exclusão ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3097 appEditors/FlatCAMGeoEditor.py:3123
-#: appEditors/FlatCAMGeoEditor.py:3129 appEditors/FlatCAMGrbEditor.py:2162
+#: appEditors/appGeoEditor.py:3097 appEditors/appGeoEditor.py:3123
+#: appEditors/appGeoEditor.py:3129 appEditors/FlatCAMGrbEditor.py:2162
 msgid "Click to pick-up the erase shape..."
 msgstr "Clique para pegar a forma a apagar ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3133 appEditors/FlatCAMGrbEditor.py:2221
+#: appEditors/appGeoEditor.py:3133 appEditors/FlatCAMGrbEditor.py:2221
 msgid "Click to erase ..."
 msgstr "Clique para apagar ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3162 appEditors/FlatCAMGrbEditor.py:2254
+#: appEditors/appGeoEditor.py:3162 appEditors/FlatCAMGrbEditor.py:2254
 msgid "Done. Eraser tool action completed."
 msgstr "Apagado."
 
-#: appEditors/FlatCAMGeoEditor.py:3212
+#: appEditors/appGeoEditor.py:3212
 msgid "Create Paint geometry ..."
 msgstr "Criar geometria de pintura ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3225 appEditors/FlatCAMGrbEditor.py:2417
+#: appEditors/appGeoEditor.py:3225 appEditors/FlatCAMGrbEditor.py:2417
 msgid "Shape transformations ..."
 msgstr "Transformações de forma ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3281
+#: appEditors/appGeoEditor.py:3281
 #: appGUI/preferences/geometry/GeometryEditorPrefGroupUI.py:27
 msgid "Geometry Editor"
 msgstr "Editor de Geometria"
 
-#: appEditors/FlatCAMGeoEditor.py:3287 appEditors/FlatCAMGrbEditor.py:2495
+#: appEditors/appGeoEditor.py:3287 appEditors/FlatCAMGrbEditor.py:2495
 #: appEditors/FlatCAMGrbEditor.py:3951 appGUI/ObjectUI.py:282
 #: appGUI/ObjectUI.py:1394 appGUI/ObjectUI.py:2256 appTools/ToolCutOut.py:95
 #: appTools/ToolTransform.py:92
 msgid "Type"
 msgstr "Tipo"
 
-#: appEditors/FlatCAMGeoEditor.py:3287 appGUI/ObjectUI.py:221
+#: appEditors/appGeoEditor.py:3287 appGUI/ObjectUI.py:221
 #: appGUI/ObjectUI.py:521 appGUI/ObjectUI.py:1330 appGUI/ObjectUI.py:2165
 #: appGUI/ObjectUI.py:2469 appGUI/ObjectUI.py:2536
 #: appTools/ToolCalibration.py:234 appTools/ToolFiducials.py:70
 msgid "Name"
 msgstr "Nome"
 
-#: appEditors/FlatCAMGeoEditor.py:3539
+#: appEditors/appGeoEditor.py:3539
 msgid "Ring"
 msgstr "Anel"
 
-#: appEditors/FlatCAMGeoEditor.py:3541
+#: appEditors/appGeoEditor.py:3541
 msgid "Line"
 msgstr "Linha"
 
-#: appEditors/FlatCAMGeoEditor.py:3543 appGUI/MainGUI.py:1446
+#: appEditors/appGeoEditor.py:3543 appGUI/MainGUI.py:1446
 #: appGUI/ObjectUI.py:1150 appGUI/ObjectUI.py:2005
 #: appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py:226
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:299
@@ -2778,47 +2778,47 @@ msgstr "Linha"
 msgid "Polygon"
 msgstr "Polígono"
 
-#: appEditors/FlatCAMGeoEditor.py:3545
+#: appEditors/appGeoEditor.py:3545
 msgid "Multi-Line"
 msgstr "Múlti-Linha"
 
-#: appEditors/FlatCAMGeoEditor.py:3547
+#: appEditors/appGeoEditor.py:3547
 msgid "Multi-Polygon"
 msgstr "Múlti-Polígono"
 
-#: appEditors/FlatCAMGeoEditor.py:3554
+#: appEditors/appGeoEditor.py:3554
 msgid "Geo Elem"
 msgstr "Elem Geo"
 
-#: appEditors/FlatCAMGeoEditor.py:4007
+#: appEditors/appGeoEditor.py:4007
 msgid "Editing MultiGeo Geometry, tool"
 msgstr "Editando Geometria MultiGeo, ferramenta"
 
-#: appEditors/FlatCAMGeoEditor.py:4009
+#: appEditors/appGeoEditor.py:4009
 msgid "with diameter"
 msgstr "com diâmetro"
 
-#: appEditors/FlatCAMGeoEditor.py:4081
+#: appEditors/appGeoEditor.py:4081
 msgid "Grid Snap enabled."
 msgstr "Encaixar à grade ativado."
 
-#: appEditors/FlatCAMGeoEditor.py:4085
+#: appEditors/appGeoEditor.py:4085
 msgid "Grid Snap disabled."
 msgstr "Encaixar à grade desativado."
 
-#: appEditors/FlatCAMGeoEditor.py:4446 appGUI/MainGUI.py:3046
+#: appEditors/appGeoEditor.py:4446 appGUI/MainGUI.py:3046
 #: appGUI/MainGUI.py:3092 appGUI/MainGUI.py:3110 appGUI/MainGUI.py:3254
 #: appGUI/MainGUI.py:3293 appGUI/MainGUI.py:3305 appGUI/MainGUI.py:3322
 msgid "Click on target point."
 msgstr "Clique no ponto alvo."
 
-#: appEditors/FlatCAMGeoEditor.py:4762 appEditors/FlatCAMGeoEditor.py:4797
+#: appEditors/appGeoEditor.py:4762 appEditors/appGeoEditor.py:4797
 msgid "A selection of at least 2 geo items is required to do Intersection."
 msgstr ""
 "É necessária uma seleção de pelo menos 2 itens geométricos para fazer a "
 "interseção."
 
-#: appEditors/FlatCAMGeoEditor.py:4883 appEditors/FlatCAMGeoEditor.py:4987
+#: appEditors/appGeoEditor.py:4883 appEditors/appGeoEditor.py:4987
 msgid ""
 "Negative buffer value is not accepted. Use Buffer interior to generate an "
 "'inside' shape"
@@ -2826,56 +2826,56 @@ msgstr ""
 "Valor de buffer negativo não é aceito. Use o Buffer interior para gerar uma "
 "forma 'interna'"
 
-#: appEditors/FlatCAMGeoEditor.py:4893 appEditors/FlatCAMGeoEditor.py:4946
-#: appEditors/FlatCAMGeoEditor.py:4996
+#: appEditors/appGeoEditor.py:4893 appEditors/appGeoEditor.py:4946
+#: appEditors/appGeoEditor.py:4996
 msgid "Nothing selected for buffering."
 msgstr "Nada selecionado para armazenamento em buffer."
 
-#: appEditors/FlatCAMGeoEditor.py:4898 appEditors/FlatCAMGeoEditor.py:4950
-#: appEditors/FlatCAMGeoEditor.py:5001
+#: appEditors/appGeoEditor.py:4898 appEditors/appGeoEditor.py:4950
+#: appEditors/appGeoEditor.py:5001
 msgid "Invalid distance for buffering."
 msgstr "Distância inválida para armazenamento em buffer."
 
-#: appEditors/FlatCAMGeoEditor.py:4922 appEditors/FlatCAMGeoEditor.py:5021
+#: appEditors/appGeoEditor.py:4922 appEditors/appGeoEditor.py:5021
 msgid "Failed, the result is empty. Choose a different buffer value."
 msgstr ""
 "Falhou, o resultado está vazio. Escolha um valor diferente para o buffer."
 
-#: appEditors/FlatCAMGeoEditor.py:4933
+#: appEditors/appGeoEditor.py:4933
 msgid "Full buffer geometry created."
 msgstr "Buffer de geometria completa criado."
 
-#: appEditors/FlatCAMGeoEditor.py:4939
+#: appEditors/appGeoEditor.py:4939
 msgid "Negative buffer value is not accepted."
 msgstr "Valor de buffer negativo não é aceito."
 
-#: appEditors/FlatCAMGeoEditor.py:4970
+#: appEditors/appGeoEditor.py:4970
 msgid "Failed, the result is empty. Choose a smaller buffer value."
 msgstr "Falhou, o resultado está vazio. Escolha um valor menor para o buffer."
 
-#: appEditors/FlatCAMGeoEditor.py:4980
+#: appEditors/appGeoEditor.py:4980
 msgid "Interior buffer geometry created."
 msgstr "Buffer de Geometria interna criado."
 
-#: appEditors/FlatCAMGeoEditor.py:5031
+#: appEditors/appGeoEditor.py:5031
 msgid "Exterior buffer geometry created."
 msgstr "Buffer de Geometria externa criado."
 
-#: appEditors/FlatCAMGeoEditor.py:5037
+#: appEditors/appGeoEditor.py:5037
 #, python-format
 msgid "Could not do Paint. Overlap value has to be less than 100%%."
 msgstr ""
 "Não foi possível Pintar. O valor de sobreposição deve ser menor do que 100%%."
 
-#: appEditors/FlatCAMGeoEditor.py:5044
+#: appEditors/appGeoEditor.py:5044
 msgid "Nothing selected for painting."
 msgstr "Nada selecionado para pintura."
 
-#: appEditors/FlatCAMGeoEditor.py:5050
+#: appEditors/appGeoEditor.py:5050
 msgid "Invalid value for"
 msgstr "Valor inválido para"
 
-#: appEditors/FlatCAMGeoEditor.py:5109
+#: appEditors/appGeoEditor.py:5109
 msgid ""
 "Could not do Paint. Try a different combination of parameters. Or a "
 "different method of Paint"
@@ -2883,7 +2883,7 @@ msgstr ""
 "Não foi possível pintar. Tente uma combinação diferente de parâmetros, ou um "
 "método diferente de Pintura"
 
-#: appEditors/FlatCAMGeoEditor.py:5120
+#: appEditors/appGeoEditor.py:5120
 msgid "Paint done."
 msgstr "Pintura concluída."
 
diff --git a/locale/ro/LC_MESSAGES/strings.po b/locale/ro/LC_MESSAGES/strings.po
index 19dc15cd..9acdeb90 100644
--- a/locale/ro/LC_MESSAGES/strings.po
+++ b/locale/ro/LC_MESSAGES/strings.po
@@ -177,7 +177,7 @@ msgstr ""
 "Zona adăugată. Faceți clic stanga pt a continua adăugarea de zone sau click "
 "dreapta pentru a termina."
 
-#: Common.py:322 appEditors/FlatCAMGeoEditor.py:2352
+#: Common.py:322 appEditors/appGeoEditor.py:2352
 #: appTools/ToolIsolation.py:2584 appTools/ToolNCC.py:1754
 #: appTools/ToolPaint.py:1647
 msgid "Click on next Point or click right mouse button to complete ..."
@@ -891,7 +891,7 @@ msgid "Conventional"
 msgstr "Convenţional"
 
 #: appDatabase.py:1456 appDatabase.py:1565 appDatabase.py:1667
-#: appEditors/FlatCAMGeoEditor.py:450
+#: appEditors/appGeoEditor.py:450
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:167
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:182
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:163
@@ -920,7 +920,7 @@ msgstr ""
 "Valori mari= procesare lentă cât și o execuţie la fel de lentă a PCB-ului,\n"
 "datorită numărului mai mare de treceri-tăiere."
 
-#: appDatabase.py:1477 appDatabase.py:1586 appEditors/FlatCAMGeoEditor.py:470
+#: appDatabase.py:1477 appDatabase.py:1586 appEditors/appGeoEditor.py:470
 #: appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py:72
 #: appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py:229
 #: appGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py:59
@@ -949,7 +949,7 @@ msgstr "Margine"
 msgid "Bounding box margin."
 msgstr "Marginea pentru forma înconjurătoare."
 
-#: appDatabase.py:1490 appDatabase.py:1601 appEditors/FlatCAMGeoEditor.py:484
+#: appDatabase.py:1490 appDatabase.py:1601 appEditors/appGeoEditor.py:484
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:105
 #: appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py:106
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:215
@@ -972,7 +972,7 @@ msgstr ""
 "- Punct-origine: înspre exterior porning de la punctul sămanță.\n"
 "- Linii: linii paralele."
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2232 appTools/ToolNCC.py:2764
@@ -982,8 +982,8 @@ msgstr ""
 msgid "Standard"
 msgstr "Standard"
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
-#: appEditors/FlatCAMGeoEditor.py:568 appEditors/FlatCAMGeoEditor.py:5091
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
+#: appEditors/appGeoEditor.py:568 appEditors/appGeoEditor.py:5091
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2243 appTools/ToolNCC.py:2770
@@ -994,8 +994,8 @@ msgstr "Standard"
 msgid "Seed"
 msgstr "Punct_arbitrar"
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
-#: appEditors/FlatCAMGeoEditor.py:5095
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
+#: appEditors/appGeoEditor.py:5095
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2254 appTools/ToolPaint.py:389
@@ -1019,7 +1019,7 @@ msgstr "Combinat"
 msgid "Connect"
 msgstr "Conectează"
 
-#: appDatabase.py:1512 appDatabase.py:1629 appEditors/FlatCAMGeoEditor.py:507
+#: appDatabase.py:1512 appDatabase.py:1629 appEditors/appGeoEditor.py:507
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:239
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:226
 #: appTools/ToolNCC.py:443 appTools/ToolPaint.py:403
@@ -1038,7 +1038,7 @@ msgstr ""
 msgid "Contour"
 msgstr "Contur"
 
-#: appDatabase.py:1522 appDatabase.py:1636 appEditors/FlatCAMGeoEditor.py:517
+#: appDatabase.py:1522 appDatabase.py:1636 appEditors/appGeoEditor.py:517
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:248
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:234
 #: appTools/ToolNCC.py:453 appTools/ToolPaint.py:410
@@ -1049,7 +1049,7 @@ msgstr ""
 "Taie de-a lungul perimetrului poligonului\n"
 "pentru a elimina bavurile."
 
-#: appDatabase.py:1528 appEditors/FlatCAMGeoEditor.py:611
+#: appDatabase.py:1528 appEditors/appGeoEditor.py:611
 #: appEditors/FlatCAMGrbEditor.py:5304 appGUI/ObjectUI.py:143
 #: appGUI/ObjectUI.py:1394 appGUI/ObjectUI.py:2256
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:255
@@ -1072,7 +1072,7 @@ msgstr ""
 "de traseele de cupru.\n"
 "Valoarea poate fi cuprinsă între 0 și 10 unități FlatCAM."
 
-#: appDatabase.py:1567 appEditors/FlatCAMGeoEditor.py:452
+#: appDatabase.py:1567 appEditors/appGeoEditor.py:452
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:165
 #: appTools/ToolPaint.py:330
 msgid ""
@@ -1093,7 +1093,7 @@ msgstr ""
 "Valori mari= procesare lentă cat și o execuţie la fel de lentă a PCB-ului,\n"
 "datorită numărului mai mare de treceri-tăiere."
 
-#: appDatabase.py:1588 appEditors/FlatCAMGeoEditor.py:472
+#: appDatabase.py:1588 appEditors/appGeoEditor.py:472
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:185
 #: appTools/ToolPaint.py:351
 msgid ""
@@ -1559,7 +1559,7 @@ msgstr "Y"
 #: appEditors/FlatCAMExcEditor.py:1800 appEditors/FlatCAMExcEditor.py:1871
 #: appEditors/FlatCAMExcEditor.py:1875 appEditors/FlatCAMExcEditor.py:1964
 #: appEditors/FlatCAMExcEditor.py:1982 appEditors/FlatCAMExcEditor.py:2016
-#: appEditors/FlatCAMGeoEditor.py:683 appEditors/FlatCAMGrbEditor.py:2822
+#: appEditors/appGeoEditor.py:683 appEditors/FlatCAMGrbEditor.py:2822
 #: appEditors/FlatCAMGrbEditor.py:2839 appEditors/FlatCAMGrbEditor.py:2875
 #: appEditors/FlatCAMGrbEditor.py:5376
 #: appGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py:94
@@ -1787,7 +1787,7 @@ msgid "Cancelled. There is no Tool/Drill selected"
 msgstr "Anulat. Nu este selectată nici-o unealtă sau op. de găurire"
 
 #: appEditors/FlatCAMExcEditor.py:3601 appEditors/FlatCAMExcEditor.py:3609
-#: appEditors/FlatCAMGeoEditor.py:4286 appEditors/FlatCAMGeoEditor.py:4300
+#: appEditors/appGeoEditor.py:4286 appEditors/appGeoEditor.py:4300
 #: appEditors/FlatCAMGrbEditor.py:1085 appEditors/FlatCAMGrbEditor.py:1312
 #: appEditors/FlatCAMGrbEditor.py:1497 appEditors/FlatCAMGrbEditor.py:1766
 #: appEditors/FlatCAMGrbEditor.py:4608 appEditors/FlatCAMGrbEditor.py:4625
@@ -1806,15 +1806,15 @@ msgstr "Executat. Operatiile de găurire șterse."
 msgid "Click on the circular array Center position"
 msgstr "Click pe punctul de Centru al ariei circulare"
 
-#: appEditors/FlatCAMGeoEditor.py:84
+#: appEditors/appGeoEditor.py:84
 msgid "Buffer distance:"
 msgstr "Distanta pt bufer:"
 
-#: appEditors/FlatCAMGeoEditor.py:85
+#: appEditors/appGeoEditor.py:85
 msgid "Buffer corner:"
 msgstr "Coltul pt bufer:"
 
-#: appEditors/FlatCAMGeoEditor.py:87
+#: appEditors/appGeoEditor.py:87
 msgid ""
 "There are 3 types of corners:\n"
 " - 'Round': the corner is rounded for exterior buffer.\n"
@@ -1828,11 +1828,11 @@ msgstr ""
 "- 'Beveled:' coltul este inlocuit cu o linie care uneste capetele liniilor "
 "care formează coltul"
 
-#: appEditors/FlatCAMGeoEditor.py:93 appEditors/FlatCAMGrbEditor.py:2638
+#: appEditors/appGeoEditor.py:93 appEditors/FlatCAMGrbEditor.py:2638
 msgid "Round"
 msgstr "Rotund"
 
-#: appEditors/FlatCAMGeoEditor.py:94 appEditors/FlatCAMGrbEditor.py:2639
+#: appEditors/appGeoEditor.py:94 appEditors/FlatCAMGrbEditor.py:2639
 #: appGUI/ObjectUI.py:1149 appGUI/ObjectUI.py:2004
 #: appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py:225
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:68
@@ -1850,50 +1850,50 @@ msgstr "Rotund"
 msgid "Square"
 msgstr "Patrat"
 
-#: appEditors/FlatCAMGeoEditor.py:95 appEditors/FlatCAMGrbEditor.py:2640
+#: appEditors/appGeoEditor.py:95 appEditors/FlatCAMGrbEditor.py:2640
 msgid "Beveled"
 msgstr "Beveled"
 
-#: appEditors/FlatCAMGeoEditor.py:102
+#: appEditors/appGeoEditor.py:102
 msgid "Buffer Interior"
 msgstr "Bufer interior"
 
-#: appEditors/FlatCAMGeoEditor.py:104
+#: appEditors/appGeoEditor.py:104
 msgid "Buffer Exterior"
 msgstr "Bufer Exterior"
 
-#: appEditors/FlatCAMGeoEditor.py:110
+#: appEditors/appGeoEditor.py:110
 msgid "Full Buffer"
 msgstr "Bufer complet"
 
-#: appEditors/FlatCAMGeoEditor.py:131 appEditors/FlatCAMGeoEditor.py:2959
+#: appEditors/appGeoEditor.py:131 appEditors/appGeoEditor.py:2959
 #: appGUI/MainGUI.py:4301
 #: appGUI/preferences/gerber/GerberEditorPrefGroupUI.py:191
 msgid "Buffer Tool"
 msgstr "Unealta Bufer"
 
-#: appEditors/FlatCAMGeoEditor.py:143 appEditors/FlatCAMGeoEditor.py:160
-#: appEditors/FlatCAMGeoEditor.py:177 appEditors/FlatCAMGeoEditor.py:2978
-#: appEditors/FlatCAMGeoEditor.py:3006 appEditors/FlatCAMGeoEditor.py:3034
+#: appEditors/appGeoEditor.py:143 appEditors/appGeoEditor.py:160
+#: appEditors/appGeoEditor.py:177 appEditors/appGeoEditor.py:2978
+#: appEditors/appGeoEditor.py:3006 appEditors/appGeoEditor.py:3034
 #: appEditors/FlatCAMGrbEditor.py:5109
 msgid "Buffer distance value is missing or wrong format. Add it and retry."
 msgstr ""
 "Valoarea distantei bufer lipseste sau este intr-un format gresit. Adaugă din "
 "nou și reîncearcă."
 
-#: appEditors/FlatCAMGeoEditor.py:241
+#: appEditors/appGeoEditor.py:241
 msgid "Font"
 msgstr "Font"
 
-#: appEditors/FlatCAMGeoEditor.py:322 appGUI/MainGUI.py:1452
+#: appEditors/appGeoEditor.py:322 appGUI/MainGUI.py:1452
 msgid "Text"
 msgstr "Text"
 
-#: appEditors/FlatCAMGeoEditor.py:348
+#: appEditors/appGeoEditor.py:348
 msgid "Text Tool"
 msgstr "Unealta Text"
 
-#: appEditors/FlatCAMGeoEditor.py:404 appGUI/MainGUI.py:502
+#: appEditors/appGeoEditor.py:404 appGUI/MainGUI.py:502
 #: appGUI/MainGUI.py:1199 appGUI/ObjectUI.py:597 appGUI/ObjectUI.py:1564
 #: appObjects/FlatCAMExcellon.py:852 appObjects/FlatCAMExcellon.py:1242
 #: appObjects/FlatCAMGeometry.py:825 appTools/ToolIsolation.py:313
@@ -1902,15 +1902,15 @@ msgstr "Unealta Text"
 msgid "Tool"
 msgstr "Unealta"
 
-#: appEditors/FlatCAMGeoEditor.py:438
+#: appEditors/appGeoEditor.py:438
 msgid "Tool dia"
 msgstr "Dia unealtă"
 
-#: appEditors/FlatCAMGeoEditor.py:440
+#: appEditors/appGeoEditor.py:440
 msgid "Diameter of the tool to be used in the operation."
 msgstr "Diametrul uneltei care este utilizata in operaţie."
 
-#: appEditors/FlatCAMGeoEditor.py:486
+#: appEditors/appGeoEditor.py:486
 msgid ""
 "Algorithm to paint the polygons:\n"
 "- Standard: Fixed step inwards.\n"
@@ -1922,57 +1922,57 @@ msgstr ""
 "- Semințe: înspre exterior porning de la punctul sămanță.\n"
 "- Linii: linii paralele."
 
-#: appEditors/FlatCAMGeoEditor.py:505
+#: appEditors/appGeoEditor.py:505
 msgid "Connect:"
 msgstr "Conectează:"
 
-#: appEditors/FlatCAMGeoEditor.py:515
+#: appEditors/appGeoEditor.py:515
 msgid "Contour:"
 msgstr "Contur:"
 
-#: appEditors/FlatCAMGeoEditor.py:528 appGUI/MainGUI.py:1456
+#: appEditors/appGeoEditor.py:528 appGUI/MainGUI.py:1456
 msgid "Paint"
 msgstr "Pictează"
 
-#: appEditors/FlatCAMGeoEditor.py:546 appGUI/MainGUI.py:912
+#: appEditors/appGeoEditor.py:546 appGUI/MainGUI.py:912
 #: appGUI/MainGUI.py:1944 appGUI/ObjectUI.py:2069 appTools/ToolPaint.py:42
 #: appTools/ToolPaint.py:737
 msgid "Paint Tool"
 msgstr "Unealta Paint"
 
-#: appEditors/FlatCAMGeoEditor.py:582 appEditors/FlatCAMGeoEditor.py:1071
-#: appEditors/FlatCAMGeoEditor.py:2966 appEditors/FlatCAMGeoEditor.py:2994
-#: appEditors/FlatCAMGeoEditor.py:3022 appEditors/FlatCAMGeoEditor.py:4439
+#: appEditors/appGeoEditor.py:582 appEditors/appGeoEditor.py:1071
+#: appEditors/appGeoEditor.py:2966 appEditors/appGeoEditor.py:2994
+#: appEditors/appGeoEditor.py:3022 appEditors/appGeoEditor.py:4439
 #: appEditors/FlatCAMGrbEditor.py:5764
 msgid "Cancelled. No shape selected."
 msgstr "Anulat. Nici-o forma geometrică nu este selectată."
 
-#: appEditors/FlatCAMGeoEditor.py:595 appEditors/FlatCAMGeoEditor.py:2984
-#: appEditors/FlatCAMGeoEditor.py:3012 appEditors/FlatCAMGeoEditor.py:3040
+#: appEditors/appGeoEditor.py:595 appEditors/appGeoEditor.py:2984
+#: appEditors/appGeoEditor.py:3012 appEditors/appGeoEditor.py:3040
 #: appGUI/preferences/geometry/GeometryGenPrefGroupUI.py:69
 #: appTools/ToolProperties.py:117 appTools/ToolProperties.py:162
 msgid "Tools"
 msgstr "Unelte"
 
-#: appEditors/FlatCAMGeoEditor.py:606 appEditors/FlatCAMGeoEditor.py:1035
+#: appEditors/appGeoEditor.py:606 appEditors/appGeoEditor.py:1035
 #: appEditors/FlatCAMGrbEditor.py:5299 appEditors/FlatCAMGrbEditor.py:5728
 #: appGUI/MainGUI.py:935 appGUI/MainGUI.py:1967 appTools/ToolTransform.py:494
 msgid "Transform Tool"
 msgstr "Unealta Transformare"
 
-#: appEditors/FlatCAMGeoEditor.py:607 appEditors/FlatCAMGeoEditor.py:699
+#: appEditors/appGeoEditor.py:607 appEditors/appGeoEditor.py:699
 #: appEditors/FlatCAMGrbEditor.py:5300 appEditors/FlatCAMGrbEditor.py:5392
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:88
 #: appTools/ToolTransform.py:27 appTools/ToolTransform.py:146
 msgid "Rotate"
 msgstr "Rotaţie"
 
-#: appEditors/FlatCAMGeoEditor.py:608 appEditors/FlatCAMGrbEditor.py:5301
+#: appEditors/appGeoEditor.py:608 appEditors/FlatCAMGrbEditor.py:5301
 #: appTools/ToolTransform.py:28
 msgid "Skew/Shear"
 msgstr "Deformare"
 
-#: appEditors/FlatCAMGeoEditor.py:609 appEditors/FlatCAMGrbEditor.py:2687
+#: appEditors/appGeoEditor.py:609 appEditors/FlatCAMGrbEditor.py:2687
 #: appEditors/FlatCAMGrbEditor.py:5302 appGUI/MainGUI.py:1057
 #: appGUI/MainGUI.py:1499 appGUI/MainGUI.py:2089 appGUI/MainGUI.py:4513
 #: appGUI/ObjectUI.py:125
@@ -1981,12 +1981,12 @@ msgstr "Deformare"
 msgid "Scale"
 msgstr "Scalare"
 
-#: appEditors/FlatCAMGeoEditor.py:610 appEditors/FlatCAMGrbEditor.py:5303
+#: appEditors/appGeoEditor.py:610 appEditors/FlatCAMGrbEditor.py:5303
 #: appTools/ToolTransform.py:30
 msgid "Mirror (Flip)"
 msgstr "Oglindire"
 
-#: appEditors/FlatCAMGeoEditor.py:612 appEditors/FlatCAMGrbEditor.py:2647
+#: appEditors/appGeoEditor.py:612 appEditors/FlatCAMGrbEditor.py:2647
 #: appEditors/FlatCAMGrbEditor.py:5305 appGUI/MainGUI.py:1055
 #: appGUI/MainGUI.py:1454 appGUI/MainGUI.py:1497 appGUI/MainGUI.py:2087
 #: appGUI/MainGUI.py:4511
@@ -1995,7 +1995,7 @@ msgstr "Oglindire"
 msgid "Buffer"
 msgstr "Bufer"
 
-#: appEditors/FlatCAMGeoEditor.py:643 appEditors/FlatCAMGrbEditor.py:5336
+#: appEditors/appGeoEditor.py:643 appEditors/FlatCAMGrbEditor.py:5336
 #: appGUI/GUIElements.py:2701
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:169
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:44
@@ -2004,7 +2004,7 @@ msgstr "Bufer"
 msgid "Reference"
 msgstr "Referinţă"
 
-#: appEditors/FlatCAMGeoEditor.py:645 appEditors/FlatCAMGrbEditor.py:5338
+#: appEditors/appGeoEditor.py:645 appEditors/FlatCAMGrbEditor.py:5338
 msgid ""
 "The reference point for Rotate, Skew, Scale, Mirror.\n"
 "Can be:\n"
@@ -2021,14 +2021,14 @@ msgstr ""
 "- Punct -> punct personalizat definit de coordonatele X, Y\n"
 "- Selectie Min-> punctul (minx, miny) al casetei de delimitare a selectiei"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
 #: appTools/ToolCalibration.py:770 appTools/ToolCalibration.py:771
 #: appTools/ToolTransform.py:70
 msgid "Origin"
 msgstr "Originea"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGeoEditor.py:1044
+#: appEditors/appGeoEditor.py:653 appEditors/appGeoEditor.py:1044
 #: appEditors/FlatCAMGrbEditor.py:5346 appEditors/FlatCAMGrbEditor.py:5737
 #: appGUI/preferences/general/GeneralGUIPrefGroupUI.py:250
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:275
@@ -2040,7 +2040,7 @@ msgstr "Originea"
 msgid "Selection"
 msgstr "Selecţie"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 #: appGUI/preferences/tools/Tools2sidedPrefGroupUI.py:80
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:60
@@ -2048,11 +2048,11 @@ msgstr "Selecţie"
 msgid "Point"
 msgstr "Punct"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 msgid "Minimum"
 msgstr "Minim"
 
-#: appEditors/FlatCAMGeoEditor.py:659 appEditors/FlatCAMGeoEditor.py:955
+#: appEditors/appGeoEditor.py:659 appEditors/appGeoEditor.py:955
 #: appEditors/FlatCAMGrbEditor.py:5352 appEditors/FlatCAMGrbEditor.py:5648
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:131
 #: appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py:133
@@ -2063,13 +2063,13 @@ msgstr "Minim"
 msgid "Value"
 msgstr "Valoare"
 
-#: appEditors/FlatCAMGeoEditor.py:661 appEditors/FlatCAMGrbEditor.py:5354
+#: appEditors/appGeoEditor.py:661 appEditors/FlatCAMGrbEditor.py:5354
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:62
 #: appTools/ToolTransform.py:78
 msgid "A point of reference in format X,Y."
 msgstr "Un punct de referință în format X, Y."
 
-#: appEditors/FlatCAMGeoEditor.py:668 appEditors/FlatCAMGrbEditor.py:2590
+#: appEditors/appGeoEditor.py:668 appEditors/FlatCAMGrbEditor.py:2590
 #: appEditors/FlatCAMGrbEditor.py:5361 appGUI/ObjectUI.py:1494
 #: appTools/ToolDblSided.py:192 appTools/ToolDblSided.py:425
 #: appTools/ToolIsolation.py:276 appTools/ToolIsolation.py:631
@@ -2080,12 +2080,12 @@ msgstr "Un punct de referință în format X, Y."
 msgid "Add"
 msgstr "Adaugă"
 
-#: appEditors/FlatCAMGeoEditor.py:670 appEditors/FlatCAMGrbEditor.py:5363
+#: appEditors/appGeoEditor.py:670 appEditors/FlatCAMGrbEditor.py:5363
 #: appTools/ToolTransform.py:87
 msgid "Add point coordinates from clipboard."
 msgstr "Adăugați coordonatele de punct din clipboard."
 
-#: appEditors/FlatCAMGeoEditor.py:685 appEditors/FlatCAMGrbEditor.py:5378
+#: appEditors/appGeoEditor.py:685 appEditors/FlatCAMGrbEditor.py:5378
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:98
 #: appTools/ToolTransform.py:132
 msgid ""
@@ -2098,7 +2098,7 @@ msgstr ""
 "Numerele pozitive inseamna o mișcare in sens ace ceasornic.\n"
 "Numerele negative inseamna o mișcare in sens invers ace ceasornic."
 
-#: appEditors/FlatCAMGeoEditor.py:701 appEditors/FlatCAMGrbEditor.py:5394
+#: appEditors/appGeoEditor.py:701 appEditors/FlatCAMGrbEditor.py:5394
 #: appTools/ToolTransform.py:148
 msgid ""
 "Rotate the selected object(s).\n"
@@ -2109,7 +2109,7 @@ msgstr ""
 "Punctul de referinţă este mijlocul \n"
 "formei înconjurătoare pt toate obiectele."
 
-#: appEditors/FlatCAMGeoEditor.py:721 appEditors/FlatCAMGeoEditor.py:783
+#: appEditors/appGeoEditor.py:721 appEditors/appGeoEditor.py:783
 #: appEditors/FlatCAMGrbEditor.py:5414 appEditors/FlatCAMGrbEditor.py:5476
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:112
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:151
@@ -2117,7 +2117,7 @@ msgstr ""
 msgid "Link"
 msgstr "Legatura"
 
-#: appEditors/FlatCAMGeoEditor.py:723 appEditors/FlatCAMGeoEditor.py:785
+#: appEditors/appGeoEditor.py:723 appEditors/appGeoEditor.py:785
 #: appEditors/FlatCAMGrbEditor.py:5416 appEditors/FlatCAMGrbEditor.py:5478
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:114
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:153
@@ -2126,14 +2126,14 @@ msgid "Link the Y entry to X entry and copy its content."
 msgstr ""
 "Conectați campul Y la campul X și copiați conținutul acestuia din X in Y."
 
-#: appEditors/FlatCAMGeoEditor.py:728 appEditors/FlatCAMGrbEditor.py:5421
+#: appEditors/appGeoEditor.py:728 appEditors/FlatCAMGrbEditor.py:5421
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:151
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:124
 #: appTools/ToolFilm.py:184 appTools/ToolTransform.py:175
 msgid "X angle"
 msgstr "Unghi X"
 
-#: appEditors/FlatCAMGeoEditor.py:730 appEditors/FlatCAMGeoEditor.py:751
+#: appEditors/appGeoEditor.py:730 appEditors/appGeoEditor.py:751
 #: appEditors/FlatCAMGrbEditor.py:5423 appEditors/FlatCAMGrbEditor.py:5444
 #: appTools/ToolTransform.py:177 appTools/ToolTransform.py:198
 msgid ""
@@ -2143,12 +2143,12 @@ msgstr ""
 "Valoarea unghiului de Deformare, in grade.\n"
 "Ia valori Reale între -360 si 360 grade."
 
-#: appEditors/FlatCAMGeoEditor.py:738 appEditors/FlatCAMGrbEditor.py:5431
+#: appEditors/appGeoEditor.py:738 appEditors/FlatCAMGrbEditor.py:5431
 #: appTools/ToolTransform.py:185
 msgid "Skew X"
 msgstr "Deformare X"
 
-#: appEditors/FlatCAMGeoEditor.py:740 appEditors/FlatCAMGeoEditor.py:761
+#: appEditors/appGeoEditor.py:740 appEditors/appGeoEditor.py:761
 #: appEditors/FlatCAMGrbEditor.py:5433 appEditors/FlatCAMGrbEditor.py:5454
 #: appTools/ToolTransform.py:187 appTools/ToolTransform.py:208
 msgid ""
@@ -2160,37 +2160,37 @@ msgstr ""
 "Punctul de referinţă este mijlocul \n"
 "formei înconjurătoare pt toate obiectele."
 
-#: appEditors/FlatCAMGeoEditor.py:749 appEditors/FlatCAMGrbEditor.py:5442
+#: appEditors/appGeoEditor.py:749 appEditors/FlatCAMGrbEditor.py:5442
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:160
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:138
 #: appTools/ToolFilm.py:193 appTools/ToolTransform.py:196
 msgid "Y angle"
 msgstr "Unghi Y"
 
-#: appEditors/FlatCAMGeoEditor.py:759 appEditors/FlatCAMGrbEditor.py:5452
+#: appEditors/appGeoEditor.py:759 appEditors/FlatCAMGrbEditor.py:5452
 #: appTools/ToolTransform.py:206
 msgid "Skew Y"
 msgstr "Deformare Y"
 
-#: appEditors/FlatCAMGeoEditor.py:790 appEditors/FlatCAMGrbEditor.py:5483
+#: appEditors/appGeoEditor.py:790 appEditors/FlatCAMGrbEditor.py:5483
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:120
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:162
 #: appTools/ToolFilm.py:145 appTools/ToolTransform.py:237
 msgid "X factor"
 msgstr "Factor X"
 
-#: appEditors/FlatCAMGeoEditor.py:792 appEditors/FlatCAMGrbEditor.py:5485
+#: appEditors/appGeoEditor.py:792 appEditors/FlatCAMGrbEditor.py:5485
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:164
 #: appTools/ToolTransform.py:239
 msgid "Factor for scaling on X axis."
 msgstr "Factor de scalare pe axa X."
 
-#: appEditors/FlatCAMGeoEditor.py:799 appEditors/FlatCAMGrbEditor.py:5492
+#: appEditors/appGeoEditor.py:799 appEditors/FlatCAMGrbEditor.py:5492
 #: appTools/ToolTransform.py:246
 msgid "Scale X"
 msgstr "Scalează X"
 
-#: appEditors/FlatCAMGeoEditor.py:801 appEditors/FlatCAMGeoEditor.py:821
+#: appEditors/appGeoEditor.py:801 appEditors/appGeoEditor.py:821
 #: appEditors/FlatCAMGrbEditor.py:5494 appEditors/FlatCAMGrbEditor.py:5514
 #: appTools/ToolTransform.py:248 appTools/ToolTransform.py:268
 msgid ""
@@ -2202,58 +2202,58 @@ msgstr ""
 "Punctul de referinţă depinde  de\n"
 "starea checkbox-ului >Referința Scalare<."
 
-#: appEditors/FlatCAMGeoEditor.py:810 appEditors/FlatCAMGrbEditor.py:5503
+#: appEditors/appGeoEditor.py:810 appEditors/FlatCAMGrbEditor.py:5503
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:129
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:175
 #: appTools/ToolFilm.py:154 appTools/ToolTransform.py:257
 msgid "Y factor"
 msgstr "Factor Y"
 
-#: appEditors/FlatCAMGeoEditor.py:812 appEditors/FlatCAMGrbEditor.py:5505
+#: appEditors/appGeoEditor.py:812 appEditors/FlatCAMGrbEditor.py:5505
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:177
 #: appTools/ToolTransform.py:259
 msgid "Factor for scaling on Y axis."
 msgstr "Factor de scalare pe axa Y."
 
-#: appEditors/FlatCAMGeoEditor.py:819 appEditors/FlatCAMGrbEditor.py:5512
+#: appEditors/appGeoEditor.py:819 appEditors/FlatCAMGrbEditor.py:5512
 #: appTools/ToolTransform.py:266
 msgid "Scale Y"
 msgstr "Scalează Y"
 
-#: appEditors/FlatCAMGeoEditor.py:846 appEditors/FlatCAMGrbEditor.py:5539
+#: appEditors/appGeoEditor.py:846 appEditors/FlatCAMGrbEditor.py:5539
 #: appTools/ToolTransform.py:293
 msgid "Flip on X"
 msgstr "Oglindește pe X"
 
-#: appEditors/FlatCAMGeoEditor.py:848 appEditors/FlatCAMGeoEditor.py:853
+#: appEditors/appGeoEditor.py:848 appEditors/appGeoEditor.py:853
 #: appEditors/FlatCAMGrbEditor.py:5541 appEditors/FlatCAMGrbEditor.py:5546
 #: appTools/ToolTransform.py:295 appTools/ToolTransform.py:300
 msgid "Flip the selected object(s) over the X axis."
 msgstr "Oglindește obiectele selectate pe axa X."
 
-#: appEditors/FlatCAMGeoEditor.py:851 appEditors/FlatCAMGrbEditor.py:5544
+#: appEditors/appGeoEditor.py:851 appEditors/FlatCAMGrbEditor.py:5544
 #: appTools/ToolTransform.py:298
 msgid "Flip on Y"
 msgstr "Oglindește pe Y"
 
-#: appEditors/FlatCAMGeoEditor.py:871 appEditors/FlatCAMGrbEditor.py:5564
+#: appEditors/appGeoEditor.py:871 appEditors/FlatCAMGrbEditor.py:5564
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:191
 #: appTools/ToolTransform.py:318
 msgid "X val"
 msgstr "Val X"
 
-#: appEditors/FlatCAMGeoEditor.py:873 appEditors/FlatCAMGrbEditor.py:5566
+#: appEditors/appGeoEditor.py:873 appEditors/FlatCAMGrbEditor.py:5566
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:193
 #: appTools/ToolTransform.py:320
 msgid "Distance to offset on X axis. In current units."
 msgstr "Distanta la care se face ofset pe axa X. In unitatile curente."
 
-#: appEditors/FlatCAMGeoEditor.py:880 appEditors/FlatCAMGrbEditor.py:5573
+#: appEditors/appGeoEditor.py:880 appEditors/FlatCAMGrbEditor.py:5573
 #: appTools/ToolTransform.py:327
 msgid "Offset X"
 msgstr "Ofset pe X"
 
-#: appEditors/FlatCAMGeoEditor.py:882 appEditors/FlatCAMGeoEditor.py:902
+#: appEditors/appGeoEditor.py:882 appEditors/appGeoEditor.py:902
 #: appEditors/FlatCAMGrbEditor.py:5575 appEditors/FlatCAMGrbEditor.py:5595
 #: appTools/ToolTransform.py:329 appTools/ToolTransform.py:349
 msgid ""
@@ -2265,31 +2265,31 @@ msgstr ""
 "Punctul de referinţă este mijlocul formei înconjurătoare\n"
 "pentru toate obiectele selectate.\n"
 
-#: appEditors/FlatCAMGeoEditor.py:891 appEditors/FlatCAMGrbEditor.py:5584
+#: appEditors/appGeoEditor.py:891 appEditors/FlatCAMGrbEditor.py:5584
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:204
 #: appTools/ToolTransform.py:338
 msgid "Y val"
 msgstr "Val Y"
 
-#: appEditors/FlatCAMGeoEditor.py:893 appEditors/FlatCAMGrbEditor.py:5586
+#: appEditors/appGeoEditor.py:893 appEditors/FlatCAMGrbEditor.py:5586
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:206
 #: appTools/ToolTransform.py:340
 msgid "Distance to offset on Y axis. In current units."
 msgstr "Distanta la care se face ofset pe axa Y. In unitatile curente."
 
-#: appEditors/FlatCAMGeoEditor.py:900 appEditors/FlatCAMGrbEditor.py:5593
+#: appEditors/appGeoEditor.py:900 appEditors/FlatCAMGrbEditor.py:5593
 #: appTools/ToolTransform.py:347
 msgid "Offset Y"
 msgstr "Ofset pe Y"
 
-#: appEditors/FlatCAMGeoEditor.py:920 appEditors/FlatCAMGrbEditor.py:5613
+#: appEditors/appGeoEditor.py:920 appEditors/FlatCAMGrbEditor.py:5613
 #: appGUI/preferences/tools/Tools2QRCodePrefGroupUI.py:142
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:216
 #: appTools/ToolQRCode.py:206 appTools/ToolTransform.py:367
 msgid "Rounded"
 msgstr "Rotunjit"
 
-#: appEditors/FlatCAMGeoEditor.py:922 appEditors/FlatCAMGrbEditor.py:5615
+#: appEditors/appGeoEditor.py:922 appEditors/FlatCAMGrbEditor.py:5615
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:218
 #: appTools/ToolTransform.py:369
 msgid ""
@@ -2303,14 +2303,14 @@ msgstr ""
 "Dacă nu este bifat, bufferul va urma geometria exactă\n"
 "de forma tamponată."
 
-#: appEditors/FlatCAMGeoEditor.py:930 appEditors/FlatCAMGrbEditor.py:5623
+#: appEditors/appGeoEditor.py:930 appEditors/FlatCAMGrbEditor.py:5623
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:226
 #: appTools/ToolDistance.py:505 appTools/ToolDistanceMin.py:286
 #: appTools/ToolTransform.py:377
 msgid "Distance"
 msgstr "Distanță"
 
-#: appEditors/FlatCAMGeoEditor.py:932 appEditors/FlatCAMGrbEditor.py:5625
+#: appEditors/appGeoEditor.py:932 appEditors/FlatCAMGrbEditor.py:5625
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:228
 #: appTools/ToolTransform.py:379
 msgid ""
@@ -2324,12 +2324,12 @@ msgstr ""
 "Fiecare element de geometrie al obiectului va fi mărit\n"
 "sau scăzut proportional cu „distanța”."
 
-#: appEditors/FlatCAMGeoEditor.py:944 appEditors/FlatCAMGrbEditor.py:5637
+#: appEditors/appGeoEditor.py:944 appEditors/FlatCAMGrbEditor.py:5637
 #: appTools/ToolTransform.py:391
 msgid "Buffer D"
 msgstr "Bufer D"
 
-#: appEditors/FlatCAMGeoEditor.py:946 appEditors/FlatCAMGrbEditor.py:5639
+#: appEditors/appGeoEditor.py:946 appEditors/FlatCAMGrbEditor.py:5639
 #: appTools/ToolTransform.py:393
 msgid ""
 "Create the buffer effect on each geometry,\n"
@@ -2338,7 +2338,7 @@ msgstr ""
 "Creați efectul buffer pe fiecare geometrie,\n"
 "element din obiectul selectat, folosind distanta."
 
-#: appEditors/FlatCAMGeoEditor.py:957 appEditors/FlatCAMGrbEditor.py:5650
+#: appEditors/appGeoEditor.py:957 appEditors/FlatCAMGrbEditor.py:5650
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:245
 #: appTools/ToolTransform.py:404
 msgid ""
@@ -2354,12 +2354,12 @@ msgstr ""
 "sau scăzut proportional cu „distanța”. Valoarea este\n"
 "un procent din dimensiunea initială."
 
-#: appEditors/FlatCAMGeoEditor.py:970 appEditors/FlatCAMGrbEditor.py:5663
+#: appEditors/appGeoEditor.py:970 appEditors/FlatCAMGrbEditor.py:5663
 #: appTools/ToolTransform.py:417
 msgid "Buffer F"
 msgstr "Bufer F"
 
-#: appEditors/FlatCAMGeoEditor.py:972 appEditors/FlatCAMGrbEditor.py:5665
+#: appEditors/appGeoEditor.py:972 appEditors/FlatCAMGrbEditor.py:5665
 #: appTools/ToolTransform.py:419
 msgid ""
 "Create the buffer effect on each geometry,\n"
@@ -2368,7 +2368,7 @@ msgstr ""
 "Creați efectul buffer pe fiecare geometrie,\n"
 "element din obiectul selectat, folosing un factor."
 
-#: appEditors/FlatCAMGeoEditor.py:1043 appEditors/FlatCAMGrbEditor.py:5736
+#: appEditors/appGeoEditor.py:1043 appEditors/FlatCAMGrbEditor.py:5736
 #: appGUI/ObjectUI.py:1103 appGUI/ObjectUI.py:1958
 #: appGUI/preferences/tools/Tools2CalPrefGroupUI.py:48
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
@@ -2379,329 +2379,329 @@ msgstr ""
 msgid "Object"
 msgstr "Obiect"
 
-#: appEditors/FlatCAMGeoEditor.py:1107 appEditors/FlatCAMGeoEditor.py:1130
-#: appEditors/FlatCAMGeoEditor.py:1276 appEditors/FlatCAMGeoEditor.py:1301
-#: appEditors/FlatCAMGeoEditor.py:1335 appEditors/FlatCAMGeoEditor.py:1370
-#: appEditors/FlatCAMGeoEditor.py:1401 appEditors/FlatCAMGrbEditor.py:5800
+#: appEditors/appGeoEditor.py:1107 appEditors/appGeoEditor.py:1130
+#: appEditors/appGeoEditor.py:1276 appEditors/appGeoEditor.py:1301
+#: appEditors/appGeoEditor.py:1335 appEditors/appGeoEditor.py:1370
+#: appEditors/appGeoEditor.py:1401 appEditors/FlatCAMGrbEditor.py:5800
 #: appEditors/FlatCAMGrbEditor.py:5823 appEditors/FlatCAMGrbEditor.py:5968
 #: appEditors/FlatCAMGrbEditor.py:6001 appEditors/FlatCAMGrbEditor.py:6044
 #: appEditors/FlatCAMGrbEditor.py:6085 appEditors/FlatCAMGrbEditor.py:6121
 msgid "No shape selected."
 msgstr "Nicio formă selectată."
 
-#: appEditors/FlatCAMGeoEditor.py:1115 appEditors/FlatCAMGrbEditor.py:5808
+#: appEditors/appGeoEditor.py:1115 appEditors/FlatCAMGrbEditor.py:5808
 #: appTools/ToolTransform.py:585
 msgid "Incorrect format for Point value. Needs format X,Y"
 msgstr "Format incorect pentru valoarea punctului. Necesită formatul X, Y"
 
-#: appEditors/FlatCAMGeoEditor.py:1140 appEditors/FlatCAMGrbEditor.py:5833
+#: appEditors/appGeoEditor.py:1140 appEditors/FlatCAMGrbEditor.py:5833
 #: appTools/ToolTransform.py:602
 msgid "Rotate transformation can not be done for a value of 0."
 msgstr "Transformarea Rotire nu se poate face pentru o valoare de 0."
 
-#: appEditors/FlatCAMGeoEditor.py:1198 appEditors/FlatCAMGeoEditor.py:1219
+#: appEditors/appGeoEditor.py:1198 appEditors/appGeoEditor.py:1219
 #: appEditors/FlatCAMGrbEditor.py:5891 appEditors/FlatCAMGrbEditor.py:5912
 #: appTools/ToolTransform.py:660 appTools/ToolTransform.py:681
 msgid "Scale transformation can not be done for a factor of 0 or 1."
 msgstr "Transformarea Scalare nu se poate face pentru un factor de 0 sau 1."
 
-#: appEditors/FlatCAMGeoEditor.py:1232 appEditors/FlatCAMGeoEditor.py:1241
+#: appEditors/appGeoEditor.py:1232 appEditors/appGeoEditor.py:1241
 #: appEditors/FlatCAMGrbEditor.py:5925 appEditors/FlatCAMGrbEditor.py:5934
 #: appTools/ToolTransform.py:694 appTools/ToolTransform.py:703
 msgid "Offset transformation can not be done for a value of 0."
 msgstr "Transformarea Deplasare nu se poate face pentru o valoare de 0."
 
-#: appEditors/FlatCAMGeoEditor.py:1271 appEditors/FlatCAMGrbEditor.py:5971
+#: appEditors/appGeoEditor.py:1271 appEditors/FlatCAMGrbEditor.py:5971
 #: appTools/ToolTransform.py:731
 msgid "Appying Rotate"
 msgstr "Execuţie Rotaţie"
 
-#: appEditors/FlatCAMGeoEditor.py:1284 appEditors/FlatCAMGrbEditor.py:5983
+#: appEditors/appGeoEditor.py:1284 appEditors/FlatCAMGrbEditor.py:5983
 msgid "Done. Rotate completed."
 msgstr "Executat. Rotaţie finalizată."
 
-#: appEditors/FlatCAMGeoEditor.py:1286
+#: appEditors/appGeoEditor.py:1286
 msgid "Rotation action was not executed"
 msgstr "Actiunea de rotatie nu a fost efectuată"
 
-#: appEditors/FlatCAMGeoEditor.py:1304 appEditors/FlatCAMGrbEditor.py:6004
+#: appEditors/appGeoEditor.py:1304 appEditors/FlatCAMGrbEditor.py:6004
 #: appTools/ToolTransform.py:757
 msgid "Applying Flip"
 msgstr "Execuţie Oglindire"
 
-#: appEditors/FlatCAMGeoEditor.py:1312 appEditors/FlatCAMGrbEditor.py:6016
+#: appEditors/appGeoEditor.py:1312 appEditors/FlatCAMGrbEditor.py:6016
 #: appTools/ToolTransform.py:774
 msgid "Flip on the Y axis done"
 msgstr "Oglindire pe axa Y executată"
 
-#: appEditors/FlatCAMGeoEditor.py:1315 appEditors/FlatCAMGrbEditor.py:6024
+#: appEditors/appGeoEditor.py:1315 appEditors/FlatCAMGrbEditor.py:6024
 #: appTools/ToolTransform.py:783
 msgid "Flip on the X axis done"
 msgstr "Oglindire pe axa X executată"
 
-#: appEditors/FlatCAMGeoEditor.py:1319
+#: appEditors/appGeoEditor.py:1319
 msgid "Flip action was not executed"
 msgstr "Actiunea de oglindire nu a fost efectuată"
 
-#: appEditors/FlatCAMGeoEditor.py:1338 appEditors/FlatCAMGrbEditor.py:6047
+#: appEditors/appGeoEditor.py:1338 appEditors/FlatCAMGrbEditor.py:6047
 #: appTools/ToolTransform.py:804
 msgid "Applying Skew"
 msgstr "Execuţie Deformare"
 
-#: appEditors/FlatCAMGeoEditor.py:1347 appEditors/FlatCAMGrbEditor.py:6063
+#: appEditors/appGeoEditor.py:1347 appEditors/FlatCAMGrbEditor.py:6063
 msgid "Skew on the X axis done"
 msgstr "Oglindire pe axa X executată"
 
-#: appEditors/FlatCAMGeoEditor.py:1349 appEditors/FlatCAMGrbEditor.py:6065
+#: appEditors/appGeoEditor.py:1349 appEditors/FlatCAMGrbEditor.py:6065
 msgid "Skew on the Y axis done"
 msgstr "Oglindire pe axa Y executată"
 
-#: appEditors/FlatCAMGeoEditor.py:1352
+#: appEditors/appGeoEditor.py:1352
 msgid "Skew action was not executed"
 msgstr "Actiunea de deformare nu a fost efectuată"
 
-#: appEditors/FlatCAMGeoEditor.py:1373 appEditors/FlatCAMGrbEditor.py:6088
+#: appEditors/appGeoEditor.py:1373 appEditors/FlatCAMGrbEditor.py:6088
 #: appTools/ToolTransform.py:831
 msgid "Applying Scale"
 msgstr "Execuţie Scalare"
 
-#: appEditors/FlatCAMGeoEditor.py:1382 appEditors/FlatCAMGrbEditor.py:6101
+#: appEditors/appGeoEditor.py:1382 appEditors/FlatCAMGrbEditor.py:6101
 msgid "Scale on the X axis done"
 msgstr "Scalarea pe axa X executată"
 
-#: appEditors/FlatCAMGeoEditor.py:1384 appEditors/FlatCAMGrbEditor.py:6103
+#: appEditors/appGeoEditor.py:1384 appEditors/FlatCAMGrbEditor.py:6103
 msgid "Scale on the Y axis done"
 msgstr "Scalarea pe axa Y executată"
 
-#: appEditors/FlatCAMGeoEditor.py:1386
+#: appEditors/appGeoEditor.py:1386
 msgid "Scale action was not executed"
 msgstr "Scalarea nu a fost efectuată"
 
-#: appEditors/FlatCAMGeoEditor.py:1404 appEditors/FlatCAMGrbEditor.py:6124
+#: appEditors/appGeoEditor.py:1404 appEditors/FlatCAMGrbEditor.py:6124
 #: appTools/ToolTransform.py:859
 msgid "Applying Offset"
 msgstr "Execuţie Ofset"
 
-#: appEditors/FlatCAMGeoEditor.py:1414 appEditors/FlatCAMGrbEditor.py:6145
+#: appEditors/appGeoEditor.py:1414 appEditors/FlatCAMGrbEditor.py:6145
 msgid "Offset on the X axis done"
 msgstr "Ofset pe axa X efectuat"
 
-#: appEditors/FlatCAMGeoEditor.py:1416 appEditors/FlatCAMGrbEditor.py:6147
+#: appEditors/appGeoEditor.py:1416 appEditors/FlatCAMGrbEditor.py:6147
 msgid "Offset on the Y axis done"
 msgstr "Ofset pe axa Y efectuat"
 
-#: appEditors/FlatCAMGeoEditor.py:1419
+#: appEditors/appGeoEditor.py:1419
 msgid "Offset action was not executed"
 msgstr "Actiuena de Ofset nu a fost efectuată"
 
-#: appEditors/FlatCAMGeoEditor.py:1426 appEditors/FlatCAMGrbEditor.py:6157
+#: appEditors/appGeoEditor.py:1426 appEditors/FlatCAMGrbEditor.py:6157
 msgid "No shape selected"
 msgstr "Nicio formă selectată"
 
-#: appEditors/FlatCAMGeoEditor.py:1429 appEditors/FlatCAMGrbEditor.py:6160
+#: appEditors/appGeoEditor.py:1429 appEditors/FlatCAMGrbEditor.py:6160
 #: appTools/ToolTransform.py:889
 msgid "Applying Buffer"
 msgstr "Aplicarea tampon (Buffer)"
 
-#: appEditors/FlatCAMGeoEditor.py:1436 appEditors/FlatCAMGrbEditor.py:6182
+#: appEditors/appGeoEditor.py:1436 appEditors/FlatCAMGrbEditor.py:6182
 #: appTools/ToolTransform.py:910
 msgid "Buffer done"
 msgstr "Buffer finalizat"
 
-#: appEditors/FlatCAMGeoEditor.py:1440 appEditors/FlatCAMGrbEditor.py:6186
+#: appEditors/appGeoEditor.py:1440 appEditors/FlatCAMGrbEditor.py:6186
 #: appTools/ToolTransform.py:879 appTools/ToolTransform.py:915
 msgid "Action was not executed, due of"
 msgstr "Acțiunea nu a fost executată, din cauza"
 
-#: appEditors/FlatCAMGeoEditor.py:1444 appEditors/FlatCAMGrbEditor.py:6190
+#: appEditors/appGeoEditor.py:1444 appEditors/FlatCAMGrbEditor.py:6190
 msgid "Rotate ..."
 msgstr "Rotaţie ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1445 appEditors/FlatCAMGeoEditor.py:1494
-#: appEditors/FlatCAMGeoEditor.py:1509 appEditors/FlatCAMGrbEditor.py:6191
+#: appEditors/appGeoEditor.py:1445 appEditors/appGeoEditor.py:1494
+#: appEditors/appGeoEditor.py:1509 appEditors/FlatCAMGrbEditor.py:6191
 #: appEditors/FlatCAMGrbEditor.py:6240 appEditors/FlatCAMGrbEditor.py:6255
 msgid "Enter an Angle Value (degrees)"
 msgstr "Introdu o valoare in grade pt Unghi"
 
-#: appEditors/FlatCAMGeoEditor.py:1453 appEditors/FlatCAMGrbEditor.py:6199
+#: appEditors/appGeoEditor.py:1453 appEditors/FlatCAMGrbEditor.py:6199
 msgid "Geometry shape rotate done"
 msgstr "Rotatia formei geometrice executată"
 
-#: appEditors/FlatCAMGeoEditor.py:1456 appEditors/FlatCAMGrbEditor.py:6202
+#: appEditors/appGeoEditor.py:1456 appEditors/FlatCAMGrbEditor.py:6202
 msgid "Geometry shape rotate cancelled"
 msgstr "Rotatia formei geometrice anulată"
 
-#: appEditors/FlatCAMGeoEditor.py:1461 appEditors/FlatCAMGrbEditor.py:6207
+#: appEditors/appGeoEditor.py:1461 appEditors/FlatCAMGrbEditor.py:6207
 msgid "Offset on X axis ..."
 msgstr "Ofset pe axa X ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1462 appEditors/FlatCAMGeoEditor.py:1479
+#: appEditors/appGeoEditor.py:1462 appEditors/appGeoEditor.py:1479
 #: appEditors/FlatCAMGrbEditor.py:6208 appEditors/FlatCAMGrbEditor.py:6225
 msgid "Enter a distance Value"
 msgstr "Introdu of valoare pt Distantă"
 
-#: appEditors/FlatCAMGeoEditor.py:1470 appEditors/FlatCAMGrbEditor.py:6216
+#: appEditors/appGeoEditor.py:1470 appEditors/FlatCAMGrbEditor.py:6216
 msgid "Geometry shape offset on X axis done"
 msgstr "Ofset pe axa X executat"
 
-#: appEditors/FlatCAMGeoEditor.py:1473 appEditors/FlatCAMGrbEditor.py:6219
+#: appEditors/appGeoEditor.py:1473 appEditors/FlatCAMGrbEditor.py:6219
 msgid "Geometry shape offset X cancelled"
 msgstr "Ofset pe axa X anulat"
 
-#: appEditors/FlatCAMGeoEditor.py:1478 appEditors/FlatCAMGrbEditor.py:6224
+#: appEditors/appGeoEditor.py:1478 appEditors/FlatCAMGrbEditor.py:6224
 msgid "Offset on Y axis ..."
 msgstr "Ofset pe axa Y ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1487 appEditors/FlatCAMGrbEditor.py:6233
+#: appEditors/appGeoEditor.py:1487 appEditors/FlatCAMGrbEditor.py:6233
 msgid "Geometry shape offset on Y axis done"
 msgstr "Ofset pe axa Y executat"
 
-#: appEditors/FlatCAMGeoEditor.py:1490
+#: appEditors/appGeoEditor.py:1490
 msgid "Geometry shape offset on Y axis canceled"
 msgstr "Ofset pe axa Y anulat"
 
-#: appEditors/FlatCAMGeoEditor.py:1493 appEditors/FlatCAMGrbEditor.py:6239
+#: appEditors/appGeoEditor.py:1493 appEditors/FlatCAMGrbEditor.py:6239
 msgid "Skew on X axis ..."
 msgstr "Deformare pe axa X ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1502 appEditors/FlatCAMGrbEditor.py:6248
+#: appEditors/appGeoEditor.py:1502 appEditors/FlatCAMGrbEditor.py:6248
 msgid "Geometry shape skew on X axis done"
 msgstr "Deformarea pe axa X executată"
 
-#: appEditors/FlatCAMGeoEditor.py:1505
+#: appEditors/appGeoEditor.py:1505
 msgid "Geometry shape skew on X axis canceled"
 msgstr "Deformarea pe axa X anulată"
 
-#: appEditors/FlatCAMGeoEditor.py:1508 appEditors/FlatCAMGrbEditor.py:6254
+#: appEditors/appGeoEditor.py:1508 appEditors/FlatCAMGrbEditor.py:6254
 msgid "Skew on Y axis ..."
 msgstr "Deformare pe axa Y ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1517 appEditors/FlatCAMGrbEditor.py:6263
+#: appEditors/appGeoEditor.py:1517 appEditors/FlatCAMGrbEditor.py:6263
 msgid "Geometry shape skew on Y axis done"
 msgstr "Deformarea pe axa Y executată"
 
-#: appEditors/FlatCAMGeoEditor.py:1520
+#: appEditors/appGeoEditor.py:1520
 msgid "Geometry shape skew on Y axis canceled"
 msgstr "Deformarea pe axa Y anulată"
 
-#: appEditors/FlatCAMGeoEditor.py:1950 appEditors/FlatCAMGeoEditor.py:2021
+#: appEditors/appGeoEditor.py:1950 appEditors/appGeoEditor.py:2021
 #: appEditors/FlatCAMGrbEditor.py:1444 appEditors/FlatCAMGrbEditor.py:1522
 msgid "Click on Center point ..."
 msgstr "Click pe punctul de Centru ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1963 appEditors/FlatCAMGrbEditor.py:1454
+#: appEditors/appGeoEditor.py:1963 appEditors/FlatCAMGrbEditor.py:1454
 msgid "Click on Perimeter point to complete ..."
 msgstr "Click pe un punct aflat pe Circumferintă pentru terminare ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1995
+#: appEditors/appGeoEditor.py:1995
 msgid "Done. Adding Circle completed."
 msgstr "Executat. Adăugarea unei forme Cerc terminată."
 
-#: appEditors/FlatCAMGeoEditor.py:2049 appEditors/FlatCAMGrbEditor.py:1555
+#: appEditors/appGeoEditor.py:2049 appEditors/FlatCAMGrbEditor.py:1555
 msgid "Click on Start point ..."
 msgstr "Click pe punctul de Start ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2051 appEditors/FlatCAMGrbEditor.py:1557
+#: appEditors/appGeoEditor.py:2051 appEditors/FlatCAMGrbEditor.py:1557
 msgid "Click on Point3 ..."
 msgstr "Click pe Punctul3 ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2053 appEditors/FlatCAMGrbEditor.py:1559
+#: appEditors/appGeoEditor.py:2053 appEditors/FlatCAMGrbEditor.py:1559
 msgid "Click on Stop point ..."
 msgstr "Click pe punctulde Stop ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2058 appEditors/FlatCAMGrbEditor.py:1564
+#: appEditors/appGeoEditor.py:2058 appEditors/FlatCAMGrbEditor.py:1564
 msgid "Click on Stop point to complete ..."
 msgstr "Click pe punctul de Stop pentru terminare ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2060 appEditors/FlatCAMGrbEditor.py:1566
+#: appEditors/appGeoEditor.py:2060 appEditors/FlatCAMGrbEditor.py:1566
 msgid "Click on Point2 to complete ..."
 msgstr "Click pe Punctul2 pentru terminare ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2062 appEditors/FlatCAMGrbEditor.py:1568
+#: appEditors/appGeoEditor.py:2062 appEditors/FlatCAMGrbEditor.py:1568
 msgid "Click on Center point to complete ..."
 msgstr "Click pe punctul de Centru pentru terminare ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2074
+#: appEditors/appGeoEditor.py:2074
 #, python-format
 msgid "Direction: %s"
 msgstr "Direcţie: %s"
 
-#: appEditors/FlatCAMGeoEditor.py:2088 appEditors/FlatCAMGrbEditor.py:1594
+#: appEditors/appGeoEditor.py:2088 appEditors/FlatCAMGrbEditor.py:1594
 msgid "Mode: Start -> Stop -> Center. Click on Start point ..."
 msgstr "Mod: Start -> Stop -> Centru. Click pe punctul de Start ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2091 appEditors/FlatCAMGrbEditor.py:1597
+#: appEditors/appGeoEditor.py:2091 appEditors/FlatCAMGrbEditor.py:1597
 msgid "Mode: Point1 -> Point3 -> Point2. Click on Point1 ..."
 msgstr "Mod: Point1 -> Point3 -> Point2. Click pe Punctul1 ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2094 appEditors/FlatCAMGrbEditor.py:1600
+#: appEditors/appGeoEditor.py:2094 appEditors/FlatCAMGrbEditor.py:1600
 msgid "Mode: Center -> Start -> Stop. Click on Center point ..."
 msgstr "Mod: Center -> Start -> Stop. Click pe punctul de Centru ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2235
+#: appEditors/appGeoEditor.py:2235
 msgid "Done. Arc completed."
 msgstr "Executat. Adăugarea unei forme Arc terminată."
 
-#: appEditors/FlatCAMGeoEditor.py:2266 appEditors/FlatCAMGeoEditor.py:2339
+#: appEditors/appGeoEditor.py:2266 appEditors/appGeoEditor.py:2339
 msgid "Click on 1st corner ..."
 msgstr "Click pe primul colt ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2278
+#: appEditors/appGeoEditor.py:2278
 msgid "Click on opposite corner to complete ..."
 msgstr "Click pe punctul opus pentru terminare ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2308
+#: appEditors/appGeoEditor.py:2308
 msgid "Done. Rectangle completed."
 msgstr "Executat. Adăugare Pătrat terminată."
 
-#: appEditors/FlatCAMGeoEditor.py:2383
+#: appEditors/appGeoEditor.py:2383
 msgid "Done. Polygon completed."
 msgstr "Executat. Adăugarea unei forme Poligon terminată."
 
-#: appEditors/FlatCAMGeoEditor.py:2397 appEditors/FlatCAMGeoEditor.py:2462
+#: appEditors/appGeoEditor.py:2397 appEditors/appGeoEditor.py:2462
 #: appEditors/FlatCAMGrbEditor.py:1102 appEditors/FlatCAMGrbEditor.py:1322
 msgid "Backtracked one point ..."
 msgstr "Revenit la penultimul Punct ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2440
+#: appEditors/appGeoEditor.py:2440
 msgid "Done. Path completed."
 msgstr "Executat. Traseu finalizat."
 
-#: appEditors/FlatCAMGeoEditor.py:2599
+#: appEditors/appGeoEditor.py:2599
 msgid "No shape selected. Select a shape to explode"
 msgstr "Nicio formă selectată. Selectați o formă pentru a o exploda"
 
-#: appEditors/FlatCAMGeoEditor.py:2632
+#: appEditors/appGeoEditor.py:2632
 msgid "Done. Polygons exploded into lines."
 msgstr "Terminat. Poligoanele au fost descompuse în linii."
 
-#: appEditors/FlatCAMGeoEditor.py:2664
+#: appEditors/appGeoEditor.py:2664
 msgid "MOVE: No shape selected. Select a shape to move"
 msgstr ""
 "MUTARE: Nici-o formă nu este selectată. Selectează o formă pentru a putea "
 "face deplasare"
 
-#: appEditors/FlatCAMGeoEditor.py:2667 appEditors/FlatCAMGeoEditor.py:2687
+#: appEditors/appGeoEditor.py:2667 appEditors/appGeoEditor.py:2687
 msgid " MOVE: Click on reference point ..."
 msgstr " MUTARE: Click pe punctul de referinţă ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2672
+#: appEditors/appGeoEditor.py:2672
 msgid " Click on destination point ..."
 msgstr " Click pe punctul de Destinaţie ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2712
+#: appEditors/appGeoEditor.py:2712
 msgid "Done. Geometry(s) Move completed."
 msgstr "Executat. Mutarea Geometriilor terminată."
 
-#: appEditors/FlatCAMGeoEditor.py:2845
+#: appEditors/appGeoEditor.py:2845
 msgid "Done. Geometry(s) Copy completed."
 msgstr "Executat. Copierea Geometriilor terminată."
 
-#: appEditors/FlatCAMGeoEditor.py:2876 appEditors/FlatCAMGrbEditor.py:897
+#: appEditors/appGeoEditor.py:2876 appEditors/FlatCAMGrbEditor.py:897
 msgid "Click on 1st point ..."
 msgstr "Click pe primul punct ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2900
+#: appEditors/appGeoEditor.py:2900
 msgid ""
 "Font not supported. Only Regular, Bold, Italic and BoldItalic are supported. "
 "Error"
@@ -2709,83 +2709,83 @@ msgstr ""
 "Fontul nu este compatibil. Doar cele tip: Regular, Bold, Italic și "
 "BoldItalic sunt acceptate. Eroarea"
 
-#: appEditors/FlatCAMGeoEditor.py:2908
+#: appEditors/appGeoEditor.py:2908
 msgid "No text to add."
 msgstr "Niciun text de adăugat."
 
-#: appEditors/FlatCAMGeoEditor.py:2918
+#: appEditors/appGeoEditor.py:2918
 msgid " Done. Adding Text completed."
 msgstr " Executat. Adăugarea de Text terminată."
 
-#: appEditors/FlatCAMGeoEditor.py:2955
+#: appEditors/appGeoEditor.py:2955
 msgid "Create buffer geometry ..."
 msgstr "Crează o geometrie de tipe Bufer ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2990 appEditors/FlatCAMGrbEditor.py:5153
+#: appEditors/appGeoEditor.py:2990 appEditors/FlatCAMGrbEditor.py:5153
 msgid "Done. Buffer Tool completed."
 msgstr "Executat. Unealta Bufer terminată."
 
-#: appEditors/FlatCAMGeoEditor.py:3018
+#: appEditors/appGeoEditor.py:3018
 msgid "Done. Buffer Int Tool completed."
 msgstr "Executat. Unealta Bufer Intern terminată."
 
-#: appEditors/FlatCAMGeoEditor.py:3046
+#: appEditors/appGeoEditor.py:3046
 msgid "Done. Buffer Ext Tool completed."
 msgstr "Executat. Unealta Bufer Extern terminată."
 
-#: appEditors/FlatCAMGeoEditor.py:3095 appEditors/FlatCAMGrbEditor.py:2160
+#: appEditors/appGeoEditor.py:3095 appEditors/FlatCAMGrbEditor.py:2160
 msgid "Select a shape to act as deletion area ..."
 msgstr "Selectează o formă geometrică ca formă de stergere ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3097 appEditors/FlatCAMGeoEditor.py:3123
-#: appEditors/FlatCAMGeoEditor.py:3129 appEditors/FlatCAMGrbEditor.py:2162
+#: appEditors/appGeoEditor.py:3097 appEditors/appGeoEditor.py:3123
+#: appEditors/appGeoEditor.py:3129 appEditors/FlatCAMGrbEditor.py:2162
 msgid "Click to pick-up the erase shape..."
 msgstr "Click pentru a activa forma de stergere..."
 
-#: appEditors/FlatCAMGeoEditor.py:3133 appEditors/FlatCAMGrbEditor.py:2221
+#: appEditors/appGeoEditor.py:3133 appEditors/FlatCAMGrbEditor.py:2221
 msgid "Click to erase ..."
 msgstr "Click pt a sterge ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3162 appEditors/FlatCAMGrbEditor.py:2254
+#: appEditors/appGeoEditor.py:3162 appEditors/FlatCAMGrbEditor.py:2254
 msgid "Done. Eraser tool action completed."
 msgstr "Executat. Unealta Stergere s-a terminat."
 
-#: appEditors/FlatCAMGeoEditor.py:3212
+#: appEditors/appGeoEditor.py:3212
 msgid "Create Paint geometry ..."
 msgstr "Crează o geometrie Paint ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3225 appEditors/FlatCAMGrbEditor.py:2417
+#: appEditors/appGeoEditor.py:3225 appEditors/FlatCAMGrbEditor.py:2417
 msgid "Shape transformations ..."
 msgstr "Transformări de forme geometrice ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3281
+#: appEditors/appGeoEditor.py:3281
 #: appGUI/preferences/geometry/GeometryEditorPrefGroupUI.py:27
 msgid "Geometry Editor"
 msgstr "Editor Geometrii"
 
-#: appEditors/FlatCAMGeoEditor.py:3287 appEditors/FlatCAMGrbEditor.py:2495
+#: appEditors/appGeoEditor.py:3287 appEditors/FlatCAMGrbEditor.py:2495
 #: appEditors/FlatCAMGrbEditor.py:3951 appGUI/ObjectUI.py:282
 #: appGUI/ObjectUI.py:1394 appGUI/ObjectUI.py:2256 appTools/ToolCutOut.py:95
 #: appTools/ToolTransform.py:92
 msgid "Type"
 msgstr "Tip"
 
-#: appEditors/FlatCAMGeoEditor.py:3287 appGUI/ObjectUI.py:221
+#: appEditors/appGeoEditor.py:3287 appGUI/ObjectUI.py:221
 #: appGUI/ObjectUI.py:521 appGUI/ObjectUI.py:1330 appGUI/ObjectUI.py:2165
 #: appGUI/ObjectUI.py:2469 appGUI/ObjectUI.py:2536
 #: appTools/ToolCalibration.py:234 appTools/ToolFiducials.py:70
 msgid "Name"
 msgstr "Nume"
 
-#: appEditors/FlatCAMGeoEditor.py:3539
+#: appEditors/appGeoEditor.py:3539
 msgid "Ring"
 msgstr "Inel"
 
-#: appEditors/FlatCAMGeoEditor.py:3541
+#: appEditors/appGeoEditor.py:3541
 msgid "Line"
 msgstr "Linie"
 
-#: appEditors/FlatCAMGeoEditor.py:3543 appGUI/MainGUI.py:1446
+#: appEditors/appGeoEditor.py:3543 appGUI/MainGUI.py:1446
 #: appGUI/ObjectUI.py:1150 appGUI/ObjectUI.py:2005
 #: appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py:226
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:299
@@ -2796,47 +2796,47 @@ msgstr "Linie"
 msgid "Polygon"
 msgstr "Poligon"
 
-#: appEditors/FlatCAMGeoEditor.py:3545
+#: appEditors/appGeoEditor.py:3545
 msgid "Multi-Line"
 msgstr "Multi-Linie"
 
-#: appEditors/FlatCAMGeoEditor.py:3547
+#: appEditors/appGeoEditor.py:3547
 msgid "Multi-Polygon"
 msgstr "Multi-Poligon"
 
-#: appEditors/FlatCAMGeoEditor.py:3554
+#: appEditors/appGeoEditor.py:3554
 msgid "Geo Elem"
 msgstr "Element Geo"
 
-#: appEditors/FlatCAMGeoEditor.py:4007
+#: appEditors/appGeoEditor.py:4007
 msgid "Editing MultiGeo Geometry, tool"
 msgstr "Se editează Geometrie tip MultiGeo. unealta"
 
-#: appEditors/FlatCAMGeoEditor.py:4009
+#: appEditors/appGeoEditor.py:4009
 msgid "with diameter"
 msgstr "cu diametrul"
 
-#: appEditors/FlatCAMGeoEditor.py:4081
+#: appEditors/appGeoEditor.py:4081
 msgid "Grid Snap enabled."
 msgstr "Captura pr grilă activată."
 
-#: appEditors/FlatCAMGeoEditor.py:4085
+#: appEditors/appGeoEditor.py:4085
 msgid "Grid Snap disabled."
 msgstr "Captura pe grilă dezactivată."
 
-#: appEditors/FlatCAMGeoEditor.py:4446 appGUI/MainGUI.py:3046
+#: appEditors/appGeoEditor.py:4446 appGUI/MainGUI.py:3046
 #: appGUI/MainGUI.py:3092 appGUI/MainGUI.py:3110 appGUI/MainGUI.py:3254
 #: appGUI/MainGUI.py:3293 appGUI/MainGUI.py:3305 appGUI/MainGUI.py:3322
 msgid "Click on target point."
 msgstr "Click pe punctul tinta."
 
-#: appEditors/FlatCAMGeoEditor.py:4762 appEditors/FlatCAMGeoEditor.py:4797
+#: appEditors/appGeoEditor.py:4762 appEditors/appGeoEditor.py:4797
 msgid "A selection of at least 2 geo items is required to do Intersection."
 msgstr ""
 "Cel puțin o selecţie de doua forme geometrice este necesară pentru a face o "
 "Intersecţie."
 
-#: appEditors/FlatCAMGeoEditor.py:4883 appEditors/FlatCAMGeoEditor.py:4987
+#: appEditors/appGeoEditor.py:4883 appEditors/appGeoEditor.py:4987
 msgid ""
 "Negative buffer value is not accepted. Use Buffer interior to generate an "
 "'inside' shape"
@@ -2844,56 +2844,56 @@ msgstr ""
 "O valoare de bufer negativă nu se acceptă. Foloseste Bufer Interior pentru a "
 "genera o formă geo. interioară"
 
-#: appEditors/FlatCAMGeoEditor.py:4893 appEditors/FlatCAMGeoEditor.py:4946
-#: appEditors/FlatCAMGeoEditor.py:4996
+#: appEditors/appGeoEditor.py:4893 appEditors/appGeoEditor.py:4946
+#: appEditors/appGeoEditor.py:4996
 msgid "Nothing selected for buffering."
 msgstr "Nici-o forma geometrică nu este selectată pentru a face Bufer."
 
-#: appEditors/FlatCAMGeoEditor.py:4898 appEditors/FlatCAMGeoEditor.py:4950
-#: appEditors/FlatCAMGeoEditor.py:5001
+#: appEditors/appGeoEditor.py:4898 appEditors/appGeoEditor.py:4950
+#: appEditors/appGeoEditor.py:5001
 msgid "Invalid distance for buffering."
 msgstr "Distanta invalida pentru a face Bufer."
 
-#: appEditors/FlatCAMGeoEditor.py:4922 appEditors/FlatCAMGeoEditor.py:5021
+#: appEditors/appGeoEditor.py:4922 appEditors/appGeoEditor.py:5021
 msgid "Failed, the result is empty. Choose a different buffer value."
 msgstr "Eșuat, rezultatul este gol. Foloseşte o valoare diferita pentru Bufer."
 
-#: appEditors/FlatCAMGeoEditor.py:4933
+#: appEditors/appGeoEditor.py:4933
 msgid "Full buffer geometry created."
 msgstr "Geometrie tip Bufer Complet creată."
 
-#: appEditors/FlatCAMGeoEditor.py:4939
+#: appEditors/appGeoEditor.py:4939
 msgid "Negative buffer value is not accepted."
 msgstr "Valoarea bufer negativă nu este acceptată."
 
-#: appEditors/FlatCAMGeoEditor.py:4970
+#: appEditors/appGeoEditor.py:4970
 msgid "Failed, the result is empty. Choose a smaller buffer value."
 msgstr "Eșuat, rezultatul este gol. Foloseşte of valoare mai mica pt. Bufer."
 
-#: appEditors/FlatCAMGeoEditor.py:4980
+#: appEditors/appGeoEditor.py:4980
 msgid "Interior buffer geometry created."
 msgstr "Geometrie Bufer interior creată."
 
-#: appEditors/FlatCAMGeoEditor.py:5031
+#: appEditors/appGeoEditor.py:5031
 msgid "Exterior buffer geometry created."
 msgstr "Geometrie Bufer Exterior creată."
 
-#: appEditors/FlatCAMGeoEditor.py:5037
+#: appEditors/appGeoEditor.py:5037
 #, python-format
 msgid "Could not do Paint. Overlap value has to be less than 100%%."
 msgstr ""
 "Nu se poate face Paint. Valoarea de suprapunere trebuie să fie mai puțin de "
 "100%%."
 
-#: appEditors/FlatCAMGeoEditor.py:5044
+#: appEditors/appGeoEditor.py:5044
 msgid "Nothing selected for painting."
 msgstr "Nici-o forma geometrică nu este selectată pentru Paint."
 
-#: appEditors/FlatCAMGeoEditor.py:5050
+#: appEditors/appGeoEditor.py:5050
 msgid "Invalid value for"
 msgstr "Valoare invalida pentru"
 
-#: appEditors/FlatCAMGeoEditor.py:5109
+#: appEditors/appGeoEditor.py:5109
 msgid ""
 "Could not do Paint. Try a different combination of parameters. Or a "
 "different method of Paint"
@@ -2901,7 +2901,7 @@ msgstr ""
 "Nu se poate face Paint. Incearcă o combinaţie diferita de parametri. Or o "
 "metoda diferita de Paint"
 
-#: appEditors/FlatCAMGeoEditor.py:5120
+#: appEditors/appGeoEditor.py:5120
 msgid "Paint done."
 msgstr "Pictare executata."
 
diff --git a/locale/ru/LC_MESSAGES/strings.po b/locale/ru/LC_MESSAGES/strings.po
index 11368f09..2008a988 100644
--- a/locale/ru/LC_MESSAGES/strings.po
+++ b/locale/ru/LC_MESSAGES/strings.po
@@ -172,7 +172,7 @@ msgstr "Нажмите на конечную точку области."
 msgid "Zone added. Click to start adding next zone or right click to finish."
 msgstr "Зона добавлена. Щелкните правой кнопкой мыши для завершения."
 
-#: Common.py:322 appEditors/FlatCAMGeoEditor.py:2352
+#: Common.py:322 appEditors/appGeoEditor.py:2352
 #: appTools/ToolIsolation.py:2584 appTools/ToolNCC.py:1754
 #: appTools/ToolPaint.py:1647
 msgid "Click on next Point or click right mouse button to complete ..."
@@ -891,7 +891,7 @@ msgid "Conventional"
 msgstr "Обычный"
 
 #: appDatabase.py:1456 appDatabase.py:1565 appDatabase.py:1667
-#: appEditors/FlatCAMGeoEditor.py:450
+#: appEditors/appGeoEditor.py:450
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:167
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:182
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:163
@@ -921,7 +921,7 @@ msgstr ""
 "Более высокие значения = медленная обработка и медленное выполнение на ЧПУ\n"
 "из-за большого количества путей."
 
-#: appDatabase.py:1477 appDatabase.py:1586 appEditors/FlatCAMGeoEditor.py:470
+#: appDatabase.py:1477 appDatabase.py:1586 appEditors/appGeoEditor.py:470
 #: appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py:72
 #: appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py:229
 #: appGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py:59
@@ -950,7 +950,7 @@ msgstr "Отступ"
 msgid "Bounding box margin."
 msgstr "Граница рамки."
 
-#: appDatabase.py:1490 appDatabase.py:1601 appEditors/FlatCAMGeoEditor.py:484
+#: appDatabase.py:1490 appDatabase.py:1601 appEditors/appGeoEditor.py:484
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:105
 #: appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py:106
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:215
@@ -973,7 +973,7 @@ msgstr ""
 "- Круговой: наружу от центра.\n"
 "- Линейный: параллельные линии."
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2232 appTools/ToolNCC.py:2764
@@ -983,8 +983,8 @@ msgstr ""
 msgid "Standard"
 msgstr "Стандартный"
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
-#: appEditors/FlatCAMGeoEditor.py:568 appEditors/FlatCAMGeoEditor.py:5091
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
+#: appEditors/appGeoEditor.py:568 appEditors/appGeoEditor.py:5091
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2243 appTools/ToolNCC.py:2770
@@ -995,8 +995,8 @@ msgstr "Стандартный"
 msgid "Seed"
 msgstr "По кругу"
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
-#: appEditors/FlatCAMGeoEditor.py:5095
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
+#: appEditors/appGeoEditor.py:5095
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217
 #: appTools/ToolNCC.py:431 appTools/ToolNCC.py:2254 appTools/ToolPaint.py:389
@@ -1020,7 +1020,7 @@ msgstr "Комбо"
 msgid "Connect"
 msgstr "Подключение"
 
-#: appDatabase.py:1512 appDatabase.py:1629 appEditors/FlatCAMGeoEditor.py:507
+#: appDatabase.py:1512 appDatabase.py:1629 appEditors/appGeoEditor.py:507
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:239
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:226
 #: appTools/ToolNCC.py:443 appTools/ToolPaint.py:403
@@ -1038,7 +1038,7 @@ msgstr ""
 msgid "Contour"
 msgstr "Контур"
 
-#: appDatabase.py:1522 appDatabase.py:1636 appEditors/FlatCAMGeoEditor.py:517
+#: appDatabase.py:1522 appDatabase.py:1636 appEditors/appGeoEditor.py:517
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:248
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:234
 #: appTools/ToolNCC.py:453 appTools/ToolPaint.py:410
@@ -1049,7 +1049,7 @@ msgstr ""
 "Обрезка по периметру полигона\n"
 "для зачистки неровных краёв."
 
-#: appDatabase.py:1528 appEditors/FlatCAMGeoEditor.py:611
+#: appDatabase.py:1528 appEditors/appGeoEditor.py:611
 #: appEditors/FlatCAMGrbEditor.py:5304 appGUI/ObjectUI.py:143
 #: appGUI/ObjectUI.py:1394 appGUI/ObjectUI.py:2256
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:255
@@ -1072,7 +1072,7 @@ msgstr ""
 "из медных штучек.\n"
 "Значение может быть от 0 до 10 единиц FlatCAM."
 
-#: appDatabase.py:1567 appEditors/FlatCAMGeoEditor.py:452
+#: appDatabase.py:1567 appEditors/appGeoEditor.py:452
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:165
 #: appTools/ToolPaint.py:330
 msgid ""
@@ -1094,7 +1094,7 @@ msgstr ""
 "Более высокие значения = медленная обработка и медленное выполнение на ЧПУ\n"
 "из-за большого количества путей."
 
-#: appDatabase.py:1588 appEditors/FlatCAMGeoEditor.py:472
+#: appDatabase.py:1588 appEditors/appGeoEditor.py:472
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:185
 #: appTools/ToolPaint.py:351
 msgid ""
@@ -1554,7 +1554,7 @@ msgstr "Y"
 #: appEditors/FlatCAMExcEditor.py:1800 appEditors/FlatCAMExcEditor.py:1871
 #: appEditors/FlatCAMExcEditor.py:1875 appEditors/FlatCAMExcEditor.py:1964
 #: appEditors/FlatCAMExcEditor.py:1982 appEditors/FlatCAMExcEditor.py:2016
-#: appEditors/FlatCAMGeoEditor.py:683 appEditors/FlatCAMGrbEditor.py:2822
+#: appEditors/appGeoEditor.py:683 appEditors/FlatCAMGrbEditor.py:2822
 #: appEditors/FlatCAMGrbEditor.py:2839 appEditors/FlatCAMGrbEditor.py:2875
 #: appEditors/FlatCAMGrbEditor.py:5376
 #: appGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py:94
@@ -1779,7 +1779,7 @@ msgid "Cancelled. There is no Tool/Drill selected"
 msgstr "Отмена. Инструмент/сверло не выбрано"
 
 #: appEditors/FlatCAMExcEditor.py:3601 appEditors/FlatCAMExcEditor.py:3609
-#: appEditors/FlatCAMGeoEditor.py:4286 appEditors/FlatCAMGeoEditor.py:4300
+#: appEditors/appGeoEditor.py:4286 appEditors/appGeoEditor.py:4300
 #: appEditors/FlatCAMGrbEditor.py:1085 appEditors/FlatCAMGrbEditor.py:1312
 #: appEditors/FlatCAMGrbEditor.py:1497 appEditors/FlatCAMGrbEditor.py:1766
 #: appEditors/FlatCAMGrbEditor.py:4608 appEditors/FlatCAMGrbEditor.py:4625
@@ -1798,15 +1798,15 @@ msgstr "Готово. Отверстия удалены."
 msgid "Click on the circular array Center position"
 msgstr "Нажмите на центральную позицию кругового массива"
 
-#: appEditors/FlatCAMGeoEditor.py:84
+#: appEditors/appGeoEditor.py:84
 msgid "Buffer distance:"
 msgstr "Расстояние буфера:"
 
-#: appEditors/FlatCAMGeoEditor.py:85
+#: appEditors/appGeoEditor.py:85
 msgid "Buffer corner:"
 msgstr "Угол буфера:"
 
-#: appEditors/FlatCAMGeoEditor.py:87
+#: appEditors/appGeoEditor.py:87
 msgid ""
 "There are 3 types of corners:\n"
 " - 'Round': the corner is rounded for exterior buffer.\n"
@@ -1819,11 +1819,11 @@ msgstr ""
 "- 'Квадрат:' угол встречается под острым углом для внешнего буфера.\n"
 "- 'Скошенный:' линия, напрямую соединяющая элементы, встречающиеся в углу"
 
-#: appEditors/FlatCAMGeoEditor.py:93 appEditors/FlatCAMGrbEditor.py:2638
+#: appEditors/appGeoEditor.py:93 appEditors/FlatCAMGrbEditor.py:2638
 msgid "Round"
 msgstr "Круглый"
 
-#: appEditors/FlatCAMGeoEditor.py:94 appEditors/FlatCAMGrbEditor.py:2639
+#: appEditors/appGeoEditor.py:94 appEditors/FlatCAMGrbEditor.py:2639
 #: appGUI/ObjectUI.py:1149 appGUI/ObjectUI.py:2004
 #: appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py:225
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:68
@@ -1841,50 +1841,50 @@ msgstr "Круглый"
 msgid "Square"
 msgstr "Квадрат"
 
-#: appEditors/FlatCAMGeoEditor.py:95 appEditors/FlatCAMGrbEditor.py:2640
+#: appEditors/appGeoEditor.py:95 appEditors/FlatCAMGrbEditor.py:2640
 msgid "Beveled"
 msgstr "Скошенный"
 
-#: appEditors/FlatCAMGeoEditor.py:102
+#: appEditors/appGeoEditor.py:102
 msgid "Buffer Interior"
 msgstr "Буфер внутри"
 
-#: appEditors/FlatCAMGeoEditor.py:104
+#: appEditors/appGeoEditor.py:104
 msgid "Buffer Exterior"
 msgstr "Буфер снаружи"
 
-#: appEditors/FlatCAMGeoEditor.py:110
+#: appEditors/appGeoEditor.py:110
 msgid "Full Buffer"
 msgstr "Полный буфер"
 
-#: appEditors/FlatCAMGeoEditor.py:131 appEditors/FlatCAMGeoEditor.py:2959
+#: appEditors/appGeoEditor.py:131 appEditors/appGeoEditor.py:2959
 #: appGUI/MainGUI.py:4301
 #: appGUI/preferences/gerber/GerberEditorPrefGroupUI.py:191
 msgid "Buffer Tool"
 msgstr "Буфер"
 
-#: appEditors/FlatCAMGeoEditor.py:143 appEditors/FlatCAMGeoEditor.py:160
-#: appEditors/FlatCAMGeoEditor.py:177 appEditors/FlatCAMGeoEditor.py:2978
-#: appEditors/FlatCAMGeoEditor.py:3006 appEditors/FlatCAMGeoEditor.py:3034
+#: appEditors/appGeoEditor.py:143 appEditors/appGeoEditor.py:160
+#: appEditors/appGeoEditor.py:177 appEditors/appGeoEditor.py:2978
+#: appEditors/appGeoEditor.py:3006 appEditors/appGeoEditor.py:3034
 #: appEditors/FlatCAMGrbEditor.py:5109
 msgid "Buffer distance value is missing or wrong format. Add it and retry."
 msgstr ""
 "Отсутствует значение расстояния буфера или оно имеет неправильный формат. "
 "Добавьте его и повторите попытку."
 
-#: appEditors/FlatCAMGeoEditor.py:241
+#: appEditors/appGeoEditor.py:241
 msgid "Font"
 msgstr "Шрифт"
 
-#: appEditors/FlatCAMGeoEditor.py:322 appGUI/MainGUI.py:1452
+#: appEditors/appGeoEditor.py:322 appGUI/MainGUI.py:1452
 msgid "Text"
 msgstr "Tекст"
 
-#: appEditors/FlatCAMGeoEditor.py:348
+#: appEditors/appGeoEditor.py:348
 msgid "Text Tool"
 msgstr "Текст"
 
-#: appEditors/FlatCAMGeoEditor.py:404 appGUI/MainGUI.py:502
+#: appEditors/appGeoEditor.py:404 appGUI/MainGUI.py:502
 #: appGUI/MainGUI.py:1199 appGUI/ObjectUI.py:597 appGUI/ObjectUI.py:1564
 #: appObjects/FlatCAMExcellon.py:852 appObjects/FlatCAMExcellon.py:1242
 #: appObjects/FlatCAMGeometry.py:825 appTools/ToolIsolation.py:313
@@ -1893,15 +1893,15 @@ msgstr "Текст"
 msgid "Tool"
 msgstr "Инструменты"
 
-#: appEditors/FlatCAMGeoEditor.py:438
+#: appEditors/appGeoEditor.py:438
 msgid "Tool dia"
 msgstr "Диаметр инструмента"
 
-#: appEditors/FlatCAMGeoEditor.py:440
+#: appEditors/appGeoEditor.py:440
 msgid "Diameter of the tool to be used in the operation."
 msgstr "Диаметр инструмента используемого в этой операции."
 
-#: appEditors/FlatCAMGeoEditor.py:486
+#: appEditors/appGeoEditor.py:486
 msgid ""
 "Algorithm to paint the polygons:\n"
 "- Standard: Fixed step inwards.\n"
@@ -1913,57 +1913,57 @@ msgstr ""
 "- Круговой: наружу от центра.\n"
 "- Линейный: параллельные линии."
 
-#: appEditors/FlatCAMGeoEditor.py:505
+#: appEditors/appGeoEditor.py:505
 msgid "Connect:"
 msgstr "Подключение:"
 
-#: appEditors/FlatCAMGeoEditor.py:515
+#: appEditors/appGeoEditor.py:515
 msgid "Contour:"
 msgstr "Контур:"
 
-#: appEditors/FlatCAMGeoEditor.py:528 appGUI/MainGUI.py:1456
+#: appEditors/appGeoEditor.py:528 appGUI/MainGUI.py:1456
 msgid "Paint"
 msgstr "Нарисовать"
 
-#: appEditors/FlatCAMGeoEditor.py:546 appGUI/MainGUI.py:912
+#: appEditors/appGeoEditor.py:546 appGUI/MainGUI.py:912
 #: appGUI/MainGUI.py:1944 appGUI/ObjectUI.py:2069 appTools/ToolPaint.py:42
 #: appTools/ToolPaint.py:737
 msgid "Paint Tool"
 msgstr "Рисование"
 
-#: appEditors/FlatCAMGeoEditor.py:582 appEditors/FlatCAMGeoEditor.py:1071
-#: appEditors/FlatCAMGeoEditor.py:2966 appEditors/FlatCAMGeoEditor.py:2994
-#: appEditors/FlatCAMGeoEditor.py:3022 appEditors/FlatCAMGeoEditor.py:4439
+#: appEditors/appGeoEditor.py:582 appEditors/appGeoEditor.py:1071
+#: appEditors/appGeoEditor.py:2966 appEditors/appGeoEditor.py:2994
+#: appEditors/appGeoEditor.py:3022 appEditors/appGeoEditor.py:4439
 #: appEditors/FlatCAMGrbEditor.py:5764
 msgid "Cancelled. No shape selected."
 msgstr "Отменено. Форма не выбрана."
 
-#: appEditors/FlatCAMGeoEditor.py:595 appEditors/FlatCAMGeoEditor.py:2984
-#: appEditors/FlatCAMGeoEditor.py:3012 appEditors/FlatCAMGeoEditor.py:3040
+#: appEditors/appGeoEditor.py:595 appEditors/appGeoEditor.py:2984
+#: appEditors/appGeoEditor.py:3012 appEditors/appGeoEditor.py:3040
 #: appGUI/preferences/geometry/GeometryGenPrefGroupUI.py:69
 #: appTools/ToolProperties.py:117 appTools/ToolProperties.py:162
 msgid "Tools"
 msgstr "Инструменты"
 
-#: appEditors/FlatCAMGeoEditor.py:606 appEditors/FlatCAMGeoEditor.py:1035
+#: appEditors/appGeoEditor.py:606 appEditors/appGeoEditor.py:1035
 #: appEditors/FlatCAMGrbEditor.py:5299 appEditors/FlatCAMGrbEditor.py:5728
 #: appGUI/MainGUI.py:935 appGUI/MainGUI.py:1967 appTools/ToolTransform.py:494
 msgid "Transform Tool"
 msgstr "Трансформация"
 
-#: appEditors/FlatCAMGeoEditor.py:607 appEditors/FlatCAMGeoEditor.py:699
+#: appEditors/appGeoEditor.py:607 appEditors/appGeoEditor.py:699
 #: appEditors/FlatCAMGrbEditor.py:5300 appEditors/FlatCAMGrbEditor.py:5392
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:88
 #: appTools/ToolTransform.py:27 appTools/ToolTransform.py:146
 msgid "Rotate"
 msgstr "Вращение"
 
-#: appEditors/FlatCAMGeoEditor.py:608 appEditors/FlatCAMGrbEditor.py:5301
+#: appEditors/appGeoEditor.py:608 appEditors/FlatCAMGrbEditor.py:5301
 #: appTools/ToolTransform.py:28
 msgid "Skew/Shear"
 msgstr "Наклон/Сдвиг"
 
-#: appEditors/FlatCAMGeoEditor.py:609 appEditors/FlatCAMGrbEditor.py:2687
+#: appEditors/appGeoEditor.py:609 appEditors/FlatCAMGrbEditor.py:2687
 #: appEditors/FlatCAMGrbEditor.py:5302 appGUI/MainGUI.py:1057
 #: appGUI/MainGUI.py:1499 appGUI/MainGUI.py:2089 appGUI/MainGUI.py:4513
 #: appGUI/ObjectUI.py:125
@@ -1972,12 +1972,12 @@ msgstr "Наклон/Сдвиг"
 msgid "Scale"
 msgstr "Масштаб"
 
-#: appEditors/FlatCAMGeoEditor.py:610 appEditors/FlatCAMGrbEditor.py:5303
+#: appEditors/appGeoEditor.py:610 appEditors/FlatCAMGrbEditor.py:5303
 #: appTools/ToolTransform.py:30
 msgid "Mirror (Flip)"
 msgstr "Зеркалирование (отражение)"
 
-#: appEditors/FlatCAMGeoEditor.py:612 appEditors/FlatCAMGrbEditor.py:2647
+#: appEditors/appGeoEditor.py:612 appEditors/FlatCAMGrbEditor.py:2647
 #: appEditors/FlatCAMGrbEditor.py:5305 appGUI/MainGUI.py:1055
 #: appGUI/MainGUI.py:1454 appGUI/MainGUI.py:1497 appGUI/MainGUI.py:2087
 #: appGUI/MainGUI.py:4511
@@ -1986,7 +1986,7 @@ msgstr "Зеркалирование (отражение)"
 msgid "Buffer"
 msgstr "Буфер"
 
-#: appEditors/FlatCAMGeoEditor.py:643 appEditors/FlatCAMGrbEditor.py:5336
+#: appEditors/appGeoEditor.py:643 appEditors/FlatCAMGrbEditor.py:5336
 #: appGUI/GUIElements.py:2701
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:169
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:44
@@ -1995,7 +1995,7 @@ msgstr "Буфер"
 msgid "Reference"
 msgstr "Ссылка"
 
-#: appEditors/FlatCAMGeoEditor.py:645 appEditors/FlatCAMGrbEditor.py:5338
+#: appEditors/appGeoEditor.py:645 appEditors/FlatCAMGrbEditor.py:5338
 msgid ""
 "The reference point for Rotate, Skew, Scale, Mirror.\n"
 "Can be:\n"
@@ -2012,14 +2012,14 @@ msgstr ""
 "- Точка -> пользовательская точка, заданная координатами X,Y.\n"
 "- Мин Выделение -> точка (minx, miny) ограничивающего поля выделения"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
 #: appTools/ToolCalibration.py:770 appTools/ToolCalibration.py:771
 #: appTools/ToolTransform.py:70
 msgid "Origin"
 msgstr "Источник"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGeoEditor.py:1044
+#: appEditors/appGeoEditor.py:653 appEditors/appGeoEditor.py:1044
 #: appEditors/FlatCAMGrbEditor.py:5346 appEditors/FlatCAMGrbEditor.py:5737
 #: appGUI/preferences/general/GeneralGUIPrefGroupUI.py:250
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:275
@@ -2031,7 +2031,7 @@ msgstr "Источник"
 msgid "Selection"
 msgstr "Выбор"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 #: appGUI/preferences/tools/Tools2sidedPrefGroupUI.py:80
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:60
@@ -2039,11 +2039,11 @@ msgstr "Выбор"
 msgid "Point"
 msgstr "Точка"
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 msgid "Minimum"
 msgstr "Минимальное расстояние"
 
-#: appEditors/FlatCAMGeoEditor.py:659 appEditors/FlatCAMGeoEditor.py:955
+#: appEditors/appGeoEditor.py:659 appEditors/appGeoEditor.py:955
 #: appEditors/FlatCAMGrbEditor.py:5352 appEditors/FlatCAMGrbEditor.py:5648
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:131
 #: appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py:133
@@ -2054,13 +2054,13 @@ msgstr "Минимальное расстояние"
 msgid "Value"
 msgstr "Значение"
 
-#: appEditors/FlatCAMGeoEditor.py:661 appEditors/FlatCAMGrbEditor.py:5354
+#: appEditors/appGeoEditor.py:661 appEditors/FlatCAMGrbEditor.py:5354
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:62
 #: appTools/ToolTransform.py:78
 msgid "A point of reference in format X,Y."
 msgstr "Точка привязки в формате X,Y."
 
-#: appEditors/FlatCAMGeoEditor.py:668 appEditors/FlatCAMGrbEditor.py:2590
+#: appEditors/appGeoEditor.py:668 appEditors/FlatCAMGrbEditor.py:2590
 #: appEditors/FlatCAMGrbEditor.py:5361 appGUI/ObjectUI.py:1494
 #: appTools/ToolDblSided.py:192 appTools/ToolDblSided.py:425
 #: appTools/ToolIsolation.py:276 appTools/ToolIsolation.py:631
@@ -2071,12 +2071,12 @@ msgstr "Точка привязки в формате X,Y."
 msgid "Add"
 msgstr "Добавить"
 
-#: appEditors/FlatCAMGeoEditor.py:670 appEditors/FlatCAMGrbEditor.py:5363
+#: appEditors/appGeoEditor.py:670 appEditors/FlatCAMGrbEditor.py:5363
 #: appTools/ToolTransform.py:87
 msgid "Add point coordinates from clipboard."
 msgstr "Координаты скопированы в буфер обмена."
 
-#: appEditors/FlatCAMGeoEditor.py:685 appEditors/FlatCAMGrbEditor.py:5378
+#: appEditors/appGeoEditor.py:685 appEditors/FlatCAMGrbEditor.py:5378
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:98
 #: appTools/ToolTransform.py:132
 msgid ""
@@ -2090,7 +2090,7 @@ msgstr ""
 "Положительные числа для движения по часовой стрелке.\n"
 "Отрицательные числа для движения против часовой стрелки."
 
-#: appEditors/FlatCAMGeoEditor.py:701 appEditors/FlatCAMGrbEditor.py:5394
+#: appEditors/appGeoEditor.py:701 appEditors/FlatCAMGrbEditor.py:5394
 #: appTools/ToolTransform.py:148
 msgid ""
 "Rotate the selected object(s).\n"
@@ -2101,7 +2101,7 @@ msgstr ""
 "Точкой отсчета является середина\n"
 "ограничительная рамка для всех выбранных объектов."
 
-#: appEditors/FlatCAMGeoEditor.py:721 appEditors/FlatCAMGeoEditor.py:783
+#: appEditors/appGeoEditor.py:721 appEditors/appGeoEditor.py:783
 #: appEditors/FlatCAMGrbEditor.py:5414 appEditors/FlatCAMGrbEditor.py:5476
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:112
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:151
@@ -2109,7 +2109,7 @@ msgstr ""
 msgid "Link"
 msgstr "Ссылка"
 
-#: appEditors/FlatCAMGeoEditor.py:723 appEditors/FlatCAMGeoEditor.py:785
+#: appEditors/appGeoEditor.py:723 appEditors/appGeoEditor.py:785
 #: appEditors/FlatCAMGrbEditor.py:5416 appEditors/FlatCAMGrbEditor.py:5478
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:114
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:153
@@ -2117,14 +2117,14 @@ msgstr "Ссылка"
 msgid "Link the Y entry to X entry and copy its content."
 msgstr "Соедините запись Y с записью X и скопируйте ее содержимое."
 
-#: appEditors/FlatCAMGeoEditor.py:728 appEditors/FlatCAMGrbEditor.py:5421
+#: appEditors/appGeoEditor.py:728 appEditors/FlatCAMGrbEditor.py:5421
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:151
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:124
 #: appTools/ToolFilm.py:184 appTools/ToolTransform.py:175
 msgid "X angle"
 msgstr "Угол наклона X"
 
-#: appEditors/FlatCAMGeoEditor.py:730 appEditors/FlatCAMGeoEditor.py:751
+#: appEditors/appGeoEditor.py:730 appEditors/appGeoEditor.py:751
 #: appEditors/FlatCAMGrbEditor.py:5423 appEditors/FlatCAMGrbEditor.py:5444
 #: appTools/ToolTransform.py:177 appTools/ToolTransform.py:198
 msgid ""
@@ -2134,12 +2134,12 @@ msgstr ""
 "Угол наклона в градусах.\n"
 "Число с плавающей запятой между -360 и 360."
 
-#: appEditors/FlatCAMGeoEditor.py:738 appEditors/FlatCAMGrbEditor.py:5431
+#: appEditors/appGeoEditor.py:738 appEditors/FlatCAMGrbEditor.py:5431
 #: appTools/ToolTransform.py:185
 msgid "Skew X"
 msgstr "Наклон X"
 
-#: appEditors/FlatCAMGeoEditor.py:740 appEditors/FlatCAMGeoEditor.py:761
+#: appEditors/appGeoEditor.py:740 appEditors/appGeoEditor.py:761
 #: appEditors/FlatCAMGrbEditor.py:5433 appEditors/FlatCAMGrbEditor.py:5454
 #: appTools/ToolTransform.py:187 appTools/ToolTransform.py:208
 msgid ""
@@ -2151,37 +2151,37 @@ msgstr ""
 "Точка отсчета - середина\n"
 "ограничительной рамки для всех выбранных объектов."
 
-#: appEditors/FlatCAMGeoEditor.py:749 appEditors/FlatCAMGrbEditor.py:5442
+#: appEditors/appGeoEditor.py:749 appEditors/FlatCAMGrbEditor.py:5442
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:160
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:138
 #: appTools/ToolFilm.py:193 appTools/ToolTransform.py:196
 msgid "Y angle"
 msgstr "Угол наклона Y"
 
-#: appEditors/FlatCAMGeoEditor.py:759 appEditors/FlatCAMGrbEditor.py:5452
+#: appEditors/appGeoEditor.py:759 appEditors/FlatCAMGrbEditor.py:5452
 #: appTools/ToolTransform.py:206
 msgid "Skew Y"
 msgstr "Наклон Y"
 
-#: appEditors/FlatCAMGeoEditor.py:790 appEditors/FlatCAMGrbEditor.py:5483
+#: appEditors/appGeoEditor.py:790 appEditors/FlatCAMGrbEditor.py:5483
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:120
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:162
 #: appTools/ToolFilm.py:145 appTools/ToolTransform.py:237
 msgid "X factor"
 msgstr "Коэффициент X"
 
-#: appEditors/FlatCAMGeoEditor.py:792 appEditors/FlatCAMGrbEditor.py:5485
+#: appEditors/appGeoEditor.py:792 appEditors/FlatCAMGrbEditor.py:5485
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:164
 #: appTools/ToolTransform.py:239
 msgid "Factor for scaling on X axis."
 msgstr "Коэффициент масштабирования по оси X."
 
-#: appEditors/FlatCAMGeoEditor.py:799 appEditors/FlatCAMGrbEditor.py:5492
+#: appEditors/appGeoEditor.py:799 appEditors/FlatCAMGrbEditor.py:5492
 #: appTools/ToolTransform.py:246
 msgid "Scale X"
 msgstr "Масштаб Х"
 
-#: appEditors/FlatCAMGeoEditor.py:801 appEditors/FlatCAMGeoEditor.py:821
+#: appEditors/appGeoEditor.py:801 appEditors/appGeoEditor.py:821
 #: appEditors/FlatCAMGrbEditor.py:5494 appEditors/FlatCAMGrbEditor.py:5514
 #: appTools/ToolTransform.py:248 appTools/ToolTransform.py:268
 msgid ""
@@ -2193,58 +2193,58 @@ msgstr ""
 "Точка отсчета зависит от\n"
 "состояние флажка Scale Reference."
 
-#: appEditors/FlatCAMGeoEditor.py:810 appEditors/FlatCAMGrbEditor.py:5503
+#: appEditors/appGeoEditor.py:810 appEditors/FlatCAMGrbEditor.py:5503
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:129
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:175
 #: appTools/ToolFilm.py:154 appTools/ToolTransform.py:257
 msgid "Y factor"
 msgstr "Коэффициент Y"
 
-#: appEditors/FlatCAMGeoEditor.py:812 appEditors/FlatCAMGrbEditor.py:5505
+#: appEditors/appGeoEditor.py:812 appEditors/FlatCAMGrbEditor.py:5505
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:177
 #: appTools/ToolTransform.py:259
 msgid "Factor for scaling on Y axis."
 msgstr "Коэффициент масштабирования по оси Y."
 
-#: appEditors/FlatCAMGeoEditor.py:819 appEditors/FlatCAMGrbEditor.py:5512
+#: appEditors/appGeoEditor.py:819 appEditors/FlatCAMGrbEditor.py:5512
 #: appTools/ToolTransform.py:266
 msgid "Scale Y"
 msgstr "Масштаб Y"
 
-#: appEditors/FlatCAMGeoEditor.py:846 appEditors/FlatCAMGrbEditor.py:5539
+#: appEditors/appGeoEditor.py:846 appEditors/FlatCAMGrbEditor.py:5539
 #: appTools/ToolTransform.py:293
 msgid "Flip on X"
 msgstr "Отразить по X"
 
-#: appEditors/FlatCAMGeoEditor.py:848 appEditors/FlatCAMGeoEditor.py:853
+#: appEditors/appGeoEditor.py:848 appEditors/appGeoEditor.py:853
 #: appEditors/FlatCAMGrbEditor.py:5541 appEditors/FlatCAMGrbEditor.py:5546
 #: appTools/ToolTransform.py:295 appTools/ToolTransform.py:300
 msgid "Flip the selected object(s) over the X axis."
 msgstr "Отражает выбранные фигуры по оси X."
 
-#: appEditors/FlatCAMGeoEditor.py:851 appEditors/FlatCAMGrbEditor.py:5544
+#: appEditors/appGeoEditor.py:851 appEditors/FlatCAMGrbEditor.py:5544
 #: appTools/ToolTransform.py:298
 msgid "Flip on Y"
 msgstr "Отразить по Y"
 
-#: appEditors/FlatCAMGeoEditor.py:871 appEditors/FlatCAMGrbEditor.py:5564
+#: appEditors/appGeoEditor.py:871 appEditors/FlatCAMGrbEditor.py:5564
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:191
 #: appTools/ToolTransform.py:318
 msgid "X val"
 msgstr "Значение X"
 
-#: appEditors/FlatCAMGeoEditor.py:873 appEditors/FlatCAMGrbEditor.py:5566
+#: appEditors/appGeoEditor.py:873 appEditors/FlatCAMGrbEditor.py:5566
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:193
 #: appTools/ToolTransform.py:320
 msgid "Distance to offset on X axis. In current units."
 msgstr "Расстояние смещения по оси X. В текущих единицах."
 
-#: appEditors/FlatCAMGeoEditor.py:880 appEditors/FlatCAMGrbEditor.py:5573
+#: appEditors/appGeoEditor.py:880 appEditors/FlatCAMGrbEditor.py:5573
 #: appTools/ToolTransform.py:327
 msgid "Offset X"
 msgstr "Смещение Х"
 
-#: appEditors/FlatCAMGeoEditor.py:882 appEditors/FlatCAMGeoEditor.py:902
+#: appEditors/appGeoEditor.py:882 appEditors/appGeoEditor.py:902
 #: appEditors/FlatCAMGrbEditor.py:5575 appEditors/FlatCAMGrbEditor.py:5595
 #: appTools/ToolTransform.py:329 appTools/ToolTransform.py:349
 msgid ""
@@ -2256,31 +2256,31 @@ msgstr ""
 "Точка отсчета - середина\n"
 "ограничительной рамки для всех выбранных объектов.\n"
 
-#: appEditors/FlatCAMGeoEditor.py:891 appEditors/FlatCAMGrbEditor.py:5584
+#: appEditors/appGeoEditor.py:891 appEditors/FlatCAMGrbEditor.py:5584
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:204
 #: appTools/ToolTransform.py:338
 msgid "Y val"
 msgstr "Значение Y"
 
-#: appEditors/FlatCAMGeoEditor.py:893 appEditors/FlatCAMGrbEditor.py:5586
+#: appEditors/appGeoEditor.py:893 appEditors/FlatCAMGrbEditor.py:5586
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:206
 #: appTools/ToolTransform.py:340
 msgid "Distance to offset on Y axis. In current units."
 msgstr "Расстояние смещения по оси Y. В текущих единицах."
 
-#: appEditors/FlatCAMGeoEditor.py:900 appEditors/FlatCAMGrbEditor.py:5593
+#: appEditors/appGeoEditor.py:900 appEditors/FlatCAMGrbEditor.py:5593
 #: appTools/ToolTransform.py:347
 msgid "Offset Y"
 msgstr "Смещение Y"
 
-#: appEditors/FlatCAMGeoEditor.py:920 appEditors/FlatCAMGrbEditor.py:5613
+#: appEditors/appGeoEditor.py:920 appEditors/FlatCAMGrbEditor.py:5613
 #: appGUI/preferences/tools/Tools2QRCodePrefGroupUI.py:142
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:216
 #: appTools/ToolQRCode.py:206 appTools/ToolTransform.py:367
 msgid "Rounded"
 msgstr "Закругленный"
 
-#: appEditors/FlatCAMGeoEditor.py:922 appEditors/FlatCAMGrbEditor.py:5615
+#: appEditors/appGeoEditor.py:922 appEditors/FlatCAMGrbEditor.py:5615
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:218
 #: appTools/ToolTransform.py:369
 msgid ""
@@ -2294,14 +2294,14 @@ msgstr ""
 "Если не проверить, то буфер будет следовать точной геометрии\n"
 "буферизованной формы."
 
-#: appEditors/FlatCAMGeoEditor.py:930 appEditors/FlatCAMGrbEditor.py:5623
+#: appEditors/appGeoEditor.py:930 appEditors/FlatCAMGrbEditor.py:5623
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:226
 #: appTools/ToolDistance.py:505 appTools/ToolDistanceMin.py:286
 #: appTools/ToolTransform.py:377
 msgid "Distance"
 msgstr "Расстояние"
 
-#: appEditors/FlatCAMGeoEditor.py:932 appEditors/FlatCAMGrbEditor.py:5625
+#: appEditors/appGeoEditor.py:932 appEditors/FlatCAMGrbEditor.py:5625
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:228
 #: appTools/ToolTransform.py:379
 msgid ""
@@ -2315,12 +2315,12 @@ msgstr ""
 "Каждый геометрический элемент объекта будет увеличен\n"
 "или уменьшается с помощью \"расстояния\"."
 
-#: appEditors/FlatCAMGeoEditor.py:944 appEditors/FlatCAMGrbEditor.py:5637
+#: appEditors/appGeoEditor.py:944 appEditors/FlatCAMGrbEditor.py:5637
 #: appTools/ToolTransform.py:391
 msgid "Buffer D"
 msgstr "Буфер D"
 
-#: appEditors/FlatCAMGeoEditor.py:946 appEditors/FlatCAMGrbEditor.py:5639
+#: appEditors/appGeoEditor.py:946 appEditors/FlatCAMGrbEditor.py:5639
 #: appTools/ToolTransform.py:393
 msgid ""
 "Create the buffer effect on each geometry,\n"
@@ -2329,7 +2329,7 @@ msgstr ""
 "Создаёт буферный эффект для каждой геометрии,\n"
 "элемента из выбранного объекта, используя расстояние."
 
-#: appEditors/FlatCAMGeoEditor.py:957 appEditors/FlatCAMGrbEditor.py:5650
+#: appEditors/appGeoEditor.py:957 appEditors/FlatCAMGrbEditor.py:5650
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:245
 #: appTools/ToolTransform.py:404
 msgid ""
@@ -2345,12 +2345,12 @@ msgstr ""
 "или уменьшен, чтобы соответствовать \"Значению\". Значение в процентах\n"
 "исходного размера."
 
-#: appEditors/FlatCAMGeoEditor.py:970 appEditors/FlatCAMGrbEditor.py:5663
+#: appEditors/appGeoEditor.py:970 appEditors/FlatCAMGrbEditor.py:5663
 #: appTools/ToolTransform.py:417
 msgid "Buffer F"
 msgstr "Буфер F"
 
-#: appEditors/FlatCAMGeoEditor.py:972 appEditors/FlatCAMGrbEditor.py:5665
+#: appEditors/appGeoEditor.py:972 appEditors/FlatCAMGrbEditor.py:5665
 #: appTools/ToolTransform.py:419
 msgid ""
 "Create the buffer effect on each geometry,\n"
@@ -2359,7 +2359,7 @@ msgstr ""
 "Создаёт буферный эффект для каждой геометрии,\n"
 "элемента из выбранного объекта, используя коэффициент."
 
-#: appEditors/FlatCAMGeoEditor.py:1043 appEditors/FlatCAMGrbEditor.py:5736
+#: appEditors/appGeoEditor.py:1043 appEditors/FlatCAMGrbEditor.py:5736
 #: appGUI/ObjectUI.py:1103 appGUI/ObjectUI.py:1958
 #: appGUI/preferences/tools/Tools2CalPrefGroupUI.py:48
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
@@ -2370,328 +2370,328 @@ msgstr ""
 msgid "Object"
 msgstr "Объект"
 
-#: appEditors/FlatCAMGeoEditor.py:1107 appEditors/FlatCAMGeoEditor.py:1130
-#: appEditors/FlatCAMGeoEditor.py:1276 appEditors/FlatCAMGeoEditor.py:1301
-#: appEditors/FlatCAMGeoEditor.py:1335 appEditors/FlatCAMGeoEditor.py:1370
-#: appEditors/FlatCAMGeoEditor.py:1401 appEditors/FlatCAMGrbEditor.py:5800
+#: appEditors/appGeoEditor.py:1107 appEditors/appGeoEditor.py:1130
+#: appEditors/appGeoEditor.py:1276 appEditors/appGeoEditor.py:1301
+#: appEditors/appGeoEditor.py:1335 appEditors/appGeoEditor.py:1370
+#: appEditors/appGeoEditor.py:1401 appEditors/FlatCAMGrbEditor.py:5800
 #: appEditors/FlatCAMGrbEditor.py:5823 appEditors/FlatCAMGrbEditor.py:5968
 #: appEditors/FlatCAMGrbEditor.py:6001 appEditors/FlatCAMGrbEditor.py:6044
 #: appEditors/FlatCAMGrbEditor.py:6085 appEditors/FlatCAMGrbEditor.py:6121
 msgid "No shape selected."
 msgstr "Фигура не выбрана."
 
-#: appEditors/FlatCAMGeoEditor.py:1115 appEditors/FlatCAMGrbEditor.py:5808
+#: appEditors/appGeoEditor.py:1115 appEditors/FlatCAMGrbEditor.py:5808
 #: appTools/ToolTransform.py:585
 msgid "Incorrect format for Point value. Needs format X,Y"
 msgstr "Неправильный формат для значения точки. Требуется формат X,Y"
 
-#: appEditors/FlatCAMGeoEditor.py:1140 appEditors/FlatCAMGrbEditor.py:5833
+#: appEditors/appGeoEditor.py:1140 appEditors/FlatCAMGrbEditor.py:5833
 #: appTools/ToolTransform.py:602
 msgid "Rotate transformation can not be done for a value of 0."
 msgstr "Трансформация поворота не может быть выполнена для значения 0."
 
-#: appEditors/FlatCAMGeoEditor.py:1198 appEditors/FlatCAMGeoEditor.py:1219
+#: appEditors/appGeoEditor.py:1198 appEditors/appGeoEditor.py:1219
 #: appEditors/FlatCAMGrbEditor.py:5891 appEditors/FlatCAMGrbEditor.py:5912
 #: appTools/ToolTransform.py:660 appTools/ToolTransform.py:681
 msgid "Scale transformation can not be done for a factor of 0 or 1."
 msgstr ""
 "Преобразование масштаба не может быть выполнено с коэффициентом 0 или 1."
 
-#: appEditors/FlatCAMGeoEditor.py:1232 appEditors/FlatCAMGeoEditor.py:1241
+#: appEditors/appGeoEditor.py:1232 appEditors/appGeoEditor.py:1241
 #: appEditors/FlatCAMGrbEditor.py:5925 appEditors/FlatCAMGrbEditor.py:5934
 #: appTools/ToolTransform.py:694 appTools/ToolTransform.py:703
 msgid "Offset transformation can not be done for a value of 0."
 msgstr "Трансформация смещения не может быть выполнена для значения 0."
 
-#: appEditors/FlatCAMGeoEditor.py:1271 appEditors/FlatCAMGrbEditor.py:5971
+#: appEditors/appGeoEditor.py:1271 appEditors/FlatCAMGrbEditor.py:5971
 #: appTools/ToolTransform.py:731
 msgid "Appying Rotate"
 msgstr "Применение поворота"
 
-#: appEditors/FlatCAMGeoEditor.py:1284 appEditors/FlatCAMGrbEditor.py:5983
+#: appEditors/appGeoEditor.py:1284 appEditors/FlatCAMGrbEditor.py:5983
 msgid "Done. Rotate completed."
 msgstr "Готово. Поворот выполнен."
 
-#: appEditors/FlatCAMGeoEditor.py:1286
+#: appEditors/appGeoEditor.py:1286
 msgid "Rotation action was not executed"
 msgstr "Вращение не было выполнено"
 
-#: appEditors/FlatCAMGeoEditor.py:1304 appEditors/FlatCAMGrbEditor.py:6004
+#: appEditors/appGeoEditor.py:1304 appEditors/FlatCAMGrbEditor.py:6004
 #: appTools/ToolTransform.py:757
 msgid "Applying Flip"
 msgstr "Применение отражения"
 
-#: appEditors/FlatCAMGeoEditor.py:1312 appEditors/FlatCAMGrbEditor.py:6016
+#: appEditors/appGeoEditor.py:1312 appEditors/FlatCAMGrbEditor.py:6016
 #: appTools/ToolTransform.py:774
 msgid "Flip on the Y axis done"
 msgstr "Отражение по оси Y завершено"
 
-#: appEditors/FlatCAMGeoEditor.py:1315 appEditors/FlatCAMGrbEditor.py:6024
+#: appEditors/appGeoEditor.py:1315 appEditors/FlatCAMGrbEditor.py:6024
 #: appTools/ToolTransform.py:783
 msgid "Flip on the X axis done"
 msgstr "Отражение по оси Х завершёно"
 
-#: appEditors/FlatCAMGeoEditor.py:1319
+#: appEditors/appGeoEditor.py:1319
 msgid "Flip action was not executed"
 msgstr "Операция переворота не была выполнена"
 
-#: appEditors/FlatCAMGeoEditor.py:1338 appEditors/FlatCAMGrbEditor.py:6047
+#: appEditors/appGeoEditor.py:1338 appEditors/FlatCAMGrbEditor.py:6047
 #: appTools/ToolTransform.py:804
 msgid "Applying Skew"
 msgstr "Применение наклона"
 
-#: appEditors/FlatCAMGeoEditor.py:1347 appEditors/FlatCAMGrbEditor.py:6063
+#: appEditors/appGeoEditor.py:1347 appEditors/FlatCAMGrbEditor.py:6063
 msgid "Skew on the X axis done"
 msgstr "Наклон по оси X выполнен"
 
-#: appEditors/FlatCAMGeoEditor.py:1349 appEditors/FlatCAMGrbEditor.py:6065
+#: appEditors/appGeoEditor.py:1349 appEditors/FlatCAMGrbEditor.py:6065
 msgid "Skew on the Y axis done"
 msgstr "Наклон по оси Y выполнен"
 
-#: appEditors/FlatCAMGeoEditor.py:1352
+#: appEditors/appGeoEditor.py:1352
 msgid "Skew action was not executed"
 msgstr "Наклон не был выполнен"
 
-#: appEditors/FlatCAMGeoEditor.py:1373 appEditors/FlatCAMGrbEditor.py:6088
+#: appEditors/appGeoEditor.py:1373 appEditors/FlatCAMGrbEditor.py:6088
 #: appTools/ToolTransform.py:831
 msgid "Applying Scale"
 msgstr "Применение масштабирования"
 
-#: appEditors/FlatCAMGeoEditor.py:1382 appEditors/FlatCAMGrbEditor.py:6101
+#: appEditors/appGeoEditor.py:1382 appEditors/FlatCAMGrbEditor.py:6101
 msgid "Scale on the X axis done"
 msgstr "Масштабирование по оси X выполнено"
 
-#: appEditors/FlatCAMGeoEditor.py:1384 appEditors/FlatCAMGrbEditor.py:6103
+#: appEditors/appGeoEditor.py:1384 appEditors/FlatCAMGrbEditor.py:6103
 msgid "Scale on the Y axis done"
 msgstr "Масштабирование по оси Y выполнено"
 
-#: appEditors/FlatCAMGeoEditor.py:1386
+#: appEditors/appGeoEditor.py:1386
 msgid "Scale action was not executed"
 msgstr "Операция масштабирования не была выполнена"
 
-#: appEditors/FlatCAMGeoEditor.py:1404 appEditors/FlatCAMGrbEditor.py:6124
+#: appEditors/appGeoEditor.py:1404 appEditors/FlatCAMGrbEditor.py:6124
 #: appTools/ToolTransform.py:859
 msgid "Applying Offset"
 msgstr "Применение смещения"
 
-#: appEditors/FlatCAMGeoEditor.py:1414 appEditors/FlatCAMGrbEditor.py:6145
+#: appEditors/appGeoEditor.py:1414 appEditors/FlatCAMGrbEditor.py:6145
 msgid "Offset on the X axis done"
 msgstr "Смещение формы по оси X выполнено"
 
-#: appEditors/FlatCAMGeoEditor.py:1416 appEditors/FlatCAMGrbEditor.py:6147
+#: appEditors/appGeoEditor.py:1416 appEditors/FlatCAMGrbEditor.py:6147
 msgid "Offset on the Y axis done"
 msgstr "Смещение формы по оси Y выполнено"
 
-#: appEditors/FlatCAMGeoEditor.py:1419
+#: appEditors/appGeoEditor.py:1419
 msgid "Offset action was not executed"
 msgstr "Операция смещения не была выполнена"
 
-#: appEditors/FlatCAMGeoEditor.py:1426 appEditors/FlatCAMGrbEditor.py:6157
+#: appEditors/appGeoEditor.py:1426 appEditors/FlatCAMGrbEditor.py:6157
 msgid "No shape selected"
 msgstr "Фигура не выбрана"
 
-#: appEditors/FlatCAMGeoEditor.py:1429 appEditors/FlatCAMGrbEditor.py:6160
+#: appEditors/appGeoEditor.py:1429 appEditors/FlatCAMGrbEditor.py:6160
 #: appTools/ToolTransform.py:889
 msgid "Applying Buffer"
 msgstr "Применение буфера"
 
-#: appEditors/FlatCAMGeoEditor.py:1436 appEditors/FlatCAMGrbEditor.py:6182
+#: appEditors/appGeoEditor.py:1436 appEditors/FlatCAMGrbEditor.py:6182
 #: appTools/ToolTransform.py:910
 msgid "Buffer done"
 msgstr "Буфер готов"
 
-#: appEditors/FlatCAMGeoEditor.py:1440 appEditors/FlatCAMGrbEditor.py:6186
+#: appEditors/appGeoEditor.py:1440 appEditors/FlatCAMGrbEditor.py:6186
 #: appTools/ToolTransform.py:879 appTools/ToolTransform.py:915
 msgid "Action was not executed, due of"
 msgstr "Действие не было выполнено, в связи с"
 
-#: appEditors/FlatCAMGeoEditor.py:1444 appEditors/FlatCAMGrbEditor.py:6190
+#: appEditors/appGeoEditor.py:1444 appEditors/FlatCAMGrbEditor.py:6190
 msgid "Rotate ..."
 msgstr "Поворот ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1445 appEditors/FlatCAMGeoEditor.py:1494
-#: appEditors/FlatCAMGeoEditor.py:1509 appEditors/FlatCAMGrbEditor.py:6191
+#: appEditors/appGeoEditor.py:1445 appEditors/appGeoEditor.py:1494
+#: appEditors/appGeoEditor.py:1509 appEditors/FlatCAMGrbEditor.py:6191
 #: appEditors/FlatCAMGrbEditor.py:6240 appEditors/FlatCAMGrbEditor.py:6255
 msgid "Enter an Angle Value (degrees)"
 msgstr "Введите значение угла (градусы)"
 
-#: appEditors/FlatCAMGeoEditor.py:1453 appEditors/FlatCAMGrbEditor.py:6199
+#: appEditors/appGeoEditor.py:1453 appEditors/FlatCAMGrbEditor.py:6199
 msgid "Geometry shape rotate done"
 msgstr "Вращение фигуры выполнено"
 
-#: appEditors/FlatCAMGeoEditor.py:1456 appEditors/FlatCAMGrbEditor.py:6202
+#: appEditors/appGeoEditor.py:1456 appEditors/FlatCAMGrbEditor.py:6202
 msgid "Geometry shape rotate cancelled"
 msgstr "Вращение фигуры отменено"
 
-#: appEditors/FlatCAMGeoEditor.py:1461 appEditors/FlatCAMGrbEditor.py:6207
+#: appEditors/appGeoEditor.py:1461 appEditors/FlatCAMGrbEditor.py:6207
 msgid "Offset on X axis ..."
 msgstr "Смещение по оси X ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1462 appEditors/FlatCAMGeoEditor.py:1479
+#: appEditors/appGeoEditor.py:1462 appEditors/appGeoEditor.py:1479
 #: appEditors/FlatCAMGrbEditor.py:6208 appEditors/FlatCAMGrbEditor.py:6225
 msgid "Enter a distance Value"
 msgstr "Введите значение расстояния"
 
-#: appEditors/FlatCAMGeoEditor.py:1470 appEditors/FlatCAMGrbEditor.py:6216
+#: appEditors/appGeoEditor.py:1470 appEditors/FlatCAMGrbEditor.py:6216
 msgid "Geometry shape offset on X axis done"
 msgstr "Смещение формы по оси X выполнено"
 
-#: appEditors/FlatCAMGeoEditor.py:1473 appEditors/FlatCAMGrbEditor.py:6219
+#: appEditors/appGeoEditor.py:1473 appEditors/FlatCAMGrbEditor.py:6219
 msgid "Geometry shape offset X cancelled"
 msgstr "Смещение формы по оси X отменено"
 
-#: appEditors/FlatCAMGeoEditor.py:1478 appEditors/FlatCAMGrbEditor.py:6224
+#: appEditors/appGeoEditor.py:1478 appEditors/FlatCAMGrbEditor.py:6224
 msgid "Offset on Y axis ..."
 msgstr "Смещение по оси Y ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1487 appEditors/FlatCAMGrbEditor.py:6233
+#: appEditors/appGeoEditor.py:1487 appEditors/FlatCAMGrbEditor.py:6233
 msgid "Geometry shape offset on Y axis done"
 msgstr "Смещение формы по оси Y выполнено"
 
-#: appEditors/FlatCAMGeoEditor.py:1490
+#: appEditors/appGeoEditor.py:1490
 msgid "Geometry shape offset on Y axis canceled"
 msgstr "Смещение формы по оси Y отменено"
 
-#: appEditors/FlatCAMGeoEditor.py:1493 appEditors/FlatCAMGrbEditor.py:6239
+#: appEditors/appGeoEditor.py:1493 appEditors/FlatCAMGrbEditor.py:6239
 msgid "Skew on X axis ..."
 msgstr "Наклон по оси X ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1502 appEditors/FlatCAMGrbEditor.py:6248
+#: appEditors/appGeoEditor.py:1502 appEditors/FlatCAMGrbEditor.py:6248
 msgid "Geometry shape skew on X axis done"
 msgstr "Наклон формы по оси X выполнен"
 
-#: appEditors/FlatCAMGeoEditor.py:1505
+#: appEditors/appGeoEditor.py:1505
 msgid "Geometry shape skew on X axis canceled"
 msgstr "Наклон формы по оси X отменён"
 
-#: appEditors/FlatCAMGeoEditor.py:1508 appEditors/FlatCAMGrbEditor.py:6254
+#: appEditors/appGeoEditor.py:1508 appEditors/FlatCAMGrbEditor.py:6254
 msgid "Skew on Y axis ..."
 msgstr "Наклон по оси Y ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1517 appEditors/FlatCAMGrbEditor.py:6263
+#: appEditors/appGeoEditor.py:1517 appEditors/FlatCAMGrbEditor.py:6263
 msgid "Geometry shape skew on Y axis done"
 msgstr "Наклон формы по оси Y выполнен"
 
-#: appEditors/FlatCAMGeoEditor.py:1520
+#: appEditors/appGeoEditor.py:1520
 msgid "Geometry shape skew on Y axis canceled"
 msgstr "Наклон формы по оси Y отменён"
 
-#: appEditors/FlatCAMGeoEditor.py:1950 appEditors/FlatCAMGeoEditor.py:2021
+#: appEditors/appGeoEditor.py:1950 appEditors/appGeoEditor.py:2021
 #: appEditors/FlatCAMGrbEditor.py:1444 appEditors/FlatCAMGrbEditor.py:1522
 msgid "Click on Center point ..."
 msgstr "Нажмите на  центральную точку ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1963 appEditors/FlatCAMGrbEditor.py:1454
+#: appEditors/appGeoEditor.py:1963 appEditors/FlatCAMGrbEditor.py:1454
 msgid "Click on Perimeter point to complete ..."
 msgstr "Для завершения щелкните по периметру ..."
 
-#: appEditors/FlatCAMGeoEditor.py:1995
+#: appEditors/appGeoEditor.py:1995
 msgid "Done. Adding Circle completed."
 msgstr "Готово. Добавление круга завершено."
 
-#: appEditors/FlatCAMGeoEditor.py:2049 appEditors/FlatCAMGrbEditor.py:1555
+#: appEditors/appGeoEditor.py:2049 appEditors/FlatCAMGrbEditor.py:1555
 msgid "Click on Start point ..."
 msgstr "Нажмите на точку начала отсчета..."
 
-#: appEditors/FlatCAMGeoEditor.py:2051 appEditors/FlatCAMGrbEditor.py:1557
+#: appEditors/appGeoEditor.py:2051 appEditors/FlatCAMGrbEditor.py:1557
 msgid "Click on Point3 ..."
 msgstr "Нажмите на 3-ю точку ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2053 appEditors/FlatCAMGrbEditor.py:1559
+#: appEditors/appGeoEditor.py:2053 appEditors/FlatCAMGrbEditor.py:1559
 msgid "Click on Stop point ..."
 msgstr "Нажмите на конечную точку ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2058 appEditors/FlatCAMGrbEditor.py:1564
+#: appEditors/appGeoEditor.py:2058 appEditors/FlatCAMGrbEditor.py:1564
 msgid "Click on Stop point to complete ..."
 msgstr "Нажмите на конечную точку для завершения ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2060 appEditors/FlatCAMGrbEditor.py:1566
+#: appEditors/appGeoEditor.py:2060 appEditors/FlatCAMGrbEditor.py:1566
 msgid "Click on Point2 to complete ..."
 msgstr "Нажмите на 2-ю точку для завершения ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2062 appEditors/FlatCAMGrbEditor.py:1568
+#: appEditors/appGeoEditor.py:2062 appEditors/FlatCAMGrbEditor.py:1568
 msgid "Click on Center point to complete ..."
 msgstr "Нажмите на  центральную точку для завершения..."
 
-#: appEditors/FlatCAMGeoEditor.py:2074
+#: appEditors/appGeoEditor.py:2074
 #, python-format
 msgid "Direction: %s"
 msgstr "Направление: %s"
 
-#: appEditors/FlatCAMGeoEditor.py:2088 appEditors/FlatCAMGrbEditor.py:1594
+#: appEditors/appGeoEditor.py:2088 appEditors/FlatCAMGrbEditor.py:1594
 msgid "Mode: Start -> Stop -> Center. Click on Start point ..."
 msgstr "Режим: Старт -> Стоп -> Центр. Нажмите на начальную точку ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2091 appEditors/FlatCAMGrbEditor.py:1597
+#: appEditors/appGeoEditor.py:2091 appEditors/FlatCAMGrbEditor.py:1597
 msgid "Mode: Point1 -> Point3 -> Point2. Click on Point1 ..."
 msgstr "Режим: Точка1 -> Точка3 -> Точка2. Нажмите на Точку1 ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2094 appEditors/FlatCAMGrbEditor.py:1600
+#: appEditors/appGeoEditor.py:2094 appEditors/FlatCAMGrbEditor.py:1600
 msgid "Mode: Center -> Start -> Stop. Click on Center point ..."
 msgstr "Режим: Центр -> Старт -> Стоп. Нажмите на центральную точку ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2235
+#: appEditors/appGeoEditor.py:2235
 msgid "Done. Arc completed."
 msgstr "Готово. Дуга завершена."
 
-#: appEditors/FlatCAMGeoEditor.py:2266 appEditors/FlatCAMGeoEditor.py:2339
+#: appEditors/appGeoEditor.py:2266 appEditors/appGeoEditor.py:2339
 msgid "Click on 1st corner ..."
 msgstr "Нажмите на 1-ый угол ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2278
+#: appEditors/appGeoEditor.py:2278
 msgid "Click on opposite corner to complete ..."
 msgstr "Нажмите на противоположном углу для завершения ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2308
+#: appEditors/appGeoEditor.py:2308
 msgid "Done. Rectangle completed."
 msgstr "Готово. Прямоугольник завершен."
 
-#: appEditors/FlatCAMGeoEditor.py:2383
+#: appEditors/appGeoEditor.py:2383
 msgid "Done. Polygon completed."
 msgstr "Готово. Полигон завершен."
 
-#: appEditors/FlatCAMGeoEditor.py:2397 appEditors/FlatCAMGeoEditor.py:2462
+#: appEditors/appGeoEditor.py:2397 appEditors/appGeoEditor.py:2462
 #: appEditors/FlatCAMGrbEditor.py:1102 appEditors/FlatCAMGrbEditor.py:1322
 msgid "Backtracked one point ..."
 msgstr "Отступ на одну точку ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2440
+#: appEditors/appGeoEditor.py:2440
 msgid "Done. Path completed."
 msgstr "Готово. Путь завершен."
 
-#: appEditors/FlatCAMGeoEditor.py:2599
+#: appEditors/appGeoEditor.py:2599
 msgid "No shape selected. Select a shape to explode"
 msgstr "Фигура не выбрана. Выберите фигуру для разделения"
 
-#: appEditors/FlatCAMGeoEditor.py:2632
+#: appEditors/appGeoEditor.py:2632
 msgid "Done. Polygons exploded into lines."
 msgstr "Готово. Полигоны разделены на линии."
 
-#: appEditors/FlatCAMGeoEditor.py:2664
+#: appEditors/appGeoEditor.py:2664
 msgid "MOVE: No shape selected. Select a shape to move"
 msgstr "ПЕРЕМЕЩЕНИЕ: Фигура не выбрана. Выберите фигуру для перемещения"
 
-#: appEditors/FlatCAMGeoEditor.py:2667 appEditors/FlatCAMGeoEditor.py:2687
+#: appEditors/appGeoEditor.py:2667 appEditors/appGeoEditor.py:2687
 msgid " MOVE: Click on reference point ..."
 msgstr " Перемещение: Нажмите на исходную точку ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2672
+#: appEditors/appGeoEditor.py:2672
 msgid " Click on destination point ..."
 msgstr " Нажмите на конечную точку ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2712
+#: appEditors/appGeoEditor.py:2712
 msgid "Done. Geometry(s) Move completed."
 msgstr "Готово. Перемещение Geometry завершено."
 
-#: appEditors/FlatCAMGeoEditor.py:2845
+#: appEditors/appGeoEditor.py:2845
 msgid "Done. Geometry(s) Copy completed."
 msgstr "Готово. Копирование Geometry завершено."
 
-#: appEditors/FlatCAMGeoEditor.py:2876 appEditors/FlatCAMGrbEditor.py:897
+#: appEditors/appGeoEditor.py:2876 appEditors/FlatCAMGrbEditor.py:897
 msgid "Click on 1st point ..."
 msgstr "Нажмите на 1-й точке ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2900
+#: appEditors/appGeoEditor.py:2900
 msgid ""
 "Font not supported. Only Regular, Bold, Italic and BoldItalic are supported. "
 "Error"
@@ -2699,83 +2699,83 @@ msgstr ""
 "Шрифт не поддерживается. Поддерживаются только обычный, полужирный, курсив и "
 "полужирный курсив. Ошибка"
 
-#: appEditors/FlatCAMGeoEditor.py:2908
+#: appEditors/appGeoEditor.py:2908
 msgid "No text to add."
 msgstr "Нет текста для добавления."
 
-#: appEditors/FlatCAMGeoEditor.py:2918
+#: appEditors/appGeoEditor.py:2918
 msgid " Done. Adding Text completed."
 msgstr " Готово. Добавление текста завершено."
 
-#: appEditors/FlatCAMGeoEditor.py:2955
+#: appEditors/appGeoEditor.py:2955
 msgid "Create buffer geometry ..."
 msgstr "Создание геометрии буфера ..."
 
-#: appEditors/FlatCAMGeoEditor.py:2990 appEditors/FlatCAMGrbEditor.py:5153
+#: appEditors/appGeoEditor.py:2990 appEditors/FlatCAMGrbEditor.py:5153
 msgid "Done. Buffer Tool completed."
 msgstr "Готово. Создание буфера завершено."
 
-#: appEditors/FlatCAMGeoEditor.py:3018
+#: appEditors/appGeoEditor.py:3018
 msgid "Done. Buffer Int Tool completed."
 msgstr "Готово. Внутренний буфер создан."
 
-#: appEditors/FlatCAMGeoEditor.py:3046
+#: appEditors/appGeoEditor.py:3046
 msgid "Done. Buffer Ext Tool completed."
 msgstr "Готово. Внешний буфер создан."
 
-#: appEditors/FlatCAMGeoEditor.py:3095 appEditors/FlatCAMGrbEditor.py:2160
+#: appEditors/appGeoEditor.py:3095 appEditors/FlatCAMGrbEditor.py:2160
 msgid "Select a shape to act as deletion area ..."
 msgstr "Выберите фигуру в качестве области для удаления ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3097 appEditors/FlatCAMGeoEditor.py:3123
-#: appEditors/FlatCAMGeoEditor.py:3129 appEditors/FlatCAMGrbEditor.py:2162
+#: appEditors/appGeoEditor.py:3097 appEditors/appGeoEditor.py:3123
+#: appEditors/appGeoEditor.py:3129 appEditors/FlatCAMGrbEditor.py:2162
 msgid "Click to pick-up the erase shape..."
 msgstr "Кликните, что бы выбрать фигуру для стирания ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3133 appEditors/FlatCAMGrbEditor.py:2221
+#: appEditors/appGeoEditor.py:3133 appEditors/FlatCAMGrbEditor.py:2221
 msgid "Click to erase ..."
 msgstr "Нажмите для очистки ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3162 appEditors/FlatCAMGrbEditor.py:2254
+#: appEditors/appGeoEditor.py:3162 appEditors/FlatCAMGrbEditor.py:2254
 msgid "Done. Eraser tool action completed."
 msgstr "Готово. Действие инструмента стирания завершено.."
 
-#: appEditors/FlatCAMGeoEditor.py:3212
+#: appEditors/appGeoEditor.py:3212
 msgid "Create Paint geometry ..."
 msgstr "Создать геометрию окрашивания ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3225 appEditors/FlatCAMGrbEditor.py:2417
+#: appEditors/appGeoEditor.py:3225 appEditors/FlatCAMGrbEditor.py:2417
 msgid "Shape transformations ..."
 msgstr "Преобразования фигуры ..."
 
-#: appEditors/FlatCAMGeoEditor.py:3281
+#: appEditors/appGeoEditor.py:3281
 #: appGUI/preferences/geometry/GeometryEditorPrefGroupUI.py:27
 msgid "Geometry Editor"
 msgstr "Редактор Geometry"
 
-#: appEditors/FlatCAMGeoEditor.py:3287 appEditors/FlatCAMGrbEditor.py:2495
+#: appEditors/appGeoEditor.py:3287 appEditors/FlatCAMGrbEditor.py:2495
 #: appEditors/FlatCAMGrbEditor.py:3951 appGUI/ObjectUI.py:282
 #: appGUI/ObjectUI.py:1394 appGUI/ObjectUI.py:2256 appTools/ToolCutOut.py:95
 #: appTools/ToolTransform.py:92
 msgid "Type"
 msgstr "Тип"
 
-#: appEditors/FlatCAMGeoEditor.py:3287 appGUI/ObjectUI.py:221
+#: appEditors/appGeoEditor.py:3287 appGUI/ObjectUI.py:221
 #: appGUI/ObjectUI.py:521 appGUI/ObjectUI.py:1330 appGUI/ObjectUI.py:2165
 #: appGUI/ObjectUI.py:2469 appGUI/ObjectUI.py:2536
 #: appTools/ToolCalibration.py:234 appTools/ToolFiducials.py:70
 msgid "Name"
 msgstr "Имя"
 
-#: appEditors/FlatCAMGeoEditor.py:3539
+#: appEditors/appGeoEditor.py:3539
 msgid "Ring"
 msgstr "Кольцо"
 
-#: appEditors/FlatCAMGeoEditor.py:3541
+#: appEditors/appGeoEditor.py:3541
 msgid "Line"
 msgstr "Линия"
 
-#: appEditors/FlatCAMGeoEditor.py:3543 appGUI/MainGUI.py:1446
+#: appEditors/appGeoEditor.py:3543 appGUI/MainGUI.py:1446
 #: appGUI/ObjectUI.py:1150 appGUI/ObjectUI.py:2005
 #: appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py:226
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:299
@@ -2786,45 +2786,45 @@ msgstr "Линия"
 msgid "Polygon"
 msgstr "Полигон"
 
-#: appEditors/FlatCAMGeoEditor.py:3545
+#: appEditors/appGeoEditor.py:3545
 msgid "Multi-Line"
 msgstr "Multi-Line"
 
-#: appEditors/FlatCAMGeoEditor.py:3547
+#: appEditors/appGeoEditor.py:3547
 msgid "Multi-Polygon"
 msgstr "Multi-Polygon"
 
-#: appEditors/FlatCAMGeoEditor.py:3554
+#: appEditors/appGeoEditor.py:3554
 msgid "Geo Elem"
 msgstr "Элемент Geo"
 
-#: appEditors/FlatCAMGeoEditor.py:4007
+#: appEditors/appGeoEditor.py:4007
 msgid "Editing MultiGeo Geometry, tool"
 msgstr "Редактирование MultiGeo Geometry, инструментом"
 
-#: appEditors/FlatCAMGeoEditor.py:4009
+#: appEditors/appGeoEditor.py:4009
 msgid "with diameter"
 msgstr "с диаметром"
 
-#: appEditors/FlatCAMGeoEditor.py:4081
+#: appEditors/appGeoEditor.py:4081
 msgid "Grid Snap enabled."
 msgstr "Привязка к сетке включена."
 
-#: appEditors/FlatCAMGeoEditor.py:4085
+#: appEditors/appGeoEditor.py:4085
 msgid "Grid Snap disabled."
 msgstr "Привязка к сетке отключена."
 
-#: appEditors/FlatCAMGeoEditor.py:4446 appGUI/MainGUI.py:3046
+#: appEditors/appGeoEditor.py:4446 appGUI/MainGUI.py:3046
 #: appGUI/MainGUI.py:3092 appGUI/MainGUI.py:3110 appGUI/MainGUI.py:3254
 #: appGUI/MainGUI.py:3293 appGUI/MainGUI.py:3305 appGUI/MainGUI.py:3322
 msgid "Click on target point."
 msgstr "Нажмите на целевой точке."
 
-#: appEditors/FlatCAMGeoEditor.py:4762 appEditors/FlatCAMGeoEditor.py:4797
+#: appEditors/appGeoEditor.py:4762 appEditors/appGeoEditor.py:4797
 msgid "A selection of at least 2 geo items is required to do Intersection."
 msgstr "Выберите по крайней мере 2 элемента геометрии для пересечения."
 
-#: appEditors/FlatCAMGeoEditor.py:4883 appEditors/FlatCAMGeoEditor.py:4987
+#: appEditors/appGeoEditor.py:4883 appEditors/appGeoEditor.py:4987
 msgid ""
 "Negative buffer value is not accepted. Use Buffer interior to generate an "
 "'inside' shape"
@@ -2832,54 +2832,54 @@ msgstr ""
 "Отрицательное значение буфера не принимается. Используйте внутренний буфер "
 "для создания \"внутри\" формы"
 
-#: appEditors/FlatCAMGeoEditor.py:4893 appEditors/FlatCAMGeoEditor.py:4946
-#: appEditors/FlatCAMGeoEditor.py:4996
+#: appEditors/appGeoEditor.py:4893 appEditors/appGeoEditor.py:4946
+#: appEditors/appGeoEditor.py:4996
 msgid "Nothing selected for buffering."
 msgstr "Ничего не выбрано для создания буфера."
 
-#: appEditors/FlatCAMGeoEditor.py:4898 appEditors/FlatCAMGeoEditor.py:4950
-#: appEditors/FlatCAMGeoEditor.py:5001
+#: appEditors/appGeoEditor.py:4898 appEditors/appGeoEditor.py:4950
+#: appEditors/appGeoEditor.py:5001
 msgid "Invalid distance for buffering."
 msgstr "Недопустимое расстояние для создания буфера."
 
-#: appEditors/FlatCAMGeoEditor.py:4922 appEditors/FlatCAMGeoEditor.py:5021
+#: appEditors/appGeoEditor.py:4922 appEditors/appGeoEditor.py:5021
 msgid "Failed, the result is empty. Choose a different buffer value."
 msgstr "Ошибка, результат нулевой. Выберите другое значение буфера."
 
-#: appEditors/FlatCAMGeoEditor.py:4933
+#: appEditors/appGeoEditor.py:4933
 msgid "Full buffer geometry created."
 msgstr "Создана геометрия полного буфера."
 
-#: appEditors/FlatCAMGeoEditor.py:4939
+#: appEditors/appGeoEditor.py:4939
 msgid "Negative buffer value is not accepted."
 msgstr "Отрицательное значение буфера не принимается."
 
-#: appEditors/FlatCAMGeoEditor.py:4970
+#: appEditors/appGeoEditor.py:4970
 msgid "Failed, the result is empty. Choose a smaller buffer value."
 msgstr "Ошибка, результат нулевой. Выберите меньшее значение буфера."
 
-#: appEditors/FlatCAMGeoEditor.py:4980
+#: appEditors/appGeoEditor.py:4980
 msgid "Interior buffer geometry created."
 msgstr "Создана геометрия внутреннего буфера."
 
-#: appEditors/FlatCAMGeoEditor.py:5031
+#: appEditors/appGeoEditor.py:5031
 msgid "Exterior buffer geometry created."
 msgstr "Создана геометрия внешнего буфера."
 
-#: appEditors/FlatCAMGeoEditor.py:5037
+#: appEditors/appGeoEditor.py:5037
 #, python-format
 msgid "Could not do Paint. Overlap value has to be less than 100%%."
 msgstr "Окраска не выполнена. Значение перекрытия должно быть меньше 100%%."
 
-#: appEditors/FlatCAMGeoEditor.py:5044
+#: appEditors/appGeoEditor.py:5044
 msgid "Nothing selected for painting."
 msgstr "Ничего не выбрано для рисования."
 
-#: appEditors/FlatCAMGeoEditor.py:5050
+#: appEditors/appGeoEditor.py:5050
 msgid "Invalid value for"
 msgstr "Недопустимые значения для"
 
-#: appEditors/FlatCAMGeoEditor.py:5109
+#: appEditors/appGeoEditor.py:5109
 msgid ""
 "Could not do Paint. Try a different combination of parameters. Or a "
 "different method of Paint"
@@ -2887,7 +2887,7 @@ msgstr ""
 "Окраска не выполнена. Попробуйте другую комбинацию параметров или другой "
 "способ рисования"
 
-#: appEditors/FlatCAMGeoEditor.py:5120
+#: appEditors/appGeoEditor.py:5120
 msgid "Paint done."
 msgstr "Окраска завершена."
 
diff --git a/locale_template/strings.pot b/locale_template/strings.pot
index ae901e3b..331243eb 100644
--- a/locale_template/strings.pot
+++ b/locale_template/strings.pot
@@ -164,7 +164,7 @@ msgstr ""
 msgid "Zone added. Click to start adding next zone or right click to finish."
 msgstr ""
 
-#: Common.py:322 appEditors/FlatCAMGeoEditor.py:2352 appTools/ToolIsolation.py:2584
+#: Common.py:322 appEditors/appGeoEditor.py:2352 appTools/ToolIsolation.py:2584
 #: appTools/ToolNCC.py:1754 appTools/ToolPaint.py:1647
 msgid "Click on next Point or click right mouse button to complete ..."
 msgstr ""
@@ -764,7 +764,7 @@ msgid "Conventional"
 msgstr ""
 
 #: appDatabase.py:1456 appDatabase.py:1565 appDatabase.py:1667
-#: appEditors/FlatCAMGeoEditor.py:450 appGUI/preferences/tools/ToolsISOPrefGroupUI.py:167
+#: appEditors/appGeoEditor.py:450 appGUI/preferences/tools/ToolsISOPrefGroupUI.py:167
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:182
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:163 appTools/ToolIsolation.py:336
 #: appTools/ToolNCC.py:382 appTools/ToolPaint.py:328
@@ -783,7 +783,7 @@ msgid ""
 "due of too many paths."
 msgstr ""
 
-#: appDatabase.py:1477 appDatabase.py:1586 appEditors/FlatCAMGeoEditor.py:470
+#: appDatabase.py:1477 appDatabase.py:1586 appEditors/appGeoEditor.py:470
 #: appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py:72
 #: appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py:229
 #: appGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py:59
@@ -808,7 +808,7 @@ msgstr ""
 msgid "Bounding box margin."
 msgstr ""
 
-#: appDatabase.py:1490 appDatabase.py:1601 appEditors/FlatCAMGeoEditor.py:484
+#: appDatabase.py:1490 appDatabase.py:1601 appEditors/appGeoEditor.py:484
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:105
 #: appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py:106
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:215
@@ -826,7 +826,7 @@ msgid ""
 "- Line-based: Parallel lines."
 msgstr ""
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217 appTools/ToolNCC.py:431
 #: appTools/ToolNCC.py:2232 appTools/ToolNCC.py:2764 appTools/ToolNCC.py:2796
@@ -836,8 +836,8 @@ msgstr ""
 msgid "Standard"
 msgstr ""
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
-#: appEditors/FlatCAMGeoEditor.py:568 appEditors/FlatCAMGeoEditor.py:5091
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
+#: appEditors/appGeoEditor.py:568 appEditors/appGeoEditor.py:5091
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217 appTools/ToolNCC.py:431
 #: appTools/ToolNCC.py:2243 appTools/ToolNCC.py:2770 appTools/ToolNCC.py:2802
@@ -847,8 +847,8 @@ msgstr ""
 msgid "Seed"
 msgstr ""
 
-#: appDatabase.py:1500 appDatabase.py:1615 appEditors/FlatCAMGeoEditor.py:498
-#: appEditors/FlatCAMGeoEditor.py:5095 appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
+#: appDatabase.py:1500 appDatabase.py:1615 appEditors/appGeoEditor.py:498
+#: appEditors/appGeoEditor.py:5095 appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:230
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:217 appTools/ToolNCC.py:431
 #: appTools/ToolNCC.py:2254 appTools/ToolPaint.py:389 appTools/ToolPaint.py:698
 #: appTools/ToolPaint.py:1887 tclCommands/TclCommandCopperClear.py:130
@@ -871,7 +871,7 @@ msgstr ""
 msgid "Connect"
 msgstr ""
 
-#: appDatabase.py:1512 appDatabase.py:1629 appEditors/FlatCAMGeoEditor.py:507
+#: appDatabase.py:1512 appDatabase.py:1629 appEditors/appGeoEditor.py:507
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:239
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:226 appTools/ToolNCC.py:443
 #: appTools/ToolPaint.py:403
@@ -887,7 +887,7 @@ msgstr ""
 msgid "Contour"
 msgstr ""
 
-#: appDatabase.py:1522 appDatabase.py:1636 appEditors/FlatCAMGeoEditor.py:517
+#: appDatabase.py:1522 appDatabase.py:1636 appEditors/appGeoEditor.py:517
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:248
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:234 appTools/ToolNCC.py:453
 #: appTools/ToolPaint.py:410
@@ -896,7 +896,7 @@ msgid ""
 "to trim rough edges."
 msgstr ""
 
-#: appDatabase.py:1528 appEditors/FlatCAMGeoEditor.py:611
+#: appDatabase.py:1528 appEditors/appGeoEditor.py:611
 #: appEditors/FlatCAMGrbEditor.py:5304 appGUI/ObjectUI.py:143 appGUI/ObjectUI.py:1394
 #: appGUI/ObjectUI.py:2256 appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:255
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:183
@@ -914,7 +914,7 @@ msgid ""
 "The value can be between 0 and 10 FlatCAM units."
 msgstr ""
 
-#: appDatabase.py:1567 appEditors/FlatCAMGeoEditor.py:452
+#: appDatabase.py:1567 appEditors/appGeoEditor.py:452
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:165 appTools/ToolPaint.py:330
 msgid ""
 "How much (percentage) of the tool width to overlap each tool pass.\n"
@@ -926,7 +926,7 @@ msgid ""
 "due of too many paths."
 msgstr ""
 
-#: appDatabase.py:1588 appEditors/FlatCAMGeoEditor.py:472
+#: appDatabase.py:1588 appEditors/appGeoEditor.py:472
 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:185 appTools/ToolPaint.py:351
 msgid ""
 "Distance by which to avoid\n"
@@ -1326,7 +1326,7 @@ msgstr ""
 #: appEditors/FlatCAMExcEditor.py:1800 appEditors/FlatCAMExcEditor.py:1871
 #: appEditors/FlatCAMExcEditor.py:1875 appEditors/FlatCAMExcEditor.py:1964
 #: appEditors/FlatCAMExcEditor.py:1982 appEditors/FlatCAMExcEditor.py:2016
-#: appEditors/FlatCAMGeoEditor.py:683 appEditors/FlatCAMGrbEditor.py:2822
+#: appEditors/appGeoEditor.py:683 appEditors/FlatCAMGrbEditor.py:2822
 #: appEditors/FlatCAMGrbEditor.py:2839 appEditors/FlatCAMGrbEditor.py:2875
 #: appEditors/FlatCAMGrbEditor.py:5376
 #: appGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py:94
@@ -1524,7 +1524,7 @@ msgid "Cancelled. There is no Tool/Drill selected"
 msgstr ""
 
 #: appEditors/FlatCAMExcEditor.py:3601 appEditors/FlatCAMExcEditor.py:3609
-#: appEditors/FlatCAMGeoEditor.py:4286 appEditors/FlatCAMGeoEditor.py:4300
+#: appEditors/appGeoEditor.py:4286 appEditors/appGeoEditor.py:4300
 #: appEditors/FlatCAMGrbEditor.py:1085 appEditors/FlatCAMGrbEditor.py:1312
 #: appEditors/FlatCAMGrbEditor.py:1497 appEditors/FlatCAMGrbEditor.py:1766
 #: appEditors/FlatCAMGrbEditor.py:4608 appEditors/FlatCAMGrbEditor.py:4625
@@ -1542,15 +1542,15 @@ msgstr ""
 msgid "Click on the circular array Center position"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:84
+#: appEditors/appGeoEditor.py:84
 msgid "Buffer distance:"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:85
+#: appEditors/appGeoEditor.py:85
 msgid "Buffer corner:"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:87
+#: appEditors/appGeoEditor.py:87
 msgid ""
 "There are 3 types of corners:\n"
 " - 'Round': the corner is rounded for exterior buffer.\n"
@@ -1559,11 +1559,11 @@ msgid ""
 "corner"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:93 appEditors/FlatCAMGrbEditor.py:2638
+#: appEditors/appGeoEditor.py:93 appEditors/FlatCAMGrbEditor.py:2638
 msgid "Round"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:94 appEditors/FlatCAMGrbEditor.py:2639
+#: appEditors/appGeoEditor.py:94 appEditors/FlatCAMGrbEditor.py:2639
 #: appGUI/ObjectUI.py:1149 appGUI/ObjectUI.py:2004
 #: appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py:225
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:68
@@ -1580,47 +1580,47 @@ msgstr ""
 msgid "Square"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:95 appEditors/FlatCAMGrbEditor.py:2640
+#: appEditors/appGeoEditor.py:95 appEditors/FlatCAMGrbEditor.py:2640
 msgid "Beveled"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:102
+#: appEditors/appGeoEditor.py:102
 msgid "Buffer Interior"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:104
+#: appEditors/appGeoEditor.py:104
 msgid "Buffer Exterior"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:110
+#: appEditors/appGeoEditor.py:110
 msgid "Full Buffer"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:131 appEditors/FlatCAMGeoEditor.py:2959
+#: appEditors/appGeoEditor.py:131 appEditors/appGeoEditor.py:2959
 #: appGUI/MainGUI.py:4301 appGUI/preferences/gerber/GerberEditorPrefGroupUI.py:191
 msgid "Buffer Tool"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:143 appEditors/FlatCAMGeoEditor.py:160
-#: appEditors/FlatCAMGeoEditor.py:177 appEditors/FlatCAMGeoEditor.py:2978
-#: appEditors/FlatCAMGeoEditor.py:3006 appEditors/FlatCAMGeoEditor.py:3034
+#: appEditors/appGeoEditor.py:143 appEditors/appGeoEditor.py:160
+#: appEditors/appGeoEditor.py:177 appEditors/appGeoEditor.py:2978
+#: appEditors/appGeoEditor.py:3006 appEditors/appGeoEditor.py:3034
 #: appEditors/FlatCAMGrbEditor.py:5109
 msgid "Buffer distance value is missing or wrong format. Add it and retry."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:241
+#: appEditors/appGeoEditor.py:241
 msgid "Font"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:322 appGUI/MainGUI.py:1452
+#: appEditors/appGeoEditor.py:322 appGUI/MainGUI.py:1452
 msgid "Text"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:348
+#: appEditors/appGeoEditor.py:348
 msgid "Text Tool"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:404 appGUI/MainGUI.py:502 appGUI/MainGUI.py:1199
+#: appEditors/appGeoEditor.py:404 appGUI/MainGUI.py:502 appGUI/MainGUI.py:1199
 #: appGUI/ObjectUI.py:597 appGUI/ObjectUI.py:1564 appObjects/FlatCAMExcellon.py:852
 #: appObjects/FlatCAMExcellon.py:1242 appObjects/FlatCAMGeometry.py:825
 #: appTools/ToolIsolation.py:313 appTools/ToolIsolation.py:1196 appTools/ToolNCC.py:331
@@ -1628,15 +1628,15 @@ msgstr ""
 msgid "Tool"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:438
+#: appEditors/appGeoEditor.py:438
 msgid "Tool dia"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:440
+#: appEditors/appGeoEditor.py:440
 msgid "Diameter of the tool to be used in the operation."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:486
+#: appEditors/appGeoEditor.py:486
 msgid ""
 "Algorithm to paint the polygons:\n"
 "- Standard: Fixed step inwards.\n"
@@ -1644,82 +1644,82 @@ msgid ""
 "- Line-based: Parallel lines."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:505
+#: appEditors/appGeoEditor.py:505
 msgid "Connect:"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:515
+#: appEditors/appGeoEditor.py:515
 msgid "Contour:"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:528 appGUI/MainGUI.py:1456
+#: appEditors/appGeoEditor.py:528 appGUI/MainGUI.py:1456
 msgid "Paint"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:546 appGUI/MainGUI.py:912 appGUI/MainGUI.py:1944
+#: appEditors/appGeoEditor.py:546 appGUI/MainGUI.py:912 appGUI/MainGUI.py:1944
 #: appGUI/ObjectUI.py:2069 appTools/ToolPaint.py:42 appTools/ToolPaint.py:737
 msgid "Paint Tool"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:582 appEditors/FlatCAMGeoEditor.py:1071
-#: appEditors/FlatCAMGeoEditor.py:2966 appEditors/FlatCAMGeoEditor.py:2994
-#: appEditors/FlatCAMGeoEditor.py:3022 appEditors/FlatCAMGeoEditor.py:4439
+#: appEditors/appGeoEditor.py:582 appEditors/appGeoEditor.py:1071
+#: appEditors/appGeoEditor.py:2966 appEditors/appGeoEditor.py:2994
+#: appEditors/appGeoEditor.py:3022 appEditors/appGeoEditor.py:4439
 #: appEditors/FlatCAMGrbEditor.py:5764
 msgid "Cancelled. No shape selected."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:595 appEditors/FlatCAMGeoEditor.py:2984
-#: appEditors/FlatCAMGeoEditor.py:3012 appEditors/FlatCAMGeoEditor.py:3040
+#: appEditors/appGeoEditor.py:595 appEditors/appGeoEditor.py:2984
+#: appEditors/appGeoEditor.py:3012 appEditors/appGeoEditor.py:3040
 #: appGUI/preferences/geometry/GeometryGenPrefGroupUI.py:69 appTools/ToolProperties.py:117
 #: appTools/ToolProperties.py:162
 msgid "Tools"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:606 appEditors/FlatCAMGeoEditor.py:1035
+#: appEditors/appGeoEditor.py:606 appEditors/appGeoEditor.py:1035
 #: appEditors/FlatCAMGrbEditor.py:5299 appEditors/FlatCAMGrbEditor.py:5728
 #: appGUI/MainGUI.py:935 appGUI/MainGUI.py:1967 appTools/ToolTransform.py:494
 msgid "Transform Tool"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:607 appEditors/FlatCAMGeoEditor.py:699
+#: appEditors/appGeoEditor.py:607 appEditors/appGeoEditor.py:699
 #: appEditors/FlatCAMGrbEditor.py:5300 appEditors/FlatCAMGrbEditor.py:5392
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:88 appTools/ToolTransform.py:27
 #: appTools/ToolTransform.py:146
 msgid "Rotate"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:608 appEditors/FlatCAMGrbEditor.py:5301
+#: appEditors/appGeoEditor.py:608 appEditors/FlatCAMGrbEditor.py:5301
 #: appTools/ToolTransform.py:28
 msgid "Skew/Shear"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:609 appEditors/FlatCAMGrbEditor.py:2687
+#: appEditors/appGeoEditor.py:609 appEditors/FlatCAMGrbEditor.py:2687
 #: appEditors/FlatCAMGrbEditor.py:5302 appGUI/MainGUI.py:1057 appGUI/MainGUI.py:1499
 #: appGUI/MainGUI.py:2089 appGUI/MainGUI.py:4513 appGUI/ObjectUI.py:125
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:147 appTools/ToolTransform.py:29
 msgid "Scale"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:610 appEditors/FlatCAMGrbEditor.py:5303
+#: appEditors/appGeoEditor.py:610 appEditors/FlatCAMGrbEditor.py:5303
 #: appTools/ToolTransform.py:30
 msgid "Mirror (Flip)"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:612 appEditors/FlatCAMGrbEditor.py:2647
+#: appEditors/appGeoEditor.py:612 appEditors/FlatCAMGrbEditor.py:2647
 #: appEditors/FlatCAMGrbEditor.py:5305 appGUI/MainGUI.py:1055 appGUI/MainGUI.py:1454
 #: appGUI/MainGUI.py:1497 appGUI/MainGUI.py:2087 appGUI/MainGUI.py:4511
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:212 appTools/ToolTransform.py:32
 msgid "Buffer"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:643 appEditors/FlatCAMGrbEditor.py:5336
+#: appEditors/appGeoEditor.py:643 appEditors/FlatCAMGrbEditor.py:5336
 #: appGUI/GUIElements.py:2701 appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:169
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:44 appTools/ToolDblSided.py:173
 #: appTools/ToolDblSided.py:388 appTools/ToolFilm.py:202 appTools/ToolTransform.py:60
 msgid "Reference"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:645 appEditors/FlatCAMGrbEditor.py:5338
+#: appEditors/appGeoEditor.py:645 appEditors/FlatCAMGrbEditor.py:5338
 msgid ""
 "The reference point for Rotate, Skew, Scale, Mirror.\n"
 "Can be:\n"
@@ -1729,13 +1729,13 @@ msgid ""
 "- Min Selection -> the point (minx, miny) of the bounding box of the selection"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54 appTools/ToolCalibration.py:770
 #: appTools/ToolCalibration.py:771 appTools/ToolTransform.py:70
 msgid "Origin"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGeoEditor.py:1044
+#: appEditors/appGeoEditor.py:653 appEditors/appGeoEditor.py:1044
 #: appEditors/FlatCAMGrbEditor.py:5346 appEditors/FlatCAMGrbEditor.py:5737
 #: appGUI/preferences/general/GeneralGUIPrefGroupUI.py:250
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:275
@@ -1747,7 +1747,7 @@ msgstr ""
 msgid "Selection"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 #: appGUI/preferences/tools/Tools2sidedPrefGroupUI.py:80
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:60 appTools/ToolDblSided.py:181
@@ -1755,11 +1755,11 @@ msgstr ""
 msgid "Point"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
+#: appEditors/appGeoEditor.py:653 appEditors/FlatCAMGrbEditor.py:5346
 msgid "Minimum"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:659 appEditors/FlatCAMGeoEditor.py:955
+#: appEditors/appGeoEditor.py:659 appEditors/appGeoEditor.py:955
 #: appEditors/FlatCAMGrbEditor.py:5352 appEditors/FlatCAMGrbEditor.py:5648
 #: appGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py:131
 #: appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py:133
@@ -1770,12 +1770,12 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:661 appEditors/FlatCAMGrbEditor.py:5354
+#: appEditors/appGeoEditor.py:661 appEditors/FlatCAMGrbEditor.py:5354
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:62 appTools/ToolTransform.py:78
 msgid "A point of reference in format X,Y."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:668 appEditors/FlatCAMGrbEditor.py:2590
+#: appEditors/appGeoEditor.py:668 appEditors/FlatCAMGrbEditor.py:2590
 #: appEditors/FlatCAMGrbEditor.py:5361 appGUI/ObjectUI.py:1494 appTools/ToolDblSided.py:192
 #: appTools/ToolDblSided.py:425 appTools/ToolIsolation.py:276 appTools/ToolIsolation.py:631
 #: appTools/ToolNCC.py:294 appTools/ToolNCC.py:631 appTools/ToolPaint.py:276
@@ -1784,12 +1784,12 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:670 appEditors/FlatCAMGrbEditor.py:5363
+#: appEditors/appGeoEditor.py:670 appEditors/FlatCAMGrbEditor.py:5363
 #: appTools/ToolTransform.py:87
 msgid "Add point coordinates from clipboard."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:685 appEditors/FlatCAMGrbEditor.py:5378
+#: appEditors/appGeoEditor.py:685 appEditors/FlatCAMGrbEditor.py:5378
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:98 appTools/ToolTransform.py:132
 msgid ""
 "Angle for Rotation action, in degrees.\n"
@@ -1798,7 +1798,7 @@ msgid ""
 "Negative numbers for CCW motion."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:701 appEditors/FlatCAMGrbEditor.py:5394
+#: appEditors/appGeoEditor.py:701 appEditors/FlatCAMGrbEditor.py:5394
 #: appTools/ToolTransform.py:148
 msgid ""
 "Rotate the selected object(s).\n"
@@ -1806,7 +1806,7 @@ msgid ""
 "the bounding box for all selected objects."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:721 appEditors/FlatCAMGeoEditor.py:783
+#: appEditors/appGeoEditor.py:721 appEditors/appGeoEditor.py:783
 #: appEditors/FlatCAMGrbEditor.py:5414 appEditors/FlatCAMGrbEditor.py:5476
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:112
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:151 appTools/ToolTransform.py:168
@@ -1814,7 +1814,7 @@ msgstr ""
 msgid "Link"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:723 appEditors/FlatCAMGeoEditor.py:785
+#: appEditors/appGeoEditor.py:723 appEditors/appGeoEditor.py:785
 #: appEditors/FlatCAMGrbEditor.py:5416 appEditors/FlatCAMGrbEditor.py:5478
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:114
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:153 appTools/ToolTransform.py:170
@@ -1822,14 +1822,14 @@ msgstr ""
 msgid "Link the Y entry to X entry and copy its content."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:728 appEditors/FlatCAMGrbEditor.py:5421
+#: appEditors/appGeoEditor.py:728 appEditors/FlatCAMGrbEditor.py:5421
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:151
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:124 appTools/ToolFilm.py:184
 #: appTools/ToolTransform.py:175
 msgid "X angle"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:730 appEditors/FlatCAMGeoEditor.py:751
+#: appEditors/appGeoEditor.py:730 appEditors/appGeoEditor.py:751
 #: appEditors/FlatCAMGrbEditor.py:5423 appEditors/FlatCAMGrbEditor.py:5444
 #: appTools/ToolTransform.py:177 appTools/ToolTransform.py:198
 msgid ""
@@ -1837,12 +1837,12 @@ msgid ""
 "Float number between -360 and 360."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:738 appEditors/FlatCAMGrbEditor.py:5431
+#: appEditors/appGeoEditor.py:738 appEditors/FlatCAMGrbEditor.py:5431
 #: appTools/ToolTransform.py:185
 msgid "Skew X"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:740 appEditors/FlatCAMGeoEditor.py:761
+#: appEditors/appGeoEditor.py:740 appEditors/appGeoEditor.py:761
 #: appEditors/FlatCAMGrbEditor.py:5433 appEditors/FlatCAMGrbEditor.py:5454
 #: appTools/ToolTransform.py:187 appTools/ToolTransform.py:208
 msgid ""
@@ -1851,36 +1851,36 @@ msgid ""
 "the bounding box for all selected objects."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:749 appEditors/FlatCAMGrbEditor.py:5442
+#: appEditors/appGeoEditor.py:749 appEditors/FlatCAMGrbEditor.py:5442
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:160
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:138 appTools/ToolFilm.py:193
 #: appTools/ToolTransform.py:196
 msgid "Y angle"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:759 appEditors/FlatCAMGrbEditor.py:5452
+#: appEditors/appGeoEditor.py:759 appEditors/FlatCAMGrbEditor.py:5452
 #: appTools/ToolTransform.py:206
 msgid "Skew Y"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:790 appEditors/FlatCAMGrbEditor.py:5483
+#: appEditors/appGeoEditor.py:790 appEditors/FlatCAMGrbEditor.py:5483
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:120
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:162 appTools/ToolFilm.py:145
 #: appTools/ToolTransform.py:237
 msgid "X factor"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:792 appEditors/FlatCAMGrbEditor.py:5485
+#: appEditors/appGeoEditor.py:792 appEditors/FlatCAMGrbEditor.py:5485
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:164 appTools/ToolTransform.py:239
 msgid "Factor for scaling on X axis."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:799 appEditors/FlatCAMGrbEditor.py:5492
+#: appEditors/appGeoEditor.py:799 appEditors/FlatCAMGrbEditor.py:5492
 #: appTools/ToolTransform.py:246
 msgid "Scale X"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:801 appEditors/FlatCAMGeoEditor.py:821
+#: appEditors/appGeoEditor.py:801 appEditors/appGeoEditor.py:821
 #: appEditors/FlatCAMGrbEditor.py:5494 appEditors/FlatCAMGrbEditor.py:5514
 #: appTools/ToolTransform.py:248 appTools/ToolTransform.py:268
 msgid ""
@@ -1889,55 +1889,55 @@ msgid ""
 "the Scale reference checkbox state."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:810 appEditors/FlatCAMGrbEditor.py:5503
+#: appEditors/appGeoEditor.py:810 appEditors/FlatCAMGrbEditor.py:5503
 #: appGUI/preferences/tools/ToolsFilmPrefGroupUI.py:129
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:175 appTools/ToolFilm.py:154
 #: appTools/ToolTransform.py:257
 msgid "Y factor"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:812 appEditors/FlatCAMGrbEditor.py:5505
+#: appEditors/appGeoEditor.py:812 appEditors/FlatCAMGrbEditor.py:5505
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:177 appTools/ToolTransform.py:259
 msgid "Factor for scaling on Y axis."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:819 appEditors/FlatCAMGrbEditor.py:5512
+#: appEditors/appGeoEditor.py:819 appEditors/FlatCAMGrbEditor.py:5512
 #: appTools/ToolTransform.py:266
 msgid "Scale Y"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:846 appEditors/FlatCAMGrbEditor.py:5539
+#: appEditors/appGeoEditor.py:846 appEditors/FlatCAMGrbEditor.py:5539
 #: appTools/ToolTransform.py:293
 msgid "Flip on X"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:848 appEditors/FlatCAMGeoEditor.py:853
+#: appEditors/appGeoEditor.py:848 appEditors/appGeoEditor.py:853
 #: appEditors/FlatCAMGrbEditor.py:5541 appEditors/FlatCAMGrbEditor.py:5546
 #: appTools/ToolTransform.py:295 appTools/ToolTransform.py:300
 msgid "Flip the selected object(s) over the X axis."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:851 appEditors/FlatCAMGrbEditor.py:5544
+#: appEditors/appGeoEditor.py:851 appEditors/FlatCAMGrbEditor.py:5544
 #: appTools/ToolTransform.py:298
 msgid "Flip on Y"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:871 appEditors/FlatCAMGrbEditor.py:5564
+#: appEditors/appGeoEditor.py:871 appEditors/FlatCAMGrbEditor.py:5564
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:191 appTools/ToolTransform.py:318
 msgid "X val"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:873 appEditors/FlatCAMGrbEditor.py:5566
+#: appEditors/appGeoEditor.py:873 appEditors/FlatCAMGrbEditor.py:5566
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:193 appTools/ToolTransform.py:320
 msgid "Distance to offset on X axis. In current units."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:880 appEditors/FlatCAMGrbEditor.py:5573
+#: appEditors/appGeoEditor.py:880 appEditors/FlatCAMGrbEditor.py:5573
 #: appTools/ToolTransform.py:327
 msgid "Offset X"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:882 appEditors/FlatCAMGeoEditor.py:902
+#: appEditors/appGeoEditor.py:882 appEditors/appGeoEditor.py:902
 #: appEditors/FlatCAMGrbEditor.py:5575 appEditors/FlatCAMGrbEditor.py:5595
 #: appTools/ToolTransform.py:329 appTools/ToolTransform.py:349
 msgid ""
@@ -1946,29 +1946,29 @@ msgid ""
 "the bounding box for all selected objects.\n"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:891 appEditors/FlatCAMGrbEditor.py:5584
+#: appEditors/appGeoEditor.py:891 appEditors/FlatCAMGrbEditor.py:5584
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:204 appTools/ToolTransform.py:338
 msgid "Y val"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:893 appEditors/FlatCAMGrbEditor.py:5586
+#: appEditors/appGeoEditor.py:893 appEditors/FlatCAMGrbEditor.py:5586
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:206 appTools/ToolTransform.py:340
 msgid "Distance to offset on Y axis. In current units."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:900 appEditors/FlatCAMGrbEditor.py:5593
+#: appEditors/appGeoEditor.py:900 appEditors/FlatCAMGrbEditor.py:5593
 #: appTools/ToolTransform.py:347
 msgid "Offset Y"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:920 appEditors/FlatCAMGrbEditor.py:5613
+#: appEditors/appGeoEditor.py:920 appEditors/FlatCAMGrbEditor.py:5613
 #: appGUI/preferences/tools/Tools2QRCodePrefGroupUI.py:142
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:216 appTools/ToolQRCode.py:206
 #: appTools/ToolTransform.py:367
 msgid "Rounded"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:922 appEditors/FlatCAMGrbEditor.py:5615
+#: appEditors/appGeoEditor.py:922 appEditors/FlatCAMGrbEditor.py:5615
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:218 appTools/ToolTransform.py:369
 msgid ""
 "If checked then the buffer will surround the buffered shape,\n"
@@ -1977,13 +1977,13 @@ msgid ""
 "of the buffered shape."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:930 appEditors/FlatCAMGrbEditor.py:5623
+#: appEditors/appGeoEditor.py:930 appEditors/FlatCAMGrbEditor.py:5623
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:226 appTools/ToolDistance.py:505
 #: appTools/ToolDistanceMin.py:286 appTools/ToolTransform.py:377
 msgid "Distance"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:932 appEditors/FlatCAMGrbEditor.py:5625
+#: appEditors/appGeoEditor.py:932 appEditors/FlatCAMGrbEditor.py:5625
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:228 appTools/ToolTransform.py:379
 msgid ""
 "A positive value will create the effect of dilation,\n"
@@ -1992,19 +1992,19 @@ msgid ""
 "or decreased with the 'distance'."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:944 appEditors/FlatCAMGrbEditor.py:5637
+#: appEditors/appGeoEditor.py:944 appEditors/FlatCAMGrbEditor.py:5637
 #: appTools/ToolTransform.py:391
 msgid "Buffer D"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:946 appEditors/FlatCAMGrbEditor.py:5639
+#: appEditors/appGeoEditor.py:946 appEditors/FlatCAMGrbEditor.py:5639
 #: appTools/ToolTransform.py:393
 msgid ""
 "Create the buffer effect on each geometry,\n"
 "element from the selected object, using the distance."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:957 appEditors/FlatCAMGrbEditor.py:5650
+#: appEditors/appGeoEditor.py:957 appEditors/FlatCAMGrbEditor.py:5650
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:245 appTools/ToolTransform.py:404
 msgid ""
 "A positive value will create the effect of dilation,\n"
@@ -2014,19 +2014,19 @@ msgid ""
 "of the initial dimension."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:970 appEditors/FlatCAMGrbEditor.py:5663
+#: appEditors/appGeoEditor.py:970 appEditors/FlatCAMGrbEditor.py:5663
 #: appTools/ToolTransform.py:417
 msgid "Buffer F"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:972 appEditors/FlatCAMGrbEditor.py:5665
+#: appEditors/appGeoEditor.py:972 appEditors/FlatCAMGrbEditor.py:5665
 #: appTools/ToolTransform.py:419
 msgid ""
 "Create the buffer effect on each geometry,\n"
 "element from the selected object, using the factor."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1043 appEditors/FlatCAMGrbEditor.py:5736
+#: appEditors/appGeoEditor.py:1043 appEditors/FlatCAMGrbEditor.py:5736
 #: appGUI/ObjectUI.py:1103 appGUI/ObjectUI.py:1958
 #: appGUI/preferences/tools/Tools2CalPrefGroupUI.py:48
 #: appGUI/preferences/tools/ToolsTransformPrefGroupUI.py:54
@@ -2036,405 +2036,405 @@ msgstr ""
 msgid "Object"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1107 appEditors/FlatCAMGeoEditor.py:1130
-#: appEditors/FlatCAMGeoEditor.py:1276 appEditors/FlatCAMGeoEditor.py:1301
-#: appEditors/FlatCAMGeoEditor.py:1335 appEditors/FlatCAMGeoEditor.py:1370
-#: appEditors/FlatCAMGeoEditor.py:1401 appEditors/FlatCAMGrbEditor.py:5800
+#: appEditors/appGeoEditor.py:1107 appEditors/appGeoEditor.py:1130
+#: appEditors/appGeoEditor.py:1276 appEditors/appGeoEditor.py:1301
+#: appEditors/appGeoEditor.py:1335 appEditors/appGeoEditor.py:1370
+#: appEditors/appGeoEditor.py:1401 appEditors/FlatCAMGrbEditor.py:5800
 #: appEditors/FlatCAMGrbEditor.py:5823 appEditors/FlatCAMGrbEditor.py:5968
 #: appEditors/FlatCAMGrbEditor.py:6001 appEditors/FlatCAMGrbEditor.py:6044
 #: appEditors/FlatCAMGrbEditor.py:6085 appEditors/FlatCAMGrbEditor.py:6121
 msgid "No shape selected."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1115 appEditors/FlatCAMGrbEditor.py:5808
+#: appEditors/appGeoEditor.py:1115 appEditors/FlatCAMGrbEditor.py:5808
 #: appTools/ToolTransform.py:585
 msgid "Incorrect format for Point value. Needs format X,Y"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1140 appEditors/FlatCAMGrbEditor.py:5833
+#: appEditors/appGeoEditor.py:1140 appEditors/FlatCAMGrbEditor.py:5833
 #: appTools/ToolTransform.py:602
 msgid "Rotate transformation can not be done for a value of 0."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1198 appEditors/FlatCAMGeoEditor.py:1219
+#: appEditors/appGeoEditor.py:1198 appEditors/appGeoEditor.py:1219
 #: appEditors/FlatCAMGrbEditor.py:5891 appEditors/FlatCAMGrbEditor.py:5912
 #: appTools/ToolTransform.py:660 appTools/ToolTransform.py:681
 msgid "Scale transformation can not be done for a factor of 0 or 1."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1232 appEditors/FlatCAMGeoEditor.py:1241
+#: appEditors/appGeoEditor.py:1232 appEditors/appGeoEditor.py:1241
 #: appEditors/FlatCAMGrbEditor.py:5925 appEditors/FlatCAMGrbEditor.py:5934
 #: appTools/ToolTransform.py:694 appTools/ToolTransform.py:703
 msgid "Offset transformation can not be done for a value of 0."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1271 appEditors/FlatCAMGrbEditor.py:5971
+#: appEditors/appGeoEditor.py:1271 appEditors/FlatCAMGrbEditor.py:5971
 #: appTools/ToolTransform.py:731
 msgid "Appying Rotate"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1284 appEditors/FlatCAMGrbEditor.py:5983
+#: appEditors/appGeoEditor.py:1284 appEditors/FlatCAMGrbEditor.py:5983
 msgid "Done. Rotate completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1286
+#: appEditors/appGeoEditor.py:1286
 msgid "Rotation action was not executed"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1304 appEditors/FlatCAMGrbEditor.py:6004
+#: appEditors/appGeoEditor.py:1304 appEditors/FlatCAMGrbEditor.py:6004
 #: appTools/ToolTransform.py:757
 msgid "Applying Flip"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1312 appEditors/FlatCAMGrbEditor.py:6016
+#: appEditors/appGeoEditor.py:1312 appEditors/FlatCAMGrbEditor.py:6016
 #: appTools/ToolTransform.py:774
 msgid "Flip on the Y axis done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1315 appEditors/FlatCAMGrbEditor.py:6024
+#: appEditors/appGeoEditor.py:1315 appEditors/FlatCAMGrbEditor.py:6024
 #: appTools/ToolTransform.py:783
 msgid "Flip on the X axis done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1319
+#: appEditors/appGeoEditor.py:1319
 msgid "Flip action was not executed"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1338 appEditors/FlatCAMGrbEditor.py:6047
+#: appEditors/appGeoEditor.py:1338 appEditors/FlatCAMGrbEditor.py:6047
 #: appTools/ToolTransform.py:804
 msgid "Applying Skew"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1347 appEditors/FlatCAMGrbEditor.py:6063
+#: appEditors/appGeoEditor.py:1347 appEditors/FlatCAMGrbEditor.py:6063
 msgid "Skew on the X axis done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1349 appEditors/FlatCAMGrbEditor.py:6065
+#: appEditors/appGeoEditor.py:1349 appEditors/FlatCAMGrbEditor.py:6065
 msgid "Skew on the Y axis done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1352
+#: appEditors/appGeoEditor.py:1352
 msgid "Skew action was not executed"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1373 appEditors/FlatCAMGrbEditor.py:6088
+#: appEditors/appGeoEditor.py:1373 appEditors/FlatCAMGrbEditor.py:6088
 #: appTools/ToolTransform.py:831
 msgid "Applying Scale"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1382 appEditors/FlatCAMGrbEditor.py:6101
+#: appEditors/appGeoEditor.py:1382 appEditors/FlatCAMGrbEditor.py:6101
 msgid "Scale on the X axis done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1384 appEditors/FlatCAMGrbEditor.py:6103
+#: appEditors/appGeoEditor.py:1384 appEditors/FlatCAMGrbEditor.py:6103
 msgid "Scale on the Y axis done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1386
+#: appEditors/appGeoEditor.py:1386
 msgid "Scale action was not executed"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1404 appEditors/FlatCAMGrbEditor.py:6124
+#: appEditors/appGeoEditor.py:1404 appEditors/FlatCAMGrbEditor.py:6124
 #: appTools/ToolTransform.py:859
 msgid "Applying Offset"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1414 appEditors/FlatCAMGrbEditor.py:6145
+#: appEditors/appGeoEditor.py:1414 appEditors/FlatCAMGrbEditor.py:6145
 msgid "Offset on the X axis done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1416 appEditors/FlatCAMGrbEditor.py:6147
+#: appEditors/appGeoEditor.py:1416 appEditors/FlatCAMGrbEditor.py:6147
 msgid "Offset on the Y axis done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1419
+#: appEditors/appGeoEditor.py:1419
 msgid "Offset action was not executed"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1426 appEditors/FlatCAMGrbEditor.py:6157
+#: appEditors/appGeoEditor.py:1426 appEditors/FlatCAMGrbEditor.py:6157
 msgid "No shape selected"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1429 appEditors/FlatCAMGrbEditor.py:6160
+#: appEditors/appGeoEditor.py:1429 appEditors/FlatCAMGrbEditor.py:6160
 #: appTools/ToolTransform.py:889
 msgid "Applying Buffer"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1436 appEditors/FlatCAMGrbEditor.py:6182
+#: appEditors/appGeoEditor.py:1436 appEditors/FlatCAMGrbEditor.py:6182
 #: appTools/ToolTransform.py:910
 msgid "Buffer done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1440 appEditors/FlatCAMGrbEditor.py:6186
+#: appEditors/appGeoEditor.py:1440 appEditors/FlatCAMGrbEditor.py:6186
 #: appTools/ToolTransform.py:879 appTools/ToolTransform.py:915
 msgid "Action was not executed, due of"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1444 appEditors/FlatCAMGrbEditor.py:6190
+#: appEditors/appGeoEditor.py:1444 appEditors/FlatCAMGrbEditor.py:6190
 msgid "Rotate ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1445 appEditors/FlatCAMGeoEditor.py:1494
-#: appEditors/FlatCAMGeoEditor.py:1509 appEditors/FlatCAMGrbEditor.py:6191
+#: appEditors/appGeoEditor.py:1445 appEditors/appGeoEditor.py:1494
+#: appEditors/appGeoEditor.py:1509 appEditors/FlatCAMGrbEditor.py:6191
 #: appEditors/FlatCAMGrbEditor.py:6240 appEditors/FlatCAMGrbEditor.py:6255
 msgid "Enter an Angle Value (degrees)"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1453 appEditors/FlatCAMGrbEditor.py:6199
+#: appEditors/appGeoEditor.py:1453 appEditors/FlatCAMGrbEditor.py:6199
 msgid "Geometry shape rotate done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1456 appEditors/FlatCAMGrbEditor.py:6202
+#: appEditors/appGeoEditor.py:1456 appEditors/FlatCAMGrbEditor.py:6202
 msgid "Geometry shape rotate cancelled"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1461 appEditors/FlatCAMGrbEditor.py:6207
+#: appEditors/appGeoEditor.py:1461 appEditors/FlatCAMGrbEditor.py:6207
 msgid "Offset on X axis ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1462 appEditors/FlatCAMGeoEditor.py:1479
+#: appEditors/appGeoEditor.py:1462 appEditors/appGeoEditor.py:1479
 #: appEditors/FlatCAMGrbEditor.py:6208 appEditors/FlatCAMGrbEditor.py:6225
 msgid "Enter a distance Value"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1470 appEditors/FlatCAMGrbEditor.py:6216
+#: appEditors/appGeoEditor.py:1470 appEditors/FlatCAMGrbEditor.py:6216
 msgid "Geometry shape offset on X axis done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1473 appEditors/FlatCAMGrbEditor.py:6219
+#: appEditors/appGeoEditor.py:1473 appEditors/FlatCAMGrbEditor.py:6219
 msgid "Geometry shape offset X cancelled"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1478 appEditors/FlatCAMGrbEditor.py:6224
+#: appEditors/appGeoEditor.py:1478 appEditors/FlatCAMGrbEditor.py:6224
 msgid "Offset on Y axis ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1487 appEditors/FlatCAMGrbEditor.py:6233
+#: appEditors/appGeoEditor.py:1487 appEditors/FlatCAMGrbEditor.py:6233
 msgid "Geometry shape offset on Y axis done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1490
+#: appEditors/appGeoEditor.py:1490
 msgid "Geometry shape offset on Y axis canceled"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1493 appEditors/FlatCAMGrbEditor.py:6239
+#: appEditors/appGeoEditor.py:1493 appEditors/FlatCAMGrbEditor.py:6239
 msgid "Skew on X axis ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1502 appEditors/FlatCAMGrbEditor.py:6248
+#: appEditors/appGeoEditor.py:1502 appEditors/FlatCAMGrbEditor.py:6248
 msgid "Geometry shape skew on X axis done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1505
+#: appEditors/appGeoEditor.py:1505
 msgid "Geometry shape skew on X axis canceled"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1508 appEditors/FlatCAMGrbEditor.py:6254
+#: appEditors/appGeoEditor.py:1508 appEditors/FlatCAMGrbEditor.py:6254
 msgid "Skew on Y axis ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1517 appEditors/FlatCAMGrbEditor.py:6263
+#: appEditors/appGeoEditor.py:1517 appEditors/FlatCAMGrbEditor.py:6263
 msgid "Geometry shape skew on Y axis done"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1520
+#: appEditors/appGeoEditor.py:1520
 msgid "Geometry shape skew on Y axis canceled"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1950 appEditors/FlatCAMGeoEditor.py:2021
+#: appEditors/appGeoEditor.py:1950 appEditors/appGeoEditor.py:2021
 #: appEditors/FlatCAMGrbEditor.py:1444 appEditors/FlatCAMGrbEditor.py:1522
 msgid "Click on Center point ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1963 appEditors/FlatCAMGrbEditor.py:1454
+#: appEditors/appGeoEditor.py:1963 appEditors/FlatCAMGrbEditor.py:1454
 msgid "Click on Perimeter point to complete ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:1995
+#: appEditors/appGeoEditor.py:1995
 msgid "Done. Adding Circle completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2049 appEditors/FlatCAMGrbEditor.py:1555
+#: appEditors/appGeoEditor.py:2049 appEditors/FlatCAMGrbEditor.py:1555
 msgid "Click on Start point ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2051 appEditors/FlatCAMGrbEditor.py:1557
+#: appEditors/appGeoEditor.py:2051 appEditors/FlatCAMGrbEditor.py:1557
 msgid "Click on Point3 ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2053 appEditors/FlatCAMGrbEditor.py:1559
+#: appEditors/appGeoEditor.py:2053 appEditors/FlatCAMGrbEditor.py:1559
 msgid "Click on Stop point ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2058 appEditors/FlatCAMGrbEditor.py:1564
+#: appEditors/appGeoEditor.py:2058 appEditors/FlatCAMGrbEditor.py:1564
 msgid "Click on Stop point to complete ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2060 appEditors/FlatCAMGrbEditor.py:1566
+#: appEditors/appGeoEditor.py:2060 appEditors/FlatCAMGrbEditor.py:1566
 msgid "Click on Point2 to complete ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2062 appEditors/FlatCAMGrbEditor.py:1568
+#: appEditors/appGeoEditor.py:2062 appEditors/FlatCAMGrbEditor.py:1568
 msgid "Click on Center point to complete ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2074
+#: appEditors/appGeoEditor.py:2074
 #, python-format
 msgid "Direction: %s"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2088 appEditors/FlatCAMGrbEditor.py:1594
+#: appEditors/appGeoEditor.py:2088 appEditors/FlatCAMGrbEditor.py:1594
 msgid "Mode: Start -> Stop -> Center. Click on Start point ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2091 appEditors/FlatCAMGrbEditor.py:1597
+#: appEditors/appGeoEditor.py:2091 appEditors/FlatCAMGrbEditor.py:1597
 msgid "Mode: Point1 -> Point3 -> Point2. Click on Point1 ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2094 appEditors/FlatCAMGrbEditor.py:1600
+#: appEditors/appGeoEditor.py:2094 appEditors/FlatCAMGrbEditor.py:1600
 msgid "Mode: Center -> Start -> Stop. Click on Center point ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2235
+#: appEditors/appGeoEditor.py:2235
 msgid "Done. Arc completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2266 appEditors/FlatCAMGeoEditor.py:2339
+#: appEditors/appGeoEditor.py:2266 appEditors/appGeoEditor.py:2339
 msgid "Click on 1st corner ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2278
+#: appEditors/appGeoEditor.py:2278
 msgid "Click on opposite corner to complete ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2308
+#: appEditors/appGeoEditor.py:2308
 msgid "Done. Rectangle completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2383
+#: appEditors/appGeoEditor.py:2383
 msgid "Done. Polygon completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2397 appEditors/FlatCAMGeoEditor.py:2462
+#: appEditors/appGeoEditor.py:2397 appEditors/appGeoEditor.py:2462
 #: appEditors/FlatCAMGrbEditor.py:1102 appEditors/FlatCAMGrbEditor.py:1322
 msgid "Backtracked one point ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2440
+#: appEditors/appGeoEditor.py:2440
 msgid "Done. Path completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2599
+#: appEditors/appGeoEditor.py:2599
 msgid "No shape selected. Select a shape to explode"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2632
+#: appEditors/appGeoEditor.py:2632
 msgid "Done. Polygons exploded into lines."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2664
+#: appEditors/appGeoEditor.py:2664
 msgid "MOVE: No shape selected. Select a shape to move"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2667 appEditors/FlatCAMGeoEditor.py:2687
+#: appEditors/appGeoEditor.py:2667 appEditors/appGeoEditor.py:2687
 msgid " MOVE: Click on reference point ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2672
+#: appEditors/appGeoEditor.py:2672
 msgid " Click on destination point ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2712
+#: appEditors/appGeoEditor.py:2712
 msgid "Done. Geometry(s) Move completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2845
+#: appEditors/appGeoEditor.py:2845
 msgid "Done. Geometry(s) Copy completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2876 appEditors/FlatCAMGrbEditor.py:897
+#: appEditors/appGeoEditor.py:2876 appEditors/FlatCAMGrbEditor.py:897
 msgid "Click on 1st point ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2900
+#: appEditors/appGeoEditor.py:2900
 msgid "Font not supported. Only Regular, Bold, Italic and BoldItalic are supported. Error"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2908
+#: appEditors/appGeoEditor.py:2908
 msgid "No text to add."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2918
+#: appEditors/appGeoEditor.py:2918
 msgid " Done. Adding Text completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2955
+#: appEditors/appGeoEditor.py:2955
 msgid "Create buffer geometry ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:2990 appEditors/FlatCAMGrbEditor.py:5153
+#: appEditors/appGeoEditor.py:2990 appEditors/FlatCAMGrbEditor.py:5153
 msgid "Done. Buffer Tool completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3018
+#: appEditors/appGeoEditor.py:3018
 msgid "Done. Buffer Int Tool completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3046
+#: appEditors/appGeoEditor.py:3046
 msgid "Done. Buffer Ext Tool completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3095 appEditors/FlatCAMGrbEditor.py:2160
+#: appEditors/appGeoEditor.py:3095 appEditors/FlatCAMGrbEditor.py:2160
 msgid "Select a shape to act as deletion area ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3097 appEditors/FlatCAMGeoEditor.py:3123
-#: appEditors/FlatCAMGeoEditor.py:3129 appEditors/FlatCAMGrbEditor.py:2162
+#: appEditors/appGeoEditor.py:3097 appEditors/appGeoEditor.py:3123
+#: appEditors/appGeoEditor.py:3129 appEditors/FlatCAMGrbEditor.py:2162
 msgid "Click to pick-up the erase shape..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3133 appEditors/FlatCAMGrbEditor.py:2221
+#: appEditors/appGeoEditor.py:3133 appEditors/FlatCAMGrbEditor.py:2221
 msgid "Click to erase ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3162 appEditors/FlatCAMGrbEditor.py:2254
+#: appEditors/appGeoEditor.py:3162 appEditors/FlatCAMGrbEditor.py:2254
 msgid "Done. Eraser tool action completed."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3212
+#: appEditors/appGeoEditor.py:3212
 msgid "Create Paint geometry ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3225 appEditors/FlatCAMGrbEditor.py:2417
+#: appEditors/appGeoEditor.py:3225 appEditors/FlatCAMGrbEditor.py:2417
 msgid "Shape transformations ..."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3281
+#: appEditors/appGeoEditor.py:3281
 #: appGUI/preferences/geometry/GeometryEditorPrefGroupUI.py:27
 msgid "Geometry Editor"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3287 appEditors/FlatCAMGrbEditor.py:2495
+#: appEditors/appGeoEditor.py:3287 appEditors/FlatCAMGrbEditor.py:2495
 #: appEditors/FlatCAMGrbEditor.py:3951 appGUI/ObjectUI.py:282 appGUI/ObjectUI.py:1394
 #: appGUI/ObjectUI.py:2256 appTools/ToolCutOut.py:95 appTools/ToolTransform.py:92
 msgid "Type"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3287 appGUI/ObjectUI.py:221 appGUI/ObjectUI.py:521
+#: appEditors/appGeoEditor.py:3287 appGUI/ObjectUI.py:221 appGUI/ObjectUI.py:521
 #: appGUI/ObjectUI.py:1330 appGUI/ObjectUI.py:2165 appGUI/ObjectUI.py:2469
 #: appGUI/ObjectUI.py:2536 appTools/ToolCalibration.py:234 appTools/ToolFiducials.py:70
 msgid "Name"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3539
+#: appEditors/appGeoEditor.py:3539
 msgid "Ring"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3541
+#: appEditors/appGeoEditor.py:3541
 msgid "Line"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3543 appGUI/MainGUI.py:1446 appGUI/ObjectUI.py:1150
+#: appEditors/appGeoEditor.py:3543 appGUI/MainGUI.py:1446 appGUI/ObjectUI.py:1150
 #: appGUI/ObjectUI.py:2005 appGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py:226
 #: appGUI/preferences/tools/ToolsISOPrefGroupUI.py:299
 #: appGUI/preferences/tools/ToolsNCCPrefGroupUI.py:328
@@ -2443,103 +2443,103 @@ msgstr ""
 msgid "Polygon"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3545
+#: appEditors/appGeoEditor.py:3545
 msgid "Multi-Line"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3547
+#: appEditors/appGeoEditor.py:3547
 msgid "Multi-Polygon"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:3554
+#: appEditors/appGeoEditor.py:3554
 msgid "Geo Elem"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4007
+#: appEditors/appGeoEditor.py:4007
 msgid "Editing MultiGeo Geometry, tool"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4009
+#: appEditors/appGeoEditor.py:4009
 msgid "with diameter"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4081
+#: appEditors/appGeoEditor.py:4081
 msgid "Grid Snap enabled."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4085
+#: appEditors/appGeoEditor.py:4085
 msgid "Grid Snap disabled."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4446 appGUI/MainGUI.py:3046 appGUI/MainGUI.py:3092
+#: appEditors/appGeoEditor.py:4446 appGUI/MainGUI.py:3046 appGUI/MainGUI.py:3092
 #: appGUI/MainGUI.py:3110 appGUI/MainGUI.py:3254 appGUI/MainGUI.py:3293
 #: appGUI/MainGUI.py:3305 appGUI/MainGUI.py:3322
 msgid "Click on target point."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4762 appEditors/FlatCAMGeoEditor.py:4797
+#: appEditors/appGeoEditor.py:4762 appEditors/appGeoEditor.py:4797
 msgid "A selection of at least 2 geo items is required to do Intersection."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4883 appEditors/FlatCAMGeoEditor.py:4987
+#: appEditors/appGeoEditor.py:4883 appEditors/appGeoEditor.py:4987
 msgid ""
 "Negative buffer value is not accepted. Use Buffer interior to generate an 'inside' shape"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4893 appEditors/FlatCAMGeoEditor.py:4946
-#: appEditors/FlatCAMGeoEditor.py:4996
+#: appEditors/appGeoEditor.py:4893 appEditors/appGeoEditor.py:4946
+#: appEditors/appGeoEditor.py:4996
 msgid "Nothing selected for buffering."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4898 appEditors/FlatCAMGeoEditor.py:4950
-#: appEditors/FlatCAMGeoEditor.py:5001
+#: appEditors/appGeoEditor.py:4898 appEditors/appGeoEditor.py:4950
+#: appEditors/appGeoEditor.py:5001
 msgid "Invalid distance for buffering."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4922 appEditors/FlatCAMGeoEditor.py:5021
+#: appEditors/appGeoEditor.py:4922 appEditors/appGeoEditor.py:5021
 msgid "Failed, the result is empty. Choose a different buffer value."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4933
+#: appEditors/appGeoEditor.py:4933
 msgid "Full buffer geometry created."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4939
+#: appEditors/appGeoEditor.py:4939
 msgid "Negative buffer value is not accepted."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4970
+#: appEditors/appGeoEditor.py:4970
 msgid "Failed, the result is empty. Choose a smaller buffer value."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:4980
+#: appEditors/appGeoEditor.py:4980
 msgid "Interior buffer geometry created."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:5031
+#: appEditors/appGeoEditor.py:5031
 msgid "Exterior buffer geometry created."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:5037
+#: appEditors/appGeoEditor.py:5037
 #, python-format
 msgid "Could not do Paint. Overlap value has to be less than 100%%."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:5044
+#: appEditors/appGeoEditor.py:5044
 msgid "Nothing selected for painting."
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:5050
+#: appEditors/appGeoEditor.py:5050
 msgid "Invalid value for"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:5109
+#: appEditors/appGeoEditor.py:5109
 msgid ""
 "Could not do Paint. Try a different combination of parameters. Or a different method of "
 "Paint"
 msgstr ""
 
-#: appEditors/FlatCAMGeoEditor.py:5120
+#: appEditors/appGeoEditor.py:5120
 msgid "Paint done."
 msgstr ""