GNOME.org
 

[evolution-patches] Patch for #68137 (VFolder vs. vFolder etc...)

This patch fixes up the differences everywhere we refer to vFolders to
use the term vFolder.

-- dobey


? mail/evolution-mail-2.0.schemas
? mail/default/zh_CN/Makefile
? mail/default/zh_CN/Makefile.in
Index: mail/em-folder-browser.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-browser.c,v
retrieving revision 1.56
diff -u -p -r1.56 em-folder-browser.c
--- mail/em-folder-browser.c	18 Jan 2005 06:09:31 -0000	1.56
+++ mail/em-folder-browser.c	1 Feb 2005 17:11:57 -0000
@@ -130,7 +130,7 @@ static ESearchBarItem emfb_search_items[
 	E_FILTERBAR_SAVE,
 	E_FILTERBAR_EDIT,
 	{ NULL, 0, NULL },
-	{ N_("Create _Virtual Folder From Search..."), ESB_SAVE, NULL  },
+	{ N_("Create _vFolder From Search..."), ESB_SAVE, NULL  },
 	{ NULL, -1, NULL }
 };
 
Index: mail/em-folder-tree-model.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-tree-model.c,v
retrieving revision 1.65
diff -u -p -r1.65 em-folder-tree-model.c
--- mail/em-folder-tree-model.c	1 Feb 2005 07:41:49 -0000	1.65
+++ mail/em-folder-tree-model.c	1 Feb 2005 17:11:57 -0000
@@ -193,14 +193,14 @@ sort_cb (GtkTreeModel *model, GtkTreeIte
 	gtk_tree_model_get (model, b, COL_STRING_DISPLAY_NAME, &bname, COL_UINT_FLAGS, &bflags, -1);
 	
 	if (is_store) {
-		/* On This Computer is always first and VFolders is always last */
+		/* On This Computer is always first and vFolders is always last */
 		if (!strcmp (aname, _("On This Computer")))
 			rv = -1;
 		else if (!strcmp (bname, _("On This Computer")))
 			rv = 1;
-		else if (!strcmp (aname, _("VFolders")))
+		else if (!strcmp (aname, _("vFolders")))
 			rv = 1;
-		else if (!strcmp (bname, _("VFolders")))
+		else if (!strcmp (bname, _("vFolders")))
 			rv = -1;
 	} else if (store == vfolder_store) {
 		/* UNMATCHED is always last */
@@ -331,7 +331,7 @@ em_folder_tree_model_load_state (EMFolde
 	if (stat (filename, &st) == 0 && (model->state = xmlParseFile (filename)))
 		return;
 	
-	/* setup some defaults - expand "Local Folders" and "VFolders" */
+	/* setup some defaults - expand "Local Folders" and "vFolders" */
 	model->state = xmlNewDoc ("1.0");
 	root = xmlNewDocNode (model->state, NULL, "tree-state", NULL);
 	xmlDocSetRootElement (model->state, root);
Index: mail/em-folder-view.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-view.c,v
retrieving revision 1.103
diff -u -p -r1.103 em-folder-view.c
--- mail/em-folder-view.c	1 Feb 2005 00:33:53 -0000	1.103
+++ mail/em-folder-view.c	1 Feb 2005 17:11:58 -0000
@@ -1007,10 +1007,10 @@ static EPopupItem emfv_popup_items[] = {
 
 	{ E_POPUP_BAR, "90.filter", NULL, NULL, NULL, NULL, EM_POPUP_SELECT_ONE },
 	{ E_POPUP_SUBMENU, "90.filter.00", N_("Crea_te Rule From Message"), NULL, NULL, NULL, EM_POPUP_SELECT_ONE },
-	{ E_POPUP_ITEM, "90.filter.00/00.00", N_("VFolder on _Subject"), emfv_popup_vfolder_subject, NULL, NULL, EM_POPUP_SELECT_ONE },
-	{ E_POPUP_ITEM, "90.filter.00/00.01", N_("VFolder on Se_nder"), emfv_popup_vfolder_sender, NULL, NULL, EM_POPUP_SELECT_ONE },
-	{ E_POPUP_ITEM, "90.filter.00/00.02", N_("VFolder on _Recipients"), emfv_popup_vfolder_recipients, NULL, NULL, EM_POPUP_SELECT_ONE },
-	{ E_POPUP_ITEM, "90.filter.00/00.03", N_("VFolder on Mailing _List"),
+	{ E_POPUP_ITEM, "90.filter.00/00.00", N_("vFolder on _Subject"), emfv_popup_vfolder_subject, NULL, NULL, EM_POPUP_SELECT_ONE },
+	{ E_POPUP_ITEM, "90.filter.00/00.01", N_("vFolder on Se_nder"), emfv_popup_vfolder_sender, NULL, NULL, EM_POPUP_SELECT_ONE },
+	{ E_POPUP_ITEM, "90.filter.00/00.02", N_("vFolder on _Recipients"), emfv_popup_vfolder_recipients, NULL, NULL, EM_POPUP_SELECT_ONE },
+	{ E_POPUP_ITEM, "90.filter.00/00.03", N_("vFolder on Mailing _List"),
 	  emfv_popup_vfolder_mlist, NULL, NULL, EM_POPUP_SELECT_ONE|EM_POPUP_SELECT_MAILING_LIST },
 	
 	{ E_POPUP_BAR, "90.filter.00/10", NULL, NULL, NULL, NULL, EM_POPUP_SELECT_ONE },
Index: mail/em-vfolder-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-vfolder-editor.c,v
retrieving revision 1.2
diff -u -p -r1.2 em-vfolder-editor.c
--- mail/em-vfolder-editor.c	18 Jun 2004 08:57:50 -0000	1.2
+++ mail/em-vfolder-editor.c	1 Feb 2005 17:11:58 -0000
@@ -101,7 +101,7 @@ em_vfolder_editor_new (EMVFolderContext 
 	GladeXML *gui;
 	
 	gui = glade_xml_new (EVOLUTION_GLADEDIR "/filter.glade", "rule_editor", NULL);
-	rule_editor_construct ((RuleEditor *) ve, (RuleContext *) vc, gui, "incoming", _("Virtual _Folders"));
+	rule_editor_construct ((RuleEditor *) ve, (RuleContext *) vc, gui, "incoming", _("v_Folders"));
         gtk_widget_hide(glade_xml_get_widget (gui, "filter_source"));
 	g_object_unref (gui);
 	
Index: mail/em-vfolder-rule.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-vfolder-rule.c,v
retrieving revision 1.4
diff -u -p -r1.4 em-vfolder-rule.c
--- mail/em-vfolder-rule.c	29 Jun 2004 06:30:24 -0000	1.4
+++ mail/em-vfolder-rule.c	1 Feb 2005 17:11:58 -0000
@@ -571,7 +571,7 @@ em_vfolder_editor_sourcelist_new(char *w
 	
 	renderer = gtk_cell_renderer_text_new();
 	gtk_tree_view_insert_column_with_attributes((GtkTreeView *)table, -1,
-						     _("VFolder source"), renderer,
+						     _("vFolder source"), renderer,
 						     "text", 0, NULL);
 	
 	selection = gtk_tree_view_get_selection((GtkTreeView *)table);
Index: mail/mail-errors.xml
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-errors.xml,v
retrieving revision 1.11
diff -u -p -r1.11 mail-errors.xml
--- mail/mail-errors.xml	31 Jan 2005 17:03:08 -0000	1.11
+++ mail/mail-errors.xml	1 Feb 2005 17:11:58 -0000
@@ -263,7 +263,7 @@ The message is stored in the Outbox fold
 
  <error id="vfolder-notexist" type="error">
   <primary>Cannot edit vFolder &quot;{0}&quot; as it does not exist.</primary>
-  <secondary>This folder may have been added implicitly, go to the virtual folder editor to add it explicitly, if required.</secondary>
+  <secondary>This folder may have been added implicitly, go to the vFolder editor to add it explicitly, if required.</secondary>
  </error>
 
  <error id="vfolder-notunique" type="error">
Index: mail/mail-errors.xml.h
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-errors.xml.h,v
retrieving revision 1.11
diff -u -p -r1.11 mail-errors.xml.h
--- mail/mail-errors.xml.h	31 Jan 2005 17:03:08 -0000	1.11
+++ mail/mail-errors.xml.h	1 Feb 2005 17:11:58 -0000
@@ -190,7 +190,7 @@ char *s = N_("_Discard changes");
 /* mail:vfolder-notexist primary */
 char *s = N_("Cannot edit vFolder \"{0}\" as it does not exist.");
 /* mail:vfolder-notexist secondary */
-char *s = N_("This folder may have been added implicitly, go to the virtual folder editor to add it explicitly, if required.");
+char *s = N_("This folder may have been added implicitly, go to the vFolder editor to add it explicitly, if required.");
 /* mail:vfolder-notunique primary */
 char *s = N_("Cannot add vFolder \"{0}\".");
 /* mail:vfolder-notunique secondary */
Index: mail/mail-vfolder.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-vfolder.c,v
retrieving revision 1.129
diff -u -p -r1.129 mail-vfolder.c
--- mail/mail-vfolder.c	28 Jan 2005 09:04:28 -0000	1.129
+++ mail/mail-vfolder.c	1 Feb 2005 17:11:58 -0000
@@ -87,7 +87,7 @@ vfolder_setup_desc(struct _mail_msg *mm,
 {
 	struct _setup_msg *m = (struct _setup_msg *)mm;
 
-	return g_strdup_printf(_("Setting up vfolder: %s"), m->folder->full_name);
+	return g_strdup_printf(_("Setting up vFolder: %s"), m->folder->full_name);
 }
 
 static void
@@ -97,7 +97,7 @@ vfolder_setup_do(struct _mail_msg *mm)
 	GList *l, *list = NULL;
 	CamelFolder *folder;
 
-	d(printf("Setting up vfolder: %s\n", m->folder->full_name));
+	d(printf("Setting up vFolder: %s\n", m->folder->full_name));
 
 	camel_vee_folder_set_expression((CamelVeeFolder *)m->folder, m->query);
 
@@ -896,7 +896,7 @@ vfolder_load_storage(void)
 				(CamelObjectEventHookFunc)store_folder_renamed, NULL);
 	
 	d(printf("got store '%s' = %p\n", storeuri, vfolder_store));
-	mail_component_load_store_by_uri (mail_component_peek (), storeuri, _("VFolders"));
+	mail_component_load_store_by_uri (mail_component_peek (), storeuri, _("vFolders"));
 	
 	/* load our rules */
 	user = g_strdup_printf ("%s/mail/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
@@ -1005,7 +1005,7 @@ vfolder_edit_rule(const char *uri)
 
 		w = filter_rule_get_widget((FilterRule *)newrule, (RuleContext *)context);
 
-		gd = (GtkDialog *)gtk_dialog_new_with_buttons(_("Edit VFolder"), NULL,
+		gd = (GtkDialog *)gtk_dialog_new_with_buttons(_("Edit vFolder"), NULL,
 							      GTK_DIALOG_DESTROY_WITH_PARENT,
 							      GTK_STOCK_CANCEL,
 							      GTK_RESPONSE_CANCEL,
@@ -1089,7 +1089,7 @@ vfolder_gui_add_rule(EMVFolderRule *rule
 
 	w = filter_rule_get_widget((FilterRule *)rule, (RuleContext *)context);
 
-	gd = (GtkDialog *)gtk_dialog_new_with_buttons(_("New VFolder"),
+	gd = (GtkDialog *)gtk_dialog_new_with_buttons(_("New vFolder"),
 						      NULL,
 						      GTK_DIALOG_DESTROY_WITH_PARENT,
 						      GTK_STOCK_CANCEL,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]