]>
Commit | Line | Data |
---|---|---|
0e3f7173 MM |
1 | diff -Nur gettext-0.11.2.orig/doc/gettext.texi gettext-0.11.2/doc/gettext.texi |
2 | --- gettext-0.11.2.orig/doc/gettext.texi Mon Apr 22 20:26:53 2002 | |
3 | +++ gettext-0.11.2/doc/gettext.texi Thu May 16 19:53:42 2002 | |
4 | @@ -31,13 +31,13 @@ | |
70ba7319 | 5 | |
6 | @include version.texi | |
7 | ||
8 | -@dircategory GNU Gettext Utilities | |
a33824de | 9 | +@dircategory Programming tools: |
70ba7319 | 10 | @direntry |
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. | |
0e3f7173 MM |
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. | |
70ba7319 | 21 | @end direntry |
22 | ||
23 | @ifinfo | |
0e3f7173 | 24 | @@ -156,16 +156,16 @@ |
70ba7319 | 25 | |
a33824de | 26 | Making the PO Template File |
70ba7319 | 27 | |
28 | -* xgettext Invocation:: Invoking the @code{xgettext} Program | |
0e3f7173 MM |
29 | +* xgettext:: Invoking the @code{xgettext} Program |
30 | ||
31 | Creating a New PO File | |
32 | ||
33 | -* msginit Invocation:: Invoking the @code{msginit} Program | |
34 | +* msginit:: Invoking the @code{msginit} Program | |
35 | * Header Entry:: Filling in the Header Entry | |
70ba7319 | 36 | |
37 | Updating Existing PO Files | |
38 | ||
39 | -* msgmerge Invocation:: Invoking the @code{msgmerge} Program | |
0e3f7173 | 40 | +* msgmerge:: Invoking the @code{msgmerge} Program |
a33824de | 41 | * Translated Entries:: Translated Entries |
42 | * Fuzzy Entries:: Fuzzy Entries | |
70ba7319 | 43 | * Untranslated Entries:: Untranslated Entries |
0e3f7173 MM |
44 | @@ -184,21 +184,21 @@ |
45 | ||
46 | Manipulating PO Files | |
47 | ||
48 | -* msgcat Invocation:: Invoking the @code{msgcat} Program | |
49 | -* msgconv Invocation:: Invoking the @code{msgconv} Program | |
50 | -* msggrep Invocation:: Invoking the @code{msggrep} Program | |
51 | -* msgfilter Invocation:: Invoking the @code{msgfilter} Program | |
52 | -* msguniq Invocation:: Invoking the @code{msguniq} Program | |
53 | -* msgcomm Invocation:: Invoking the @code{msgcomm} Program | |
54 | -* msgcmp Invocation:: Invoking the @code{msgcmp} Program | |
55 | -* msgattrib Invocation:: Invoking the @code{msgattrib} Program | |
56 | -* msgen Invocation:: Invoking the @code{msgen} Program | |
57 | -* msgexec Invocation:: Invoking the @code{msgexec} Program | |
58 | +* msgcat:: Invoking the @code{msgcat} Program | |
59 | +* msgconv:: Invoking the @code{msgconv} Program | |
60 | +* msggrep:: Invoking the @code{msggrep} Program | |
61 | +* msgfilter:: Invoking the @code{msgfilter} Program | |
62 | +* msguniq:: Invoking the @code{msguniq} Program | |
63 | +* msgcomm:: Invoking the @code{msgcomm} Program | |
64 | +* msgcmp:: Invoking the @code{msgcmp} Program | |
65 | +* msgattrib:: Invoking the @code{msgattrib} Program | |
66 | +* msgen:: Invoking the @code{msgen} Program | |
67 | +* msgexec:: Invoking the @code{msgexec} Program | |
70ba7319 | 68 | |
69 | Producing Binary MO Files | |
70 | ||
71 | -* msgfmt Invocation:: Invoking the @code{msgfmt} Program | |
0e3f7173 MM |
72 | -* msgunfmt Invocation:: Invoking the @code{msgunfmt} Program |
73 | +* msgfmt:: Invoking the @code{msgfmt} Program | |
74 | +* msgunfmt:: Invoking the @code{msgunfmt} Program | |
70ba7319 | 75 | * MO Files:: The Format of GNU MO Files |
76 | ||
77 | The User's View | |
0e3f7173 | 78 | @@ -261,7 +261,7 @@ |
70ba7319 | 79 | |
80 | * Flat and Non-Flat:: Flat or Non-Flat Directory Structures | |
81 | * Prerequisites:: Prerequisite Works | |
82 | -* gettextize Invocation:: Invoking the @code{gettextize} Program | |
0e3f7173 | 83 | +* gettextize:: Invoking the @code{gettextize} Program |
70ba7319 | 84 | * Adjusting Files:: Files You Must Create or Alter |
0e3f7173 | 85 | * autoconf macros:: Autoconf macros for use in @file{configure.in} |
70ba7319 | 86 | |
0e3f7173 | 87 | @@ -809,7 +809,7 @@ |
70ba7319 | 88 | exactly where in C sources each string is used. All translations |
89 | are set to empty. The letter @kbd{t} in @file{.pot} marks this as | |
90 | a Template PO file, not yet oriented towards any particular language. | |
91 | -@xref{xgettext Invocation}, for more details about how one calls the | |
92 | +@xref{xgettext}, for more details about how one calls the | |
93 | @code{xgettext} program. If you are @emph{really} lazy, you might | |
94 | be interested at working a lot more right away, and preparing the | |
95 | whole distribution setup (@pxref{Maintainers}). By doing so, you | |
0e3f7173 | 96 | @@ -886,7 +886,7 @@ |
70ba7319 | 97 | which are no longer used in the program sources (@pxref{Obsolete |
98 | Entries}). It finally discovers new strings and inserts them in | |
99 | the resulting PO file as untranslated entries (@pxref{Untranslated | |
100 | -Entries}). @xref{msgmerge Invocation}, for more information about what | |
101 | +Entries}). @xref{msgmerge}, for more information about what | |
102 | @code{msgmerge} really does. | |
103 | ||
104 | Whatever route or means taken, the goal is to obtain an updated | |
0e3f7173 | 105 | @@ -910,8 +910,8 @@ |
70ba7319 | 106 | Once the PO file is complete and dependable, the @code{msgfmt} program |
107 | is used for turning the PO file into a machine-oriented format, which | |
108 | may yield efficient retrieval of translations by the programs of the | |
109 | -package, whenever needed at runtime (@pxref{MO Files}). @xref{msgfmt | |
0e3f7173 | 110 | -Invocation}, for more information about all modes of execution |
70ba7319 | 111 | +package, whenever needed at runtime (@pxref{MO Files}). @xref{msgfmt}, |
0e3f7173 MM |
112 | +for more information about all modes of execution |
113 | for the @code{msgfmt} program. | |
70ba7319 | 114 | |
115 | Finally, the modified and marked C sources are compiled and linked | |
0e3f7173 | 116 | @@ -1078,7 +1078,7 @@ |
70ba7319 | 117 | |
118 | In case the @kbd{c-format} flag is given for a string the @code{msgfmt} | |
119 | does some more tests to check to validity of the translation. | |
120 | -@xref{msgfmt Invocation}. | |
121 | +@xref{msgfmt}. | |
122 | ||
123 | @end table | |
124 | ||
0e3f7173 | 125 | @@ -2208,7 +2208,7 @@ |
70ba7319 | 126 | |
127 | If a string is marked with @kbd{c-format} and this is not correct the | |
a33824de | 128 | user can find out who is responsible for the decision. See |
129 | -@ref{xgettext Invocation} to see how the @kbd{--debug} option can be | |
130 | +@ref{xgettext} to see how the @kbd{--debug} option can be | |
131 | used for solving this problem. | |
70ba7319 | 132 | |
133 | @node Special cases, , c-format, Sources | |
0e3f7173 | 134 | @@ -2240,7 +2240,7 @@ |
70ba7319 | 135 | While it is no problem to mark the string @code{"a default message"} it |
136 | is not possible to mark the string initializers for @code{messages}. | |
137 | What is to be done? We have to fulfill two tasks. First we have to mark the | |
138 | -strings so that the @code{xgettext} program (@pxref{xgettext Invocation}) | |
139 | +strings so that the @code{xgettext} program (@pxref{xgettext}) | |
140 | can find them, and second we have to translate the string at runtime | |
141 | before printing them. | |
142 | ||
0e3f7173 | 143 | @@ -2270,8 +2270,7 @@ |
70ba7319 | 144 | |
145 | Please convince yourself that the string which is written by | |
146 | @code{fputs} is translated in any case. How to get @code{xgettext} know | |
147 | -the additional keyword @code{gettext_noop} is explained in @ref{xgettext | |
148 | -Invocation}. | |
149 | +the additional keyword @code{gettext_noop} is explained in @ref{xgettext}. | |
150 | ||
151 | The above is of course not the only solution. You could also come along | |
152 | with the following one: | |
0e3f7173 | 153 | @@ -2315,10 +2314,10 @@ |
70ba7319 | 154 | @c FIXME: Rewrite. |
155 | ||
156 | @menu | |
157 | -* xgettext Invocation:: Invoking the @code{xgettext} Program | |
0e3f7173 | 158 | +* xgettext:: Invoking the @code{xgettext} Program |
70ba7319 | 159 | @end menu |
160 | ||
a33824de | 161 | -@node xgettext Invocation, , Template, Template |
162 | +@node xgettext, , Template, Template | |
70ba7319 | 163 | @section Invoking the @code{xgettext} Program |
164 | ||
0e3f7173 MM |
165 | @include xgettext.texi |
166 | @@ -2347,16 +2346,16 @@ | |
167 | the header entry of this file. | |
168 | ||
169 | @menu | |
170 | -* msginit Invocation:: Invoking the @code{msginit} Program | |
171 | +* msginit:: Invoking the @code{msginit} Program | |
172 | * Header Entry:: Filling in the Header Entry | |
173 | @end menu | |
174 | ||
175 | -@node msginit Invocation, Header Entry, Creating, Creating | |
176 | +@node msginit, Header Entry, Creating, Creating | |
177 | @section Invoking the @code{msginit} Program | |
178 | ||
179 | @include msginit.texi | |
180 | ||
181 | -@node Header Entry, , msginit Invocation, Creating | |
182 | +@node Header Entry, , msginit, Creating | |
183 | @section Filling in the Header Entry | |
184 | @cindex header entry of a PO file | |
185 | ||
186 | @@ -2507,7 +2506,7 @@ | |
70ba7319 | 187 | @c FIXME: Rewrite. |
188 | ||
189 | @menu | |
190 | -* msgmerge Invocation:: Invoking the @code{msgmerge} Program | |
0e3f7173 | 191 | +* msgmerge:: Invoking the @code{msgmerge} Program |
a33824de | 192 | * Translated Entries:: Translated Entries |
193 | * Fuzzy Entries:: Fuzzy Entries | |
70ba7319 | 194 | * Untranslated Entries:: Untranslated Entries |
0e3f7173 MM |
195 | @@ -2520,12 +2519,12 @@ |
196 | * Compendium:: Using Translation Compendia | |
70ba7319 | 197 | @end menu |
198 | ||
199 | -@node msgmerge Invocation, Translated Entries, Updating, Updating | |
200 | +@node msgmerge, Translated Entries, Updating, Updating | |
201 | @section Invoking the @code{msgmerge} Program | |
202 | ||
0e3f7173 | 203 | @include msgmerge.texi |
a33824de | 204 | |
205 | -@node Translated Entries, Fuzzy Entries, msgmerge Invocation, Updating | |
206 | +@node Translated Entries, Fuzzy Entries, msgmerge, Updating | |
207 | @section Translated Entries | |
0e3f7173 MM |
208 | @cindex translated entries |
209 | ||
210 | @@ -3563,64 +3562,64 @@ | |
211 | catalogs. It copies each message's msgid to its msgstr. | |
212 | ||
213 | @menu | |
214 | -* msgcat Invocation:: Invoking the @code{msgcat} Program | |
215 | -* msgconv Invocation:: Invoking the @code{msgconv} Program | |
216 | -* msggrep Invocation:: Invoking the @code{msggrep} Program | |
217 | -* msgfilter Invocation:: Invoking the @code{msgfilter} Program | |
218 | -* msguniq Invocation:: Invoking the @code{msguniq} Program | |
219 | -* msgcomm Invocation:: Invoking the @code{msgcomm} Program | |
220 | -* msgcmp Invocation:: Invoking the @code{msgcmp} Program | |
221 | -* msgattrib Invocation:: Invoking the @code{msgattrib} Program | |
222 | -* msgen Invocation:: Invoking the @code{msgen} Program | |
223 | -* msgexec Invocation:: Invoking the @code{msgexec} Program | |
224 | +* msgcat:: Invoking the @code{msgcat} Program | |
225 | +* msgconv:: Invoking the @code{msgconv} Program | |
226 | +* msggrep:: Invoking the @code{msggrep} Program | |
227 | +* msgfilter:: Invoking the @code{msgfilter} Program | |
228 | +* msguniq:: Invoking the @code{msguniq} Program | |
229 | +* msgcomm:: Invoking the @code{msgcomm} Program | |
230 | +* msgcmp:: Invoking the @code{msgcmp} Program | |
231 | +* msgattrib:: Invoking the @code{msgattrib} Program | |
232 | +* msgen:: Invoking the @code{msgen} Program | |
233 | +* msgexec:: Invoking the @code{msgexec} Program | |
234 | @end menu | |
235 | ||
236 | -@node msgcat Invocation, msgconv Invocation, Manipulating, Manipulating | |
237 | +@node msgcat, msgconv, Manipulating, Manipulating | |
238 | @section Invoking the @code{msgcat} Program | |
239 | ||
240 | @include msgcat.texi | |
241 | ||
242 | -@node msgconv Invocation, msggrep Invocation, msgcat Invocation, Manipulating | |
243 | +@node msgconv, msggrep, msgcat, Manipulating | |
244 | @section Invoking the @code{msgconv} Program | |
245 | ||
246 | @include msgconv.texi | |
247 | ||
248 | -@node msggrep Invocation, msgfilter Invocation, msgconv Invocation, Manipulating | |
249 | +@node msggrep, msgfilter, msgconv, Manipulating | |
250 | @section Invoking the @code{msggrep} Program | |
a33824de | 251 | |
0e3f7173 MM |
252 | @include msggrep.texi |
253 | ||
254 | -@node msgfilter Invocation, msguniq Invocation, msggrep Invocation, Manipulating | |
255 | +@node msgfilter, msguniq, msggrep, Manipulating | |
256 | @section Invoking the @code{msgfilter} Program | |
257 | ||
258 | @include msgfilter.texi | |
259 | ||
260 | -@node msguniq Invocation, msgcomm Invocation, msgfilter Invocation, Manipulating | |
261 | +@node msguniq, msgcomm, msgfilter, Manipulating | |
262 | @section Invoking the @code{msguniq} Program | |
263 | ||
264 | @include msguniq.texi | |
265 | ||
266 | -@node msgcomm Invocation, msgcmp Invocation, msguniq Invocation, Manipulating | |
267 | +@node msgcomm, msgcmp, msguniq, Manipulating | |
268 | @section Invoking the @code{msgcomm} Program | |
269 | ||
270 | @include msgcomm.texi | |
271 | ||
272 | -@node msgcmp Invocation, msgattrib Invocation, msgcomm Invocation, Manipulating | |
273 | +@node msgcmp, msgattrib, msgcomm, Manipulating | |
274 | @section Invoking the @code{msgcmp} Program | |
275 | ||
276 | @include msgcmp.texi | |
277 | ||
278 | -@node msgattrib Invocation, msgen Invocation, msgcmp Invocation, Manipulating | |
279 | +@node msgattrib, msgen, msgcmp, Manipulating | |
280 | @section Invoking the @code{msgattrib} Program | |
281 | ||
282 | @include msgattrib.texi | |
283 | ||
284 | -@node msgen Invocation, msgexec Invocation, msgattrib Invocation, Manipulating | |
285 | +@node msgen, msgexec, msgattrib, Manipulating | |
286 | @section Invoking the @code{msgen} Program | |
287 | ||
288 | @include msgen.texi | |
289 | ||
290 | -@node msgexec Invocation, , msgen Invocation, Manipulating | |
291 | +@node msgexec, , msgen, Manipulating | |
292 | @section Invoking the @code{msgexec} Program | |
293 | ||
294 | @include msgexec.texi | |
295 | @@ -3631,22 +3630,22 @@ | |
70ba7319 | 296 | @c FIXME: Rewrite. |
297 | ||
298 | @menu | |
299 | -* msgfmt Invocation:: Invoking the @code{msgfmt} Program | |
0e3f7173 MM |
300 | -* msgunfmt Invocation:: Invoking the @code{msgunfmt} Program |
301 | +* msgfmt:: Invoking the @code{msgfmt} Program | |
302 | +* msgunfmt:: Invoking the @code{msgunfmt} Program | |
70ba7319 | 303 | * MO Files:: The Format of GNU MO Files |
304 | @end menu | |
305 | ||
0e3f7173 MM |
306 | -@node msgfmt Invocation, msgunfmt Invocation, Binaries, Binaries |
307 | +@node msgfmt, msgunfmt, Binaries, Binaries | |
70ba7319 | 308 | @section Invoking the @code{msgfmt} Program |
309 | ||
0e3f7173 | 310 | @include msgfmt.texi |
70ba7319 | 311 | |
0e3f7173 MM |
312 | -@node msgunfmt Invocation, MO Files, msgfmt Invocation, Binaries |
313 | +@node msgunfmt, MO Files, msgfmt, Binaries | |
314 | @section Invoking the @code{msgunfmt} Program | |
315 | ||
316 | @include msgunfmt.texi | |
70ba7319 | 317 | |
0e3f7173 MM |
318 | -@node MO Files, , msgunfmt Invocation, Binaries |
319 | +@node MO Files, , msgunfmt, Binaries | |
320 | @section The Format of GNU MO Files | |
321 | @cindex MO file's format | |
322 | @cindex file format, @file{.mo} | |
323 | @@ -5531,7 +5530,7 @@ | |
70ba7319 | 324 | @menu |
325 | * Flat and Non-Flat:: Flat or Non-Flat Directory Structures | |
326 | * Prerequisites:: Prerequisite Works | |
327 | -* gettextize Invocation:: Invoking the @code{gettextize} Program | |
0e3f7173 | 328 | +* gettextize:: Invoking the @code{gettextize} Program |
70ba7319 | 329 | * Adjusting Files:: Files You Must Create or Alter |
0e3f7173 | 330 | * autoconf macros:: Autoconf macros for use in @file{configure.in} |
70ba7319 | 331 | @end menu |
0e3f7173 | 332 | @@ -5562,7 +5561,7 @@ |
a33824de | 333 | described in the remaining of this chapter. Some maintainers might |
334 | use this as an opportunity to unflatten their package structure. | |
70ba7319 | 335 | |
336 | -@node Prerequisites, gettextize Invocation, Flat and Non-Flat, Maintainers | |
337 | +@node Prerequisites, gettextize, Flat and Non-Flat, Maintainers | |
338 | @section Prerequisite Works | |
0e3f7173 MM |
339 | @cindex converting a package to use @code{gettext} |
340 | @cindex migration from earlier versions of @code{gettext} | |
341 | @@ -5647,7 +5646,7 @@ | |
70ba7319 | 342 | a maintainer, ever think there is a real problem with a team, please |
343 | never try to @emph{solve} a team's problem on your own. | |
344 | ||
345 | -@node gettextize Invocation, Adjusting Files, Prerequisites, Maintainers | |
346 | +@node gettextize, Adjusting Files, Prerequisites, Maintainers | |
347 | @section Invoking the @code{gettextize} Program | |
348 | ||
349 | Some files are consistently and identically needed in every package | |
0e3f7173 | 350 | @@ -5768,7 +5767,7 @@ |
70ba7319 | 351 | directory needs its own @file{Makefile}, and it has been designed so |
352 | it can be identical in all packages. | |
353 | ||
0e3f7173 MM |
354 | -@node Adjusting Files, autoconf macros, gettextize Invocation, Maintainers |
355 | +@node Adjusting Files, autoconf macros, gettextize, Maintainers | |
70ba7319 | 356 | @section Files You Must Create or Alter |
0e3f7173 | 357 | @cindex @code{gettext} files |
70ba7319 | 358 |