Mercurial > octave

changeset 31434:9d4ef8d54bfe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default
author Rik <rik@octave.org>
date Tue, 15 Nov 2022 13:13:40 -0800
parents df8bdaf1164b (current diff) d17ee5e7b66c (diff)
children 6737f0f0d420 03aebcb28937
files libgui/src/settings-dialog.ui
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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>
--- 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; }");
--- 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)