[Commits] [SCM] claws branch, master, updated. 3.16.0-201-gf7c1067

[claws at claws-mail.org]

The branch, master has been updated
       via  f7c10678ad9b7f4470b75618fcd34f5964d40724 (commit)
       via  1b59ce9a396fc163ae4d01d336d20c9f7da06293 (commit)
      from  5c1c396395406dd205cdb470dc7da741145b0af1 (commit)

Summary of changes:
 src/prefs_account.c |    4 ++--
 src/prefs_proxy.c   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit f7c10678ad9b7f4470b75618fcd34f5964d40724
Author: Paul <paul at claws-mail.org>
Date:   Mon Jun 11 10:17:31 2018 +0100

    two small fixes to text in label and tooltip

diff --git a/src/prefs_account.c b/src/prefs_account.c
index dc176ca..d94b384 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -2801,7 +2801,7 @@ static void proxy_create_widget_func(PrefsPage * _page,
 	vbox1 = gtk_vbox_new (FALSE, VSPACING);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 
-	proxy_checkbtn = gtk_check_button_new_with_label (_("Use proxy server for this account"));
+	proxy_checkbtn = gtk_check_button_new_with_label (_("Use proxy server"));
 	PACK_FRAME (vbox1, proxy_frame, NULL);
 	gtk_frame_set_label_widget (GTK_FRAME(proxy_frame), proxy_checkbtn);
 
@@ -2812,7 +2812,7 @@ static void proxy_create_widget_func(PrefsPage * _page,
 	default_proxy_checkbtn =
 		gtk_check_button_new_with_label (C_("In account preferences, referring to whether or not use proxy settings from common preferences", "Use default settings"));
 	CLAWS_SET_TIP(default_proxy_checkbtn,
-			_("Use proxy server settings from common preferences."));
+			_("Use global proxy server settings"));
 	gtk_box_pack_start (GTK_BOX (vbox2), default_proxy_checkbtn, FALSE, FALSE, 0);
 
 	vbox3 = gtk_vbox_new (FALSE, VSPACING_NARROW);

commit 1b59ce9a396fc163ae4d01d336d20c9f7da06293
Author: Paul <paul at claws-mail.org>
Date:   Mon Jun 11 10:16:54 2018 +0100

    move 'Proxy' page from Other/ to Mail Handling/

diff --git a/src/prefs_proxy.c b/src/prefs_proxy.c
index c3cf43d..1d990f7 100644
--- a/src/prefs_proxy.c
+++ b/src/prefs_proxy.c
@@ -215,7 +215,7 @@ void prefs_proxy_init(void)
 	ProxyPage *page;
 	static gchar *path[3];
 
-	path[0] = _("Other");
+	path[0] = _("Mail Handling");
 	path[1] = _("Proxy");
 	path[2] = NULL;
 
@@ -224,7 +224,7 @@ void prefs_proxy_init(void)
 	page->page.create_widget = prefs_proxy_create_widget;
 	page->page.destroy_widget = prefs_proxy_destroy_widget;
 	page->page.save_page = prefs_proxy_save;
-	page->page.weight = 5.0;
+	page->page.weight = 190.0;
 
 	prefs_gtk_register_page((PrefsPage *)page);
 	prefs_proxy = page;

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


hooks/post-receive
-- 
Claws Mail