2007-01-18 [fabien] 2.7.1cvs29
authorFabien Vantard <fzzzzz@gmail.com>
Thu, 18 Jan 2007 20:02:00 +0000 (20:02 +0000)
committerFabien Vantard <fzzzzz@gmail.com>
Thu, 18 Jan 2007 20:02:00 +0000 (20:02 +0000)
* src/plugins/bogofilter/bogofilter_gtk.c
* src/plugins/bogofilter/bogofilter.c
* src/plugins/spamassassin/spamassassin_gtk.c
* src/addr_compl.c
* src/prefs_account.c
factorize or rewrite some translatable strings.

ChangeLog
PATCHSETS
configure.ac
src/addr_compl.c
src/plugins/bogofilter/bogofilter.c
src/plugins/bogofilter/bogofilter_gtk.c
src/plugins/spamassassin/spamassassin_gtk.c
src/prefs_account.c

index 125397b948ffee03e11525b79c64337478d9ac48..9b31ebb3e6f3ed3a281dcb44e18ad04e46834edf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-01-18 [fabien]    2.7.1cvs29
+
+       * src/plugins/bogofilter/bogofilter_gtk.c
+       * src/plugins/bogofilter/bogofilter.c
+       * src/plugins/spamassassin/spamassassin_gtk.c
+       * src/addr_compl.c
+       * src/prefs_account.c
+               factorize or rewrite some translatable strings.
+
 2007-01-18 [fabien]    2.7.1cvs28
 
        * src/prefs_gtk.h
index 2db9f62391d5a0fd3464269dc2ea7fda31d77bda..e04728745939b287aa0b27506d9a7d304a8e39b3 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.18.2.6 -r 1.18.2.7 src/addressbook.h;  ) > 2.7.1cvs26.patchset
 ( cvs diff -u -r 1.60.2.76 -r 1.60.2.77 src/addressbook.c;  ) > 2.7.1cvs27.patchset
 ( cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/prefs_gtk.h;  cvs diff -u -r 1.382.2.352 -r 1.382.2.353 src/compose.c;  ) > 2.7.1cvs28.patchset
+( cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/plugins/bogofilter/bogofilter_gtk.c;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/plugins/bogofilter/bogofilter.c;  cvs diff -u -r 1.23.2.34 -r 1.23.2.35 src/plugins/spamassassin/spamassassin_gtk.c;  cvs diff -u -r 1.27.2.27 -r 1.27.2.28 src/addr_compl.c;  cvs diff -u -r 1.105.2.81 -r 1.105.2.82 src/prefs_account.c;  ) > 2.7.1cvs29.patchset
index bbc8af62549c7748018b9dab29f7222602819e8f..84a3c9cb42fdf6b4329ed1941c172b2c0d44444f 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=28
+EXTRA_VERSION=29
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 010bc2d3cc2861a87d295af8c9a7349e18247d69..dbe78d7593a1536bcec5d4d53a726ea60ca74876 100644 (file)
@@ -551,7 +551,7 @@ gchar *get_complete_address(gint index)
                                address = get_complete_address_from_name_email(p->name, p->address);
                        } else if (p != NULL && p->address == NULL && p->name != NULL) {
                                /* that's a group */
-                               address = g_strdup_printf("%s%s <!--___group___-->", p->name, _(" (Group)"));
+                               address = g_strdup_printf("%s (%s) <!--___group___-->", p->name, _("Group"));
                                if (!_groupAddresses_) {
                                        _groupAddresses_ = g_hash_table_new(NULL, g_direct_equal);
                                }
index 00c8cc6bfaa67c7681193856e32df881a1ff3bb1..d0a370498bc664f4fed1766c0cd1fc018c035eeb 100644 (file)
@@ -563,7 +563,7 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
                                           "spam and ham messages."));
                else
                        msg =  g_strdup_printf(_("The Bogofilter plugin couldn't filter "
-                                          "a message. the command `%s %s %s` couldn't be run."), 
+                                          "a message. The command `%s %s %s` couldn't be run."), 
                                           bogo_args[0], bogo_args[1], bogo_args[2]);
                if (!prefs_common.no_recv_err_panel) {
                        if (!warned_error) {
@@ -870,12 +870,12 @@ 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 Bogofilter. "
-                "You will need Bogofilter installed locally.\n "
+                "You will need Bogofilter installed locally.\n"
                 "\n"
                 "Before Bogofilter can recognize spam messages, you have to "
-                "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"
+                "train it by marking a few hundred spam and ham messages "
+                "with the use of \"/Mark/Mark as spam\" and \"/Mark/Mark as "
+                "ham\".\n"
                 "\n"
                 "When a message is identified as spam it can be deleted or "
                 "saved in a specially designated folder.\n"
index 08a1b93cb107286333b09cd8fadec88ddb4342bf..25ae53cd6c1cce887e628315d9c069200136816f 100644 (file)
@@ -213,7 +213,7 @@ static void bogofilter_create_widget_func(PrefsPage * _page,
        gtk_widget_show (save_unsure_folder_select);
        gtk_box_pack_start (GTK_BOX (hbox_save_unsure), save_unsure_folder_select, FALSE, FALSE, 0);
        gtk_tooltips_set_tip(tooltips, save_unsure_folder_select,
-                       _("Click this button to select a folder for storing Unsure mails"),
+                       _("Click this button to select a folder for storing Unsure mails."),
                        NULL);
 
        insert_header_chkbtn = gtk_check_button_new_with_label(_("Insert X-Bogosity header"));
index 86c66f156c65b19d56072657ac7fea7b6983b137..84178477f123f68a85b913a1d3f907fabdd2bd3e 100644 (file)
@@ -377,7 +377,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        gtk_widget_show (save_spam_folder_entry);
        gtk_box_pack_start (GTK_BOX (hbox_save_spam), save_spam_folder_entry, TRUE, TRUE, 0);
        gtk_tooltips_set_tip(tooltips, save_spam_folder_entry,
-                       _("Folder for storing identified spam. Leave empty to use the default trash folder"),
+                       _("Folder for storing identified spam. Leave empty to use the default trash folder."),
                        NULL);
 
        save_spam_folder_select = gtkut_get_browse_directory_btn(_("_Browse"));
index cb64f4051a5dcb5cc7ac965be878b49f30efcb2f..48888a51c96a0543e129a8307b8622746137256a 100644 (file)
@@ -2053,7 +2053,7 @@ static void prefs_account_compose_create(void)
        gtk_table_set_col_spacings (GTK_TABLE (table_dict), 8);
 
        /* Default dictionary */
-       checkbtn_enable_default_dictionary = gtk_check_button_new_with_label(_("Default dictionary"));
+       checkbtn_enable_default_dictionary = gtk_check_button_new_with_label(_("Default dictionary"));
        gtk_table_attach(GTK_TABLE(table_dict), checkbtn_enable_default_dictionary, 0, 1,
                        0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_dictionary),
@@ -2070,7 +2070,7 @@ static void prefs_account_compose_create(void)
        SET_TOGGLE_SENSITIVITY(checkbtn_enable_default_dictionary, optmenu_default_dictionary);
 
        /* Default dictionary */
-       checkbtn_enable_default_alt_dictionary = gtk_check_button_new_with_label(_("Default alternate dictionary"));
+       checkbtn_enable_default_alt_dictionary = gtk_check_button_new_with_label(_("Default alternate dictionary"));
        gtk_table_attach(GTK_TABLE(table_dict), checkbtn_enable_default_alt_dictionary, 0, 1,
                        1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_alt_dictionary),