From fe3f268c8877650cebbace74214a72fa5493af33 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Mon, 18 Dec 2006 20:04:10 +0000 Subject: [PATCH] 2006-12-18 [wwp] 2.6.1cvs48 * src/compose.c * src/prefs_quote.c Factorize some strings for translation (it's about error messages when applying or checking template/quote format). --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/compose.c | 8 ++++---- src/prefs_quote.c | 4 ++-- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index b667367ea..c6d49e025 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-12-18 [wwp] 2.6.1cvs48 + + * src/compose.c + * src/prefs_quote.c + Factorize some strings for translation (it's about error + messages when applying or checking template/quote format). + 2006-12-18 [colin] 2.6.1cvs47 * Makefile.am diff --git a/PATCHSETS b/PATCHSETS index ffbd2e96c..e0aeabafb 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2155,3 +2155,4 @@ ( cvs diff -u -r 1.1.4.22 -r 1.1.4.23 src/gtk/logwindow.c; ) > 2.6.1cvs45.patchset ( cvs diff -u -r 1.83.2.94 -r 1.83.2.95 src/mimeview.c; cvs diff -u -r 1.96.2.162 -r 1.96.2.163 src/textview.c; cvs diff -u -r 1.2.2.27 -r 1.2.2.28 src/gtk/filesel.c; ) > 2.6.1cvs46.patchset ( cvs diff -u -r 1.24.2.17 -r 1.24.2.18 Makefile.am; cvs diff -u -r 1.9.2.31 -r 1.9.2.32 src/common/defs.h; cvs diff -u -r 1.20.2.11 -r 1.20.2.12 src/gtk/Makefile.am; cvs diff -u -r 1.4.2.44 -r 1.4.2.45 src/gtk/about.c; ) > 2.6.1cvs47.patchset +( cvs diff -u -r 1.382.2.341 -r 1.382.2.342 src/compose.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/prefs_quote.c; ) > 2.6.1cvs48.patchset diff --git a/configure.ac b/configure.ac index 571bb1652..3f47d5dad 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=47 +EXTRA_VERSION=48 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/compose.c b/src/compose.c index bf167cdf3..c849aadaf 100644 --- a/src/compose.c +++ b/src/compose.c @@ -6960,7 +6960,7 @@ void compose_template_apply_fields(Compose *compose, Template *tmpl) buf = quote_fmt_get_buffer(); if (buf == NULL) { - alertpanel_error(_("Message To format error.")); + alertpanel_error(_("Template To format error.")); } else { compose_entry_append(compose, buf, COMPOSE_TO); } @@ -6973,7 +6973,7 @@ void compose_template_apply_fields(Compose *compose, Template *tmpl) buf = quote_fmt_get_buffer(); if (buf == NULL) { - alertpanel_error(_("Message Cc format error.")); + alertpanel_error(_("Template Cc format error.")); } else { compose_entry_append(compose, buf, COMPOSE_CC); } @@ -6986,7 +6986,7 @@ void compose_template_apply_fields(Compose *compose, Template *tmpl) buf = quote_fmt_get_buffer(); if (buf == NULL) { - alertpanel_error(_("Message Bcc format error.")); + alertpanel_error(_("Template Bcc format error.")); } else { compose_entry_append(compose, buf, COMPOSE_BCC); } @@ -7000,7 +7000,7 @@ void compose_template_apply_fields(Compose *compose, Template *tmpl) buf = quote_fmt_get_buffer(); if (buf == NULL) { - alertpanel_error(_("Message subject format error.")); + alertpanel_error(_("Template subject format error.")); } else { gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), buf); } diff --git a/src/prefs_quote.c b/src/prefs_quote.c index afd4c8171..ef154264b 100644 --- a/src/prefs_quote.c +++ b/src/prefs_quote.c @@ -258,12 +258,12 @@ void prefs_quote_save(PrefsPage *_page) prefs_common.quotefmt = pref_get_pref_from_textview( GTK_TEXT_VIEW(page->text_quotefmt)); if (!prefs_template_string_is_valid(prefs_common.quotefmt)) - alertpanel_error(_("Message reply quote format error.")); + alertpanel_error(_("Message reply format error.")); prefs_common.fw_quotefmt = pref_get_pref_from_textview( GTK_TEXT_VIEW(page->text_fw_quotefmt)); if (!prefs_template_string_is_valid(prefs_common.fw_quotefmt)) - alertpanel_error(_("Message forward quote format error.")); + alertpanel_error(_("Message forward format error.")); prefs_common.quotemark = gtk_editable_get_chars( GTK_EDITABLE(page->entry_quotemark), 0, -1); -- 2.25.1