From 8e8492bdd9b8e1d9c08df1f510dd1853587f96de Mon Sep 17 00:00:00 2001 From: Rodney Dawes Date: Tue, 1 Feb 2005 19:30:49 +0000 Subject: Replace "_Virtual Folder" with "_vFolder" for the search menu to create a 2005-02-01 Rodney Dawes * em-folder-browser.c: Replace "_Virtual Folder" with "_vFolder" for the search menu to create a vfolder from a search * em-folder-tree-model.c (sort_cb): s/VFolders/vFolders/ for sorting in the folder tree (em_folder_tree_model_load_state): s/VFolders/vFolders/ in a comment * em-folder-view.c: s/VFolder/vFolder/ for the popup menu * em-vfolder-editor.c (em_vfolder_editor_new): Replace the string "Virtual _Folders" with "v_Folders" for the label * em-vfolder-rule.c (em_vfolder_editor_sourcelist_new): Repalce the string "VFolder source" with "vFolder source" * mail-errors.xml: * mail-errors.xml.h: Replace "virtual folder" with "vFolder" in an error string * mail-vfolder.c (vfolder_setup_desc): s/vfolder/vFolder/ (vfolder_setup_do): s/vfolder/vFolder/ (vfolder_load_storage): s/VFolders/vFolders/ (vfolder_edit_rule): s/VFolder/vFolder/ (vfolder_gui_add_rule): s/VFolder/vFolder/ Fixes #68137 svn path=/trunk/; revision=28664 --- mail/ChangeLog | 29 +++++++++++++++++++++++++++++ mail/em-folder-browser.c | 2 +- mail/em-folder-tree-model.c | 8 ++++---- mail/em-folder-view.c | 8 ++++---- mail/em-vfolder-editor.c | 2 +- mail/em-vfolder-rule.c | 2 +- mail/mail-errors.xml | 2 +- mail/mail-errors.xml.h | 2 +- mail/mail-vfolder.c | 10 +++++----- 9 files changed, 47 insertions(+), 18 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 4e8900969a..90f61e1e07 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,32 @@ +2005-02-01 Rodney Dawes + + * em-folder-browser.c: Replace "_Virtual Folder" with "_vFolder" for + the search menu to create a vfolder from a search + + * em-folder-tree-model.c (sort_cb): s/VFolders/vFolders/ for sorting + in the folder tree + (em_folder_tree_model_load_state): s/VFolders/vFolders/ in a comment + + * em-folder-view.c: s/VFolder/vFolder/ for the popup menu + + * em-vfolder-editor.c (em_vfolder_editor_new): Replace the string + "Virtual _Folders" with "v_Folders" for the label + + * em-vfolder-rule.c (em_vfolder_editor_sourcelist_new): Repalce the + string "VFolder source" with "vFolder source" + + * mail-errors.xml: + * mail-errors.xml.h: Replace "virtual folder" with "vFolder" in an + error string + + * mail-vfolder.c (vfolder_setup_desc): s/vfolder/vFolder/ + (vfolder_setup_do): s/vfolder/vFolder/ + (vfolder_load_storage): s/VFolders/vFolders/ + (vfolder_edit_rule): s/VFolder/vFolder/ + (vfolder_gui_add_rule): s/VFolder/vFolder/ + + Fixes #68137 + 2005-02-01 Not Zed ** See bug #65329. diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index fa2bd6aa85..c0b9d92529 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -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 } }; diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index 446d2fbde5..40cf8de1e9 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -193,14 +193,14 @@ sort_cb (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data 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 (EMFolderTreeModel *model, const char *filename) 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); diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index d3438c6bf6..a604b0a4bf 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -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 }, diff --git a/mail/em-vfolder-editor.c b/mail/em-vfolder-editor.c index 3e7aa3e282..24ca862104 100644 --- a/mail/em-vfolder-editor.c +++ b/mail/em-vfolder-editor.c @@ -101,7 +101,7 @@ em_vfolder_editor_new (EMVFolderContext *vc) 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); diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c index 24cc3f390c..ceafc56b2a 100644 --- a/mail/em-vfolder-rule.c +++ b/mail/em-vfolder-rule.c @@ -571,7 +571,7 @@ em_vfolder_editor_sourcelist_new(char *widget_name, char *string1, char *string2 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); diff --git a/mail/mail-errors.xml b/mail/mail-errors.xml index 13ebb22182..045cf9326a 100644 --- a/mail/mail-errors.xml +++ b/mail/mail-errors.xml @@ -263,7 +263,7 @@ The message is stored in the Outbox folder. Check the message for errors and re Cannot edit vFolder "{0}" as it does not exist. - This folder may have been added implicitly, go to the virtual folder editor to add it explicitly, if required. + This folder may have been added implicitly, go to the vFolder editor to add it explicitly, if required. diff --git a/mail/mail-errors.xml.h b/mail/mail-errors.xml.h index 916570a159..ba728c520d 100644 --- a/mail/mail-errors.xml.h +++ b/mail/mail-errors.xml.h @@ -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 */ diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index a1a0830ac0..8798ccba33 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -87,7 +87,7 @@ vfolder_setup_desc(struct _mail_msg *mm, int done) { 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, -- cgit v1.2.3