[Commits] [SCM] claws branch, master, updated. 3.14.0-90-g0ebf0a0

[wwp at claws-mail.org]

The branch, master has been updated
       via  0ebf0a02f878767624133613dff8ea9c2d65b42d (commit)
      from  0f33f4bbfabef892fdf147d48d9ee02c23f088ef (commit)

Summary of changes:
 src/prefs_actions.c          |    2 +-
 src/prefs_filtering.c        |    4 ++--
 src/prefs_filtering_action.c |    2 +-
 src/prefs_matcher.c          |    2 +-
 src/prefs_template.c         |    2 +-
 src/prefs_toolbar.c          |    2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)


- Log -----------------------------------------------------------------
commit 0ebf0a02f878767624133613dff8ea9c2d65b42d
Author: wwp <wwp at free.fr>
Date:   Fri Sep 23 09:26:47 2016 +0200

    Use Delete button instead of Remove (tooltips and other places already
    talk about deletion) in prefs dialogs. Reassign some keyboard hotkeys
    accordingly, 'e' for Delete.

diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index d18df3a..6b232d9 100644
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -334,7 +334,7 @@ static void prefs_actions_create(MainWindow *mainwin)
 	CLAWS_SET_TIP(subst_btn,
 			_("Replace the selected action in list with the action above"));
 
-	del_btn = gtk_button_new_with_mnemonic (_("Re_move"));
+	del_btn = gtk_button_new_with_mnemonic (_("D_elete"));
 	gtk_button_set_image(GTK_BUTTON(del_btn),
 			gtk_image_new_from_stock(GTK_STOCK_REMOVE,GTK_ICON_SIZE_BUTTON));
 	gtk_widget_show(del_btn);
diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index 3ffcfa4..ea2d195 100644
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -421,7 +421,7 @@ static void prefs_filtering_create(void)
                     	  (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
                     	  (GtkAttachOptions) (0), 0, 0);
 
-	cond_btn =  gtk_button_new_with_mnemonic (_(" D_efine... "));
+	cond_btn =  gtk_button_new_with_mnemonic (_(" Def_ine... "));
 	gtk_widget_show (cond_btn);
   	gtk_table_attach (GTK_TABLE (table), cond_btn, 2, 3, 2, 3,
                     	  (GtkAttachOptions) (GTK_FILL),
@@ -483,7 +483,7 @@ static void prefs_filtering_create(void)
 	CLAWS_SET_TIP(subst_btn,
 			_("Replace the selected rule in list with the rule above"));
 
-	del_btn = gtk_button_new_with_mnemonic (_("Re_move"));
+	del_btn = gtk_button_new_with_mnemonic (_("D_elete"));
 	gtk_button_set_image(GTK_BUTTON(del_btn),
 			gtk_image_new_from_stock(GTK_STOCK_REMOVE,GTK_ICON_SIZE_BUTTON));
 	gtk_box_pack_start (GTK_BOX (btn_hbox), del_btn, FALSE, TRUE, 0);
diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
index 2c42c10..e105bdd 100644
--- a/src/prefs_filtering_action.c
+++ b/src/prefs_filtering_action.c
@@ -613,7 +613,7 @@ static void prefs_filtering_action_create(void)
 			 G_CALLBACK(prefs_filtering_action_substitute_cb),
 			 NULL);
 
-	del_btn = gtk_button_new_with_mnemonic (_("Re_move"));
+	del_btn = gtk_button_new_with_mnemonic (_("D_elete"));
 	gtk_button_set_image(GTK_BUTTON(del_btn),
 			gtk_image_new_from_stock(GTK_STOCK_REMOVE,GTK_ICON_SIZE_BUTTON));
 	gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);
diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 0a67877..9c2d180 100644
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -776,7 +776,7 @@ static void prefs_matcher_create(void)
 			 G_CALLBACK(prefs_matcher_substitute_cb),
 			 NULL);
 
-	del_btn = gtk_button_new_with_mnemonic (_("Re_move"));
+	del_btn = gtk_button_new_with_mnemonic (_("D_elete"));
 	gtk_button_set_image(GTK_BUTTON(del_btn),
 			gtk_image_new_from_stock(GTK_STOCK_REMOVE,GTK_ICON_SIZE_BUTTON));
 	gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);
diff --git a/src/prefs_template.c b/src/prefs_template.c
index 732c7cf..c095ec4 100644
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -317,7 +317,7 @@ static void prefs_template_window_create(void)
 	CLAWS_SET_TIP(subst_btn,
 			_("Replace the selected template in list with the template above"));
 
-	del_btn = gtk_button_new_with_mnemonic (_("Re_move"));
+	del_btn = gtk_button_new_with_mnemonic (_("D_elete"));
 	gtk_button_set_image(GTK_BUTTON(del_btn),
 			gtk_image_new_from_stock(GTK_STOCK_REMOVE,GTK_ICON_SIZE_BUTTON));
 	gtk_widget_show(del_btn);
diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index 45151a6..fc9a17b 100644
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -1053,7 +1053,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
 			 G_CALLBACK(prefs_toolbar_substitute),
 			 prefs_toolbar);
 
-	del_btn = gtk_button_new_with_mnemonic (_("Re_move"));
+	del_btn = gtk_button_new_with_mnemonic (_("D_elete"));
 	gtk_button_set_image(GTK_BUTTON(del_btn),
 			gtk_image_new_from_stock(GTK_STOCK_REMOVE,GTK_ICON_SIZE_BUTTON));
 	gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail