Support for Qt message catalog format and Qt format strings.

4 files changed, 37 insertions, 2 deletions

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index d38e666..e8be675 100644
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-19  Bruno Haible  <bruno@clisp.org>
+
+	* gettext.texi (PO Files): Mention qt-format.
+	(qt-format): New subsection.
+	* msgfmt.texi: Document --qt option.
+	* xgettext.texi: Likewise.
+
 2003-10-13  Bruno Haible  <bruno@clisp.org>
 
 	* gettext.texi (PO Files): Mention objc-format, sh-format, perl-format,
diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi
index 2ae21aa..6076ff7 100644
--- a/gettext-tools/doc/gettext.texi
+++ b/gettext-tools/doc/gettext.texi
@@ -342,6 +342,7 @@ The Translator's View
 * perl-format::                 Perl Format Strings
 * php-format::                  PHP Format Strings
 * gcc-internal-format::         GCC internal Format Strings
+* qt-format::                   Qt Format Strings
 
 Individual Programming Languages
 
@@ -1263,6 +1264,12 @@ Likewise for PHP, see @ref{php-format}.
 @kwindex no-gcc-internal-format@r{ flag}
 Likewise for the GCC sources, see @ref{gcc-internal-format}.
 
+@item qt-format
+@kwindex qt-format@r{ flag}
+@itemx no-qt-format
+@kwindex no-qt-format@r{ flag}
+Likewise for Qt, see @ref{qt-format}.
+
 @end table
 
 @kwindex msgid_plural
@@ -7275,6 +7282,7 @@ strings.
 * perl-format::                 Perl Format Strings
 * php-format::                  PHP Format Strings
 * gcc-internal-format::         GCC internal Format Strings
+* qt-format::                   Qt Format Strings
 @end menu
 
 @node c-format, objc-format, Translators for other Languages, Translators for other Languages
@@ -7437,7 +7445,7 @@ PHP format strings are described in the documentation of the PHP function
 @code{sprintf}, in @file{phpdoc/manual/function.sprintf.html} or
 @uref{http://www.php.net/manual/en/function.sprintf.php}.
 
-@node gcc-internal-format,  , php-format, Translators for other Languages
+@node gcc-internal-format, qt-format, php-format, Translators for other Languages
 @subsection GCC internal Format Strings
 
 These format strings are used inside the GCC sources.  In such a format
@@ -7455,6 +7463,14 @@ 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,  , 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}.
+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 Maintainers for other Languages, List of Programming Languages, Translators for other Languages, Programming Languages
 @section The Maintainer's View
 
diff --git a/gettext-tools/doc/msgfmt.texi b/gettext-tools/doc/msgfmt.texi
index 821ca88..b072443 100644
--- a/gettext-tools/doc/msgfmt.texi
+++ b/gettext-tools/doc/msgfmt.texi
@@ -44,6 +44,11 @@ Like --java, and assume Java2 (JDK 1.2 or higher).
 @cindex Tcl mode, and @code{msgfmt} program
 Tcl mode: generate a tcl/msgcat @file{.msg} file.
 
+@item --qt
+@opindex --qt@r{, @code{msgfmt} option}
+@cindex Qt mode, and @code{msgfmt} program
+Qt mode: generate a Qt @file{.qm} file.
+
 @end table
 
 @subsection Output file location
diff --git a/gettext-tools/doc/xgettext.texi b/gettext-tools/doc/xgettext.texi
index 2c84ee6..5204b1f 100644
--- a/gettext-tools/doc/xgettext.texi
+++ b/gettext-tools/doc/xgettext.texi
@@ -215,7 +215,14 @@ Understand ANSI C trigraphs for input.
 @*
 This option has an effect only with the languages C, C++, ObjectiveC.
 
-@itemx --debug
+@item --qt
+@opindex --qt@r{, @code{xgettext} option}
+@cindex Qt format strings
+Recognize Qt format strings.
+@*
+This option has an effect only with the language C++.
+
+@item --debug
 @opindex --debug@r{, @code{xgettext} option}
 @cindex debugging messages marked as format strings
 Use the flags @code{c-format} and @code{possible-c-format} to show who was