+2007-08-11 [paul] 2.10.0cvs113
+
+ * src/addrgather.c
+ * src/folderview.c
+ use 'subfolder' instead of 'sub-folder', matching
+ everywhere else the term is used
+ * src/imap_gtk.c
+ fix engrish
+
2007-08-10 [wwp] 2.10.0cvs112
* src/msgcache.c
( cvs diff -u -r 1.179.2.180 -r 1.179.2.181 src/imap.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/etpan/etpan-thread-manager-types.h; cvs diff -u -r 1.1.4.81 -r 1.1.4.82 src/etpan/imap-thread.c; cvs diff -u -r 1.1.4.18 -r 1.1.4.19 src/etpan/imap-thread.h; ) > 2.10.0cvs110.patchset
( cvs diff -u -r 1.16.2.55 -r 1.16.2.56 src/msgcache.c; cvs diff -u -r 1.17.2.10 -r 1.17.2.11 src/recv.c; ) > 2.10.0cvs111.patchset
( cvs diff -u -r 1.16.2.56 -r 1.16.2.57 src/msgcache.c; ) > 2.10.0cvs112.patchset
+( cvs diff -u -r 1.5.10.19 -r 1.5.10.20 src/addrgather.c; cvs diff -u -r 1.207.2.172 -r 1.207.2.173 src/folderview.c; cvs diff -u -r 1.1.2.48 -r 1.1.2.49 src/imap_gtk.c; ) > 2.10.0cvs113.patchset
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=112
+EXTRA_VERSION=113
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
/* Recurse folders */
top += 4;
- checkRecurse = gtk_check_button_new_with_label( _("Include sub-folders" ) );
+ checkRecurse = gtk_check_button_new_with_label( _("Include subfolders" ) );
gtk_table_attach( GTK_TABLE(table), checkRecurse, 0, 2, top, (top + 1),
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0 );
if (prefs_common.warn_dnd) {
buf = g_strdup_printf(copy ? _("Do you really want to copy folder '%s' in '%s' ?"):
- _("Do you really want to make folder '%s' a sub-folder of '%s' ?"),
+ _("Do you really want to make folder '%s' a subfolder of '%s' ?"),
from_folder->name, to_folder->name);
status = alertpanel_full(copy ? _("Copy folder"):_("Move folder"), buf,
GTK_STOCK_NO, GTK_STOCK_YES, NULL, TRUE,
(_("New folder"),
_("Input the name of new folder:\n"
"(if you want to create a folder to store subfolders\n"
- "and no mails, append '/' at the end of the name)"),
+ "only and no mail, append '/' to the folder name)"),
_("NewFolder"));
if (!new_folder) return;
AUTORELEASE_STR(new_folder, {g_free(new_folder); return;});