2007-03-17 [paul] 2.8.1cvs22

	* src/main.c
		fix a typo, and be a little more verbose.

diff --git a/ChangeLog b/ChangeLog
index b051ed97e5504886bb38f6b601cdf71c9bd357aa..5874c37dad8cb6512e212ef05b50636976f3aa9d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-17 [paul]      2.8.1cvs22
+
+       * src/main.c
+               fix a typo, and be a little more verbose.
+
 2007-03-17 [wwp]       2.8.1cvs21
 
        * src/inc.c

diff --git a/PATCHSETS b/PATCHSETS
index 9294c127463c598d82803a82a3cc62025c9e57f9..2cc117738e85691d030c5da3579ce83078b838a9 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2438,3 +2438,4 @@
 ( cvs diff -u -r 1.12.2.42 -r 1.12.2.43 src/action.c;  ) > 2.8.1cvs19.patchset
 ( cvs diff -u -r 1.25.2.18 -r 1.25.2.19 tools/Makefile.am;  cvs diff -u -r 1.30.2.18 -r 1.30.2.19 tools/README;  ) > 2.8.1cvs20.patchset
 ( cvs diff -u -r 1.149.2.66 -r 1.149.2.67 src/inc.c;  ) > 2.8.1cvs21.patchset
+( cvs diff -u -r 1.115.2.142 -r 1.115.2.143 src/main.c;  ) > 2.8.1cvs22.patchset

diff --git a/configure.ac b/configure.ac
index 98cd180d59bb0065bd1731497e1964402ba6bd36..d74eb755b58a7f1487f0b7cb28d61a4ef9bb9cc3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=21
+EXTRA_VERSION=22
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index dae04eab5edd4bbbe342009db718c0625687820c..95ae57775c069452ee3d0f6aad3342f6f544507e 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -915,10 +915,10 @@ int main(int argc, char *argv[])
                main_window_cursor_normal(mainwin);
                if (folder_get_list() != NULL) {
                        alertpanel_error(_("Claws Mail has detected a configured "
-                                  "mailbox, but is it incomplete. It is "
+                                  "mailbox, but it is incomplete. It is "
                                   "possibly due to a failing IMAP account. Use "
-                                  "\"Rebuild folder tree\" on the mailbox's folder "
-                                  "to try to fix it."));
+                                  "\"Rebuild folder tree\" on the mailbox parent "
+                                  "folder's context menu to try to fix it."));
                } else {
                        alertpanel_error(_("Claws Mail has detected a configured "
                                   "mailbox, but could not load it. It is "