Mercurial > octave-libgccjit
changeset 17935:752f6b358754
Tweak GUI strings for conformity.
* libgui/src/files-dock-widget.cc, libgui/src/history-dock-widget.cc:
Use "Double-click" instead of "Doubleclick".
* libgui/src/m-editor/file-editor.cc: Capitalize breakpoint in menu items.
* libgui/src/main-window.cc: Consistently capitalize first letter of all words
in menus.
* libgui/src/settings-dialog.ui: Capitalize only first letter of options in
preferences dialog.
* libgui/src/welcome-wizard.cc: Rephrase wizard screen.
| author | Rik <rik@octave.org> |
|---|---|
| date | Sun, 10 Nov 2013 16:10:19 -0800 |
| parents | 929c95b33eae |
| children | 8c23f844bd30 |
| files | libgui/src/files-dock-widget.cc libgui/src/history-dock-widget.cc libgui/src/m-editor/file-editor.cc libgui/src/main-window.cc libgui/src/settings-dialog.ui libgui/src/welcome-wizard.cc |
| diffstat | 6 files changed, 23 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/files-dock-widget.cc Thu Nov 14 23:20:52 2013 -0500 +++ b/libgui/src/files-dock-widget.cc Sun Nov 10 16:10:19 2013 -0800 @@ -165,7 +165,7 @@ _file_tree_view->setSortingEnabled (true); _file_tree_view->setAlternatingRowColors (true); _file_tree_view->setAnimated (true); - _file_tree_view->setToolTip (tr ("Doubleclick a file to open it")); + _file_tree_view->setToolTip (tr ("Double-click a file to open it")); // get sort column and order as well as cloumn state (order and width) QSettings *settings = resource_manager::get_settings ();
--- a/libgui/src/history-dock-widget.cc Thu Nov 14 23:20:52 2013 -0500 +++ b/libgui/src/history-dock-widget.cc Sun Nov 10 16:10:19 2013 -0800 @@ -64,7 +64,7 @@ _history_list_view->setAlternatingRowColors (true); _history_list_view->setEditTriggers (QAbstractItemView::NoEditTriggers); _history_list_view->setStatusTip ( - tr ("Doubleclick a command to transfer it to the terminal.")); + tr ("Double-click a command to transfer it to the terminal.")); _history_list_view->setSelectionMode (QAbstractItemView::ExtendedSelection); _history_list_view->setContextMenuPolicy (Qt::CustomContextMenu); connect (_history_list_view,
--- a/libgui/src/m-editor/file-editor.cc Thu Nov 14 23:20:52 2013 -0500 +++ b/libgui/src/m-editor/file-editor.cc Sun Nov 10 16:10:19 2013 -0800 @@ -915,16 +915,16 @@ QAction *next_breakpoint_action = new QAction (QIcon (":/actions/icons/bp_next.png"), - tr ("&Next breakpoint"), _tool_bar); + tr ("&Next Breakpoint"), _tool_bar); QAction *previous_breakpoint_action = new QAction (QIcon (":/actions/icons/bp_prev.png"), - tr ("Pre&vious breakpoint"), _tool_bar); + tr ("Pre&vious Breakpoint"), _tool_bar); QAction *toggle_breakpoint_action = new QAction (QIcon (":/actions/icons/bp_toggle.png"), - tr ("Toggle &breakpoint"), _tool_bar); + tr ("Toggle &Breakpoint"), _tool_bar); QAction *remove_all_breakpoints_action = new QAction (QIcon (":/actions/icons/bp_rm_all.png"), - tr ("&Remove All breakpoints"), _tool_bar); + tr ("&Remove All Breakpoints"), _tool_bar); _comment_selection_action = new QAction (tr ("&Comment"), _tool_bar); @@ -935,7 +935,7 @@ tr ("&Find and Replace"), _tool_bar); _run_action = new QAction (QIcon (":/actions/icons/artsbuilderexecute.png"), - tr ("Save File And Run"), _tool_bar); + tr ("Save File and Run"), _tool_bar); _goto_line_action = new QAction (tr ("Go&to Line"), _tool_bar);
--- a/libgui/src/main-window.cc Thu Nov 14 23:20:52 2013 -0500 +++ b/libgui/src/main-window.cc Sun Nov 10 16:10:19 2013 -0800 @@ -1130,7 +1130,7 @@ file_menu->addSeparator (); QAction *load_workspace_action - = file_menu->addAction (tr ("Load workspace")); + = file_menu->addAction (tr ("Load Workspace")); QAction *save_workspace_action = file_menu->addAction (tr ("Save Workspace As")); @@ -1281,11 +1281,11 @@ Qt::Key_F10); _debug_step_into = construct_debug_menu_item - (":/actions/icons/db_step_in.png", tr ("Step in"), + (":/actions/icons/db_step_in.png", tr ("Step In"), Qt::Key_F11); _debug_step_out = construct_debug_menu_item - (":/actions/icons/db_step_out.png", tr ("Step out"), + (":/actions/icons/db_step_out.png", tr ("Step Out"), Qt::ShiftModifier + Qt::Key_F11); _debug_continue = construct_debug_menu_item
--- a/libgui/src/settings-dialog.ui Thu Nov 14 23:20:52 2013 -0500 +++ b/libgui/src/settings-dialog.ui Sun Nov 10 16:10:19 2013 -0800 @@ -208,7 +208,7 @@ <item row="2" column="0"> <widget class="QCheckBox" name="editor_ws_checkbox"> <property name="text"> - <string>Show white space</string> + <string>Show whitespace</string> </property> </widget> </item> @@ -235,7 +235,7 @@ <bool>false</bool> </property> <property name="text"> - <string>Do not show white spaces used for indentation</string> + <string>Do not show whitespace used for indentation</string> </property> </widget> </item> @@ -525,7 +525,7 @@ <bool>false</bool> </property> <property name="text"> - <string>Characters before list with suggestions is displayed</string> + <string># of characters typed before completion list displayed</string> </property> </widget> </item> @@ -719,7 +719,7 @@ </sizepolicy> </property> <property name="text"> - <string>Create non existing files without prompting</string> + <string>Create nonexistent files without prompting</string> </property> </widget> </item> @@ -776,7 +776,7 @@ <bool>false</bool> </property> <property name="text"> - <string>Command line (%f=file, %l=line):</string> + <string>command line (%f=file, %l=line):</string> </property> </widget> </item> @@ -822,7 +822,7 @@ <enum>QFrame::NoFrame</enum> </property> <property name="text"> - <string><html><head/><body><p>Select font, font size (as difference to the default size), font decoration (bold, italic, underline), textcolor and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</p></body></html></string> + <string><html><head/><body><p>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</p></body></html></string> </property> <property name="scaledContents"> <bool>false</bool> @@ -898,7 +898,7 @@ <item> <widget class="QCheckBox" name="terminal_cursorUseForegroundColor"> <property name="text"> - <string>Use Foreground Color</string> + <string>Use foreground color</string> </property> </widget> </item> @@ -1061,7 +1061,7 @@ <item> <widget class="QCheckBox" name="sync_octave_directory"> <property name="text"> - <string>Synchronize octave directory with the file browser</string> + <string>Synchronize Octave working directory with file browser</string> </property> </widget> </item> @@ -1209,7 +1209,7 @@ <bool>false</bool> </property> <property name="text"> - <string>Proxy Type:</string> + <string>Proxy type:</string> </property> </widget> </item>
--- a/libgui/src/welcome-wizard.cc Thu Nov 14 23:20:52 2013 -0500 +++ b/libgui/src/welcome-wizard.cc Sun Nov 10 16:10:19 2013 -0800 @@ -61,8 +61,8 @@ msg_1->setWordWrap (true); QString msg_2_text = QString (tr ("The configuration file is stored in %1. " - "If that file exists, you will not see this " - "dialog when Octave starts again."). + "If that file exists, you will not see " + "this dialog again when Octave starts."). arg (resource_manager::get_settings_file ())); QLabel *msg_2 = new QLabel (msg_2_text); msg_2->setWordWrap (true); @@ -91,8 +91,8 @@ "<p>For more information about Octave:</p>\n" "<ul>\n" "<li>Visit <a href=\"http://octave.org\">http://octave.org</a></li>\n" - "<li>Get the documentation online as <a href=\"http://www.gnu.org/software/octave/doc/interpreter/index.html\">html</a>- or <a href=\"http://www.gnu.org/software/octave/octave.pdf\">pdf</span></a>-document</li>\n" - "<li>Open the documentation browser of Octave GUI with the help menu</li>\n" + "<li>Get the documentation online in <a href=\"http://www.gnu.org/software/octave/doc/interpreter/index.html\">html</a> or <a href=\"http://www.gnu.org/software/octave/octave.pdf\">pdf</span></a> format</li>\n" + "<li>Open the documentation browser from the help menu</li>\n" "</ul>\n" "</body></html>"), this);