2007-01-27 [paul] 2.7.2cvs3

	* src/prefs_folder_item.c
	* src/prefs_receive.c
	* src/plugins/pgpcore/prefs_gpg.c
		use 'start-up' instead of 'startup' in labels

diff --git a/ChangeLog b/ChangeLog
index 8c6cae584e1d862b3ec764edc4c1bd46c6db32b0..33777d30d05b1863246cf9b991583feb3af8b73f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-27 [paul]      2.7.2cvs3
+
+       * src/prefs_folder_item.c
+       * src/prefs_receive.c
+       * src/plugins/pgpcore/prefs_gpg.c
+               use 'start-up' instead of 'startup' in labels
+
 2007-01-26 [wwp]       2.7.2cvs2
 
        * src/plugins/trayicon/Makefile.am

diff --git a/PATCHSETS b/PATCHSETS
index d0b502d0fa3a9ba373770780b3be179ab51b11f9..c5fdc67ac35275fe2620dbd4deb374e030bd372b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2320,3 +2320,4 @@
 ( cvs diff -u -r 1.60.2.41 -r 1.60.2.42 po/es.po;  ) > 2.7.1cvs60.patchset
 ( cvs diff -u -r 1.42.2.26 -r 1.42.2.27 NEWS;  cvs diff -u -r 1.8.2.30 -r 1.8.2.31 README;  cvs diff -u -r 1.1.2.15 -r 1.1.2.16 RELEASE_NOTES;  cvs diff -u -r 1.654.2.2372 -r 1.654.2.2373 configure.ac;  ) > 2.7.2cvs1.patchset
 ( cvs diff -u -r 1.4.2.8 -r 1.4.2.9 src/plugins/trayicon/Makefile.am;  cvs diff -u -r 1.14.2.47 -r 1.14.2.48 src/plugins/trayicon/trayicon.c;  diff -u /dev/null src/plugins/trayicon/trayicon_prefs.c;  diff -u /dev/null src/plugins/trayicon/trayicon_prefs.h;  ) > 2.7.2cvs2.patchset
+( cvs diff -u -r 1.52.2.36 -r 1.52.2.37 src/prefs_folder_item.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_receive.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/plugins/pgpcore/prefs_gpg.c;  ) > 2.7.2cvs3.patchset

diff --git a/configure.ac b/configure.ac
index ac0014c3f50faca79345d33b6c3dcf298d42e16d..cb216b92726f944a09ec46d7fdaa5c62af1f87dd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=2
+EXTRA_VERSION=3
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/pgpcore/prefs_gpg.c b/src/plugins/pgpcore/prefs_gpg.c
index 5743f2913d99c987caa66df380d8b4826e610a73..6591cbe24218922c07c283f3a3bdea95c454d91b 100644 (file)
--- a/src/plugins/pgpcore/prefs_gpg.c
+++ b/src/plugins/pgpcore/prefs_gpg.c
@@ -141,7 +141,7 @@ static void prefs_gpg_create_widget_func(PrefsPage *_page,
        gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
 
        PACK_CHECK_BUTTON (vbox2, checkbtn_gpg_warning,
-                       _("Display warning on startup if GnuPG doesn't work"));
+                       _("Display warning on start-up if GnuPG doesn't work"));
 
        config = prefs_gpg_get_config();
 

diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index da5c39e34db70aacda03697a950a43e34a781658..0ddb0e43c41bc0cb24a142024190ef4ee1461723 100644 (file)
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -381,7 +381,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        rowcount++;
 
        /* Enable processing at startup */
-       checkbtn_enable_processing = gtk_check_button_new_with_label(_("Process at startup"));
+       checkbtn_enable_processing = gtk_check_button_new_with_label(_("Process at start-up"));
        gtk_table_attach(GTK_TABLE(table), checkbtn_enable_processing, 0, 2, 
                         rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
 

diff --git a/src/prefs_receive.c b/src/prefs_receive.c
index ab846d208f15abc81b0a024fa038f8e645342f4c..2299c1eee167714a8ba193badae6731742594896 100644 (file)
--- a/src/prefs_receive.c
+++ b/src/prefs_receive.c
@@ -162,7 +162,7 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
        SET_TOGGLE_SENSITIVITY(checkbtn_autochk, label_autochk2);
 
        PACK_CHECK_BUTTON (vbox2, checkbtn_chkonstartup,
-                          _("Check for new mail on startup"));
+                          _("Check for new mail on start-up"));
 
        /* receive dialog */
        vbox2 = gtkut_get_options_frame(vbox1, &frame, _("Dialogs"));