Merge branch '2.9'

LinuxCNC · Nov 18, 2024 · 636da80 · 636da80
2 parents 8fb7cb5 + 86cdee2
commit 636da80
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/docs/src/gui/gstat.adoc b/docs/src/gui/gstat.adoc
@@ -112,7 +112,7 @@ class HandlerClass:
         GSTAT.connect("state-estop",lambda w: self.update_estate_label('ESTOP'))
         GSTAT.connect("state-estop-reset",lambda w: self.update_estate_label('RESET'))
 
-        GSTAT.connect("state-on",lambda w: self.update_state_label('MACHIBE ON'))
+        GSTAT.connect("state-on",lambda w: self.update_state_label('MACHINE ON'))
         GSTAT.connect("state-off",lambda w: self.update_state_label('MACHINE OFF'))
 
         GSTAT.connect("interp-paused",lambda w: self.update_interp_label('Paused'))
@@ -156,7 +156,7 @@ class HandlerClass:
         GSTAT.connect("state-estop",lambda w: self.update_estate_label('ESTOP'))
         GSTAT.connect("state-estop-reset",lambda w: self.update_estate_label('RESET'))
 
-        GSTAT.connect("state-on",lambda w: self.update_state_label('MACHIBE ON'))
+        GSTAT.connect("state-on",lambda w: self.update_state_label('MACHINE ON'))
         GSTAT.connect("state-off",lambda w: self.update_state_label('MACHINE OFF'))
 
         GSTAT.connect("interp-paused",lambda w: self.update_interp_label('Paused'))

diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.py b/src/emc/usr_intf/gmoccapy/gmoccapy.py
@@ -491,7 +491,7 @@ def __init__(self, argv):
             except:
                 tb = traceback.format_exc()
                 LOG.error(tb)
-                self.notification.add_message(_("Error in ") + rcfile + "\n" \
+                self.notification.add_message(_("Error in") + " " + rcfile + "\n" \
                     + _("Please check the console output."), ALERT_ICON)
 
         # Custom css file, e.g.:
@@ -512,7 +512,7 @@ def __init__(self, argv):
             except:
                 tb = traceback.format_exc()
                 LOG.error(tb)
-                self.notification.add_message(_("Error in ") + css_file + "\n" \
+                self.notification.add_message(_("Error in") + " " + css_file + "\n" \
                     + _("Please check the console output."), ALERT_ICON)
 
 

diff --git a/tcl/bin/halshow.tcl b/tcl/bin/halshow.tcl
@@ -956,7 +956,7 @@ proc popupmenu_watch {vartype label index writable which x y} {
     # add entries
     $m add command -label [msgcat::mc "Copy"] -command [list copyName $label]
     if {$writable} {
-        $m add command -label [msgcat::mc "Set to .."] -command [list setValue $label]
+        $m add command -label [msgcat::mc "Set to .."] -command [list setpValue $label]
     }
     if {$writable == -1} {
         $m add command -label [msgcat::mc "Unlink pin"] -command [list unlinkp $label $index]