renamed from mail-errors.xml, add i18n tags, fix some whitespace issues.

2005-05-06  Not Zed  <NotZed@Ximian.com>

        * mail.error.xml: renamed from mail-errors.xml, add i18n tags, fix
        some whitespace issues.  Removed some unecessary translations.

svn path=/trunk/; revision=29307

5 files changed, 83 insertions, 135 deletions

diff --git a/composer/ChangeLog b/composer/ChangeLog
index 9a75beaea5..13761dd241 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-06  Not Zed  <NotZed@Ximian.com>
+
+	* mail.error.xml: renamed from mail-errors.xml, add i18n tags, fix
+	some whitespace issues.  Removed some unecessary translations.
+
 2005-05-05  Radek Doulik  <rodo@site>
 
 	* e-msg-composer.c (e_msg_composer_ignore): removed old unused
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 4d536dc95e..ffef638b7d 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -27,11 +27,11 @@ $(HTML_EDITOR_GENERATED): $(GTKHTML_DATADIR)/Editor.idl
 
 ##
 
-error_DATA = mail-composer-errors.xml
-error_i18n = $(error_DATA:.xml=.xml.h)
+error_DATA = mail-composer.error
 errordir = $(privdatadir)/errors
-%.xml.h: %.xml
-	$(top_builddir)/e-util/e-error-tool $^
+
+# provides error rule
+@EVO_PLUGIN_RULE@
 
 idl_DATA = $(IDLS)
 
@@ -80,13 +80,12 @@ libcomposer_la_SOURCES = 			\
 	listener.h
 
 EXTRA_DIST =					\
-	$(error_DATA)				\
-	$(error_i18n)				\
+	mail-composer.error.xml			\
 	$(glade_DATA)				\
 	$(IDLS)					\
 	ChangeLog.pre-1-4
 
-BUILT_SOURCES = $(IDL_GENERATED) $(HTML_EDITOR_GENERATED) $(error_i18n)
+BUILT_SOURCES = $(IDL_GENERATED) $(HTML_EDITOR_GENERATED) $(error_DATA)
 CLEANFILES = $(BUILT_SOURCES)
 
 dist-hook:
diff --git a/composer/mail-composer-errors.xml b/composer/mail-composer-errors.xml
deleted file mode 100644
index 25018074dd..0000000000
--- a/composer/mail-composer-errors.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<error-list domain="mail-composer">
-
- <error id="no-attach" type="error" modal="true">
-  <primary>You cannot attach the file `{0}' to this message.</primary>
-  <secondary>{1}</secondary>
- </error>
-
- <error id="attach-notfile" type="warning">
-  <primary>The file `{0}' is not a regular file and cannot be sent in a message.</primary>
- </error>
-
- <error id="attach-directory">
-  <primary>Directories can not be attached to Messages.</primary>
-  <secondary>To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it.</secondary>
- </error>
-
- <error id="attach-nomessages" type="error">
-  <primary>Could not retrieve messages to attach from {0}.</primary>
-  <secondary>Because &quot;{1}&quot;.</secondary>
- </error>
-
- <error id="recover-autosave" type="question" default="GTK_RESPONSE_YES">
-  <title>Unfinished messages found</title>
-  <primary>Do you want to recover unfinished messages?</primary>
-  <secondary>Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off.</secondary>
-  <button label="Don't Recover" response="GTK_RESPONSE_CANCEL"/>
-  <button label="Recover" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="no-autosave" type="error">
-  <primary>Could not save to autosave file &quot;{0}&quot;.</primary>
-  <secondary>Error saving to autosave because &quot;{1}&quot;.</secondary>
- </error>
-
- <error id="exit-unsaved" modal="true" type="warning" default="GTK_RESPONSE_YES">
-  <title>Warning: Modified Message</title>
-  <primary>Are you sure you want to discard the message, titled '{0}', you are composing?</primary>
-  <secondary>Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date.</secondary>
-  <button label="_Discard Changes" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button label="_Save Message" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="no-build-message" type="error" modal="true">
-  <primary>Could not create message.</primary>
-  <secondary>Because &quot;{0}&quot;, you may need to select different mail options.</secondary>
- </error>
-
- <error id="no-sig-file" type="warning" modal="true">
-  <primary>Could not read signature file &quot;{0}&quot;.</primary>
-  <secondary>Because &quot;{1}&quot;.</secondary>
- </error>
-
- <error id="all-accounts-deleted" type="warning" modal="true">
-  <primary>All accounts have been removed.</primary>
-  <secondary>You need to configure an account before you can compose mail.</secondary>
- </error>
-
- <error id="no-address-control" type="error" modal="true">
-  <primary>Could not create composer window.</primary>
-  <secondary>Unable to activate the address selector control.</secondary>
- </error>
-
- <error id="no-editor-control" type="error" modal="true">
-  <primary>Could not create composer window.</primary>
-  <secondary>Unable to activate the HTML editor control.
-
-Please make sure that you have the correct version of gtkhtml and libgtkhtml installed.</secondary>
- </error>
-
-</error-list>
diff --git a/composer/mail-composer-errors.xml.h b/composer/mail-composer-errors.xml.h
deleted file mode 100644
index 30f0005258..0000000000
--- a/composer/mail-composer-errors.xml.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* mail-composer:no-attach primary */
-char *s = N_("You cannot attach the file `{0}' to this message.");
-/* mail-composer:no-attach secondary */
-char *s = N_("{1}");
-/* mail-composer:attach-notfile primary */
-char *s = N_("The file `{0}' is not a regular file and cannot be sent in a message.");
-/* mail-composer:attach-directory primary */
-char *s = N_("Directories can not be attached to Messages.");
-/* mail-composer:attach-directory secondary */
-char *s = N_("To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it.");
-/* mail-composer:attach-nomessages primary */
-char *s = N_("Could not retrieve messages to attach from {0}.");
-/* mail-composer:attach-nomessages secondary */
-char *s = N_("Because \"{1}\".");
-/* mail-composer:recover-autosave title */
-char *s = N_("Unfinished messages found");
-/* mail-composer:recover-autosave primary */
-char *s = N_("Do you want to recover unfinished messages?");
-/* mail-composer:recover-autosave secondary */
-char *s = N_("Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off.");
-char *s = N_("Don't Recover");
-char *s = N_("Recover");
-/* mail-composer:no-autosave primary */
-char *s = N_("Could not save to autosave file \"{0}\".");
-/* mail-composer:no-autosave secondary */
-char *s = N_("Error saving to autosave because \"{1}\".");
-/* mail-composer:exit-unsaved title */
-char *s = N_("Warning: Modified Message");
-/* mail-composer:exit-unsaved primary */
-char *s = N_("Are you sure you want to discard the message, titled '{0}', you are composing?");
-/* mail-composer:exit-unsaved secondary */
-char *s = N_("Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date.");
-char *s = N_("_Discard Changes");
-char *s = N_("_Save Message");
-/* mail-composer:no-build-message primary */
-char *s = N_("Could not create message.");
-/* mail-composer:no-build-message secondary */
-char *s = N_("Because \"{0}\", you may need to select different mail options.");
-/* mail-composer:no-sig-file primary */
-char *s = N_("Could not read signature file \"{0}\".");
-/* mail-composer:no-sig-file secondary */
-char *s = N_("Because \"{1}\".");
-/* mail-composer:all-accounts-deleted primary */
-char *s = N_("All accounts have been removed.");
-/* mail-composer:all-accounts-deleted secondary */
-char *s = N_("You need to configure an account before you can compose mail.");
-/* mail-composer:no-address-control primary */
-char *s = N_("Could not create composer window.");
-/* mail-composer:no-address-control secondary */
-char *s = N_("Unable to activate the address selector control.");
-/* mail-composer:no-editor-control primary */
-char *s = N_("Could not create composer window.");
-/* mail-composer:no-editor-control secondary */
-char *s = N_("Unable to activate the HTML editor control.\n"
-	"\n"
-	"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed.");
diff --git a/composer/mail-composer.error.xml b/composer/mail-composer.error.xml
new file mode 100644
index 0000000000..aa00c122e7
--- /dev/null
+++ b/composer/mail-composer.error.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<error-list domain="mail-composer">
+
+ <error id="no-attach" type="error" modal="true">
+  <_primary>You cannot attach the file `{0}' to this message.</_primary>
+  <secondary>{1}</secondary>
+ </error>
+
+ <error id="attach-notfile" type="warning">
+  <_primary>The file `{0}' is not a regular file and cannot be sent in a message.</_primary>
+ </error>
+
+ <error id="attach-directory">
+  <_primary>Directories can not be attached to Messages.</_primary>
+  <_secondary>To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it.</_secondary>
+ </error>
+
+ <error id="attach-nomessages" type="error">
+  <_primary>Could not retrieve messages to attach from {0}.</_primary>
+  <_secondary>Because &quot;{1}&quot;.</_secondary>
+ </error>
+
+ <error id="recover-autosave" type="question" default="GTK_RESPONSE_YES">
+  <_title>Unfinished messages found</_title>
+  <_primary>Do you want to recover unfinished messages?</_primary>
+  <_secondary>Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off.</_secondary>
+  <button _label="Don't Recover" response="GTK_RESPONSE_CANCEL"/>
+  <button _label="Recover" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="no-autosave" type="error">
+  <_primary>Could not save to autosave file &quot;{0}&quot;.</_primary>
+  <_secondary>Error saving to autosave because &quot;{1}&quot;.</_secondary>
+ </error>
+
+ <error id="exit-unsaved" modal="true" type="warning" default="GTK_RESPONSE_YES">
+  <_title>Warning: Modified Message</_title>
+  <_primary>Are you sure you want to discard the message, titled '{0}', you are composing?</_primary>
+  <_secondary>Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date.</_secondary>
+  <button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+  <button _label="_Save Message" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="no-build-message" type="error" modal="true">
+  <_primary>Could not create message.</_primary>
+  <_secondary>Because &quot;{0}&quot;, you may need to select different mail options.</_secondary>
+ </error>
+
+ <error id="no-sig-file" type="warning" modal="true">
+  <_primary>Could not read signature file &quot;{0}&quot;.</_primary>
+  <_secondary>Because &quot;{1}&quot;.</_secondary>
+ </error>
+
+ <error id="all-accounts-deleted" type="warning" modal="true">
+  <_primary>All accounts have been removed.</_primary>
+  <_secondary>You need to configure an account before you can compose mail.</_secondary>
+ </error>
+
+ <error id="no-address-control" type="error" modal="true">
+  <_primary>Could not create composer window.</_primary>
+  <_secondary>Unable to activate the address selector control.</_secondary>
+ </error>
+
+ <error id="no-editor-control" type="error" modal="true">
+  <_primary>Could not create composer window.</_primary>
+  <_secondary xml:space="preserve">Unable to activate the HTML editor control.
+
+Please make sure that you have the correct version of gtkhtml and libgtkhtml installed.</_secondary>
+ </error>
+
+</error-list>