2006-09-16 [paul] 2.4.0cvs190

	* src/account.c
		improvements to the English

diff --git a/ChangeLog b/ChangeLog
index 91cbd91f9adcddee7b9c9967e9ad96d6319b87de..c6b17662333e339a9d9baed6f5ca59eb32ef5969 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-16 [paul]      2.4.0cvs190
+
+       * src/account.c
+               improvements to the English
+
 2006-09-15 [colin]     2.4.0cvs189
 
        * src/summaryview.c

diff --git a/PATCHSETS b/PATCHSETS
index 1f0c41ce67d727ff48ddfb3909022e9a4b2a0bc5..97fc586cd3f2d6f27cc812aa0fef9568b15c7048 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1881,3 +1881,4 @@
 ( cvs diff -u -r 1.1.2.29 -r 1.1.2.30 manual/advanced.xml;  cvs diff -u -r 1.5.2.37 -r 1.5.2.38 src/gtk/pluginwindow.c;  ) > 2.4.0cvs187.patchset
 ( cvs diff -u -r 1.13.2.21 -r 1.13.2.22 src/common/socket.c;  cvs diff -u -r 1.13.2.7 -r 1.13.2.8 src/common/socket.h;  cvs diff -u -r 1.9.2.14 -r 1.9.2.15 src/common/ssl.c;  cvs diff -u -r 1.4.2.11 -r 1.4.2.12 src/common/ssl_certificate.c;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/common/ssl_certificate.h;  cvs diff -u -r 1.1.4.50 -r 1.1.4.51 src/etpan/imap-thread.c;  ) > 2.4.0cvs188.patchset
 ( cvs diff -u -r 1.395.2.249 -r 1.395.2.250 src/summaryview.c;  ) > 2.4.0cvs189.patchset
+( cvs diff -u -r 1.61.2.52 -r 1.61.2.53 src/account.c;  ) > 2.4.0cvs190.patchset

diff --git a/configure.ac b/configure.ac
index 1e3e8220b59ce5ee6e63421f2bac9f09eb2f371f..d069096a23ab609faa941351793c23d72d365c9f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=189
+EXTRA_VERSION=190
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/account.c b/src/account.c
index d1d53f25ff87fbca452ea4c10a48cf0c65fc80b4..0c01275ee36903a639ae66774baf50d97597d9d3 100644 (file)
--- a/src/account.c
+++ b/src/account.c
@@ -697,11 +697,13 @@ static void account_edit_create(void)
        gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
        label = gtk_label_new
-               (_("New messages will be checked in this order. Check the boxes\n"
-                  "on the 'G' column to enable message retrieval by 'Get Mail'."));
+               (_("Using 'Get Mail' will retrieve messages from your Accounts "
+                  "in the order given, the checkbox in the 'G' column indicates "
+                  "which accounts will be included."));
        gtk_widget_show (label);
        gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 4);
        gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
+       gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
 
        hbox = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox);
@@ -1467,7 +1469,7 @@ static void account_create_list_view_columns(GtkWidget *list_view)
        gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);          
        gtk_tree_view_column_set_alignment (column, 0.5);
        gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), column->button,
-                       _("'Get Mail' retrieve mails for all checked accounts"), NULL);
+                       _("'Get Mail' retrieves mail from the checked accounts"), NULL);
        g_signal_connect(G_OBJECT(renderer), "toggled",                      
                         G_CALLBACK(account_get_all_toggled),
                         list_view);