This commit was manufactured by cvs2svn to create tagEVOLUTION_1_0_2

'EVOLUTION_1_0_2'.

svn path=/tags/EVOLUTION_1_0_2/; revision=15455

2 files changed, 22 insertions, 51 deletions

diff --git a/filter/ChangeLog b/filter/ChangeLog
index 76a439ced6..c0308c9ec4 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,36 +1,3 @@
-2002-01-15  Not Zed  <NotZed@Ximian.com>
-
-	* filter-input.c (xml_decode): If we write "" to an xml file, we
-	read back NULL.  So if we read back NULL, convert it to "".
-	Sigh.  This makes a fix for #7801, although new gui may also be
-	required.
-
-2002-01-03  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filter-source.c (filter_source_get_sources): Get the account
-	name because that is the string we'd like to use for display.
-	(get_widget): Generate the account label the same as we do for the
-	composer's From optionmenu.
-	(filter_source_finalize): Free the account_name.
-	(clone): Pass along the account_name member to filter_add_source
-
-2002-01-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* vfoldertypes.xml: Make the date comparisons read the same as the
-	ones in filtertypes.xml
-
-2001-12-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* filtertypes.xml: Add new action to execute a shell command.
-
-2001-12-09  Jon Trowbridge  <trow@ximian.com>
-
-	* vfoldertypes.xml: Add "Needs Reply" option to different status
-	types.
-
-	* filtertypes.xml: Add "Needs Reply" option to different status
-	types.
-
 2001-11-15  Zbigniew Chyla  <cyba@gnome.pl>
 
 	* rule-editor.c (set_source): Removed U_.  Fixes #15415.
diff --git a/filter/libfilter-i18n.h b/filter/libfilter-i18n.h
index 03fd35443f..175eac2dc6 100644
--- a/filter/libfilter-i18n.h
+++ b/filter/libfilter-i18n.h
@@ -2,36 +2,22 @@
 char *s = N_("Assign Color");
 char *s = N_("Assign Score");
 char *s = N_("Attachments");
-char *s = N_("contains");
 char *s = N_("Copy to Folder");
 char *s = N_("Date received");
 char *s = N_("Date sent");
 char *s = N_("Delete");
 char *s = N_("Deleted");
-char *s = N_("does not contain");
-char *s = N_("does not end with");
-char *s = N_("does not exist");
-char *s = N_("does not sound like");
-char *s = N_("does not start with");
 char *s = N_("Do Not Exist");
 char *s = N_("Draft");
-char *s = N_("ends with");
-char *s = N_("Execute Shell Command");
 char *s = N_("Exist");
-char *s = N_("exists");
 char *s = N_("Expression");
 char *s = N_("Important");
-char *s = N_("is");
-char *s = N_("is after");
-char *s = N_("is before");
-char *s = N_("is greater than");
-char *s = N_("is less than");
-char *s = N_("is not");
 char *s = N_("Mailing list");
 char *s = N_("Message Body");
 char *s = N_("Message Header");
+char *s = N_("Message was received");
+char *s = N_("Message was sent");
 char *s = N_("Move to Folder");
-char *s = N_("Needs Reply");
 char *s = N_("Read");
 char *s = N_("Recipients");
 char *s = N_("Regex Match");
@@ -40,10 +26,28 @@ char *s = N_("Score");
 char *s = N_("Sender");
 char *s = N_("Set Status");
 char *s = N_("Size (kB)");
-char *s = N_("sounds like");
 char *s = N_("Source Account");
 char *s = N_("Specific header");
-char *s = N_("starts with");
 char *s = N_("Status");
 char *s = N_("Stop Processing");
 char *s = N_("Subject");
+char *s = N_("after");
+char *s = N_("before");
+char *s = N_("contains");
+char *s = N_("does not contain");
+char *s = N_("does not end with");
+char *s = N_("does not exist");
+char *s = N_("does not sound like");
+char *s = N_("does not start with");
+char *s = N_("ends with");
+char *s = N_("exists");
+char *s = N_("is greater than");
+char *s = N_("is less than");
+char *s = N_("is not");
+char *s = N_("is");
+char *s = N_("on or after");
+char *s = N_("on or before");
+char *s = N_("sounds like");
+char *s = N_("starts with");
+char *s = N_("was after");
+char *s = N_("was before");