plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml changed "mails" to

2006-01-19  Andre Klapper <a9016009@gmx.de>

	* plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml:
	* plugins/exchange-operations/org-gnome-exchange-operations.error.xml:
	* plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml
	changed "mails" to "mail", "emails" or "messages". Fixes bug 325569.

svn path=/trunk/; revision=31244

6 files changed, 24 insertions, 8 deletions

diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog
index 97ea89b6da..b06b3a2e7f 100644
--- a/plugins/bbdb/ChangeLog
+++ b/plugins/bbdb/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-19  Andre Klapper <a9016009@gmx.de>
+
+	* org-gnome-evolution-bbdb.eplug.xml:
+	changed "mails" to "mail" or "messages". Fixes bug 325569.
+
 2005-12-30  Andre Klapper <a9016009@gmx.de>
 
 	* org-gnome-evolution-bbdb.eplug.xml:  Fixing several typos and 
diff --git a/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml b/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml
index aa79f2f3a7..7aa24c607d 100644
--- a/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml
+++ b/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml
@@ -5,7 +5,7 @@
 	  _name="Automatic Contacts"
  	  location="@PLUGINDIR@/liborg-gnome-evolution-bbdb.so">
 
-	  	<_description>Automatically fills your addressbook with names and email addresses as you reply to mails.  Also fills in IM contact information from your buddy lists.</_description>
+	  	<_description>Automatically fills your addressbook with names and email addresses as you reply to messages.  Also fills in IM contact information from your buddy lists.</_description>
 
 		<author name="Nat Friedman" email="nat@novell.com"/>
 
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index 51264b3749..4d4cd6dedb 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-19  Andre Klapper <a9016009@gmx.de>
+
+	* org-gnome-exchange-operations.error.xml:
+	changed "mails" to "mail" or "messages", removed duplicated
+	whitespaces. Fixes bug 325569.
+
 2006-01-18  Sushma Rai  <rsushma@novell.com>
 
 	* exchange-contacts.c (e_exchange_contacts_pcontacts): Displaying the
diff --git a/plugins/exchange-operations/org-gnome-exchange-operations.error.xml b/plugins/exchange-operations/org-gnome-exchange-operations.error.xml
index 971567374c..1300f128f3 100644
--- a/plugins/exchange-operations/org-gnome-exchange-operations.error.xml
+++ b/plugins/exchange-operations/org-gnome-exchange-operations.error.xml
@@ -101,18 +101,18 @@ supports Microsoft Exchange 2000 and 2003 only.</_secondary>
  </error>
 
  <error id="account-quota-error" type="error">
-  <_primary>You have exceeded your quota for storing mails on this server.</_primary>
-  <_secondary>Your current usage is: {0} KB.  You will not be able to either send or receive mails now.</_secondary>
+  <_primary>You have exceeded your quota for storing mail on this server.</_primary>
+  <_secondary>Your current usage is: {0} KB. You will not be able to either send or receive mail now.</_secondary>
  </error>
 
  <error id="account-quota-send-error" type="warning">
-  <_primary>You are nearing your quota available for storing mails on this server.</_primary>
-  <_secondary>Your current usage is: {0} KB.  You will not be able to send mails till you clear up some space by deleting some mails.</_secondary>
+  <_primary>You are nearing your quota available for storing mail on this server.</_primary>
+  <_secondary>Your current usage is: {0} KB. You will not be able to send mail until you clear up some space by deleting some mail.</_secondary>
  </error>
 
  <error id="account-quota-warn" type="warning">
-  <_primary>You are nearing your quota available for storing mails on this server.</_primary>
-  <_secondary>Your current usage is: {0} KB.  Try to clear up some space by deleting some mails.</_secondary>
+  <_primary>You are nearing your quota available for storing mail on this server.</_primary>
+  <_secondary>Your current usage is: {0} KB. Try to clear up some space by deleting some mail.</_secondary>
  </error>
 
  <error id="connect-exchange-error" type="error">
diff --git a/plugins/prefer-plain/ChangeLog b/plugins/prefer-plain/ChangeLog
index fdcd91f188..2ab119d120 100644
--- a/plugins/prefer-plain/ChangeLog
+++ b/plugins/prefer-plain/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-19  Andre Klapper <a9016009@gmx.de>
+
+	* org-gnome-prefer-plain.eplug.xml
+	changed "mails" to "emails". Fixes bug 325569.
+
 2005-05-17  Not Zed  <NotZed@Ximian.com>
 
 	* org-gnome-prefer-plain.eplug.xml: make it clear this is a demonstration only.
diff --git a/plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml b/plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml
index e210b17c2c..de5ded5b9d 100644
--- a/plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml
+++ b/plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml
@@ -7,7 +7,7 @@
     _name="Prefer plain-text">
 
 
-    <_description xml:space="preserve">A test plugin which demonstrates a formatter plugin which lets you choose to disable HTML mails.
+    <_description xml:space="preserve">A test plugin which demonstrates a formatter plugin which lets you choose to disable HTML emails.
 
 This plugin is unsupported demonstration code only.
 </_description>