]>
Commit | Line | Data |
---|---|---|
a33824de | 1 | diff -Nru gettext-0.10.36/doc/gettext.texi gettext-0.10.36.new/doc/gettext.texi |
2 | --- gettext-0.10.36/doc/gettext.texi Thu Mar 29 17:51:51 2001 | |
3 | +++ gettext-0.10.36.new/doc/gettext.texi Wed Apr 4 01:11:29 2001 | |
70ba7319 | 4 | @@ -7,13 +7,13 @@ |
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. | |
04922126 | 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 | |
a33824de | 24 | @@ -120,11 +120,11 @@ |
70ba7319 | 25 | |
a33824de | 26 | Making the PO Template File |
70ba7319 | 27 | |
28 | -* xgettext Invocation:: Invoking the @code{xgettext} Program | |
29 | +* xgettext:: Invoking the @code{xgettext} Program | |
70ba7319 | 30 | |
31 | Updating Existing PO Files | |
32 | ||
33 | -* msgmerge Invocation:: Invoking the @code{msgmerge} Program | |
34 | +* msgmerge:: Invoking the @code{msgmerge} Program | |
a33824de | 35 | * Translated Entries:: Translated Entries |
36 | * Fuzzy Entries:: Fuzzy Entries | |
70ba7319 | 37 | * Untranslated Entries:: Untranslated Entries |
a33824de | 38 | @@ -138,7 +138,7 @@ |
70ba7319 | 39 | |
40 | Producing Binary MO Files | |
41 | ||
42 | -* msgfmt Invocation:: Invoking the @code{msgfmt} Program | |
43 | +* msgfmt:: Invoking the @code{msgfmt} Program | |
44 | * MO Files:: The Format of GNU MO Files | |
45 | ||
46 | The User's View | |
a33824de | 47 | @@ -201,7 +201,7 @@ |
70ba7319 | 48 | |
49 | * Flat and Non-Flat:: Flat or Non-Flat Directory Structures | |
50 | * Prerequisites:: Prerequisite Works | |
51 | -* gettextize Invocation:: Invoking the @code{gettextize} Program | |
52 | +* gettextize:: Invoking the @code{gettextize} Program | |
53 | * Adjusting Files:: Files You Must Create or Alter | |
54 | ||
55 | Files You Must Create or Alter | |
a33824de | 56 | @@ -649,7 +649,7 @@ |
70ba7319 | 57 | exactly where in C sources each string is used. All translations |
58 | are set to empty. The letter @kbd{t} in @file{.pot} marks this as | |
59 | a Template PO file, not yet oriented towards any particular language. | |
60 | -@xref{xgettext Invocation}, for more details about how one calls the | |
61 | +@xref{xgettext}, for more details about how one calls the | |
62 | @code{xgettext} program. If you are @emph{really} lazy, you might | |
63 | be interested at working a lot more right away, and preparing the | |
64 | whole distribution setup (@pxref{Maintainers}). By doing so, you | |
a33824de | 65 | @@ -725,7 +725,7 @@ |
70ba7319 | 66 | which are no longer used in the program sources (@pxref{Obsolete |
67 | Entries}). It finally discovers new strings and inserts them in | |
68 | the resulting PO file as untranslated entries (@pxref{Untranslated | |
69 | -Entries}). @xref{msgmerge Invocation}, for more information about what | |
70 | +Entries}). @xref{msgmerge}, for more information about what | |
71 | @code{msgmerge} really does. | |
72 | ||
73 | Whatever route or means taken, the goal is to obtain an updated | |
a33824de | 74 | @@ -751,9 +751,9 @@ |
70ba7319 | 75 | Once the PO file is complete and dependable, the @code{msgfmt} program |
76 | is used for turning the PO file into a machine-oriented format, which | |
77 | may yield efficient retrieval of translations by the programs of the | |
78 | -package, whenever needed at runtime (@pxref{MO Files}). @xref{msgfmt | |
79 | -Invocation}, for more information about all modalities of execution | |
80 | -for the @code{msgfmt} program. | |
81 | +package, whenever needed at runtime (@pxref{MO Files}). @xref{msgfmt}, | |
82 | +for more information about all modalities of execution for the @code{msgfmt} | |
83 | +program. | |
84 | ||
85 | Finally, the modified and marked C sources are compiled and linked | |
86 | with the GNU @code{gettext} library, usually through the operation of | |
a33824de | 87 | @@ -908,7 +908,7 @@ |
70ba7319 | 88 | |
89 | In case the @kbd{c-format} flag is given for a string the @code{msgfmt} | |
90 | does some more tests to check to validity of the translation. | |
91 | -@xref{msgfmt Invocation}. | |
92 | +@xref{msgfmt}. | |
93 | ||
94 | @end table | |
95 | ||
a33824de | 96 | @@ -1726,7 +1726,7 @@ |
70ba7319 | 97 | |
98 | If a string is marked with @kbd{c-format} and this is not correct the | |
a33824de | 99 | user can find out who is responsible for the decision. See |
100 | -@ref{xgettext Invocation} to see how the @kbd{--debug} option can be | |
101 | +@ref{xgettext} to see how the @kbd{--debug} option can be | |
102 | used for solving this problem. | |
70ba7319 | 103 | |
104 | @node Special cases, , c-format, Sources | |
a33824de | 105 | @@ -1757,7 +1757,7 @@ |
70ba7319 | 106 | While it is no problem to mark the string @code{"a default message"} it |
107 | is not possible to mark the string initializers for @code{messages}. | |
108 | What is to be done? We have to fulfill two tasks. First we have to mark the | |
109 | -strings so that the @code{xgettext} program (@pxref{xgettext Invocation}) | |
110 | +strings so that the @code{xgettext} program (@pxref{xgettext}) | |
111 | can find them, and second we have to translate the string at runtime | |
112 | before printing them. | |
113 | ||
a33824de | 114 | @@ -1787,8 +1787,7 @@ |
70ba7319 | 115 | |
116 | Please convince yourself that the string which is written by | |
117 | @code{fputs} is translated in any case. How to get @code{xgettext} know | |
118 | -the additional keyword @code{gettext_noop} is explained in @ref{xgettext | |
119 | -Invocation}. | |
120 | +the additional keyword @code{gettext_noop} is explained in @ref{xgettext}. | |
121 | ||
122 | The above is of course not the only solution. You could also come along | |
123 | with the following one: | |
a33824de | 124 | @@ -1833,10 +1832,10 @@ |
70ba7319 | 125 | @c FIXME: Rewrite. |
126 | ||
127 | @menu | |
128 | -* xgettext Invocation:: Invoking the @code{xgettext} Program | |
129 | +* xgettext:: Invoking the @code{xgettext} Program | |
70ba7319 | 130 | @end menu |
131 | ||
a33824de | 132 | -@node xgettext Invocation, , Template, Template |
133 | +@node xgettext, , Template, Template | |
70ba7319 | 134 | @section Invoking the @code{xgettext} Program |
135 | ||
136 | @c FIXME: Rewrite. | |
a33824de | 137 | @@ -2119,7 +2118,7 @@ |
70ba7319 | 138 | @c FIXME: Rewrite. |
139 | ||
140 | @menu | |
141 | -* msgmerge Invocation:: Invoking the @code{msgmerge} Program | |
142 | +* msgmerge:: Invoking the @code{msgmerge} Program | |
a33824de | 143 | * Translated Entries:: Translated Entries |
144 | * Fuzzy Entries:: Fuzzy Entries | |
70ba7319 | 145 | * Untranslated Entries:: Untranslated Entries |
a33824de | 146 | @@ -2132,7 +2131,7 @@ |
147 | * Compendium:: Using Translation Compendiums | |
70ba7319 | 148 | @end menu |
149 | ||
150 | -@node msgmerge Invocation, Translated Entries, Updating, Updating | |
151 | +@node msgmerge, Translated Entries, Updating, Updating | |
152 | @section Invoking the @code{msgmerge} Program | |
153 | ||
154 | @c FIXME: Rewrite. | |
a33824de | 155 | @@ -2156,7 +2155,7 @@ |
156 | @c so marking the entry as obsolete, and giving the modified string with | |
157 | @c an empty translation, that is, marking the entry as untranslated. | |
158 | ||
159 | -@node Translated Entries, Fuzzy Entries, msgmerge Invocation, Updating | |
160 | +@node Translated Entries, Fuzzy Entries, msgmerge, Updating | |
161 | @section Translated Entries | |
162 | ||
163 | Each PO file entry for which the @code{msgstr} field has been filled with | |
164 | @@ -2874,11 +2873,11 @@ | |
70ba7319 | 165 | @c FIXME: Rewrite. |
166 | ||
167 | @menu | |
168 | -* msgfmt Invocation:: Invoking the @code{msgfmt} Program | |
169 | +* msgfmt:: Invoking the @code{msgfmt} Program | |
170 | * MO Files:: The Format of GNU MO Files | |
171 | @end menu | |
172 | ||
173 | -@node msgfmt Invocation, MO Files, Binaries, Binaries | |
174 | +@node msgfmt, MO Files, Binaries, Binaries | |
175 | @section Invoking the @code{msgfmt} Program | |
176 | ||
177 | @c FIXME: Rewrite. | |
a33824de | 178 | @@ -2954,7 +2953,7 @@ |
70ba7319 | 179 | If input file is @samp{-}, standard input is read. If output file |
180 | is @samp{-}, output is written to standard output. | |
181 | ||
182 | -@node MO Files, , msgfmt Invocation, Binaries | |
183 | +@node MO Files, , msgfmt, Binaries | |
184 | @section The Format of GNU MO Files | |
185 | ||
186 | The format of the generated MO files is best described by a picture, | |
a33824de | 187 | @@ -4752,7 +4751,7 @@ |
70ba7319 | 188 | @menu |
189 | * Flat and Non-Flat:: Flat or Non-Flat Directory Structures | |
190 | * Prerequisites:: Prerequisite Works | |
191 | -* gettextize Invocation:: Invoking the @code{gettextize} Program | |
192 | +* gettextize:: Invoking the @code{gettextize} Program | |
193 | * Adjusting Files:: Files You Must Create or Alter | |
194 | @end menu | |
195 | ||
a33824de | 196 | @@ -4782,7 +4781,7 @@ |
197 | described in the remaining of this chapter. Some maintainers might | |
198 | use this as an opportunity to unflatten their package structure. | |
70ba7319 | 199 | |
200 | -@node Prerequisites, gettextize Invocation, Flat and Non-Flat, Maintainers | |
201 | +@node Prerequisites, gettextize, Flat and Non-Flat, Maintainers | |
202 | @section Prerequisite Works | |
203 | ||
204 | There are some works which are required for using GNU @code{gettext} | |
a33824de | 205 | @@ -4862,7 +4861,7 @@ |
70ba7319 | 206 | a maintainer, ever think there is a real problem with a team, please |
207 | never try to @emph{solve} a team's problem on your own. | |
208 | ||
209 | -@node gettextize Invocation, Adjusting Files, Prerequisites, Maintainers | |
210 | +@node gettextize, Adjusting Files, Prerequisites, Maintainers | |
211 | @section Invoking the @code{gettextize} Program | |
212 | ||
213 | Some files are consistently and identically needed in every package | |
a33824de | 214 | @@ -4954,7 +4953,7 @@ |
70ba7319 | 215 | directory needs its own @file{Makefile}, and it has been designed so |
216 | it can be identical in all packages. | |
217 | ||
218 | -@node Adjusting Files, , gettextize Invocation, Maintainers | |
219 | +@node Adjusting Files, , gettextize, Maintainers | |
220 | @section Files You Must Create or Alter | |
221 | ||
222 | Besides files which are automatically added through @code{gettextize}, |