2006-08-01 [wwp] 2.4.0cvs9
authorTristan Chabredier <wwp@claws-mail.org>
Tue, 1 Aug 2006 09:35:18 +0000 (09:35 +0000)
committerTristan Chabredier <wwp@claws-mail.org>
Tue, 1 Aug 2006 09:35:18 +0000 (09:35 +0000)
* src/matcher.c
* src/prefs_filtering.c
* src/prefs_matcher.c
allow context-dependent translations for "All",
patch by Fabien Vantard <fzzzzz@gmail.com>.

ChangeLog
PATCHSETS
configure.ac
src/matcher.c
src/prefs_filtering.c
src/prefs_matcher.c

index 2554828a048c7015bf8e6d970b4b75dc150fa93b..91b5cd6a5c63a51c911057d16a197f7e77850f47 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-01 [wwp]       2.4.0cvs9
+
+       * src/matcher.c
+       * src/prefs_filtering.c
+       * src/prefs_matcher.c
+               allow context-dependent translations for "All",
+               patch by Fabien Vantard <fzzzzz@gmail.com>.
+
 2006-07-31 [colin]     2.4.0cvs8
 
        * AUTHORS
index d06053fe1d3a1681be136ef02fce56de8f7cea70..017daa00e39b41cb421c333652eb9d1143df74b8 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.12.2.36 -r 1.12.2.37 src/action.c;  ) > 2.4.0cvs6.patchset
 ( cvs diff -u -r 1.382.2.295 -r 1.382.2.296 src/compose.c;  cvs diff -u -r 1.274.2.129 -r 1.274.2.130 src/mainwindow.c;  cvs diff -u -r 1.19.2.8 -r 1.19.2.9 src/messageview.h;  cvs diff -u -r 1.204.2.93 -r 1.204.2.94 src/prefs_common.c;  cvs diff -u -r 1.103.2.55 -r 1.103.2.56 src/prefs_common.h;  cvs diff -u -r 1.96.2.128 -r 1.96.2.129 src/textview.c;  ) > 2.4.0cvs7.patchset
 ( cvs diff -u -r 1.100.2.40 -r 1.100.2.41 AUTHORS;  cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/gtk/authors.h;  ) > 2.4.0cvs8.patchset
+( cvs diff -u -r 1.75.2.28 -r 1.75.2.29 src/matcher.c;  cvs diff -u -r 1.59.2.38 -r 1.59.2.39 src/prefs_filtering.c;  cvs diff -u -r 1.43.2.41 -r 1.43.2.42 src/prefs_matcher.c;  ) > 2.4.0cvs9.patchset
index ea7dedda3bbc2be535863ab56474afdb8c805df4..cfcd4cc3452fc4d3b55f731307cd19b7d1a4b361 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=8
+EXTRA_VERSION=9
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 44b6d9297555f6be4405184c44ed6d3bccba411d..cf6abfdd4d9cb052c88fb9405c71fc92ffdf73a7 100644 (file)
@@ -753,7 +753,7 @@ static gboolean matcherprop_match_one_header(MatcherProp *matcher,
                        /* how many address headers are me trying to mach? */
                        if (strcasecmp(matcher->header, _("Any")) == 0)
                                match = MATCH_ANY;
-                       else if (strcasecmp(matcher->header, _("All")) == 0)
+                       else if (strcasecmp(matcher->header, Q_("Filtering Matcher Menu|All")) == 0)
                                        match = MATCH_ALL;
 
                        if (match == MATCH_ONE) {
@@ -886,7 +886,7 @@ static gboolean matcherlist_match_headers(MatcherList *matchers, FILE *fp)
 
                                        if (strcasecmp(matcher->header, _("Any")) == 0)
                                                match = MATCH_ANY;
-                                       else if (strcasecmp(matcher->header, _("All")) == 0)
+                                       else if (strcasecmp(matcher->header, Q_("Filtering Matcher Menu|All")) == 0)
                                                match = MATCH_ALL;
                                        else
                                                match = MATCH_ONE;
index 177ce09146d82e1671b496f90a26563bff456862..49bb8e4502d39a5c600897ae94e46461bc453371 100644 (file)
@@ -240,7 +240,7 @@ static void prefs_filtering_account_option_menu_populate(void)
 
        g_return_val_if_fail(accounts != NULL, NULL);
 
-       COMBOBOX_ADD(filtering.account_combobox_list, _("All"), 0);
+       COMBOBOX_ADD(filtering.account_combobox_list, Q_("Filtering Account Menu|All"), 0);
        for (; accounts != NULL; accounts = accounts->next) {
                PrefsAccount *ac = (PrefsAccount *)accounts->data;
 
index c06da84529a7f373945a7668b668da0573500f1b..262e1c71119e0b5f8d9067231faea667a1a0c6cc 100644 (file)
@@ -517,7 +517,8 @@ static void prefs_matcher_create(void)
        header_addr_combo = gtk_combo_new();
        gtk_widget_set_size_request(header_addr_combo, 120, -1);
        gtkut_combo_set_items(GTK_COMBO (header_addr_combo),
-                             _("All"), _("Any"), "From", "To", "Cc", "Reply-To", "Sender",
+                             Q_("Filtering Matcher Menu|All"),
+                             _("Any"), "From", "To", "Cc", "Reply-To", "Sender",
                              NULL);
        gtk_table_attach(GTK_TABLE(criteria_table), header_addr_combo, 1, 2, 1, 2,
                         0, 0, 0, 0);