From 6ab70aeec58ed414e90ca0d4aa7c3280644c2307 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Wed, 20 Dec 2006 14:25:07 +0000 Subject: [PATCH] 2006-12-20 [wwp] 2.6.1cvs57 * src/prefs_common.c * src/prefs_summaries.c i18n fix and factorize patch, thanks to Fabien. --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/prefs_common.c | 4 ++++ src/prefs_summaries.c | 4 ++-- 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c4318994..5ecbcc73c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-12-20 [wwp] 2.6.1cvs57 + + * src/prefs_common.c + * src/prefs_summaries.c + i18n fix and factorize patch, thanks to Fabien. + 2006-12-20 [paul] 2.6.1cvs56 * configure.ac diff --git a/PATCHSETS b/PATCHSETS index 8e2f44b24..d5e6e7740 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2164,3 +2164,4 @@ ( cvs diff -u -r 1.18.2.18 -r 1.18.2.19 src/jpilot.c; ) > 2.6.1cvs54.patchset ( cvs diff -u -r 1.18.2.19 -r 1.18.2.20 src/jpilot.c; ) > 2.6.1cvs55.patchset ( cvs diff -u -r 1.654.2.2217 -r 1.654.2.2218 configure.ac; cvs diff -u -r 1.115.2.120 -r 1.115.2.121 src/main.c; cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/plugins/bogofilter/bogofilter.c; ) > 2.6.1cvs56.patchset +( cvs diff -u -r 1.204.2.112 -r 1.204.2.113 src/prefs_common.c; cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/prefs_summaries.c; ) > 2.6.1cvs57.patchset diff --git a/configure.ac b/configure.ac index e90fb286d..57f9451ed 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=6 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=56 +EXTRA_VERSION=57 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/prefs_common.c b/src/prefs_common.c index d8d2f538a..75dc39596 100644 --- a/src/prefs_common.c +++ b/src/prefs_common.c @@ -887,6 +887,10 @@ void prefs_common_read_config(void) g_free(prefs_common.date_format); prefs_common.date_format = tmp; + tmp = g_strdup(gettext(prefs_common.compose_body_format)); + g_free(prefs_common.compose_body_format); + prefs_common.compose_body_format = tmp; + prefs_common.mime_open_cmd_history = prefs_common_read_history(COMMAND_HISTORY); prefs_common.summary_quicksearch_history = diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c index 642fc8d15..72019d990 100644 --- a/src/prefs_summaries.c +++ b/src/prefs_summaries.c @@ -897,7 +897,7 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, gtk_box_pack_start (GTK_BOX (vbox4), hbox1, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox1), gtk_label_new - (_("Mark messages as read after ")), FALSE, FALSE, 0); + (_("Mark messages as read after")), FALSE, FALSE, 0); spinbtn_mark_as_read_delay_adj = gtk_adjustment_new (0, 0, 60, 1, 10, 10); spinbtn_mark_as_read_delay = gtk_spin_button_new @@ -908,7 +908,7 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_mark_as_read_delay), TRUE); gtk_box_pack_start (GTK_BOX (hbox1), gtk_label_new - (_(" seconds")), FALSE, FALSE, 0); + (_("seconds")), FALSE, FALSE, 0); gtk_widget_show_all(hbox1); vbox5 = gtk_vbox_new (FALSE, 0); -- 2.25.1