From b1d249cff8e753279d6c01cce13dda60c57884ec Mon Sep 17 00:00:00 2001
From: Marius Stanciu <marius.adrian@gmail.com>
Date: Sat, 7 Dec 2019 01:07:52 +0200
Subject: [PATCH] - renamed Calibrate Excellon Tool to a simpler Calibrate Tool
 - Calibrate Tool - when generating verification GCode it will always load
 into an Editor from which it can be edited and/or saved. On save the editor
 will close.

---
 FlatCAMApp.py                                 |   2 +-
 README.md                                     |   5 +
 flatcamEditors/FlatCAMTextEditor.py           |   5 +-
 flatcamGUI/FlatCAMGUI.py                      |   2 +-
 ...lCalibrateExcellon.py => ToolCalibrate.py} | 197 +++++++-----------
 flatcamTools/__init__.py                      |   2 +-
 locale/en/LC_MESSAGES/strings.po              | 156 +++++++-------
 locale/es/LC_MESSAGES/strings.po              | 156 +++++++-------
 locale/ro/LC_MESSAGES/strings.po              | 174 ++++++++--------
 locale_template/strings.pot                   | 144 ++++++-------
 10 files changed, 398 insertions(+), 445 deletions(-)
 rename flatcamTools/{ToolCalibrateExcellon.py => ToolCalibrate.py} (83%)

diff --git a/FlatCAMApp.py b/FlatCAMApp.py
index 10f7898a..3198ad5d 100644
--- a/FlatCAMApp.py
+++ b/FlatCAMApp.py
@@ -2964,7 +2964,7 @@ class App(QtCore.QObject):
         self.dblsidedtool = DblSidedTool(self)
         self.dblsidedtool.install(icon=QtGui.QIcon('share/doubleside16.png'), separator=True)
 
-        self.cal_exc_tool = ToolCalibrateExcellon(self)
+        self.cal_exc_tool = ToolCalibrate(self)
         self.cal_exc_tool.install(icon=QtGui.QIcon('share/drill16.png'), pos=self.ui.menutool,
                                   before=self.dblsidedtool.menuAction,
                                   separator=False)
diff --git a/README.md b/README.md
index e8ee9fec..8e18f62e 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,11 @@ CAD program, and create G-Code for Isolation routing.
 
 =================================================
 
+7.12.2019 
+
+- renamed Calibrate Excellon Tool to a simpler Calibrate Tool
+- Calibrate Tool - when generating verification GCode it will always load into an Editor from which it can be edited and/or saved. On save the editor will close.
+
 6.12.2019
 
 - fixed the toggle_units() method so now the grid values are accurate to the decimal
diff --git a/flatcamEditors/FlatCAMTextEditor.py b/flatcamEditors/FlatCAMTextEditor.py
index 10f96a68..11113183 100644
--- a/flatcamEditors/FlatCAMTextEditor.py
+++ b/flatcamEditors/FlatCAMTextEditor.py
@@ -183,7 +183,7 @@ class TextEditor(QtWidgets.QWidget):
                 self.code_editor.setPlainText(self.code_edited)
                 file.close()
 
-    def handleSaveGCode(self, name=None, filt=None):
+    def handleSaveGCode(self, name=None, filt=None, callback=None):
         self.app.report_usage("handleSaveGCode()")
 
         if filt:
@@ -235,6 +235,9 @@ class TextEditor(QtWidgets.QWidget):
         self.app.file_saved.emit("cncjob", filename)
         self.app.inform.emit('%s: %s' % (_("Saved to"), str(filename)))
 
+        if callback is not None:
+            callback()
+
     def handleFindGCode(self):
         self.app.report_usage("handleFindGCode()")
 
diff --git a/flatcamGUI/FlatCAMGUI.py b/flatcamGUI/FlatCAMGUI.py
index 2a549e5a..f8930f7b 100644
--- a/flatcamGUI/FlatCAMGUI.py
+++ b/flatcamGUI/FlatCAMGUI.py
@@ -2530,7 +2530,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
                     self.app.dblsidedtool.run(toggle=True)
                     return
 
-                # Calibrate Excellon Tool
+                # Calibrate  Tool
                 if key == QtCore.Qt.Key_E:
                     self.app.cal_exc_tool.run(toggle=True)
                     return
diff --git a/flatcamTools/ToolCalibrateExcellon.py b/flatcamTools/ToolCalibrate.py
similarity index 83%
rename from flatcamTools/ToolCalibrateExcellon.py
rename to flatcamTools/ToolCalibrate.py
index e8f20a9f..2773f3dc 100644
--- a/flatcamTools/ToolCalibrateExcellon.py
+++ b/flatcamTools/ToolCalibrate.py
@@ -5,10 +5,11 @@
 # MIT Licence                                              #
 # ##########################################################
 
-from PyQt5 import QtWidgets, QtCore
+from PyQt5 import QtWidgets, QtCore, QtGui
 
 from FlatCAMTool import FlatCAMTool
 from flatcamGUI.GUIElements import FCDoubleSpinner, EvalEntry, FCCheckBox, OptionalInputSection, FCTable
+from flatcamEditors.FlatCAMTextEditor import TextEditor
 
 from shapely.geometry import Point
 from shapely.geometry.base import *
@@ -28,9 +29,9 @@ if '_' not in builtins.__dict__:
 log = logging.getLogger('base')
 
 
-class ToolCalibrateExcellon(FlatCAMTool):
+class ToolCalibrate(FlatCAMTool):
 
-    toolName = _("Calibrate Excellon")
+    toolName = _("Calibrate Tool")
 
     def __init__(self, app):
         FlatCAMTool.__init__(self, app)
@@ -288,108 +289,6 @@ class ToolCalibrateExcellon(FlatCAMTool):
         self.points_table.setMinimumHeight(self.points_table.getHeight() + 2)
         self.points_table.setMaximumHeight(self.points_table.getHeight() + 3)
 
-        # # BOTTOM LEFT
-        # self.bottom_left_lbl = QtWidgets.QLabel('<b>%s</b>' % _('Bottom Left'))
-        # grid_lay.addWidget(self.bottom_left_lbl, 3, 0)
-        # self.bottom_left_tgt_lbl = QtWidgets.QLabel('%s' % _('Target'))
-        # grid_lay.addWidget(self.bottom_left_tgt_lbl, 3, 1)
-        # self.bottom_left_found_lbl = QtWidgets.QLabel('%s' % _('Cal. Origin'))
-        # grid_lay.addWidget(self.bottom_left_found_lbl, 3, 2)
-        #
-        # self.bottom_left_coordx_lbl = QtWidgets.QLabel('%s' % _('X'))
-        # grid_lay.addWidget(self.bottom_left_coordx_lbl, 4, 0)
-        # self.bottom_left_coordx_tgt = EvalEntry()
-        # self.bottom_left_coordx_tgt.setReadOnly(True)
-        # grid_lay.addWidget(self.bottom_left_coordx_tgt, 4, 1)
-        # self.bottom_left_coordx_found = EvalEntry()
-        # grid_lay.addWidget(self.bottom_left_coordx_found, 4, 2)
-        #
-        # self.bottom_left_coordy_lbl = QtWidgets.QLabel('%s' % _('Y'))
-        # grid_lay.addWidget(self.bottom_left_coordy_lbl, 5, 0)
-        # self.bottom_left_coordy_tgt = EvalEntry()
-        # self.bottom_left_coordy_tgt.setReadOnly(True)
-        # grid_lay.addWidget(self.bottom_left_coordy_tgt, 5, 1)
-        # self.bottom_left_coordy_found = EvalEntry()
-        # grid_lay.addWidget(self.bottom_left_coordy_found, 5, 2)
-        #
-        # self.bottom_left_coordx_found.set_value(_('Set Origin'))
-        # self.bottom_left_coordy_found.set_value(_('Set Origin'))
-        # self.bottom_left_coordx_found.setDisabled(True)
-        # self.bottom_left_coordy_found.setDisabled(True)
-        #
-        # # BOTTOM RIGHT
-        # self.bottom_right_lbl = QtWidgets.QLabel('<b>%s</b>' % _('Bottom Right'))
-        # grid_lay.addWidget(self.bottom_right_lbl, 6, 0)
-        # self.bottom_right_tgt_lbl = QtWidgets.QLabel('%s' % _('Target'))
-        # grid_lay.addWidget(self.bottom_right_tgt_lbl, 6, 1)
-        # self.bottom_right_found_lbl = QtWidgets.QLabel('%s' % _('Found Delta'))
-        # grid_lay.addWidget(self.bottom_right_found_lbl, 6, 2)
-        #
-        # self.bottom_right_coordx_lbl = QtWidgets.QLabel('%s' % _('X'))
-        # grid_lay.addWidget(self.bottom_right_coordx_lbl, 7, 0)
-        # self.bottom_right_coordx_tgt = EvalEntry()
-        # self.bottom_right_coordx_tgt.setReadOnly(True)
-        # grid_lay.addWidget(self.bottom_right_coordx_tgt, 7, 1)
-        # self.bottom_right_coordx_found = EvalEntry()
-        # grid_lay.addWidget(self.bottom_right_coordx_found, 7, 2)
-        #
-        # self.bottom_right_coordy_lbl = QtWidgets.QLabel('%s' % _('Y'))
-        # grid_lay.addWidget(self.bottom_right_coordy_lbl, 8, 0)
-        # self.bottom_right_coordy_tgt = EvalEntry()
-        # self.bottom_right_coordy_tgt.setReadOnly(True)
-        # grid_lay.addWidget(self.bottom_right_coordy_tgt, 8, 1)
-        # self.bottom_right_coordy_found = EvalEntry()
-        # grid_lay.addWidget(self.bottom_right_coordy_found, 8, 2)
-        #
-        # # TOP LEFT
-        # self.top_left_lbl = QtWidgets.QLabel('<b>%s</b>' % _('Top Left'))
-        # grid_lay.addWidget(self.top_left_lbl, 9, 0)
-        # self.top_left_tgt_lbl = QtWidgets.QLabel('%s' % _('Target'))
-        # grid_lay.addWidget(self.top_left_tgt_lbl, 9, 1)
-        # self.top_left_found_lbl = QtWidgets.QLabel('%s' % _('Found Delta'))
-        # grid_lay.addWidget(self.top_left_found_lbl, 9, 2)
-        #
-        # self.top_left_coordx_lbl = QtWidgets.QLabel('%s' % _('X'))
-        # grid_lay.addWidget(self.top_left_coordx_lbl, 10, 0)
-        # self.top_left_coordx_tgt = EvalEntry()
-        # self.top_left_coordx_tgt.setReadOnly(True)
-        # grid_lay.addWidget(self.top_left_coordx_tgt, 10, 1)
-        # self.top_left_coordx_found = EvalEntry()
-        # grid_lay.addWidget(self.top_left_coordx_found, 10, 2)
-        #
-        # self.top_left_coordy_lbl = QtWidgets.QLabel('%s' % _('Y'))
-        # grid_lay.addWidget(self.top_left_coordy_lbl, 11, 0)
-        # self.top_left_coordy_tgt = EvalEntry()
-        # self.top_left_coordy_tgt.setReadOnly(True)
-        # grid_lay.addWidget(self.top_left_coordy_tgt, 11, 1)
-        # self.top_left_coordy_found = EvalEntry()
-        # grid_lay.addWidget(self.top_left_coordy_found, 11, 2)
-        #
-        # # TOP RIGHT
-        # self.top_right_lbl = QtWidgets.QLabel('<b>%s</b>' % _('Top Right'))
-        # grid_lay.addWidget(self.top_right_lbl, 12, 0)
-        # self.top_right_tgt_lbl = QtWidgets.QLabel('%s' % _('Target'))
-        # grid_lay.addWidget(self.top_right_tgt_lbl, 12, 1)
-        # self.top_right_found_lbl = QtWidgets.QLabel('%s' % _('Found Delta'))
-        # grid_lay.addWidget(self.top_right_found_lbl, 12, 2)
-        #
-        # self.top_right_coordx_lbl = QtWidgets.QLabel('%s' % _('X'))
-        # grid_lay.addWidget(self.top_right_coordx_lbl, 13, 0)
-        # self.top_right_coordx_tgt = EvalEntry()
-        # self.top_right_coordx_tgt.setReadOnly(True)
-        # grid_lay.addWidget(self.top_right_coordx_tgt, 13, 1)
-        # self.top_right_coordx_found = EvalEntry()
-        # grid_lay.addWidget(self.top_right_coordx_found, 13, 2)
-        #
-        # self.top_right_coordy_lbl = QtWidgets.QLabel('%s' % _('Y'))
-        # grid_lay.addWidget(self.top_right_coordy_lbl, 14, 0)
-        # self.top_right_coordy_tgt = EvalEntry()
-        # self.top_right_coordy_tgt.setReadOnly(True)
-        # grid_lay.addWidget(self.top_right_coordy_tgt, 14, 1)
-        # self.top_right_coordy_found = EvalEntry()
-        # grid_lay.addWidget(self.top_right_coordy_found, 14, 2)
-
-        # STEP 1 #
         step_1 = QtWidgets.QLabel('<b>%s</b>' % _("STEP 1"))
         step_1.setToolTip(
             _("Pick four points by clicking inside the drill holes.\n"
@@ -403,7 +302,7 @@ class ToolCalibrateExcellon(FlatCAMTool):
         self.start_button.setToolTip(
             _("Pick four points by clicking inside the drill holes.\n"
               "Those four points should be in the four squares of\n"
-              "the Excellon object.")
+              "the object.")
         )
         self.start_button.setStyleSheet("""
                         QPushButton
@@ -644,7 +543,7 @@ class ToolCalibrateExcellon(FlatCAMTool):
         self.reset_button.clicked.connect(self.set_tool_ui)
 
     def run(self, toggle=True):
-        self.app.report_usage("ToolCalibrateExcellon()")
+        self.app.report_usage("ToolCalibrate()")
 
         if toggle:
             # if the splitter is hidden, display it, else hide it but only if the current widget is the same
@@ -669,7 +568,7 @@ class ToolCalibrateExcellon(FlatCAMTool):
 
         self.set_tool_ui()
 
-        self.app.ui.notebook.setTabText(2, _("Cal Exc Tool"))
+        self.app.ui.notebook.setTabText(2, _("Calibrate Tool"))
 
     def install(self, icon=None, separator=None, **kwargs):
         FlatCAMTool.install(self, icon, separator, shortcut='ALT+E', **kwargs)
@@ -751,13 +650,13 @@ class ToolCalibrateExcellon(FlatCAMTool):
                 self.app.ui.grid_snap_btn.trigger()
 
     def gcode_header(self):
-        log.debug("ToolCalibrateExcellon.gcode_header()")
+        log.debug("ToolCalibrate.gcode_header()")
         time_str = "{:%A, %d %B %Y at %H:%M}".format(datetime.now())
 
         gcode = '(G-CODE GENERATED BY FLATCAM v%s - www.flatcam.org - Version Date: %s)\n' % \
                 (str(self.app.version), str(self.app.version_date)) + '\n'
 
-        gcode += '(Name: ' + _('Verification GCode') + ')\n'
+        gcode += '(Name: ' + _('Verification GCode for FlatCAM Calibrate Tool') + ')\n'
 
         gcode += '(Units: ' + self.units.upper() + ')\n' + "\n"
         gcode += '(Created on ' + time_str + ')\n' + '\n'
@@ -767,7 +666,15 @@ class ToolCalibrateExcellon(FlatCAMTool):
         gcode += 'G94\n\n'
         return gcode
 
+    def close_tab(self):
+        for idx in range(self.app.ui.plot_tab_area.count()):
+            if self.app.ui.plot_tab_area.tabText(idx) == _("Gcode Viewer"):
+                wdg = self.app.ui.plot_tab_area.widget(idx)
+                wdg.deleteLater()
+                self.app.ui.plot_tab_area.removeTab(idx)
+
     def generate_verification_gcode(self):
+
         travel_z = '%.*f' % (self.decimals, self.travelz_entry.get_value())
         toolchange_z = '%.*f' % (self.decimals, self.toolchangez_entry.get_value())
         verification_z = '%.*f' % (self.decimals, self.verz_entry.get_value())
@@ -812,26 +719,64 @@ class ToolCalibrateExcellon(FlatCAMTool):
 
         gcode += 'M2'
 
-        _filter_ = "G-Code Files (*.nc);;All Files (*.*)"
+        self.gcode_editor_tab = TextEditor(app=self.app, plain_text=True)
 
+        # add the tab if it was closed
+        self.app.ui.plot_tab_area.addTab(self.gcode_editor_tab, '%s' % _("Gcode Viewer"))
+        self.gcode_editor_tab.setObjectName('gcode_viewer_tab')
+
+        # delete the absolute and relative position and messages in the infobar
+        self.app.ui.position_label.setText("")
+        self.app.ui.rel_position_label.setText("")
+
+        # first clear previous text in text editor (if any)
+        self.gcode_editor_tab.code_editor.clear()
+        self.gcode_editor_tab.code_editor.setReadOnly(False)
+
+        self.gcode_editor_tab.code_editor.completer_enable = False
+        self.gcode_editor_tab.buttonRun.hide()
+
+        # Switch plot_area to CNCJob tab
+        self.app.ui.plot_tab_area.setCurrentWidget(self.gcode_editor_tab)
+
+        self.gcode_editor_tab.t_frame.hide()
+        # then append the text from GCode to the text editor
         try:
-            dir_file_to_save = self.app.get_last_save_folder() + '/' + 'ver_gcode'
-            filename, _f = QtWidgets.QFileDialog.getSaveFileName(
-                caption=_("Export Machine Code ..."),
-                directory=dir_file_to_save,
-                filter=_filter_
-            )
-        except TypeError:
-            filename, _f = QtWidgets.QFileDialog.getSaveFileName(caption=_("Export Machine Code ..."), filter=_filter_)
-
-        filename = str(filename)
-
-        if filename == '':
-            self.app.inform.emit('[WARNING_NOTCL] %s' % _("Export Machine Code cancelled ..."))
+            self.gcode_editor_tab.code_editor.setPlainText(gcode)
+        except Exception as e:
+            self.app.inform.emit('[ERROR] %s %s' % ('ERROR -->', str(e)))
             return
 
-        with open(filename, 'w') as f:
-            f.write(gcode)
+        self.gcode_editor_tab.code_editor.moveCursor(QtGui.QTextCursor.Start)
+
+        self.gcode_editor_tab.t_frame.show()
+        self.app.proc_container.view.set_idle()
+
+        self.app.inform.emit('[success] %s...' % _('Loaded Machine Code into Code Editor'))
+
+        _filter_ = "G-Code Files (*.nc);;All Files (*.*)"
+        self.gcode_editor_tab.buttonSave.clicked.disconnect()
+        self.gcode_editor_tab.buttonSave.clicked.connect(
+            lambda: self.gcode_editor_tab.handleSaveGCode(name='fc_ver_gcode', filt=_filter_, callback=self.close_tab))
+        #
+        # try:
+        #     dir_file_to_save = self.app.get_last_save_folder() + '/' + 'ver_gcode'
+        #     filename, _f = QtWidgets.QFileDialog.getSaveFileName(
+        #         caption=_("Export Machine Code ..."),
+        #         directory=dir_file_to_save,
+        #         filter=_filter_
+        #     )
+        # except TypeError:
+        #     filename, _f = QtWidgets.QFileDialog.getSaveFileName(caption=_("Export Machine Code ..."), filter=_filter_)
+        #
+        # filename = str(filename)
+        #
+        # if filename == '':
+        #     self.app.inform.emit('[WARNING_NOTCL] %s' % _("Export Machine Code cancelled ..."))
+        #     return
+        #
+        # with open(filename, 'w') as f:
+        #     f.write(gcode)
 
     def calculate_factors(self):
         origin_x = self.click_points[0][0]
diff --git a/flatcamTools/__init__.py b/flatcamTools/__init__.py
index c230dd21..9d86c30f 100644
--- a/flatcamTools/__init__.py
+++ b/flatcamTools/__init__.py
@@ -2,7 +2,7 @@ import sys
 
 
 from flatcamTools.ToolCalculators import ToolCalculator
-from flatcamTools.ToolCalibrateExcellon import ToolCalibrateExcellon
+from flatcamTools.ToolCalibrate import ToolCalibrate
 from flatcamTools.ToolCutOut import CutOut
 
 from flatcamTools.ToolDblSided import DblSidedTool
diff --git a/locale/en/LC_MESSAGES/strings.po b/locale/en/LC_MESSAGES/strings.po
index 32ce46bf..93f34a10 100644
--- a/locale/en/LC_MESSAGES/strings.po
+++ b/locale/en/LC_MESSAGES/strings.po
@@ -1821,7 +1821,7 @@ msgstr "V-Angle"
 
 #: FlatCAMCommon.py:524 flatcamGUI/ObjectUI.py:798 flatcamGUI/ObjectUI.py:1369
 #: flatcamGUI/PreferencesUI.py:2304 flatcamGUI/PreferencesUI.py:3178
-#: flatcamTools/ToolCalibrateExcellon.py:82
+#: flatcamTools/ToolCalibrate.py:82
 msgid "Travel Z"
 msgstr "Travel Z"
 
@@ -1872,7 +1872,7 @@ msgid "Toolchange XY"
 msgstr "Toolchange XY"
 
 #: FlatCAMCommon.py:535 flatcamGUI/PreferencesUI.py:2330
-#: flatcamGUI/PreferencesUI.py:3210 flatcamTools/ToolCalibrateExcellon.py:119
+#: flatcamGUI/PreferencesUI.py:3210 flatcamTools/ToolCalibrate.py:119
 msgid "Toolchange Z"
 msgstr "Toolchange Z"
 
@@ -2641,13 +2641,13 @@ msgid "Plotting..."
 msgstr "Plotting..."
 
 #: FlatCAMObj.py:6172 FlatCAMObj.py:6177
-#: flatcamTools/ToolCalibrateExcellon.py:765
-#: flatcamTools/ToolCalibrateExcellon.py:770
+#: flatcamTools/ToolCalibrate.py:765
+#: flatcamTools/ToolCalibrate.py:770
 #: flatcamTools/ToolSolderPaste.py:1470
 msgid "Export Machine Code ..."
 msgstr "Export Machine Code ..."
 
-#: FlatCAMObj.py:6182 flatcamTools/ToolCalibrateExcellon.py:775
+#: FlatCAMObj.py:6182 flatcamTools/ToolCalibrate.py:775
 #: flatcamTools/ToolSolderPaste.py:1474
 msgid "Export Machine Code cancelled ..."
 msgstr "Export Machine Code cancelled ..."
@@ -3718,8 +3718,8 @@ msgstr "Skew/Shear"
 #: flatcamGUI/FlatCAMGUI.py:1849 flatcamGUI/FlatCAMGUI.py:1927
 #: flatcamGUI/FlatCAMGUI.py:2262 flatcamGUI/ObjectUI.py:91
 #: flatcamGUI/ObjectUI.py:112 flatcamGUI/PreferencesUI.py:5139
-#: flatcamTools/ToolCalibrateExcellon.py:446
-#: flatcamTools/ToolCalibrateExcellon.py:473 flatcamTools/ToolTransform.py:27
+#: flatcamTools/ToolCalibrate.py:446
+#: flatcamTools/ToolCalibrate.py:473 flatcamTools/ToolTransform.py:27
 msgid "Scale"
 msgstr "Scale"
 
@@ -3775,7 +3775,7 @@ msgstr ""
 
 #: flatcamEditors/FlatCAMGeoEditor.py:711
 #: flatcamEditors/FlatCAMGrbEditor.py:5102
-#: flatcamTools/ToolCalibrateExcellon.py:482
+#: flatcamTools/ToolCalibrate.py:482
 msgid "Angle X:"
 msgstr "Angle X:"
 
@@ -3783,8 +3783,8 @@ msgstr "Angle X:"
 #: flatcamEditors/FlatCAMGeoEditor.py:731
 #: flatcamEditors/FlatCAMGrbEditor.py:5104
 #: flatcamEditors/FlatCAMGrbEditor.py:5122 flatcamGUI/PreferencesUI.py:5118
-#: flatcamGUI/PreferencesUI.py:5132 flatcamTools/ToolCalibrateExcellon.py:484
-#: flatcamTools/ToolCalibrateExcellon.py:497
+#: flatcamGUI/PreferencesUI.py:5132 flatcamTools/ToolCalibrate.py:484
+#: flatcamTools/ToolCalibrate.py:497
 msgid ""
 "Angle for Skew action, in degrees.\n"
 "Float number between -360 and 359."
@@ -3812,7 +3812,7 @@ msgstr ""
 
 #: flatcamEditors/FlatCAMGeoEditor.py:729
 #: flatcamEditors/FlatCAMGrbEditor.py:5120
-#: flatcamTools/ToolCalibrateExcellon.py:495
+#: flatcamTools/ToolCalibrate.py:495
 msgid "Angle Y:"
 msgstr "Angle Y:"
 
@@ -3823,13 +3823,13 @@ msgstr "Skew Y"
 
 #: flatcamEditors/FlatCAMGeoEditor.py:768
 #: flatcamEditors/FlatCAMGrbEditor.py:5159
-#: flatcamTools/ToolCalibrateExcellon.py:449
+#: flatcamTools/ToolCalibrate.py:449
 msgid "Factor X:"
 msgstr "Factor X:"
 
 #: flatcamEditors/FlatCAMGeoEditor.py:770
 #: flatcamEditors/FlatCAMGrbEditor.py:5161
-#: flatcamTools/ToolCalibrateExcellon.py:451
+#: flatcamTools/ToolCalibrate.py:451
 msgid "Factor for Scale action over X axis."
 msgstr "Factor for Scale action over X axis."
 
@@ -3853,13 +3853,13 @@ msgstr ""
 
 #: flatcamEditors/FlatCAMGeoEditor.py:785
 #: flatcamEditors/FlatCAMGrbEditor.py:5176
-#: flatcamTools/ToolCalibrateExcellon.py:461
+#: flatcamTools/ToolCalibrate.py:461
 msgid "Factor Y:"
 msgstr "Factor Y:"
 
 #: flatcamEditors/FlatCAMGeoEditor.py:787
 #: flatcamEditors/FlatCAMGrbEditor.py:5178
-#: flatcamTools/ToolCalibrateExcellon.py:463
+#: flatcamTools/ToolCalibrate.py:463
 msgid "Factor for Scale action over Y axis."
 msgstr "Factor for Scale action over Y axis."
 
@@ -6217,12 +6217,12 @@ msgstr "General"
 msgid "GERBER"
 msgstr "GERBER"
 
-#: flatcamGUI/FlatCAMGUI.py:994 flatcamTools/ToolCalibrateExcellon.py:66
-#: flatcamTools/ToolCalibrateExcellon.py:543 flatcamTools/ToolDblSided.py:79
+#: flatcamGUI/FlatCAMGUI.py:994 flatcamTools/ToolCalibrate.py:66
+#: flatcamTools/ToolCalibrate.py:543 flatcamTools/ToolDblSided.py:79
 msgid "EXCELLON"
 msgstr "EXCELLON"
 
-#: flatcamGUI/FlatCAMGUI.py:1004 flatcamTools/ToolCalibrateExcellon.py:556
+#: flatcamGUI/FlatCAMGUI.py:1004 flatcamTools/ToolCalibrate.py:556
 #: flatcamTools/ToolDblSided.py:101
 msgid "GEOMETRY"
 msgstr "GEOMETRY"
@@ -7046,7 +7046,7 @@ msgstr "Plot (show) this object."
 #: flatcamGUI/ObjectUI.py:199 flatcamGUI/ObjectUI.py:697
 #: flatcamGUI/ObjectUI.py:1089 flatcamGUI/ObjectUI.py:1671
 #: flatcamGUI/ObjectUI.py:1952 flatcamGUI/ObjectUI.py:2004
-#: flatcamTools/ToolCalibrateExcellon.py:159 flatcamTools/ToolFiducials.py:73
+#: flatcamTools/ToolCalibrate.py:159 flatcamTools/ToolFiducials.py:73
 msgid "Name"
 msgstr "Name"
 
@@ -11350,8 +11350,8 @@ msgstr ""
 "Various transformations that can be applied\n"
 "on a FlatCAM object."
 
-#: flatcamGUI/PreferencesUI.py:5108 flatcamTools/ToolCalibrateExcellon.py:479
-#: flatcamTools/ToolCalibrateExcellon.py:508
+#: flatcamGUI/PreferencesUI.py:5108 flatcamTools/ToolCalibrate.py:479
+#: flatcamTools/ToolCalibrate.py:508
 msgid "Skew"
 msgstr "Skew"
 
@@ -12609,46 +12609,46 @@ msgstr ""
 msgid "Calc. Tool"
 msgstr "Calc. Tool"
 
-#: flatcamTools/ToolCalibrateExcellon.py:33
+#: flatcamTools/ToolCalibrate.py:33
 #| msgid "Creating Excellon."
 msgid "Calibrate Excellon"
 msgstr "Calibrate Excellon"
 
-#: flatcamTools/ToolCalibrateExcellon.py:68
+#: flatcamTools/ToolCalibrate.py:68
 #| msgid "The FlatCAM object to be used as non copper clearing reference."
 msgid "Excellon Object to be used as a source for reference points."
 msgstr "Excellon Object to be used as a source for reference points."
 
-#: flatcamTools/ToolCalibrateExcellon.py:75
+#: flatcamTools/ToolCalibrate.py:75
 #| msgid "Slot Parameters"
 msgid "GCode Parameters"
 msgstr "GCode Parameters"
 
-#: flatcamTools/ToolCalibrateExcellon.py:77
+#: flatcamTools/ToolCalibrate.py:77
 msgid "Parameters used when creating the GCode in this tool."
 msgstr "Parameters used when creating the GCode in this tool."
 
-#: flatcamTools/ToolCalibrateExcellon.py:84
+#: flatcamTools/ToolCalibrate.py:84
 #| msgid ""
 #| "The height (Z) for travel between pads\n"
 #| "(without dispensing solder paste)."
 msgid "Height (Z) for travelling between the points."
 msgstr "Height (Z) for travelling between the points."
 
-#: flatcamTools/ToolCalibrateExcellon.py:96
+#: flatcamTools/ToolCalibrate.py:96
 #| msgid "Gerber Specification"
 msgid "Verification Z"
 msgstr "Verification Z"
 
-#: flatcamTools/ToolCalibrateExcellon.py:98
+#: flatcamTools/ToolCalibrate.py:98
 msgid "Height (Z) for checking the point."
 msgstr "Height (Z) for checking the point."
 
-#: flatcamTools/ToolCalibrateExcellon.py:110
+#: flatcamTools/ToolCalibrate.py:110
 msgid "Zero Z tool"
 msgstr "Zero Z tool"
 
-#: flatcamTools/ToolCalibrateExcellon.py:112
+#: flatcamTools/ToolCalibrate.py:112
 msgid ""
 "Include a sequence to zero the height (Z)\n"
 "of the verification tool."
@@ -12656,15 +12656,15 @@ msgstr ""
 "Include a sequence to zero the height (Z)\n"
 "of the verification tool."
 
-#: flatcamTools/ToolCalibrateExcellon.py:121
+#: flatcamTools/ToolCalibrate.py:121
 msgid "Height (Z) for mounting the verification probe."
 msgstr "Height (Z) for mounting the verification probe."
 
-#: flatcamTools/ToolCalibrateExcellon.py:143
+#: flatcamTools/ToolCalibrate.py:143
 msgid "Calibration Points"
 msgstr "Calibration Points"
 
-#: flatcamTools/ToolCalibrateExcellon.py:145
+#: flatcamTools/ToolCalibrate.py:145
 msgid ""
 "Contain the expected calibration points and the\n"
 "ones measured."
@@ -12672,67 +12672,67 @@ msgstr ""
 "Contain the expected calibration points and the\n"
 "ones measured."
 
-#: flatcamTools/ToolCalibrateExcellon.py:160 flatcamTools/ToolSub.py:73
+#: flatcamTools/ToolCalibrate.py:160 flatcamTools/ToolSub.py:73
 #: flatcamTools/ToolSub.py:119
 msgid "Target"
 msgstr "Target"
 
-#: flatcamTools/ToolCalibrateExcellon.py:161
+#: flatcamTools/ToolCalibrate.py:161
 msgid "Found Delta"
 msgstr "Found Delta"
 
-#: flatcamTools/ToolCalibrateExcellon.py:173
+#: flatcamTools/ToolCalibrate.py:173
 #| msgid "Bottom Left"
 msgid "Bot Left X"
 msgstr "Bot Left X"
 
-#: flatcamTools/ToolCalibrateExcellon.py:182
+#: flatcamTools/ToolCalibrate.py:182
 #| msgid "Bottom Left"
 msgid "Bot Left Y"
 msgstr "Bot Left Y"
 
-#: flatcamTools/ToolCalibrateExcellon.py:190
-#: flatcamTools/ToolCalibrateExcellon.py:191
+#: flatcamTools/ToolCalibrate.py:190
+#: flatcamTools/ToolCalibrate.py:191
 #| msgid "Origin set"
 msgid "Origin"
 msgstr "Origin"
 
-#: flatcamTools/ToolCalibrateExcellon.py:202
+#: flatcamTools/ToolCalibrate.py:202
 #| msgid "Bottom Right"
 msgid "Bot Right X"
 msgstr "Bot Right X"
 
-#: flatcamTools/ToolCalibrateExcellon.py:212
+#: flatcamTools/ToolCalibrate.py:212
 #| msgid "Bottom Right"
 msgid "Bot Right Y"
 msgstr "Bot Right Y"
 
-#: flatcamTools/ToolCalibrateExcellon.py:227
+#: flatcamTools/ToolCalibrate.py:227
 #| msgid "Top Left"
 msgid "Top Left X"
 msgstr "Top Left X"
 
-#: flatcamTools/ToolCalibrateExcellon.py:236
+#: flatcamTools/ToolCalibrate.py:236
 #| msgid "Top Left"
 msgid "Top Left Y"
 msgstr "Top Left Y"
 
-#: flatcamTools/ToolCalibrateExcellon.py:251
+#: flatcamTools/ToolCalibrate.py:251
 #| msgid "Top right"
 msgid "Top Right X"
 msgstr "Top Right X"
 
-#: flatcamTools/ToolCalibrateExcellon.py:260
+#: flatcamTools/ToolCalibrate.py:260
 #| msgid "Top right"
 msgid "Top Right Y"
 msgstr "Top Right Y"
 
-#: flatcamTools/ToolCalibrateExcellon.py:393
+#: flatcamTools/ToolCalibrate.py:393
 #: flatcamTools/ToolSolderPaste.py:148
 msgid "STEP 1"
 msgstr "STEP 1"
 
-#: flatcamTools/ToolCalibrateExcellon.py:395
+#: flatcamTools/ToolCalibrate.py:395
 msgid ""
 "Pick four points by clicking inside the drill holes.\n"
 "Those four points should be in the four\n"
@@ -12742,11 +12742,11 @@ msgstr ""
 "Those four points should be in the four\n"
 "(as much as possible) corners of the Excellon object."
 
-#: flatcamTools/ToolCalibrateExcellon.py:402
+#: flatcamTools/ToolCalibrate.py:402
 msgid "Acquire Calibration Points"
 msgstr "Acquire Calibration Points"
 
-#: flatcamTools/ToolCalibrateExcellon.py:404
+#: flatcamTools/ToolCalibrate.py:404
 msgid ""
 "Pick four points by clicking inside the drill holes.\n"
 "Those four points should be in the four squares of\n"
@@ -12756,13 +12756,13 @@ msgstr ""
 "Those four points should be in the four squares of\n"
 "the Excellon object."
 
-#: flatcamTools/ToolCalibrateExcellon.py:412
+#: flatcamTools/ToolCalibrate.py:412
 #: flatcamTools/ToolSolderPaste.py:358
 msgid "STEP 2"
 msgstr "STEP 2"
 
-#: flatcamTools/ToolCalibrateExcellon.py:414
-#: flatcamTools/ToolCalibrateExcellon.py:422
+#: flatcamTools/ToolCalibrate.py:414
+#: flatcamTools/ToolCalibrate.py:422
 msgid ""
 "Generate GCode file to locate and align the PCB by using\n"
 "the four points acquired above."
@@ -12770,18 +12770,18 @@ msgstr ""
 "Generate GCode file to locate and align the PCB by using\n"
 "the four points acquired above."
 
-#: flatcamTools/ToolCalibrateExcellon.py:420
+#: flatcamTools/ToolCalibrate.py:420
 #: flatcamTools/ToolSolderPaste.py:341
 msgid "Generate GCode"
 msgstr "Generate GCode"
 
-#: flatcamTools/ToolCalibrateExcellon.py:429
+#: flatcamTools/ToolCalibrate.py:429
 #: flatcamTools/ToolSolderPaste.py:387
 msgid "STEP 3"
 msgstr "STEP 3"
 
-#: flatcamTools/ToolCalibrateExcellon.py:431
-#: flatcamTools/ToolCalibrateExcellon.py:440
+#: flatcamTools/ToolCalibrate.py:431
+#: flatcamTools/ToolCalibrate.py:440
 msgid ""
 "Calculate Scale and Skew factors based on the differences (delta)\n"
 "found when checking the PCB pattern. The differences must be filled\n"
@@ -12791,26 +12791,26 @@ msgstr ""
 "found when checking the PCB pattern. The differences must be filled\n"
 "in the fields Found (Delta)."
 
-#: flatcamTools/ToolCalibrateExcellon.py:438
+#: flatcamTools/ToolCalibrate.py:438
 #| msgid "Calculators"
 msgid "Calculate Factors"
 msgstr "Calculate Factors"
 
-#: flatcamTools/ToolCalibrateExcellon.py:475
+#: flatcamTools/ToolCalibrate.py:475
 msgid "Apply Scale factors on the calibration points."
 msgstr "Apply Scale factors on the calibration points."
 
-#: flatcamTools/ToolCalibrateExcellon.py:510
+#: flatcamTools/ToolCalibrate.py:510
 msgid "Apply Skew factors on the calibration points."
 msgstr "Apply Skew factors on the calibration points."
 
-#: flatcamTools/ToolCalibrateExcellon.py:515
+#: flatcamTools/ToolCalibrate.py:515
 #: flatcamTools/ToolSolderPaste.py:433
 msgid "STEP 4"
 msgstr "STEP 4"
 
-#: flatcamTools/ToolCalibrateExcellon.py:517
-#: flatcamTools/ToolCalibrateExcellon.py:525
+#: flatcamTools/ToolCalibrate.py:517
+#: flatcamTools/ToolCalibrate.py:525
 msgid ""
 "Generate verification GCode file adjusted with\n"
 "the factors above."
@@ -12818,17 +12818,17 @@ msgstr ""
 "Generate verification GCode file adjusted with\n"
 "the factors above."
 
-#: flatcamTools/ToolCalibrateExcellon.py:523
+#: flatcamTools/ToolCalibrate.py:523
 #| msgid "Generate GCode"
 msgid "Generate Adjusted GCode"
 msgstr "Generate Adjusted GCode"
 
-#: flatcamTools/ToolCalibrateExcellon.py:531
+#: flatcamTools/ToolCalibrate.py:531
 #| msgid "STEP 1"
 msgid "STEP 5"
 msgstr "STEP 5"
 
-#: flatcamTools/ToolCalibrateExcellon.py:533
+#: flatcamTools/ToolCalibrate.py:533
 msgid ""
 "Ajust the Excellon and Cutout Geometry objects\n"
 "with the factors determined, and verified, above."
@@ -12836,22 +12836,22 @@ msgstr ""
 "Ajust the Excellon and Cutout Geometry objects\n"
 "with the factors determined, and verified, above."
 
-#: flatcamTools/ToolCalibrateExcellon.py:545
+#: flatcamTools/ToolCalibrate.py:545
 #| msgid "Excellon Object to be mirrored."
 msgid "Excellon Object to be adjusted."
 msgstr "Excellon Object to be adjusted."
 
-#: flatcamTools/ToolCalibrateExcellon.py:558
+#: flatcamTools/ToolCalibrate.py:558
 #| msgid "Geometry Obj to be mirrored."
 msgid "Geometry Object to be adjusted."
 msgstr "Geometry Object to be adjusted."
 
-#: flatcamTools/ToolCalibrateExcellon.py:565
+#: flatcamTools/ToolCalibrate.py:565
 #| msgid "Edit Object\tE"
 msgid "Adjust Objects"
 msgstr "Adjust Objects"
 
-#: flatcamTools/ToolCalibrateExcellon.py:567
+#: flatcamTools/ToolCalibrate.py:567
 msgid ""
 "Adjust (scale and/or skew) the objects\n"
 "with the factors determined above."
@@ -12859,43 +12859,43 @@ msgstr ""
 "Adjust (scale and/or skew) the objects\n"
 "with the factors determined above."
 
-#: flatcamTools/ToolCalibrateExcellon.py:617
+#: flatcamTools/ToolCalibrate.py:617
 #| msgid "Calc. Tool"
 msgid "Cal Exc Tool"
 msgstr "Cal Exc Tool"
 
-#: flatcamTools/ToolCalibrateExcellon.py:648 flatcamTools/ToolDblSided.py:457
+#: flatcamTools/ToolCalibrate.py:648 flatcamTools/ToolDblSided.py:457
 msgid "There is no Excellon object loaded ..."
 msgstr "There is no Excellon object loaded ..."
 
-#: flatcamTools/ToolCalibrateExcellon.py:651
+#: flatcamTools/ToolCalibrate.py:651
 #| msgid "Click inside the desired polygon."
 msgid "Click inside the First drill point. Bottom Left..."
 msgstr "Click inside the First drill point. Bottom Left..."
 
-#: flatcamTools/ToolCalibrateExcellon.py:679
+#: flatcamTools/ToolCalibrate.py:679
 msgid "Click inside the Second drill point. Bottom Right..."
 msgstr "Click inside the Second drill point. Bottom Right..."
 
-#: flatcamTools/ToolCalibrateExcellon.py:683
+#: flatcamTools/ToolCalibrate.py:683
 #| msgid "Click inside the desired polygon."
 msgid "Click inside the Third drill point. Top Left..."
 msgstr "Click inside the Third drill point. Top Left..."
 
-#: flatcamTools/ToolCalibrateExcellon.py:687
+#: flatcamTools/ToolCalibrate.py:687
 msgid "Click inside the Fourth drill point. Top Right..."
 msgstr "Click inside the Fourth drill point. Top Right..."
 
-#: flatcamTools/ToolCalibrateExcellon.py:691
+#: flatcamTools/ToolCalibrate.py:691
 msgid "Done. All four points have been acquired."
 msgstr "Done. All four points have been acquired."
 
-#: flatcamTools/ToolCalibrateExcellon.py:705
+#: flatcamTools/ToolCalibrate.py:705
 #| msgid "Generate GCode"
 msgid "Verification GCode"
 msgstr "Verification GCode"
 
-#: flatcamTools/ToolCalibrateExcellon.py:721
+#: flatcamTools/ToolCalibrate.py:721
 msgid "Cancelled. Four points are needed for GCode generation."
 msgstr "Cancelled. Four points are needed for GCode generation."
 
diff --git a/locale/es/LC_MESSAGES/strings.po b/locale/es/LC_MESSAGES/strings.po
index 3e1ab71d..83806440 100644
--- a/locale/es/LC_MESSAGES/strings.po
+++ b/locale/es/LC_MESSAGES/strings.po
@@ -1882,7 +1882,7 @@ msgstr "Ángulo"
 
 #: FlatCAMCommon.py:524 flatcamGUI/ObjectUI.py:798 flatcamGUI/ObjectUI.py:1369
 #: flatcamGUI/PreferencesUI.py:2304 flatcamGUI/PreferencesUI.py:3178
-#: flatcamTools/ToolCalibrateExcellon.py:82
+#: flatcamTools/ToolCalibrate.py:82
 msgid "Travel Z"
 msgstr "Viaje Z"
 
@@ -1937,7 +1937,7 @@ msgid "Toolchange XY"
 msgstr "Cambio de herra X, Y"
 
 #: FlatCAMCommon.py:535 flatcamGUI/PreferencesUI.py:2330
-#: flatcamGUI/PreferencesUI.py:3210 flatcamTools/ToolCalibrateExcellon.py:119
+#: flatcamGUI/PreferencesUI.py:3210 flatcamTools/ToolCalibrate.py:119
 msgid "Toolchange Z"
 msgstr "Cambio de herramienta Z"
 
@@ -2685,13 +2685,13 @@ msgid "Plotting..."
 msgstr "Trazando ..."
 
 #: FlatCAMObj.py:6172 FlatCAMObj.py:6177
-#: flatcamTools/ToolCalibrateExcellon.py:765
-#: flatcamTools/ToolCalibrateExcellon.py:770
+#: flatcamTools/ToolCalibrate.py:765
+#: flatcamTools/ToolCalibrate.py:770
 #: flatcamTools/ToolSolderPaste.py:1470
 msgid "Export Machine Code ..."
 msgstr "Exportar código de máquina ..."
 
-#: FlatCAMObj.py:6182 flatcamTools/ToolCalibrateExcellon.py:775
+#: FlatCAMObj.py:6182 flatcamTools/ToolCalibrate.py:775
 #: flatcamTools/ToolSolderPaste.py:1474
 msgid "Export Machine Code cancelled ..."
 msgstr "Exportar código de máquina cancelado ..."
@@ -3791,8 +3791,8 @@ msgstr "Sesgo / cizalla"
 #: flatcamGUI/FlatCAMGUI.py:1849 flatcamGUI/FlatCAMGUI.py:1927
 #: flatcamGUI/FlatCAMGUI.py:2262 flatcamGUI/ObjectUI.py:91
 #: flatcamGUI/ObjectUI.py:112 flatcamGUI/PreferencesUI.py:5139
-#: flatcamTools/ToolCalibrateExcellon.py:446
-#: flatcamTools/ToolCalibrateExcellon.py:473 flatcamTools/ToolTransform.py:27
+#: flatcamTools/ToolCalibrate.py:446
+#: flatcamTools/ToolCalibrate.py:473 flatcamTools/ToolTransform.py:27
 msgid "Scale"
 msgstr "Escala"
 
@@ -3848,7 +3848,7 @@ msgstr ""
 
 #: flatcamEditors/FlatCAMGeoEditor.py:711
 #: flatcamEditors/FlatCAMGrbEditor.py:5102
-#: flatcamTools/ToolCalibrateExcellon.py:482
+#: flatcamTools/ToolCalibrate.py:482
 msgid "Angle X:"
 msgstr "Ángulo X:"
 
@@ -3856,8 +3856,8 @@ msgstr "Ángulo X:"
 #: flatcamEditors/FlatCAMGeoEditor.py:731
 #: flatcamEditors/FlatCAMGrbEditor.py:5104
 #: flatcamEditors/FlatCAMGrbEditor.py:5122 flatcamGUI/PreferencesUI.py:5118
-#: flatcamGUI/PreferencesUI.py:5132 flatcamTools/ToolCalibrateExcellon.py:484
-#: flatcamTools/ToolCalibrateExcellon.py:497
+#: flatcamGUI/PreferencesUI.py:5132 flatcamTools/ToolCalibrate.py:484
+#: flatcamTools/ToolCalibrate.py:497
 msgid ""
 "Angle for Skew action, in degrees.\n"
 "Float number between -360 and 359."
@@ -3885,7 +3885,7 @@ msgstr ""
 
 #: flatcamEditors/FlatCAMGeoEditor.py:729
 #: flatcamEditors/FlatCAMGrbEditor.py:5120
-#: flatcamTools/ToolCalibrateExcellon.py:495
+#: flatcamTools/ToolCalibrate.py:495
 msgid "Angle Y:"
 msgstr "Ángulo Y:"
 
@@ -3896,13 +3896,13 @@ msgstr "Sesgo y"
 
 #: flatcamEditors/FlatCAMGeoEditor.py:768
 #: flatcamEditors/FlatCAMGrbEditor.py:5159
-#: flatcamTools/ToolCalibrateExcellon.py:449
+#: flatcamTools/ToolCalibrate.py:449
 msgid "Factor X:"
 msgstr "Factor X:"
 
 #: flatcamEditors/FlatCAMGeoEditor.py:770
 #: flatcamEditors/FlatCAMGrbEditor.py:5161
-#: flatcamTools/ToolCalibrateExcellon.py:451
+#: flatcamTools/ToolCalibrate.py:451
 msgid "Factor for Scale action over X axis."
 msgstr "Factor para la acción de escala sobre el eje X."
 
@@ -3926,13 +3926,13 @@ msgstr ""
 
 #: flatcamEditors/FlatCAMGeoEditor.py:785
 #: flatcamEditors/FlatCAMGrbEditor.py:5176
-#: flatcamTools/ToolCalibrateExcellon.py:461
+#: flatcamTools/ToolCalibrate.py:461
 msgid "Factor Y:"
 msgstr "Factor Y:"
 
 #: flatcamEditors/FlatCAMGeoEditor.py:787
 #: flatcamEditors/FlatCAMGrbEditor.py:5178
-#: flatcamTools/ToolCalibrateExcellon.py:463
+#: flatcamTools/ToolCalibrate.py:463
 msgid "Factor for Scale action over Y axis."
 msgstr "Factor de acción de escala sobre eje Y."
 
@@ -6330,12 +6330,12 @@ msgstr "General"
 msgid "GERBER"
 msgstr "GERBER"
 
-#: flatcamGUI/FlatCAMGUI.py:994 flatcamTools/ToolCalibrateExcellon.py:66
-#: flatcamTools/ToolCalibrateExcellon.py:543 flatcamTools/ToolDblSided.py:79
+#: flatcamGUI/FlatCAMGUI.py:994 flatcamTools/ToolCalibrate.py:66
+#: flatcamTools/ToolCalibrate.py:543 flatcamTools/ToolDblSided.py:79
 msgid "EXCELLON"
 msgstr "EXCELLON"
 
-#: flatcamGUI/FlatCAMGUI.py:1004 flatcamTools/ToolCalibrateExcellon.py:556
+#: flatcamGUI/FlatCAMGUI.py:1004 flatcamTools/ToolCalibrate.py:556
 #: flatcamTools/ToolDblSided.py:101
 msgid "GEOMETRY"
 msgstr "GEOMETRÍA"
@@ -7165,7 +7165,7 @@ msgstr "Trazar (mostrar) este objeto."
 #: flatcamGUI/ObjectUI.py:199 flatcamGUI/ObjectUI.py:697
 #: flatcamGUI/ObjectUI.py:1089 flatcamGUI/ObjectUI.py:1671
 #: flatcamGUI/ObjectUI.py:1952 flatcamGUI/ObjectUI.py:2004
-#: flatcamTools/ToolCalibrateExcellon.py:159 flatcamTools/ToolFiducials.py:73
+#: flatcamTools/ToolCalibrate.py:159 flatcamTools/ToolFiducials.py:73
 msgid "Name"
 msgstr "Nombre"
 
@@ -11525,8 +11525,8 @@ msgstr ""
 "Diversas transformaciones que se pueden aplicar.\n"
 "en un objeto FlatCAM."
 
-#: flatcamGUI/PreferencesUI.py:5108 flatcamTools/ToolCalibrateExcellon.py:479
-#: flatcamTools/ToolCalibrateExcellon.py:508
+#: flatcamGUI/PreferencesUI.py:5108 flatcamTools/ToolCalibrate.py:479
+#: flatcamTools/ToolCalibrate.py:508
 msgid "Skew"
 msgstr "Sesgar"
 
@@ -12770,30 +12770,30 @@ msgstr ""
 msgid "Calc. Tool"
 msgstr "Calc. Herramienta"
 
-#: flatcamTools/ToolCalibrateExcellon.py:33
+#: flatcamTools/ToolCalibrate.py:33
 #, fuzzy
 #| msgid "Creating Excellon."
 msgid "Calibrate Excellon"
 msgstr "Creación de Excellon."
 
-#: flatcamTools/ToolCalibrateExcellon.py:68
+#: flatcamTools/ToolCalibrate.py:68
 #, fuzzy
 #| msgid "The FlatCAM object to be used as non copper clearing reference."
 msgid "Excellon Object to be used as a source for reference points."
 msgstr ""
 "El objeto FlatCAM que se utilizará como referencia de compensación sin cobre."
 
-#: flatcamTools/ToolCalibrateExcellon.py:75
+#: flatcamTools/ToolCalibrate.py:75
 #, fuzzy
 #| msgid "Slot Parameters"
 msgid "GCode Parameters"
 msgstr "Parámetros de ranura"
 
-#: flatcamTools/ToolCalibrateExcellon.py:77
+#: flatcamTools/ToolCalibrate.py:77
 msgid "Parameters used when creating the GCode in this tool."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:84
+#: flatcamTools/ToolCalibrate.py:84
 #, fuzzy
 #| msgid ""
 #| "The height (Z) for travel between pads\n"
@@ -12803,266 +12803,266 @@ msgstr ""
 "La altura (Z) para viajar entre almohadillas\n"
 "(sin dispensar pasta de soldadura)."
 
-#: flatcamTools/ToolCalibrateExcellon.py:96
+#: flatcamTools/ToolCalibrate.py:96
 #, fuzzy
 #| msgid "Gerber Specification"
 msgid "Verification Z"
 msgstr "Especificación de Gerber"
 
-#: flatcamTools/ToolCalibrateExcellon.py:98
+#: flatcamTools/ToolCalibrate.py:98
 msgid "Height (Z) for checking the point."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:110
+#: flatcamTools/ToolCalibrate.py:110
 msgid "Zero Z tool"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:112
+#: flatcamTools/ToolCalibrate.py:112
 msgid ""
 "Include a sequence to zero the height (Z)\n"
 "of the verification tool."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:121
+#: flatcamTools/ToolCalibrate.py:121
 msgid "Height (Z) for mounting the verification probe."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:143
+#: flatcamTools/ToolCalibrate.py:143
 msgid "Calibration Points"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:145
+#: flatcamTools/ToolCalibrate.py:145
 msgid ""
 "Contain the expected calibration points and the\n"
 "ones measured."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:160 flatcamTools/ToolSub.py:73
+#: flatcamTools/ToolCalibrate.py:160 flatcamTools/ToolSub.py:73
 #: flatcamTools/ToolSub.py:119
 msgid "Target"
 msgstr "Objetivo"
 
-#: flatcamTools/ToolCalibrateExcellon.py:161
+#: flatcamTools/ToolCalibrate.py:161
 msgid "Found Delta"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:173
+#: flatcamTools/ToolCalibrate.py:173
 #, fuzzy
 #| msgid "Bottom Left"
 msgid "Bot Left X"
 msgstr "Abajo a la izquierda"
 
-#: flatcamTools/ToolCalibrateExcellon.py:182
+#: flatcamTools/ToolCalibrate.py:182
 #, fuzzy
 #| msgid "Bottom Left"
 msgid "Bot Left Y"
 msgstr "Abajo a la izquierda"
 
-#: flatcamTools/ToolCalibrateExcellon.py:190
-#: flatcamTools/ToolCalibrateExcellon.py:191
+#: flatcamTools/ToolCalibrate.py:190
+#: flatcamTools/ToolCalibrate.py:191
 #, fuzzy
 #| msgid "Origin set"
 msgid "Origin"
 msgstr "Conjunto de origen"
 
-#: flatcamTools/ToolCalibrateExcellon.py:202
+#: flatcamTools/ToolCalibrate.py:202
 #, fuzzy
 #| msgid "Bottom Right"
 msgid "Bot Right X"
 msgstr "Abajo a la derecha"
 
-#: flatcamTools/ToolCalibrateExcellon.py:212
+#: flatcamTools/ToolCalibrate.py:212
 #, fuzzy
 #| msgid "Bottom Right"
 msgid "Bot Right Y"
 msgstr "Abajo a la derecha"
 
-#: flatcamTools/ToolCalibrateExcellon.py:227
+#: flatcamTools/ToolCalibrate.py:227
 #, fuzzy
 #| msgid "Top Left"
 msgid "Top Left X"
 msgstr "Arriba a la izquierda"
 
-#: flatcamTools/ToolCalibrateExcellon.py:236
+#: flatcamTools/ToolCalibrate.py:236
 #, fuzzy
 #| msgid "Top Left"
 msgid "Top Left Y"
 msgstr "Arriba a la izquierda"
 
-#: flatcamTools/ToolCalibrateExcellon.py:251
+#: flatcamTools/ToolCalibrate.py:251
 #, fuzzy
 #| msgid "Top right"
 msgid "Top Right X"
 msgstr "Arriba a la derecha"
 
-#: flatcamTools/ToolCalibrateExcellon.py:260
+#: flatcamTools/ToolCalibrate.py:260
 #, fuzzy
 #| msgid "Top right"
 msgid "Top Right Y"
 msgstr "Arriba a la derecha"
 
-#: flatcamTools/ToolCalibrateExcellon.py:393
+#: flatcamTools/ToolCalibrate.py:393
 #: flatcamTools/ToolSolderPaste.py:148
 msgid "STEP 1"
 msgstr "PASO 1"
 
-#: flatcamTools/ToolCalibrateExcellon.py:395
+#: flatcamTools/ToolCalibrate.py:395
 msgid ""
 "Pick four points by clicking inside the drill holes.\n"
 "Those four points should be in the four\n"
 "(as much as possible) corners of the Excellon object."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:402
+#: flatcamTools/ToolCalibrate.py:402
 msgid "Acquire Calibration Points"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:404
+#: flatcamTools/ToolCalibrate.py:404
 msgid ""
 "Pick four points by clicking inside the drill holes.\n"
 "Those four points should be in the four squares of\n"
 "the Excellon object."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:412
+#: flatcamTools/ToolCalibrate.py:412
 #: flatcamTools/ToolSolderPaste.py:358
 msgid "STEP 2"
 msgstr "PASO 2"
 
-#: flatcamTools/ToolCalibrateExcellon.py:414
-#: flatcamTools/ToolCalibrateExcellon.py:422
+#: flatcamTools/ToolCalibrate.py:414
+#: flatcamTools/ToolCalibrate.py:422
 msgid ""
 "Generate GCode file to locate and align the PCB by using\n"
 "the four points acquired above."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:420
+#: flatcamTools/ToolCalibrate.py:420
 #: flatcamTools/ToolSolderPaste.py:341
 msgid "Generate GCode"
 msgstr "Generar GCode"
 
-#: flatcamTools/ToolCalibrateExcellon.py:429
+#: flatcamTools/ToolCalibrate.py:429
 #: flatcamTools/ToolSolderPaste.py:387
 msgid "STEP 3"
 msgstr "PASO 3"
 
-#: flatcamTools/ToolCalibrateExcellon.py:431
-#: flatcamTools/ToolCalibrateExcellon.py:440
+#: flatcamTools/ToolCalibrate.py:431
+#: flatcamTools/ToolCalibrate.py:440
 msgid ""
 "Calculate Scale and Skew factors based on the differences (delta)\n"
 "found when checking the PCB pattern. The differences must be filled\n"
 "in the fields Found (Delta)."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:438
+#: flatcamTools/ToolCalibrate.py:438
 #, fuzzy
 #| msgid "Calculators"
 msgid "Calculate Factors"
 msgstr "Calculadoras"
 
-#: flatcamTools/ToolCalibrateExcellon.py:475
+#: flatcamTools/ToolCalibrate.py:475
 msgid "Apply Scale factors on the calibration points."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:510
+#: flatcamTools/ToolCalibrate.py:510
 msgid "Apply Skew factors on the calibration points."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:515
+#: flatcamTools/ToolCalibrate.py:515
 #: flatcamTools/ToolSolderPaste.py:433
 msgid "STEP 4"
 msgstr "PASO 4"
 
-#: flatcamTools/ToolCalibrateExcellon.py:517
-#: flatcamTools/ToolCalibrateExcellon.py:525
+#: flatcamTools/ToolCalibrate.py:517
+#: flatcamTools/ToolCalibrate.py:525
 msgid ""
 "Generate verification GCode file adjusted with\n"
 "the factors above."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:523
+#: flatcamTools/ToolCalibrate.py:523
 #, fuzzy
 #| msgid "Generate GCode"
 msgid "Generate Adjusted GCode"
 msgstr "Generar GCode"
 
-#: flatcamTools/ToolCalibrateExcellon.py:531
+#: flatcamTools/ToolCalibrate.py:531
 #, fuzzy
 #| msgid "STEP 1"
 msgid "STEP 5"
 msgstr "PASO 1"
 
-#: flatcamTools/ToolCalibrateExcellon.py:533
+#: flatcamTools/ToolCalibrate.py:533
 msgid ""
 "Ajust the Excellon and Cutout Geometry objects\n"
 "with the factors determined, and verified, above."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:545
+#: flatcamTools/ToolCalibrate.py:545
 #, fuzzy
 #| msgid "Excellon Object to be mirrored."
 msgid "Excellon Object to be adjusted."
 msgstr "Excellon Objeto a ser reflejado."
 
-#: flatcamTools/ToolCalibrateExcellon.py:558
+#: flatcamTools/ToolCalibrate.py:558
 #, fuzzy
 #| msgid "Geometry Obj to be mirrored."
 msgid "Geometry Object to be adjusted."
 msgstr "Obj de geometría para ser reflejado."
 
-#: flatcamTools/ToolCalibrateExcellon.py:565
+#: flatcamTools/ToolCalibrate.py:565
 #, fuzzy
 #| msgid "Edit Object\tE"
 msgid "Adjust Objects"
 msgstr "Editar objeto\tE"
 
-#: flatcamTools/ToolCalibrateExcellon.py:567
+#: flatcamTools/ToolCalibrate.py:567
 msgid ""
 "Adjust (scale and/or skew) the objects\n"
 "with the factors determined above."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:617
+#: flatcamTools/ToolCalibrate.py:617
 #, fuzzy
 #| msgid "Calc. Tool"
 msgid "Cal Exc Tool"
 msgstr "Calc. Herramienta"
 
-#: flatcamTools/ToolCalibrateExcellon.py:648 flatcamTools/ToolDblSided.py:457
+#: flatcamTools/ToolCalibrate.py:648 flatcamTools/ToolDblSided.py:457
 msgid "There is no Excellon object loaded ..."
 msgstr "No hay ningún objeto Excellon cargado ..."
 
-#: flatcamTools/ToolCalibrateExcellon.py:651
+#: flatcamTools/ToolCalibrate.py:651
 #, fuzzy
 #| msgid "Click inside the desired polygon."
 msgid "Click inside the First drill point. Bottom Left..."
 msgstr "Haga clic dentro del polígono deseado."
 
-#: flatcamTools/ToolCalibrateExcellon.py:679
+#: flatcamTools/ToolCalibrate.py:679
 msgid "Click inside the Second drill point. Bottom Right..."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:683
+#: flatcamTools/ToolCalibrate.py:683
 #, fuzzy
 #| msgid "Click inside the desired polygon."
 msgid "Click inside the Third drill point. Top Left..."
 msgstr "Haga clic dentro del polígono deseado."
 
-#: flatcamTools/ToolCalibrateExcellon.py:687
+#: flatcamTools/ToolCalibrate.py:687
 msgid "Click inside the Fourth drill point. Top Right..."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:691
+#: flatcamTools/ToolCalibrate.py:691
 msgid "Done. All four points have been acquired."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:705
+#: flatcamTools/ToolCalibrate.py:705
 #, fuzzy
 #| msgid "Generate GCode"
 msgid "Verification GCode"
 msgstr "Generar GCode"
 
-#: flatcamTools/ToolCalibrateExcellon.py:721
+#: flatcamTools/ToolCalibrate.py:721
 msgid "Cancelled. Four points are needed for GCode generation."
 msgstr ""
 
diff --git a/locale/ro/LC_MESSAGES/strings.po b/locale/ro/LC_MESSAGES/strings.po
index 0f22bd00..1f4f03e1 100644
--- a/locale/ro/LC_MESSAGES/strings.po
+++ b/locale/ro/LC_MESSAGES/strings.po
@@ -1782,7 +1782,7 @@ msgstr "Unghi"
 
 #: FlatCAMCommon.py:524 flatcamGUI/ObjectUI.py:774 flatcamGUI/ObjectUI.py:1345
 #: flatcamGUI/PreferencesUI.py:2187 flatcamGUI/PreferencesUI.py:3061
-#: flatcamTools/ToolCalibrateExcellon.py:82
+#: flatcamTools/ToolCalibrate.py:82
 msgid "Travel Z"
 msgstr "Z Deplasare"
 
@@ -1837,7 +1837,7 @@ msgid "Toolchange XY"
 msgstr "X,Y schimb. unealtă"
 
 #: FlatCAMCommon.py:535 flatcamGUI/PreferencesUI.py:2213
-#: flatcamGUI/PreferencesUI.py:3093 flatcamTools/ToolCalibrateExcellon.py:119
+#: flatcamGUI/PreferencesUI.py:3093 flatcamTools/ToolCalibrate.py:119
 msgid "Toolchange Z"
 msgstr "Z schimb. unealtă"
 
@@ -2492,13 +2492,13 @@ msgid "Plotting..."
 msgstr "Se afișeaza..."
 
 #: FlatCAMObj.py:6053 FlatCAMObj.py:6058
-#: flatcamTools/ToolCalibrateExcellon.py:624
-#: flatcamTools/ToolCalibrateExcellon.py:629
+#: flatcamTools/ToolCalibrate.py:624
+#: flatcamTools/ToolCalibrate.py:629
 #: flatcamTools/ToolSolderPaste.py:1470
 msgid "Export Machine Code ..."
 msgstr "Exporta CNC Cod Masina ..."
 
-#: FlatCAMObj.py:6064 flatcamTools/ToolCalibrateExcellon.py:634
+#: FlatCAMObj.py:6064 flatcamTools/ToolCalibrate.py:634
 #: flatcamTools/ToolSolderPaste.py:1474
 msgid "Export Machine Code cancelled ..."
 msgstr "Exportul Codului Mașina a fost anulat ..."
@@ -3091,10 +3091,10 @@ msgstr ""
 #: flatcamEditors/FlatCAMGrbEditor.py:2731 flatcamGUI/PreferencesUI.py:1782
 #: flatcamGUI/PreferencesUI.py:2716 flatcamGUI/PreferencesUI.py:2811
 #: flatcamGUI/PreferencesUI.py:2864 flatcamGUI/PreferencesUI.py:4586
-#: flatcamTools/ToolCalibrateExcellon.py:158
-#: flatcamTools/ToolCalibrateExcellon.py:187
-#: flatcamTools/ToolCalibrateExcellon.py:211
-#: flatcamTools/ToolCalibrateExcellon.py:235 flatcamTools/ToolFilm.py:233
+#: flatcamTools/ToolCalibrate.py:158
+#: flatcamTools/ToolCalibrate.py:187
+#: flatcamTools/ToolCalibrate.py:211
+#: flatcamTools/ToolCalibrate.py:235 flatcamTools/ToolFilm.py:233
 msgid "X"
 msgstr "X"
 
@@ -3104,10 +3104,10 @@ msgstr "X"
 #: flatcamEditors/FlatCAMGrbEditor.py:2732 flatcamGUI/PreferencesUI.py:1783
 #: flatcamGUI/PreferencesUI.py:2717 flatcamGUI/PreferencesUI.py:2812
 #: flatcamGUI/PreferencesUI.py:2865 flatcamGUI/PreferencesUI.py:4587
-#: flatcamTools/ToolCalibrateExcellon.py:166
-#: flatcamTools/ToolCalibrateExcellon.py:195
-#: flatcamTools/ToolCalibrateExcellon.py:219
-#: flatcamTools/ToolCalibrateExcellon.py:243 flatcamTools/ToolFilm.py:234
+#: flatcamTools/ToolCalibrate.py:166
+#: flatcamTools/ToolCalibrate.py:195
+#: flatcamTools/ToolCalibrate.py:219
+#: flatcamTools/ToolCalibrate.py:243 flatcamTools/ToolFilm.py:234
 msgid "Y"
 msgstr "Y"
 
@@ -3608,8 +3608,8 @@ msgstr "Deformare"
 #: flatcamGUI/FlatCAMGUI.py:1835 flatcamGUI/FlatCAMGUI.py:1913
 #: flatcamGUI/FlatCAMGUI.py:2247 flatcamGUI/ObjectUI.py:91
 #: flatcamGUI/ObjectUI.py:112 flatcamGUI/PreferencesUI.py:4922
-#: flatcamTools/ToolCalibrateExcellon.py:305
-#: flatcamTools/ToolCalibrateExcellon.py:332 flatcamTools/ToolTransform.py:27
+#: flatcamTools/ToolCalibrate.py:305
+#: flatcamTools/ToolCalibrate.py:332 flatcamTools/ToolTransform.py:27
 msgid "Scale"
 msgstr "Scalare"
 
@@ -3665,7 +3665,7 @@ msgstr ""
 
 #: flatcamEditors/FlatCAMGeoEditor.py:711
 #: flatcamEditors/FlatCAMGrbEditor.py:5051
-#: flatcamTools/ToolCalibrateExcellon.py:341
+#: flatcamTools/ToolCalibrate.py:341
 msgid "Angle X:"
 msgstr "Unghi X:"
 
@@ -3673,8 +3673,8 @@ msgstr "Unghi X:"
 #: flatcamEditors/FlatCAMGeoEditor.py:731
 #: flatcamEditors/FlatCAMGrbEditor.py:5053
 #: flatcamEditors/FlatCAMGrbEditor.py:5071 flatcamGUI/PreferencesUI.py:4901
-#: flatcamGUI/PreferencesUI.py:4915 flatcamTools/ToolCalibrateExcellon.py:343
-#: flatcamTools/ToolCalibrateExcellon.py:356
+#: flatcamGUI/PreferencesUI.py:4915 flatcamTools/ToolCalibrate.py:343
+#: flatcamTools/ToolCalibrate.py:356
 msgid ""
 "Angle for Skew action, in degrees.\n"
 "Float number between -360 and 359."
@@ -3703,7 +3703,7 @@ msgstr ""
 
 #: flatcamEditors/FlatCAMGeoEditor.py:729
 #: flatcamEditors/FlatCAMGrbEditor.py:5069
-#: flatcamTools/ToolCalibrateExcellon.py:354
+#: flatcamTools/ToolCalibrate.py:354
 msgid "Angle Y:"
 msgstr "Unghi Y:"
 
@@ -3714,13 +3714,13 @@ msgstr "Deformare Y"
 
 #: flatcamEditors/FlatCAMGeoEditor.py:768
 #: flatcamEditors/FlatCAMGrbEditor.py:5108
-#: flatcamTools/ToolCalibrateExcellon.py:308
+#: flatcamTools/ToolCalibrate.py:308
 msgid "Factor X:"
 msgstr "Factor X:"
 
 #: flatcamEditors/FlatCAMGeoEditor.py:770
 #: flatcamEditors/FlatCAMGrbEditor.py:5110
-#: flatcamTools/ToolCalibrateExcellon.py:310
+#: flatcamTools/ToolCalibrate.py:310
 msgid "Factor for Scale action over X axis."
 msgstr "Factor pentru scalarea pe axa X."
 
@@ -3744,13 +3744,13 @@ msgstr ""
 
 #: flatcamEditors/FlatCAMGeoEditor.py:785
 #: flatcamEditors/FlatCAMGrbEditor.py:5125
-#: flatcamTools/ToolCalibrateExcellon.py:320
+#: flatcamTools/ToolCalibrate.py:320
 msgid "Factor Y:"
 msgstr "Factor Y:"
 
 #: flatcamEditors/FlatCAMGeoEditor.py:787
 #: flatcamEditors/FlatCAMGrbEditor.py:5127
-#: flatcamTools/ToolCalibrateExcellon.py:322
+#: flatcamTools/ToolCalibrate.py:322
 msgid "Factor for Scale action over Y axis."
 msgstr "Factor pentru scalarea pe axa Y."
 
@@ -5834,8 +5834,8 @@ msgid "Distance Min Tool"
 msgstr "Unealta Distanță min"
 
 #: flatcamGUI/FlatCAMGUI.py:708 flatcamGUI/FlatCAMGUI.py:1424
-#: flatcamGUI/FlatCAMGUI.py:2139 flatcamTools/ToolCalibrateExcellon.py:174
-#: flatcamTools/ToolCalibrateExcellon.py:175
+#: flatcamGUI/FlatCAMGUI.py:2139 flatcamTools/ToolCalibrate.py:174
+#: flatcamTools/ToolCalibrate.py:175
 msgid "Set Origin"
 msgstr "Setează Originea"
 
@@ -6141,12 +6141,12 @@ msgstr "General"
 msgid "GERBER"
 msgstr "GERBER"
 
-#: flatcamGUI/FlatCAMGUI.py:991 flatcamTools/ToolCalibrateExcellon.py:66
-#: flatcamTools/ToolCalibrateExcellon.py:402 flatcamTools/ToolDblSided.py:79
+#: flatcamGUI/FlatCAMGUI.py:991 flatcamTools/ToolCalibrate.py:66
+#: flatcamTools/ToolCalibrate.py:402 flatcamTools/ToolDblSided.py:79
 msgid "EXCELLON"
 msgstr "EXCELLON"
 
-#: flatcamGUI/FlatCAMGUI.py:1001 flatcamTools/ToolCalibrateExcellon.py:415
+#: flatcamGUI/FlatCAMGUI.py:1001 flatcamTools/ToolCalibrate.py:415
 #: flatcamTools/ToolDblSided.py:103
 msgid "GEOMETRY"
 msgstr "GEOMETRIE"
@@ -10967,17 +10967,17 @@ msgstr ""
 "Poate fi unul dintre cele patru puncte ale căsuței de delimitare a "
 "geometriei."
 
-#: flatcamGUI/PreferencesUI.py:4563 flatcamTools/ToolCalibrateExcellon.py:151
+#: flatcamGUI/PreferencesUI.py:4563 flatcamTools/ToolCalibrate.py:151
 #: flatcamTools/ToolFilm.py:207
 msgid "Bottom Left"
 msgstr "Stânga jos"
 
-#: flatcamGUI/PreferencesUI.py:4564 flatcamTools/ToolCalibrateExcellon.py:204
+#: flatcamGUI/PreferencesUI.py:4564 flatcamTools/ToolCalibrate.py:204
 #: flatcamTools/ToolFilm.py:208
 msgid "Top Left"
 msgstr "Stânga sus"
 
-#: flatcamGUI/PreferencesUI.py:4565 flatcamTools/ToolCalibrateExcellon.py:180
+#: flatcamGUI/PreferencesUI.py:4565 flatcamTools/ToolCalibrate.py:180
 #: flatcamTools/ToolFilm.py:209
 msgid "Bottom Right"
 msgstr "Dreapta-jos"
@@ -11242,8 +11242,8 @@ msgstr ""
 "Diverse transformări care pot fi aplicate\n"
 "asupra unui obiect FlatCAM."
 
-#: flatcamGUI/PreferencesUI.py:4891 flatcamTools/ToolCalibrateExcellon.py:338
-#: flatcamTools/ToolCalibrateExcellon.py:367
+#: flatcamGUI/PreferencesUI.py:4891 flatcamTools/ToolCalibrate.py:338
+#: flatcamTools/ToolCalibrate.py:367
 msgid "Skew"
 msgstr "Deformare"
 
@@ -12292,30 +12292,30 @@ msgstr ""
 msgid "Calc. Tool"
 msgstr "Unealta Calc"
 
-#: flatcamTools/ToolCalibrateExcellon.py:33
+#: flatcamTools/ToolCalibrate.py:33
 #, fuzzy
 #| msgid "Creating Excellon."
 msgid "Calibrate Excellon"
 msgstr "In curs de creere Excellon."
 
-#: flatcamTools/ToolCalibrateExcellon.py:68
+#: flatcamTools/ToolCalibrate.py:68
 #, fuzzy
 #| msgid "The FlatCAM object to be used as non copper clearing reference."
 msgid "Excellon Object to be used as a source for reference points."
 msgstr ""
 "Obiectul FlatCAM pentru a fi utilizat ca referință pt. curățarea de cupru."
 
-#: flatcamTools/ToolCalibrateExcellon.py:75
+#: flatcamTools/ToolCalibrate.py:75
 #, fuzzy
 #| msgid "Slot Parameters"
 msgid "GCode Parameters"
 msgstr "Parametrii pt slot"
 
-#: flatcamTools/ToolCalibrateExcellon.py:77
+#: flatcamTools/ToolCalibrate.py:77
 msgid "Parameters used when creating the GCode in this tool."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:84
+#: flatcamTools/ToolCalibrate.py:84
 #, fuzzy
 #| msgid ""
 #| "The height (Z) for travel between pads\n"
@@ -12325,228 +12325,228 @@ msgstr ""
 "Înălţimea (Z) când se face deplasare între pad-uri.\n"
 "(fără dispensare de pastă de fludor)."
 
-#: flatcamTools/ToolCalibrateExcellon.py:96
+#: flatcamTools/ToolCalibrate.py:96
 #, fuzzy
 #| msgid "Gerber Specification"
 msgid "Verification Z"
 msgstr "Specificatii Gerber"
 
-#: flatcamTools/ToolCalibrateExcellon.py:98
+#: flatcamTools/ToolCalibrate.py:98
 msgid "Height (Z) for checking the point."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:110
+#: flatcamTools/ToolCalibrate.py:110
 msgid "Zero Z tool"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:112
+#: flatcamTools/ToolCalibrate.py:112
 msgid ""
 "Include a sequence to zero the height (Z)\n"
 "of the verification tool."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:121
+#: flatcamTools/ToolCalibrate.py:121
 msgid "Height (Z) for mounting the verification probe."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:143
+#: flatcamTools/ToolCalibrate.py:143
 msgid "Calibration Points"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:145
+#: flatcamTools/ToolCalibrate.py:145
 msgid ""
 "Contain the expected calibration points and the\n"
 "ones measured."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:153
-#: flatcamTools/ToolCalibrateExcellon.py:182
-#: flatcamTools/ToolCalibrateExcellon.py:206
-#: flatcamTools/ToolCalibrateExcellon.py:230 flatcamTools/ToolSub.py:73
+#: flatcamTools/ToolCalibrate.py:153
+#: flatcamTools/ToolCalibrate.py:182
+#: flatcamTools/ToolCalibrate.py:206
+#: flatcamTools/ToolCalibrate.py:230 flatcamTools/ToolSub.py:73
 #: flatcamTools/ToolSub.py:119
 msgid "Target"
 msgstr "Tintă"
 
-#: flatcamTools/ToolCalibrateExcellon.py:155
+#: flatcamTools/ToolCalibrate.py:155
 #, fuzzy
 #| msgid "Set Origin"
 msgid "Cal. Origin"
 msgstr "Setează Originea"
 
-#: flatcamTools/ToolCalibrateExcellon.py:184
-#: flatcamTools/ToolCalibrateExcellon.py:208
-#: flatcamTools/ToolCalibrateExcellon.py:232
+#: flatcamTools/ToolCalibrate.py:184
+#: flatcamTools/ToolCalibrate.py:208
+#: flatcamTools/ToolCalibrate.py:232
 msgid "Found Delta"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:228
+#: flatcamTools/ToolCalibrate.py:228
 #, fuzzy
 #| msgid "Top right"
 msgid "Top Right"
 msgstr "Dreapta-sus"
 
-#: flatcamTools/ToolCalibrateExcellon.py:252
+#: flatcamTools/ToolCalibrate.py:252
 #: flatcamTools/ToolSolderPaste.py:148
 msgid "STEP 1"
 msgstr "PAS 1"
 
-#: flatcamTools/ToolCalibrateExcellon.py:254
+#: flatcamTools/ToolCalibrate.py:254
 msgid ""
 "Pick four points by clicking inside the drill holes.\n"
 "Those four points should be in the four\n"
 "(as much as possible) corners of the Excellon object."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:261
+#: flatcamTools/ToolCalibrate.py:261
 msgid "Acquire Calibration Points"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:263
+#: flatcamTools/ToolCalibrate.py:263
 msgid ""
 "Pick four points by clicking inside the drill holes.\n"
 "Those four points should be in the four squares of\n"
 "the Excellon object."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:271
+#: flatcamTools/ToolCalibrate.py:271
 #: flatcamTools/ToolSolderPaste.py:358
 msgid "STEP 2"
 msgstr "PAS 2"
 
-#: flatcamTools/ToolCalibrateExcellon.py:273
-#: flatcamTools/ToolCalibrateExcellon.py:281
+#: flatcamTools/ToolCalibrate.py:273
+#: flatcamTools/ToolCalibrate.py:281
 msgid ""
 "Generate GCode file to locate and align the PCB by using\n"
 "the four points acquired above."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:279
+#: flatcamTools/ToolCalibrate.py:279
 #: flatcamTools/ToolSolderPaste.py:341
 msgid "Generate GCode"
 msgstr "Genereaa GCode"
 
-#: flatcamTools/ToolCalibrateExcellon.py:288
+#: flatcamTools/ToolCalibrate.py:288
 #: flatcamTools/ToolSolderPaste.py:387
 msgid "STEP 3"
 msgstr "PAS 3"
 
-#: flatcamTools/ToolCalibrateExcellon.py:290
-#: flatcamTools/ToolCalibrateExcellon.py:299
+#: flatcamTools/ToolCalibrate.py:290
+#: flatcamTools/ToolCalibrate.py:299
 msgid ""
 "Calculate Scale and Skew factors based on the differences (delta)\n"
 "found when checking the PCB pattern. The differences must be filled\n"
 "in the fields Found (Delta)."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:297
+#: flatcamTools/ToolCalibrate.py:297
 #, fuzzy
 #| msgid "Calculators"
 msgid "Calculate Factors"
 msgstr "Calculatoare"
 
-#: flatcamTools/ToolCalibrateExcellon.py:334
+#: flatcamTools/ToolCalibrate.py:334
 msgid "Apply Scale factors on the calibration points."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:369
+#: flatcamTools/ToolCalibrate.py:369
 msgid "Apply Skew factors on the calibration points."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:374
+#: flatcamTools/ToolCalibrate.py:374
 #: flatcamTools/ToolSolderPaste.py:433
 msgid "STEP 4"
 msgstr "PAS 4"
 
-#: flatcamTools/ToolCalibrateExcellon.py:376
-#: flatcamTools/ToolCalibrateExcellon.py:384
+#: flatcamTools/ToolCalibrate.py:376
+#: flatcamTools/ToolCalibrate.py:384
 msgid ""
 "Generate verification GCode file adjusted with\n"
 "the factors above."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:382
+#: flatcamTools/ToolCalibrate.py:382
 #, fuzzy
 #| msgid "Generate GCode"
 msgid "Generate Adjusted GCode"
 msgstr "Genereaa GCode"
 
-#: flatcamTools/ToolCalibrateExcellon.py:390
+#: flatcamTools/ToolCalibrate.py:390
 #, fuzzy
 #| msgid "STEP 1"
 msgid "STEP 5"
 msgstr "PAS 1"
 
-#: flatcamTools/ToolCalibrateExcellon.py:392
+#: flatcamTools/ToolCalibrate.py:392
 msgid ""
 "Ajust the Excellon and Cutout Geometry objects\n"
 "with the factors determined, and verified, above."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:404
+#: flatcamTools/ToolCalibrate.py:404
 #, fuzzy
 #| msgid "Excellon Object to be mirrored."
 msgid "Excellon Object to be adjusted."
 msgstr "Obiectul Excellon care va fi oglindit."
 
-#: flatcamTools/ToolCalibrateExcellon.py:417
+#: flatcamTools/ToolCalibrate.py:417
 #, fuzzy
 #| msgid "Geometry Obj to be mirrored."
 msgid "Geometry Object to be adjusted."
 msgstr "Obiectul Geometrie care va fi oglindit."
 
-#: flatcamTools/ToolCalibrateExcellon.py:424
+#: flatcamTools/ToolCalibrate.py:424
 #, fuzzy
 #| msgid "Edit Object\tE"
 msgid "Adjust Objects"
 msgstr "Editare Obiect\tE"
 
-#: flatcamTools/ToolCalibrateExcellon.py:426
+#: flatcamTools/ToolCalibrate.py:426
 msgid ""
 "Adjust (scale and / or skew) the objects\n"
 "with the factors determined above."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:476
+#: flatcamTools/ToolCalibrate.py:476
 #, fuzzy
 #| msgid "Calc. Tool"
 msgid "Cal Exc Tool"
 msgstr "Unealta Calc"
 
-#: flatcamTools/ToolCalibrateExcellon.py:507 flatcamTools/ToolDblSided.py:468
+#: flatcamTools/ToolCalibrate.py:507 flatcamTools/ToolDblSided.py:468
 msgid "There is no Excellon object loaded ..."
 msgstr "Nici-un obiect tip Excellon nu este incărcat ..."
 
-#: flatcamTools/ToolCalibrateExcellon.py:510
+#: flatcamTools/ToolCalibrate.py:510
 #, fuzzy
 #| msgid "Click inside the desired polygon."
 msgid "Click inside the First drill point. Bottom Left..."
 msgstr "Click in interiorul poligonului care se dorește să fie 'pictat'."
 
-#: flatcamTools/ToolCalibrateExcellon.py:538
+#: flatcamTools/ToolCalibrate.py:538
 msgid "Click inside the Second drill point. Bottom Right..."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:542
+#: flatcamTools/ToolCalibrate.py:542
 #, fuzzy
 #| msgid "Click inside the desired polygon."
 msgid "Click inside the Third drill point. Top Left..."
 msgstr "Click in interiorul poligonului care se dorește să fie 'pictat'."
 
-#: flatcamTools/ToolCalibrateExcellon.py:546
+#: flatcamTools/ToolCalibrate.py:546
 msgid "Click inside the Fourth drill point. Top Right..."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:550
+#: flatcamTools/ToolCalibrate.py:550
 msgid "Done. All four points have been acquired."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:564
+#: flatcamTools/ToolCalibrate.py:564
 #, fuzzy
 #| msgid "Generate GCode"
 msgid "Verification GCode"
 msgstr "Genereaa GCode"
 
-#: flatcamTools/ToolCalibrateExcellon.py:580
+#: flatcamTools/ToolCalibrate.py:580
 msgid "Cancelled. Four points are needed for GCode generation."
 msgstr ""
 
diff --git a/locale_template/strings.pot b/locale_template/strings.pot
index 3a8c7187..791ea5cf 100644
--- a/locale_template/strings.pot
+++ b/locale_template/strings.pot
@@ -1615,7 +1615,7 @@ msgstr ""
 
 #: FlatCAMCommon.py:524 flatcamGUI/ObjectUI.py:798 flatcamGUI/ObjectUI.py:1369
 #: flatcamGUI/PreferencesUI.py:2304 flatcamGUI/PreferencesUI.py:3178
-#: flatcamTools/ToolCalibrateExcellon.py:82
+#: flatcamTools/ToolCalibrate.py:82
 msgid "Travel Z"
 msgstr ""
 
@@ -1662,7 +1662,7 @@ msgid "Toolchange XY"
 msgstr ""
 
 #: FlatCAMCommon.py:535 flatcamGUI/PreferencesUI.py:2330 flatcamGUI/PreferencesUI.py:3210
-#: flatcamTools/ToolCalibrateExcellon.py:119
+#: flatcamTools/ToolCalibrate.py:119
 msgid "Toolchange Z"
 msgstr ""
 
@@ -2277,12 +2277,12 @@ msgstr ""
 msgid "Plotting..."
 msgstr ""
 
-#: FlatCAMObj.py:6172 FlatCAMObj.py:6177 flatcamTools/ToolCalibrateExcellon.py:765
-#: flatcamTools/ToolCalibrateExcellon.py:770 flatcamTools/ToolSolderPaste.py:1470
+#: FlatCAMObj.py:6172 FlatCAMObj.py:6177 flatcamTools/ToolCalibrate.py:765
+#: flatcamTools/ToolCalibrate.py:770 flatcamTools/ToolSolderPaste.py:1470
 msgid "Export Machine Code ..."
 msgstr ""
 
-#: FlatCAMObj.py:6182 flatcamTools/ToolCalibrateExcellon.py:775
+#: FlatCAMObj.py:6182 flatcamTools/ToolCalibrate.py:775
 #: flatcamTools/ToolSolderPaste.py:1474
 msgid "Export Machine Code cancelled ..."
 msgstr ""
@@ -3198,7 +3198,7 @@ msgstr ""
 #: flatcamEditors/FlatCAMGrbEditor.py:5017 flatcamGUI/FlatCAMGUI.py:829
 #: flatcamGUI/FlatCAMGUI.py:1849 flatcamGUI/FlatCAMGUI.py:1927 flatcamGUI/FlatCAMGUI.py:2262
 #: flatcamGUI/ObjectUI.py:91 flatcamGUI/ObjectUI.py:112 flatcamGUI/PreferencesUI.py:5139
-#: flatcamTools/ToolCalibrateExcellon.py:446 flatcamTools/ToolCalibrateExcellon.py:473
+#: flatcamTools/ToolCalibrate.py:446 flatcamTools/ToolCalibrate.py:473
 #: flatcamTools/ToolTransform.py:27
 msgid "Scale"
 msgstr ""
@@ -3242,14 +3242,14 @@ msgid ""
 msgstr ""
 
 #: flatcamEditors/FlatCAMGeoEditor.py:711 flatcamEditors/FlatCAMGrbEditor.py:5102
-#: flatcamTools/ToolCalibrateExcellon.py:482
+#: flatcamTools/ToolCalibrate.py:482
 msgid "Angle X:"
 msgstr ""
 
 #: flatcamEditors/FlatCAMGeoEditor.py:713 flatcamEditors/FlatCAMGeoEditor.py:731
 #: flatcamEditors/FlatCAMGrbEditor.py:5104 flatcamEditors/FlatCAMGrbEditor.py:5122
 #: flatcamGUI/PreferencesUI.py:5118 flatcamGUI/PreferencesUI.py:5132
-#: flatcamTools/ToolCalibrateExcellon.py:484 flatcamTools/ToolCalibrateExcellon.py:497
+#: flatcamTools/ToolCalibrate.py:484 flatcamTools/ToolCalibrate.py:497
 msgid ""
 "Angle for Skew action, in degrees.\n"
 "Float number between -360 and 359."
@@ -3269,7 +3269,7 @@ msgid ""
 msgstr ""
 
 #: flatcamEditors/FlatCAMGeoEditor.py:729 flatcamEditors/FlatCAMGrbEditor.py:5120
-#: flatcamTools/ToolCalibrateExcellon.py:495
+#: flatcamTools/ToolCalibrate.py:495
 msgid "Angle Y:"
 msgstr ""
 
@@ -3279,12 +3279,12 @@ msgid "Skew Y"
 msgstr ""
 
 #: flatcamEditors/FlatCAMGeoEditor.py:768 flatcamEditors/FlatCAMGrbEditor.py:5159
-#: flatcamTools/ToolCalibrateExcellon.py:449
+#: flatcamTools/ToolCalibrate.py:449
 msgid "Factor X:"
 msgstr ""
 
 #: flatcamEditors/FlatCAMGeoEditor.py:770 flatcamEditors/FlatCAMGrbEditor.py:5161
-#: flatcamTools/ToolCalibrateExcellon.py:451
+#: flatcamTools/ToolCalibrate.py:451
 msgid "Factor for Scale action over X axis."
 msgstr ""
 
@@ -3302,12 +3302,12 @@ msgid ""
 msgstr ""
 
 #: flatcamEditors/FlatCAMGeoEditor.py:785 flatcamEditors/FlatCAMGrbEditor.py:5176
-#: flatcamTools/ToolCalibrateExcellon.py:461
+#: flatcamTools/ToolCalibrate.py:461
 msgid "Factor Y:"
 msgstr ""
 
 #: flatcamEditors/FlatCAMGeoEditor.py:787 flatcamEditors/FlatCAMGrbEditor.py:5178
-#: flatcamTools/ToolCalibrateExcellon.py:463
+#: flatcamTools/ToolCalibrate.py:463
 msgid "Factor for Scale action over Y axis."
 msgstr ""
 
@@ -5437,12 +5437,12 @@ msgstr ""
 msgid "GERBER"
 msgstr ""
 
-#: flatcamGUI/FlatCAMGUI.py:994 flatcamTools/ToolCalibrateExcellon.py:66
-#: flatcamTools/ToolCalibrateExcellon.py:543 flatcamTools/ToolDblSided.py:79
+#: flatcamGUI/FlatCAMGUI.py:994 flatcamTools/ToolCalibrate.py:66
+#: flatcamTools/ToolCalibrate.py:543 flatcamTools/ToolDblSided.py:79
 msgid "EXCELLON"
 msgstr ""
 
-#: flatcamGUI/FlatCAMGUI.py:1004 flatcamTools/ToolCalibrateExcellon.py:556
+#: flatcamGUI/FlatCAMGUI.py:1004 flatcamTools/ToolCalibrate.py:556
 #: flatcamTools/ToolDblSided.py:101
 msgid "GEOMETRY"
 msgstr ""
@@ -6223,7 +6223,7 @@ msgstr ""
 
 #: flatcamGUI/ObjectUI.py:199 flatcamGUI/ObjectUI.py:697 flatcamGUI/ObjectUI.py:1089
 #: flatcamGUI/ObjectUI.py:1671 flatcamGUI/ObjectUI.py:1952 flatcamGUI/ObjectUI.py:2004
-#: flatcamTools/ToolCalibrateExcellon.py:159 flatcamTools/ToolFiducials.py:73
+#: flatcamTools/ToolCalibrate.py:159 flatcamTools/ToolFiducials.py:73
 msgid "Name"
 msgstr ""
 
@@ -9662,8 +9662,8 @@ msgid ""
 "on a FlatCAM object."
 msgstr ""
 
-#: flatcamGUI/PreferencesUI.py:5108 flatcamTools/ToolCalibrateExcellon.py:479
-#: flatcamTools/ToolCalibrateExcellon.py:508
+#: flatcamGUI/PreferencesUI.py:5108 flatcamTools/ToolCalibrate.py:479
+#: flatcamTools/ToolCalibrate.py:508
 msgid "Skew"
 msgstr ""
 
@@ -10728,237 +10728,237 @@ msgstr ""
 msgid "Calc. Tool"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:33
+#: flatcamTools/ToolCalibrate.py:33
 msgid "Calibrate Excellon"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:68
+#: flatcamTools/ToolCalibrate.py:68
 msgid "Excellon Object to be used as a source for reference points."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:75
+#: flatcamTools/ToolCalibrate.py:75
 msgid "GCode Parameters"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:77
+#: flatcamTools/ToolCalibrate.py:77
 msgid "Parameters used when creating the GCode in this tool."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:84
+#: flatcamTools/ToolCalibrate.py:84
 msgid "Height (Z) for travelling between the points."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:96
+#: flatcamTools/ToolCalibrate.py:96
 msgid "Verification Z"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:98
+#: flatcamTools/ToolCalibrate.py:98
 msgid "Height (Z) for checking the point."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:110
+#: flatcamTools/ToolCalibrate.py:110
 msgid "Zero Z tool"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:112
+#: flatcamTools/ToolCalibrate.py:112
 msgid ""
 "Include a sequence to zero the height (Z)\n"
 "of the verification tool."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:121
+#: flatcamTools/ToolCalibrate.py:121
 msgid "Height (Z) for mounting the verification probe."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:143
+#: flatcamTools/ToolCalibrate.py:143
 msgid "Calibration Points"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:145
+#: flatcamTools/ToolCalibrate.py:145
 msgid ""
 "Contain the expected calibration points and the\n"
 "ones measured."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:160 flatcamTools/ToolSub.py:73
+#: flatcamTools/ToolCalibrate.py:160 flatcamTools/ToolSub.py:73
 #: flatcamTools/ToolSub.py:119
 msgid "Target"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:161
+#: flatcamTools/ToolCalibrate.py:161
 msgid "Found Delta"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:173
+#: flatcamTools/ToolCalibrate.py:173
 msgid "Bot Left X"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:182
+#: flatcamTools/ToolCalibrate.py:182
 msgid "Bot Left Y"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:190 flatcamTools/ToolCalibrateExcellon.py:191
+#: flatcamTools/ToolCalibrate.py:190 flatcamTools/ToolCalibrate.py:191
 msgid "Origin"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:202
+#: flatcamTools/ToolCalibrate.py:202
 msgid "Bot Right X"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:212
+#: flatcamTools/ToolCalibrate.py:212
 msgid "Bot Right Y"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:227
+#: flatcamTools/ToolCalibrate.py:227
 msgid "Top Left X"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:236
+#: flatcamTools/ToolCalibrate.py:236
 msgid "Top Left Y"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:251
+#: flatcamTools/ToolCalibrate.py:251
 msgid "Top Right X"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:260
+#: flatcamTools/ToolCalibrate.py:260
 msgid "Top Right Y"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:393 flatcamTools/ToolSolderPaste.py:148
+#: flatcamTools/ToolCalibrate.py:393 flatcamTools/ToolSolderPaste.py:148
 msgid "STEP 1"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:395
+#: flatcamTools/ToolCalibrate.py:395
 msgid ""
 "Pick four points by clicking inside the drill holes.\n"
 "Those four points should be in the four\n"
 "(as much as possible) corners of the Excellon object."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:402
+#: flatcamTools/ToolCalibrate.py:402
 msgid "Acquire Calibration Points"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:404
+#: flatcamTools/ToolCalibrate.py:404
 msgid ""
 "Pick four points by clicking inside the drill holes.\n"
 "Those four points should be in the four squares of\n"
 "the Excellon object."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:412 flatcamTools/ToolSolderPaste.py:358
+#: flatcamTools/ToolCalibrate.py:412 flatcamTools/ToolSolderPaste.py:358
 msgid "STEP 2"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:414 flatcamTools/ToolCalibrateExcellon.py:422
+#: flatcamTools/ToolCalibrate.py:414 flatcamTools/ToolCalibrate.py:422
 msgid ""
 "Generate GCode file to locate and align the PCB by using\n"
 "the four points acquired above."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:420 flatcamTools/ToolSolderPaste.py:341
+#: flatcamTools/ToolCalibrate.py:420 flatcamTools/ToolSolderPaste.py:341
 msgid "Generate GCode"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:429 flatcamTools/ToolSolderPaste.py:387
+#: flatcamTools/ToolCalibrate.py:429 flatcamTools/ToolSolderPaste.py:387
 msgid "STEP 3"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:431 flatcamTools/ToolCalibrateExcellon.py:440
+#: flatcamTools/ToolCalibrate.py:431 flatcamTools/ToolCalibrate.py:440
 msgid ""
 "Calculate Scale and Skew factors based on the differences (delta)\n"
 "found when checking the PCB pattern. The differences must be filled\n"
 "in the fields Found (Delta)."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:438
+#: flatcamTools/ToolCalibrate.py:438
 msgid "Calculate Factors"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:475
+#: flatcamTools/ToolCalibrate.py:475
 msgid "Apply Scale factors on the calibration points."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:510
+#: flatcamTools/ToolCalibrate.py:510
 msgid "Apply Skew factors on the calibration points."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:515 flatcamTools/ToolSolderPaste.py:433
+#: flatcamTools/ToolCalibrate.py:515 flatcamTools/ToolSolderPaste.py:433
 msgid "STEP 4"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:517 flatcamTools/ToolCalibrateExcellon.py:525
+#: flatcamTools/ToolCalibrate.py:517 flatcamTools/ToolCalibrate.py:525
 msgid ""
 "Generate verification GCode file adjusted with\n"
 "the factors above."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:523
+#: flatcamTools/ToolCalibrate.py:523
 msgid "Generate Adjusted GCode"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:531
+#: flatcamTools/ToolCalibrate.py:531
 msgid "STEP 5"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:533
+#: flatcamTools/ToolCalibrate.py:533
 msgid ""
 "Ajust the Excellon and Cutout Geometry objects\n"
 "with the factors determined, and verified, above."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:545
+#: flatcamTools/ToolCalibrate.py:545
 msgid "Excellon Object to be adjusted."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:558
+#: flatcamTools/ToolCalibrate.py:558
 msgid "Geometry Object to be adjusted."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:565
+#: flatcamTools/ToolCalibrate.py:565
 msgid "Adjust Objects"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:567
+#: flatcamTools/ToolCalibrate.py:567
 msgid ""
 "Adjust (scale and/or skew) the objects\n"
 "with the factors determined above."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:617
+#: flatcamTools/ToolCalibrate.py:617
 msgid "Cal Exc Tool"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:648 flatcamTools/ToolDblSided.py:457
+#: flatcamTools/ToolCalibrate.py:648 flatcamTools/ToolDblSided.py:457
 msgid "There is no Excellon object loaded ..."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:651
+#: flatcamTools/ToolCalibrate.py:651
 msgid "Click inside the First drill point. Bottom Left..."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:679
+#: flatcamTools/ToolCalibrate.py:679
 msgid "Click inside the Second drill point. Bottom Right..."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:683
+#: flatcamTools/ToolCalibrate.py:683
 msgid "Click inside the Third drill point. Top Left..."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:687
+#: flatcamTools/ToolCalibrate.py:687
 msgid "Click inside the Fourth drill point. Top Right..."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:691
+#: flatcamTools/ToolCalibrate.py:691
 msgid "Done. All four points have been acquired."
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:705
+#: flatcamTools/ToolCalibrate.py:705
 msgid "Verification GCode"
 msgstr ""
 
-#: flatcamTools/ToolCalibrateExcellon.py:721
+#: flatcamTools/ToolCalibrate.py:721
 msgid "Cancelled. Four points are needed for GCode generation."
 msgstr ""