talons

commit df907a2efc5017ce4bc861259fb153cbc7d03627
parent b5cb37d2b7ee9658ab1c21539e584d4bd09dbf54
Author: Tristan Chabredier <wwp@claws-mail.org>
Date:   Fri,  2 May 2008 15:10:50 +0000

2008-05-02 [wwp]	3.4.0cvs20

	* po/fr.po
		Fix translation.

	* src/prefs_folder_item.c
		Add missing notice in folder properties (templates) when
		folder is a root node.

Diffstat:
M
ChangeLog
 | 
9
+++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
po/fr.po
 | 
2
+-
M
src/prefs_folder_item.c
 | 
12
++++++++++++

5 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+2008-05-02 [wwp]	3.4.0cvs20
+
+	* po/fr.po
+		Fix translation.
+
+	* src/prefs_folder_item.c
+		Add missing notice in folder properties (templates) when
+		folder is a root node.
+
 2008-04-30 [colin]	3.4.0cvs19
 
 	* src/prefs_toolbar.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3315,3 +3315,4 @@
 ( cvs diff -u -r 1.382.2.444 -r 1.382.2.445 src/compose.c;  ) > 3.4.0cvs17.patchset
 ( cvs diff -u -r 1.382.2.445 -r 1.382.2.446 src/compose.c;  ) > 3.4.0cvs18.patchset
 ( cvs diff -u -r 1.30.2.48 -r 1.30.2.49 src/prefs_toolbar.c;  ) > 3.4.0cvs19.patchset
+( cvs diff -u -r 1.42.2.37 -r 1.42.2.38 po/fr.po;  cvs diff -u -r 1.52.2.63 -r 1.52.2.64 src/prefs_folder_item.c;  ) > 3.4.0cvs20.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=19
+EXTRA_VERSION=20
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/po/fr.po b/po/fr.po
@@ -11723,7 +11723,7 @@ msgstr ""
 "<i>Attention, les paramètres de ce méta-dossier (boîte aux lettres) NE "
 "seront PAS enregistrés. Cependant, vous pouvez très bien les utiliser pour "
 "les appliquer récursivement à l'ensemble de la boîte aux lettres en cochant "
-"« Inclure les sous-dossiers ».</i>"
+"« Appliquer aux sous-dossiers ».</i>"
 
 #: src/prefs_folder_item.c:263 src/prefs_folder_item.c:796
 msgid ""
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
@@ -1153,6 +1153,7 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
 	GtkWidget *notebook;
 	GtkWidget *vbox;
 	GtkWidget *page_vbox;
+	GtkWidget *no_save_warning;
 	GtkWidget *new_msg_format_rec_checkbtn;
 	GtkWidget *reply_format_rec_checkbtn;
 	GtkWidget *forward_format_rec_checkbtn;
@@ -1162,6 +1163,17 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
 	page_vbox = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (page_vbox);
 	
+	if (!can_save) {
+		no_save_warning = gtk_label_new(
+			_("<i>These preferences will not be saved as this folder "
+			"is a top-level one. However you can use them to set them "
+			"to the whole mailbox tree using \"Apply to subfolders\".</i>"));
+		gtk_label_set_use_markup(GTK_LABEL(no_save_warning), TRUE);
+		gtk_label_set_line_wrap(GTK_LABEL(no_save_warning), TRUE);
+		gtk_misc_set_alignment(GTK_MISC(no_save_warning), 0.0, 0.5);
+		gtk_box_pack_start(GTK_BOX(page_vbox), no_save_warning, FALSE, FALSE, 4);
+	}
+
 	/* Notebook */
 	notebook = gtk_notebook_new();
 	gtk_widget_show(notebook);