callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved e-error to e-util

Browse Source 
2005-05-16  Not Zed  <NotZed@Ximian.com>

        * moved e-error to e-util

        * Makefile.am: fix error i18n extraction

svn path=/trunk/; revision=29364
This commit is contained in:
Not Zed
2005-05-16 06:14:34 +00:00
committed by Michael Zucci
parent 36811e6195
commit 14ea35c439
11 changed files with 50 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
filter/ChangeLog
View File

@ -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

11
filter/Makefile.am
View File

@ -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)

2
filter/filter-datespec.c
View File

@ -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)

34
filter/filter-errors.xml
View File

@ -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 &quot;{0}&quot; 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 &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="bad-name-notunique" type="error">
<primary>Name &quot;{0}&quot; already used.</primary>
<secondary>Please choose another name.</secondary>
</error>
</error-list>

24
filter/filter-errors.xml.h
View File

@ -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.");

2
filter/filter-file.c
View File

@ -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)

2
filter/filter-input.c
View File

@ -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)

2
filter/filter-rule.c
View File

@ -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"

34
filter/filter.error.xml Normal file
View File

@ -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 &quot;{0}&quot; 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 &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="bad-name-notunique" type="error">
<_primary>Name &quot;{0}&quot; already used.</_primary>
<_secondary>Please choose another name.</_secondary>
</error>
</error-list>

2
filter/rule-context.c
View File

@ -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"

2
filter/rule-editor.c
View File

@ -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;