From: Colin Leroy <colin@colino.net>
Date: Tue, 28 Sep 2004 11:43:43 +0000 (+0000)
Subject: 2004-09-28 [colin]	0.9.12cvs111
X-Git-Tag: rel_0_9_13~101
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=0ffb528b716e8bb3364687fc69f4c725f5abe77f

2004-09-28 [colin]	0.9.12cvs111

	* src/mainwindow.c
		Relabel Empty all Trash folders
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index d1fe60b2b..1467167fa 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2004-09-28 [colin]	0.9.12cvs111
+
+	* src/mainwindow.c
+		Relabel Empty all Trash folders
+
 2004-09-28 [colin]	0.9.12cvs110
 
 	* src/folderview.c
diff --git a/PATCHSETS b/PATCHSETS
index e9842a160..2f68b7a65 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -93,3 +93,4 @@
 ( cvs diff -u -r 1.73 -r 1.74 src/addressbook.c; ) > 0.9.12cvs108.patchset
 ( cvs diff -u -r 1.306 -r 1.307 src/mainwindow.c; ) > 0.9.12cvs109.patchset
 ( cvs diff -u -r 1.246 -r 1.247 src/folderview.c; cvs diff -u -r 1.307 -r 1.308 src/mainwindow.c; ) > 0.9.12cvs110.patchset
+( cvs diff -u -r 1.308 -r 1.309 src/mainwindow.c; ) > 0.9.12cvs111.patchset
diff --git a/configure.ac b/configure.ac
index 17d894dae..ccdaacc6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=110
+EXTRA_VERSION=111
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 17acb0b4d..8ccf41df3 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -438,7 +438,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
 	{N_("/_File/Change folder order"),	NULL, foldersort_cb,  0, NULL},
 	{N_("/_File/_Import mbox file..."),	NULL, import_mbox_cb, 0, NULL},
 	{N_("/_File/_Export to mbox file..."),	NULL, export_mbox_cb, 0, NULL},
-	{N_("/_File/Empty _trash"),		"<shift>D", empty_trash_cb, 0, NULL},
+	{N_("/_File/Empty all Trash folders"),	"<shift>D", empty_trash_cb, 0, NULL},
 	{N_("/_File/---"),			NULL, NULL, 0, "<Separator>"},
 	{N_("/_File/_Save as..."),		"<control>S", save_as_cb, 0, NULL},
 	{N_("/_File/_Print..."),		NULL, print_cb, 0, NULL},
@@ -1696,7 +1696,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                 {"/File/Add mailbox/MH..."   		      , M_UNLOCKED},
 		{"/File/Change folder order"	      	      , M_UNLOCKED},
 		{"/File/Export to mbox file..."               , M_UNLOCKED},
-		{"/File/Empty trash"                          , M_UNLOCKED},
+		{"/File/Empty all Trash folders"              , M_UNLOCKED},
 		{"/File/Work offline"	       		      , M_UNLOCKED},
 
 		{"/File/Save as...", M_TARGET_EXIST|M_UNLOCKED},