2006-08-01 [wwp] 2.4.0cvs10

	* tools/update-po
		updated update-po tool to work w/ context-dependent translations.
		Patch by Fabien Vantard <fzzzzz@gmail.com>.

diff --git a/ChangeLog b/ChangeLog
index 91b5cd6a5c63a51c911057d16a197f7e77850f47..b801bf18690ddd5296aef971160d4a8660fac522 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-01 [wwp]       2.4.0cvs10
+
+       * tools/update-po
+               updated update-po tool to work w/ context-dependent translations.
+               Patch by Fabien Vantard <fzzzzz@gmail.com>.
+

 2006-08-01 [wwp]       2.4.0cvs9
 
        * src/matcher.c
 2006-08-01 [wwp]       2.4.0cvs9
 
        * src/matcher.c

diff --git a/PATCHSETS b/PATCHSETS
index 017daa00e39b41cb421c333652eb9d1143df74b8..6d011647c6f305c8771cb4231bf941fa1a822654 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1701,3 +1701,4 @@
 ( cvs diff -u -r 1.382.2.295 -r 1.382.2.296 src/compose.c;  cvs diff -u -r 1.274.2.129 -r 1.274.2.130 src/mainwindow.c;  cvs diff -u -r 1.19.2.8 -r 1.19.2.9 src/messageview.h;  cvs diff -u -r 1.204.2.93 -r 1.204.2.94 src/prefs_common.c;  cvs diff -u -r 1.103.2.55 -r 1.103.2.56 src/prefs_common.h;  cvs diff -u -r 1.96.2.128 -r 1.96.2.129 src/textview.c;  ) > 2.4.0cvs7.patchset
 ( cvs diff -u -r 1.100.2.40 -r 1.100.2.41 AUTHORS;  cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/gtk/authors.h;  ) > 2.4.0cvs8.patchset
 ( cvs diff -u -r 1.75.2.28 -r 1.75.2.29 src/matcher.c;  cvs diff -u -r 1.59.2.38 -r 1.59.2.39 src/prefs_filtering.c;  cvs diff -u -r 1.43.2.41 -r 1.43.2.42 src/prefs_matcher.c;  ) > 2.4.0cvs9.patchset
 ( cvs diff -u -r 1.382.2.295 -r 1.382.2.296 src/compose.c;  cvs diff -u -r 1.274.2.129 -r 1.274.2.130 src/mainwindow.c;  cvs diff -u -r 1.19.2.8 -r 1.19.2.9 src/messageview.h;  cvs diff -u -r 1.204.2.93 -r 1.204.2.94 src/prefs_common.c;  cvs diff -u -r 1.103.2.55 -r 1.103.2.56 src/prefs_common.h;  cvs diff -u -r 1.96.2.128 -r 1.96.2.129 src/textview.c;  ) > 2.4.0cvs7.patchset
 ( cvs diff -u -r 1.100.2.40 -r 1.100.2.41 AUTHORS;  cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/gtk/authors.h;  ) > 2.4.0cvs8.patchset
 ( cvs diff -u -r 1.75.2.28 -r 1.75.2.29 src/matcher.c;  cvs diff -u -r 1.59.2.38 -r 1.59.2.39 src/prefs_filtering.c;  cvs diff -u -r 1.43.2.41 -r 1.43.2.42 src/prefs_matcher.c;  ) > 2.4.0cvs9.patchset

+( cvs diff -u -r 1.2.14.1 -r 1.2.14.2 tools/update-po;  ) > 2.4.0cvs10.patchset

diff --git a/configure.ac b/configure.ac
index cfcd4cc3452fc4d3b55f731307cd19b7d1a4b361..87bc935b82324bdec7d7b081f5b1e8b147b38455 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=9
+EXTRA_VERSION=10

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/tools/update-po b/tools/update-po
index bd70e9db87e7bccebdb773ce22775e5d922697c9..9fd180d253fdd022d39706de766633b1e0a640bc 100644 (file)
--- a/tools/update-po
+++ b/tools/update-po
@@ -33,7 +33,7 @@ if [ "$1" -a -f "$1" ] ; then
 
 sources = \$(shell cat po/POTFILES.in)
 po/messages.pot: \$(sources) po/POTFILES.in
 
 sources = \$(shell cat po/POTFILES.in)
 po/messages.pot: \$(sources) po/POTFILES.in

-       xgettext --keyword=N_ --keyword=_ --file=po/POTFILES.in \
+       xgettext --keyword=N_ --keyword=_ --keyword=Q_ --file=po/POTFILES.in \

                --output=po/messages.pot
 EOF
 
                --output=po/messages.pot
 EOF