2006-07-31 [wwp] 2.4.0cvs1

	* src/quote_fmt.c
		make more strings translatable.

diff --git a/ChangeLog b/ChangeLog
index d2843f61486c9e85130d38d9f319b11153db3421..f612e8026d07344e3b9b838a195e857a62e46637 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-31 [wwp]       2.4.0cvs1
+
+       * src/quote_fmt.c
+               make more strings translatable.
+

 2006-07-31 [paul]      2.4.0
 
        2.4.0 released
 2006-07-31 [paul]      2.4.0
 
        2.4.0 released

diff --git a/PATCHSETS b/PATCHSETS
index 9ebed95a04a1b1f99cc840b6362c7a907e455652..db5f067cf5194eb2f1c10ca470bc7e683e2e609d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1692,3 +1692,4 @@
 ( cvs diff -u -r 1.61.2.47 -r 1.61.2.48 src/account.c;  cvs diff -u -r 1.115.2.97 -r 1.115.2.98 src/main.c;  cvs diff -u -r 1.274.2.126 -r 1.274.2.127 src/mainwindow.c;  cvs diff -u -r 1.39.2.17 -r 1.39.2.18 src/mainwindow.h;  ) > 2.3.1cvs89.patchset
 ( cvs diff -u -r 1.58.2.23 -r 1.58.2.24 po/de.po;  cvs diff -u -r 1.9.2.6 -r 1.9.2.7 po/el.po;  cvs diff -u -r 1.42.2.25 -r 1.42.2.26 po/fr.po;  cvs diff -u -r 1.34.2.19 -r 1.34.2.20 po/it.po;  cvs diff -u -r 1.10.2.10 -r 1.10.2.11 po/pl.po;  cvs diff -u -r 1.50.2.19 -r 1.50.2.20 po/pt_BR.po;  cvs diff -u -r 1.17.2.22 -r 1.17.2.23 po/sr.po;  cvs diff -u -r 1.5.2.16 -r 1.5.2.17 po/zh_CN.po;  ) > 2.3.1cvs90.patchset
 ( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 po/ca.po;  ) > 2.3.1cvs91.patchset
 ( cvs diff -u -r 1.61.2.47 -r 1.61.2.48 src/account.c;  cvs diff -u -r 1.115.2.97 -r 1.115.2.98 src/main.c;  cvs diff -u -r 1.274.2.126 -r 1.274.2.127 src/mainwindow.c;  cvs diff -u -r 1.39.2.17 -r 1.39.2.18 src/mainwindow.h;  ) > 2.3.1cvs89.patchset
 ( cvs diff -u -r 1.58.2.23 -r 1.58.2.24 po/de.po;  cvs diff -u -r 1.9.2.6 -r 1.9.2.7 po/el.po;  cvs diff -u -r 1.42.2.25 -r 1.42.2.26 po/fr.po;  cvs diff -u -r 1.34.2.19 -r 1.34.2.20 po/it.po;  cvs diff -u -r 1.10.2.10 -r 1.10.2.11 po/pl.po;  cvs diff -u -r 1.50.2.19 -r 1.50.2.20 po/pt_BR.po;  cvs diff -u -r 1.17.2.22 -r 1.17.2.23 po/sr.po;  cvs diff -u -r 1.5.2.16 -r 1.5.2.17 po/zh_CN.po;  ) > 2.3.1cvs90.patchset
 ( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 po/ca.po;  ) > 2.3.1cvs91.patchset

+( cvs diff -u -r 1.8.2.8 -r 1.8.2.9 src/quote_fmt.c;  ) > 2.4.0cvs1.patchset

diff --git a/configure.ac b/configure.ac
index ada1906dddbd34efee889dcb1274b86c8f24375f..38fd9393e163c20fb0302b96804122e4c0cb9254 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=0
+EXTRA_VERSION=1

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/quote_fmt.c b/src/quote_fmt.c
index 3b58e83a4b7c24fb3b019bfc41e9903c346e5666..6a2df4d46158acfe69efccef908ebd9904b8b78d 100644 (file)
--- a/src/quote_fmt.c
+++ b/src/quote_fmt.c
@@ -71,9 +71,9 @@ static gchar *quote_desc_strings[] = {
        "|p{sub_expr}\n\n",     N_("insert program output:\nsub_expr is evaluated as a command-line to get\nthe output from"), /* insert program output */
        "|i{sub_expr}\n\n",     N_("insert user input:\nsub_expr is a variable to be replaced by\nuser-entered text"), /* insert user input */
        "",             NULL,
        "|p{sub_expr}\n\n",     N_("insert program output:\nsub_expr is evaluated as a command-line to get\nthe output from"), /* insert program output */
        "|i{sub_expr}\n\n",     N_("insert user input:\nsub_expr is a variable to be replaced by\nuser-entered text"), /* insert user input */
        "",             NULL,

-       "terms definition:",    NULL,
-       "expr",                 "text that can contain any of the symbols above",
-       "sub_expr\n",   "text that can contain any of the symbols above\nbut ?x{}, !x{}, |f{}, |p{} and |i{}",
+       N_("terms definition:"),        NULL,
+       "expr",                 N_("text that can contain any of the symbols above"),
+       "sub_expr\n",   N_("text that can contain any of the symbols above\nbut ?x{}, !x{}, |f{}, |p{} and |i{}"),

        NULL,NULL
 };
 
        NULL,NULL
 };