Merge branch 'master' into kill-bonobo

Conflicts:
	plugins/audio-inline/org-gnome-audio-inline.eplug.xml
	plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml
	plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml
	plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml
	plugins/select-one-source/org-gnome-select-one-source.eplug.xml

39 files changed, 54 insertions, 57 deletions

diff --git a/plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml b/plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml
index b9fe52e341..ea76c75945 100644
--- a/plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml
+++ b/plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml
@@ -7,7 +7,7 @@
      _name="Local Address Books"
      system_plugin="true">
      <author name="Sivaiah Nallagatla" email="snallagatla@novell.com"/>
-     <_description>Provides core functionality for local address books.</_description>
+     <_description>Add local address books to Evolution.</_description>
         <hook class="org.gnome.evolution.addressbook.config:1.0">
             <group
 	     target="source"
diff --git a/plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml b/plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml
index 6d6a3e4d82..4faf44b5a6 100644
--- a/plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml
+++ b/plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml
@@ -5,8 +5,7 @@
 	  _name="Attachment Reminder"
  	  location="@PLUGINDIR@/liborg-gnome-evolution-attachment-reminder@SOEXT@">
 
-	  	<_description>Looks for clues in a message for mention of
-	  	attachments and warns if the attachment is missing</_description>
+	  	<_description>Reminds you when you forgot to add an attachment to a mail message.</_description>
 
 		<author name="Johnny Jacob" email="jjohnny@novell.com"/>
 
diff --git a/plugins/backup-restore/org-gnome-backup-restore.eplug.xml b/plugins/backup-restore/org-gnome-backup-restore.eplug.xml
index 2b294d5353..2ed7222adc 100644
--- a/plugins/backup-restore/org-gnome-backup-restore.eplug.xml
+++ b/plugins/backup-restore/org-gnome-backup-restore.eplug.xml
@@ -5,9 +5,9 @@
     id="org.gnome.plugin.backup.restore"
     type="shlib"
     location="@PLUGINDIR@/liborg-gnome-backup-restore@SOEXT@"
-    _name="Backup and restore plugin">
+    _name="Backup and Restore">
     <author name="JP Rosevear" email="jpr@novell.com"/>
-    <_description>A plugin for backing up and restore Evolution data and settings.</_description>
+    <_description>Backup and restore your Evolution data and settings.</_description>
 
     <hook class="org.gnome.evolution.shell.bonobomenu:1.0">
 
diff --git a/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml b/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml
index 8f9af69821..04ad29f494 100644
--- a/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml
+++ b/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml
@@ -5,7 +5,9 @@
 	  _name="Automatic Contacts"
  	  location="@PLUGINDIR@/liborg-gnome-evolution-bbdb@SOEXT@">
 
-	  	<_description>Automatically fills your address book with names and email addresses as you reply to messages.  Also fills in IM contact information from your buddy lists.</_description>
+	  	<_description xml:space="preserve">Takes the gruntwork out of managing your address book.
+
+Automatically fills your address book 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/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml b/plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml
index 9c61f4003f..e1d8cc83a0 100644
--- a/plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml
+++ b/plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml
@@ -3,8 +3,8 @@
 	<e-plugin type="shlib"
 	          location="@PLUGINDIR@/liborg-gnome-bogo-junk-plugin.so"
 	          id="org.gnome.evolution.bogo.bf_junk_plugin"
-	          _name="Bogofilter junk plugin">
-		<_description>Filters junk messages using Bogofilter.</_description>
+	          _name="Bogofilter Junk Filter">
+		<_description>Filter junk messages using Bogofilter.</_description>
 		<author name="Mikhail Zabaluev" email="mhz@altlinux.org"/>
 		<hook class="org.gnome.evolution.mail.junk:1.0">
 			<group id="EMJunk" >
diff --git a/plugins/caldav/org-gnome-evolution-caldav.eplug.xml b/plugins/caldav/org-gnome-evolution-caldav.eplug.xml
index 368570d49b..42efe6390e 100644
--- a/plugins/caldav/org-gnome-evolution-caldav.eplug.xml
+++ b/plugins/caldav/org-gnome-evolution-caldav.eplug.xml
@@ -7,10 +7,10 @@
 	  load-on-startup="true"
 	  domain="@GETTEXT_PACKAGE@"
 	  localedir="@LOCALEDIR@"
-	  _name="CalDAV sources"
+	  _name="CalDAV Support"
           system_plugin="true">
   		<author name="Christian Kellner" email="gicmo@gnome.org"/>
-		<_description>CalDAV Calendar sources</_description>
+		<_description>Add CalDAV support to Evolution.</_description>
 
 		<hook class="org.gnome.evolution.calendar.config:1.0">
             	<group target="source"
diff --git a/plugins/calendar-file/org-gnome-calendar-file.eplug.xml b/plugins/calendar-file/org-gnome-calendar-file.eplug.xml
index 246b176059..9b146101f2 100644
--- a/plugins/calendar-file/org-gnome-calendar-file.eplug.xml
+++ b/plugins/calendar-file/org-gnome-calendar-file.eplug.xml
@@ -7,7 +7,7 @@
      _name="Local Calendars"
      system_plugin="true">
      <author name="JP Rosevear" email="jpr@novell.com"/>
-     <_description>Provides core functionality for local calendars.</_description>
+     <_description>Add local calendars to Evolution.</_description>
         <hook class="org.gnome.evolution.calendar.config:1.0">
             <group
 	     target="source"
diff --git a/plugins/calendar-http/org-gnome-calendar-http.eplug.xml b/plugins/calendar-http/org-gnome-calendar-http.eplug.xml
index 8b75a0f2c3..32f2abe499 100644
--- a/plugins/calendar-http/org-gnome-calendar-http.eplug.xml
+++ b/plugins/calendar-http/org-gnome-calendar-http.eplug.xml
@@ -4,10 +4,10 @@
      type="shlib"
      location="@PLUGINDIR@/liborg-gnome-calendar-http@SOEXT@"
      id="org.gnome.evolution.calendar.http"
-     _name="HTTP Calendars"
+     _name="Web Calendars"
      system_plugin="true">
      <author name="David Trowbridge" email="David.Trowbridge@Colorado.edu"/>
-     <_description>Provides core functionality for webcal and http calendars.</_description>
+     <_description>Add web calendars to Evolution.</_description>
         <hook class="org.gnome.evolution.calendar.config:1.0">
             <group
 	     target="source"
diff --git a/plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml b/plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml
index e6767d128a..89c0d307d0 100644
--- a/plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml
+++ b/plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml
@@ -6,7 +6,7 @@
      id="org.gnome.evolution.calendar.weather"
      _name="Weather Calendars"
      system_plugin="true">
-        <_description>Provides core functionality for weather calendars.</_description>
+        <_description>Add weather calendars to Evolution.</_description>
 	<author name="David Trowbridge" email="trowbrds@cs.colorado.edu"/>
         <hook class="org.gnome.evolution.calendar.config:1.0">
 	    <group
diff --git a/plugins/copy-tool/org-gnome-copy-tool.eplug.xml b/plugins/copy-tool/org-gnome-copy-tool.eplug.xml
index c1400dc30b..3b6a30752d 100644
--- a/plugins/copy-tool/org-gnome-copy-tool.eplug.xml
+++ b/plugins/copy-tool/org-gnome-copy-tool.eplug.xml
@@ -4,8 +4,8 @@
     type="shlib"
     id="org.gnome.evolution.plugin.copyTool"
     location="@PLUGINDIR@/liborg-gnome-copy-tool@SOEXT@"
-    _name="Copy tool">
-    <_description>A test plugin which demonstrates a popup menu plugin which lets you copy things to the clipboard.</_description>
+    _name="Copy Tool">
+    <_description>Copy things to the clipboard.</_description>
     <author name="Michael Zucchi" email="notzed@ximian.com"/>
 
     <!-- hook into the uri popup menu -->
diff --git a/plugins/default-mailer/org-gnome-default-mailer.eplug.xml b/plugins/default-mailer/org-gnome-default-mailer.eplug.xml
index 1005b75bd1..44c5febedf 100644
--- a/plugins/default-mailer/org-gnome-default-mailer.eplug.xml
+++ b/plugins/default-mailer/org-gnome-default-mailer.eplug.xml
@@ -3,10 +3,10 @@
 	<e-plugin
 	id="org.gnome.evolution.default.mailer" 
 	type="shlib" 
-	_name="Default Mail Client " 
+	_name="Default Mail Client" 
 	location="@PLUGINDIR@/liborg-gnome-default-mailer@SOEXT@">
 
-		<_description>Checks whether Evolution is the default mail client on startup.</_description>
+		<_description>Check whether Evolution is the default mail client on startup.</_description>
 		<author name="Jonathan Dieter" email="jdieter99@gmx.net"/>
 
 		<hook class="org.gnome.evolution.shell.events:1.0">
diff --git a/plugins/default-source/org-gnome-default-source.eplug.xml b/plugins/default-source/org-gnome-default-source.eplug.xml
index 92c6fb7078..25bf09dbea 100644
--- a/plugins/default-source/org-gnome-default-source.eplug.xml
+++ b/plugins/default-source/org-gnome-default-source.eplug.xml
@@ -6,7 +6,7 @@
      id="org.gnome.evolution.plugin.default-source"
      _name="Default Sources">
      <author name="Sivaiah Nallagatla" email="snallagatla@novell.com"/>
-     <_description>Provides functionality for marking a calendar or an address book as the default one.</_description>
+     <_description>Mark your preferred address book and calendar as default.</_description>
         <hook class="org.gnome.evolution.calendar.config:1.0">
             <group
 	     target="source"
diff --git a/plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml b/plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml
index 94102ba62a..3eb1f0a5a5 100644
--- a/plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml
+++ b/plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml
@@ -5,7 +5,7 @@
 
 		<author name="Ashish Shrivastava" email="shashish@novell.com"/>
                 <!-- For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added -->
-		<_description>Adds custom header to outgoing messages.</_description>
+		<_description>Add custom headers to outgoing mail messages.</_description>
 
 		<hook class="org.gnome.evolution.ui:1.0">
 			<ui-manager id="org.gnome.evolution.composer">
diff --git a/plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml b/plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml
index 16f4a7b311..381ac94e4c 100644
--- a/plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml
+++ b/plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml
@@ -11,7 +11,7 @@
     <author name="Praveen Kumar" email="kpraveen@novell.com"/>
     <author name="Shakti Sen" email="shprasad@novell.com"/>
     <author name="Raghavendran R" email="raghavguru7@gmail.com"/>	
-    <_description>A plugin that manages a collection of Exchange account specific operations and features.</_description>
+    <_description>Activates the Evolution-Exchange extension package.</_description>
 	
     <hook class="org.gnome.evolution.mail.config:1.0">
       	<group 
diff --git a/plugins/external-editor/org-gnome-external-editor.eplug.xml b/plugins/external-editor/org-gnome-external-editor.eplug.xml
index 3ecab43293..20cbf91487 100644
--- a/plugins/external-editor/org-gnome-external-editor.eplug.xml
+++ b/plugins/external-editor/org-gnome-external-editor.eplug.xml
@@ -5,7 +5,7 @@
 	    id="org.gnome.plugin.external.editor" _name="External Editor">
     <author name="Holger Macht" email="hmacht@suse.de"/>
     <author name="Sankar P" email="sankar2u@gmail.com"/>
-    <_description>A plugin for using an external editor as the composer. You can send only plain-text messages.</_description>
+    <_description>Use an external editor to compose plain-text mail messages.</_description>
 
      <hook class="org.gnome.evolution.ui:1.0">
        <ui-manager id="org.gnome.evolution.composer">
diff --git a/plugins/face/org-gnome-face.eplug.xml b/plugins/face/org-gnome-face.eplug.xml
index e84b93f809..08e30b5948 100644
--- a/plugins/face/org-gnome-face.eplug.xml
+++ b/plugins/face/org-gnome-face.eplug.xml
@@ -3,7 +3,9 @@
   <e-plugin id="org.gnome.evolution.face" type="shlib" _name="Face" location="@PLUGINDIR@/liborg-gnome-face@SOEXT@">
 
     <author name="Sankar P" email="psankar@novell.com"/>
-    <_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>
+    <_description xml:space="preserve">Attach a small picture of your face to outgoing messages.
+
+First time the user needs to configure a 48x48 PNG image. It is Base-64 encoded and stored in ~/.evolution/faces. This will be used in subsequent sent messages.</_description>
 
     <hook class="org.gnome.evolution.ui:1.0">
       <ui-manager id="org.gnome.evolution.composer">
diff --git a/plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml b/plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml
index 44cf7af61f..24271fa8af 100644
--- a/plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml
+++ b/plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml
@@ -6,7 +6,7 @@
 		domain="@GETTEXT_PACKAGE@"
 		_name="Unsubscribe Folders"
 		location="@PLUGINDIR@/liborg-gnome-mail-folder-unsubscribe@SOEXT@">
-		<_description>Allows unsubscribing of mail folders in the side bar context menu.</_description>
+		<_description>Unsubscribe from an IMAP folder by right-clicking on it in the folder tree.</_description>
 		<author name="Jeffrey Stedfast" email="fejj@novell.com"/>
 
 		<hook class="org.gnome.evolution.mail.popup:1.0">
diff --git a/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml b/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml
index 2b32a5010d..42b84d58fa 100644
--- a/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml
+++ b/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <e-plugin-list>
-  <e-plugin id="org.gnome.evolution.google" type="shlib" _name="Google sources"
+  <e-plugin id="org.gnome.evolution.google" type="shlib" _name="Google Calendars"
     location="@PLUGINDIR@/liborg-gnome-evolution-google@SOEXT@" load-on-startup="false" localedir = "@LOCALEDIR@" system_plugin="true">
     <author name="Ebby Wiselyn" email="ebbywiselyn@gmail.com"/>
     <author name="Joergen Scheibengruber" email="joergen.scheibengruber@googlemail.com"/>
-    <_description>A plugin to setup Google Calendar and Contacts.</_description>
+    <_description>Add Google Calendars to Evolution.</_description>
 
     <hook class="org.gnome.evolution.calendar.config:1.0">
       <group target="source" id="org.gnome.evolution.calendar.calendarProperties">
diff --git a/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml b/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml
index d8f52a49f5..16947d89c7 100644
--- a/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml
+++ b/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml
@@ -3,7 +3,7 @@
   <e-plugin id="org.gnome.evolution.plugin.gw-account-setup" type="shlib" _name="GroupWise Account Setup"
     location="@PLUGINDIR@/liborg-gnome-gw-account-setup@SOEXT@" load-on-startup="true" system_plugin="true">
     <author name="Sivaiah Nallagatla" email="snallagatla@novell.com"/>
-    <_description>A plugin to setup GroupWise calendar and contacts sources.</_description>
+    <_description>Add Novell GroupWise support to Evolution.</_description>
     
     <hook class="org.gnome.evolution.mail.config:1.0">
       <group target="account" id="org.gnome.evolution.mail.config.accountDruid">
diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am
index 53b0ab6948..42b68c58ec 100644
--- a/plugins/groupwise-features/Makefile.am
+++ b/plugins/groupwise-features/Makefile.am
@@ -59,7 +59,6 @@ glade_DATA =			\
 
 error_DATA = 				\
 	org-gnome-shared-folder.error	\
-	org-gnome-process-meeting.error	\
 	org-gnome-proxy.error		\
 	org-gnome-proxy-login.error     \
 	org-gnome-mail-retract.error
@@ -73,7 +72,6 @@ EXTRA_DIST =						\
 	org-gnome-compose-send-options.xml		\
 	org-gnome-groupwise-features.eplug.xml		\
 	org-gnome-shared-folder.error.xml		\
-	org-gnome-process-meeting.error.xml		\
 	org-gnome-proxy.error.xml			\
 	org-gnome-proxy-login.error.xml     		\
 	org-gnome-mail-retract.error.xml
diff --git a/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml b/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
index 226872b6a8..8bb6651acf 100644
--- a/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
+++ b/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
@@ -10,7 +10,7 @@
     		<author name="Shreyas Srinivasan" email="sshreyas@novell.com"/>
 		<author name="Raghavendran R" email="raghavguru7@gmail.com"/>
 
-		<_description>A plugin for the features in GroupWise accounts.</_description>
+		<_description>Fine-tune your GroupWise accounts.</_description>
 		<hook class="org.gnome.evolution.mail.config:1.0">
 			<group id="org.gnome.evolution.mail.folderConfig" target="folder"
 				check= "shared_folder_check"
diff --git a/plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml b/plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml
index 24b3467d19..68ae2fe8dd 100644
--- a/plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml
+++ b/plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <e-plugin-list>
-  <e-plugin id="org.gnome.evolution.plugin.hula-account-setup" type="shlib" _name="Hula Account Setup"
+  <e-plugin id="org.gnome.evolution.plugin.hula-account-setup" type="shlib" _name="Hula Support"
     location="@PLUGINDIR@/liborg-gnome-evolution-hula-account-setup@SOEXT@" load-on-startup="true" system_plugin="true">
     <author name="Harish Krishnaswamy" email="kharish@novell.com"/>
-    <_description>A plugin to setup hula calendar sources.</_description>
+    <_description>Add Hula support to Evolution.</_description>
     
     <hook class="org.gnome.evolution.mail.config:1.0">
       <group target="account" id="org.gnome.evolution.mail.config.accountDruid">
diff --git a/plugins/imap-features/org-gnome-imap-features.eplug.xml b/plugins/imap-features/org-gnome-imap-features.eplug.xml
index a5d24f7590..fdbfdc78ef 100644
--- a/plugins/imap-features/org-gnome-imap-features.eplug.xml
+++ b/plugins/imap-features/org-gnome-imap-features.eplug.xml
@@ -4,7 +4,7 @@
 		location="@PLUGINDIR@/liborg-gnome-imap-features@SOEXT@">
 	    	<author name="Sankar P" email="psankar@novell.com"/>
 
-		<_description>A plugin for the features in the IMAP accounts.</_description>
+		<_description>Fine-tune your IMAP accounts.</_description>
 
 		<hook class="org.gnome.evolution.mail.config:1.0">
 			<group id="org.gnome.evolution.mail.config.accountEditor" 
diff --git a/plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml b/plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml
index e95b63b3b9..fdd70064e6 100644
--- a/plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml
+++ b/plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml
@@ -4,7 +4,7 @@
 	_name="iPod Synchronization"
 	    location="@PLUGINDIR@/liborg-gnome-ipod-sync-evolution@SOEXT@"> 
 	    <author name="Srinivasa Ragavan" email="sragavan@novell.com"/>
-	    <_description>Synchronize the selected task/memo/calendar/address book with Apple iPod</_description>
+	    <_description>Synchronize your data with your Apple iPod.</_description>
 	
 		<hook class="org.gnome.evolution.calendar.popup:1.0">
 			<menu id="org.gnome.evolution.tasks.source.popup" target="source">
diff --git a/plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml b/plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml
index 5311f57f0a..233f893c1a 100644
--- a/plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml
+++ b/plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml
@@ -3,7 +3,7 @@
 	<e-plugin id="org.gnome.evolution.itip_formatter" 
 		type="shlib" _name="Itip Formatter"
 		location="@PLUGINDIR@/liborg-gnome-itip-formatter@SOEXT@">
-		<_description>Displays text/calendar parts in messages.</_description>
+		<_description>Display "text/calendar" MIME parts in mail messages.</_description>
 		<author name="JP Rosevear" email="jpr@novell.com"/>
 	
 		<hook class="org.gnome.evolution.mail.format:1.0">
diff --git a/plugins/mail-notification/org-gnome-mail-notification.eplug.xml b/plugins/mail-notification/org-gnome-mail-notification.eplug.xml
index 9cc4530e73..8cc4fd6983 100644
--- a/plugins/mail-notification/org-gnome-mail-notification.eplug.xml
+++ b/plugins/mail-notification/org-gnome-mail-notification.eplug.xml
@@ -5,7 +5,7 @@
 	_name="Mail Notification" 
 	location="@PLUGINDIR@/liborg-gnome-mail-notification@SOEXT@">
 
-		<_description>Generates a D-Bus message or notifies the user with an icon in notification area and a notification message whenever a new message has arrived.</_description>
+		<_description>Notifies you when new mail messages arrive.</_description>
 		<author name="Miguel Angel López Hernández" email="miguel@gulev.org.mx"/>
 		<author name="Srinivasa Ragavan" email="sragavan@novell.com"/>
 
diff --git a/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml b/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
index 74210054d6..65ae2f4a7b 100644
--- a/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
+++ b/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
@@ -4,8 +4,8 @@
     type="shlib"
     id="org.gnome.evolution.plugin.mailToTask"
     location="@PLUGINDIR@/liborg-gnome-mail-to-task@SOEXT@"
-    _name="Mail to task">
-    <_description>A plugin which allows the creation of tasks from the contents of a mail message.</_description>
+    _name="Mail-to-Task">
+    <_description>Convert a mail message to a task.</_description>
     <author name="Rodrigo Moya" email="rodrigo@novell.com"/>
 
     <!-- hook into the uri popup menu -->
diff --git a/plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml b/plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml
index 1149f0f4b9..7b0861c70e 100644
--- a/plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml
+++ b/plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml
@@ -7,7 +7,7 @@
 		location="@PLUGINDIR@/liborg-gnome-mailing-list-actions@SOEXT@"
 		_name="Mailing List Actions">
 	    	<author name="Meilof Veeningen" email="meilof@wanadoo.nl"/>
-		<_description>Provide actions for common mailing list commands (subscribe, unsubscribe...).</_description>
+		<_description>Perform common mailing list actions (subscribe, unsubscribe, etc.).</_description>
 		<hook class="org.gnome.evolution.mail.bonobomenu:1.0">
 			<menu id="org.gnome.evolution.mail.browser" target="select">
 				<ui file="@PLUGINDIR@/org-gnome-mailing-list-actions.xml"/>
diff --git a/plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml b/plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml
index 76c0864fa1..a254e1e4db 100644
--- a/plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml
+++ b/plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml
@@ -6,7 +6,7 @@
         _name="Mark All Read"
         location="@PLUGINDIR@/liborg-gnome-mark-all-read@SOEXT@">
     <author name="Chenthill Palanisamy" email="pchenthill@novell.com"/>
-    <_description>Used for marking all the messages under a folder as read</_description>
+    <_description>Mark all messages in a folder as read.</_description>
 
     <hook class="org.gnome.evolution.ui:1.0">
       <ui-manager id="org.gnome.evolution.mail">
diff --git a/plugins/mono/org-gnome-evolution-mono.eplug.xml b/plugins/mono/org-gnome-evolution-mono.eplug.xml
index 094ccff722..8b7ea0d043 100644
--- a/plugins/mono/org-gnome-evolution-mono.eplug.xml
+++ b/plugins/mono/org-gnome-evolution-mono.eplug.xml
@@ -3,8 +3,7 @@
 	<e-plugin type="shlib" id="org.gnome.evolution.plugin.mono" 
 	location="@PLUGINDIR@/liborg-gnome-evolution-mono@SOEXT@" _name="Mono Loader" load_level="1">
 
-		<_description>A plugin which implements mono plugins.</_description>
-
+		<_description>Support plugins written in Mono.</_description>
 		<author name="Michael Zucchi" email="notzed@ximian.com"/>
 		<author name="Sankar P" email="psankar@novell.com"/>
 
diff --git a/plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml b/plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml
index c931b5c968..da270764a0 100644
--- a/plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml
+++ b/plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml
@@ -7,7 +7,7 @@
     _name="Plugin Manager"
     system_plugin="true">
     <author name="Michael Zucchi" email="notzed@ximian.com"/>
-    <_description>A plugin for managing which plugins are enabled or disabled.</_description>
+    <_description>Manage your Evolution plugins.</_description>
 
     <hook class="org.gnome.evolution.ui:1.0">
       <ui-manager id="org.gnome.evolution.shell">
diff --git a/plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml b/plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml
index 0f80a11ae5..6d0c3ae6ac 100644
--- a/plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml
+++ b/plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml
@@ -4,13 +4,10 @@
     type="shlib"
     id="org.gnome.evolution.plugin.preferPlain"
     location="@PLUGINDIR@/liborg-gnome-prefer-plain@SOEXT@"
-    _name="Prefer plain-text">
+    _name="Prefer Plain Text">
 
 
-    <_description xml:space="preserve">A test plugin which demonstrates a formatter plugin which lets you choose to disable HTML messages.
-
-This plugin is unsupported demonstration code only.
-</_description>
+    <_description>View mail messages as plain text, even if they contain HTML content.</_description>
     <author name="Michael Zucchi" email="NotZed@Ximian.com"/>
 
 
diff --git a/plugins/profiler/org-gnome-evolution-profiler.eplug.xml b/plugins/profiler/org-gnome-evolution-profiler.eplug.xml
index 733b89fc4b..97720132be 100644
--- a/plugins/profiler/org-gnome-evolution-profiler.eplug.xml
+++ b/plugins/profiler/org-gnome-evolution-profiler.eplug.xml
@@ -5,7 +5,7 @@
 	_name="Evolution Profiler" 
 	location="@PLUGINDIR@/liborg-gnome-evolution-profiler@SOEXT@">
 
-		<_description>Writes a log of profiling data events.</_description>
+		<_description>Profile data events in Evolution (for developers only).</_description>
 		<author name="Michael Zucchi" email="notzed@novell.com"/>
 
 		<hook class="org.gnome.evolution.profile.events:1.0">
diff --git a/plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml b/plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml
index 3dfc2e63b6..4923aa1c28 100644
--- a/plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml
+++ b/plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml
@@ -5,7 +5,7 @@
      location="@PLUGINDIR@/liborg-gnome-publish-calendar@SOEXT@"
      id="org.gnome.evolution.calendar.publish"
      _name="Calendar Publishing">
-        <_description>Allows calendars to be published to the web</_description>
+        <_description>Publish calendars to the web.</_description>
 	<author name="David Trowbridge" email="trowbrds@cs.colorado.edu"/>
 	<!-- calendar main menu -->
 	<hook class="org.gnome.evolution.calendar.bonobomenu:1.0">
diff --git a/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml b/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml
index 4277040fa5..3403a3b8aa 100644
--- a/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml
+++ b/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <e-plugin-list>
 	<e-plugin id="org.gnome.evolution.sa_junk_plugin" 
-		type="shlib" _name="SpamAssassin junk plugin"
+		type="shlib" _name="SpamAssassin Junk Filter"
 		location="@PLUGINDIR@/liborg-gnome-sa-junk-plugin@SOEXT@">
-		<_description>Filters junk messages using SpamAssassin. This plugin requires SpamAssassin to be installed.</_description>
+		<_description>Filter junk messages using SpamAssassin.</_description>
 		<author name="Vivek Jain" email="jvivek@novell.com"/>
 		<hook class="org.gnome.evolution.mail.junk:1.0">
 			<group id="EMJunk" >
diff --git a/plugins/save-calendar/org-gnome-save-calendar.eplug.xml b/plugins/save-calendar/org-gnome-save-calendar.eplug.xml
index a548b25245..57138294cf 100644
--- a/plugins/save-calendar/org-gnome-save-calendar.eplug.xml
+++ b/plugins/save-calendar/org-gnome-save-calendar.eplug.xml
@@ -4,7 +4,7 @@
 	_name="Save Selected"
 	    location="@PLUGINDIR@/liborg-gnome-save-calendar@SOEXT@"> 
 	    <author name="Rodrigo Moya" email="rodrigo@novell.com"/>
-		<_description>Saves selected calendar or tasks list to disk.</_description>
+		<_description>Save a calendar or task list to disk.</_description>
 	
 		<hook class="org.gnome.evolution.calendar.popup:1.0">
 			<menu id="org.gnome.evolution.tasks.source.popup" target="source">
diff --git a/plugins/subject-thread/org-gnome-subject-thread.eplug.xml b/plugins/subject-thread/org-gnome-subject-thread.eplug.xml
index a472f0289d..dfc94ec223 100644
--- a/plugins/subject-thread/org-gnome-subject-thread.eplug.xml
+++ b/plugins/subject-thread/org-gnome-subject-thread.eplug.xml
@@ -3,7 +3,7 @@
 	<e-plugin id="org.gnome.evolution.mail_subject_thread" type="shlib" _name="Subject Threading" 
 		location="@PLUGINDIR@/liborg-gnome-subject-thread@SOEXT@">
 		<author name="JP Rosevear" email="jpr@novell.com"/>
-		<_description>Indicates if threading of messages should fall back to subject.</_description>
+		<_description>Sort mail message threads by subject.</_description>
 	
 		<hook class="org.gnome.evolution.mail.config:1.0">
 			<group id="org.gnome.evolution.mail.prefs" target="prefs">
diff --git a/plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml b/plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml
index eca319cf5e..5bfb0e65c0 100644
--- a/plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml
+++ b/plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml
@@ -4,8 +4,8 @@
     type="shlib"
     id="org.gnome.evolution.mail.tnefattachments"
     location="@PLUGINDIR@/liborg-gnome-tnef-attachments@SOEXT@"
-    _name="TNEF Attachment decoder">
-    <_description>A simple plugin which uses yTNEF to decode TNEF attachments.</_description>
+    _name="TNEF Decoder">
+    <_description>Decode TNEF (winmail.dat) attachments from Microsoft Outlook.</_description>
     <author name="Lucky Wankhede" email="wlakke@novell.com"/>
 
     <hook class="org.gnome.evolution.mail.format:1.0">
diff --git a/plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml b/plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml
index 6699a4ae8e..a2130581de 100644
--- a/plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml
+++ b/plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml
@@ -8,7 +8,7 @@
 	          localedir = "@LOCALEDIR@">
 		<author name="Matthias Braun"
 		        email="matze@braunis.de"/>
-		<_description>A plugin to setup WebDAV contacts.</_description>
+		<_description>Add WebDAV contacts to Evolution.</_description>
 
 		<hook class="org.gnome.evolution.addressbook.config:1.0">
 				<group target="source"