fix i18n file generation rules.

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

        * Makefile.am (%.xml.h): fix i18n file generation rules.

        * filter-errors.xml: rename from xml.in and fix tags.

        * filter-errors.xml.h: add for translators.

svn path=/trunk/; revision=25867

5 files changed, 106 insertions, 55 deletions

diff --git a/filter/ChangeLog b/filter/ChangeLog
index 47d7611e9d..a1f20d8611 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,11 @@
+2004-05-12  Not Zed  <NotZed@Ximian.com>
+
+	* Makefile.am (%.xml.h): fix i18n file generation rules.
+
+	* filter-errors.xml: rename from xml.in and fix tags.
+
+	* filter-errors.xml.h: add for translators.
+
 2004-05-03  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* vfoldertypes.xml: Added the Junk status flag to the xml
diff --git a/filter/Makefile.am b/filter/Makefile.am
index 502e543a5c..0e7fd2f4b7 100644
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -70,7 +70,8 @@ libfilter_la_DEPENDENCIES = libfilter-i18n.h
 
 EXTRA_DIST =					\
 	$(glade_DATA)				\
-	$(error_in_files)			\
+	$(error_DATA)				\
+	$(error_i18n)				\
 	ChangeLog.pre-1-4			\
 	filter-marshal.list			\
 	filtertypes.xml				\
@@ -82,10 +83,11 @@ EXTRA_DIST =					\
 filterdir = $(privdatadir)
 filter_DATA = filtertypes.xml vfoldertypes.xml searchtypes.xml
 
-error_in_files = filter-errors.xml.in
-error_DATA = $(error_in_files:.xml.in=.xml)
+error_DATA = filter-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 $^
 
 libfilter-i18n.h: filtertypes.xml vfoldertypes.xml
 	echo "/* Automatically generated. Do not edit. */" > $@;	      \
@@ -95,3 +97,6 @@ libfilter-i18n.h: filtertypes.xml vfoldertypes.xml
 
 MARSHAL_GENERATED = filter-marshal.c filter-marshal.h
 @EVO_MARSHAL_RULE@
+
+BUILT_SOURCES = $(MARSHAL_GENERATED) $(error_i18n)
+CLEANFILES = $(BUILT_SOURCES)
diff --git a/filter/filter-errors.xml b/filter/filter-errors.xml
new file mode 100644
index 0000000000..d7ad6ab55b
--- /dev/null
+++ b/filter/filter-errors.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<error-list domain="filter">
+
+ <error id="no-date" type="error">
+  <primary>Missing date.</primary>
+  <secondary>You must choose a date.</secondary>
+ </error>
+
+ <error id="no-file" type="error">
+  <primary>Missing file name.</primary>
+  <secondary>You must specify a file name.</secondary>
+ </error>
+
+ <error id="bad-file" type="error">
+  <primary>File &quot;{0}&quot; does not exist or is not a regular file.</primary>
+  <secondary>You must specify a file name.</secondary>
+ </error>
+
+ <error id="no-folder" type="error">
+  <primary>Missing folder.</primary>
+  <secondary>You must specify a folder.</secondary>
+ </error>
+
+ <error id="bad-regexp" type="error">
+  <primary>Bad regular expression &quot;{0}&quot;.</primary>
+  <secondary>Could not compile regular expression &quot;{1}&quot;.</secondary>
+ </error>
+
+ <error id="no-name" type="error">
+  <primary>Missing name.</primary>
+  <secondary>You must name this filter.</secondary>
+ </error>
+
+ <error id="no-name-vfolder" type="error">
+  <primary>Missing name.</primary>
+  <secondary>You must name this vFolder.</secondary>
+ </error>
+
+ <error id="bad-name-notunique" type="error">
+  <primary>Name &quot;{0}&quot; already used.</primary>
+  <secondary>Please choose another name.</secondary>
+ </error>
+
+ <error id="vfolder-no-source" type="error">
+  <primary>No sources selected.</primary>
+  <secondary>You must specify at least one folder as a source.
+Either by selecting the folders individually, and/or by selecting
+all local folders, all remote folders, or both.</secondary>
+ </error>
+
+</error-list>
\ No newline at end of file
diff --git a/filter/filter-errors.xml.h b/filter/filter-errors.xml.h
new file mode 100644
index 0000000000..f8ed2d6ffb
--- /dev/null
+++ b/filter/filter-errors.xml.h
@@ -0,0 +1,38 @@
+/* filter:no-date primary */
+char *s = N_("Missing date.");
+/* filter:no-date secondary */
+char *s = N_("You must choose a date.");
+/* filter:no-file primary */
+char *s = N_("Missing file name.");
+/* filter:no-file secondary */
+char *s = N_("You must specify a file name.");
+/* filter:bad-file primary */
+char *s = N_("File \"{0}\" does not exist or is not a regular file.");
+/* filter:bad-file secondary */
+char *s = N_("You must specify a file name.");
+/* filter:no-folder primary */
+char *s = N_("Missing folder.");
+/* filter:no-folder secondary */
+char *s = N_("You must specify a folder.");
+/* filter:bad-regexp primary */
+char *s = N_("Bad regular expression \"{0}\".");
+/* filter:bad-regexp secondary */
+char *s = N_("Could not compile regular expression \"{1}\".");
+/* filter:no-name primary */
+char *s = N_("Missing name.");
+/* filter:no-name secondary */
+char *s = N_("You must name this filter.");
+/* filter:no-name-vfolder primary */
+char *s = N_("Missing name.");
+/* filter:no-name-vfolder secondary */
+char *s = N_("You must name this vFolder.");
+/* filter:bad-name-notunique primary */
+char *s = N_("Name \"{0}\" already used.");
+/* filter:bad-name-notunique secondary */
+char *s = N_("Please choose another name.");
+/* filter:vfolder-no-source primary */
+char *s = N_("No sources selected.");
+/* filter:vfolder-no-source secondary */
+char *s = N_("You must specify at least one folder as a source.\n"
+	"Either by selecting the folders individually, and/or by selecting\n"
+	"all local folders, all remote folders, or both.");
diff --git a/filter/filter-errors.xml.in b/filter/filter-errors.xml.in
deleted file mode 100644
index 97bbd9c8fb..0000000000
--- a/filter/filter-errors.xml.in
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<error-list domain="filter">
-
- <error id="no-date" type="error">
-  <_primary>Missing date.</_primary>
-  <_secondary>You must choose a date.</_secondary>
- </error>
-
- <error id="no-file" type="error">
-  <_primary>Missing file name.</_primary>
-  <_secondary>You must specify a file name.</_secondary>
- </error>
-
- <error id="bad-file" type="error">
-  <_primary>File &quot;{0}&quot; does not exist or is not a regular file.</_primary>
-  <_secondary>You must specify a file name.</_secondary>
- </error>
-
- <error id="no-folder" type="error">
-  <_primary>Missing folder.</_primary>
-  <_secondary>You must specify a folder.</_secondary>
- </error>
-
- <error id="bad-regexp" type="error">
-  <_primary>Bad regular expression &quot;{0}&quot;.</_primary>
-  <_secondary>Could not compile regular expression &quot;{1}&quot;.</_secondary>
- </error>
-
- <error id="no-name" type="error">
-  <_primary>Missing name.</_primary>
-  <_secondary>You must name this filter.</_secondary>
- </error>
-
- <error id="no-name-vfolder" type="error">
-  <_primary>Missing name.</_primary>
-  <_secondary>You must name this vFolder.</_secondary>
- </error>
-
- <error id="bad-name-notunique" type="error">
-  <_primary>Name &quot;{0}&quot; already used.</_primary>
-  <_secondary>Please choose another name.</_secondary>
- </error>
-
- <error id="vfolder-no-source" type="error">
-  <_primary>No sources selected.</_primary>
-  <_secondary>You must specify at least one folder as a source.
-Either by selecting the folders individually, and/or by selecting
-all local folders, all remote folders, or both.</_secondary>
- </error>
-
-</error-list>
\ No newline at end of file