---- gettext-0.14/gettext-tools/doc/gettext.texi.orig 2004-01-17 14:37:22.000000000 +0100
-+++ gettext-0.14/gettext-tools/doc/gettext.texi 2004-01-29 20:56:03.715853216 +0100
-@@ -31,30 +31,30 @@
-
+--- 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
+* ISO639: (gettext)Language Codes. ISO 639 language codes
+* ISO3166: (gettext)Country Codes. ISO 3166 country codes
@end direntry
+ @end ifinfo
- @ifinfo
-@@ -178,16 +178,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
-@@ -206,22 +206,22 @@
+
+ Editing PO Files
+
+@@ -237,22 +237,22 @@
Manipulating PO Files
+* msgunfmt:: Invoking the @code{msgunfmt} Program
* MO Files:: The Format of GNU MO Files
- The User's View
-@@ -285,7 +285,7 @@
+ The Programmer's View
+@@ -310,7 +310,7 @@
* Flat and Non-Flat:: Flat or Non-Flat Directory Structures
* Prerequisites:: Prerequisite Works
* Adjusting Files:: Files You Must Create or Alter
* autoconf macros:: Autoconf macros for use in @file{configure.in}
* CVS Issues:: Integrating with CVS
-@@ -316,7 +316,7 @@
+@@ -343,7 +343,7 @@
* Distributed CVS:: Avoiding version mismatch in distributed development
* Files under CVS:: Files to put under CVS version control
Other Programming Languages
-@@ -375,11 +375,11 @@
-
+@@ -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
+ * 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
-+* gettext Invocation:: Invoking the @code{gettext} program
+* ngettext:: Invoking the @code{ngettext} program
+* envsubst:: Invoking the @code{envsubst} program
+* eval_gettext:: Invoking the @code{eval_gettext} function
Perl
-@@ -889,7 +889,7 @@
+@@ -936,7 +936,7 @@
exactly where in C sources each string is used. All translations
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.
@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
-@@ -966,7 +966,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
-@@ -990,8 +990,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
-@@ -1171,7 +1171,7 @@
+@@ -1235,7 +1235,7 @@
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.
@item objc-format
@kwindex objc-format@r{ flag}
-@@ -2451,7 +2451,7 @@
+@@ -2164,7 +2164,7 @@
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
used for solving this problem.
@node Special cases, Names, c-format Flag, Sources
-@@ -2483,7 +2483,7 @@
+@@ -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.
-@@ -2513,8 +2513,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:
-@@ -2736,10 +2735,10 @@
+@@ -2449,10 +2448,10 @@
@c FIXME: Rewrite.
@menu
@section Invoking the @code{xgettext} Program
@include xgettext.texi
-@@ -2768,16 +2767,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
-@@ -2952,7 +2951,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
-@@ -2965,12 +2964,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
-
-@@ -4012,70 +4011,70 @@
+@@ -4206,70 +4205,70 @@
write other specialized programs that process PO files.
@menu
@section Writing your own programs that process PO files
For the tasks for which a combination of @samp{msgattrib}, @samp{msgcat} etc.
-@@ -4209,22 +4208,22 @@
+@@ -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}
-@@ -6237,7 +6236,7 @@
+@@ -6407,7 +6406,7 @@
@menu
* Flat and Non-Flat:: Flat or Non-Flat Directory Structures
* Prerequisites:: Prerequisite Works
* Adjusting Files:: Files You Must Create or Alter
* autoconf macros:: Autoconf macros for use in @file{configure.in}
* CVS Issues:: Integrating with CVS
-@@ -6269,7 +6268,7 @@
+@@ -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}
-@@ -6354,12 +6353,12 @@
+@@ -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.
@section Files You Must Create or Alter
@cindex @code{gettext} files
-@@ -7137,7 +7136,7 @@
+@@ -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
@end menu
@node Distributed CVS, Files under CVS, CVS Issues, CVS Issues
-@@ -7179,7 +7178,7 @@
+@@ -7448,7 +7447,7 @@
undiscovered due to this constellation.
@end itemize
@subsection Files to put under CVS version control
There are basically three ways to deal with generated files in the
-@@ -7246,7 +7245,7 @@
- @code{autopoint} invocation will copy into the right place the
- @code{gettext} infrastructure files that have been omitted from the CVS.
+@@ -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
-@@ -7843,11 +7842,11 @@
- @menu
+@@ -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
+ * 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
-+* gettext Invocation:: Invoking the @code{gettext} program
+* ngettext:: Invoking the @code{ngettext} program
+* envsubst:: Invoking the @code{envsubst} program
+* eval_gettext:: Invoking the @code{eval_gettext} function
@end menu
@node Preparing Shell Scripts, gettext.sh, sh, sh
-@@ -7868,8 +7867,8 @@
+@@ -8217,8 +8216,8 @@
near the top of the script. @code{gettext.sh} is a shell function library
that provides the functions
You have to ensure that @code{gettext.sh} can be found in the @code{PATH}.
@item
-@@ -7930,7 +7929,7 @@
- @samp{eval_ngettext}, followed by a no-argument @samp{echo} command.
- @end enumerate
-
--@node gettext.sh, gettext Invocation, Preparing Shell Scripts, sh
-+@node gettext.sh, gettext Invocation, Preparing Shell Scripts, sh
- @subsubsection Contents of @code{gettext.sh}
-
- @code{gettext.sh}, contained in the run-time package of GNU gettext, provides
-@@ -7942,28 +7941,28 @@
+@@ -8328,28 +8327,28 @@
and a newline, without interpreting backslashes in the argument string.
@item eval_gettext
@subsubsection Invoking the @code{eval_gettext} function
@cindex @code{eval_gettext} function, usage
-@@ -7976,7 +7975,7 @@
+@@ -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.
projects / packages / crossmingw32-gettext.git / blobdiff