1 diff -Nru gettext-0.10.35/doc/gettext.texi gettext-0.10.35.new/doc/gettext.texi
2 --- gettext-0.10.35/doc/gettext.texi Fri May 1 07:53:32 1998
3 +++ gettext-0.10.35.new/doc/gettext.texi Fri Apr 9 18:09:45 1999
8 -@dircategory GNU Gettext Utilities
9 +@dircategory GNU Gettext Utilities:
11 -* Gettext: (gettext). GNU gettext utilities.
12 -* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext.
13 -* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files.
14 -* msgmerge: (gettext)msgmerge Invocation. Update two PO files into one.
15 -* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file.
16 +* Gettext: (gettext). GNU gettext utilities
17 +* gettextize: (gettext)gettextize. Prepare a package for gettext
18 +* msgfmt: (gettext)msgfmt. Make MO files out of PO files
19 +* msgmerge: (gettext)msgmerge. Update two PO files into one
20 +* xgettext: (gettext)xgettext. Extract strings into a PO file
26 Making the Initial PO File
28 -* xgettext Invocation:: Invoking the @code{xgettext} Program
29 +* xgettext:: Invoking the @code{xgettext} Program
30 * C Sources Context:: C Sources Context
31 * Compendium:: Using Translation Compendiums
33 Updating Existing PO Files
35 -* msgmerge Invocation:: Invoking the @code{msgmerge} Program
36 +* msgmerge:: Invoking the @code{msgmerge} Program
37 * Translated Entries::
38 * Fuzzy Entries:: Fuzzy translated Entries
39 * Untranslated Entries:: Untranslated Entries
42 Producing Binary MO Files
44 -* msgfmt Invocation:: Invoking the @code{msgfmt} Program
45 +* msgfmt:: Invoking the @code{msgfmt} Program
46 * MO Files:: The Format of GNU MO Files
51 * Flat and Non-Flat:: Flat or Non-Flat Directory Structures
52 * Prerequisites:: Prerequisite Works
53 -* gettextize Invocation:: Invoking the @code{gettextize} Program
54 +* gettextize:: Invoking the @code{gettextize} Program
55 * Adjusting Files:: Files You Must Create or Alter
57 Files You Must Create or Alter
59 exactly where in C sources each string is used. All translations
60 are set to empty. The letter @kbd{t} in @file{.pot} marks this as
61 a Template PO file, not yet oriented towards any particular language.
62 -@xref{xgettext Invocation}, for more details about how one calls the
63 +@xref{xgettext}, for more details about how one calls the
64 @code{xgettext} program. If you are @emph{really} lazy, you might
65 be interested at working a lot more right away, and preparing the
66 whole distribution setup (@pxref{Maintainers}). By doing so, you
68 which are no longer used in the program sources (@pxref{Obsolete
69 Entries}). It finally discovers new strings and inserts them in
70 the resulting PO file as untranslated entries (@pxref{Untranslated
71 -Entries}). @xref{msgmerge Invocation}, for more information about what
72 +Entries}). @xref{msgmerge}, for more information about what
73 @code{msgmerge} really does.
75 Whatever route or means taken, the goal is to obtain an updated
77 Once the PO file is complete and dependable, the @code{msgfmt} program
78 is used for turning the PO file into a machine-oriented format, which
79 may yield efficient retrieval of translations by the programs of the
80 -package, whenever needed at runtime (@pxref{MO Files}). @xref{msgfmt
81 -Invocation}, for more information about all modalities of execution
82 -for the @code{msgfmt} program.
83 +package, whenever needed at runtime (@pxref{MO Files}). @xref{msgfmt},
84 +for more information about all modalities of execution for the @code{msgfmt}
87 Finally, the modified and marked C sources are compiled and linked
88 with the GNU @code{gettext} library, usually through the operation of
91 In case the @kbd{c-format} flag is given for a string the @code{msgfmt}
92 does some more tests to check to validity of the translation.
93 -@xref{msgfmt Invocation}.
98 @@ -1678,15 +1678,14 @@
99 to use must contain the string @kbd{xgettext:no-c-format}.
101 If a string is marked with @kbd{c-format} and this is not correct the
102 -user can find out who is responsible for the decision. @xref{xgettext
103 -Invocation} to see how the @kbd{--debug} option can be used for solving
105 +user can find out who is responsible for the decision. @xref{xgettext},
106 +to see how the @kbd{--debug} option can be used for solving this problem.
108 @node Special cases, , c-format, Sources
109 @section Special Cases of Translatable Strings
111 The attentive reader might now point out that it is not always possible
112 -to mark translatable string with @code{gettext} or something like this.
113 +to mark translatable string with @code{gettext}, or something like this.
114 Consider the following case:
117 @@ -1710,7 +1709,7 @@
118 While it is no problem to mark the string @code{"a default message"} it
119 is not possible to mark the string initializers for @code{messages}.
120 What is to be done? We have to fulfill two tasks. First we have to mark the
121 -strings so that the @code{xgettext} program (@pxref{xgettext Invocation})
122 +strings so that the @code{xgettext} program (@pxref{xgettext})
123 can find them, and second we have to translate the string at runtime
124 before printing them.
126 @@ -1740,8 +1739,7 @@
128 Please convince yourself that the string which is written by
129 @code{fputs} is translated in any case. How to get @code{xgettext} know
130 -the additional keyword @code{gettext_noop} is explained in @ref{xgettext
132 +the additional keyword @code{gettext_noop} is explained in @ref{xgettext}.
134 The above is of course not the only solution. You could also come along
135 with the following one:
136 @@ -1783,12 +1781,12 @@
140 -* xgettext Invocation:: Invoking the @code{xgettext} Program
141 +* xgettext:: Invoking the @code{xgettext} Program
142 * C Sources Context:: C Sources Context
143 * Compendium:: Using Translation Compendiums
146 -@node xgettext Invocation, C Sources Context, Initial, Initial
147 +@node xgettext, C Sources Context, Initial, Initial
148 @section Invoking the @code{xgettext} Program
151 @@ -1915,7 +1913,7 @@
152 cases, like strings in preprocessor macros, ANSI concatenation of
153 adjacent strings, and escaped end of lines for continued strings.
155 -@node C Sources Context, Compendium, xgettext Invocation, Initial
156 +@node C Sources Context, Compendium, xgettext, Initial
157 @section C Sources Context
159 PO mode is particularily powerful when used with PO files
160 @@ -2040,7 +2038,7 @@
164 -* msgmerge Invocation:: Invoking the @code{msgmerge} Program
165 +* msgmerge:: Invoking the @code{msgmerge} Program
166 * Translated Entries::
168 * Untranslated Entries:: Untranslated Entries
169 @@ -2050,7 +2048,7 @@
170 * Auxiliary:: Consulting Auxiliary PO Files
173 -@node msgmerge Invocation, Translated Entries, Updating, Updating
174 +@node msgmerge, Translated Entries, Updating, Updating
175 @section Invoking the @code{msgmerge} Program
178 @@ -2642,11 +2640,11 @@
182 -* msgfmt Invocation:: Invoking the @code{msgfmt} Program
183 +* msgfmt:: Invoking the @code{msgfmt} Program
184 * MO Files:: The Format of GNU MO Files
187 -@node msgfmt Invocation, MO Files, Binaries, Binaries
188 +@node msgfmt, MO Files, Binaries, Binaries
189 @section Invoking the @code{msgfmt} Program
192 @@ -2722,7 +2720,7 @@
193 If input file is @samp{-}, standard input is read. If output file
194 is @samp{-}, output is written to standard output.
196 -@node MO Files, , msgfmt Invocation, Binaries
197 +@node MO Files, , msgfmt, Binaries
198 @section The Format of GNU MO Files
200 The format of the generated MO files is best described by a picture,
201 @@ -3078,7 +3076,7 @@
202 method of normal file handling (open-use-close) and that it does not
203 burden the programmer so many task, especially the unique key handling.
204 Of course here is also a unique key needed, but this key is the
205 -message itself (how long or short it is). @xref{Comparison} for a
206 +message itself (how long or short it is). @xref{Comparison}, for a
207 more detailed comparison of the two methods.
209 The following section contains a rather detailed description of the
210 @@ -4146,7 +4144,7 @@
212 * Flat and Non-Flat:: Flat or Non-Flat Directory Structures
213 * Prerequisites:: Prerequisite Works
214 -* gettextize Invocation:: Invoking the @code{gettextize} Program
215 +* gettextize:: Invoking the @code{gettextize} Program
216 * Adjusting Files:: Files You Must Create or Alter
219 @@ -4181,7 +4179,7 @@
220 to flat distributions, we might add some notes about how to proceed
223 -@node Prerequisites, gettextize Invocation, Flat and Non-Flat, Maintainers
224 +@node Prerequisites, gettextize, Flat and Non-Flat, Maintainers
225 @section Prerequisite Works
227 There are some works which are required for using GNU @code{gettext}
228 @@ -4261,7 +4259,7 @@
229 a maintainer, ever think there is a real problem with a team, please
230 never try to @emph{solve} a team's problem on your own.
232 -@node gettextize Invocation, Adjusting Files, Prerequisites, Maintainers
233 +@node gettextize, Adjusting Files, Prerequisites, Maintainers
234 @section Invoking the @code{gettextize} Program
236 Some files are consistently and identically needed in every package
237 @@ -4353,7 +4351,7 @@
238 directory needs its own @file{Makefile}, and it has been designed so
239 it can be identical in all packages.
241 -@node Adjusting Files, , gettextize Invocation, Maintainers
242 +@node Adjusting Files, , gettextize, Maintainers
243 @section Files You Must Create or Alter
245 Besides files which are automatically added through @code{gettextize},