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

diff --git a/ChangeLog b/ChangeLog
index fbc092e4db996552756b5f8c16098fa8777ddd6e..5f8fa59e5eddc29eeeb531a67e022492f8b616c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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

diff --git a/PATCHSETS b/PATCHSETS
index ba7c00c6a8ef5dddf24c70212a518117fd2c884f..8648639692d851aa0df5ea3948813bdb6fb87842 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2766,3 +2766,4 @@
 ( 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

diff --git a/configure.ac b/configure.ac
index 24611ef08849c6bc3f2c2d18c6f4d78104e43c67..7216c6cd894c7a8b2efb32ee7fb08ef590a30749 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=112
+EXTRA_VERSION=113
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addrgather.c b/src/addrgather.c
index f2e32ee90516d2218a21b1466108186b44e46c9a..a941ad8698faa18e7b9b25a2c4962d5498632652 100644 (file)
--- a/src/addrgather.c
+++ b/src/addrgather.c
@@ -405,7 +405,7 @@ static void addrgather_page_fields( gint pageNum, gchar *pageLbl ) {
 
        /* 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 );
 

diff --git a/src/folderview.c b/src/folderview.c
index 0d14d70af0bbb7d97f68e19b7e2e74945a5f3d31..302d948707beaa03548579d200ed40b525106347 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -2522,7 +2522,7 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
        
        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,

diff --git a/src/imap_gtk.c b/src/imap_gtk.c
index c9453d63564a14a0e8184c384fc206ca2ab49c84..ad247b7458b32a31f8f22d07589a078adbc5b910 100644 (file)
--- a/src/imap_gtk.c
+++ b/src/imap_gtk.c
@@ -155,7 +155,7 @@ static void new_folder_cb(FolderView *folderview, guint action,
                (_("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;});