From 7029abc8cd37639e1126219e64d07faa6705e5e9 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 28 Sep 2007 02:30:14 +0000 Subject: Use consistent terminology for mail messages (#480621). 2007-09-27 Matthew Barnes * mail/em-account-editor.c: * mail/evolution-mail.schemas.in: * mail/mail-config.glade: * plugins/bbdb/bbdb.c (bbdb_page_factory): * plugins/bogo-junk-plugin/bf-junk-filter.c: * plugins/face/org-gnome-face-eplug.xml: * plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml: * plugins/print-message/org-gnome-print-message.eplug.xml: Use consistent terminology for mail messages (#480621). svn path=/trunk/; revision=34326 --- mail/ChangeLog | 7 +++++++ mail/em-account-editor.c | 6 +++--- mail/evolution-mail.schemas.in | 2 +- mail/mail-config.glade | 26 +++++++++++++------------- 4 files changed, 24 insertions(+), 17 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index b55544c979..2cad686331 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2007-09-27 Matthew Barnes + + * em-account-editor.c: + * evolution-mail.schemas.in: + * mail-config.glade: + Use consistent terminology for mail messages (#480621). + 2007-09-27 Matthew Barnes ** Fixes part of bug #477045 diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index f4b8efe01e..5570c26989 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -2053,7 +2053,7 @@ emae_receive_options_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *par row = ((GtkTable *)parent)->nrows; box = gtk_hbox_new(FALSE, 4); - w = gtk_check_button_new_with_mnemonic (_("Automatically check for _new mail every")); + w = gtk_check_button_new_with_mnemonic (_("Check for _new messages every")); emae_account_toggle_widget(emae, (GtkToggleButton *)w, E_ACCOUNT_SOURCE_AUTO_CHECK); gtk_box_pack_start((GtkBox *)box, w, FALSE, FALSE, 0); @@ -2397,7 +2397,7 @@ static EMConfigItem emae_editor_items[] = { /* Most sections for this is auto-generated fromt the camel config */ { E_CONFIG_PAGE, "20.receive_options", N_("Receiving Options"), }, - { E_CONFIG_SECTION_TABLE, "20.receive_options/10.mailcheck", N_("Checking for New Mail"), }, + { E_CONFIG_SECTION_TABLE, "20.receive_options/10.mailcheck", N_("Checking for New Messages"), }, { E_CONFIG_ITEM_TABLE, "20.receive_options/10.mailcheck/00.autocheck", NULL, emae_receive_options_item, }, { E_CONFIG_PAGE, "30.send", "vboxTransportBorder", emae_send_page }, @@ -2488,7 +2488,7 @@ static EMConfigItem emae_druid_items[] = { /* Most sections for this is auto-generated fromt the camel config */ { E_CONFIG_PAGE, "20.receive_options", N_("Receiving Options"), }, - { E_CONFIG_SECTION_TABLE, "20.receive_options/10.mailcheck", N_("Checking for New Mail"), }, + { E_CONFIG_SECTION_TABLE, "20.receive_options/10.mailcheck", N_("Checking for New Messages"), }, { E_CONFIG_ITEM_TABLE, "20.receive_options/10.mailcheck/00.autocheck", NULL, emae_receive_options_item, }, { E_CONFIG_PAGE, "30.send", "vboxTransportBorder", emae_send_page }, diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in index afc6170be0..5a876b123e 100644 --- a/mail/evolution-mail.schemas.in +++ b/mail/evolution-mail.schemas.in @@ -250,7 +250,7 @@ Load images for HTML messages over http(s). Possible values are: 0 - Never load images off the net - 1 - Load images in mail from contacts + 1 - Load images in messages from contacts 2 - Always load images off the net diff --git a/mail/mail-config.glade b/mail/mail-config.glade index b17679cbfd..1a2faca02f 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -3630,7 +3630,7 @@ For example: "Work" or "Personal" True True - Always encrypt to _myself when sending encrypted mail + Always encrypt to _myself when sending encrypted messages True GTK_RELIEF_NORMAL True @@ -3810,7 +3810,7 @@ For example: "Work" or "Personal" True True - Also encrypt to sel_f when sending encrypted mail + Also encrypt to sel_f when sending encrypted messages True GTK_RELIEF_NORMAL True @@ -4975,7 +4975,7 @@ For example: "Work" or "Personal" True True - Do not format text contents in mails if the text si_ze exceeds + Do not format text contents in messages if the text si_ze exceeds True GTK_RELIEF_NORMAL True @@ -5471,7 +5471,7 @@ For example: "Work" or "Personal" True - <span weight="bold">New Mail Notification</span> + <span weight="bold">New Message Notification</span> False True GTK_JUSTIFY_LEFT @@ -5543,7 +5543,7 @@ For example: "Work" or "Personal" True True - _Do not notify me when new mail arrives + _Do not notify me when new messages arrive True GTK_RELIEF_NORMAL True @@ -5562,7 +5562,7 @@ For example: "Work" or "Personal" True True - _Beep when new mail arrives + _Beep when new messages arrive True GTK_RELIEF_NORMAL True @@ -5582,7 +5582,7 @@ For example: "Work" or "Personal" True True - Play sound file when new mail arri_ves + Play sound file when new messages arri_ve True GTK_RELIEF_NORMAL True @@ -5924,7 +5924,7 @@ For example: "Work" or "Personal" True True - _Load images in mail from contacts + _Load images in messages from contacts True GTK_RELIEF_NORMAL True @@ -5990,7 +5990,7 @@ For example: "Work" or "Personal" True - HTML Mail + HTML Messages True False GTK_JUSTIFY_CENTER @@ -6424,7 +6424,7 @@ For example: "Work" or "Personal" True True - _Show the photograph of sender in the email preview + _Show the photograph of sender in the message preview True GTK_RELIEF_NORMAL True @@ -6495,7 +6495,7 @@ For example: "Work" or "Personal" True - <span weight="bold">Displayed Mail _Headers</span> + <span weight="bold">Displayed Message _Headers</span> True True GTK_JUSTIFY_LEFT @@ -6804,7 +6804,7 @@ For example: "Work" or "Personal" True Checks incoming mail messages to be Junk True - Check in_coming mail for junk + Check in_coming messages for junk True GTK_RELIEF_NORMAL True @@ -6891,7 +6891,7 @@ For example: "Work" or "Personal" True True - Delete junk mails on e_xit + Delete junk messages on e_xit True GTK_RELIEF_NORMAL True -- cgit v1.2.3