Merged jpcgt/flatcam/jpcgt_flatcam_Beta into Beta

flatcamGUI/FlatCAMGUI.py

@@ -3766,8 +3766,8 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
                                           "ADVANCED level -> full functionality.\n\n"
                                           "The choice here will influence the parameters in\n"
                                           "the Selected Tab for all kinds of FlatCAM objects."))
-        self.app_level_radio = RadioSet([{'label': 'Basic', 'value': 'b'},
+        self.app_level_radio = RadioSet([{'label': _('Basic'), 'value': 'b'},
-                                         {'label': 'Advanced', 'value': 'a'}])
+                                         {'label': _('Advanced'), 'value': 'a'}])
 
         # Languages for FlatCAM
         self.languagelabel = QtWidgets.QLabel(_('<b>Languages:</b>'))
@@ -3989,7 +3989,7 @@ class GerberGenPrefGroupUI(OptionsGroupUI):
         # OptionsGroupUI.__init__(self, "Gerber General Preferences", parent=parent)
         super(GerberGenPrefGroupUI, self).__init__(self)
 
-        self.setTitle(str("Gerber General"))
+        self.setTitle(str(_("Gerber General")))
 
         # ## Plot options
         self.plot_options_label = QtWidgets.QLabel(_("<b>Plot Options:</b>"))

flatcamGUI/ObjectUI.py

@@ -1499,7 +1499,7 @@ class CNCObjectUI(ObjectUI):
         self.custom_box.addWidget(self.prepend_text)
 
         # Append text to GCode
-        appendlabel = QtWidgets.QLabel(_('Append to CNC Code'))
+        appendlabel = QtWidgets.QLabel(_('Append to CNC Code:'))
         appendlabel.setToolTip(
             _(
                 "Type here any G-Code commands you would\n"

flatcamTools/ToolCutOut.py

@@ -310,7 +310,7 @@ class CutOut(FlatCAMTool):
         FlatCAMTool.run(self)
         self.set_tool_ui()
 
-        self.app.ui.notebook.setTabText(2, "Cutout Tool")
+        self.app.ui.notebook.setTabText(2, _("Cutout Tool"))
 
     def install(self, icon=None, separator=None, **kwargs):
         FlatCAMTool.install(self, icon, separator, shortcut='ALT+U', **kwargs)

flatcamTools/ToolMeasurement.py

@@ -52,10 +52,10 @@ class Measurement(FlatCAMTool):
         self.stop_label = QtWidgets.QLabel("<b>%s</b> %s:" % (_('Stop'), _('Coords')))
         self.stop_label.setToolTip(_("This is the measuring Stop point coordinates."))
 
-        self.distance_x_label = QtWidgets.QLabel("Dx:")
+        self.distance_x_label = QtWidgets.QLabel(_("Dx:"))
         self.distance_x_label.setToolTip(_("This is the distance measured over the X axis."))
 
-        self.distance_y_label = QtWidgets.QLabel("Dy:")
+        self.distance_y_label = QtWidgets.QLabel(_("Dy:"))
         self.distance_y_label.setToolTip(_("This is the distance measured over the Y axis."))
 
         self.total_distance_label = QtWidgets.QLabel("<b>%s:</b>" % _('DISTANCE'))

locale_template/strings.pot

@@ -5233,6 +5233,14 @@ msgid ""
 "the Selected Tab for all kinds of FlatCAM objects."
 msgstr ""
 
+#: flatcamGUI/FlatCAMGUI.py:3769
+msgid "Basic"
+msgstr ""
+
+#: flatcamGUI/FlatCAMGUI.py:3770
+msgid "Advanced"
+msgstr ""
+
 #: flatcamGUI/FlatCAMGUI.py:3773
 msgid "<b>Languages:</b>"
 msgstr ""
@@ -5394,6 +5402,10 @@ msgid ""
 "but require more RAM usage and more processing time."
 msgstr ""
 
+#: flatcamGUI/FlatCAMGUI.py:3992
+msgid "Gerber General"
+msgstr ""
+
 #: flatcamGUI/FlatCAMGUI.py:3995 flatcamGUI/FlatCAMGUI.py:4361
 #: flatcamGUI/FlatCAMGUI.py:5153 flatcamGUI/FlatCAMGUI.py:5525
 #: flatcamGUI/ObjectUI.py:150 flatcamGUI/ObjectUI.py:505
@@ -7397,7 +7409,7 @@ msgstr ""
 msgid "<b>Board cutout:</b>"
 msgstr ""
 
-#: flatcamGUI/ObjectUI.py:408
+#: flatcamGUI/ObjectUI.py:408 flatcamTools/ToolCutOut.py:313
 msgid "Cutout Tool"
 msgstr ""
 
@@ -7919,7 +7931,7 @@ msgid ""
 msgstr ""
 
 #: flatcamGUI/ObjectUI.py:1502
-msgid "Append to CNC Code"
+msgid "Append to CNC Code:"
 msgstr ""
 
 #: flatcamGUI/ObjectUI.py:1526
@@ -8736,6 +8748,14 @@ msgstr ""
 msgid "Stop"
 msgstr ""
 
+#: flatcamTools/ToolMeasurement.py:55
+msgid "Dx:"
+msgstr ""
+
+#: flatcamTools/ToolMeasurement.py:58
+msgid "Dy:"
+msgstr ""
+
 #: flatcamTools/ToolMeasurement.py:53 flatcamTools/ToolMeasurement.py:70
 msgid "This is the measuring Stop point coordinates."
 msgstr ""