2006-08-28 [paul] 2.4.0cvs103
authorPaul Mangan <paul@claws-mail.org>
Mon, 28 Aug 2006 12:07:09 +0000 (12:07 +0000)
committerPaul Mangan <paul@claws-mail.org>
Mon, 28 Aug 2006 12:07:09 +0000 (12:07 +0000)
* src/plugins/bogofilter/bogofilter.c
* src/plugins/bogofilter/bogofilter_gtk.c
fix english up a bit, innit

ChangeLog
PATCHSETS
configure.ac
src/plugins/bogofilter/bogofilter.c
src/plugins/bogofilter/bogofilter_gtk.c

index 0bb4b2f..8ce1b57 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-28 [paul]      2.4.0cvs103
+
+       * src/plugins/bogofilter/bogofilter.c
+       * src/plugins/bogofilter/bogofilter_gtk.c
+               fix english up a bit, innit
+
 2006-08-28 [paul]      2.4.0cvs102
 
        * configure.ac
index 21d0c55..a20c998 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.213.2.109 -r 1.213.2.110 src/folder.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/bogofilter/bogofilter.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/bogofilter/bogofilter.h;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/bogofilter/bogofilter_gtk.c;  ) > 2.4.0cvs100.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/bogofilter/Makefile.am;  ) > 2.4.0cvs101.patchset
 ( cvs diff -u -r 1.654.2.1840 -r 1.654.2.1841 configure.ac;  cvs diff -u -r 1.6.2.8 -r 1.6.2.9 po/Makefile.in.in;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 po/Makevars;  ) > 2.4.0cvs102.patchset
+( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/bogofilter/bogofilter.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/bogofilter/bogofilter_gtk.c;  ) > 2.4.0cvs103.patchset
index a61f334..d4d3959 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=102
+EXTRA_VERSION=103
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 05fc698..9ddba96 100644 (file)
@@ -158,11 +158,11 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
        if (status == 3) { /* I/O or other errors */
                if (!warned_error) {
                        alertpanel_error(_("The Bogofilter plugin couldn't filter "
-                                          "a message. The probable error cause is "
-                                          "that it didn't learn from any mail.\n"
-                                          "Use \"Mark/As Spam(Ham)\" from messages' "
-                                          "contextual menu to train Bogofilter with "
-                                          "a few hundreds spam and ham messages."));
+                                          "a message. The probable cause of the "
+                                          "error is that it didn't learn from any mail.\n"
+                                          "Use \"/Mark/Mark as spam\" and \"/Mark/Mark as "
+                                          "ham\" to train Bogofilter with a few hundred "
+                                          "spam and ham messages."));
                }
                warned_error = TRUE;
        }
@@ -334,13 +334,13 @@ const gchar *plugin_name(void)
 const gchar *plugin_desc(void)
 {
        return _("This plugin can check all messages that are received from an "
-                "IMAP, LOCAL or POP account for spam using a Bogofilter "
-                "server. You will need Bogofilter installed locally.\n "
+                "IMAP, LOCAL or POP account for spam using Bogofilter. "
+                "You will need Bogofilter installed locally.\n "
                 "\n"
                 "Before Bogofilter can recognize spam messages, you have to "
-                "train it by marking a few hundreds spam and ham messages. "
-                "Use \"Mark/As Spam(Ham)\" from messages' contextual menu "
-                "to train Bogofilter.\n"
+                "train it by marking a few hundred spam and ham messages. "
+                "Use \"/Mark/Mark as Spam\" and \"/Mark/Mark as ham\" to "
+                "train Bogofilter.\n"
                 "\n"
                 "When a message is identified as spam it can be deleted or "
                 "saved in a specially designated folder.\n"
index b62e5f7..5b3c66f 100644 (file)
@@ -160,14 +160,16 @@ static void bogofilter_create_widget_func(PrefsPage * _page,
        gtk_widget_show(hbox_bogopath);
        gtk_box_pack_start (GTK_BOX (vbox2), hbox_bogopath, FALSE, FALSE, 0);
 
-       bogopath_label = gtk_label_new(
-                       _("Bogofilter call: "));
+       bogopath_label = gtk_label_new(_("Bogofilter call"));
        gtk_widget_show(bogopath_label);
        gtk_box_pack_start(GTK_BOX(hbox_bogopath), bogopath_label, FALSE, FALSE, 0);
 
        bogopath_entry = gtk_entry_new();
        gtk_widget_show(bogopath_entry);
        gtk_box_pack_start(GTK_BOX(hbox_bogopath), bogopath_entry, FALSE, FALSE, 0);
+       gtk_tooltips_set_tip(tooltips, bogopath_entry,
+                       _("Path to bogofilter executable"),
+                       NULL);
 
        SET_TOGGLE_SENSITIVITY(save_spam_checkbtn, save_spam_folder_entry);
        SET_TOGGLE_SENSITIVITY(save_spam_checkbtn, save_spam_folder_select);