add for translators.

2004-05-12  Not Zed  <NotZed@Ximian.com>

        * mail-composer-errors.xml.h: add for translators.

        * mail-composer-errors.xml: renamed from xml.in file.

        * Makefile.am: Fix for i18n build stuff.

svn path=/trunk/; revision=25866

5 files changed, 112 insertions, 60 deletions

diff --git a/composer/ChangeLog b/composer/ChangeLog
index 5cb0cd874d..818c7aa847 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,11 @@
+2004-05-12  Not Zed  <NotZed@Ximian.com>
+
+	* mail-composer-errors.xml.h: add for translators.
+
+	* mail-composer-errors.xml: renamed from xml.in file.
+
+	* Makefile.am: Fix for i18n build stuff.
+
 2004-05-11  Jeffrey Stedfast  <fejj@novell.com>
 
 	* e-msg-composer.c (build_message): Use CAMEL_EXCEPTION_SYSTEM
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 17d918f3ac..aee419abf9 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -29,10 +29,11 @@ $(HTML_EDITOR_GENERATED): $(GTKHTML_DATADIR)/Editor.idl
 
 ##
 
-error_in_files = mail-composer-errors.xml.in
-error_DATA = $(error_in_files:.xml.in=.xml)
+error_DATA = mail-composer-errors.xml
+error_i18n = $(error_DATA:.xml=.xml.h)
 errordir = $(privdatadir)/errors
-@INTLTOOL_XML_RULE@
+%.xml.h: %.xml
+	$(top_builddir)/e-util/e-error-tool $^
 
 idl_DATA = $(IDLS)
 
@@ -82,12 +83,13 @@ libcomposer_la_SOURCES = 			\
 	listener.h
 
 EXTRA_DIST =					\
-	$(error_in_files)			\
+	$(error_DATA)				\
+	$(error_i18n)				\
 	$(glade_DATA)				\
 	$(IDLS)					\
 	ChangeLog.pre-1-4
 
-BUILT_SOURCES = $(IDL_GENERATED) $(HTML_EDITOR_GENERATED) $(error_DATA)
+BUILT_SOURCES = $(IDL_GENERATED) $(HTML_EDITOR_GENERATED) $(error_i18n)
 CLEANFILES = $(BUILT_SOURCES)
 
 dist-hook:
diff --git a/composer/mail-composer-errors.xml b/composer/mail-composer-errors.xml
new file mode 100644
index 0000000000..2e8defb1a7
--- /dev/null
+++ b/composer/mail-composer-errors.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<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="recover-autosave" type="question">
+  <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">
+  <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-list>
diff --git a/composer/mail-composer-errors.xml.h b/composer/mail-composer-errors.xml.h
new file mode 100644
index 0000000000..d45b635ecc
--- /dev/null
+++ b/composer/mail-composer-errors.xml.h
@@ -0,0 +1,42 @@
+/* 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: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.");
diff --git a/composer/mail-composer-errors.xml.in b/composer/mail-composer-errors.xml.in
deleted file mode 100644
index 3314a6dc5c..0000000000
--- a/composer/mail-composer-errors.xml.in
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-<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="recover-autosave" type="question">
-  <_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">
-  <_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-list>