From 581a7cd1953dcb86c60e3800e09e6d7d8ea16d0c Mon Sep 17 00:00:00 2001 From: Not Zed Date: Fri, 6 May 2005 11:26:06 +0000 Subject: renamed from mail-errors.xml, add i18n tags, fix some whitespace issues. 2005-05-06 Not Zed * mail.error.xml: renamed from mail-errors.xml, add i18n tags, fix some whitespace issues. Removed some unecessary translations. svn path=/trunk/; revision=29307 --- mail/ChangeLog | 5 + mail/Makefile.am | 12 +- mail/mail-errors.xml | 359 ------------------------------------------------- mail/mail-errors.xml.h | 267 ------------------------------------ mail/mail.error.xml | 353 ++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 363 insertions(+), 633 deletions(-) delete mode 100644 mail/mail-errors.xml delete mode 100644 mail/mail-errors.xml.h create mode 100644 mail/mail.error.xml (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index 3fa6b2626b..84d635ba65 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2005-05-06 Not Zed + + * mail.error.xml: renamed from mail-errors.xml, add i18n tags, fix + some whitespace issues. Removed some unecessary translations. + 2005-05-06 Chenthill Palanisamy * evolution-mail.schemas.in.in: Removed the schema diff --git a/mail/Makefile.am b/mail/Makefile.am index 78ce20e60f..567e2256b9 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -218,11 +218,10 @@ server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server) filterdir = $(privdatadir) filter_DATA = filtertypes.xml vfoldertypes.xml searchtypes.xml -error_DATA = mail-errors.xml -error_i18n = $(error_DATA:.xml=.xml.h) +error_DATA = mail.error errordir = $(privdatadir)/errors -%.xml.h: %.xml - $(top_builddir)/e-util/e-error-tool $^ +# provides error rules too +@EVO_PLUGIN_RULE@ em-filter-i18n.h: filtertypes.xml vfoldertypes.xml searchtypes.xml echo "/* Automatically generated. Do not edit. */" > $@; \ @@ -240,8 +239,7 @@ EXTRA_DIST = \ ChangeLog.pre-1-4 \ em-marshal.list \ $(SPELL_IDL) \ - $(error_DATA) \ - $(error_i18n) \ + mail.error.xml \ $(glade_DATA) \ $(schema_in_files) \ $(server_in_files) \ @@ -288,6 +286,6 @@ install-data-local: dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) -BUILT_SOURCES = $(SPELL_IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA) $(error_i18n) +BUILT_SOURCES = $(SPELL_IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA) $(error_DATA) CLEANFILES = $(BUILT_SOURCES) diff --git a/mail/mail-errors.xml b/mail/mail-errors.xml deleted file mode 100644 index 44ec8efe5d..0000000000 --- a/mail/mail-errors.xml +++ /dev/null @@ -1,359 +0,0 @@ - - - - - Invalid authentication - This server does not support this type of authentication and may not support authentication at all. - - - - Your login to your server "{0}" as "{0}" failed. - Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on. - - - - Are you sure you want to send a message in HTML format? - Please make sure the following recipients are willing and able to receive HTML email: -{0} -Send anyway? -