Updating branch refs/heads/master
to 1db926495fb9020ec01f28fd6eb32a8e24e07dbc (commit)
from c93b45e6a3bf3ad4797008ac2a546833a78321f3 (commit)
commit 1db926495fb9020ec01f28fd6eb32a8e24e07dbc
Author: Nick Schermer <n...@xfce.org>
Date: Tue Dec 25 15:32:14 2012 +0100
Rename reset option to "Reset Scrollback".
This described what it actually does.
terminal/terminal-window.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
index 8fa3f63..9495322 100644
--- a/terminal/terminal-window.c
+++ b/terminal/terminal-window.c
@@ -218,27 +218,27 @@ static const GtkActionEntry action_entries[] =
{ "file-menu", NULL, N_ ("_File"), NULL, NULL, NULL, },
{ "new-tab", "tab-new", N_ ("Open _Tab"), "<control><shift>t", N_ ("Open a
new terminal tab"), G_CALLBACK (terminal_window_action_new_tab), },
{ "new-window", "window-new", N_ ("Open T_erminal"), "<control><shift>n",
N_ ("Open a new terminal window"), G_CALLBACK
(terminal_window_action_new_window), },
- { "detach-tab", NULL, N_ ("_Detach Tab"), "<control><shift>d", N_ ("Open a
new window for the current terminal tab"), G_CALLBACK
(terminal_window_action_detach_tab), },
- { "close-tab", GTK_STOCK_CLOSE, N_ ("C_lose Tab"), "<control><shift>w", N_
("Close the current terminal tab"), G_CALLBACK
(terminal_window_action_close_tab), },
- { "close-window", GTK_STOCK_QUIT, N_ ("_Close Window"),
"<control><shift>q", N_ ("Close the terminal window"), G_CALLBACK
(terminal_window_action_close_window), },
+ { "detach-tab", NULL, N_ ("_Detach Tab"), "<control><shift>d", NULL,
G_CALLBACK (terminal_window_action_detach_tab), },
+ { "close-tab", GTK_STOCK_CLOSE, N_ ("C_lose Tab"), "<control><shift>w",
NULL, G_CALLBACK (terminal_window_action_close_tab), },
+ { "close-window", GTK_STOCK_QUIT, N_ ("_Close Window"),
"<control><shift>q", NULL, G_CALLBACK (terminal_window_action_close_window), },
{ "edit-menu", NULL, N_ ("_Edit"), NULL, NULL, NULL, },
{ "copy", GTK_STOCK_COPY, N_ ("_Copy"), "<control><shift>c", N_ ("Copy to
clipboard"), G_CALLBACK (terminal_window_action_copy), },
{ "paste", GTK_STOCK_PASTE, N_ ("_Paste"), "<control><shift>v", N_ ("Paste
from clipboard"), G_CALLBACK (terminal_window_action_paste), },
- { "paste-selection", NULL, N_ ("Paste _Selection"), NULL, N_ ("Paste from
primary selection"), G_CALLBACK (terminal_window_action_paste_selection), },
- { "select-all", GTK_STOCK_SELECT_ALL, N_ ("Select _All"),
"<control><shift>a", N_ ("Select all text in the terminal"), G_CALLBACK
(terminal_window_action_select_all), },
- { "preferences", GTK_STOCK_PREFERENCES, N_ ("Pr_eferences..."), NULL, N_
("Open the Terminal preferences dialog"), G_CALLBACK
(terminal_window_action_prefs), },
+ { "paste-selection", NULL, N_ ("Paste _Selection"), NULL, NULL, G_CALLBACK
(terminal_window_action_paste_selection), },
+ { "select-all", GTK_STOCK_SELECT_ALL, N_ ("Select _All"),
"<control><shift>a", NULL, G_CALLBACK (terminal_window_action_select_all), },
+ { "preferences", GTK_STOCK_PREFERENCES, N_ ("Pr_eferences..."), NULL, N_
("Open the preferences dialog"), G_CALLBACK (terminal_window_action_prefs), },
{ "view-menu", NULL, N_ ("_View"), NULL, NULL, NULL, },
{ "terminal-menu", NULL, N_ ("_Terminal"), NULL, NULL, NULL, },
- { "set-title", NULL, N_ ("_Set Title..."), NULL, N_ ("Set a custom title
for the current tab"), G_CALLBACK (terminal_window_action_set_title), },
- { "reset", GTK_STOCK_REFRESH, N_ ("_Reset"), NULL, N_ ("Reset"),
G_CALLBACK (terminal_window_action_reset), },
- { "reset-and-clear", GTK_STOCK_CLEAR, N_ ("Reset and C_lear"), NULL, N_
("Reset and clear"), G_CALLBACK (terminal_window_action_reset_and_clear), },
+ { "set-title", NULL, N_ ("_Set Title..."), NULL, NULL, G_CALLBACK
(terminal_window_action_set_title), },
+ { "reset", NULL, N_ ("_Clear Scrollback"), NULL, NULL, G_CALLBACK
(terminal_window_action_reset), },
+ { "reset-and-clear", NULL, N_ ("Clear Scrollback and _Reset"), NULL, NULL,
G_CALLBACK (terminal_window_action_reset_and_clear), },
{ "go-menu", NULL, N_ ("_Go"), NULL, NULL, NULL, },
{ "prev-tab", GTK_STOCK_GO_BACK, N_ ("_Previous Tab"), "<Control>Page_Up",
N_ ("Switch to previous tab"), G_CALLBACK (terminal_window_action_prev_tab), },
{ "next-tab", GTK_STOCK_GO_FORWARD, N_ ("_Next Tab"),
"<Control>Page_Down", N_ ("Switch to next tab"), G_CALLBACK
(terminal_window_action_next_tab), },
{ "help-menu", NULL, N_ ("_Help"), NULL, NULL, NULL, },
{ "contents", GTK_STOCK_HELP, N_ ("_Contents"), "F1", N_ ("Display help
contents"), G_CALLBACK (terminal_window_action_contents), },
- { "report-bug", NULL, N_ ("_Report a bug"), NULL, N_ ("Report a bug in
Terminal"), G_CALLBACK (terminal_window_action_report_bug), },
- { "about", GTK_STOCK_ABOUT, N_ ("_About"), NULL, N_ ("Display information
about Terminal"), G_CALLBACK (terminal_window_action_about), },
+ { "report-bug", NULL, N_ ("_Report a bug"), NULL, NULL, G_CALLBACK
(terminal_window_action_report_bug), },
+ { "about", GTK_STOCK_ABOUT, N_ ("_About"), NULL, NULL, G_CALLBACK
(terminal_window_action_about), },
{ "input-methods", NULL, N_ ("_Input Methods"), NULL, NULL, NULL, },
};
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
