From: Tristan Chabredier Date: Thu, 5 Jul 2007 20:10:52 +0000 (+0000) Subject: 2007-07-05 [wwp] 2.10.0cvs7 X-Git-Tag: rel_3_0_0~190 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=83e001eba3460591f8dc4495cdbccab0ab4a4bbc 2007-07-05 [wwp] 2.10.0cvs7 * src/quote_fmt.c It's %am that works, not %ae (this doc incoherence has been introduced with 2.9.2cvs14). --- diff --git a/ChangeLog b/ChangeLog index 369e22f34..7d6026df3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-07-05 [wwp] 2.10.0cvs7 + + * src/quote_fmt.c + It's %am that works, not %ae (this doc incoherence has been + introduced with 2.9.2cvs14). + 2007-07-04 [wwp] 2.10.0cvs6 * src/plugins/bogofilter/bogofilter.c diff --git a/PATCHSETS b/PATCHSETS index 396d01a22..3b07dfb04 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2660,3 +2660,4 @@ ( cvs diff -u -r 1.213.2.146 -r 1.213.2.147 src/folder.c; cvs diff -u -r 1.274.2.193 -r 1.274.2.194 src/mainwindow.c; ) > 2.10.0cvs4.patchset ( cvs diff -u -r 1.53.2.27 -r 1.53.2.28 po/POTFILES.in; ) > 2.10.0cvs5.patchset ( cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/plugins/bogofilter/bogofilter.c; ) > 2.10.0cvs6.patchset +( cvs diff -u -r 1.8.2.20 -r 1.8.2.21 src/quote_fmt.c; ) > 2.10.0cvs7.patchset diff --git a/configure.ac b/configure.ac index 5d41c7868..130487318 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=10 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=6 +EXTRA_VERSION=7 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/quote_fmt.c b/src/quote_fmt.c index 2d00b67f1..2e497eb1b 100644 --- a/src/quote_fmt.c +++ b/src/quote_fmt.c @@ -66,7 +66,7 @@ static gchar *quote_desc_strings[] = { "%dict (%T)", N_("current dictionary"), /* current dictionary */ "%cursor (%X)", N_("cursor position"), /* X marks the cursor spot */ "%account_fullname (%af)", N_("account property: your name"), /* full name in compose account */ - "%account_email (%ae)", N_("account property: your email address"), /* mail address in compose account */ + "%account_email (%am)", N_("account property: your email address"), /* mail address in compose account */ "%account_name (%an)", N_("account property: account name"), /* compose account name itself */ "%account_org (%ao)", N_("account property: organization"), /* organization in compose account */ "%account_dict (%aT)", N_("account property: default dictionary"), /* main dict (if enabled) in account */