2006-03-10 [colin] 2.0.0cvs131

	* src/plugins/spamassassin/spamassassin_gtk.c
		Put back Paul's engrish fixes

diff --git a/ChangeLog b/ChangeLog
index f117083b88ffbe999ccfed4ea05d6a2542b12c9f..e30a832c864fcadd081040abea59329287a1f002 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-10 [colin]     2.0.0cvs131
+
+       * src/plugins/spamassassin/spamassassin_gtk.c
+               Put back Paul's engrish fixes
+
 2006-03-10 [colin]     2.0.0cvs130
 
        * src/plugins/spamassassin/spamassassin.c

diff --git a/PATCHSETS b/PATCHSETS
index dcbd1668c3843f62890b4ce705e627794e3c9a50..de3fe67d835e7f44db4ab4e668358898b9eb8900 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1315,3 +1315,4 @@
 ( cvs diff -u -r 1.60.2.25 -r 1.60.2.26 po/es.po;  ) > 2.0.0cvs128.patchset
 ( cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_msg_colors.c;  cvs diff -u -r 1.5.2.19 -r 1.5.2.20 src/prefs_spelling.c;  ) > 2.0.0cvs129.patchset
 ( cvs diff -u -r 1.18.2.30 -r 1.18.2.31 src/plugins/spamassassin/spamassassin.c;  cvs diff -u -r 1.4.2.10 -r 1.4.2.11 src/plugins/spamassassin/spamassassin.h;  cvs diff -u -r 1.23.2.23 -r 1.23.2.24 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 2.0.0cvs130.patchset
+( cvs diff -u -r 1.23.2.24 -r 1.23.2.25 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 2.0.0cvs131.patchset

diff --git a/configure.ac b/configure.ac
index f6c41047bd4aab50b1844bde0dc1e44067e90679..54f9caa2a7985ebdb861f27721fc412e61ac0cc9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=130
+EXTRA_VERSION=131
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
index 512a85ae281ff2f218f4b54c7036ab32d02299fb..cfb65cfa29ef3127fcbb1e4578862099e0fa1205 100644 (file)
--- a/src/plugins/spamassassin/spamassassin_gtk.c
+++ b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -336,7 +336,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        gtk_widget_show(max_size_spinbtn);
        gtk_box_pack_start(GTK_BOX(hbox_max_size), max_size_spinbtn, FALSE, FALSE, 0);
        gtk_tooltips_set_tip(tooltips, max_size_spinbtn,
-                       _("Don't check emails bigger than"), NULL);
+                       _("Messages larger than this will not be checked"), NULL);
        gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(max_size_spinbtn), TRUE);
 
        max_size_kb_label = gtk_label_new(_("kB"));
@@ -375,7 +375,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        gtk_widget_show(process_emails_checkbtn);
        gtk_box_pack_start(GTK_BOX(hbox_process_emails), process_emails_checkbtn, TRUE, TRUE, 0);
        gtk_tooltips_set_tip(tooltips, process_emails_checkbtn,
-                       _("Process emails upon incorporation"), NULL);
+                       _("Process emails on receiving"), NULL);
 
        hbox_save_spam = gtk_hbox_new(FALSE, 8);
        gtk_widget_show(hbox_save_spam);