-diff -Nur gettext-0.11.2.orig/doc/gettext.texi gettext-0.11.2/doc/gettext.texi
---- gettext-0.11.2.orig/doc/gettext.texi Mon Apr 22 20:26:53 2002
-+++ gettext-0.11.2/doc/gettext.texi Thu May 16 19:53:42 2002
-@@ -31,13 +31,13 @@
-
+--- gettext-0.15/gettext-tools/doc/gettext.texi.orig 2006-06-30 16:25:39.000000000 +0200
++++ gettext-0.15/gettext-tools/doc/gettext.texi 2006-07-27 19:02:53.450167750 +0200
+@@ -36,30 +36,30 @@
@include version.texi
+ @ifinfo
-@dircategory GNU Gettext Utilities
+@dircategory Programming tools:
@direntry
--* Gettext: (gettext). GNU gettext utilities.
--* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext.
--* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files.
--* msgmerge: (gettext)msgmerge Invocation. Update two PO files into one.
--* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file.
-+* Gettext: (gettext). GNU gettext utilities.
-+* gettextize: (gettext)gettextize. Prepare a package for gettext.
-+* msgfmt: (gettext)msgfmt. Make MO files out of PO files.
-+* msgmerge: (gettext)msgmerge. Update two PO files into one.
-+* xgettext: (gettext)xgettext. Extract strings into a PO file.
+-* gettext: (gettext). GNU gettext utilities.
+-* autopoint: (gettext)autopoint Invocation. Copy gettext infrastructure.
+-* envsubst: (gettext)envsubst Invocation. Expand environment variables.
+-* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext.
+-* msgattrib: (gettext)msgattrib Invocation. Select part of a PO file.
+-* msgcat: (gettext)msgcat Invocation. Combine several PO files.
+-* msgcmp: (gettext)msgcmp Invocation. Compare a PO file and template.
+-* msgcomm: (gettext)msgcomm Invocation. Match two PO files.
+-* msgconv: (gettext)msgconv Invocation. Convert PO file to encoding.
+-* msgen: (gettext)msgen Invocation. Create an English PO file.
+-* msgexec: (gettext)msgexec Invocation. Process a PO file.
+-* msgfilter: (gettext)msgfilter Invocation. Pipe a PO file through a filter.
+-* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files.
+-* msggrep: (gettext)msggrep Invocation. Select part of a PO file.
+-* msginit: (gettext)msginit Invocation. Create a fresh PO file.
+-* msgmerge: (gettext)msgmerge Invocation. Update a PO file from template.
+-* msgunfmt: (gettext)msgunfmt Invocation. Uncompile MO file into PO file.
+-* msguniq: (gettext)msguniq Invocation. Unify duplicates for PO file.
+-* ngettext: (gettext)ngettext Invocation. Translate a message with plural.
+-* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file.
+-* ISO639: (gettext)Language Codes. ISO 639 language codes.
+-* ISO3166: (gettext)Country Codes. ISO 3166 country codes.
++* gettext: (gettext). GNU gettext utilities
++* autopoint: (gettext)autopoint. Copy gettext infrastructure
++* envsubst: (gettext)envsubst. Expand environment variables
++* gettextize: (gettext)gettextize. Prepare a package for gettext
++* msgattrib: (gettext)msgattrib. Select part of a PO file
++* msgcat: (gettext)msgcat. Combine several PO files
++* msgcmp: (gettext)msgcmp. Compare a PO file and template
++* msgcomm: (gettext)msgcomm. Match two PO files
++* msgconv: (gettext)msgconv. Convert PO file to encoding
++* msgen: (gettext)msgen. Create an English PO file
++* msgexec: (gettext)msgexec. Process a PO file
++* msgfilter: (gettext)msgfilter. Pipe a PO file through a filter
++* msgfmt: (gettext)msgfmt. Make MO files out of PO files
++* msggrep: (gettext)msggrep. Select part of a PO file
++* msginit: (gettext)msginit. Create a fresh PO file
++* msgmerge: (gettext)msgmerge. Update a PO file from template
++* msgunfmt: (gettext)msgunfmt. Uncompile MO file into PO file
++* msguniq: (gettext)msguniq. Unify duplicates for PO file
++* ngettext: (gettext)ngettext. Translate a message with plural
++* xgettext: (gettext)xgettext. Extract strings into a PO file
++* ISO639: (gettext)Language Codes. ISO 639 language codes
++* ISO3166: (gettext)Country Codes. ISO 3166 country codes
@end direntry
+ @end ifinfo
- @ifinfo
-@@ -156,16 +156,16 @@
+@@ -196,16 +196,16 @@
Making the PO Template File
-* msgmerge Invocation:: Invoking the @code{msgmerge} Program
+* msgmerge:: Invoking the @code{msgmerge} Program
- * Translated Entries:: Translated Entries
- * Fuzzy Entries:: Fuzzy Entries
- * Untranslated Entries:: Untranslated Entries
-@@ -184,21 +184,21 @@
+
+ Editing PO Files
+
+@@ -237,22 +237,22 @@
Manipulating PO Files
+* msgattrib:: Invoking the @code{msgattrib} Program
+* msgen:: Invoking the @code{msgen} Program
+* msgexec:: Invoking the @code{msgexec} Program
+ * libgettextpo:: Writing your own programs that process PO files
Producing Binary MO Files
+* msgunfmt:: Invoking the @code{msgunfmt} Program
* MO Files:: The Format of GNU MO Files
- The User's View
-@@ -261,7 +261,7 @@
+ The Programmer's View
+@@ -310,7 +310,7 @@
* Flat and Non-Flat:: Flat or Non-Flat Directory Structures
* Prerequisites:: Prerequisite Works
+* gettextize:: Invoking the @code{gettextize} Program
* Adjusting Files:: Files You Must Create or Alter
* autoconf macros:: Autoconf macros for use in @file{configure.in}
-
-@@ -809,7 +809,7 @@
+ * CVS Issues:: Integrating with CVS
+@@ -343,7 +343,7 @@
+
+ * Distributed CVS:: Avoiding version mismatch in distributed development
+ * Files under CVS:: Files to put under CVS version control
+-* autopoint Invocation:: Invoking the @code{autopoint} Program
++* autopoint:: Invoking the @code{autopoint} Program
+
+ Other Programming Languages
+
+@@ -406,10 +406,10 @@
+ * Preparing Shell Scripts:: Preparing Shell Scripts for Internationalization
+ * gettext.sh:: Contents of @code{gettext.sh}
+ * gettext Invocation:: Invoking the @code{gettext} program
+-* ngettext Invocation:: Invoking the @code{ngettext} program
+-* envsubst Invocation:: Invoking the @code{envsubst} program
+-* eval_gettext Invocation:: Invoking the @code{eval_gettext} function
+-* eval_ngettext Invocation:: Invoking the @code{eval_ngettext} function
++* ngettext:: Invoking the @code{ngettext} program
++* envsubst:: Invoking the @code{envsubst} program
++* eval_gettext:: Invoking the @code{eval_gettext} function
++* eval_ngettext:: Invoking the @code{eval_ngettext} function
+
+ Perl
+
+@@ -936,7 +936,7 @@
exactly where in C sources each string is used. All translations
- are set to empty. The letter @kbd{t} in @file{.pot} marks this as
+ are set to empty. The letter @code{t} in @file{.pot} marks this as
a Template PO file, not yet oriented towards any particular language.
-@xref{xgettext Invocation}, for more details about how one calls the
+@xref{xgettext}, for more details about how one calls the
@code{xgettext} program. If you are @emph{really} lazy, you might
be interested at working a lot more right away, and preparing the
whole distribution setup (@pxref{Maintainers}). By doing so, you
-@@ -886,7 +886,7 @@
+@@ -1011,7 +1011,7 @@
which are no longer used in the program sources (@pxref{Obsolete
Entries}). It finally discovers new strings and inserts them in
the resulting PO file as untranslated entries (@pxref{Untranslated
@code{msgmerge} really does.
Whatever route or means taken, the goal is to obtain an updated
-@@ -910,8 +910,8 @@
+@@ -1035,8 +1035,8 @@
Once the PO file is complete and dependable, the @code{msgfmt} program
is used for turning the PO file into a machine-oriented format, which
may yield efficient retrieval of translations by the programs of the
for the @code{msgfmt} program.
Finally, the modified and marked C sources are compiled and linked
-@@ -1078,7 +1078,7 @@
+@@ -1235,7 +1235,7 @@
- In case the @kbd{c-format} flag is given for a string the @code{msgfmt}
+ In case the @code{c-format} flag is given for a string the @code{msgfmt}
does some more tests to check to validity of the translation.
--@xref{msgfmt Invocation}.
-+@xref{msgfmt}.
+-@xref{msgfmt Invocation}, @ref{c-format Flag} and @ref{c-format}.
++@xref{msgfmt}, @ref{c-format Flag} and @ref{c-format}.
- @end table
+ @item objc-format
+ @kwindex objc-format@r{ flag}
+@@ -2164,7 +2164,7 @@
-@@ -2208,7 +2208,7 @@
-
- If a string is marked with @kbd{c-format} and this is not correct the
+ If a string is marked with @code{c-format} and this is not correct the
user can find out who is responsible for the decision. See
--@ref{xgettext Invocation} to see how the @kbd{--debug} option can be
-+@ref{xgettext} to see how the @kbd{--debug} option can be
+-@ref{xgettext Invocation} to see how the @code{--debug} option can be
++@ref{xgettext} to see how the @code{--debug} option can be
used for solving this problem.
- @node Special cases, , c-format, Sources
-@@ -2240,7 +2240,7 @@
+ @node Special cases, Names, c-format Flag, Sources
+@@ -2196,7 +2196,7 @@
While it is no problem to mark the string @code{"a default message"} it
is not possible to mark the string initializers for @code{messages}.
What is to be done? We have to fulfill two tasks. First we have to mark the
can find them, and second we have to translate the string at runtime
before printing them.
-@@ -2270,8 +2270,7 @@
+@@ -2226,8 +2226,7 @@
Please convince yourself that the string which is written by
@code{fputs} is translated in any case. How to get @code{xgettext} know
The above is of course not the only solution. You could also come along
with the following one:
-@@ -2315,10 +2314,10 @@
+@@ -2449,10 +2448,10 @@
@c FIXME: Rewrite.
@menu
@section Invoking the @code{xgettext} Program
@include xgettext.texi
-@@ -2347,16 +2346,16 @@
+@@ -2481,16 +2480,16 @@
the header entry of this file.
@menu
@section Filling in the Header Entry
@cindex header entry of a PO file
-@@ -2507,7 +2506,7 @@
- @c FIXME: Rewrite.
+@@ -2663,10 +2662,10 @@
+ @chapter Updating Existing PO Files
@menu
-* msgmerge Invocation:: Invoking the @code{msgmerge} Program
+* msgmerge:: Invoking the @code{msgmerge} Program
- * Translated Entries:: Translated Entries
- * Fuzzy Entries:: Fuzzy Entries
- * Untranslated Entries:: Untranslated Entries
-@@ -2520,12 +2519,12 @@
- * Compendium:: Using Translation Compendia
@end menu
--@node msgmerge Invocation, Translated Entries, Updating, Updating
-+@node msgmerge, Translated Entries, Updating, Updating
+-@node msgmerge Invocation, , Updating, Updating
++@node msgmerge, , Updating, Updating
@section Invoking the @code{msgmerge} Program
@include msgmerge.texi
-
--@node Translated Entries, Fuzzy Entries, msgmerge Invocation, Updating
-+@node Translated Entries, Fuzzy Entries, msgmerge, Updating
- @section Translated Entries
- @cindex translated entries
-
-@@ -3563,64 +3562,64 @@
- catalogs. It copies each message's msgid to its msgstr.
+@@ -4206,70 +4205,70 @@
+ write other specialized programs that process PO files.
@menu
-* msgcat Invocation:: Invoking the @code{msgcat} Program
+* msgattrib:: Invoking the @code{msgattrib} Program
+* msgen:: Invoking the @code{msgen} Program
+* msgexec:: Invoking the @code{msgexec} Program
+ * libgettextpo:: Writing your own programs that process PO files
@end menu
-@node msgcat Invocation, msgconv Invocation, Manipulating, Manipulating
@include msgen.texi
--@node msgexec Invocation, , msgen Invocation, Manipulating
-+@node msgexec, , msgen, Manipulating
+-@node msgexec Invocation, libgettextpo, msgen Invocation, Manipulating
++@node msgexec, libgettextpo, msgen, Manipulating
@section Invoking the @code{msgexec} Program
@include msgexec.texi
-@@ -3631,22 +3630,22 @@
+
+-@node libgettextpo, , msgexec Invocation, Manipulating
++@node libgettextpo, , msgexec, Manipulating
+ @section Writing your own programs that process PO files
+
+ For the tasks for which a combination of @samp{msgattrib}, @samp{msgcat} etc.
+@@ -4403,22 +4402,22 @@
@c FIXME: Rewrite.
@menu
@section The Format of GNU MO Files
@cindex MO file's format
@cindex file format, @file{.mo}
-@@ -5531,7 +5530,7 @@
+@@ -6407,7 +6406,7 @@
@menu
* Flat and Non-Flat:: Flat or Non-Flat Directory Structures
* Prerequisites:: Prerequisite Works
+* gettextize:: Invoking the @code{gettextize} Program
* Adjusting Files:: Files You Must Create or Alter
* autoconf macros:: Autoconf macros for use in @file{configure.in}
- @end menu
-@@ -5562,7 +5561,7 @@
+ * CVS Issues:: Integrating with CVS
+@@ -6440,7 +6439,7 @@
described in the remaining of this chapter. Some maintainers might
use this as an opportunity to unflatten their package structure.
@section Prerequisite Works
@cindex converting a package to use @code{gettext}
@cindex migration from earlier versions of @code{gettext}
-@@ -5647,7 +5646,7 @@
+@@ -6525,12 +6524,12 @@
a maintainer, ever think there is a real problem with a team, please
never try to @emph{solve} a team's problem on your own.
+@node gettextize, Adjusting Files, Prerequisites, Maintainers
@section Invoking the @code{gettextize} Program
- Some files are consistently and identically needed in every package
-@@ -5768,7 +5767,7 @@
- directory needs its own @file{Makefile}, and it has been designed so
- it can be identical in all packages.
+ @include gettextize.texi
-@node Adjusting Files, autoconf macros, gettextize Invocation, Maintainers
+@node Adjusting Files, autoconf macros, gettextize, Maintainers
@section Files You Must Create or Alter
@cindex @code{gettext} files
+@@ -6689,7 +6688,7 @@
+ Similarly, you can create rules for building message catalogs for the
+ @file{sr@@latin} locale -- Serbian written with the Latin alphabet --
+ from those for the @file{sr} locale -- Serbian written with Cyrillic
+-letters. See @ref{msgfilter Invocation}.
++letters. See @ref{msgfilter}.
+
+ @node configure.in, config.guess, po/Rules-*, Adjusting Files
+ @subsection @file{configure.in} at top level
+@@ -7406,7 +7405,7 @@
+ @menu
+ * Distributed CVS:: Avoiding version mismatch in distributed development
+ * Files under CVS:: Files to put under CVS version control
+-* autopoint Invocation:: Invoking the @code{autopoint} Program
++* autopoint:: Invoking the @code{autopoint} Program
+ @end menu
+
+ @node Distributed CVS, Files under CVS, CVS Issues, CVS Issues
+@@ -7448,7 +7447,7 @@
+ undiscovered due to this constellation.
+ @end itemize
+
+-@node Files under CVS, autopoint Invocation, Distributed CVS, CVS Issues
++@node Files under CVS, autopoint, Distributed CVS, CVS Issues
+ @subsection Files to put under CVS version control
+
+ There are basically three ways to deal with generated files in the
+@@ -7527,7 +7526,7 @@
+ use the CVS will henceforth need to have GNU @code{gettext} 0.12.1 or newer
+ installed.
+
+-@node autopoint Invocation, , Files under CVS, CVS Issues
++@node autopoint, , Files under CVS, CVS Issues
+ @subsection Invoking the @code{autopoint} Program
+
+ @include autopoint.texi
+@@ -8193,10 +8192,10 @@
+ * Preparing Shell Scripts:: Preparing Shell Scripts for Internationalization
+ * gettext.sh:: Contents of @code{gettext.sh}
+ * gettext Invocation:: Invoking the @code{gettext} program
+-* ngettext Invocation:: Invoking the @code{ngettext} program
+-* envsubst Invocation:: Invoking the @code{envsubst} program
+-* eval_gettext Invocation:: Invoking the @code{eval_gettext} function
+-* eval_ngettext Invocation:: Invoking the @code{eval_ngettext} function
++* ngettext:: Invoking the @code{ngettext} program
++* envsubst:: Invoking the @code{envsubst} program
++* eval_gettext:: Invoking the @code{eval_gettext} function
++* eval_ngettext:: Invoking the @code{eval_ngettext} function
+ @end menu
+
+ @node Preparing Shell Scripts, gettext.sh, sh, sh
+@@ -8217,8 +8216,8 @@
+
+ near the top of the script. @code{gettext.sh} is a shell function library
+ that provides the functions
+-@code{eval_gettext} (see @ref{eval_gettext Invocation}) and
+-@code{eval_ngettext} (see @ref{eval_ngettext Invocation}).
++@code{eval_gettext} (see @ref{eval_gettext}) and
++@code{eval_ngettext} (see @ref{eval_ngettext}).
+ You have to ensure that @code{gettext.sh} can be found in the @code{PATH}.
+
+ @item
+@@ -8328,28 +8327,28 @@
+ and a newline, without interpreting backslashes in the argument string.
+
+ @item eval_gettext
+-See @ref{eval_gettext Invocation}.
++See @ref{eval_gettext}.
+
+ @item eval_ngettext
+-See @ref{eval_ngettext Invocation}.
++See @ref{eval_ngettext}.
+ @end itemize
+
+-@node gettext Invocation, ngettext Invocation, gettext.sh, sh
++@node gettext Invocation, ngettext, gettext.sh, sh
+ @subsubsection Invoking the @code{gettext} program
+
+ @include rt-gettext.texi
+
+-@node ngettext Invocation, envsubst Invocation, gettext Invocation, sh
++@node ngettext, envsubst, gettext Invocation, sh
+ @subsubsection Invoking the @code{ngettext} program
+
+ @include rt-ngettext.texi
+
+-@node envsubst Invocation, eval_gettext Invocation, ngettext Invocation, sh
++@node envsubst, eval_gettext, ngettext, sh
+ @subsubsection Invoking the @code{envsubst} program
+
+ @include rt-envsubst.texi
+
+-@node eval_gettext Invocation, eval_ngettext Invocation, envsubst Invocation, sh
++@node eval_gettext, eval_ngettext, envsubst, sh
+ @subsubsection Invoking the @code{eval_gettext} function
+
+ @cindex @code{eval_gettext} function, usage
+@@ -8362,7 +8361,7 @@
+ performing dollar-substitution on the result. Note that only shell variables
+ mentioned in @var{msgid} will be dollar-substituted in the result.
+
+-@node eval_ngettext Invocation, , eval_gettext Invocation, sh
++@node eval_ngettext, , eval_gettext, sh
+ @subsubsection Invoking the @code{eval_ngettext} function
+
+ @cindex @code{eval_ngettext} function, usage
+--- gettext-0.12.1/gettext-tools/doc/gettextize.texi.orig 2003-05-05 11:09:21.000000000 +0200
++++ gettext-0.12.1/gettext-tools/doc/gettextize.texi 2003-06-07 20:10:53.000000000 +0200
+@@ -177,4 +177,4 @@
+ of the GNU build system, in the sense that it should not be invoked
+ automatically, and not be invoked by someone who doesn't assume the
+ responsibilities of a package maintainer. For the latter purpose, a
+-separate tool is provided, see @ref{autopoint Invocation}.
++separate tool is provided, see @ref{autopoint}.
+--- gettext-0.13/gettext-runtime/libasprintf/autosprintf.texi.orig Fri May 30 16:30:21 2003
++++ gettext-0.13/gettext-runtime/libasprintf/autosprintf.texi Mon Dec 1 15:52:12 2003
+@@ -15,9 +15,9 @@
+ @c %**end of header
+ @set VERSION 1.0
+
+-@dircategory C++ libraries
++@dircategory Libraries:
+ @direntry
+-* autosprintf: (autosprintf). Support for printf format strings in C++.
++* autosprintf: (autosprintf). Support for printf format strings in C++
+ @end direntry
+
+ @ifinfo
projects / packages / crossmingw32-gettext.git / blobdiff