[Commits] [SCM] claws branch, master, updated. 3.17.0-164-g4c1d17a

[claws at claws-mail.org]

The branch, master has been updated
       via  4c1d17a798553d4d0ce2c6bb29a8baeff25dbe8a (commit)
      from  c27905f5dc36acedbbf022d26ed52719c9289241 (commit)

Summary of changes:
 src/prefs_summaries.c    |   24 ++++++++++++------------
 src/prefs_summary_open.c |    6 +++---
 2 files changed, 15 insertions(+), 15 deletions(-)


- Log -----------------------------------------------------------------
commit 4c1d17a798553d4d0ce2c6bb29a8baeff25dbe8a
Author: Paul <paul at claws-mail.org>
Date:   Wed Nov 14 06:20:21 2018 +0000

    move 'msg selection when entering a folder" button to Message List page
    
    ... and some English modifications

diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
index c6e415e..62967f5 100644
--- a/src/prefs_summaries.c
+++ b/src/prefs_summaries.c
@@ -479,6 +479,18 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
 	CLAWS_SET_TIP(button_datefmt,
 			     _("Date format help"));
 
+	hbox1 = gtk_hbox_new (FALSE, 10);
+	gtk_widget_show (hbox1);
+	gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, TRUE, 0);
+
+	button_edit_actions = gtk_button_new_with_label(_("Set message selection when entering a folder"));
+	gtk_widget_show (button_edit_actions);
+	gtk_box_pack_start (GTK_BOX (hbox1), button_edit_actions,
+			  FALSE, TRUE, 0);
+	g_signal_connect (G_OBJECT (button_edit_actions), "clicked",
+			  G_CALLBACK (prefs_summary_open_open),
+			  NULL);
+
 	/* Open message on select policy */
 	vbox4 = gtkut_get_options_frame(vbox1, NULL, _("Open message when selected"));
 
@@ -578,18 +590,6 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
 	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox1,
 				 gtk_label_new(_("Defaults")));
 
-	hbox1 = gtk_hbox_new (FALSE, 10);
-	gtk_widget_show (hbox1);
-	gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, TRUE, 0);
-
-	button_edit_actions = gtk_button_new_with_label(_("Set selection when entering a folder"));
-	gtk_widget_show (button_edit_actions);
-	gtk_box_pack_start (GTK_BOX (hbox1), button_edit_actions,
-			  FALSE, TRUE, 0);
-	g_signal_connect (G_OBJECT (button_edit_actions), "clicked",
-			  G_CALLBACK (prefs_summary_open_open),
-			  NULL);
-
 	vbox2 = gtkut_get_options_frame(vbox1, &frame_new_folders, _("New folders"));
 
 	hbox1 = gtk_hbox_new(FALSE, 10);
diff --git a/src/prefs_summary_open.c b/src/prefs_summary_open.c
index 9331e45..b9e6b82 100644
--- a/src/prefs_summary_open.c
+++ b/src/prefs_summary_open.c
@@ -185,7 +185,7 @@ static void prefs_summary_open_create(void)
 	gtk_widget_grab_default (ok_btn);
 
 	gtk_window_set_title (GTK_WINDOW(window),
-			      _(" Selection when entering a folder"));
+			      _("Message selection when entering a folder"));
 	MANAGE_WINDOW_SIGNALS_CONNECT(window);
 	g_signal_connect (G_OBJECT(window), "delete_event",
 			  G_CALLBACK(prefs_summary_open_deleted),
@@ -230,7 +230,7 @@ static void prefs_summary_open_create(void)
 					    GTK_SHADOW_IN);
 
 	possible_actions_list_view = prefs_summary_open_list_view_create
-				(_("Possible selections"));
+				(_("Available selections"));
 	gtk_widget_show (possible_actions_list_view);
 	gtk_container_add(GTK_CONTAINER(list_view_scrolledwin), possible_actions_list_view);
 
@@ -265,7 +265,7 @@ static void prefs_summary_open_create(void)
 					    GTK_SHADOW_IN);
 
 	actions_list_view = prefs_summary_open_list_view_create
-					(_("Selection on folder opening"));
+					(_("Current selections"));
 	g_signal_connect (G_OBJECT (del_btn), "clicked",
 			  G_CALLBACK (prefs_summary_open_delete_cb),
 			  actions_list_view);

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


hooks/post-receive
-- 
Claws Mail