-
diff --git a/libgui/src/documentation.cc b/libgui/src/documentation.cc
index 8f6fafd92a..4664e3d5fb 100644
--- a/libgui/src/documentation.cc
+++ b/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)
diff --git a/libgui/src/find-files-dialog.cc b/libgui/src/find-files-dialog.cc
index 940c525b20..e67120c20a 100644
--- a/libgui/src/find-files-dialog.cc
+++ b/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);
diff --git a/libgui/src/gui-preferences-cs.h b/libgui/src/gui-preferences-cs.h
index 001126aa48..4d549aba48 100644
--- a/libgui/src/gui-preferences-cs.h
+++ b/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;
diff --git a/libgui/src/gui-preferences-sc.cc b/libgui/src/gui-preferences-sc.cc
index b9777cdee8..a2f74531e4 100644
--- a/libgui/src/gui-preferences-sc.cc
+++ b/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));
diff --git a/libgui/src/gui-preferences-sd.h b/libgui/src/gui-preferences-sd.h
index 7792f1a140..a19285e809 100644
--- a/libgui/src/gui-preferences-sd.h
+++ b/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,8 +53,8 @@ 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",
@@ -62,7 +62,7 @@ const QString settings_reload_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
diff --git a/libgui/src/gui-preferences-ve.h b/libgui/src/gui-preferences-ve.h
index 529d4fe51e..1aa7acb083 100644
--- a/libgui/src/gui-preferences-ve.h
+++ b/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 = {
diff --git a/libgui/src/history-dock-widget.cc b/libgui/src/history-dock-widget.cc
index f888ffac05..d15c726230 100644
--- a/libgui/src/history-dock-widget.cc
+++ b/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,
diff --git a/libgui/src/m-editor/file-editor-tab.cc b/libgui/src/m-editor/file-editor-tab.cc
index fe73a174e6..611228cb1c 100644
--- a/libgui/src/m-editor/file-editor-tab.cc
+++ b/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);
diff --git a/libgui/src/m-editor/file-editor.cc b/libgui/src/m-editor/file-editor.cc
index 326986ebbb..641e3c6564 100644
--- a/libgui/src/m-editor/file-editor.cc
+++ b/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
diff --git a/libgui/src/m-editor/find-dialog.cc b/libgui/src/m-editor/find-dialog.cc
index 53e1e9fc5d..dbd43c8550 100644
--- a/libgui/src/m-editor/find-dialog.cc
+++ b/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);
diff --git a/libgui/src/main-window.cc b/libgui/src/main-window.cc
index cf3e89f563..b2b4da16a0 100644
--- a/libgui/src/main-window.cc
+++ b/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 ()));
diff --git a/libgui/src/news-reader.cc b/libgui/src/news-reader.cc
index 77fc84fa4d..602efad28c 100644
--- a/libgui/src/news-reader.cc
+++ b/libgui/src/news-reader.cc
@@ -130,7 +130,7 @@ void news_reader::process ()
"For the latest news, please check\n"
"https://octave.org/community-news.html\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"
"\n"
"
\n"
"— The Octave Developers, ") + OCTAVE_RELEASE_DATE + "\n"
diff --git a/libgui/src/octave-dock-widget.cc b/libgui/src/octave-dock-widget.cc
index 9879b2ed16..1f237fc52b 100644
--- a/libgui/src/octave-dock-widget.cc
+++ b/libgui/src/octave-dock-widget.cc
@@ -79,7 +79,7 @@ label_dock_widget::label_dock_widget (QWidget *p)
m_dock_action = new QAction
(settings.icon ("widget-undock", true), "", this);
- m_dock_action->setToolTip (tr ("Undock widget"));
+ m_dock_action->setToolTip (tr ("Undock Widget"));
m_dock_button = new QToolButton (m_title_widget);
m_dock_button->setDefaultAction (m_dock_action);
m_dock_button->setFocusPolicy (Qt::NoFocus);
@@ -87,7 +87,7 @@ label_dock_widget::label_dock_widget (QWidget *p)
m_close_action = new QAction
(settings.icon ("widget-close", true), "", this);
- m_close_action->setToolTip (tr ("Close widget"));
+ m_close_action->setToolTip (tr ("Close Widget"));
m_close_button = new QToolButton (m_title_widget);
m_close_button->setDefaultAction (m_close_action);
m_close_button->setFocusPolicy (Qt::NoFocus);
@@ -231,13 +231,13 @@ octave_dock_widget::octave_dock_widget (const QString& obj_name, QWidget *p)
connect (m_close_action, &QAction::triggered,
this, &octave_dock_widget::change_visibility);
- m_close_action->setToolTip (tr ("Hide widget"));
+ m_close_action->setToolTip (tr ("Hide Widget"));
setStyleSheet (qdockwidget_css
(global_icon_paths.at (ICON_THEME_OCTAVE) + "widget-close.png",
- QString ("Close widget"),
+ QString ("Close Widget"),
global_icon_paths.at (ICON_THEME_OCTAVE) + "widget-undock.png",
- QString ("Undock widget"), m_icon_size, "", ""));
+ QString ("Undock Widget"), m_icon_size, "", ""));
if (widget ())
widget ()->setToolTip ("");
@@ -312,7 +312,7 @@ octave_dock_widget::make_window (bool widget_was_dragged)
gui_settings settings;
m_dock_action->setIcon (settings.icon ("widget-dock" + m_icon_color, true));
- m_dock_action->setToolTip (tr ("Dock widget"));
+ m_dock_action->setToolTip (tr ("Dock Widget"));
}
else
{
@@ -370,7 +370,7 @@ octave_dock_widget::make_widget (bool)
if (titleBarWidget ())
{
m_dock_action->setIcon (settings.icon ("widget-undock" + m_icon_color, true));
- m_dock_action->setToolTip (tr ("Undock widget"));
+ m_dock_action->setToolTip (tr ("Undock Widget"));
}
else
{
@@ -728,18 +728,18 @@ octave_dock_widget::set_style (bool active)
QString icon_col = m_icon_color;
- QString close_tooltip = "Close widget";
+ QString close_tooltip = "Close Widget";
QString dock_tooltip;
if (isFloating ())
{
dock_icon = "widget-dock";
- dock_tooltip = "Dock widget";
+ dock_tooltip = "Dock Widget";
}
else
{
dock_icon = "widget-undock";
- dock_tooltip = "Undock widget";
+ dock_tooltip = "Undock Widget";
}
#if defined (Q_OS_MAC)
diff --git a/libgui/src/set-path-dialog.cc b/libgui/src/set-path-dialog.cc
index 97ecfde4e3..71e3b5c22d 100644
--- a/libgui/src/set-path-dialog.cc
+++ b/libgui/src/set-path-dialog.cc
@@ -67,13 +67,13 @@ set_path_dialog::set_path_dialog (QWidget *parent)
m_info_label = new QLabel (tr ("All changes take effect immediately."));
- m_add_folder_button = new QPushButton (tr ("Add Folder..."));
+ m_add_folder_button = new QPushButton (tr ("Add Directory..."));
QMenu *add_dir_menu = new QMenu ();
m_add_folder_button->setMenu (add_dir_menu);
- add_dir_menu->addAction (tr ("Single Folder"),
+ add_dir_menu->addAction (tr ("Single Directory"),
this, &set_path_dialog::add_dir);
- add_dir_menu->addAction (tr ("Folder With Subfolders"),
+ add_dir_menu->addAction (tr ("Directory With Subdirectories"),
this, &set_path_dialog::add_dir_subdirs);
m_move_to_top_button = new QPushButton (tr ("Move to Top"));
diff --git a/libgui/src/settings-dialog.cc b/libgui/src/settings-dialog.cc
index b86ddcff58..9368573355 100644
--- a/libgui/src/settings-dialog.cc
+++ b/libgui/src/settings-dialog.cc
@@ -1408,7 +1408,7 @@ void settings_dialog::read_workspace_colors ()
m_ws_enable_colors = new QCheckBox (tr ("Enable attribute colors"));
style_grid->addWidget (m_ws_enable_colors, row++, column, 1, 4);
- m_ws_hide_tool_tips = new QCheckBox (tr ("Hide tools tips"));
+ m_ws_hide_tool_tips = new QCheckBox (tr ("Hide tool tips"));
style_grid->addWidget (m_ws_hide_tool_tips, row++, column, 1, 4);
connect (m_ws_enable_colors, &QCheckBox::toggled,
m_ws_hide_tool_tips, &QCheckBox::setEnabled);
diff --git a/libgui/src/settings-dialog.ui b/libgui/src/settings-dialog.ui
index 470ff00935..91cd583d83 100644
--- a/libgui/src/settings-dialog.ui
+++ b/libgui/src/settings-dialog.ui
@@ -454,7 +454,7 @@
-
- Cursor blinking
+ Blinking cursor
true
@@ -2671,7 +2671,7 @@ interference with readline key strokes.
-
- Edit a shortcut by double-clicking in a cell
+ Edit a shortcut by double-clicking in Actual column
diff --git a/libgui/src/shortcuts-tree-widget.cc b/libgui/src/shortcuts-tree-widget.cc
index 2e191d2ee0..5fae77526c 100644
--- a/libgui/src/shortcuts-tree-widget.cc
+++ b/libgui/src/shortcuts-tree-widget.cc
@@ -159,16 +159,15 @@ shortcut_edit_dialog::shortcut_edit_dialog
{
setAttribute (Qt::WA_DeleteOnClose);
- setWindowTitle (tr ("Enter new Shortcut"));
+ setWindowTitle (tr ("Enter New Shortcut"));
QVBoxLayout *box = new QVBoxLayout (this);
box->setSpacing (2);
box->setContentsMargins (12, 12, 12, 12);
- QLabel *help = new QLabel (tr ("Apply the desired shortcut or click "
- "on the right button to reset the "
- "shortcut to its default. (%1)")
+ QLabel *help = new QLabel (tr ("Enter custom shortcut\n"
+ "Action: %1")
.arg (m_settings_key));
help->setWordWrap (true);
@@ -176,7 +175,7 @@ shortcut_edit_dialog::shortcut_edit_dialog
box->addWidget (help);
QCheckBox *direct
- = new QCheckBox (tr ("Enter shortcut directly by performing it"));
+ = new QCheckBox (tr ("Enter shortcut by typing it"));
QCheckBox *shift
= new QCheckBox (tr ("Add Shift modifier\n"
@@ -196,7 +195,7 @@ shortcut_edit_dialog::shortcut_edit_dialog
QGridLayout *grid = new QGridLayout ();
- QLabel *actual = new QLabel (tr ("Actual shortcut"));
+ QLabel *actual = new QLabel (tr ("Actual Shortcut"));
m_edit_actual = new enter_shortcut (this);
m_edit_actual->setAlignment (Qt::AlignHCenter);
@@ -204,7 +203,7 @@ shortcut_edit_dialog::shortcut_edit_dialog
grid->addWidget (actual, 0, 0);
grid->addWidget (m_edit_actual, 0, 1);
- QLabel *def = new QLabel (tr ("Default shortcut"));
+ QLabel *def = new QLabel (tr ("Default Shortcut"));
QLabel *label_default = new QLabel (this);
label_default->setAlignment (Qt::AlignHCenter);
diff --git a/libgui/src/variable-editor.cc b/libgui/src/variable-editor.cc
index be6786fda9..80d23cd2bd 100644
--- a/libgui/src/variable-editor.cc
+++ b/libgui/src/variable-editor.cc
@@ -174,7 +174,7 @@ variable_dock_widget::toplevel_change (bool toplevel)
{
m_dock_action->setIcon (QIcon (global_icon_paths.at (ICON_THEME_OCTAVE)
+ "widget-dock.png"));
- m_dock_action->setToolTip (tr ("Dock widget"));
+ m_dock_action->setToolTip (tr ("Dock Widget"));
setWindowFlags (Qt::Window);
setWindowTitle (tr ("Variable Editor: ") + objectName ());
@@ -192,7 +192,7 @@ variable_dock_widget::toplevel_change (bool toplevel)
{
m_dock_action->setIcon (QIcon (global_icon_paths.at (ICON_THEME_OCTAVE)
+ "widget-undock.png"));
- m_dock_action->setToolTip (tr ("Undock widget"));
+ m_dock_action->setToolTip (tr ("Undock Widget"));
setFocus ();
diff --git a/libgui/src/welcome-wizard.cc b/libgui/src/welcome-wizard.cc
index 0c696bd065..9f178f0857 100644
--- a/libgui/src/welcome-wizard.cc
+++ b/libgui/src/welcome-wizard.cc
@@ -319,7 +319,7 @@ final_page::final_page (welcome_wizard *wizard)
m_message->setText
(tr ("\n"
"We hope you find Octave to be a useful tool.
\n"
- "If you encounter problems, there are a number of ways to get help, including commercial support options, a mailing list, a wiki, and other community-based support channels.\n"
+ "
If you encounter problems, there are a number of ways to get help, including commercial support options, a discussion board, a wiki, and other community-based support channels.\n"
"You can find more information about each of these by visiting https://octave.org/support.html (opens in external browser).
\n"
""));
m_message->setWordWrap (true);
diff --git a/liboctave/version.cc b/liboctave/version.cc
index c3906c8811..59bcdd2dec 100644
--- a/liboctave/version.cc
+++ b/liboctave/version.cc
@@ -67,13 +67,16 @@ octave_bugs_statement (bool html)
}
std::string
-octave_name_version_and_copyright ()
+octave_name_version_and_copyright (bool html)
{
// The GNU coding standards say that on the first line printed by
// --version, the version number should follow the last space on the
// line.
+ std::string br = (html ? "
\n" : "\n");
- return "GNU Octave, version " OCTAVE_VERSION "\n" OCTAVE_COPYRIGHT;
+ return "GNU Octave, version " OCTAVE_VERSION
+ + br
+ + OCTAVE_COPYRIGHT;
}
std::string
@@ -83,7 +86,7 @@ octave_name_version_copyright_copying_and_warranty
std::string br = (html ? "
\n" : "\n");
std::string sep = (html ? "\n
\n\n" : "\n\n");
- return octave_name_version_and_copyright ()
+ return octave_name_version_and_copyright (html)
+ br
+ "This is free software; see the source code for copying conditions."
+ br
diff --git a/liboctave/version.in.h b/liboctave/version.in.h
index c3475d4ed1..c860800b80 100644
--- a/liboctave/version.in.h
+++ b/liboctave/version.in.h
@@ -62,7 +62,7 @@ extern OCTAVE_API std::string octave_contrib_statement (bool html = false);
extern OCTAVE_API std::string octave_bugs_statement (bool html = false);
-extern OCTAVE_API std::string octave_name_version_and_copyright ();
+extern OCTAVE_API std::string octave_name_version_and_copyright (bool html = false);
extern OCTAVE_API std::string
octave_name_version_copyright_copying_and_warranty
diff --git a/scripts/plot/util/private/__add_default_menu__.m b/scripts/plot/util/private/__add_default_menu__.m
index eff30d6c30..2a9689a12f 100644
--- a/scripts/plot/util/private/__add_default_menu__.m
+++ b/scripts/plot/util/private/__add_default_menu__.m
@@ -80,29 +80,29 @@ function __add_default_menu__ (hf, hmenu = [], htb = [])
## Tools menu
hui = uimenu (hf, "label", "&Tools", "handlevisibility", "off", ...
"tag", "__default_menu__Tools");
- uimenu (hui, "label", "Toggle &grid on all axes", "tag", "toggle", ...
+ uimenu (hui, "label", "Toggle &Grid on All Axes", "tag", "toggle", ...
"menuselectedfcn", @grid_cb);
- uimenu (hui, "label", "Show grid on all axes", "tag", "on", ...
+ uimenu (hui, "label", "Show Grid on All Axes", "tag", "on", ...
"menuselectedfcn", @grid_cb);
- uimenu (hui, "label", "Hide grid on all axes", "tag", "off", ...
+ uimenu (hui, "label", "Hide Grid on All Axes", "tag", "off", ...
"menuselectedfcn", @grid_cb);
- uimenu (hui, "label", "Auto&scale all axes",
+ uimenu (hui, "label", "Auto&scale All Axes",
"menuselectedfcn", @autoscale_cb);
- hui2 = uimenu (hui, "label", "GUI &Mode (on all axes)");
- uimenu (hui2, "label", "Pan x and y", "tag", "pan_on", ...
+ hui2 = uimenu (hui, "label", "GUI &Mode (on All Axes)");
+ uimenu (hui2, "label", "Pan X and Y", "tag", "pan_on", ...
"menuselectedfcn", @guimode_cb);
- uimenu (hui2, "label", "Pan x only", "tag", "pan_xon", ...
+ uimenu (hui2, "label", "Pan X Only", "tag", "pan_xon", ...
"menuselectedfcn", @guimode_cb);
- uimenu (hui2, "label", "Pan y only", "tag", "pan_yon", ...
+ uimenu (hui2, "label", "Pan Y Only", "tag", "pan_yon", ...
"menuselectedfcn", @guimode_cb);
- uimenu (hui2, "label", "Disable pan and rotate", "tag", ...
- "no_pan_rotate", "menuselectedfcn", @guimode_cb);
- uimenu (hui2, "label", "Rotate on", "tag", "rotate3d", ...
+ uimenu (hui2, "label", "Rotate On", "tag", "rotate3d", ...
"menuselectedfcn", @guimode_cb);
- uimenu (hui2, "label", "Enable mousezoom", "tag", "zoom_on", ...
+ uimenu (hui2, "label", "Disable Pan and Rotate", "tag", ...
+ "no_pan_rotate", "menuselectedfcn", @guimode_cb);
+ uimenu (hui2, "label", "Enable Mousezoom", "tag", "zoom_on", ...
"menuselectedfcn", @guimode_cb);
- uimenu (hui2, "label", "Disable mousezoom", "tag", "zoom_off", ...
+ uimenu (hui2, "label", "Disable Mousezoom", "tag", "zoom_off", ...
"menuselectedfcn", @guimode_cb);
hmenu(3) = hui;
@@ -118,18 +118,18 @@ function __add_default_menu__ (hf, hmenu = [], htb = [])
"tag", "__default_button_rotate__", ...
"__named_icon__", "figure-rotate");
- ht(3) = uitoggletool (htb, "tooltipstring", "Zoom In", ...
+ ht(3) = uitoggletool (htb, "tooltipstring", "Zoom in", ...
"tag", "__default_button_zoomin__", ...
"__named_icon__", "figure-zoom-in", ...
"separator", "on");
- ht(4) = uitoggletool (htb, "tooltipstring", "Zoom Out", ...
+ ht(4) = uitoggletool (htb, "tooltipstring", "Zoom out", ...
"tag", "__default_button_zoomout__", ...
"__named_icon__", "figure-zoom-out");
uipushtool (htb, "tooltipstring", "Automatic limits for current axes", ...
"clickedcallback", @auto_cb, ...
"__named_icon__", "figure-zoom-original");
- ht(5) = uitoggletool (htb, "tooltipstring", "Insert Text", ...
+ ht(5) = uitoggletool (htb, "tooltipstring", "Insert text", ...
"tag", "__default_button_text__", ...
"separator", "on", ...
"__named_icon__", "figure-text");