# HG changeset patch
# User Rik <rik@octave.org>
# Date 1668546820 28800
# Node ID 9d4ef8d54bfea066407d5b23960a5b1666d94749
# Parent  df8bdaf1164b3d08f7503c525da5a0f03f1fc22f# Parent  d17ee5e7b66c105728ab162518666d83a0226125
maint: merge stable to default

diff -r df8bdaf1164b -r 9d4ef8d54bfe libgui/src/settings-dialog.ui
--- a/libgui/src/settings-dialog.ui	Mon Aug 29 18:29:24 2022 +0200
+++ b/libgui/src/settings-dialog.ui	Tue Nov 15 13:13:40 2022 -0800
@@ -2602,7 +2602,7 @@
 interference with readline key strokes.</string>
                  </property>
                  <property name="text">
-                  <string>Disable menu accelerators of main window menus when Commmand Window has focus</string>
+                  <string>Disable menu accelerators of main window menus when Command Window has focus</string>
                  </property>
                 </widget>
                </item>
diff -r df8bdaf1164b -r 9d4ef8d54bfe libgui/src/shortcut-manager.cc
--- a/libgui/src/shortcut-manager.cc	Mon Aug 29 18:29:24 2022 +0200
+++ b/libgui/src/shortcut-manager.cc	Tue Nov 15 13:13:40 2022 -0800
@@ -677,7 +677,7 @@
 
         QCheckBox *shift
           = new QCheckBox (tr ("Add Shift modifier\n"
-                               "(allows to enter number keys)"));
+                               "(allows one to enter number keys)"));
 
         shift->setStyleSheet
           ("QCheckBox::indicator { subcontrol-position: left top; }");
diff -r df8bdaf1164b -r 9d4ef8d54bfe liboctave/numeric/svd.cc
--- a/liboctave/numeric/svd.cc	Mon Aug 29 18:29:24 2022 +0200
+++ b/liboctave/numeric/svd.cc	Tue Nov 15 13:13:40 2022 -0800
@@ -827,7 +827,7 @@
           if (iwork[2] == 1)
             (*current_liboctave_warning_with_id_handler)
               ("Octave:convergence", "svd: (driver: GEJSV) "
-               "Denormal occured, possible loss of accuracy.");
+               "Denormal occurred, possible loss of accuracy.");
 
           if (info < 0)
             (*current_liboctave_error_handler)