diff options
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/ChangeLog | 6 | ||||
| -rw-r--r-- | filter/Makefile.am | 11 | ||||
| -rw-r--r-- | filter/filter-datespec.c | 2 | ||||
| -rw-r--r-- | filter/filter-errors.xml | 34 | ||||
| -rw-r--r-- | filter/filter-errors.xml.h | 24 | ||||
| -rw-r--r-- | filter/filter-file.c | 2 | ||||
| -rw-r--r-- | filter/filter-input.c | 2 | ||||
| -rw-r--r-- | filter/filter-rule.c | 2 | ||||
| -rw-r--r-- | filter/filter.error.xml | 34 | ||||
| -rw-r--r-- | filter/rule-context.c | 2 | ||||
| -rw-r--r-- | filter/rule-editor.c | 2 |
11 files changed, 50 insertions, 71 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog index 3582616927..75a9efac83 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,3 +1,9 @@ +2005-05-16 Not Zed <NotZed@Ximian.com> + + * moved e-error to e-util + + * Makefile.am: fix error i18n extraction + 2005-05-06 Sarfraaz Ahmed <asarfraaz@novell.com> * filter-rule.c : Remove markup from translatable string. Fixes #268390 diff --git a/filter/Makefile.am b/filter/Makefile.am index a3b70d7f9a..8c287ee637 100644 --- a/filter/Makefile.am +++ b/filter/Makefile.am @@ -44,20 +44,17 @@ libfilter_la_SOURCES = \ EXTRA_DIST = \ $(glade_DATA) \ - $(error_DATA) \ - $(error_i18n) \ + filter.error.xml \ ChangeLog.pre-1-4 \ filter-marshal.list # basic rules. -error_DATA = filter-errors.xml -error_i18n = $(error_DATA:.xml=.xml.h) +error_DATA = filter.error errordir = $(privdatadir)/errors -%.xml.h: %.xml - $(top_builddir)/e-util/e-error-tool $^ +@EVO_PLUGIN_RULE@ MARSHAL_GENERATED = filter-marshal.c filter-marshal.h @EVO_MARSHAL_RULE@ -BUILT_SOURCES = $(MARSHAL_GENERATED) $(error_i18n) +BUILT_SOURCES = $(MARSHAL_GENERATED) $(error_DATA) CLEANFILES = $(BUILT_SOURCES) diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c index b190eeebe8..1dbd357c04 100644 --- a/filter/filter-datespec.c +++ b/filter/filter-datespec.c @@ -35,7 +35,7 @@ #include "filter-datespec.h" #include "libedataserver/e-sexp.h" -#include "widgets/misc/e-error.h" +#include "e-util/e-error.h" #define d(x) diff --git a/filter/filter-errors.xml b/filter/filter-errors.xml deleted file mode 100644 index 21487f04f7..0000000000 --- a/filter/filter-errors.xml +++ /dev/null @@ -1,34 +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 "{0}" does not exist or is not a regular file.</primary> - <secondary>You must specify a file name.</secondary> - </error> - - <error id="bad-regexp" type="error"> - <primary>Bad regular expression "{0}".</primary> - <secondary>Could not compile regular expression "{1}".</secondary> - </error> - - <error id="no-name" type="error"> - <primary>Missing name.</primary> - <secondary>You must name this filter.</secondary> - </error> - - <error id="bad-name-notunique" type="error"> - <primary>Name "{0}" already used.</primary> - <secondary>Please choose another name.</secondary> - </error> - -</error-list>
\ No newline at end of file diff --git a/filter/filter-errors.xml.h b/filter/filter-errors.xml.h deleted file mode 100644 index f14c26698b..0000000000 --- a/filter/filter-errors.xml.h +++ /dev/null @@ -1,24 +0,0 @@ -/* 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: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:bad-name-notunique primary */ -char *s = N_("Name \"{0}\" already used."); -/* filter:bad-name-notunique secondary */ -char *s = N_("Please choose another name."); diff --git a/filter/filter-file.c b/filter/filter-file.c index e654c79cc1..f4a6ae7ec1 100644 --- a/filter/filter-file.c +++ b/filter/filter-file.c @@ -35,7 +35,7 @@ #include "filter-file.h" #include "libedataserver/e-sexp.h" -#include "widgets/misc/e-error.h" +#include "e-util/e-error.h" #define d(x) diff --git a/filter/filter-input.c b/filter/filter-input.c index d610d5d872..36bf40a284 100644 --- a/filter/filter-input.c +++ b/filter/filter-input.c @@ -34,7 +34,7 @@ #include "filter-input.h" #include "libedataserver/e-sexp.h" -#include "widgets/misc/e-error.h" +#include "e-util/e-error.h" #define d(x) diff --git a/filter/filter-rule.c b/filter/filter-rule.c index cc92b7781e..2debd1c017 100644 --- a/filter/filter-rule.c +++ b/filter/filter-rule.c @@ -29,7 +29,7 @@ #include <gtk/gtk.h> #include <libgnome/gnome-i18n.h> -#include "widgets/misc/e-error.h" +#include "e-util/e-error.h" #include "filter-rule.h" #include "rule-context.h" #include "filter-marshal.h" diff --git a/filter/filter.error.xml b/filter/filter.error.xml new file mode 100644 index 0000000000..63294dc75e --- /dev/null +++ b/filter/filter.error.xml @@ -0,0 +1,34 @@ +<?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 "{0}" does not exist or is not a regular file.</_primary> + <_secondary>You must specify a file name.</_secondary> + </error> + + <error id="bad-regexp" type="error"> + <_primary>Bad regular expression "{0}".</_primary> + <_secondary>Could not compile regular expression "{1}".</_secondary> + </error> + + <error id="no-name" type="error"> + <_primary>Missing name.</_primary> + <_secondary>You must name this filter.</_secondary> + </error> + + <error id="bad-name-notunique" type="error"> + <_primary>Name "{0}" already used.</_primary> + <_secondary>Please choose another name.</_secondary> + </error> + +</error-list>
\ No newline at end of file diff --git a/filter/rule-context.c b/filter/rule-context.c index 560e9100a4..2587b65150 100644 --- a/filter/rule-context.c +++ b/filter/rule-context.c @@ -35,7 +35,7 @@ #include <gtk/gtk.h> #include <libgnome/gnome-i18n.h> #include <gal/util/e-xml-utils.h> -#include "widgets/misc/e-error.h" +#include "e-util/e-error.h" #include "rule-context.h" #include "filter-rule.h" diff --git a/filter/rule-editor.c b/filter/rule-editor.c index bbdd9b022f..d2953ffe63 100644 --- a/filter/rule-editor.c +++ b/filter/rule-editor.c @@ -31,7 +31,7 @@ #include <libgnome/gnome-i18n.h> -#include "widgets/misc/e-error.h" +#include "e-util/e-error.h" #include "rule-editor.h" static int enable_undo = 0; |