talons

commit afb2211934dec2ef36d9597b91241f29e58fe112
parent 83f6420d65cd319f592ad69f771e497c8434b5dd
Author: wwp <wwp@free.fr>
Date:   Mon, 11 Jun 2018 11:21:09 +0200

Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws

Diffstat:
M
src/prefs_account.c
 | 
4
++--
M
src/prefs_proxy.c
 | 
4
++--

2 files changed, 4 insertions(+), 4 deletions(-)
diff --git 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);
diff --git 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;