---- LPRng-3.8.15/src/common/lpstat.c.orig Mon Aug 12 02:01:45 2002
-+++ LPRng-3.8.15/src/common/lpstat.c Fri Dec 27 16:57:53 2002
+--- LPRng-3.8.26/src/common/lpstat.c.orig 2004-02-24 20:37:34.000000000 +0100
++++ LPRng-3.8.26/src/common/lpstat.c 2004-03-07 20:15:44.259399920 +0100
@@ -113,7 +113,7 @@
Setup_configuration();
Get_parms(argc, argv ); /* scan input args */
RemotePrinter_DYN, RemoteHost_DYN );
if( Write_fd_str( output, msg ) < 0 ) return(1);
}
-@@ -584,7 +584,7 @@
+@@ -584,30 +584,30 @@
}
- char *lpstat_msg =
--"usage: %s [-A] [-d] [-l] [-r] [-R] [-s] [-t] [-a [list]]\n\
-+N_("usage: %s [-A] [-d] [-l] [-r] [-R] [-s] [-t] [-a [list]]\n\
- [-c [list]] [-f [list]] [-o [list]]\n\
- [-p [list]] [-P] [-S [list]] [list]\n\
- [-u [login-ID-list]] [-v [list]] [-V] [-n] [-Tdbgflags]\n\
-@@ -607,12 +607,12 @@
- -v [list] printer mapping *\n\
- -V verbose mode \n\
- -Tdbgflags debug flags\n\
-- * - long status format produced\n";
-+ * - long status format produced\n");
+ static char *lpstat_msg[] = {
+- "usage: %s [-A] [-d] [-l] [-r] [-R] [-s] [-t] [-a [list]]\n",
+- " [-c [list]] [-f [list]] [-o [list]]\n",
+- " [-p [list]] [-P] [-S [list]] [list]\n",
+- " [-u [login-ID-list]] [-v [list]] [-V] [-n] [-Tdbgflags]\n",
+- " list is a list of print queues\n",
+- " -A use authentication specified by AUTH environment variable\n",
+- " -a [list] destination status *\n",
+- " -c [list] class status *\n",
+- " -d print default destination\n",
+- " -f [list] forms status *\n",
+- " -o [list] job or printer status *\n",
+- " -n each -n increases number of status lines (default 1) *\n",
+- " -N maximum number of status lines *\n",
+- " -p [list] printer status *\n",
+- " -P paper types - ignored\n",
+- " -r scheduler status\n",
+- " -s summary status information - short format\n",
+- " -S [list] character set - ignored\n",
+- " -t all status information - long format\n",
+- " -u [joblist] job status information\n",
+- " -v [list] printer mapping *\n",
+- " -V verbose mode \n",
+- " -Tdbgflags debug flags\n",
+- " * - long status format produced\n",
++ N_("usage: %s [-A] [-d] [-l] [-r] [-R] [-s] [-t] [-a [list]]\n"),
++ N_(" [-c [list]] [-f [list]] [-o [list]]\n"),
++ N_(" [-p [list]] [-P] [-S [list]] [list]\n"),
++ N_(" [-u [login-ID-list]] [-v [list]] [-V] [-n] [-Tdbgflags]\n"),
++ N_(" list is a list of print queues\n"),
++ N_(" -A use authentication specified by AUTH environment variable\n"),
++ N_(" -a [list] destination status *\n"),
++ N_(" -c [list] class status *\n"),
++ N_(" -d print default destination\n"),
++ N_(" -f [list] forms status *\n"),
++ N_(" -o [list] job or printer status *\n"),
++ N_(" -n each -n increases number of status lines (default 1) *\n"),
++ N_(" -N maximum number of status lines *\n"),
++ N_(" -p [list] printer status *\n"),
++ N_(" -P paper types - ignored\n"),
++ N_(" -r scheduler status\n"),
++ N_(" -s summary status information - short format\n"),
++ N_(" -S [list] character set - ignored\n"),
++ N_(" -t all status information - long format\n"),
++ N_(" -u [joblist] job status information\n"),
++ N_(" -v [list] printer mapping *\n"),
++ N_(" -V verbose mode \n"),
++ N_(" -Tdbgflags debug flags\n"),
++ N_(" * - long status format produced\n"),
+ 0 };
- void usage(void)
+@@ -615,7 +615,7 @@
{
-- FPRINTF( STDERR, lpstat_msg, Name );
-+ FPRINTF( STDERR, _(lpstat_msg), Name );
+ char **sptr, *s;
+ for( sptr= lpstat_msg; (s = *sptr); ++sptr ){
+- FPRINTF( STDERR, s, Name );
++ FPRINTF( STDERR, _(s), Name );
+ }
Parse_debug("=",-1);
FPRINTF( STDOUT, "%s\n", Version );
- exit(1);
--- LPRng-3.8.15/src/common/getopt.c.orig Mon Aug 12 02:01:44 2002
+++ LPRng-3.8.15/src/common/getopt.c Fri Dec 27 17:02:40 2002
@@ -89,7 +89,7 @@
next_opt = 0;
--- LPRng-3.8.15/po/POTFILES.in.orig Wed Aug 22 01:19:53 2001
+++ LPRng-3.8.15/po/POTFILES.in Fri Dec 27 17:11:07 2002
-@@ -1,5 +1,6 @@
+@@ -1,5 +1,7 @@
src/common/accounting.c
src/common/controlword.c
++src/common/debug.c
+src/common/getopt.c
src/common/linelist.c
src/common/lpc.c
src/common/lpd.c
-@@ -12,6 +13,7 @@
+@@ -12,6 +14,7 @@
src/common/lpq.c
src/common/lpr.c
src/common/lprm.c
src/common/sendjob.c
src/common/sendmail.c
src/common/sendreq.c
+--- LPRng-3.8.22/src/common/lpd_status.c.orig 2003-11-13 21:32:25.000000000 +0100
++++ LPRng-3.8.22/src/common/lpd_status.c 2003-11-13 21:41:55.840610760 +0100
+@@ -467,7 +467,7 @@
+ end_of_name = 0;
+ if( displayformat != REQ_DSHORT ){
+ SNPRINTF( header, sizeof(header)) "%s: ",
+- Server_queue_name_DYN?"Server Printer":"Printer" );
++ Server_queue_name_DYN?_("Server Printer"):_("Printer") );
+ }
+ len = safestrlen(header);
+ SNPRINTF( header+len, sizeof(header)-len) "%s@%s",
+--- LPRng-3.8.27/src/common/debug.c.orig 2004-05-03 22:24:01.000000000 +0200
++++ LPRng-3.8.27/src/common/debug.c 2004-05-16 10:08:08.829446800 +0200
+@@ -89,22 +89,22 @@
+ */
+
+ static char *guide[] = {
+- " use on command line, or in printcap :db=... entry",
+- " for server:",
+- " print: show queue (printing) actions, larger number, more information",
+- " NUMBER same as print+NUMBER",
+- " lpr: show servicing lpr actions",
+- " lpq: show servicing lpq actions",
+- " lprm: show servicing lprm actions",
+- " network: show low level network actions",
+- " database: show low level database actions",
+- " log: Testing. Don't use this unless you read the code.",
+- " test: Testing. don't use this unless you read the code.",
+- " for clients (lpr, lpq, etc):",
+- " print: show client actions, larger number, more information",
+- " NUMBER same as print+NUMBER",
+- " network: show low level network actions.",
+- " database: show low level database actions.",
++ N_(" use on command line, or in printcap :db=... entry"),
++ N_(" for server:"),
++ N_(" print: show queue (printing) actions, larger number, more information"),
++ N_(" NUMBER same as print+NUMBER"),
++ N_(" lpr: show servicing lpr actions"),
++ N_(" lpq: show servicing lpq actions"),
++ N_(" lprm: show servicing lprm actions"),
++ N_(" network: show low level network actions"),
++ N_(" database: show low level database actions"),
++ N_(" log: Testing. Don't use this unless you read the code."),
++ N_(" test: Testing. don't use this unless you read the code."),
++ N_(" for clients (lpr, lpq, etc):"),
++ N_(" print: show client actions, larger number, more information"),
++ N_(" NUMBER same as print+NUMBER"),
++ N_(" network: show low level network actions."),
++ N_(" database: show low level database actions."),
+ 0
+ };
+ void Parse_debug (char *dbgstr, int interactive )
+@@ -157,8 +157,8 @@
+ if(!found && interactive ){
+ int i;
+ int lastflag = 0;
+- FPRINTF (STDERR, "debug flag format: num | flag[+num] | flag=str\n");
+- FPRINTF (STDERR, " flag names:");
++ FPRINTF (STDERR, _("debug flag format: num | flag[+num] | flag=str\n"));
++ FPRINTF (STDERR, _(" flag names:"));
+ for (i = 0; list[i].keyword; i++) {
+ if( safestrchr( list[i].keyword, '+' ) ) continue;
+ if( lastflag ){
+@@ -169,10 +169,10 @@
+ }
+ switch( list[i].type ){
+ case INTEGER_K:
+- FPRINTF (STDERR, "%s=num", list[i].keyword);
++ FPRINTF (STDERR, _("%s=num"), list[i].keyword);
+ break;
+ case STRING_K:
+- FPRINTF (STDERR, "%s=str", list[i].keyword);
++ FPRINTF (STDERR, _("%s=str"), list[i].keyword);
+ break;
+ case FLAG_K:
+ FPRINTF (STDERR, "%s[+N]", list[i].keyword );
+@@ -184,7 +184,7 @@
+ }
+ FPRINTF (STDERR, "\n");
+ for(i = 0; guide[i]; ++i ){
+- FPRINTF (STDERR, "%s\n", guide[i]);
++ FPRINTF (STDERR, "%s\n", _(guide[i]));
+ }
+
+ Errorcode = JABORT;