2007-04-27 [paul] 2.9.1cvs30
authorPaul Mangan <paul@claws-mail.org>
Fri, 27 Apr 2007 09:17:55 +0000 (09:17 +0000)
committerPaul Mangan <paul@claws-mail.org>
Fri, 27 Apr 2007 09:17:55 +0000 (09:17 +0000)
* src/mainwindow.c
* src/prefs_logging.c
improvements to english usage

ChangeLog
PATCHSETS
configure.ac
src/mainwindow.c
src/prefs_logging.c

index 001c2968da0e5c7864e8cf33a8e595bd46bbaf3e..26568d130fc043d12b9a193a5cf8801535198154 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-27 [paul]      2.9.1cvs30
+
+       * src/mainwindow.c
+       * src/prefs_logging.c
+               improvements to english usage
+
 2007-04-27 [colin]     2.9.1cvs29
 
        * src/imap.c
index 91cc0d5b63acf87feaf04c0593f9e79b28f7815f..af56c0cb677e3b035661a15dcadb531259c327c2 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.654.2.2610 -r 1.654.2.2611 configure.ac;  cvs diff -u -r 1.49.2.91 -r 1.49.2.92 src/procmime.c;  cvs diff -u -r 1.179.2.167 -r 1.179.2.168 src/imap.c;  ) > 2.9.1cvs27.patchset
 ( cvs diff -u -r 1.179.2.168 -r 1.179.2.169 src/imap.c;  cvs diff -u -r 1.34.2.15 -r 1.34.2.16 src/imap.h;  cvs diff -u -r 1.96.2.170 -r 1.96.2.171 src/textview.c;  ) > 2.9.1cvs28.patchset
 ( cvs diff -u -r 1.179.2.169 -r 1.179.2.170 src/imap.c;  ) > 2.9.1cvs29.patchset
+( cvs diff -u -r 1.274.2.186 -r 1.274.2.187 src/mainwindow.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/prefs_logging.c;  ) > 2.9.1cvs30.patchset
index 76b8fd9f819173c8a12963bed36cbf05c03703b5..75eee963c40487e7254932c96148a8f8ef0823ef 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=29
+EXTRA_VERSION=30
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index d93d263cc3e40e0c825fa64109c491e6448b4886..2e95c71a0d67ae4d78099b15ccee0b5010d0bc41 100644 (file)
@@ -864,8 +864,8 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, ssl_manager_open_cb, 0, NULL},
 #endif
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
-       {N_("/_Tools/Filtering debug window"),  NULL, filtering_debug_window_show_cb, 0, NULL},
-       {N_("/_Tools/_Log window"),             "<shift><control>L", log_window_show_cb, 0, NULL},
+       {N_("/_Tools/Filtering Log"),           NULL, filtering_debug_window_show_cb, 0, NULL},
+       {N_("/_Tools/Protocol _Log"),           "<shift><control>L", log_window_show_cb, 0, NULL},
 
        {N_("/_Configuration"),                 NULL, NULL, 0, "<Branch>"},
        {N_("/_Configuration/C_hange current account"),
@@ -1320,9 +1320,9 @@ MainWindow *main_window_create()
                                prefs_common.filtering_debug_cliplog,
                                prefs_common.filtering_debug_loglength);
        if (prefs_common.enable_filtering_debug)
-               log_message(LOG_DEBUG_FILTERING, _("filtering debug enabled\n"));
+               log_message(LOG_DEBUG_FILTERING, _("filtering log enabled\n"));
        else
-               log_message(LOG_DEBUG_FILTERING, _("filtering debug disabled\n"));
+               log_message(LOG_DEBUG_FILTERING, _("filtering log disabled\n"));
 
        folderview->mainwin      = mainwin;
        folderview->summaryview  = summaryview;
index cabec0f9c35311f7a7c824f862ccf86a4330797f..5cefb54098daff1a2ba09f1126e90da479c5830e 100644 (file)
@@ -114,7 +114,7 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
        vbox_logging = gtkut_get_options_frame(vbox1, &frame_logging, _("Protocol log"));
 
        PACK_CHECK_BUTTON (vbox_logging, checkbtn_cliplog,
-                          _("Clip the log size"));
+                          _("Restrict the log size"));
        hbox_cliplog = gtk_hbox_new (FALSE, 8);
        gtk_container_add (GTK_CONTAINER (vbox_logging), hbox_cliplog);
        gtk_widget_show (hbox_cliplog);
@@ -149,24 +149,26 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
 
        /* Filtering/processing debug log */
        vbox_filteringdebug_log = gtkut_get_options_frame(vbox1,
-                               &frame_logging, _("Filtering/processing debug log"));
+                               &frame_logging, _("Filtering/processing log"));
 
        PACK_CHECK_BUTTON (vbox_filteringdebug_log, checkbtn_filteringdebug,
-                          _("Enable debugging of filtering/processing rules"));
+                          _("Enable logging of filtering/processing rules"));
        hbox_filteringdebug = gtk_hbox_new (FALSE, 8);
        gtk_container_add (GTK_CONTAINER (vbox_filteringdebug_log), hbox_filteringdebug);
        gtk_widget_show (hbox_filteringdebug);
 
        filteringdebug_tooltip = gtk_tooltips_new();
-       gtk_tooltips_set_tip(GTK_TOOLTIPS(filteringdebug_tooltip), checkbtn_filteringdebug,
-                            _("If checked, turns on debugging of filtering and processing rules.\n"
-                                       "Debug log is available from 'Tools/Filtering debug window'.\n"
-                                       "Caution: enabling this option will slow down the filtering/processing, "
-                                       "this might be critical when applying many rules upon thousands of messages."),
-                            NULL);
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(filteringdebug_tooltip),
+                            checkbtn_filteringdebug,
+                            _("If checked, turns on logging of filtering and processing rules.\n"
+                               "The log is accessible from 'Tools/Filtering log'.\n"
+                               "Caution: enabling this option will slow down the filtering/processing, "
+                               "this might be critical when applying many rules upon thousands of "
+                               "messages."),
+                               NULL);
 
        vbox_filteringdebug = gtkut_get_options_frame(vbox_filteringdebug_log, &frame_filteringdebug,
-                                                       _("Debugging of filtering/processing rules when.."));
+                                                       _("Log filtering/processing when..."));
 
        PACK_CHECK_BUTTON (vbox_filteringdebug, checkbtn_filteringdebug_inc,
                           _("filtering at incorporation"));
@@ -208,7 +210,7 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_widget_show (hbox_filteringdebug_level);
        gtk_box_pack_start(GTK_BOX (vbox_filteringdebug_log), hbox_filteringdebug_level, FALSE, FALSE, 0);
 
-       label_debug_level = gtk_label_new (_("Debug level"));
+       label_debug_level = gtk_label_new (_("Log level"));
        gtk_widget_show (label_debug_level);
        gtk_box_pack_start(GTK_BOX(hbox_filteringdebug_level), label_debug_level, FALSE, FALSE, 0);
 
@@ -224,16 +226,23 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_box_pack_start(GTK_BOX(hbox_filteringdebug_level), optmenu_filteringdebug_level, FALSE, FALSE, 0);
 
        filteringdebug_level_tooltip = gtk_tooltips_new();
-       gtk_tooltips_set_tip(GTK_TOOLTIPS(filteringdebug_level_tooltip), optmenu_filteringdebug_level,
-                            _("Select the level of detail displayed if debugging is enabled.\n"
-                               "Choose low level to see when rules are applied, what conditions match or not and what actions are performed.\n"
-                               "Choose medium level to see more detail about the message that is being processed, and why rules are skipped.\n"
-                               "Choose high level to explicitely show the reason why all rules are skipped or not, and why all conditions are matching or not.\n"
-                               "Caution: the higher the level is, the more it will impact the performances."),
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(filteringdebug_level_tooltip),
+                            optmenu_filteringdebug_level,
+                            _("Select the level of detail of the logging.\n"
+                               "Choose Low to see when rules are applied, which "
+                               "conditions match or don't match and what actions are "
+                               "performed.\n"
+                               "Choose Medium to see more details about the message "
+                               "that is being processed, and why rules are skipped.\n"
+                               "Choose High to explicitly show the reason why all "
+                               "rules are processed or skipped, and why all conditions "
+                               "are matched or not matched.\n"
+                               "Caution: the higher the level, the greater the "
+                               "impact on performance."),
                             NULL);
 
        PACK_CHECK_BUTTON (vbox_filteringdebug_log, checkbtn_debug_cliplog,
-                          _("Clip the log size"));
+                          _("Restrict the log size"));
        hbox_debug_cliplog = gtk_hbox_new (FALSE, 8);
        gtk_container_add (GTK_CONTAINER (vbox_filteringdebug_log), hbox_debug_cliplog);
        gtk_widget_show (hbox_debug_cliplog);
@@ -336,9 +345,9 @@ static void prefs_logging_save(PrefsPage *_page)
                GTK_TOGGLE_BUTTON(page->checkbtn_filteringdebug));
        if (filtering_debug_enabled != prefs_common.enable_filtering_debug) {
                if (prefs_common.enable_filtering_debug)
-                       log_message(LOG_DEBUG_FILTERING, _("filtering debug enabled\n"));
+                       log_message(LOG_DEBUG_FILTERING, _("filtering log enabled\n"));
                else
-                       log_message(LOG_DEBUG_FILTERING, _("filtering debug disabled\n"));
+                       log_message(LOG_DEBUG_FILTERING, _("filtering log disabled\n"));
        }
        prefs_common.enable_filtering_debug_inc = gtk_toggle_button_get_active(
                GTK_TOGGLE_BUTTON(page->checkbtn_filteringdebug_inc));