2007-03-24 [paul] 2.8.1cvs47

	* src/folderview.c
		an improvement to English usage
	* tools/kdeservicemenu/README
		updated Claws url

diff --git a/ChangeLog b/ChangeLog
index 2e92f1578bb770e6c3a84b996ec7f9882627fbd9..d87ba79f3b26a5a6c5e25a2beb8680a02dd55f0d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-24 [paul]      2.8.1cvs47
+
+       * src/folderview.c
+               an improvement to English usage
+       * tools/kdeservicemenu/README
+               updated Claws url
+

 2007-03-24 [paul]      2.8.1cvs46
 
        * src/Makefile.am
 2007-03-24 [paul]      2.8.1cvs46
 
        * src/Makefile.am

diff --git a/PATCHSETS b/PATCHSETS
index 67271d3cba0a9713f0b33b69ade6f9b5b3840fbf..c1df825814732269e513cd34b9e1c78c28e75f1d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2463,3 +2463,4 @@
 ( cvs diff -u -r 1.179.2.160 -r 1.179.2.161 src/imap.c;  ) > 2.8.1cvs44.patchset
 ( cvs diff -u -r 1.43.2.62 -r 1.43.2.63 src/toolbar.c;  ) > 2.8.1cvs45.patchset
 ( cvs diff -u -r 1.155.2.57 -r 1.155.2.58 src/Makefile.am;  cvs diff -u -r 1.25.2.34 -r 1.25.2.35 src/stock_pixmap.c;  diff -u /dev/null src/pixmaps/edit_extern.xpm;  diff -u /dev/null src/pixmaps/mail_sign.xpm;  ) > 2.8.1cvs46.patchset
 ( cvs diff -u -r 1.179.2.160 -r 1.179.2.161 src/imap.c;  ) > 2.8.1cvs44.patchset
 ( cvs diff -u -r 1.43.2.62 -r 1.43.2.63 src/toolbar.c;  ) > 2.8.1cvs45.patchset
 ( cvs diff -u -r 1.155.2.57 -r 1.155.2.58 src/Makefile.am;  cvs diff -u -r 1.25.2.34 -r 1.25.2.35 src/stock_pixmap.c;  diff -u /dev/null src/pixmaps/edit_extern.xpm;  diff -u /dev/null src/pixmaps/mail_sign.xpm;  ) > 2.8.1cvs46.patchset

+( cvs diff -u -r 1.207.2.154 -r 1.207.2.155 src/folderview.c;  cvs diff -u -r 1.2.2.9 -r 1.2.2.10 tools/kdeservicemenu/README;  ) > 2.8.1cvs47.patchset

diff --git a/configure.ac b/configure.ac
index f040b5f95302467520f11a5c7fdff4d5c3619a44..d36bceb4faa2e2d1595b7df35883ca899c416d5a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=46
+EXTRA_VERSION=47

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folderview.c b/src/folderview.c
index 87d2c25b85f4156f95cbb4434466ffd41bcc5a09..c74dc773f5dc4082c14825fa27a092776e5a9e7b 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -2499,7 +2499,7 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
                                                _("Can't move a folder to one of its children."));
                        break;
                case F_MOVE_FAILED_DEST_OUTSIDE_MAILBOX:
                                                _("Can't move a folder to one of its children."));
                        break;
                case F_MOVE_FAILED_DEST_OUTSIDE_MAILBOX:

-                       alertpanel_error(_("Folder moving cannot be done between different mailboxes."));
+                       alertpanel_error(_("A folder cannot be moved between different mailboxes."));

                        break;
                default:
                        alertpanel_error(copy ? _("Copy failed!"):_("Move failed!"));
                        break;
                default:
                        alertpanel_error(copy ? _("Copy failed!"):_("Move failed!"));

diff --git a/tools/kdeservicemenu/README b/tools/kdeservicemenu/README
index b25884e63591986804243ff31f3c299b6e990988..223101b48adb1270bedce6a6356d05652393adb1 100644 (file)
--- a/tools/kdeservicemenu/README
+++ b/tools/kdeservicemenu/README
@@ -54,7 +54,7 @@ Translators:
 [sk] Andrej Kacian <andrej@kacian.sk>
 
 LINKS
 [sk] Andrej Kacian <andrej@kacian.sk>
 
 LINKS

-Claws Mail <http://claws.sylpheed.org/>
+Claws Mail <http://www.claws-mail.org/>

 Perl <http://www.perl.org>
 KDE <http://www.kde.org>
 
 Perl <http://www.perl.org>
 KDE <http://www.kde.org>