maint: merge stable to default

etc/NEWS.9.md

@@ -36,7 +36,7 @@ Summary of important user-visible changes for version 9 (yyyy-mm-dd):
   factor of "off" which is equivalent to setting it to 0.  When a linestyle
   with a base marker is set suppressing arrowhead display, subsequent
   name-value property pairs in the quiver/quiver3 function call will no longer
-  turn arrowhead display back on (bug #64143).  The linewdith property now also
+  turn arrowhead display back on (bug #64143).  The linewidth property now also
   affects the line width of the base marker.
 
 - Classdefs now support breakpoints inside them.

libgui/graphics/annotation-dialog.ui

@@ -550,7 +550,7 @@
       <item row="2" column="0" colspan="2">
        <widget class="QLabel" name="label_13">
         <property name="text">
-         <string>Horz alignment</string>
+         <string>Horizontal alignment</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -579,7 +579,7 @@
       <item row="2" column="3" colspan="2">
        <widget class="QLabel" name="label_14">
         <property name="text">
-         <string>Vert alignment</string>
+         <string>Vertical alignment</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -659,6 +659,9 @@
         <property name="text">
          <string>Width</string>
         </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
        </widget>
       </item>
       <item row="0" column="5">
@@ -676,6 +679,9 @@
         <property name="text">
          <string>Height</string>
         </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
        </widget>
       </item>
       <item row="0" column="7">

libgui/src/documentation.cc

@@ -150,8 +150,8 @@ documentation::documentation (QWidget *p)
       QMessageBox::warning (this, tr ("Octave Documentation"),
                             tr ("Could not setup the data required for the\n"
                                 "documentation viewer. Maybe the Qt SQlite\n"
-                                "module is missing.\n"
-                                "Only help texts in the Command Window will\n"
+                                "module is missing?\n"
+                                "Only help text in the Command Window will\n"
                                 "be available."));
 #endif
       disconnect (m_help_engine, 0, 0, 0);
@@ -253,7 +253,7 @@ documentation::documentation (QWidget *p)
       QHelpIndexWidget *index = m_help_engine->indexWidget ();
 
       m_filter = new QComboBox (this);
-      m_filter->setToolTip (tr ("Enter text to search the indices"));
+      m_filter->setToolTip (tr ("Enter text to search function index"));
       m_filter->setEditable (true);
       m_filter->setInsertPolicy (QComboBox::NoInsert);
       m_filter->setMaxCount (10);
@@ -454,13 +454,13 @@ void documentation::construct_tool_bar ()
   // Zoom
   m_tool_bar->addSeparator ();
   m_action_zoom_in
-    = add_action (settings.icon ("view-zoom-in"), tr ("Zoom in"),
+    = add_action (settings.icon ("view-zoom-in"), tr ("Zoom In"),
                   SLOT (zoom_in ()), m_doc_browser, m_tool_bar);
   m_action_zoom_out
-    = add_action (settings.icon ("view-zoom-out"), tr ("Zoom out"),
+    = add_action (settings.icon ("view-zoom-out"), tr ("Zoom Out"),
                   SLOT (zoom_out ()), m_doc_browser, m_tool_bar);
   m_action_zoom_original
-    = add_action (settings.icon ("view-zoom-original"), tr ("Zoom original"),
+    = add_action (settings.icon ("view-zoom-original"), tr ("Zoom Original"),
                   SLOT (zoom_original ()), m_doc_browser, m_tool_bar);
 
   // Bookmarks (connect slots later)

libgui/src/find-files-dialog.cc

@@ -88,28 +88,28 @@ find_files_dialog::find_files_dialog (QWidget *p)
            this, &find_files_dialog::browse_folders);
 
   m_recurse_dirs_check = new QCheckBox (tr ("Search subdirectories"));
-  m_recurse_dirs_check->setChecked (settings.bool_value (ff_recurse_dirs));
   m_recurse_dirs_check->setToolTip (tr ("Search recursively through directories for matching files"));
+  m_recurse_dirs_check->setChecked (settings.bool_value (ff_recurse_dirs));
 
   m_include_dirs_check = new QCheckBox (tr ("Include directory names"));
-  m_include_dirs_check->setChecked (settings.bool_value (ff_include_dirs));
   m_include_dirs_check->setToolTip (tr ("Include matching directories in search results"));
+  m_include_dirs_check->setChecked (settings.bool_value (ff_include_dirs));
 
-  m_name_case_check = new QCheckBox (tr ("Name case insensitive"));
+  m_name_case_check = new QCheckBox (tr ("Ignore case"));
+  m_name_case_check->setToolTip (tr ("Perform case insensitive match"));
   m_name_case_check->setChecked (settings.bool_value (ff_name_case));
-  m_name_case_check->setToolTip (tr ("Set matching name is case insensitive"));
 
   m_contains_text_check = new QCheckBox (tr ("Contains text:"));
-  m_contains_text_check->setToolTip (tr ("Enter the file content search expression"));
+  m_contains_text_check->setToolTip (tr ("Include only files containing specified text in search results"));
   m_contains_text_check->setChecked (settings.bool_value (ff_check_text));
 
   m_contains_text_edit = new QLineEdit ();
   m_contains_text_edit->setToolTip (tr ("Text to match"));
   m_contains_text_edit->setText (settings.string_value (ff_contains_text));
 
-  m_content_case_check = new QCheckBox (tr ("Text case insensitive"));
+  m_content_case_check = new QCheckBox (tr ("Ignore case"));
+  m_content_case_check->setToolTip (tr ("Perform case insensitive match"));
   m_content_case_check->setChecked (settings.bool_value (ff_content_case));
-  m_content_case_check->setToolTip (tr ("Set text content is case insensitive"));
 
   find_files_model *model = new find_files_model (this);
 
@@ -144,7 +144,7 @@ find_files_dialog::find_files_dialog (QWidget *p)
            this, &find_files_dialog::start_find);
 
   m_stop_button = new QPushButton (tr ("Stop"));
-  m_stop_button->setToolTip (tr ("Stop searching"));
+  m_stop_button->setToolTip (tr ("Stop search"));
   m_stop_button->setEnabled (false);
   connect (m_stop_button, &QPushButton::clicked,
            this, &find_files_dialog::stop_find);
@@ -160,7 +160,7 @@ find_files_dialog::find_files_dialog (QWidget *p)
            this, &find_files_dialog::close);
 
   // name options
-  QGroupBox *name_group = new QGroupBox (tr ("Filename/location"));
+  QGroupBox *name_group = new QGroupBox (tr ("Filename/Location"));
   QGridLayout *name_layout = new QGridLayout;
   name_group->setLayout (name_layout);
 

libgui/src/gui-preferences-cs.h

@@ -57,10 +57,10 @@ extern gui_pref cs_colors[];
 
 const QStringList
 cs_color_names = {
-  QT_TRANSLATE_NOOP ("octave::settings_dialog", "foreground"),
-  QT_TRANSLATE_NOOP ("octave::settings_dialog", "background"),
-  QT_TRANSLATE_NOOP ("octave::settings_dialog", "selection"),
-  QT_TRANSLATE_NOOP ("octave::settings_dialog", "cursor")
+  QT_TRANSLATE_NOOP ("octave::settings_dialog", "Foreground"),
+  QT_TRANSLATE_NOOP ("octave::settings_dialog", "Background"),
+  QT_TRANSLATE_NOOP ("octave::settings_dialog", "Selection"),
+  QT_TRANSLATE_NOOP ("octave::settings_dialog", "Cursor")
 };
 
 extern gui_pref cs_focus_cmd;

libgui/src/gui-preferences-sc.cc

@@ -68,7 +68,7 @@ sc_pref sc_main_edit_preferences (QCoreApplication::translate ("shortcuts", "Pre
 
 // debug
 sc_pref sc_main_debug_step_over (QCoreApplication::translate ("shortcuts", "Step"), sc_main_debug + ":step_over", OCTAVE_QT_KEYCOMBINATION (PRE, Qt::Key_F10));
-sc_pref sc_main_debug_step_into (QCoreApplication::translate ("shortcuts", "Step Into"), sc_main_debug + ":step_into", OCTAVE_QT_KEYCOMBINATION (PRE, Qt::Key_F11));
+sc_pref sc_main_debug_step_into (QCoreApplication::translate ("shortcuts", "Step In"), sc_main_debug + ":step_into", OCTAVE_QT_KEYCOMBINATION (PRE, Qt::Key_F11));
 sc_pref sc_main_debug_step_out (QCoreApplication::translate ("shortcuts", "Step Out"), sc_main_debug + ":step_out", OCTAVE_QT_KEYCOMBINATION (PRE | Qt::ShiftModifier, Qt::Key_F11));
 sc_pref sc_main_debug_continue (QCoreApplication::translate ("shortcuts", "Continue"), sc_main_debug + ":continue", OCTAVE_QT_KEYCOMBINATION (PRE, Qt::Key_F5));
 sc_pref sc_main_debug_quit (QCoreApplication::translate ("shortcuts", "Quit Debug Mode"), sc_main_debug + ":quit", OCTAVE_QT_KEYCOMBINATION (PRE | Qt::ShiftModifier, Qt::Key_F5));

libgui/src/gui-preferences-sd.h

@@ -43,8 +43,8 @@ const QString settings_color_modes
 
 const QString settings_color_modes_tooltip
   = QT_TRANSLATE_NOOP ("octave::settings_dialog",
-                       "Switches to another set of colors.\n"
-                       "Useful for defining a dark/light mode.\n"
+                       "Switch to a second set of colors.\n"
+                       "Useful for defining light/dark modes.\n"
                        "Discards non-applied current changes!");
 
 const QString settings_reload_colors
@@ -53,16 +53,16 @@ const QString settings_reload_colors
 
 const QString settings_reload_colors_tooltip
   = QT_TRANSLATE_NOOP ("octave::settings_dialog",
-                       "Reloads the default colors,\n"
-                       "depending on currently selected mode.");
+                       "Reload the default colors,\n"
+                       "depends on currently selected mode.");
 
 const QString settings_reload_styles
   = QT_TRANSLATE_NOOP ("octave::settings_dialog",
                        "&Reload default styles");
 
 const QString settings_reload_styles_tooltip
   = QT_TRANSLATE_NOOP ("octave::settings_dialog",
-                       "Reloads the default values of the styles,\n"
-                       "depending on currently selected mode.");
+                       "Reload the default style values,\n"
+                       "depends on currently selected mode.");
 
 #endif

libgui/src/gui-preferences-ve.h

@@ -56,7 +56,7 @@ const QStringList ve_color_names = {
   QT_TRANSLATE_NOOP ("octave::settings_dialog", "Background"),
   QT_TRANSLATE_NOOP ("octave::settings_dialog", "Selected Foreground"),
   QT_TRANSLATE_NOOP ("octave::settings_dialog", "Selected Background"),
-  QT_TRANSLATE_NOOP ("octave::settings_dialog", "Alternate Background")
+  QT_TRANSLATE_NOOP ("octave::settings_dialog", "Alternating Background")
 };
 
 const QStringList ve_save_formats = {

libgui/src/history-dock-widget.cc

@@ -157,6 +157,7 @@ void history_dock_widget::ctxMenu (const QPoint& xpos)
                       &history_dock_widget::handle_contextmenu_evaluate);
       menu.addAction (settings.icon ("document-new"), tr ("Create script"), this,
                       &history_dock_widget::handle_contextmenu_create_script);
+      menu.addSeparator ();
     }
   if (m_filter_shown)
     menu.addAction (tr ("Hide filter"), this,

libgui/src/m-editor/file-editor-tab.cc

@@ -1765,7 +1765,7 @@ int file_editor_tab::check_file_modified (bool remove)
       // modified seems sufficient.  Exit-condition-specific messages could
       // be achieved by making 'available_actions' a function input string.
       QString available_actions =
-        tr ("Do you want to cancel closing, save or discard the changes?");
+        tr ("Do you want to cancel closing, save, or discard the changes?");
 
       QString file;
       if (valid_file_name ())
@@ -2380,7 +2380,7 @@ void file_editor_tab::do_save_file (const QString& file_to_save,
       QMessageBox *msgBox
         = new QMessageBox (QMessageBox::Critical,
                            tr ("Octave Editor"),
-                           tr ("Could not open file %1 for write:\n%2.").
+                           tr ("Could not open file %1 for writing:\n%2.").
                            arg (file_to_save).arg (file.errorString ()),
                            QMessageBox::Ok, nullptr);
       show_dialog (msgBox, false);

libgui/src/m-editor/file-editor.cc

@@ -1110,7 +1110,7 @@ void file_editor::check_conflict_save (const QString& saveFileName,
       QMessageBox *msgBox
         = new QMessageBox (QMessageBox::Critical, tr ("Octave Editor"),
                            tr ("File not saved! A file with the selected name\n%1\n"
-                               "is already open in the editor").
+                               "is already open in the editor.").
                            arg (saveFileName),
                            QMessageBox::Ok, nullptr);
 
@@ -1677,7 +1677,7 @@ void file_editor::request_open_file (const QString& openFileName,
                   QMessageBox *msgBox
                     = new QMessageBox (QMessageBox::Critical,
                                        tr ("Octave Editor"),
-                                       tr ("Could not open file\n%1\nfor read: %2.").
+                                       tr ("Could not open file\n%1\nfor reading: %2.").
                                        arg (openFileName).arg (result),
                                        QMessageBox::Ok, this);
 
@@ -1720,7 +1720,7 @@ void file_editor::request_open_file (const QString& openFileName,
                           // error opening the file
                           msgBox = new QMessageBox (QMessageBox::Critical,
                                                     tr ("Octave Editor"),
-                                                    tr ("Could not open file\n%1\nfor write: %2.").
+                                                    tr ("Could not open file\n%1\nfor writing: %2.").
                                                     arg (openFileName).arg (file.errorString ()),
                                                     QMessageBox::Ok, this);
 
@@ -2038,11 +2038,11 @@ void file_editor::construct ()
                   tr ("&Find and Replace..."), SLOT (request_find (bool)));
 
   m_find_next_action
-    = add_action (m_edit_menu, tr ("Find &Next..."),
+    = add_action (m_edit_menu, tr ("Find &Next"),
                   SLOT (request_find_next (bool)));
 
   m_find_previous_action
-    = add_action (m_edit_menu, tr ("Find &Previous..."),
+    = add_action (m_edit_menu, tr ("Find &Previous"),
                   SLOT (request_find_previous (bool)));
 
   m_edit_menu->addSeparator ();
@@ -2301,7 +2301,7 @@ void file_editor::construct ()
   m_run_action
     = add_action (_run_menu,
                   settings.icon ("system-run"),
-                  tr ("Save File and Run / Continue"),
+                  tr ("Save File and Run/Continue"),
                   SLOT (request_run_file (bool)));
 
   m_run_selection_action

libgui/src/m-editor/find-dialog.cc

@@ -92,17 +92,17 @@ find_dialog::find_dialog (octave_dock_widget *ed, QWidget *p)
 {
   setWindowTitle (tr ("Editor: Find and Replace"));
 
-  m_search_label = new QLabel (tr ("Find &what:"));
+  m_search_label = new QLabel (tr ("&Find:"));
   m_search_line_edit = new QComboBox (this);
-  m_search_line_edit->setToolTip (tr ("Enter text to search for"));
+  m_search_line_edit->setToolTip (tr ("Enter search text"));
   m_search_line_edit->setEditable (true);
   m_search_line_edit->setMaxCount (m_mru_length);
   m_search_line_edit->completer ()->setCaseSensitivity (Qt::CaseSensitive);
   m_search_label->setBuddy (m_search_line_edit);
 
-  m_replace_label = new QLabel (tr ("Re&place with:"));
+  m_replace_label = new QLabel (tr ("Re&place:"));
   m_replace_line_edit = new QComboBox (this);
-  m_replace_line_edit->setToolTip (tr ("Enter new text replacing search hits"));
+  m_replace_line_edit->setToolTip (tr ("Enter replacement text"));
   m_replace_line_edit->setEditable (true);
   m_replace_line_edit->setMaxCount (m_mru_length);
   m_replace_line_edit->completer ()->setCaseSensitivity (Qt::CaseSensitive);
@@ -116,8 +116,8 @@ find_dialog::find_dialog (octave_dock_widget *ed, QWidget *p)
   m_from_start_check_box = new QCheckBox (tr ("Search from &start"));
   m_wrap_check_box = new QCheckBox (tr ("&Wrap while searching"));
   m_wrap_check_box->setChecked (true);
-  m_find_next_button = new QPushButton (tr ("&Find Next"));
-  m_find_prev_button = new QPushButton (tr ("Find &Previous"));
+  m_find_next_button = new QPushButton (tr ("Find &Next"));
+  m_find_prev_button = new QPushButton (tr ("Find Pre&vious"));
   m_replace_button = new QPushButton (tr ("&Replace"));
   m_replace_all_button = new QPushButton (tr ("Replace &All"));
 
@@ -135,7 +135,7 @@ find_dialog::find_dialog (octave_dock_widget *ed, QWidget *p)
 
   m_extension = new QWidget (this);
   m_whole_words_check_box = new QCheckBox (tr ("&Whole words"));
-  m_regex_check_box = new QCheckBox (tr ("Regular E&xpressions"));
+  m_regex_check_box = new QCheckBox (tr ("Regular &expressions"));
   m_backward_check_box = new QCheckBox (tr ("Search &backward"));
   m_search_selection_check_box = new QCheckBox (tr ("Search se&lection"));
   m_search_selection_check_box->setCheckable (true);

libgui/src/main-window.cc

@@ -1429,7 +1429,7 @@ void main_window::handle_edit_mfile_request (const QString& fname,
          case 3:
          case 5:
          case 103:
-           message = tr ("%1 is a built-in, compiled or inline\n"
+           message = tr ("%1 is a built-in, compiled, or inline\n"
                          "function and can not be edited.");
            break;
 
@@ -2315,7 +2315,7 @@ void main_window::construct_edit_menu (QMenuBar *p)
   edit_menu->addSeparator ();
 
   m_set_path_action
-    = edit_menu->addAction (tr ("Set Path"));
+    = edit_menu->addAction (tr ("Set Path..."));
 
   m_preferences_action
     = edit_menu->addAction (settings.icon ("preferences-system"),
@@ -2416,7 +2416,7 @@ void main_window::construct_tools_menu (QMenuBar *p)
   m_profiler_stop->setEnabled (false);
 
   m_profiler_show = add_action (tools_menu, QIcon (),
-        tr ("&Show Profile Data"), SLOT (profiler_show ()));
+        tr ("&Show Profiler Data"), SLOT (profiler_show ()));
 }
 
 void main_window::editor_tabs_changed (bool have_tabs, bool is_octave)
@@ -2538,7 +2538,7 @@ void main_window::construct_help_menu (QMenuBar *p)
                                          tr ("Octave Packages"), SLOT (open_octave_packages_page ()));
 
   m_contribute_action = add_action (help_menu, QIcon (),
-                                    tr ("Contribute"), SLOT (open_contribute_page ()));
+                                    tr ("Get Involved"), SLOT (open_contribute_page ()));
 
   m_developer_action = add_action (help_menu, QIcon (),
                                    tr ("Donate to Octave"), SLOT (open_donate_page ()));

libgui/src/news-reader.cc

@@ -130,7 +130,7 @@ void news_reader::process ()
            "For the latest news, please check\n"
            "<a href=\"https://octave.org/community-news.html\">https://octave.org/community-news.html</a>\n"
            "when you have a connection to the web (link opens in an external browser)\n"
-           "or enable web connections for news in Octave's network settings dialog.\n"
+           "or enable web connections for news in Octave's network settings tab.\n"
            "</p>\n"
            "<p>\n"
            "<small><em>&mdash; The Octave Developers, ") + OCTAVE_RELEASE_DATE + "</em></small>\n"