From: Paul Mangan <paul@claws-mail.org>
Date: Fri, 19 Jan 2007 09:04:08 +0000 (+0000)
Subject: 2007-01-19 [paul]	2.7.1cvs33
X-Git-Tag: rel_2_8_0~105
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=7a839dbf3a3f292878067538199d8c62cb5d4a73

2007-01-19 [paul]	2.7.1cvs33

	* src/imap_gtk.c
	* src/prefs_account.c
		a few changes to the English
---

diff --git a/ChangeLog b/ChangeLog
index 75324743a..9b7349a62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-19 [paul]	2.7.1cvs33
+
+	* src/imap_gtk.c
+	* src/prefs_account.c
+		a few changes to the English
+
 2007-01-19 [fabien]	2.7.1cvs32
 
 	* src/wizard.c
diff --git a/PATCHSETS b/PATCHSETS
index 4577e9321..a06936017 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2290,3 +2290,4 @@
 ( cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/prefs_other.c;  ) > 2.7.1cvs30.patchset
 ( cvs diff -u -r 1.115.2.126 -r 1.115.2.127 src/main.c;  ) > 2.7.1cvs31.patchset
 ( cvs diff -u -r 1.1.2.47 -r 1.1.2.48 src/wizard.c;  ) > 2.7.1cvs32.patchset
+( cvs diff -u -r 1.1.2.41 -r 1.1.2.42 src/imap_gtk.c;  cvs diff -u -r 1.105.2.82 -r 1.105.2.83 src/prefs_account.c;  ) > 2.7.1cvs33.patchset
diff --git a/configure.ac b/configure.ac
index 632f6311d..1d6a920f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=32
+EXTRA_VERSION=33
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/imap_gtk.c b/src/imap_gtk.c
index fc118ed23..c80a4ef31 100644
--- a/src/imap_gtk.c
+++ b/src/imap_gtk.c
@@ -127,7 +127,7 @@ static void set_sensitivity(GtkItemFactory *factory, FolderItem *item)
 	
 	SET_SENS("/Subscriptions/Unsubscribe...",    item->stype == F_NORMAL && folder_item_parent(item) != NULL);
 	SET_SENS("/Subscriptions/Subscribe...",    TRUE);
-	menu_set_active(factory, "/Subscriptions/Show only subscribed folders", item->folder->account->imap_subsonly);
+	menu_set_active(factory, "/Subscriptions/Show subscribed folders only", item->folder->account->imap_subsonly);
 
 #undef SET_SENS
 }
@@ -221,7 +221,7 @@ static void rename_folder_cb(FolderView *folderview, guint action,
 
 	separator = imap_get_path_separator_for_item(item);
 	if (strchr(new_folder, separator) != NULL) {
-		alertpanel_error(_("`%c' can't be included in folder name."),
+		alertpanel_error(_("'%c' can't be included in folder name."),
 				 separator);
 		return;
 	}
@@ -429,10 +429,10 @@ static void subscribe_cb(FolderView *folderview, guint action,
 		GList *child_list = NULL;
 		
 		message = g_strdup_printf
-			(_("Do you want to look for unsubscribed subfolders of '%s'?"),
+			(_("Do you want to search for unsubscribed subfolders of '%s'?"),
 			 name);
 
-		rec_chk = gtk_check_button_new_with_label(_("Look recursively"));
+		rec_chk = gtk_check_button_new_with_label(_("Search recursively"));
 
 		g_signal_connect(G_OBJECT(rec_chk), "toggled", 
 				G_CALLBACK(chk_update_val), &recurse);
@@ -465,7 +465,7 @@ static void subscribe_cb(FolderView *folderview, guint action,
 			if (r == 0)
 				folderview_fast_rescan_tree(item->folder);
 		} else {
-			alertpanel_notice(_("This folder is already subscribed to and "
+			alertpanel_notice(_("This folder is already subscribed and "
 				  "has no unsubscribed subfolders."));
 		}
 		g_list_free(child_list);
diff --git a/src/prefs_account.c b/src/prefs_account.c
index 48888a51c..955830ebb 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1671,7 +1671,7 @@ static void prefs_account_receive_create(void)
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 4);
 
 	PACK_CHECK_BUTTON (hbox1, subsonly_chkbtn,
-			   _("Show only subscribed folders"));
+			   _("Show subscribed folders only"));
 
 	PACK_CHECK_BUTTON (vbox1, filter_on_recv_chkbtn,
 			   _("Filter messages on receiving"));