]>
Commit | Line | Data |
---|---|---|
91279555 JB |
1 | --- LPRng-3.8.26/src/common/lpstat.c.orig 2004-02-24 20:37:34.000000000 +0100 |
2 | +++ LPRng-3.8.26/src/common/lpstat.c 2004-03-07 20:15:44.259399920 +0100 | |
e520e666 JB |
3 | @@ -113,7 +113,7 @@ |
4 | Setup_configuration(); | |
5 | Get_parms(argc, argv ); /* scan input args */ | |
6 | if( A_flag && !getenv( "AUTH" ) ){ | |
7 | - FPRINTF(STDERR,"lpstat: requested authenticated transfer (-A) and AUTH environment variable not set"); | |
8 | + FPRINTF(STDERR,_("lpstat: requested authenticated transfer (-A) and AUTH environment variable not set")); | |
9 | usage(); | |
10 | } | |
11 | ||
12 | @@ -161,14 +161,14 @@ | |
13 | if(DEBUGL1)Dump_line_list("lpstat - options", &options); | |
14 | ||
15 | if( r_flag ){ | |
16 | - Write_fd_str(1,"scheduler is running\n"); | |
17 | + Write_fd_str(1,_("scheduler is running\n")); | |
18 | } | |
19 | if( d_flag ){ | |
20 | if( Printer_DYN == 0 ){ | |
21 | - Write_fd_str(1,"no system default destination\n"); | |
22 | + Write_fd_str(1,_("no system default destination\n")); | |
23 | } else { | |
24 | SNPRINTF(msg,sizeof(msg)) | |
25 | - "system default destination: %s\n", Printer_DYN); | |
26 | + _("system default destination: %s\n"), Printer_DYN); | |
27 | Write_fd_str(1,msg); | |
28 | } | |
29 | } | |
30 | @@ -176,7 +176,7 @@ | |
31 | for( i = 0; i < request_list.count; ++i ){ | |
32 | Set_DYN(&Printer_DYN,request_list.list[i] ); | |
33 | Fix_Rm_Rp_info(0,0); | |
34 | - SNPRINTF(msg,sizeof(msg)) "system for %s: %s\n", Printer_DYN, RemoteHost_DYN); | |
35 | + SNPRINTF(msg,sizeof(msg)) _("system for %s: %s\n"), Printer_DYN, RemoteHost_DYN); | |
36 | Write_fd_str(1,msg); | |
37 | } | |
38 | } | |
39 | @@ -220,7 +220,7 @@ | |
40 | ||
41 | if( Check_for_rg_group( Logname_DYN ) ){ | |
42 | SNPRINTF( msg, sizeof(msg)) | |
43 | - " Printer: %s - cannot use printer, not in privileged group\n", Printer_DYN ); | |
44 | + _(" Printer: %s - cannot use printer, not in privileged group\n"), Printer_DYN ); | |
45 | if( Write_fd_str( 1, msg ) < 0 ) cleanup(0); | |
46 | return; | |
47 | } | |
48 | @@ -358,25 +358,25 @@ | |
49 | if( a_flag ){ | |
50 | if( !nospool ){ | |
51 | SNPRINTF(msg,sizeof(msg)) | |
52 | - "%s accepting requests since %s\n", | |
53 | + _("%s accepting requests since %s\n"), | |
54 | Printer_DYN, Time_str(0,0) ); | |
55 | } else { | |
56 | SNPRINTF(msg,sizeof(msg)) | |
57 | - "%s not accepting requests since %s -\n\tunknown reason\n", | |
58 | + _("%s not accepting requests since %s -\n\tunknown reason\n"), | |
59 | Printer_DYN, Time_str(0,0) ); | |
60 | } | |
61 | if( Write_fd_str( output, msg ) < 0 ) return(1); | |
62 | } | |
63 | if( p_flag ){ | |
64 | SNPRINTF(msg,sizeof(msg)) | |
65 | - "printer %s unknown state. %s since %s. available\n", | |
66 | + _("printer %s unknown state. %s since %s. available\n"), | |
67 | Printer_DYN, noprint?"disabled":"enabled", | |
68 | Pretty_time(0)); | |
69 | if( Write_fd_str( output, msg ) < 0 ) return(1); | |
70 | } | |
71 | if( p_flag && D_flag ){ | |
72 | SNPRINTF(msg,sizeof(msg)) | |
73 | - "\tDescription: %s@%s\n", | |
74 | + _("\tDescription: %s@%s\n"), | |
75 | RemotePrinter_DYN, RemoteHost_DYN ); | |
76 | if( Write_fd_str( output, msg ) < 0 ) return(1); | |
77 | } | |
91279555 | 78 | @@ -584,30 +584,30 @@ |
e520e666 JB |
79 | } |
80 | ||
91279555 JB |
81 | static char *lpstat_msg[] = { |
82 | - "usage: %s [-A] [-d] [-l] [-r] [-R] [-s] [-t] [-a [list]]\n", | |
83 | - " [-c [list]] [-f [list]] [-o [list]]\n", | |
84 | - " [-p [list]] [-P] [-S [list]] [list]\n", | |
85 | - " [-u [login-ID-list]] [-v [list]] [-V] [-n] [-Tdbgflags]\n", | |
86 | - " list is a list of print queues\n", | |
87 | - " -A use authentication specified by AUTH environment variable\n", | |
88 | - " -a [list] destination status *\n", | |
89 | - " -c [list] class status *\n", | |
90 | - " -d print default destination\n", | |
91 | - " -f [list] forms status *\n", | |
92 | - " -o [list] job or printer status *\n", | |
93 | - " -n each -n increases number of status lines (default 1) *\n", | |
94 | - " -N maximum number of status lines *\n", | |
95 | - " -p [list] printer status *\n", | |
96 | - " -P paper types - ignored\n", | |
97 | - " -r scheduler status\n", | |
98 | - " -s summary status information - short format\n", | |
99 | - " -S [list] character set - ignored\n", | |
100 | - " -t all status information - long format\n", | |
101 | - " -u [joblist] job status information\n", | |
102 | - " -v [list] printer mapping *\n", | |
103 | - " -V verbose mode \n", | |
104 | - " -Tdbgflags debug flags\n", | |
105 | - " * - long status format produced\n", | |
106 | + N_("usage: %s [-A] [-d] [-l] [-r] [-R] [-s] [-t] [-a [list]]\n"), | |
107 | + N_(" [-c [list]] [-f [list]] [-o [list]]\n"), | |
108 | + N_(" [-p [list]] [-P] [-S [list]] [list]\n"), | |
109 | + N_(" [-u [login-ID-list]] [-v [list]] [-V] [-n] [-Tdbgflags]\n"), | |
110 | + N_(" list is a list of print queues\n"), | |
111 | + N_(" -A use authentication specified by AUTH environment variable\n"), | |
112 | + N_(" -a [list] destination status *\n"), | |
113 | + N_(" -c [list] class status *\n"), | |
114 | + N_(" -d print default destination\n"), | |
115 | + N_(" -f [list] forms status *\n"), | |
116 | + N_(" -o [list] job or printer status *\n"), | |
117 | + N_(" -n each -n increases number of status lines (default 1) *\n"), | |
118 | + N_(" -N maximum number of status lines *\n"), | |
119 | + N_(" -p [list] printer status *\n"), | |
120 | + N_(" -P paper types - ignored\n"), | |
121 | + N_(" -r scheduler status\n"), | |
122 | + N_(" -s summary status information - short format\n"), | |
123 | + N_(" -S [list] character set - ignored\n"), | |
124 | + N_(" -t all status information - long format\n"), | |
125 | + N_(" -u [joblist] job status information\n"), | |
126 | + N_(" -v [list] printer mapping *\n"), | |
127 | + N_(" -V verbose mode \n"), | |
128 | + N_(" -Tdbgflags debug flags\n"), | |
129 | + N_(" * - long status format produced\n"), | |
130 | 0 }; | |
e520e666 JB |
131 | |
132 | ||
91279555 | 133 | @@ -615,7 +615,7 @@ |
e520e666 | 134 | { |
91279555 JB |
135 | char **sptr, *s; |
136 | for( sptr= lpstat_msg; (s = *sptr); ++sptr ){ | |
137 | - FPRINTF( STDERR, s, Name ); | |
138 | + FPRINTF( STDERR, _(s), Name ); | |
139 | } | |
e520e666 JB |
140 | Parse_debug("=",-1); |
141 | FPRINTF( STDOUT, "%s\n", Version ); | |
e520e666 JB |
142 | --- LPRng-3.8.15/src/common/getopt.c.orig Mon Aug 12 02:01:44 2002 |
143 | +++ LPRng-3.8.15/src/common/getopt.c Fri Dec 27 17:02:40 2002 | |
144 | @@ -89,7 +89,7 @@ | |
145 | if (option == '-') { | |
146 | if( *next_opt ){ | |
147 | if( Opterr ){ | |
148 | - (void) FPRINTF (STDERR, "--X option form illegal\n" ); | |
149 | + (void) FPRINTF (STDERR, _("--X option form illegal\n") ); | |
150 | return('?'); | |
151 | } | |
152 | } | |
153 | @@ -100,7 +100,7 @@ | |
154 | */ | |
155 | if ((match = (char *) safestrchr (optstring, option)) == 0 ){ | |
156 | if( Opterr ){ | |
157 | - (void) FPRINTF (STDERR, "%s: Illegal option '%c'\n", Name, option); | |
158 | + (void) FPRINTF (STDERR, _("%s: Illegal option '%c'\n"), Name, option); | |
159 | } | |
160 | return( '?' ); | |
161 | } | |
162 | @@ -122,7 +122,7 @@ | |
163 | } | |
164 | if( Optarg == 0 && Opterr ) { | |
165 | (void) FPRINTF (STDERR, | |
166 | - "%s: missing argument for '%c'\n", Name, option); | |
167 | + _("%s: missing argument for '%c'\n"), Name, option); | |
168 | option = '?'; | |
169 | } | |
170 | next_opt = 0; | |
171 | --- LPRng-3.8.15/po/POTFILES.in.orig Wed Aug 22 01:19:53 2001 | |
172 | +++ LPRng-3.8.15/po/POTFILES.in Fri Dec 27 17:11:07 2002 | |
a8974305 | 173 | @@ -1,5 +1,7 @@ |
e520e666 JB |
174 | src/common/accounting.c |
175 | src/common/controlword.c | |
a8974305 | 176 | +src/common/debug.c |
e520e666 JB |
177 | +src/common/getopt.c |
178 | src/common/linelist.c | |
179 | src/common/lpc.c | |
180 | src/common/lpd.c | |
a8974305 | 181 | @@ -12,6 +14,7 @@ |
e520e666 JB |
182 | src/common/lpq.c |
183 | src/common/lpr.c | |
184 | src/common/lprm.c | |
185 | +src/common/lpstat.c | |
186 | src/common/sendjob.c | |
187 | src/common/sendmail.c | |
188 | src/common/sendreq.c | |
f07a6b13 JB |
189 | --- LPRng-3.8.22/src/common/lpd_status.c.orig 2003-11-13 21:32:25.000000000 +0100 |
190 | +++ LPRng-3.8.22/src/common/lpd_status.c 2003-11-13 21:41:55.840610760 +0100 | |
191 | @@ -467,7 +467,7 @@ | |
192 | end_of_name = 0; | |
193 | if( displayformat != REQ_DSHORT ){ | |
194 | SNPRINTF( header, sizeof(header)) "%s: ", | |
195 | - Server_queue_name_DYN?"Server Printer":"Printer" ); | |
196 | + Server_queue_name_DYN?_("Server Printer"):_("Printer") ); | |
197 | } | |
198 | len = safestrlen(header); | |
199 | SNPRINTF( header+len, sizeof(header)-len) "%s@%s", | |
a8974305 JB |
200 | --- LPRng-3.8.27/src/common/debug.c.orig 2004-05-03 22:24:01.000000000 +0200 |
201 | +++ LPRng-3.8.27/src/common/debug.c 2004-05-16 10:08:08.829446800 +0200 | |
202 | @@ -89,22 +89,22 @@ | |
203 | */ | |
204 | ||
205 | static char *guide[] = { | |
206 | - " use on command line, or in printcap :db=... entry", | |
207 | - " for server:", | |
208 | - " print: show queue (printing) actions, larger number, more information", | |
209 | - " NUMBER same as print+NUMBER", | |
210 | - " lpr: show servicing lpr actions", | |
211 | - " lpq: show servicing lpq actions", | |
212 | - " lprm: show servicing lprm actions", | |
213 | - " network: show low level network actions", | |
214 | - " database: show low level database actions", | |
215 | - " log: Testing. Don't use this unless you read the code.", | |
216 | - " test: Testing. don't use this unless you read the code.", | |
217 | - " for clients (lpr, lpq, etc):", | |
218 | - " print: show client actions, larger number, more information", | |
219 | - " NUMBER same as print+NUMBER", | |
220 | - " network: show low level network actions.", | |
221 | - " database: show low level database actions.", | |
222 | + N_(" use on command line, or in printcap :db=... entry"), | |
223 | + N_(" for server:"), | |
224 | + N_(" print: show queue (printing) actions, larger number, more information"), | |
225 | + N_(" NUMBER same as print+NUMBER"), | |
226 | + N_(" lpr: show servicing lpr actions"), | |
227 | + N_(" lpq: show servicing lpq actions"), | |
228 | + N_(" lprm: show servicing lprm actions"), | |
229 | + N_(" network: show low level network actions"), | |
230 | + N_(" database: show low level database actions"), | |
231 | + N_(" log: Testing. Don't use this unless you read the code."), | |
232 | + N_(" test: Testing. don't use this unless you read the code."), | |
233 | + N_(" for clients (lpr, lpq, etc):"), | |
234 | + N_(" print: show client actions, larger number, more information"), | |
235 | + N_(" NUMBER same as print+NUMBER"), | |
236 | + N_(" network: show low level network actions."), | |
237 | + N_(" database: show low level database actions."), | |
238 | 0 | |
239 | }; | |
240 | void Parse_debug (char *dbgstr, int interactive ) | |
241 | @@ -157,8 +157,8 @@ | |
242 | if(!found && interactive ){ | |
243 | int i; | |
244 | int lastflag = 0; | |
245 | - FPRINTF (STDERR, "debug flag format: num | flag[+num] | flag=str\n"); | |
246 | - FPRINTF (STDERR, " flag names:"); | |
247 | + FPRINTF (STDERR, _("debug flag format: num | flag[+num] | flag=str\n")); | |
248 | + FPRINTF (STDERR, _(" flag names:")); | |
249 | for (i = 0; list[i].keyword; i++) { | |
250 | if( safestrchr( list[i].keyword, '+' ) ) continue; | |
251 | if( lastflag ){ | |
252 | @@ -169,10 +169,10 @@ | |
253 | } | |
254 | switch( list[i].type ){ | |
255 | case INTEGER_K: | |
256 | - FPRINTF (STDERR, "%s=num", list[i].keyword); | |
257 | + FPRINTF (STDERR, _("%s=num"), list[i].keyword); | |
258 | break; | |
259 | case STRING_K: | |
260 | - FPRINTF (STDERR, "%s=str", list[i].keyword); | |
261 | + FPRINTF (STDERR, _("%s=str"), list[i].keyword); | |
262 | break; | |
263 | case FLAG_K: | |
264 | FPRINTF (STDERR, "%s[+N]", list[i].keyword ); | |
265 | @@ -184,7 +184,7 @@ | |
266 | } | |
267 | FPRINTF (STDERR, "\n"); | |
268 | for(i = 0; guide[i]; ++i ){ | |
269 | - FPRINTF (STDERR, "%s\n", guide[i]); | |
270 | + FPRINTF (STDERR, "%s\n", _(guide[i])); | |
271 | } | |
272 | ||
273 | Errorcode = JABORT; |