From: Colin Leroy Date: Mon, 7 Jul 2008 16:53:28 +0000 (+0000) Subject: 2008-07-07 [colin] 3.5.0cvs16 X-Git-Tag: rel_3_6_0~141 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=d5e9190738104210665a15a0d1275534566174a9 2008-07-07 [colin] 3.5.0cvs16 * src/prefs_summaries.c Revert my fix to the string, the correct term is indeed Message View --- diff --git a/ChangeLog b/ChangeLog index 9d35305c0..074da8911 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-07-07 [colin] 3.5.0cvs16 + + * src/prefs_summaries.c + Revert my fix to the string, the correct term + is indeed Message View + 2008-07-07 [colin] 3.5.0cvs15 * AUTHORS diff --git a/PATCHSETS b/PATCHSETS index db1399a5d..e404ac2d4 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3427,3 +3427,4 @@ ( cvs diff -u -r 1.274.2.247 -r 1.274.2.248 src/mainwindow.c; cvs diff -u -r 1.39.2.47 -r 1.39.2.48 src/mainwindow.h; cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/plugins/pgpcore/prefs_gpg.c; ) > 3.5.0cvs13.patchset ( cvs diff -u -r 1.5.10.20 -r 1.5.10.21 src/addrgather.c; cvs diff -u -r 1.274.2.248 -r 1.274.2.249 src/mainwindow.c; ) > 3.5.0cvs14.patchset ( cvs diff -u -r 1.100.2.62 -r 1.100.2.63 AUTHORS; cvs diff -u -r 1.1.2.49 -r 1.1.2.50 src/gtk/authors.h; cvs diff -u -r 1.204.2.173 -r 1.204.2.174 src/prefs_common.c; cvs diff -u -r 1.103.2.110 -r 1.103.2.111 src/prefs_common.h; cvs diff -u -r 1.1.2.53 -r 1.1.2.54 src/prefs_summaries.c; cvs diff -u -r 1.395.2.371 -r 1.395.2.372 src/summaryview.c; cvs diff -u -r 1.1.2.49 -r 1.1.2.50 src/gtk/authors.h; ) > 3.5.0cvs15.patchset +( cvs diff -u -r 1.1.2.54 -r 1.1.2.55 src/prefs_summaries.c; ) > 3.5.0cvs16.patchset diff --git a/configure.ac b/configure.ac index 831796729..8602d1007 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=5 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=15 +EXTRA_VERSION=16 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c index c8dd7810b..996fc1428 100644 --- a/src/prefs_summaries.c +++ b/src/prefs_summaries.c @@ -467,7 +467,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, gtk_widget_show (optmenu_always_show_msg); COMBOBOX_ADD (menu, _("Never"), OPENMSG_REQUEST_ONLY); COMBOBOX_ADD (menu, _("Always"), OPENMSG_ALWAYS); - COMBOBOX_ADD (menu, _("When message preview is visible"), + COMBOBOX_ADD (menu, _("When message view is visible"), OPENMSG_WHEN_VIEW_VISIBLE); gtk_box_pack_start(GTK_BOX(hbox1), optmenu_always_show_msg, FALSE, FALSE, 0);