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

6 files changed, 62 insertions, 83 deletions

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>