[evolution-patches] 63329 again, folder properties name translation

[Not Zed <notzed ximian com>]

straightforward, for stable



Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3568
diff -u -p -r1.3568 ChangeLog
--- mail/ChangeLog	4 Feb 2005 02:17:21 -0000	1.3568
+++ mail/ChangeLog	4 Feb 2005 04:11:37 -0000
@@ -1,5 +1,10 @@
 2005-02-04  Not Zed  <NotZed Ximian com>
 
+	** See bug #65329
+
+	* em-folder-properties.c (emfp_dialog_got_folder): translate
+	local-store special folders.
+
 	* mail-session.c (alert_user, do_user_message): if we aren't
 	waiting for cancel, then don't worry about waiting on the reply
 	port, otherwise we could block when we don't need to, if there is
Index: mail/em-folder-properties.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-properties.c,v
retrieving revision 1.8
diff -u -p -r1.8 em-folder-properties.c
--- mail/em-folder-properties.c	19 Jan 2005 18:33:46 -0000	1.8
+++ mail/em-folder-properties.c	4 Feb 2005 04:11:37 -0000
@@ -45,6 +45,7 @@
 #include "em-folder-properties.h"
 #include "em-config.h"
 
+#include "mail-component.h"
 #include "mail-ops.h"
 #include "mail-mt.h"
 #include "mail-vfolder.h"
@@ -238,7 +239,14 @@ emfp_dialog_got_folder (char *uri, Camel
 	camel_object_get (folder, NULL, CAMEL_FOLDER_PROPERTIES, &prop_data->properties, CAMEL_FOLDER_NAME, &prop_data->name,
 			  CAMEL_FOLDER_TOTAL, &prop_data->total, CAMEL_FOLDER_UNREAD, &prop_data->unread, NULL);
 
-	emfp_items[EMFP_FOLDER_SECTION].label = prop_data->name;
+	if (folder->parent_store == mail_component_peek_local_store(NULL)
+	    && (!strcmp(prop_data->name, "Drafts")
+		|| !strcmp(prop_data->name, "Inbox")
+		|| !strcmp(prop_data->name, "Outbox")
+		|| !strcmp(prop_data->name, "Sent")))
+		emfp_items[EMFP_FOLDER_SECTION].label = _(prop_data->name);
+	else
+		emfp_items[EMFP_FOLDER_SECTION].label = prop_data->name;
 
 	count = g_slist_length (prop_data->properties);