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