From: Bruno Haible <bruno@clisp.org>
Date: Mon, 1 Oct 2007 00:41:02 +0000 (+0000)
Subject: Support for KDE format strings.
X-Git-Tag: v0.17~235
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44c3b916fdef26ac63b2b8c1edbbc6c275ab7f3a;p=thirdparty%2Fgettext.git

Support for KDE format strings.
---

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index 81867b0ac..e389838fd 100644
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-30  Bruno Haible  <bruno@clisp.org>
+
+	* gettext.texi (PO Files): Mention kde-format.
+	(kde-format): New subsection.
+	(qt-format): Update for Qt 4.
+	* xgettext.texi: Document --kde option.
+
 2007-09-09  Bruno Haible  <bruno@clisp.org>
 
 	* gettext.texi (Compendium): Upgrade node from a subsection to a
diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi
index 4546e8abf..4736739d9 100644
--- a/gettext-tools/doc/gettext.texi
+++ b/gettext-tools/doc/gettext.texi
@@ -403,6 +403,7 @@ The Translator's View
 * php-format::                  PHP Format Strings
 * gcc-internal-format::         GCC internal Format Strings
 * qt-format::                   Qt Format Strings
+* kde-format::                  KDE Format Strings
 * boost-format::                Boost Format Strings
 
 Individual Programming Languages
@@ -1594,6 +1595,12 @@ Likewise for the GCC sources, see @ref{gcc-internal-format}.
 @kwindex no-qt-format@r{ flag}
 Likewise for Qt, see @ref{qt-format}.
 
+@item kde-format
+@kwindex kde-format@r{ flag}
+@itemx no-kde-format
+@kwindex no-kde-format@r{ flag}
+Likewise for KDE, see @ref{kde-format}.
+
 @item boost-format
 @kwindex boost-format@r{ flag}
 @itemx no-boost-format
@@ -8596,6 +8603,7 @@ strings.
 * php-format::                  PHP Format Strings
 * gcc-internal-format::         GCC internal Format Strings
 * qt-format::                   Qt Format Strings
+* kde-format::                  KDE Format Strings
 * boost-format::                Boost Format Strings
 @end menu
 
@@ -8805,15 +8813,23 @@ denotes a programming language, @samp{O} denotes a binary operator,
 @samp{P} denotes a function parameter, @samp{Q} denotes an assignment
 operator, @samp{V} denotes a const/volatile qualifier.
 
-@node qt-format, boost-format, gcc-internal-format, Translators for other Languages
+@node qt-format, kde-format, gcc-internal-format, Translators for other Languages
 @subsection Qt Format Strings
 
 Qt format strings are described in the documentation of the QString class
-@uref{file:/usr/lib/qt-3.0.5/doc/html/qstring.html}.
+@uref{file:/usr/lib/qt-4.3.0/doc/html/qstring.html}.
 In summary, a directive consists of a @samp{%} followed by a digit. The same
 directive cannot occur more than once in a format string.
 
-@node boost-format,  , qt-format, Translators for other Languages
+@node kde-format, boost-format, qt-format, Translators for other Languages
+@subsection KDE Format Strings
+
+KDE 4 format strings are defined as follows:
+A directive consists of a @samp{%} followed by a non-zero decimal number.
+If a @samp{%n} occurs in a format strings, all of @samp{%1}, ..., @samp{%(n-1)}
+must occur as well, except possibly one of them.
+
+@node boost-format,  , kde-format, Translators for other Languages
 @subsection Boost Format Strings
 
 Boost format strings are described in the documentation of the
diff --git a/gettext-tools/doc/xgettext.texi b/gettext-tools/doc/xgettext.texi
index 4ed5fba28..b9e9cc1cc 100644
--- a/gettext-tools/doc/xgettext.texi
+++ b/gettext-tools/doc/xgettext.texi
@@ -314,6 +314,13 @@ Recognize Qt format strings.
 @*
 This option has an effect only with the language C++.
 
+@item --kde
+@opindex --kde@r{, @code{xgettext} option}
+@cindex KDE format strings
+Recognize KDE 4 format strings.
+@*
+This option has an effect only with the language C++.
+
 @item --boost
 @opindex --boost@r{, @code{xgettext} option}
 @cindex Boost format strings