diff --git a/appEditors/AppGeoEditor.py b/appEditors/AppGeoEditor.py index 0e599f08..fde0345d 100644 --- a/appEditors/AppGeoEditor.py +++ b/appEditors/AppGeoEditor.py @@ -1162,7 +1162,7 @@ class TransformEditorTool(AppTool): return self.draw_app.select_tool("select") - self.app.ui.notebook.setTabText(2, "Tools") + self.app.ui.notebook.setTabText(2, "Plugins") self.app.ui.notebook.setCurrentWidget(self.app.ui.project_tab) self.app.ui.splitter.setSizes([0, 1]) diff --git a/appEditors/AppGerberEditor.py b/appEditors/AppGerberEditor.py index 4daabde3..941ae528 100644 --- a/appEditors/AppGerberEditor.py +++ b/appEditors/AppGerberEditor.py @@ -7135,7 +7135,7 @@ class TransformEditorTool(AppTool): return self.draw_app.select_tool("select") - self.app.ui.notebook.setTabText(2, "Tools") + self.app.ui.notebook.setTabText(2, "Plugins") self.app.ui.notebook.setCurrentWidget(self.app.ui.project_tab) self.app.ui.splitter.setSizes([0, 1]) diff --git a/appGUI/MainGUI.py b/appGUI/MainGUI.py index 9747a87e..669078a6 100644 --- a/appGUI/MainGUI.py +++ b/appGUI/MainGUI.py @@ -1527,7 +1527,7 @@ class MainGUI(QtWidgets.QMainWindow): self.cncjob_tab_lay.addWidget(self.cncjob_scroll_area) self.tools_tab = QtWidgets.QWidget() - self.pref_tab_area.addTab(self.tools_tab, _("TOOLS")) + self.pref_tab_area.addTab(self.tools_tab, '%s' % _("Plugins").upper()) self.tools_tab_lay = QtWidgets.QVBoxLayout() self.tools_tab_lay.setContentsMargins(2, 2, 2, 2) self.tools_tab.setLayout(self.tools_tab_lay) @@ -1536,7 +1536,7 @@ class MainGUI(QtWidgets.QMainWindow): self.tools_tab_lay.addWidget(self.tools_scroll_area) self.tools2_tab = QtWidgets.QWidget() - self.pref_tab_area.addTab(self.tools2_tab, _("TOOLS 2")) + self.pref_tab_area.addTab(self.tools2_tab, '%s %s' % (_("Plugins").upper(), str(2))) self.tools2_tab_lay = QtWidgets.QVBoxLayout() self.tools2_tab_lay.setContentsMargins(2, 2, 2, 2) self.tools2_tab.setLayout(self.tools2_tab_lay) diff --git a/appGUI/ObjectUI.py b/appGUI/ObjectUI.py index db7814c4..2742c2f6 100644 --- a/appGUI/ObjectUI.py +++ b/appGUI/ObjectUI.py @@ -343,7 +343,7 @@ class GerberObjectUI(ObjectUI): separator_line1.setFrameShadow(QtWidgets.QFrame.Sunken) grid0.addWidget(separator_line1, 13, 0, 1, 3) - self.tool_lbl = FCLabel('%s' % _("TOOLS")) + self.tool_lbl = FCLabel('%s' % _("Plugins")) grid0.addWidget(self.tool_lbl, 14, 0, 1, 3) # Isolation Tool - will create isolation paths around the copper features @@ -362,7 +362,7 @@ class GerberObjectUI(ObjectUI): grid0.addWidget(self.iso_button, 16, 0, 1, 3) # ## Clear non-copper regions - self.generate_ncc_button = FCButton(_('NCC Tool')) + self.generate_ncc_button = FCButton(_('NCC')) self.generate_ncc_button.setIcon(QtGui.QIcon(self.app.resource_location + '/eraser26.png')) self.generate_ncc_button.setToolTip( _("Create the Geometry Object\n" @@ -377,7 +377,7 @@ class GerberObjectUI(ObjectUI): grid0.addWidget(self.generate_ncc_button, 18, 0, 1, 3) # ## Board cutout - self.generate_cutout_button = FCButton(_('Cutout Tool')) + self.generate_cutout_button = FCButton(_('Cutout')) self.generate_cutout_button.setIcon(QtGui.QIcon(self.app.resource_location + '/cut32.png')) self.generate_cutout_button.setToolTip( _("Generate the geometry for\n" @@ -392,7 +392,7 @@ class GerberObjectUI(ObjectUI): grid0.addWidget(self.generate_cutout_button, 20, 0, 1, 3) # Follow Tool - self.generate_follow_button = FCButton(_('Follow Tool')) + self.generate_follow_button = FCButton(_('Follow')) self.generate_follow_button.setIcon(QtGui.QIcon(self.app.resource_location + '/follow32.png')) self.generate_follow_button.setToolTip( _("Generate a 'Follow' geometry.\n" @@ -408,9 +408,9 @@ class GerberObjectUI(ObjectUI): grid0.addWidget(separator_line, 24, 0, 1, 3) # UTILITIES BUTTON - self.util_button = FCButton('%s' % _("UTILTIES"), checkable=True) + self.util_button = FCButton('%s' % _("Utilities").upper(), checkable=True) self.util_button.setIcon(QtGui.QIcon(self.app.resource_location + '/settings18.png')) - self.util_button.setToolTip(_("Show the Utilties.")) + self.util_button.setToolTip(_("Show the Utilities.")) self.util_button.setStyleSheet(""" QPushButton { @@ -719,11 +719,11 @@ class ExcellonObjectUI(ObjectUI): separator_line.setFrameShadow(QtWidgets.QFrame.Sunken) grid2.addWidget(separator_line, 0, 0, 1, 2) - self.tool_lbl = FCLabel('%s' % _("TOOLS")) + self.tool_lbl = FCLabel('%s' % _("Plugins")) grid2.addWidget(self.tool_lbl, 2, 0, 1, 2) # Drilling Tool - will create GCode for drill holes - self.drill_button = FCButton(_('Drilling Tool')) + self.drill_button = FCButton(_('Drilling')) self.drill_button.setIcon(QtGui.QIcon(self.app.resource_location + '/drilling_tool32.png')) self.drill_button.setToolTip( _("Generate GCode from the drill holes in an Excellon object.") @@ -737,7 +737,7 @@ class ExcellonObjectUI(ObjectUI): grid2.addWidget(self.drill_button, 4, 0, 1, 2) # Milling Tool - will create GCode for slot holes - self.milling_button = FCButton(_('Milling Tool')) + self.milling_button = FCButton(_('Milling')) self.milling_button.setIcon(QtGui.QIcon(self.app.resource_location + '/milling_tool32.png')) self.milling_button.setToolTip( _("Generate a Geometry for milling drills or slots in an Excellon object.") @@ -756,9 +756,9 @@ class ExcellonObjectUI(ObjectUI): grid2.addWidget(separator_line, 8, 0, 1, 2) # UTILITIES BUTTON - self.util_button = FCButton('%s' % _("UTILTIES"), checkable=True) + self.util_button = FCButton('%s' % _("Utilities").upper(), checkable=True) self.util_button.setIcon(QtGui.QIcon(self.app.resource_location + '/settings18.png')) - self.util_button.setToolTip(_("Show the Utilties.")) + self.util_button.setToolTip(_("Show the Utilities.")) self.util_button.setStyleSheet(""" QPushButton { @@ -1785,14 +1785,14 @@ class GeometryObjectUI(ObjectUI): # ############################################################################################################# # ############################################ Tools ########################################################## # ############################################################################################################# - self.tools_label = FCLabel('%s' % _('TOOLS')) + self.tools_label = FCLabel('%s' % _('Plugins')) self.tools_label.setToolTip( _("Launch Paint Tool in Tools Tab.") ) self.grid4.addWidget(self.tools_label, 32, 0, 1, 2) # Milling Tool - will create GCode for slot holes - self.milling_button = FCButton(_('Milling Tool')) + self.milling_button = FCButton(_('Milling')) self.milling_button.setIcon(QtGui.QIcon(self.app.resource_location + '/milling_tool32.png')) self.milling_button.setToolTip( _("Generate a CNCJob by milling a Geometry.") @@ -1806,7 +1806,7 @@ class GeometryObjectUI(ObjectUI): self.grid4.addWidget(self.milling_button, 34, 0, 1, 2) # Paint Button - self.paint_tool_button = FCButton(_('Paint Tool')) + self.paint_tool_button = FCButton(_('Paint')) self.paint_tool_button.setIcon(QtGui.QIcon(self.app.resource_location + '/paint20_1.png')) self.paint_tool_button.setToolTip( _("Creates tool paths to cover the\n" @@ -1816,7 +1816,7 @@ class GeometryObjectUI(ObjectUI): self.grid4.addWidget(self.paint_tool_button, 36, 0, 1, 2) # NCC Tool - self.generate_ncc_button = FCButton(_('NCC Tool')) + self.generate_ncc_button = FCButton(_('NCC')) self.generate_ncc_button.setIcon(QtGui.QIcon(self.app.resource_location + '/eraser26.png')) self.generate_ncc_button.setToolTip( _("Create the Geometry Object\n" @@ -1836,9 +1836,9 @@ class GeometryObjectUI(ObjectUI): self.grid4.addWidget(separator_line, 40, 0, 1, 2) # UTILITIES BUTTON - self.util_button = FCButton('%s' % _("UTILTIES"), checkable=True) + self.util_button = FCButton('%s' % _("Utilities").upper(), checkable=True) self.util_button.setIcon(QtGui.QIcon(self.app.resource_location + '/settings18.png')) - self.util_button.setToolTip(_("Show the Utilties.")) + self.util_button.setToolTip(_("Show the Utilities.")) self.util_button.setStyleSheet(""" QPushButton { diff --git a/appGUI/preferences/PreferencesUIManager.py b/appGUI/preferences/PreferencesUIManager.py index 0813bc53..f4270c6f 100644 --- a/appGUI/preferences/PreferencesUIManager.py +++ b/appGUI/preferences/PreferencesUIManager.py @@ -560,7 +560,7 @@ class PreferencesUIManager: "tools_corners_drill_dia": self.ui.tools_defaults_form.tools_corners_group.drill_dia_entry, # ####################################################################################################### - # ########################################## TOOLS 2 #################################################### + # ########################################## PLUGINS 2 ################################################## # ####################################################################################################### # Optimal Tool diff --git a/appObjects/FlatCAMGerber.py b/appObjects/FlatCAMGerber.py index 88a4bfde..ef6f2469 100644 --- a/appObjects/FlatCAMGerber.py +++ b/appObjects/FlatCAMGerber.py @@ -165,7 +165,7 @@ class GerberObject(FlatCAMObj, Gerber): self.ui.generate_cutout_button.clicked.connect(lambda: self.app.cutout_tool.run(toggle=True)) self.ui.generate_follow_button.clicked.connect(lambda: self.app.follow_tool.run(toggle=True)) - # Utilties + # Utilities self.ui.generate_bb_button.clicked.connect(self.on_generatebb_button_click) self.ui.generate_noncopper_button.clicked.connect(self.on_generatenoncopper_button_click) self.ui.util_button.clicked.connect(lambda st: self.ui.util_frame.show() if st else self.ui.util_frame.hide()) diff --git a/appTools/ToolIsolation.py b/appTools/ToolIsolation.py index 44696e9e..d01d75ec 100644 --- a/appTools/ToolIsolation.py +++ b/appTools/ToolIsolation.py @@ -360,7 +360,7 @@ class ToolIsolation(AppTool, Gerber): dias = self.app.defaults["tools_iso_tooldia"] if not dias: - log.error("At least one tool diameter needed. Verify in Edit -> Preferences -> TOOLS -> Isolation Tools.") + log.error("At least one tool diameter needed. Verify in Edit -> Preferences -> Plugins -> Isolation Tools.") return self.tooluid = 0 diff --git a/appTools/ToolPaint.py b/appTools/ToolPaint.py index 1eba9f9e..1bfc8317 100644 --- a/appTools/ToolPaint.py +++ b/appTools/ToolPaint.py @@ -572,7 +572,7 @@ class ToolPaint(AppTool, Gerber): diameters = self.app.defaults["tools_paint_tooldia"] if not diameters: - log.error("At least one tool diameter needed. Verify in Edit -> Preferences -> TOOLS -> NCC Tools.") + log.error("At least one tool diameter needed. Verify in Edit -> Preferences -> Plugins -> NCC Tools.") self.build_ui() # if the Paint Method is "Single" disable the tool table context menu diff --git a/appTools/ToolProperties.py b/appTools/ToolProperties.py index 792420a9..acb58db1 100644 --- a/appTools/ToolProperties.py +++ b/appTools/ToolProperties.py @@ -128,7 +128,7 @@ class Properties(AppTool): obj_list = self.app.collection.get_selected() if not obj_list: self.app.inform.emit('[ERROR_NOTCL] %s' % _("No object is selected.")) - self.app.ui.notebook.setTabText(2, _("Tools")) + self.app.ui.notebook.setTabText(2, _("Plugins")) self.properties_frame.hide() self.app.ui.notebook.setCurrentWidget(self.app.ui.project_tab) return diff --git a/appTools/ToolSolderPaste.py b/appTools/ToolSolderPaste.py index 7c9c9b49..e92fbcee 100644 --- a/appTools/ToolSolderPaste.py +++ b/appTools/ToolSolderPaste.py @@ -192,7 +192,7 @@ class SolderPaste(AppTool): except Exception as err: self.app.log.error("SolderPaste.set_tool_ui() -> nozzle dias -> %s" % str(err)) self.app.log.error("At least one Nozzle tool diameter needed. " - "Verify in Edit -> Preferences -> TOOLS -> Solder Paste Tools.") + "Verify in Edit -> Preferences -> Plugins -> Solder Paste Tools.") return self.tooluid = 0 diff --git a/locale/de/LC_MESSAGES/strings.po b/locale/de/LC_MESSAGES/strings.po index 5bb01905..10eedd5f 100644 --- a/locale/de/LC_MESSAGES/strings.po +++ b/locale/de/LC_MESSAGES/strings.po @@ -6660,11 +6660,11 @@ msgstr "" "der Brettausschnitt." #: appGUI/ObjectUI.py:418 appGUI/ObjectUI.py:765 appGUI/ObjectUI.py:1848 -msgid "UTILTIES" +msgid "Utilities" msgstr "WERKZEUGE" #: appGUI/ObjectUI.py:420 appGUI/ObjectUI.py:767 appGUI/ObjectUI.py:1850 -msgid "Show the Utilties." +msgid "Show the Utilities." msgstr "Zeigen Sie die Dienstprogramme an." #: appGUI/ObjectUI.py:444 appGUI/preferences/gerber/GerberOptPrefGroupUI.py:32 diff --git a/locale/en/LC_MESSAGES/strings.po b/locale/en/LC_MESSAGES/strings.po index e0e6005c..c378693e 100644 --- a/locale/en/LC_MESSAGES/strings.po +++ b/locale/en/LC_MESSAGES/strings.po @@ -6573,12 +6573,12 @@ msgstr "" "the board cutout." #: appGUI/ObjectUI.py:418 appGUI/ObjectUI.py:765 appGUI/ObjectUI.py:1848 -msgid "UTILTIES" -msgstr "UTILTIES" +msgid "Utilities" +msgstr "Utilities" #: appGUI/ObjectUI.py:420 appGUI/ObjectUI.py:767 appGUI/ObjectUI.py:1850 -msgid "Show the Utilties." -msgstr "Show the Utilties." +msgid "Show the Utilities." +msgstr "Show the Utilities." #: appGUI/ObjectUI.py:444 appGUI/preferences/gerber/GerberOptPrefGroupUI.py:32 msgid "Non-copper regions" diff --git a/locale/es/LC_MESSAGES/strings.po b/locale/es/LC_MESSAGES/strings.po index 99393261..5e2bae51 100644 --- a/locale/es/LC_MESSAGES/strings.po +++ b/locale/es/LC_MESSAGES/strings.po @@ -6690,11 +6690,11 @@ msgstr "" "El recorte del tablero." #: appGUI/ObjectUI.py:418 appGUI/ObjectUI.py:765 appGUI/ObjectUI.py:1848 -msgid "UTILTIES" +msgid "Utilities" msgstr "UTILIDADES" #: appGUI/ObjectUI.py:420 appGUI/ObjectUI.py:767 appGUI/ObjectUI.py:1850 -msgid "Show the Utilties." +msgid "Show the Utilities." msgstr "Muestre las utilidades." #: appGUI/ObjectUI.py:444 appGUI/preferences/gerber/GerberOptPrefGroupUI.py:32 diff --git a/locale/fr/LC_MESSAGES/strings.po b/locale/fr/LC_MESSAGES/strings.po index 2f8e8cca..529e8640 100644 --- a/locale/fr/LC_MESSAGES/strings.po +++ b/locale/fr/LC_MESSAGES/strings.po @@ -6698,11 +6698,11 @@ msgstr "" "la découpe de la planche." #: appGUI/ObjectUI.py:418 appGUI/ObjectUI.py:765 appGUI/ObjectUI.py:1848 -msgid "UTILTIES" +msgid "Utilities" msgstr "UTILITAIRES" #: appGUI/ObjectUI.py:420 appGUI/ObjectUI.py:767 appGUI/ObjectUI.py:1850 -msgid "Show the Utilties." +msgid "Show the Utilities." msgstr "Affichez les utilitaires." #: appGUI/ObjectUI.py:444 appGUI/preferences/gerber/GerberOptPrefGroupUI.py:32 diff --git a/locale/it/LC_MESSAGES/strings.po b/locale/it/LC_MESSAGES/strings.po index cce38c77..ba194561 100644 --- a/locale/it/LC_MESSAGES/strings.po +++ b/locale/it/LC_MESSAGES/strings.po @@ -6614,11 +6614,11 @@ msgstr "" "il ritaglio della scheda." #: appGUI/ObjectUI.py:418 appGUI/ObjectUI.py:765 appGUI/ObjectUI.py:1848 -msgid "UTILTIES" +msgid "Utilities" msgstr "UTILITA'" #: appGUI/ObjectUI.py:420 appGUI/ObjectUI.py:767 appGUI/ObjectUI.py:1850 -msgid "Show the Utilties." +msgid "Show the Utilities." msgstr "Mostra utilità." #: appGUI/ObjectUI.py:444 appGUI/preferences/gerber/GerberOptPrefGroupUI.py:32 diff --git a/locale/pt_BR/LC_MESSAGES/strings.po b/locale/pt_BR/LC_MESSAGES/strings.po index 18442265..fdcb0a7d 100644 --- a/locale/pt_BR/LC_MESSAGES/strings.po +++ b/locale/pt_BR/LC_MESSAGES/strings.po @@ -6660,11 +6660,11 @@ msgid "" msgstr "Gera a geometria para o recorte da placa." #: appGUI/ObjectUI.py:418 appGUI/ObjectUI.py:765 appGUI/ObjectUI.py:1848 -msgid "UTILTIES" +msgid "Utilities" msgstr "Utilitários" #: appGUI/ObjectUI.py:420 appGUI/ObjectUI.py:767 appGUI/ObjectUI.py:1850 -msgid "Show the Utilties." +msgid "Show the Utilities." msgstr "Mostre os Utilitários." #: appGUI/ObjectUI.py:444 appGUI/preferences/gerber/GerberOptPrefGroupUI.py:32 diff --git a/locale/ro/LC_MESSAGES/strings.po b/locale/ro/LC_MESSAGES/strings.po index bf0f1cec..541080f1 100644 --- a/locale/ro/LC_MESSAGES/strings.po +++ b/locale/ro/LC_MESSAGES/strings.po @@ -6656,11 +6656,11 @@ msgstr "" "pt decuparea PCB." #: appGUI/ObjectUI.py:418 appGUI/ObjectUI.py:765 appGUI/ObjectUI.py:1848 -msgid "UTILTIES" +msgid "Utilities" msgstr "UTILITARE" #: appGUI/ObjectUI.py:420 appGUI/ObjectUI.py:767 appGUI/ObjectUI.py:1850 -msgid "Show the Utilties." +msgid "Show the Utilities." msgstr "Afișați Utilitarele." #: appGUI/ObjectUI.py:444 appGUI/preferences/gerber/GerberOptPrefGroupUI.py:32 diff --git a/locale/ru/LC_MESSAGES/strings.po b/locale/ru/LC_MESSAGES/strings.po index 28eafdb6..f5ca6c95 100644 --- a/locale/ru/LC_MESSAGES/strings.po +++ b/locale/ru/LC_MESSAGES/strings.po @@ -6672,11 +6672,11 @@ msgstr "" "для обрезки контура." #: appGUI/ObjectUI.py:418 appGUI/ObjectUI.py:765 appGUI/ObjectUI.py:1848 -msgid "UTILTIES" +msgid "Utilities" msgstr "польза" #: appGUI/ObjectUI.py:420 appGUI/ObjectUI.py:767 appGUI/ObjectUI.py:1850 -msgid "Show the Utilties." +msgid "Show the Utilities." msgstr "Шоу программы разделы" #: appGUI/ObjectUI.py:444 appGUI/preferences/gerber/GerberOptPrefGroupUI.py:32 diff --git a/locale/tr/LC_MESSAGES/strings.po b/locale/tr/LC_MESSAGES/strings.po index f0351457..a5f3e442 100644 --- a/locale/tr/LC_MESSAGES/strings.po +++ b/locale/tr/LC_MESSAGES/strings.po @@ -6593,11 +6593,11 @@ msgid "" msgstr "PCB'yi kesmek için kesim şekilleri oluşturun." #: appGUI/ObjectUI.py:418 appGUI/ObjectUI.py:765 appGUI/ObjectUI.py:1848 -msgid "UTILTIES" +msgid "Utilities" msgstr "ARAÇLAR" #: appGUI/ObjectUI.py:420 appGUI/ObjectUI.py:767 appGUI/ObjectUI.py:1850 -msgid "Show the Utilties." +msgid "Show the Utilities." msgstr "Araçları göster." #: appGUI/ObjectUI.py:444 appGUI/preferences/gerber/GerberOptPrefGroupUI.py:32 diff --git a/locale_template/strings.pot b/locale_template/strings.pot index 9986dd14..a3e6e27a 100644 --- a/locale_template/strings.pot +++ b/locale_template/strings.pot @@ -5985,11 +5985,11 @@ msgid "" msgstr "" #: appGUI/ObjectUI.py:418 appGUI/ObjectUI.py:765 appGUI/ObjectUI.py:1848 -msgid "UTILTIES" +msgid "Utilities" msgstr "" #: appGUI/ObjectUI.py:420 appGUI/ObjectUI.py:767 appGUI/ObjectUI.py:1850 -msgid "Show the Utilties." +msgid "Show the Utilities." msgstr "" #: appGUI/ObjectUI.py:444 appGUI/preferences/gerber/GerberOptPrefGroupUI.py:32