aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRadek Doulik <rodo@ximian.com>2004-01-15 23:06:31 +0800
committerRadek Doulik <rodo@src.gnome.org>2004-01-15 23:06:31 +0800
commit77aa60234cf346c44cde4a5aa36f1c972c1a23e8 (patch)
tree5b5a0cbec3522d1ed340d27e33f2e4d736b08b1d
parent61b6bc071892caa59936667f65bdfce881f8889b (diff)
downloadgsoc2013-evolution-77aa60234cf346c44cde4a5aa36f1c972c1a23e8.tar
gsoc2013-evolution-77aa60234cf346c44cde4a5aa36f1c972c1a23e8.tar.gz
gsoc2013-evolution-77aa60234cf346c44cde4a5aa36f1c972c1a23e8.tar.bz2
gsoc2013-evolution-77aa60234cf346c44cde4a5aa36f1c972c1a23e8.tar.lz
gsoc2013-evolution-77aa60234cf346c44cde4a5aa36f1c972c1a23e8.tar.xz
gsoc2013-evolution-77aa60234cf346c44cde4a5aa36f1c972c1a23e8.tar.zst
gsoc2013-evolution-77aa60234cf346c44cde4a5aa36f1c972c1a23e8.zip
s/spam/junk, added junk test rule, it must be lost while porting to 1.5
2004-01-15 Radek Doulik <rodo@ximian.com> * filtertypes.xml: s/spam/junk, added junk test rule, it must be lost while porting to 1.5 svn path=/trunk/; revision=24240
-rw-r--r--filter/ChangeLog5
-rw-r--r--filter/filtertypes.xml29
-rw-r--r--filter/libfilter-i18n.h49
3 files changed, 56 insertions, 27 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog
index b1c03da4ea..6b37cc3fce 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-15 Radek Doulik <rodo@ximian.com>
+
+ * filtertypes.xml: s/spam/junk, added junk test rule, it must be
+ lost while porting to 1.5
+
2003-08-20 Not Zed <NotZed@Ximian.com>
** See bug #47751.
diff --git a/filter/filtertypes.xml b/filter/filtertypes.xml
index 440cd6dddd..9dc7fed678 100644
--- a/filter/filtertypes.xml
+++ b/filter/filtertypes.xml
@@ -481,6 +481,9 @@
<option value="Seen">
<title>Read</title>
</option>
+ <option value="Junk">
+ <title>Junk</title>
+ </option>
</input>
</part>
@@ -613,6 +616,24 @@
<input type="integer" name="retval"/>
</part>
+ <part name="pipe">
+ <title>Junk Test</title>
+ <input type="optionlist" name="retval-type">
+ <option value="is-junk">
+ <title>Message is Junk</title>
+ <code>
+ (match-all (junk-test))
+ </code>
+ </option>
+ <option value="is-not-junk">
+ <title>Message is not Junk</title>
+ <code>
+ (match-all (not (junk-test)))
+ </code>
+ </option>
+ </input>
+ </part>
+
</partset>
@@ -671,8 +692,8 @@
<option value="Seen">
<title>Read</title>
</option>
- <option value="Spam">
- <title>Spam</title>
+ <option value="Junk">
+ <title>Junk</title>
</option>
</input>
</part>
@@ -697,8 +718,8 @@
<option value="Seen">
<title>Read</title>
</option>
- <option value="Spam">
- <title>Spam</title>
+ <option value="Junk">
+ <title>Junk</title>
</option>
</input>
</part>
diff --git a/filter/libfilter-i18n.h b/filter/libfilter-i18n.h
index 410ea7945f..969b4eb6c2 100644
--- a/filter/libfilter-i18n.h
+++ b/filter/libfilter-i18n.h
@@ -4,21 +4,42 @@ char *s = N_("Assign Color");
char *s = N_("Assign Score");
char *s = N_("Attachments");
char *s = N_("Beep");
+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 return");
+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_("Exist");
+char *s = N_("exists");
char *s = N_("Expression");
char *s = N_("Follow Up");
char *s = N_("Important");
+char *s = N_("is");
+char *s = N_("is after");
+char *s = N_("is before");
+char *s = N_("is Flagged");
+char *s = N_("is greater than");
+char *s = N_("is less than");
+char *s = N_("is not");
+char *s = N_("is not Flagged");
+char *s = N_("Junk");
+char *s = N_("Junk test");
char *s = N_("Label");
char *s = N_("Mailing list");
char *s = N_("Message Body");
char *s = N_("Message Header");
+char *s = N_("Message is Junk");
+char *s = N_("Message is not Junk");
char *s = N_("Move to Folder");
char *s = N_("Pipe Message to Shell Command");
char *s = N_("Play Sound");
@@ -26,37 +47,19 @@ char *s = N_("Read");
char *s = N_("Recipients");
char *s = N_("Regex Match");
char *s = N_("Replied to");
+char *s = N_("returns");
+char *s = N_("returns greater than");
+char *s = N_("returns less than");
char *s = N_("Score");
char *s = N_("Sender");
char *s = N_("Set Status");
char *s = N_("Shell Command");
char *s = N_("Size (kB)");
+char *s = N_("sounds like");
char *s = N_("Source Account");
-char *s = N_("Spam");
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_("Unset Status");
-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 return");
-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 Flagged");
-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 Flagged");
-char *s = N_("is not");
-char *s = N_("is");
-char *s = N_("returns greater than");
-char *s = N_("returns less than");
-char *s = N_("returns");
-char *s = N_("sounds like");
-char *s = N_("starts with");