fix names so that intltool will parse as xml

	remove use of e-error-tool
	tag xml for translations where appropriate

svn path=/trunk/; revision=29304

68 files changed, 313 insertions, 242 deletions

diff --git a/plugins/audio-inline/ChangeLog b/plugins/audio-inline/ChangeLog
index 613f9a6378..9af9a3a616 100644
--- a/plugins/audio-inline/ChangeLog
+++ b/plugins/audio-inline/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-06  Not Zed  <NotZed@Ximian.com>
+
+	* Makefile.am: 
+	* org-gnome-audio-inline.eplug.xml: s/.in/.xml/ & i18n.
+
 2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
 
 	* org-gnome-audio-inline.eplug.in: Added a . to the end of description.
diff --git a/plugins/audio-inline/Makefile.am b/plugins/audio-inline/Makefile.am
index e969972b6b..d2049842ce 100644
--- a/plugins/audio-inline/Makefile.am
+++ b/plugins/audio-inline/Makefile.am
@@ -12,4 +12,4 @@ liborg_gnome_audio_inline_la_SOURCES = audio-inline.c
 liborg_gnome_audio_inline_la_LDFLAGS = -module -avoid-version
 liborg_gnome_audio_inline_la_LIBADD = $(GSTREAMER_LIBS)
 
-EXTRA_DIST = org-gnome-audio-inline.eplug.in
\ No newline at end of file
+EXTRA_DIST = org-gnome-audio-inline.eplug.xml
diff --git a/plugins/audio-inline/org-gnome-audio-inline.eplug.in b/plugins/audio-inline/org-gnome-audio-inline.eplug.xml
index b099967537..a667b8f2f5 100644
--- a/plugins/audio-inline/org-gnome-audio-inline.eplug.in
+++ b/plugins/audio-inline/org-gnome-audio-inline.eplug.xml
@@ -4,9 +4,9 @@
     type="shlib"
     id="org.gnome.evolution.plugin.audioInline"
     location="@PLUGINDIR@/liborg-gnome-audio-inline.la"
-    name="Audio inline plugin">
+    _name="Audio inline plugin">
 
-    <description>A formatter plugin which displays audio attachments inline and allows you to play them directly from evolution.</description>
+    <_description>A formatter plugin which displays audio attachments inline and allows you to play them directly from evolution.</_description>
     <author name="Radek Doulík" email="rodo@novell.com"/>
 
     <hook class="org.gnome.evolution.mail.format:1.0">
diff --git a/plugins/backup-restore/ChangeLog b/plugins/backup-restore/ChangeLog
index 5272c7ff40..45d7569a61 100644
--- a/plugins/backup-restore/ChangeLog
+++ b/plugins/backup-restore/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-06  Not Zed  <NotZed@Ximian.com>
+
+	* Makefile.am (plugin_DATA): 
+	* org-gnome-backup-restore.eplug.xml: s/.in/.xml & i18n.
+
 2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
 
 	* org-gnome-backup-restore.eplug.in: Added author and fixed description.
diff --git a/plugins/backup-restore/Makefile.am b/plugins/backup-restore/Makefile.am
index 3627d1c69a..1021691d3c 100644
--- a/plugins/backup-restore/Makefile.am
+++ b/plugins/backup-restore/Makefile.am
@@ -22,5 +22,5 @@ backup_SOURCES = backup.c
 backup_LDADD = $(SHELL_LIBS)
 
 EXTRA_DIST = 					\
-	org-gnome-backup-restore.eplug.in	\
+	org-gnome-backup-restore.eplug.xml	\
 	org-gnome-backup-restore.xml
\ No newline at end of file
diff --git a/plugins/backup-restore/org-gnome-backup-restore.eplug.in b/plugins/backup-restore/org-gnome-backup-restore.eplug.xml
index b9fabc1a26..c6f18b0bc3 100644
--- a/plugins/backup-restore/org-gnome-backup-restore.eplug.in
+++ 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.so"
-    name="Backup and restore plugin">
+    _name="Backup and restore plugin">
     <author name="JP Rosevear" email="jpr@novell.com"/>
-    <description>A plugin for backing up and restore Evolution data and settings.</description>
+    <_description>A plugin for backing up and restore Evolution data and settings.</_description>
 
     <hook class="org.gnome.evolution.shell.bonobomenu:1.0">
 
diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog
index 6fe150d98e..0e81a526e7 100644
--- a/plugins/bbdb/ChangeLog
+++ b/plugins/bbdb/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-06  Not Zed  <NotZed@Ximian.com>
+
+	* Makefile.am: 
+	* org-gnome-evolution-bbdb.eplug.xml: s/.in/.xml/ & i18n.
+
 2005-04-07  Sushma Rai  <rsushma@novell.com>
 
 	* bbdb.c (bbdb_handle_reply): Check for camel_internet_address_get()
diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am
index d57c276b6f..a1dc035054 100644
--- a/plugins/bbdb/Makefile.am
+++ b/plugins/bbdb/Makefile.am
@@ -11,4 +11,4 @@ plugin_LTLIBRARIES = liborg-gnome-evolution-bbdb.la
 liborg_gnome_evolution_bbdb_la_SOURCES = bbdb.c bbdb.h gaimbuddies.c
 liborg_gnome_evolution_bbdb_la_LDFLAGS = -module -avoid-version
 
-EXTRA_DIST = org-gnome-evolution-bbdb.eplug.in
\ No newline at end of file
+EXTRA_DIST = org-gnome-evolution-bbdb.eplug.xml
diff --git a/plugins/bbdb/org-gnome-evolution-bbdb.eplug.in b/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml
index 2c435c9af4..f5b9584631 100644
--- a/plugins/bbdb/org-gnome-evolution-bbdb.eplug.in
+++ b/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml
@@ -2,10 +2,10 @@
 	<e-plugin
 	  type="shlib"
 	  id="org.gnome.evolution.bbdb"
-	  name="Automatic contacts"
+	  _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 mails.  Also fills in IM contact information from your buddy lists.</_description>
 
 		<author name="Nat Friedman" email="nat@novell.com"/>
 
@@ -19,7 +19,7 @@
 
 		<hook class="org.gnome.evolution.mail.config:1.0">
 			<group id="org.gnome.evolution.mail.prefs" target="prefs">
-				<item type="page" path="80.bbdb" label="BBDB" factory="bbdb_page_factory"/>
+				<item type="page" path="80.bbdb" _label="BBDB" factory="bbdb_page_factory"/>
 			</group>
 		</hook>
 
diff --git a/plugins/calendar-file/ChangeLog b/plugins/calendar-file/ChangeLog
index 891ae98555..285567283e 100644
--- a/plugins/calendar-file/ChangeLog
+++ b/plugins/calendar-file/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-06  Not Zed  <NotZed@Ximian.com>
+
+	* Makefile.am: 
+	* org-gnome-calendar-file.eplug.xml: s/.in/.xml/ & i18n.
+
 2005-02-28  Sivaiah Nallagatla <snallagatla@novell.com>
 
 	* calendar-file.c (e_calendar_file_dummy) :
diff --git a/plugins/calendar-file/Makefile.am b/plugins/calendar-file/Makefile.am
index a064042290..021cff80e3 100644
--- a/plugins/calendar-file/Makefile.am
+++ b/plugins/calendar-file/Makefile.am
@@ -13,4 +13,5 @@ plugin_LTLIBRARIES = liborg-gnome-calendar-file.la
 liborg_gnome_calendar_file_la_SOURCES = calendar-file.c
 liborg_gnome_calendar_file_la_LDFLAGS = -module -avoid-version
 
-EXTRA_DIST = org-gnome-calendar-file.eplug.in
+EXTRA_DIST = org-gnome-calendar-file.eplug.xml
+
diff --git a/plugins/calendar-file/org-gnome-calendar-file.eplug.in b/plugins/calendar-file/org-gnome-calendar-file.eplug.xml
index 14f89dccab..a2351c616e 100644
--- a/plugins/calendar-file/org-gnome-calendar-file.eplug.in
+++ b/plugins/calendar-file/org-gnome-calendar-file.eplug.xml
@@ -4,9 +4,9 @@
      type="shlib"
      location="@PLUGINDIR@/liborg-gnome-calendar-file.so"
      id="org.gnome.evolution.calendar.file"
-     name="Local Calendars">
+     _name="Local Calendars">
      <author name="JP Rosevear" email="jpr@novell.com"/>
-     <description>Provides core functionality for local calendars.</description>
+     <_description>Provides core functionality for local calendars.</_description>
         <hook class="org.gnome.evolution.calendar.config:1.0">
             <group
 	     target="source"
diff --git a/plugins/calendar-http/ChangeLog b/plugins/calendar-http/ChangeLog
index 6644f19279..71e99b114b 100644
--- a/plugins/calendar-http/ChangeLog
+++ b/plugins/calendar-http/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-06  Not Zed  <NotZed@Ximian.com>
+
+	* Makefile.am:
+	* org-gnome-calendar-http.eplug.xml: s/.in/.xml/ & i18n.
+
 2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
 
 	* org-gnome-calendar-http.eplug.in: Added author and description.
diff --git a/plugins/calendar-http/Makefile.am b/plugins/calendar-http/Makefile.am
index efe8c01679..e057184775 100644
--- a/plugins/calendar-http/Makefile.am
+++ b/plugins/calendar-http/Makefile.am
@@ -13,4 +13,4 @@ plugin_LTLIBRARIES = liborg-gnome-calendar-http.la
 liborg_gnome_calendar_http_la_SOURCES = calendar-http.c
 liborg_gnome_calendar_http_la_LDFLAGS = -module -avoid-version
 
-EXTRA_DIST = org-gnome-calendar-http.eplug.in
+EXTRA_DIST = org-gnome-calendar-http.eplug.xml
diff --git a/plugins/calendar-http/org-gnome-calendar-http.eplug.in b/plugins/calendar-http/org-gnome-calendar-http.eplug.xml
index a621715eb2..1004397c53 100644
--- a/plugins/calendar-http/org-gnome-calendar-http.eplug.in
+++ b/plugins/calendar-http/org-gnome-calendar-http.eplug.xml
@@ -4,9 +4,9 @@
      type="shlib"
      location="@PLUGINDIR@/liborg-gnome-calendar-http.so"
      id="org.gnome.evolution.calendar.http"
-     name="HTTP Calendars">
+     _name="HTTP Calendars">
      <author name="David Trowbridge" email="David.Trowbridge@Colorado.edu"/>
-     <description>Provides core functionality for webcal and http calendars.</description>
+     <_description>Provides core functionality for webcal and http calendars.</_description>
         <hook class="org.gnome.evolution.calendar.config:1.0">
             <group
 	     target="source"
diff --git a/plugins/calendar-weather/ChangeLog b/plugins/calendar-weather/ChangeLog
index 3b6c2fdc79..aadd81f4ba 100644
--- a/plugins/calendar-weather/ChangeLog
+++ b/plugins/calendar-weather/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-06  Not Zed  <NotZed@Ximian.com>
+
+	* Makefile.am:
+
+	* org-gnome-calendar-weather.eplug.xml: s/.in/.xml/ & i18n.
+
 2005-03-22  David Trowbridge  <trowbrds@cs.colorado.edu>
 
 	* Makefile.am: Use $(weatherdatadir) rather than $(weatherdir), get
diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am
index f538d36314..3ad0ab909e 100644
--- a/plugins/calendar-weather/Makefile.am
+++ b/plugins/calendar-weather/Makefile.am
@@ -27,5 +27,5 @@ liborg_gnome_calendar_weather_la_SOURCES = calendar-weather.c
 liborg_gnome_calendar_weather_la_LDFLAGS = -module -avoid-version
 
 EXTRA_DIST =	\
-	org-gnome-calendar-weather.eplug.in	\
+	org-gnome-calendar-weather.eplug.xml	\
 	$(weatherdata_DATA)
diff --git a/plugins/calendar-weather/org-gnome-calendar-weather.eplug.in b/plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml
index 13a495ad25..1554ce72fc 100644
--- a/plugins/calendar-weather/org-gnome-calendar-weather.eplug.in
+++ b/plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml
@@ -4,8 +4,8 @@
      type="shlib"
      location="@PLUGINDIR@/liborg-gnome-calendar-weather.so"
      id="org.gnome.evolution.calendar.weather"
-     name="Weather Calendars">
-        <description>Provides core functionality for weather calendars.</description>
+     _name="Weather Calendars">
+        <_description>Provides core functionality for weather calendars.</_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/ChangeLog b/plugins/copy-tool/ChangeLog
index 7aa644e2d6..a8dcbc0a6e 100644
--- a/plugins/copy-tool/ChangeLog
+++ b/plugins/copy-tool/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-06  Not Zed  <NotZed@Ximian.com>
+
+	* Makefile.am: 
+	* org-gnome-copy-tool.eplug.xml: s/.in/.xml/ & i18n.
+
 2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
 
 	* org-gnome-copy-tool.eplug.in: Added a . to the end of description.
diff --git a/plugins/copy-tool/Makefile.am b/plugins/copy-tool/Makefile.am
index 73092c3d20..8083f347e7 100644
--- a/plugins/copy-tool/Makefile.am
+++ b/plugins/copy-tool/Makefile.am
@@ -10,4 +10,4 @@ plugin_LTLIBRARIES = liborg-gnome-copy-tool.la
 liborg_gnome_copy_tool_la_SOURCES = copy-tool.c
 liborg_gnome_copy_tool_la_LDFLAGS = -module -avoid-version
 
-EXTRA_DIST = org-gnome-copy-tool.eplug.in
\ No newline at end of file
+EXTRA_DIST = org-gnome-copy-tool.eplug.xml
diff --git a/plugins/copy-tool/org-gnome-copy-tool.eplug.in b/plugins/copy-tool/org-gnome-copy-tool.eplug.xml
index 54afde88a2..9a759277e5 100644
--- a/plugins/copy-tool/org-gnome-copy-tool.eplug.in
+++ 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.so"
-    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>A test plugin which demonstrates a popup menu plugin which lets you copy things to the clipboard.</_description>
     <author name="Michael Zucchi" email="notzed@ximian.com"/>
 
     <!-- hook into the uri popup menu -->
@@ -15,7 +15,7 @@
 	  type="item"
 	  path="80.test"
 	  icon="gtk-copy"
-	  label="Copy _Email Address"
+	  _label="Copy _Email Address"
 	  visible="mailto"
 	  activate="org_gnome_copy_tool_copy_address"/>
       </menu>
diff --git a/plugins/folder-unsubscribe/ChangeLog b/plugins/folder-unsubscribe/ChangeLog
index 5970ecad93..4c09643dfd 100644
--- a/plugins/folder-unsubscribe/ChangeLog
+++ b/plugins/folder-unsubscribe/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-06  Not Zed  <NotZed@Ximian.com>
+
+	* Makefile.am: 
+	* org-gnome-mail-folder-unsubscribe.eplug.xml: s/.in/.xml/ & i18n.
+
 2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
 
 	* org-gnome-mail-folder-unsubscribe.eplug.in: Updated description.
diff --git a/plugins/folder-unsubscribe/Makefile.am b/plugins/folder-unsubscribe/Makefile.am
index ca805d45d9..a01b43d78e 100644
--- a/plugins/folder-unsubscribe/Makefile.am
+++ b/plugins/folder-unsubscribe/Makefile.am
@@ -10,4 +10,4 @@ plugin_LTLIBRARIES = liborg-gnome-mail-folder-unsubscribe.la
 liborg_gnome_mail_folder_unsubscribe_la_SOURCES = folder-unsubscribe.c
 liborg_gnome_mail_folder_unsubscribe_la_LDFLAGS = -module -avoid-version
 
-EXTRA_DIST = org-gnome-mail-folder-unsubscribe.eplug.in
\ No newline at end of file
+EXTRA_DIST = org-gnome-mail-folder-unsubscribe.eplug.xml
diff --git a/plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.in b/plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml
index f77a6ca7dc..25a70760f7 100644
--- a/plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.in
+++ b/plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <e-plugin-list>
   <e-plugin id="org.gnome.mail.folder.unsubscribe" 
-   type="shlib" domain="evolution" name="Unsubscribe Folders"
+   type="shlib" domain="evolution" _name="Unsubscribe Folders"
    location="@PLUGINDIR@/liborg-gnome-mail-folder-unsubscribe.so">
-    <description>Allows unsubscribing of mail folders in the folder tree context menu.</description>
+    <_description>Allows unsubscribing of mail folders in the folder tree context menu.</_description>
     <author name="Jeffrey Stedfast" email="fejj@novell.com"/>
     <hook class="org.gnome.evolution.mail.popup:1.0">
       <menu id="org.gnome.evolution.mail.foldertree.popup" target="folder">
-        <item type="item" path="20.emc.03" label="_Unsubscribe"
+        <item type="item" path="20.emc.03" _label="_Unsubscribe"
          activate="org_gnome_mail_folder_unsubscribe"
          enable="delete" visible="delete"/>
       </menu>
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index 35de67ff8d..0e82acd81c 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-06  Not Zed  <NotZed@Ximian.com>
+
+	* org-gnome-itip-formatter.error.xml: s/-errors.xml/.error.xml/
+
+	* Makefile.am: 
+	* org-gnome-itip-formatter.eplug.xml: s/.in/.xml/ & i18n.
+
 2005-04-08  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #74265
diff --git a/plugins/itip-formatter/Makefile.am b/plugins/itip-formatter/Makefile.am
index def2a59f4a..bd53e2a902 100644
--- a/plugins/itip-formatter/Makefile.am
+++ b/plugins/itip-formatter/Makefile.am
@@ -11,13 +11,13 @@ plugin_LTLIBRARIES = liborg-gnome-itip-formatter.la
 liborg_gnome_itip_formatter_la_SOURCES = itip-formatter.c itip-view.c itip-view.h
 liborg_gnome_itip_formatter_la_LDFLAGS = -module -avoid-version
 
-error_DATA = org-gnome-itip-formatter-errors.xml
-error_i18n = $(error_DATA:.xml=.xml.h)
+error_DATA = org-gnome-itip-formatter.error
 errordir = $(privdatadir)/errors
-%.xml.h: %.xml
-	$(top_builddir)/e-util/e-error-tool $^
 
-BUILT_SOURCES = $(plugin_DATA) $(error_i18n)
+BUILT_SOURCES = $(plugin_DATA) $(error_DATA)
+
+EXTRA_DIST = $(error_DATA) \
+	org-gnome-itip-formatter.eplug.xml \
+	org-gnome-itip-formatter.error.xml
 
-EXTRA_DIST = $(error_DATA) $(error_i18n) org-gnome-itip-formatter.eplug.in
 
diff --git a/plugins/itip-formatter/org-gnome-itip-formatter.eplug.in b/plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml
index 343793f11a..ca18ef2adf 100644
--- a/plugins/itip-formatter/org-gnome-itip-formatter.eplug.in
+++ b/plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <e-plugin-list>
 	<e-plugin id="org.gnome.evolution.itip_formatter" 
-		type="shlib" name="Itip Formatter"
+		type="shlib" _name="Itip Formatter"
 		location="@PLUGINDIR@/liborg-gnome-itip-formatter.so">
-		<description>Displays text/calendar parts in messages.</description>
+		<_description>Displays text/calendar parts in messages.</_description>
 		<author name="JP Rosevear" email="jpr@novell.com"/>
 	
 		<hook class="org.gnome.evolution.mail.format:1.0">
diff --git a/plugins/itip-formatter/org-gnome-itip-formatter-errors.xml b/plugins/itip-formatter/org-gnome-itip-formatter.error.xml
index f8f462a1e8..0dff527a0e 100644
--- a/plugins/itip-formatter/org-gnome-itip-formatter-errors.xml
+++ b/plugins/itip-formatter/org-gnome-itip-formatter.error.xml
@@ -2,7 +2,7 @@
 <error-list domain="org.gnome.itip-formatter">
 
  <error id="add-unknown-attendee" type="question">
-  <primary>This response is not from a current attendee.  Add the sender as an attendee?</primary>
+  <_primary>This response is not from a current attendee.  Add the sender as an attendee?</_primary>
  </error>
 
 </error-list>
diff --git a/plugins/mail-to-meeting/ChangeLog b/plugins/mail-to-meeting/ChangeLog
index b4502dc6bd..94313cd44a 100644
--- a/plugins/mail-to-meeting/ChangeLog
+++ b/plugins/mail-to-meeting/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-06  Not Zed  <NotZed@Ximian.com>
+
+	* Makefile.am: 
+
+	* org-gnome-mail-to-meeting.eplug.xml: s/.in/.xml/ & i18n.
+
 2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
 
 	* org-gnome-mail-to-meeting.eplug.in: Shortened the name and added
diff --git a/plugins/mail-to-meeting/Makefile.am b/plugins/mail-to-meeting/Makefile.am
index 2646d59670..c0ee5f783e 100644
--- a/plugins/mail-to-meeting/Makefile.am
+++ b/plugins/mail-to-meeting/Makefile.am
@@ -10,4 +10,4 @@ plugin_LTLIBRARIES = liborg-gnome-mail-to-meeting.la
 liborg_gnome_mail_to_meeting_la_SOURCES = mail-to-meeting.c
 liborg_gnome_mail_to_meeting_la_LDFLAGS = -module -avoid-version
 
-EXTRA_DIST = org-gnome-mail-to-meeting.eplug.in
\ No newline at end of file
+EXTRA_DIST = org-gnome-mail-to-meeting.eplug.xml
diff --git a/plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.in b/plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml
index e1d78beb5f..c7513ec909 100644
--- a/plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.in
+++ b/plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml
@@ -4,8 +4,8 @@
     type="shlib"
     id="org.gnome.evolution.plugin.mailToMeeting"
     location="@PLUGINDIR@/liborg-gnome-mail-to-meeting.so"
-    name="Mail to meeting">
-    <description>A plugin which allows the creation of meetings from the contents of a mail message.</description>
+    _name="Mail to meeting">
+    <_description>A plugin which allows the creation of meetings from the contents of a mail message.</_description>
     <author name="Rodrigo Moya" email="rodrigo@novell.com"/>
 
     <!-- hook into the uri popup menu -->
@@ -15,7 +15,7 @@
 	  type="item"
 	  path="72.mail_to_meeting"
 	  icon="stock_new-meeting"
-	  label="Con_vert to Meeting"
+	  _label="Con_vert to Meeting"
 	  enable="one"
 	  visible="one"
 	  activate="org_gnome_mail_to_meeting"/>
diff --git a/plugins/mail-to-task/ChangeLog b/plugins/mail-to-task/ChangeLog
index 03f66ec930..3dfdfe0648 100644
--- a/plugins/mail-to-task/ChangeLog
+++ b/plugins/mail-to-task/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-06  Not Zed  <NotZed@Ximian.com>
+
+	* Makefile.am: 
+	* org-gnome-mail-to-task.eplug.xml: s/.in/.xml/ & i18n.
+
 2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
 
 	* org-gnome-mail-to-task.eplug.in: Shortened the name of the
diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am
index 182dcdf59f..bf72450202 100644
--- a/plugins/mail-to-task/Makefile.am
+++ b/plugins/mail-to-task/Makefile.am
@@ -10,4 +10,4 @@ plugin_LTLIBRARIES = liborg-gnome-mail-to-task.la
 liborg_gnome_mail_to_task_la_SOURCES = mail-to-task.c
 liborg_gnome_mail_to_task_la_LDFLAGS = -module -avoid-version
 
-EXTRA_DIST = org-gnome-mail-to-task.eplug.in
\ No newline at end of file
+EXTRA_DIST = org-gnome-mail-to-task.eplug.xml
diff --git a/plugins/mail-to-task/org-gnome-mail-to-task.eplug.in b/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
index cb1d115dfd..e82afd1ecf 100644
--- a/plugins/mail-to-task/org-gnome-mail-to-task.eplug.in
+++ 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.so"
-    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>A plugin which allows the creation of tasks from the contents of a mail message.</_description>
     <author name="Rodrigo Moya" email="rodrigo@novell.com"/>
 
     <!-- hook into the uri popup menu -->
@@ -15,7 +15,7 @@
 	  type="item"
 	  path="71.mail_to_task"
 	  icon="stock_todo"
-	  label="Con_vert to Task"
+	  _label="Con_vert to Task"
 	  enable="one"
 	  visible="one"
 	  activate="org_gnome_mail_to_task"/>
diff --git a/plugins/mailing-list-actions/ChangeLog b/plugins/mailing-list-actions/ChangeLog
index 21b43f3421..3731a7e8b1 100644
--- a/plugins/mailing-list-actions/ChangeLog
+++ b/plugins/mailing-list-actions/ChangeLog
@@ -1,3 +1,11 @@
+2005-05-06  Not Zed  <NotZed@Ximian.com>
+
+	* org-gnome-mailing-list-actions.error.xml:
+	s/-errors.xml/.error.xml/ & i18n tags.
+
+	* Makefile.am:
+	* org-gnome-mailing-list-actions.eplug.xml: s/.in/.xml/, & i18n.
+
 2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
 
 	* org-gnome-mailing-list-actions.eplug.in: Fixed description and
diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am
index 27704c46a5..e245d39f9e 100644
--- a/plugins/mailing-list-actions/Makefile.am
+++ b/plugins/mailing-list-actions/Makefile.am
@@ -10,15 +10,14 @@ plugin_LTLIBRARIES = liborg-gnome-mailing-list-actions.la
 liborg_gnome_mailing_list_actions_la_SOURCES = mailing-list-actions.c
 liborg_gnome_mailing_list_actions_la_LDFLAGS = -module -avoid-version
 
-error_DATA = org-gnome-mailing-list-actions-errors.xml
-error_i18n = $(error_DATA:.xml=.xml.h)
+error_DATA = org-gnome-mailing-list-actions.error
 errordir = $(privdatadir)/errors
-%.xml.h: %.xml
-	$(top_builddir)/e-util/e-error-tool $^
 
-BUILT_SOURCES = $(error_i18n)
+BUILT_SOURCES = \
+	org-gnome-mailing-list-actions.eplug		\
+	org-gnome-mailing-list-actions.error
+
 EXTRA_DIST = 						\
-	$(error_DATA)					\
-	$(error_i18n)					\
-	org-gnome-mailing-list-actions.eplug.in		\
+	org-gnome-mailing-list-actions.eplug.xml	\
+	org-gnome-mailing-list-actions.error.xml	\
 	org-gnome-mailing-list-actions.xml
diff --git a/plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml b/plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml
deleted file mode 100644
index 69b20fa834..0000000000
--- a/plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<error-list domain="org.gnome.mailing-list-actions">
-
- <error id="no-header" type="error">
-  <primary>Action not available</primary>
-  <secondary>This message does not contain the header information required for this action.</secondary>
- </error>
-
- <error id="posting-not-allowed" type="error">
-  <primary>Posting not allowed</primary>
-  <secondary>Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the list owner for details.</secondary>
- </error>
-
- <error id="ask-send-message" type="question" default="GTK_RESPONSE_YES">
-  <primary>Send e-mail message to mailing list?</primary>
-  <secondary>An e-mail message will be sent to the URL "{0}". You can either send the message automatically, or see and change it first.
-
-You should receive an answer from the mailing list shortly after the message has been sent.</secondary>
-  <button label="_Send message" response="GTK_RESPONSE_YES"/>
-  <button label="_Edit message" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
- </error>
-
- <error id="malformed-header" type="error">
-  <primary>Malformed header</primary>
-  <secondary>The {0} header of this message is malformed and could not be processed.
-
-Header: {1}</secondary>
- </error>
-
- <error id="no-action" type="error">
-  <primary>No e-mail action</primary>
-  <secondary>The action could not be performed. This means the header for this action did not contain any action we could handle.
-
-Header: {0}</secondary>
- </error>
-
-</error-list>
diff --git a/plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h b/plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h
deleted file mode 100644
index a5bbbbcc20..0000000000
--- a/plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* org.gnome.mailing-list-actions:no-header primary */
-char *s = N_("Action not available");
-/* org.gnome.mailing-list-actions:no-header secondary */
-char *s = N_("This message does not contain the header information required for this action.");
-/* org.gnome.mailing-list-actions:posting-not-allowed primary */
-char *s = N_("Posting not allowed");
-/* org.gnome.mailing-list-actions:posting-not-allowed secondary */
-char *s = N_("Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the list owner for details.");
-/* org.gnome.mailing-list-actions:ask-send-message primary */
-char *s = N_("Send e-mail message to mailing list?");
-/* org.gnome.mailing-list-actions:ask-send-message secondary */
-char *s = N_("An e-mail message will be sent to the URL \"{0}\". You can either send the message automatically, or see and change it first.\n"
-	"\n"
-	"You should receive an answer from the mailing list shortly after the message has been sent.");
-char *s = N_("_Send message");
-char *s = N_("_Edit message");
-/* org.gnome.mailing-list-actions:malformed-header primary */
-char *s = N_("Malformed header");
-/* org.gnome.mailing-list-actions:malformed-header secondary */
-char *s = N_("The {0} header of this message is malformed and could not be processed.\n"
-	"\n"
-	"Header: {1}");
-/* org.gnome.mailing-list-actions:no-action primary */
-char *s = N_("No e-mail action");
-/* org.gnome.mailing-list-actions:no-action secondary */
-char *s = N_("The action could not be performed. This means the header for this action did not contain any action we could handle.\n"
-	"\n"
-	"Header: {0}");
diff --git a/plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.in b/plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml
index 115e16c528..59fb537f4b 100644
--- a/plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.in
+++ b/plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml
@@ -5,9 +5,9 @@
 		id="org.gnome.plugin.mailing-list.actions"
 		domain="eplug-mailing-list-actions"
 		location="@PLUGINDIR@/liborg-gnome-mailing-list-actions.so"
-		name="Mailing List Actions">
+		_name="Mailing List Actions">
 	    	<author name="Meilof Veeningen" email="meilof@wanadoo.nl"/>
-		<description>Provide actions for common mailing list commands (subscribe, unsubscribe, ...).</description>
+		<_description>Provide actions for common mailing list commands (subscribe, unsubscribe, ...).</_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"/>
@@ -31,13 +31,13 @@
 		<hook class="org.gnome.evolution.mail.popup:1.0">
 			<menu id="org.gnome.mail.folderview.popup.select" target="select">
 				<item type="bar" path="96.list" visible="mailing_list" activate=""/>
-				<item type="submenu" path="96.list.00" visible="mailing_list" activate="" label="Mailing _List"/>
-				<item type="item" verb="ListHelp" path="96.list.00/00.help" label="Get list _usage information" visible="mailing_list" activate="emla_list_help"/>
-				<item type="item" verb="ListSubscribe" path="96.list.00/10.subscribe" label="_Subscribe to list" visible="mailing_list" activate="emla_list_subscribe"/>
-				<item type="item" verb="ListUnsubscribe" path="96.list.00/20.unsubscribe" label="_Un-subscribe to list" visible="mailing_list" activate="emla_list_unsubscribe"/>
-				<item type="item" verb="ListPost" path="96.list.00/30.post" label="_Post message to list" visible="mailing_list" activate="emla_list_post"/>
-				<item type="item" verb="ListOwner" path="96.list.00/40.owner" label="Contact list _owner" visible="mailing_list" activate="emla_list_owner"/>
-				<item type="item" verb="ListArchive" path="96.list.00/50.archive" label="Get list _archive" visible="mailing_list" activate="emla_list_archive"/>
+				<item type="submenu" path="96.list.00" visible="mailing_list" activate="" _label="Mailing _List"/>
+				<item type="item" verb="ListHelp" path="96.list.00/00.help" _label="Get list _usage information" visible="mailing_list" activate="emla_list_help"/>
+				<item type="item" verb="ListSubscribe" path="96.list.00/10.subscribe" _label="_Subscribe to list" visible="mailing_list" activate="emla_list_subscribe"/>
+				<item type="item" verb="ListUnsubscribe" path="96.list.00/20.unsubscribe" _label="_Un-subscribe to list" visible="mailing_list" activate="emla_list_unsubscribe"/>
+				<item type="item" verb="ListPost" path="96.list.00/30.post" _label="_Post message to list" visible="mailing_list" activate="emla_list_post"/>
+				<item type="item" verb="ListOwner" path="96.list.00/40.owner" _label="Contact list _owner" visible="mailing_list" activate="emla_list_owner"/>
+				<item type="item" verb="ListArchive" path="96.list.00/50.archive" _label="Get list _archive" visible="mailing_list" activate="emla_list_archive"/>
 			</menu>
 		</hook>
   	</e-plugin>
diff --git a/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml b/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml
new file mode 100644
index 0000000000..31089a5dcd
--- /dev/null
+++ b/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<error-list domain="org.gnome.mailing-list-actions">
+
+ <error id="no-header" type="error">
+  <_primary>Action not available</_primary>
+  <_secondary>This message does not contain the header information required for this action.</_secondary>
+ </error>
+
+ <error id="posting-not-allowed" type="error">
+  <_primary>Posting not allowed</_primary>
+  <_secondary>Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the list owner for details.</_secondary>
+ </error>
+
+ <error id="ask-send-message" type="question" default="GTK_RESPONSE_YES">
+  <_primary>Send e-mail message to mailing list?</_primary>
+  <_secondary xml:space="preserve">An e-mail message will be sent to the URL "{0}". You can either send the message automatically, or see and change it first.
+
+You should receive an answer from the mailing list shortly after the message has been sent.</_secondary>
+  <button _label="_Send message" response="GTK_RESPONSE_YES"/>
+  <button _label="_Edit message" response="GTK_RESPONSE_NO"/>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+ </error>
+
+ <error id="malformed-header" type="error">
+  <_primary>Malformed header</_primary>
+  <_secondary xml:space="preserve">The {0} header of this message is malformed and could not be processed.
+
+Header: {1}</_secondary>
+ </error>
+
+ <error id="no-action" type="error">
+  <_primary>No e-mail action</_primary>
+  <_secondary xml:space="preserve">The action could not be performed. This means the header for this action did not contain any action we could handle.
+
+Header: {0}</_secondary>
+ </error>
+
+</error-list>
diff --git a/plugins/mark-calendar-offline/ChangeLog b/plugins/mark-calendar-offline/ChangeLog
index 2d79a943a2..75ee16bf23 100644
--- a/plugins/mark-calendar-offline/ChangeLog
+++ b/plugins/mark-calendar-offline/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-06  Not Zed  <NotZed@Ximian.com>
+
+	* Makefile.am: 
+	* org-gnome-mark-calendar-offline.eplug.xml: s/.in/.xml/ & i18n.
+
 2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
 
 	* org-gnome-mark-calendar-offline.eplug.in: Shortened the
diff --git a/plugins/mark-calendar-offline/Makefile.am b/plugins/mark-calendar-offline/Makefile.am
index bdd9fc46f3..907465406b 100644
--- a/plugins/mark-calendar-offline/Makefile.am
+++ b/plugins/mark-calendar-offline/Makefile.am
@@ -10,4 +10,4 @@ plugin_LTLIBRARIES = liborg-gnome-mark-calendar-offline.la
 liborg_gnome_mark_calendar_offline_la_SOURCES = mark-calendar-offline.c
 liborg_gnome_mark_calendar_offline_la_LDFLAGS = -module -avoid-version
 
-EXTRA_DIST = org-gnome-mark-calendar-offline.eplug.in
\ No newline at end of file
+EXTRA_DIST = org-gnome-mark-calendar-offline.eplug.xml
diff --git a/plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.in b/plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml
index 3b3d62f06c..af42a0f575 100644
--- a/plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.in
+++ b/plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0"?>
 <e-plugin-list>
     <e-plugin id="org.gnome.evolution.mark_calendar_offline" type="shlib" 
-	name="Mark calendar offline" 
+	_name="Mark calendar offline" 
 	location="@PLUGINDIR@/liborg-gnome-mark-calendar-offline.so">
 	<author name="Harish Krishnaswamy" email="kharish@novell.com"/>
-       	<description>Marks the selected calendar for offline viewing.</description>
+       	<_description>Marks the selected calendar for offline viewing.</_description>
 
 		<hook class="org.gnome.evolution.calendar.popup:1.0">
 			<menu id="org.gnome.evolution.calendar.source.popup" target="source">
-				<item type="item" path="28.mark_calendar_offline" label="_Mark Calendar for offline use" icon="stock_disconnect"  visible="offline" activate="org_gnome_mark_calendar_offline"/>
+				<item type="item" path="28.mark_calendar_offline" _label="_Mark Calendar for offline use" icon="stock_disconnect"  visible="offline" activate="org_gnome_mark_calendar_offline"/>
 			</menu>
 		</hook>
 		<hook class="org.gnome.evolution.calendar.popup:1.0">
 			<menu id="org.gnome.evolution.calendar.source.popup" target="source">
-				<item type="item" path="28.mark_calendar_no_offline" label="_Do not make this available offline" icon="stock_connect"  visible="no-offline" activate="org_gnome_mark_calendar_no_offline"/>
+				<item type="item" path="28.mark_calendar_no_offline" _label="_Do not make this available offline" icon="stock_connect"  visible="no-offline" activate="org_gnome_mark_calendar_no_offline"/>
 			</menu>
 		</hook>
 	</e-plugin>
diff --git a/plugins/new-mail-notify/ChangeLog b/plugins/new-mail-notify/ChangeLog
index 45d2bcede2..dd8e768577 100644
--- a/plugins/new-mail-notify/ChangeLog
+++ b/plugins/new-mail-notify/ChangeLog
@@ -1,3 +1,24 @@
+2005-05-06  Not Zed  <NotZed@Ximian.com>
+
+	* new-mail-notify.c: make the bus connection global and keep track
+	of the gconf state directly too.
+	(org_gnome_new_mail_config): removed configuration section,
+	implicitly enabled by enabling the plugin now.
+
+2005-04-06  Timo Hoenig  <thoenig@novell.com>
+
+	* new-mail-notify.c (send_dbus_message): added two checks to prevent
+	Evolution to crash if the D-BUS session bus is not running or if
+	D-BUS is not able to allocate memory for the message
+	* new-mail-notify.c (e_plugin_lib_enable): refuse to load the plugin
+	if the address of the D-BUS session bus can not be determined
+	* new-mail-notify.c (e_plugin_lib_enable): new function
+
+2005-05-06  Not Zed  <NotZed@Ximian.com>
+
+	* Makefile.am: 
+	* org-gnome-new-mail-notify.eplug.xml: s/.in/.xml/ & i18n.
+
 2005-03-11  David Malcolm  <dmalcolm@redhat.com>
 
 	* new-mail-notify.c: preprocessor hackery using the value of
diff --git a/plugins/new-mail-notify/Makefile.am b/plugins/new-mail-notify/Makefile.am
index 31c868b1ff..0b217cc260 100644
--- a/plugins/new-mail-notify/Makefile.am
+++ b/plugins/new-mail-notify/Makefile.am
@@ -16,4 +16,5 @@ plugin_LTLIBRARIES = liborg-gnome-new-mail-notify.la
 liborg_gnome_new_mail_notify_la_SOURCES = new-mail-notify.c
 liborg_gnome_new_mail_notify_la_LDFLAGS = -module -avoid-version
 
-EXTRA_DIST = org-gnome-new-mail-notify.eplug.in
+EXTRA_DIST = org-gnome-new-mail-notify.eplug.xml
+
diff --git a/plugins/new-mail-notify/new-mail-notify.c b/plugins/new-mail-notify/new-mail-notify.c
index 230a7fb8b1..872fa80c62 100644
--- a/plugins/new-mail-notify/new-mail-notify.c
+++ b/plugins/new-mail-notify/new-mail-notify.c
@@ -35,7 +35,6 @@
 #include <dbus/dbus-glib-lowlevel.h>
 #include <camel/camel-folder.h>
 
-#define GCONF_KEY "/apps/evolution/mail/notify/gen_dbus_msg"
 #define DBUS_PATH "/org/gnome/evolution/mail/newmail"
 #define DBUS_INTERFACE "org.gnome.evolution.mail.dbus.Signal"
 
@@ -43,95 +42,37 @@ GtkWidget *org_gnome_new_mail_config (EPlugin *ep, EConfigHookItemFactoryData *h
 void org_gnome_new_mail_notify (EPlugin *ep, EMEventTargetFolder *t);
 void org_gnome_message_reading_notify (EPlugin *ep, EMEventTargetMessage *t);
 
-static void
-toggled_cb (GtkWidget *widget, EConfig *config)
-{
-	EMConfigTargetPrefs *target = (EMConfigTargetPrefs *) config->target;
-	
-	/* Save the new setting to gconf */
-	gconf_client_set_bool (target->gconf,
-			       GCONF_KEY,
-			       gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)),
-			       NULL);
-}
-
-GtkWidget *
-org_gnome_new_mail_config (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
-{
-	GtkWidget *notify;
-
-	EMConfigTargetPrefs *target = (EMConfigTargetPrefs *) hook_data->config->target;
-	
-	/* Create the checkbox we will display, complete with mnemonic that is unique in the dialog */
-	notify = gtk_check_button_new_with_mnemonic (_("_Generates a D-BUS message when new mail arrives"));
-
-	/* Set the toggle button to the current gconf setting */
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (notify),
-				      gconf_client_get_bool (target->gconf,
-							     GCONF_KEY, NULL));
-
-	/* Listen for the item being toggled on and off */
-	g_signal_connect (GTK_TOGGLE_BUTTON (notify),
-			  "toggled",
-			  G_CALLBACK (toggled_cb),
-			  hook_data->config);
-	
-	/* Pack the checkbox in the parent widget and show it */
-	gtk_box_pack_start (GTK_BOX (hook_data->parent), notify, FALSE, FALSE, 0);
-	gtk_widget_show (notify);
-	
-	return notify;
-}
+static DBusConnection *bus;
 
 static void
 send_dbus_message (const char *message_name, const char *data)
 {
-	GConfClient *client = gconf_client_get_default ();
+	DBusMessage *message;
 
-	if (gconf_client_get_bool(client, GCONF_KEY, NULL)) {
-		DBusConnection *bus;
-		DBusError error;
-		DBusMessage *message;
+	if (bus == NULL)
+		return;
 
-		/* Get a connection to the session bus */
-		dbus_error_init (&error);
-		bus = dbus_bus_get (DBUS_BUS_SESSION,
-				    &error);
+	/* Create a new message on the DBUS_INTERFACE */
+	message = dbus_message_new_signal (DBUS_PATH,
+					   DBUS_INTERFACE,
+					   message_name);
 
-		if (!bus) {
-			printf ("Failed to connect to the D-BUS daemon: %s\n", error.message);
-			dbus_error_free (&error);
-		}
-
-		/* Set up this connection to work in a GLib event loop  */
-		dbus_connection_setup_with_g_main (bus, NULL);
-
-		/* Create a new message on the DBUS_INTERFACE */
-		message = dbus_message_new_signal (DBUS_PATH,
-						   DBUS_INTERFACE,
-						   message_name);
-
-		/* Appends the data as an argument to the message */
-		dbus_message_append_args (message,
+	/* Appends the data as an argument to the message */
+	dbus_message_append_args (message,
 #if DBUS_VERSION >= 310
-					  DBUS_TYPE_STRING, &data,
+				  DBUS_TYPE_STRING, &data,
 #else
-					  DBUS_TYPE_STRING, data,
-#endif
-					  DBUS_TYPE_INVALID);
-
-		/* Sends the message */
-		dbus_connection_send (bus,
-				      message,
-				      NULL);
+				  DBUS_TYPE_STRING, data,
+#endif	
+				  DBUS_TYPE_INVALID);
 
-		/* Frees the message */
-		dbus_message_unref (message);
+	/* Sends the message */
+	dbus_connection_send (bus,
+			      message,
+			      NULL);
 
-		/* printf("New message [%s] with arg [%s]!\n", message_name, data); */
-	}
-
-	g_object_unref (client);
+	/* Frees the message */
+	dbus_message_unref (message);
 }
 
 void
@@ -145,3 +86,29 @@ org_gnome_new_mail_notify (EPlugin *ep, EMEventTargetFolder *t)
 {
 	send_dbus_message ("Newmail", t->uri);
 }
+
+int
+e_plugin_lib_enable (EPluginLib *ep, int enable)
+{
+	if (enable) {
+		DBusError      error;
+
+		dbus_error_init (&error);
+		bus = dbus_bus_get (DBUS_BUS_SESSION, &error);
+		if (!bus) {
+			g_warning("Failed to connect to the D-BUS daemon: %s\n", error.message);
+
+			/* Could not determine address of the D-BUS session bus */
+			/* Plugin will be disabled */
+			dbus_error_free (&error);
+			return 1;
+		}
+
+		/* Set up this connection to work in a GLib event loop  */
+		dbus_connection_setup_with_g_main (bus, NULL);
+	}
+	/* else unref the bus if set? */
+
+	return 0;
+}
+
diff --git a/plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.in b/plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml
index c759159347..f5fb48eb7f 100644
--- a/plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.in
+++ b/plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml
@@ -2,10 +2,10 @@
 	<e-plugin
 	id="org.gnome.evolution.new_mail_notify" 
 	type="shlib" 
-	name="New Mail Notification" 
+	_name="New Mail Notification" 
 	location="@PLUGINDIR@/liborg-gnome-new-mail-notify.so">
 
-		<description>Generates a D-BUS message when new mail arrives.</description>
+		<_description>Generates a D-BUS message when new mail arrives.</_description>
 		<author name="Miguel Angel López Hernández" email="miguel@gulev.org.mx"/>
 
 		<hook class="org.gnome.evolution.mail.events:1.0">
@@ -25,7 +25,7 @@
 			<group id="org.gnome.evolution.mail.prefs" target="prefs">
 				<item type="item" 
 				path="00.general/30.notify/00.new_mail_notify" 
-				label="New mail notify" 
+				_label="New mail notify" 
 				factory="org_gnome_new_mail_config"/>
 			</group>
 		</hook>
diff --git a/plugins/plugin-manager/ChangeLog b/plugins/plugin-manager/ChangeLog
index 982ce98ed1..29fde25103 100644
--- a/plugins/plugin-manager/ChangeLog
+++ b/plugins/plugin-manager/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-06  Not Zed  <NotZed@Ximian.com>
+
+	* Makefile.am:
+	* org-gnome-plugin-manager.eplug.xml: s/.in/.xml/ & i18n.
+
 2004-11-09  Rodney Dawes  <dobey@novell.com>
 
 	* Makefile.am: Add the xml file to EXTRA_DIST
diff --git a/plugins/plugin-manager/Makefile.am b/plugins/plugin-manager/Makefile.am
index 3056e036c9..a287e25253 100644
--- a/plugins/plugin-manager/Makefile.am
+++ b/plugins/plugin-manager/Makefile.am
@@ -11,5 +11,5 @@ liborg_gnome_plugin_manager_la_SOURCES = plugin-manager.c
 liborg_gnome_plugin_manager_la_LDFLAGS = -module -avoid-version
 
 EXTRA_DIST =						\
-	org-gnome-plugin-manager.eplug.in		\
+	org-gnome-plugin-manager.eplug.xml
 	org-gnome-plugin-manager.xml
diff --git a/plugins/plugin-manager/org-gnome-plugin-manager.eplug.in b/plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml
index 6bdbcd74e5..f255d95ab0 100644
--- a/plugins/plugin-manager/org-gnome-plugin-manager.eplug.in
+++ b/plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml
@@ -4,8 +4,8 @@
     type="shlib"
     id="org.gnome.evolution.plugin.manager"
     location="@PLUGINDIR@/liborg-gnome-plugin-manager.so"
-    name="Plugin manager">
-    <description>A plugin for managing which plugins are enabled or disabled.</description>
+    _name="Plugin manager">
+    <_description>A plugin for managing which plugins are enabled or disabled.</_description>
     <author name="Michael Zucchi" email="notzed@ximian.com"/>
     <hook class="org.gnome.evolution.shell.bonobomenu:1.0">
       <menu id="org.gnome.evolution.shell" target="shell">
diff --git a/plugins/prefer-plain/ChangeLog b/plugins/prefer-plain/ChangeLog
index b7788a02d1..f6fd3469a8 100644
--- a/plugins/prefer-plain/ChangeLog
+++ b/plugins/prefer-plain/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-06  Not Zed  <NotZed@Ximian.com>
+
+	* Makefile.am: 
+	* org-gnome-prefer-plain.eplug.xml: s/.in/.xml/, fix i18n tags.
+
 2005-02-13  Björn Torkelsson  <torkel@acc.umu.se>
 
 	* org-gnome-prefer-plain.eplug.in: Added author and moved the
diff --git a/plugins/prefer-plain/Makefile.am b/plugins/prefer-plain/Makefile.am
index 2ff15c7f7a..9646ecf027 100644
--- a/plugins/prefer-plain/Makefile.am
+++ b/plugins/prefer-plain/Makefile.am
@@ -10,4 +10,4 @@ plugin_LTLIBRARIES = liborg-gnome-prefer-plain.la
 liborg_gnome_prefer_plain_la_SOURCES = prefer-plain.c
 liborg_gnome_prefer_plain_la_LDFLAGS = -module -avoid-version
 
-EXTRA_DIST = org-gnome-prefer-plain.eplug.in
\ No newline at end of file
+EXTRA_DIST = org-gnome-prefer-plain.eplug.xml
diff --git a/plugins/prefer-plain/org-gnome-prefer-plain.eplug.in b/plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml
index 0e498e9559..3d426e592f 100644
--- a/plugins/prefer-plain/org-gnome-prefer-plain.eplug.in
+++ b/plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml
@@ -4,11 +4,11 @@
     type="shlib"
     id="org.gnome.evolution.plugin.preferPlain"
     location="@PLUGINDIR@/liborg-gnome-prefer-plain.so"
-    name="Prefer plain-text">
+    _name="Prefer plain-text">
 
 
-    <description>A test plugin which demonstrates a formatter plugin
-    which lets you choose to disable HTML mails.</description>
+    <_description>A test plugin which demonstrates a formatter plugin
+    which lets you choose to disable HTML mails.</_description>
     <author name="Michael Zucchi" email="NotZed@Ximian.com"/>
 
 
@@ -17,7 +17,7 @@
       <group target="prefs" id="org.gnome.evolution.mail.prefs">
 	<!-- we could also just insert our own items from a section factory, -->
 	<!-- but then we also need to create our own section frame -->
-	<item type="section_table" path="10.html/80.mode" label="Plain Text Mode"/>
+	<item type="section_table" path="10.html/80.mode" _label="Plain Text Mode"/>
 	<item type="item_table" path="10.html/80.mode/00.mode" factory="org_gnome_prefer_plain_config_mode"/>
       </group>
     </hook>
diff --git a/plugins/save-attachments/ChangeLog b/plugins/save-attachments/ChangeLog
index 9312f4ab9e..3beca67ea0 100644
--- a/plugins/save-attachments/ChangeLog
+++ b/plugins/save-attachments/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-06  Not Zed  <NotZed@Ximian.com>
+
+	* Makefile.am: 
+	* org-gnome-save-attachments.eplug.xml: s/.in/.xml/ & i18n.
+
 2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
 
 	* org-gnome-save-attachments.eplug.in: Removed plugin from the
diff --git a/plugins/save-attachments/Makefile.am b/plugins/save-attachments/Makefile.am
index ec09b11e2c..35621ffc8f 100644
--- a/plugins/save-attachments/Makefile.am
+++ b/plugins/save-attachments/Makefile.am
@@ -11,5 +11,5 @@ liborg_gnome_save_attachments_la_SOURCES = save-attachments.c
 liborg_gnome_save_attachments_la_LDFLAGS = -module -avoid-version
 
 EXTRA_DIST = 					\
-	org-gnome-save-attachments.eplug.in	\
+	org-gnome-save-attachments.eplug.xml	\
 	org-gnome-save-attachments.xml
\ No newline at end of file
diff --git a/plugins/save-attachments/org-gnome-save-attachments.eplug.in b/plugins/save-attachments/org-gnome-save-attachments.eplug.xml
index f09441b2c8..0f63421334 100644
--- a/plugins/save-attachments/org-gnome-save-attachments.eplug.in
+++ b/plugins/save-attachments/org-gnome-save-attachments.eplug.xml
@@ -5,10 +5,10 @@
     id="org.gnome.plugin.attachments.save"
     type="shlib"
     location="@PLUGINDIR@/liborg-gnome-save-attachments.so"
-    name="Save attachments">
+    _name="Save attachments">
     
     <author name="Not Zed" email="NotZed@Ximian.com"/>
-    <description>A plugin for saving all attachments or parts of a message at once.</description>
+    <_description>A plugin for saving all attachments or parts of a message at once.</_description>
 
     <hook class="org.gnome.evolution.mail.bonobomenu:1.0">
       <menu id="org.gnome.evolution.mail.browser" target="select">
diff --git a/plugins/save-calendar/ChangeLog b/plugins/save-calendar/ChangeLog
index eec40e6b7e..d627f5072a 100644
--- a/plugins/save-calendar/ChangeLog
+++ b/plugins/save-calendar/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-06  Not Zed  <NotZed@Ximian.com>
+
+	* Makefile.am: 
+	* org-gnome-save-calendar.eplug.xml: s/.in/.xml/ & fix i18n.
+
 2005-03-22  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #73541
diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am
index 5470974673..720c586e94 100644
--- a/plugins/save-calendar/Makefile.am
+++ b/plugins/save-calendar/Makefile.am
@@ -16,4 +16,5 @@ liborg_gnome_save_calendar_la_SOURCES = \
 
 liborg_gnome_save_calendar_la_LDFLAGS = -module -avoid-version
 
-EXTRA_DIST = org-gnome-save-calendar.eplug.in
+EXTRA_DIST = org-gnome-save-calendar.eplug.xml
+
diff --git a/plugins/save-calendar/org-gnome-save-calendar.eplug.in b/plugins/save-calendar/org-gnome-save-calendar.eplug.xml
index dc3e103e36..b7aabca997 100644
--- a/plugins/save-calendar/org-gnome-save-calendar.eplug.in
+++ b/plugins/save-calendar/org-gnome-save-calendar.eplug.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0"?>
 <e-plugin-list>
     <e-plugin id="org.gnome.evolution.save_calendar" type="shlib" 
-	name="Save Selected"
+	_name="Save Selected"
 	    location="@PLUGINDIR@/liborg-gnome-save-calendar.so"> 
 	    <author name="Rodrigo Moya" email="rodrigo@novell.com"/>
-		<description>Saves selected calendar or tasks list to disk.</description>
+		<_description>Saves selected calendar or tasks list to disk.</_description>
 	
 		<hook class="org.gnome.evolution.calendar.popup:1.0">
 			<menu id="org.gnome.evolution.tasks.source.popup" target="source">
-				<item type="item" path="19.save_tasks" label="Save to _Disk" icon="stock_save" activate="org_gnome_save_tasks"/>
+				<item type="item" path="19.save_tasks" _label="Save to _Disk" icon="stock_save" activate="org_gnome_save_tasks"/>
 			</menu>
 			<menu id="org.gnome.evolution.calendar.source.popup" target="source">
-				<item type="item" path="19.save_calendar" label="Save to _Disk" icon="stock_save" activate="org_gnome_save_calendar"/>
+				<item type="item" path="19.save_calendar" _label="Save to _Disk" icon="stock_save" activate="org_gnome_save_calendar"/>
 			</menu>
 		</hook>
 	</e-plugin>
diff --git a/plugins/select-one-source/ChangeLog b/plugins/select-one-source/ChangeLog
index dbbf37175e..147c75650c 100644
--- a/plugins/select-one-source/ChangeLog
+++ b/plugins/select-one-source/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-06  Not Zed  <NotZed@Ximian.com>
+
+	* Makefile.am: 
+	* org-gnome-select-one-source.eplug.xml: s/.in/.xml/ & i18n.
+
 2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
 
 	* org-gnome-select-one-source.eplug.in: Fixed description and
diff --git a/plugins/select-one-source/Makefile.am b/plugins/select-one-source/Makefile.am
index 6b5b178e8d..e329a9efb5 100644
--- a/plugins/select-one-source/Makefile.am
+++ b/plugins/select-one-source/Makefile.am
@@ -10,4 +10,4 @@ plugin_LTLIBRARIES = liborg-gnome-select-one-source.la
 liborg_gnome_select_one_source_la_SOURCES = select-one-source.c
 liborg_gnome_select_one_source_la_LDFLAGS = -module -avoid-version
 
-EXTRA_DIST = org-gnome-select-one-source.eplug.in
\ No newline at end of file
+EXTRA_DIST = org-gnome-select-one-source.eplug.xml
diff --git a/plugins/select-one-source/org-gnome-select-one-source.eplug.in b/plugins/select-one-source/org-gnome-select-one-source.eplug.xml
index 113e16303b..53f0ebe6c1 100644
--- a/plugins/select-one-source/org-gnome-select-one-source.eplug.in
+++ b/plugins/select-one-source/org-gnome-select-one-source.eplug.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0"?>
 <e-plugin-list>
     <e-plugin id="org.gnome.evolution.select_one_source" type="shlib" 
-	name="Select one source" 
+	_name="Select one source" 
 		location="@PLUGINDIR@/liborg-gnome-select-one-source.so">
 		<author name="JP Rosevear" email="jpr@novell.com"/>
-	       	<description>Selects a single calendar or task source for viewing.</description>
+	       	<_description>Selects a single calendar or task source for viewing.</_description>
 	
 		<hook class="org.gnome.evolution.calendar.popup:1.0">
 			<menu id="org.gnome.evolution.tasks.source.popup" target="source">
-				<item type="item" path="25.select_one_source" label="_Show only this Task List" icon="stock_check-filled" activate="org_gnome_select_one_source"/>
+				<item type="item" path="25.select_one_source" _label="_Show only this Task List" icon="stock_check-filled" activate="org_gnome_select_one_source"/>
 			</menu>
 			<menu id="org.gnome.evolution.calendar.source.popup" target="source">
-				<item type="item" path="25.select_one_source" label="_Show only this Calendar" icon="stock_check-filled" activate="org_gnome_select_one_source"/>
+				<item type="item" path="25.select_one_source" _label="_Show only this Calendar" icon="stock_check-filled" activate="org_gnome_select_one_source"/>
 			</menu>
 		</hook>
 	</e-plugin>
diff --git a/plugins/startup-wizard/ChangeLog b/plugins/startup-wizard/ChangeLog
index 4123655dfd..e39396de8d 100644
--- a/plugins/startup-wizard/ChangeLog
+++ b/plugins/startup-wizard/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-06  Not Zed  <NotZed@Ximian.com>
+
+	* Makefile.am: 
+	* org-gnome-evolution-startup-wizard.eplug.xml: s/.in/.xml/ & i18n.
+
 2005-02-21  JP Rosevear  <jpr@novell.com>
 
 	* startup-wizard.c: A plugin the does the startup wizard
diff --git a/plugins/startup-wizard/Makefile.am b/plugins/startup-wizard/Makefile.am
index 0bc25089bd..e8ecfad73d 100644
--- a/plugins/startup-wizard/Makefile.am
+++ b/plugins/startup-wizard/Makefile.am
@@ -17,4 +17,5 @@ liborg_gnome_evolution_startup_wizard_la_LIBADD = 		\
 
 liborg_gnome_evolution_startup_wizard_la_LDFLAGS = -module -avoid-version
 
-EXTRA_DIST = org-gnome-evolution-startup-wizard.eplug.in
+EXTRA_DIST = org-gnome-evolution-startup-wizard.eplug.xml
+
diff --git a/plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.in b/plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml
index 7f736de6d6..65258ad4ee 100644
--- a/plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.in
+++ b/plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml
@@ -4,7 +4,7 @@
 	    type="shlib"
 	    id="org.gnome.evolution.plugin.startup-wizard"
 	    location="@PLUGINDIR@/liborg-gnome-evolution-startup-wizard.so"
-	    name="Startup wizard">
+	    _name="Startup wizard">
 
 		<hook class="org.gnome.evolution.shell.events:1.0">
 			<event
diff --git a/plugins/subject-thread/ChangeLog b/plugins/subject-thread/ChangeLog
index 5e4fb051df..11a3ba6ff2 100644
--- a/plugins/subject-thread/ChangeLog
+++ b/plugins/subject-thread/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-06  Not Zed  <NotZed@Ximian.com>
+
+	* Makefile.am: 
+
+	* org-gnome-subject-thread.eplug.xml: s/.in/.xml/ & i18n.
+
 2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
 
 	* org-gnome-subject-thread.eplug.in: Added xml tag. 
diff --git a/plugins/subject-thread/Makefile.am b/plugins/subject-thread/Makefile.am
index 2e692b41dc..9ac3129b3a 100644
--- a/plugins/subject-thread/Makefile.am
+++ b/plugins/subject-thread/Makefile.am
@@ -10,4 +10,4 @@ plugin_LTLIBRARIES = liborg-gnome-subject-thread.la
 liborg_gnome_subject_thread_la_SOURCES = subject-thread.c
 liborg_gnome_subject_thread_la_LDFLAGS = -module -avoid-version
 
-EXTRA_DIST = org-gnome-subject-thread.eplug.in
\ No newline at end of file
+EXTRA_DIST = org-gnome-subject-thread.eplug.xml
diff --git a/plugins/subject-thread/org-gnome-subject-thread.eplug.in b/plugins/subject-thread/org-gnome-subject-thread.eplug.xml
index 244aa6ab53..87132bbf8c 100644
--- a/plugins/subject-thread/org-gnome-subject-thread.eplug.in
+++ b/plugins/subject-thread/org-gnome-subject-thread.eplug.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <e-plugin-list>
-	<e-plugin id="org.gnome.evolution.mail_subject_thread" type="shlib" name="Subject Threading" 
+	<e-plugin id="org.gnome.evolution.mail_subject_thread" type="shlib" _name="Subject Threading" 
 		location="@PLUGINDIR@/liborg-gnome-subject-thread.so">
 		<author name="JP Rosevear" email="jpr@novell.com"/>
-		<description>Indicates if threading of messages should fall back to subject.</description>
+		<_description>Indicates if threading of messages should fall back to subject.</_description>
 	
 		<hook class="org.gnome.evolution.mail.config:1.0">
 			<group id="org.gnome.evolution.mail.prefs" target="prefs">
-				<item type="item" path="00.general/10.display/80.subject_thread" label="Thread messages by subject" factory="org_gnome_subject_thread_factory"/>
+				<item type="item" path="00.general/10.display/80.subject_thread" _label="Thread messages by subject" factory="org_gnome_subject_thread_factory"/>
 			</group>
 		</hook>
 	</e-plugin>