Use consistent terminology for mail messages (#480621).

2007-09-27  Matthew Barnes  <mbarnes@redhat.com>

	* 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

11 files changed, 31 insertions, 6 deletions

diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog
index eec6a27361..d4c93712af 100644
--- a/plugins/bbdb/ChangeLog
+++ b/plugins/bbdb/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
+
+	* bbdb.c (bbdb_page_factory):
+	Use consistent terminology for mail messages (#480621).
+
 2007-08-24  Suman Manjunath  <msuman@novell.com>
 
 	** Fix for bug #440807
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index 131e081f36..8a0d2924cb 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -472,7 +472,7 @@ bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	gtk_box_pack_start (GTK_BOX (hbox), inner_vbox, FALSE, FALSE, 0);
 	
 	/* Enable BBDB checkbox */
-	check = gtk_check_button_new_with_mnemonic (_("_Automatically create entries in the addressbook when responding to mail"));
+	check = gtk_check_button_new_with_mnemonic (_("_Automatically create entries in the addressbook when responding to messages"));
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE, NULL));
 	g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (enable_toggled_cb), stuff);
 	gtk_box_pack_start (GTK_BOX (inner_vbox), check, FALSE, FALSE, 0);
diff --git a/plugins/bogo-junk-plugin/ChangeLog b/plugins/bogo-junk-plugin/ChangeLog
index 4479eddb61..a803432bcc 100644
--- a/plugins/bogo-junk-plugin/ChangeLog
+++ b/plugins/bogo-junk-plugin/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
+
+	* bf-junk-filter.c:
+	Use consistent terminology for mail messages (#480621).
+
 2007-09-07  Milan Crha  <mcrha@redhat.com>
 
 	** Part of fix for bug #473903
diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c
index e47e0382d8..7d7be8ee0a 100644
--- a/plugins/bogo-junk-plugin/bf-junk-filter.c
+++ b/plugins/bogo-junk-plugin/bf-junk-filter.c
@@ -300,7 +300,7 @@ org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFac
 	if (data->old)
                 return data->old;
 		
-	check = gtk_check_button_new_with_mnemonic (_("Convert mail text to _Unicode"));
+	check = gtk_check_button_new_with_mnemonic (_("Convert message text to _Unicode"));
 
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), em_junk_bf_unicode);
 	g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (convert_unicode_cb), "/apps/evolution/mail/junk/bogofilter/unicode");
diff --git a/plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in b/plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in
index ad4c67c07a..d4bfbb5b70 100644
--- a/plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in
+++ b/plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in
@@ -7,7 +7,7 @@
       <type>bool</type>
       <default>true</default>
       <locale name="C">
-        <short>Convert mail text to Unicode</short>
+        <short>Convert mail messages to Unicode</short>
         <long>
           Convert message text to Unicode UTF-8 to unify spam/ham tokens
           coming from different character sets.
diff --git a/plugins/face/ChangeLog b/plugins/face/ChangeLog
index 11d9b0814d..bdf008141e 100644
--- a/plugins/face/ChangeLog
+++ b/plugins/face/ChangeLog
@@ -1,5 +1,10 @@
 2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
 
+	* org-gnome-face-eplug.xml:
+	Use consistent terminology for mail messages (#480621).
+
+2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
+
 	** Fixes part of bug #474000
 
 	* face.c:
diff --git a/plugins/face/org-gnome-face.eplug.xml b/plugins/face/org-gnome-face.eplug.xml
index 2c50e65685..cc56aac359 100644
--- a/plugins/face/org-gnome-face.eplug.xml
+++ b/plugins/face/org-gnome-face.eplug.xml
@@ -4,7 +4,7 @@
 		location="@PLUGINDIR@/liborg-gnome-face@SOEXT@">
 
 		<author name="Sankar P" email="psankar@novell.com"/>
-		<_description>Attach Face header to outgoing mails. First time the user needs to configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/faces  This will be used in mails that are sent further.</_description>
+		<_description>Attach Face header to outgoing messages. First time the user needs to configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/faces  This will be used in messages that are sent further.</_description>
 
 		<hook class="org.gnome.evolution.mail.bonobomenu:1.0">
 			<menu id="org.gnome.evolution.mail.composer" target="widget">
diff --git a/plugins/new-mail-notify/ChangeLog b/plugins/new-mail-notify/ChangeLog
index 9a7d8b1e58..cca3ae6b95 100644
--- a/plugins/new-mail-notify/ChangeLog
+++ b/plugins/new-mail-notify/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
+
+	* org-gnome-new-mail-notify.eplug.xml:
+	Use consistent terminology for mail messages (#480621).
+
 2007-05-14  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Fix for bug #414195 from Loïc Minier
diff --git a/plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml b/plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml
index d088388ab5..bd9521e60c 100644
--- a/plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml
+++ b/plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml
@@ -5,7 +5,7 @@
 	_name="New Mail Notification" 
 	location="@PLUGINDIR@/liborg-gnome-new-mail-notify@SOEXT@">
 
-		<_description>Generates a D-BUS message when new mail arrives.</_description>
+		<_description>Generates a D-BUS message when new mail messages arrive.</_description>
 		<author name="Miguel Angel López Hernández" email="miguel@gulev.org.mx"/>
 
 		<hook class="org.gnome.evolution.mail.events:1.0">
diff --git a/plugins/print-message/ChangeLog b/plugins/print-message/ChangeLog
index 017a5d71ef..791ab42cbd 100644
--- a/plugins/print-message/ChangeLog
+++ b/plugins/print-message/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-27  Matthew Barnes  <mbarnes@redhat.com>
+
+	* org-gnome-print-message.eplug.xml:
+	Use consistent terminology for mail messages (#480621).
+
 2007-08-24  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #355766
diff --git a/plugins/print-message/org-gnome-print-message.eplug.xml b/plugins/print-message/org-gnome-print-message.eplug.xml
index 9fc21bb900..839aae2b61 100644
--- a/plugins/print-message/org-gnome-print-message.eplug.xml
+++ b/plugins/print-message/org-gnome-print-message.eplug.xml
@@ -5,7 +5,7 @@
     id="org.gnome.evolution.plugin.compose.PrintMessage"
     location="@PLUGINDIR@/liborg-gnome-print-message@SOEXT@"
     _name="Print Message">
-    <_description>Gives an option to print mail from composer</_description>
+    <_description>Gives an option to print from the composer.</_description>
     <author name="Vivek Jain" email="jvivek@novell.com"/>
 
     <!-- hook into the popup menu -->