Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.2.0@4306 a1ca3aef-8c08-0410-bb20-df032aa958be

CHANGES.txt

@@ -1,80 +1,6 @@
-CHANGES.txt - 2006-05-22
+CHANGES.txt - 2006-05-08
 ------------------------
 
-CHANGES IN CUPS V1.2.1
-
-	- The web interface did not handle reloads properly for
-	  MSIE (STR #1716)
-	- The configure script no longer adds linker rpath
-	  options when they are unnecessary.
-	- The scheduler could crash printing a debug message on
-	  Solaris (STR #1714)
-	- The --enable-32bit and --enable-64bit configure options
-	  did not always work.
-	- The password prompt showed the domain socket address
-	  instead of "localhost" for local authentication (STR
-	  #1706)
-	- The web interface filtered the list of printers even if
-	  the user wasn't logged in (STR #1700)
-	- The IPP backend did not work reliably with some Xerox
-	  printers (STR #1704)
-	- Trailing banners were not added when printing a single
-	  file (STR #1698)
-	- The web interface support programs crashed on Solaris
-	  (STR #1699)
-	- cupstestppd incorrectly reported problems with
-	  *1284DeviceID attributes (STR #1710)
-	- Browsing could get disabled after a restart (STR #1670)
-	- Custom page sizes were not parsed properly (STR #1709)
-	- The -U option wasn't supported by lpadmin (STR #1702)
-	- The -u option didn't work with lpadmin (STR #1703)
-	- The scheduler did not create non-blocking back-channel
-	  pipes, which caused problems when the printer driver
-	  did not read the back-channel data (STR #1705)
-	- The scheduler no longer uses chunking in responses to
-	  clients - this caused problems with older versions of
-	  CUPS like 1.1.17 (PR #6143)
-	- Automatic raw printing was broken (STR #1667)
-	- 6-up printing was broken (STR #1697)
-	- The pstops filter did not disable CTRL-D processing on
-	  the printer/RIP.
-	- ppdOpen*() did not load custom options properly (STR
-	  #1680)
-	- "Set Printer Options" in the web interface did not
-	  update the DefaultImageableArea or
-	  DefaultPaperDimension attributes in the PPD file (STR
-	  #1689)
-	- Fixed compile errors (STR #1682, STR #1684, STR #1685,
-	  STR #1690)
-	- The lpstat command displayed the wrong error message
-	  for a missing destination (STR #1683)
-	- Revised and completed the Polish translation (STR
-	  #1669)
-	- Stopped jobs did not show up in the list of active jobs
-	  (STR #1676)
-	- The configure script did not use the GNU TLS
-	  "libgnutls-config" script to find the proper compiler
-	  and linker options.
-	- The imagetoraster filter did not correctly generate
-	  several 1, 2, and 4-bit color modes.
-	- cupsRasterWritePixels() could lose track of the current
-	  output row.
-	- cupsRasterReadPixels() did not automatically swap
-	  12/16-bit chunked pixel data.
-	- Moved the private _cups_raster_s structure out of the
-	  public header.
-	- Updated the CUPS raster format specification to include
-	  encoding rules and colorspace definitions.
-	- The Zebra PPD files had the wrong PostScript code for
-	  the "default" option choices.
-	- The imagetoraster filter did not generate correct CIE
-	  XYZ or Lab color data.
-	- The cups-config script did not work when invoked from a
-	  source directory (STR #1673)
-	- The SNMP backend did not compile on systems that used
-	  the getifaddrs emulation functions (STR #1668)
-
-
 CHANGES IN CUPS V1.2.0
 
 	- Documentation updates (STR #1618, STR #1620, STR #1622,

Makedefs.in

@@ -149,7 +149,6 @@ LAUNCHDLIBS	=	@LAUNCHDLIBS@
 #
 
 ARCH32FLAGS	=	@ARCH32FLAGS@
-DSO32FLAGS	=	@DSO32FLAGS@
 INSTALL32	=	@INSTALL32@
 LIB32CUPS	=	@LIB32CUPS@
 LIB32CUPSIMAGE	=	@LIB32CUPSIMAGE@
@@ -157,7 +156,6 @@ LIB32DIR	=	$(BUILDROOT)@LIB32DIR@
 UNINSTALL32	=	@UNINSTALL32@
 
 ARCH64FLAGS	=	@ARCH64FLAGS@
-DSO64FLAGS	=	@DSO64FLAGS@
 INSTALL64	=	@INSTALL64@
 LIB64CUPS	=	@LIB64CUPS@
 LIB64CUPSIMAGE	=	@LIB64CUPSIMAGE@

Makefile

@@ -99,8 +99,8 @@ install:	installhdrs
 	echo Installing cups-config script...
 	$(INSTALL_DIR) -m 755 $(BINDIR)
 	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
+	echo Installing startup script...
 	if test "x$(INITDIR)" != x; then \
-		echo Installing init scripts...; \
 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
 		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
@@ -115,16 +115,13 @@ install:	installhdrs
 	if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
 		$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
 		if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
-			echo Installing StartupItems files...; \
 			$(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \
 			$(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
 			$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
 			$(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
 		elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
-			echo Installing LaunchDaemons configuration file...; \
 			$(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
 		else \
-			echo Installing RC script...; \
 			$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
 		fi \
 	fi

backend/ipp.c

@@ -276,7 +276,7 @@ main(int  argc,				/* I - Number of command-line args */
             *ptr++ = *optptr++;
 	*ptr = '\0';
 
-	if (*optptr == '+' || *optptr == '&')
+	if (*optptr == '+')
 	  optptr ++;
       }
       else

backend/serial.c

@@ -310,7 +310,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
             *ptr++ = *options++;
 	*ptr = '\0';
 
-	if (*options == '+' || *options == '&')
+	if (*options == '+')
 	  options ++;
       }
       else

backend/usb-unix.c

@@ -60,7 +60,6 @@ print_device(const char *uri,		/* I - Device URI */
 	     int	argc,		/* I - Number of command-line arguments (6 or 7) */
 	     char	*argv[])	/* I - Command-line arguments */
 {
-  int		usebc;			/* Use backchannel path? */
   int		fd;			/* USB device */
   int		rbytes;			/* Number of bytes read */
   int		wbytes;			/* Number of bytes written */
@@ -83,14 +82,6 @@ print_device(const char *uri,		/* I - Device URI */
   (void)argc;
   (void)argv;
 
- /*
-  * Disable backchannel data when printing to Canon USB printers - apparently
-  * Canon printers will return the IEEE-1284 device ID over and over and over
-  * when they get a read request...
-  */
-
-  usebc = strcasecmp(hostname, "Canon") != 0;
-
  /*
   * Open the USB port device...
   */
@@ -247,9 +238,7 @@ print_device(const char *uri,		/* I - Device URI */
         do
 	{
           FD_ZERO(&input);
-	  if (usebc)
-	    FD_SET(fd, &input);
-
+	  FD_SET(fd, &input);
 	  FD_ZERO(&output);
 	  FD_SET(fd, &output);
         }

cgi-bin/admin.c

@@ -93,8 +93,7 @@ main(int  argc,				/* I - Number of command-line arguments */
   if (!http)
   {
     perror("ERROR: Unable to connect to cupsd");
-    fprintf(stderr, "DEBUG: cupsServer()=\"%s\"\n",
-            cupsServer() ? cupsServer() : "(null)");
+    fprintf(stderr, "DEBUG: cupsServer()=\"%s\"\n", cupsServer());
     fprintf(stderr, "DEBUG: ippPort()=%d\n", ippPort());
     fprintf(stderr, "DEBUG: cupsEncryption()=%d\n", cupsEncryption());
     exit(1);
@@ -482,7 +481,7 @@ do_am_class(http_t *http,		/* I - HTTP connection */
     char	refresh[1024];		/* Refresh URL */
 
     cgiFormEncode(uri, name, sizeof(uri));
-    snprintf(refresh, sizeof(refresh), "5;URL=/admin/?OP=redirect&URL=/classes/%s",
+    snprintf(refresh, sizeof(refresh), "5;/admin/?OP=redirect&URL=/classes/%s",
              uri);
     cgiSetVariable("refresh_page", refresh);
 
@@ -535,9 +534,8 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
 		};
 
 
-  ptr = cgiGetVariable("DEVICE_URI");
   fprintf(stderr, "DEBUG: do_am_printer: DEVICE_URI=\"%s\"\n",
-          ptr ? ptr : "(null)");
+          cgiGetVariable("DEVICE_URI"));
 
   title = cgiText(modify ? _("Modify Printer") : _("Add Printer"));
 
@@ -1043,7 +1041,7 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
 	         "5;/admin/?OP=redirect&URL=/printers/%s", uri);
       else
 	snprintf(refresh, sizeof(refresh),
-	         "5;URL=/admin/?OP=set-printer-options&PRINTER_NAME=%s", uri);
+	         "5;/admin/?OP=set-printer-options&PRINTER_NAME=%s", uri);
 
       cgiSetVariable("refresh_page", refresh);
 
@@ -1491,9 +1489,7 @@ do_config_printer(http_t *http)		/* I - HTTP connection */
 
         *keyptr = '\0';
 
-        if (!strcmp(keyword, "PageRegion") ||
-	    !strcmp(keyword, "PaperDimension") ||
-	    !strcmp(keyword, "ImageableArea"))
+        if (!strcmp(keyword, "PageRegion"))
 	  var = cgiGetVariable("PageSize");
 	else
 	  var = cgiGetVariable(keyword);
@@ -1565,7 +1561,7 @@ do_config_printer(http_t *http)		/* I - HTTP connection */
 
       cgiFormEncode(uri, printer, sizeof(uri));
       snprintf(refresh, sizeof(refresh),
-               "5;URL=/admin/?OP=redirect&URL=/printers/%s", uri);
+               "5;/admin/?OP=redirect&URL=/printers/%s", uri);
       cgiSetVariable("refresh_page", refresh);
 
       cgiStartHTML(title);
@@ -1627,7 +1623,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     }
     else
     {
-      cgiSetVariable("refresh_page", "5;URL=/admin/?OP=redirect");
+      cgiSetVariable("refresh_page", "5;/admin/?OP=redirect");
       cgiStartHTML(cgiText(_("Change Settings")));
       cgiCopyTemplateLang("restart.tmpl");
     }
@@ -1721,7 +1717,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     }
     else
     {
-      cgiSetVariable("refresh_page", "5;URL=/admin/?OP=redirect");
+      cgiSetVariable("refresh_page", "5;/admin/?OP=redirect");
 
       cgiStartHTML(cgiText(_("Edit Configuration File")));
       cgiCopyTemplateLang("restart.tmpl");
@@ -2482,7 +2478,7 @@ do_printer_op(http_t      *http,	/* I - HTTP connection */
 
     cgiRewriteURL(uri, url, sizeof(url), NULL);
     cgiFormEncode(uri, url, sizeof(uri));
-    snprintf(refresh, sizeof(refresh), "5;URL=/admin/?OP=redirect&URL=%s", uri);
+    snprintf(refresh, sizeof(refresh), "5;/admin/?OP=redirect&URL=%s", uri);
     cgiSetVariable("refresh_page", refresh);
 
     cgiStartHTML(title);
@@ -2740,8 +2736,7 @@ do_set_allowed_users(http_t *http)	/* I - HTTP connection */
 
       cgiRewriteURL(uri, url, sizeof(url), NULL);
       cgiFormEncode(uri, url, sizeof(uri));
-      snprintf(refresh, sizeof(refresh), "5;URL=/admin/?OP=redirect&URL=%s",
-               uri);
+      snprintf(refresh, sizeof(refresh), "5;/admin/?OP=redirect&URL=%s", uri);
       cgiSetVariable("refresh_page", refresh);
 
       cgiStartHTML(cgiText(_("Set Allowed Users")));
@@ -2831,7 +2826,7 @@ do_set_sharing(http_t *http)		/* I - HTTP connection */
 
     cgiRewriteURL(uri, url, sizeof(url), NULL);
     cgiFormEncode(uri, url, sizeof(uri));
-    snprintf(refresh, sizeof(refresh), "5;URL=/admin/?OP=redirect&URL=%s", uri);
+    snprintf(refresh, sizeof(refresh), "5;/admin/?OP=redirect&URL=%s", uri);
     cgiSetVariable("refresh_page", refresh);
 
     cgiStartHTML(cgiText(_("Set Publishing")));

cgi-bin/classes.c

@@ -95,7 +95,8 @@ main(int  argc,				/* I - Number of command-line arguments */
   * See who is logged in...
   */
 
-  user = getenv("REMOTE_USER");
+  if ((user = getenv("REMOTE_USER")) == NULL)
+    user = "guest";
 
  /*
   * Connect to the HTTP server...
@@ -186,7 +187,7 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 void
 show_all_classes(http_t     *http,	/* I - Connection to server */
-                 const char *user)	/* I - Username */
+                  const char *user)	/* I - Username */
 {
   int			i;		/* Looping var */
   ipp_t			*request,	/* IPP request */
@@ -220,9 +221,8 @@ show_all_classes(http_t     *http,	/* I - Connection to server */
 
   request = ippNewRequest(CUPS_GET_CLASSES);
 
-  if (user)
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-        	 "requesting-user-name", NULL, user);
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+               "requesting-user-name", NULL, user);
 
   cgiGetAttributes(request, "classes.tmpl");
 
@@ -419,7 +419,7 @@ show_class(http_t     *http,		/* I - Connection to server */
       */
 
       cgiFormEncode(uri, pclass, sizeof(uri));
-      snprintf(refresh, sizeof(refresh), "10;URL=/classes/%s", uri);
+      snprintf(refresh, sizeof(refresh), "10;/classes/%s", uri);
       cgiSetVariable("refresh_page", refresh);
     }
 

cgi-bin/help.c

@@ -187,8 +187,7 @@ main(int  argc,				/* I - Number of command-line arguments */
   topic = cgiGetVariable("TOPIC");
   si    = helpSearchIndex(hi, query, topic, helpfile);
 
-  fprintf(stderr, "DEBUG: query=\"%s\", topic=\"%s\"\n",
-          query ? query : "(null)", topic ? topic : "(null)");
+  fprintf(stderr, "DEBUG: query=\"%s\", topic=\"%s\"\n", query, topic);
 
   if (si)
   {

cgi-bin/html.c

@@ -175,8 +175,7 @@ cgi_null_passwd(const char *prompt)	/* I - Prompt string (unused) */
 {
   (void)prompt;
 
-  fprintf(stderr, "DEBUG: cgi_null_passwd(prompt=\"%s\") called!\n",
-          prompt ? prompt : "(null)");
+  fprintf(stderr, "DEBUG: cgi_null_passwd(prompt=\"%s\") called!\n", prompt);
 
   return (NULL);
 }

cgi-bin/ipp-var.c

@@ -482,7 +482,7 @@ cgiMoveJobs(http_t     *http,		/* I - Connection to server */
     {
       cgiRewriteURL(job_printer_uri, resource, sizeof(resource), NULL);
       cgiFormEncode(uri, resource, sizeof(uri));
-      snprintf(refresh, sizeof(refresh), "2;URL=%s", uri);
+      snprintf(refresh, sizeof(refresh), "2;%s", uri);
       cgiSetVariable("refresh_page", refresh);
     }
 
@@ -598,7 +598,7 @@ cgiPrintTestPage(http_t     *http,	/* I - Connection to server */
     */
 
     cgiFormEncode(uri, resource, sizeof(uri));
-    snprintf(refresh, sizeof(refresh), "2;URL=%s", uri);
+    snprintf(refresh, sizeof(refresh), "2;%s", uri);
     cgiSetVariable("refresh_page", refresh);
   }
 
@@ -774,7 +774,7 @@ cgiSetIPPObjectVars(
 
   fprintf(stderr, "DEBUG2: cgiSetIPPObjectVars(obj=%p, prefix=\"%s\", "
                   "element=%d)\n",
-          obj, prefix ? prefix : "(null)", element);
+          obj, prefix, element);
 
  /*
   * Set common CGI template variables...
@@ -977,9 +977,7 @@ cgiSetIPPVars(ipp_t      *response,	/* I - Response data to be copied... */
 
   fprintf(stderr, "DEBUG2: cgiSetIPPVars(response=%p, filter_name=\"%s\", "
                   "filter_value=\"%s\", prefix=\"%s\", parent_el=%d)\n",
-          response, filter_name ? filter_name : "(null)",
-	  filter_value ? filter_value : "(null)",
-	  prefix ? prefix : "(null)", parent_el);
+          response, filter_name, filter_value, prefix, parent_el);
 
  /*
   * Set common CGI template variables...

cgi-bin/printers.c

@@ -98,7 +98,8 @@ main(int  argc,				/* I - Number of command-line arguments */
   * See who is logged in...
   */
 
-  user = getenv("REMOTE_USER");
+  if ((user = getenv("REMOTE_USER")) == NULL)
+    user = "guest";
 
  /*
   * Connect to the HTTP server...
@@ -286,7 +287,7 @@ print_command(http_t     *http,		/* I - Connection to server */
     */
 
     cgiFormEncode(uri, resource, sizeof(uri));
-    snprintf(refresh, sizeof(refresh), "2;URL=%s", uri);
+    snprintf(refresh, sizeof(refresh), "2;%s", uri);
     cgiSetVariable("refresh_page", refresh);
   }
 
@@ -330,7 +331,7 @@ show_all_printers(http_t     *http,	/* I - Connection to server */
 
 
   fprintf(stderr, "DEBUG: show_all_printers(http=%p, user=\"%s\")\n",
-          http, user ? user : "(null)");
+          http, user);
 
  /*
   * Show the standard header...
@@ -356,9 +357,8 @@ show_all_printers(http_t     *http,	/* I - Connection to server */
   ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_ENUM,
                 "printer-type-mask", CUPS_PRINTER_CLASS);
 
-  if (user)
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-        	 "requesting-user-name", NULL, user);
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+               "requesting-user-name", NULL, user);
 
   cgiGetAttributes(request, "printers.tmpl");
 
@@ -543,7 +543,7 @@ show_printer(http_t     *http,		/* I - Connection to server */
 
 
   fprintf(stderr, "DEBUG: show_printer(http=%p, printer=\"%s\")\n",
-          http, printer ? printer : "(null)");
+          http, printer);
 
  /*
   * Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
@@ -594,7 +594,7 @@ show_printer(http_t     *http,		/* I - Connection to server */
       */
 
       cgiFormEncode(uri, printer, sizeof(uri));
-      snprintf(refresh, sizeof(refresh), "10;URL=/printers/%s", uri);
+      snprintf(refresh, sizeof(refresh), "10;/printers/%s", uri);
       cgiSetVariable("refresh_page", refresh);
     }
 

cgi-bin/template.c

@@ -60,7 +60,7 @@ cgiCopyTemplateFile(FILE       *out,	/* I - Output file */
 
 
   fprintf(stderr, "DEBUG: cgiCopyTemplateFile(out=%p, tmpl=\"%s\")\n", out,
-          tmpl ? tmpl : "(null)");
+          tmpl);
 
  /*
   * Open the template file...
@@ -69,7 +69,7 @@ cgiCopyTemplateFile(FILE       *out,	/* I - Output file */
   if ((in = fopen(tmpl, "r")) == NULL)
   {
     fprintf(stderr, "ERROR: Unable to open template file \"%s\" - %s\n",
-            tmpl ? tmpl : "(null)", strerror(errno));
+            tmpl, strerror(errno));
     return;
   }
 
@@ -102,8 +102,7 @@ cgiCopyTemplateLang(const char *tmpl)	/* I - Base filename */
   FILE		*in;			/* Input file */
 
 
-  fprintf(stderr, "DEBUG: cgiCopyTemplateLang(tmpl=\"%s\")\n",
-          tmpl ? tmpl : "(null)");
+  fprintf(stderr, "DEBUG: cgiCopyTemplateLang(tmpl=\"%s\")\n", tmpl);
 
  /*
   * Convert the language to a locale name...

cgi-bin/var.c

@@ -949,8 +949,7 @@ cgi_passwd(const char *prompt)		/* I - Prompt (not used) */
 {
   (void)prompt;
 
-  fprintf(stderr, "DEBUG: cgi_passwd(prompt=\"%s\") called!\n",
-          prompt ? prompt : "(null)");
+  fprintf(stderr, "DEBUG: cgi_passwd(prompt=\"%s\") called!\n", prompt);
 
  /*
   * Send a 401 (unauthorized) status to the server, so it can notify

config-scripts/cups-compiler.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-compiler.m4 5566 2006-05-22 01:10:11Z mike $"
+dnl "$Id: cups-compiler.m4 5473 2006-05-01 15:51:09Z mike $"
 dnl
 dnl   Compiler stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -138,8 +138,8 @@ if test -n "$GCC"; then
 					ARCH32FLAGS="$with_arch32flags"
 				fi
 				INSTALL32="install32bit"
-				LIB32CUPS="32bit/libcups.so.2"
-				LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
+				LIB32CUPS="libcups.32.so.2"
+				LIB32CUPSIMAGE="libcupsimage.32.so.2"
 				LIB32DIR="$prefix/lib32"
 				UNINSTALL32="uninstall32bit"
 
@@ -162,8 +162,8 @@ if test -n "$GCC"; then
 					ARCH64FLAGS="$with_arch64flags"
 				fi
 				INSTALL64="install64bit"
-				LIB64CUPS="64bit/libcups.so.2"
-				LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
+				LIB64CUPS="libcups.64.so.2"
+				LIB64CUPSIMAGE="libcupsimage.64.so.2"
 				LIB64DIR="$prefix/lib64"
 				UNINSTALL64="uninstall64bit"
 
@@ -188,8 +188,8 @@ if test -n "$GCC"; then
 					ARCH32FLAGS="$with_arch32flags"
 				fi
 				INSTALL32="install32bit"
-				LIB32CUPS="32bit/libcups.so.2"
-				LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
+				LIB32CUPS="libcups.32.so.2"
+				LIB32CUPSIMAGE="libcupsimage.32.so.2"
 				LIB32DIR="$exec_prefix/lib"
 				if test -d /usr/lib32; then
 					LIB32DIR="${LIB32DIR}32"
@@ -215,8 +215,8 @@ if test -n "$GCC"; then
 					ARCH64FLAGS="$with_arch64flags"
 				fi
 				INSTALL64="install64bit"
-				LIB64CUPS="64bit/libcups.so.2"
-				LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
+				LIB64CUPS="libcups.64.so.2"
+				LIB64CUPSIMAGE="libcupsimage.64.so.2"
 				LIB64DIR="$exec_prefix/lib"
 				if test -d /usr/lib64; then
 					LIB64DIR="${LIB64DIR}64"
@@ -244,8 +244,8 @@ if test -n "$GCC"; then
 					ARCH32FLAGS="$with_arch32flags"
 				fi
 				INSTALL32="install32bit"
-				LIB32CUPS="32bit/libcups.so.2"
-				LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
+				LIB32CUPS="libcups.32.so.2"
+				LIB32CUPSIMAGE="libcupsimage.32.so.2"
 				LIB32DIR="$exec_prefix/lib/32"
 				UNINSTALL32="uninstall32bit"
 
@@ -268,8 +268,8 @@ if test -n "$GCC"; then
 					ARCH64FLAGS="$with_arch64flags"
 				fi
 				INSTALL64="install64bit"
-				LIB64CUPS="64bit/libcups.so.2"
-				LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
+				LIB64CUPS="libcups.64.so.2"
+				LIB64CUPSIMAGE="libcupsimage.64.so.2"
 				LIB64DIR="$exec_prefix/lib/64"
 				UNINSTALL64="uninstall64bit"
 
@@ -310,11 +310,8 @@ else
 			# Warning 829 is passing constant string as char *
 			CXXFLAGS="+W336,829 $CXXFLAGS"
 
-			if test -z "$with_archflags"; then
-				# Build portable binaries for all HP systems...
-				ARCHFLAGS="+DAportable"
-			else
-				ARCHFLAGS="$with_archflags"
+			if test "x$with_optim" = x; then
+				OPTIM="+DAportable $OPTIM"
 			fi
 
 			if test $PICFLAG = 1; then
@@ -342,8 +339,8 @@ else
 					ARCH32FLAGS="$with_arch32flags"
 				fi
 				INSTALL32="install32bit"
-				LIB32CUPS="32bit/libcups.so.2"
-				LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
+				LIB32CUPS="libcups.32.so.2"
+				LIB32CUPSIMAGE="libcupsimage.32.so.2"
 				LIB32DIR="$prefix/lib32"
 				UNINSTALL32="uninstall32bit"
 
@@ -366,8 +363,8 @@ else
 					ARCH64FLAGS="$with_arch64flags"
 				fi
 				INSTALL64="install64bit"
-				LIB64CUPS="64bit/libcups.so.2"
-				LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
+				LIB64CUPS="libcups.64.so.2"
+				LIB64CUPSIMAGE="libcupsimage.64.so.2"
 				LIB64DIR="$prefix/lib64"
 				UNINSTALL64="uninstall64bit"
 
@@ -401,8 +398,8 @@ else
 				# binaries with separate 32-bit libraries...
 				ARCH32FLAGS="-xarch=generic"
 				INSTALL32="install32bit"
-				LIB32CUPS="32bit/libcups.so.2"
-				LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
+				LIB32CUPS="libcups.32.so.2"
+				LIB32CUPSIMAGE="libcupsimage.32.so.2"
 				LIB32DIR="$exec_prefix/lib/32"
 				UNINSTALL32="uninstall32bit"
 
@@ -411,43 +408,33 @@ else
 					# warning messages, and default to
 					# 64-bit compiles of everything else...
 					OPTIM="-w $OPTIM"
-				fi
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch64flags"; then
-						ARCHFLAGS="-xarch=generic64"
-					else
-						ARCHFLAGS="$with_arch64flags"
-					fi
-				else
-					ARCHFLAGS="$with_archflags"
+					CFLAGS="-xarch=generic64 $CFLAGS"
 				fi
 			else
 				if test "x$enable_64bit" = xyes; then
 					# Build 64-bit libraries...
 					ARCH64FLAGS="-xarch=generic64"
 					INSTALL64="install64bit"
-					LIB64CUPS="64bit/libcups.so.2"
-					LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
+					LIB64CUPS="libcups.64.so.2"
+					LIB64CUPSIMAGE="libcupsimage.64.so.2"
 					LIB64DIR="$exec_prefix/lib/64"
 					UNINSTALL64="uninstall64bit"
-				fi
 
-				if test "x$with_optim" = x; then
-					# Suppress all of Sun's questionable
-					# warning messages, and default to
-					# 32-bit compiles of everything else...
-					OPTIM="-w $OPTIM"
-				fi
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch32flags"; then
-						ARCHFLAGS="-xarch=generic"
-					else
-						ARCHFLAGS="$with_arch32flags"
+					if test "x$with_optim" = x; then
+						# Suppress all of Sun's questionable
+						# warning messages, and default to
+						# 32-bit compiles of everything else...
+						OPTIM="-w $OPTIM"
+						CFLAGS="-xarch=generic $CFLAGS"
 					fi
 				else
-					ARCHFLAGS="$with_archflags"
+					if test "x$with_optim" = x; then
+						# Suppress all of Sun's questionable
+						# warning messages, and default to
+						# 32-bit compiles of everything else...
+						OPTIM="-w $OPTIM"
+						CFLAGS="-xarch=generic $CFLAGS"
+					fi
 				fi
 			fi
 			;;
@@ -488,5 +475,5 @@ if test $uname = HP-UX; then
 fi
 
 dnl
-dnl End of "$Id: cups-compiler.m4 5566 2006-05-22 01:10:11Z mike $".
+dnl End of "$Id: cups-compiler.m4 5473 2006-05-01 15:51:09Z mike $".
 dnl

config-scripts/cups-directories.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-directories.m4 5547 2006-05-19 12:44:29Z mike $"
+dnl "$Id: cups-directories.m4 5466 2006-04-26 19:52:27Z mike $"
 dnl
 dnl   Directory stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -130,11 +130,9 @@ if test x$rcdir = x; then
 		Darwin*)
 			# Darwin and MacOS X...
 			INITDIR=""
-			if test -x /sbin/launchd; then
-				INITDDIR="/System/Library/LaunchDaemons"
-			else 
-				INITDDIR="/System/Library/StartupItems/PrintingServices"
-			fi
+			AC_CHECK_PROG(INITDDIR, launchd, 
+				"/System/Library/LaunchDaemons", 
+				"/System/Library/StartupItems/PrintingServices")
 			;;
 
 		Linux | GNU)
@@ -302,5 +300,5 @@ AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$localstatedir/run/cups")
 AC_SUBST(CUPS_STATEDIR)
 
 dnl
-dnl End of "$Id: cups-directories.m4 5547 2006-05-19 12:44:29Z mike $".
+dnl End of "$Id: cups-directories.m4 5466 2006-04-26 19:52:27Z mike $".
 dnl

config-scripts/cups-ldap.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-ldap.m4 5564 2006-05-22 00:59:11Z mike $"
+dnl "$Id: cups-ldap.m4 5466 2006-04-26 19:52:27Z mike $"
 dnl
 dnl   LDAP configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -36,7 +36,7 @@ LIBLDAP=""
 
 if test x$enable_ldap != xno; then
     AC_CHECK_HEADER(ldap.h,
-	AC_CHECK_LIB(ldap, ldap_initialize,
+	AC_CHECK_LIB(ldap, ldap_value_free,
             AC_DEFINE(HAVE_LDAP)
             AC_DEFINE(HAVE_OPENLDAP)
 	    LIBLDAP="-lldap"))
@@ -46,5 +46,5 @@ AC_SUBST(LIBLDAP)
 
 
 dnl
-dnl End of "$Id: cups-ldap.m4 5564 2006-05-22 00:59:11Z mike $".
+dnl End of "$Id: cups-ldap.m4 5466 2006-04-26 19:52:27Z mike $".
 dnl

config-scripts/cups-sharedlibs.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-sharedlibs.m4 5568 2006-05-22 15:34:01Z mike $"
+dnl "$Id: cups-sharedlibs.m4 5466 2006-04-26 19:52:27Z mike $"
 dnl
 dnl   Shared library support for the Common UNIX Printing System (CUPS).
 dnl
@@ -33,31 +33,31 @@ if test x$enable_shared != xno; then
 			LIBCUPS="libcups.so.2"
 			LIBCUPSIMAGE="libcupsimage.so.2"
 			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-h,\`basename \$@\` -G \$(OPTIM)"
+			DSOFLAGS="$DSOFLAGS -Wl,-h,\$@ -G \$(OPTIM)"
 			;;
 		HP-UX*)
 			LIBCUPS="libcups.sl.2"
 			LIBCUPSIMAGE="libcupsimage.sl.2"
 			DSO="\$(LD)"
-			DSOFLAGS="$DSOFLAGS -b -z +h \`basename \$@\`"
+			DSOFLAGS="$DSOFLAGS -b -z +h \$@"
 			;;
 		IRIX)
 			LIBCUPS="libcups.so.2"
 			LIBCUPSIMAGE="libcupsimage.so.2"
 			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -set_version,sgi2.6,-soname,\`basename \$@\` -shared \$(OPTIM)"
+			DSOFLAGS="$DSOFLAGS -Wl,-rpath,\$(libdir),-set_version,sgi2.6,-soname,\$@ -shared \$(OPTIM)"
 			;;
 		OSF1* | Linux | GNU | *BSD*)
 			LIBCUPS="libcups.so.2"
 			LIBCUPSIMAGE="libcupsimage.so.2"
 			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
+			DSOFLAGS="$DSOFLAGS -Wl,-soname,\$@ -shared \$(OPTIM)"
 			;;
 		Darwin*)
 			LIBCUPS="libcups.2.dylib"
 			LIBCUPSIMAGE="libcupsimage.2.dylib"
 			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -dynamiclib -single_module -lc"
+			DSOFLAGS="$DSOFLAGS \$(RC_CFLAGS) -dynamiclib -single_module -lc"
 			;;
 		AIX*)
 			LIBCUPS="libcups_s.a"
@@ -71,7 +71,7 @@ if test x$enable_shared != xno; then
 			LIBCUPS="libcups.so.2"
 			LIBCUPSIMAGE="libcupsimage.so.2"
 			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
+			DSOFLAGS="$DSOFLAGS -Wl,-soname,\$@ -shared \$(OPTIM)"
 			;;
 	esac
 else
@@ -81,15 +81,8 @@ else
 	DSO=":"
 fi
 
-# 32-bit and 64-bit libraries need variations of the standard
-# DSOFLAGS...
-DSO32FLAGS="$DSOFLAGS"
-DSO64FLAGS="$DSOFLAGS"
-
 AC_SUBST(DSO)
 AC_SUBST(DSOFLAGS)
-AC_SUBST(DSO32FLAGS)
-AC_SUBST(DSO64FLAGS)
 AC_SUBST(LIBCUPS)
 AC_SUBST(LIBCUPSIMAGE)
 
@@ -120,48 +113,34 @@ if test "$DSO" != ":"; then
 	DSOLIBS="\$(LIBPNG) \$(LIBTIFF) \$(LIBJPEG) \$(LIBZ)"
 	IMGLIBS=""
 
-	# Tell the run-time linkers where to find a DSO.  Some platforms
-	# need this option, even when the library is installed in a
-	# standard location...
+	# The *BSD, HP-UX, and Solaris run-time linkers need help when
+	# deciding where to find a DSO.  Add linker options to tell them
+	# where to find the DSO (usually in /usr/lib...  duh!)
 	case $uname in
                 HP-UX*)
-			# HP-UX needs the path, even for /usr/lib...
-                	DSOFLAGS="+s +b \$(libdir) $DSOFLAGS"
-                	DSO32FLAGS="+s +b \$(LIB32DIR) $DSO32FLAGS"
-                	DSO64FLAGS="+s +b \$(LIB64DIR) $DSO64FLAGS"
-                	LDFLAGS="$LDFLAGS -Wl,+s,+b,\$(libdir)"
-                	EXPORT_LDFLAGS="-Wl,+s,+b,\$(libdir)"
-			;;
+			# HP-UX
+                	DSOFLAGS="+s +b $libdir $DSOFLAGS"
+                	LDFLAGS="$LDFLAGS -Wl,+s,+b,$libdir"
+                	EXPORT_LDFLAGS="-Wl,+s,+b,$libdir"
+                	;;
                 SunOS*)
-                	# Solaris...
-			if test $exec_prefix != /usr; then
-				DSOFLAGS="-R\$(libdir) $DSOFLAGS"
-				DSO32FLAGS="-R\$(LIB32DIR) $DSO32FLAGS"
-				DSO64FLAGS="-R\$(LIB64DIR) $DSO64FLAGS"
-				LDFLAGS="$LDFLAGS -R\$(libdir)"
-				EXPORT_LDFLAGS="-R\$(libdir)"
-			fi
-			;;
+                	# Solaris
+                	DSOFLAGS="-R$libdir $DSOFLAGS"
+                	LDFLAGS="$LDFLAGS -R$libdir"
+                	EXPORT_LDFLAGS="-R$libdir"
+                	;;
                 *BSD*)
-                        # *BSD...
-			if test $exec_prefix != /usr; then
-				DSOFLAGS="-Wl,-R\$(libdir) $DSOFLAGS"
-				DSO32FLAGS="-Wl,-R\$(LIB32DIR) $DSO32FLAGS"
-				DSO64FLAGS="-Wl,-R\$(LIB64DIR) $DSO64FLAGS"
-				LDFLAGS="$LDFLAGS -Wl,-R\$(libdir)"
-				EXPORT_LDFLAGS="-Wl,-R\$(libdir)"
-			fi
-			;;
-                IRIX | Linux | GNU)
-                        # IRIX, Linux, and HURD...
-			if test $exec_prefix != /usr; then
-				DSOFLAGS="-Wl,-rpath,\$(libdir) $DSOFLAGS"
-				DSO32FLAGS="-Wl,-rpath,\$(LIB32DIR) $DSO32FLAGS"
-				DSO64FLAGS="-Wl,-rpath,\$(LIB64DIR) $DSO64FLAGS"
-				LDFLAGS="$LDFLAGS -Wl,-rpath,\$(libdir)"
-				EXPORT_LDFLAGS="-Wl,-rpath,\$(libdir)"
-			fi
-			;;
+                        # *BSD
+                	DSOFLAGS="-Wl,-R$libdir $DSOFLAGS"
+                        LDFLAGS="$LDFLAGS -Wl,-R$libdir"
+                        EXPORT_LDFLAGS="-Wl,-R$libdir"
+                        ;;
+                Linux | GNU)
+                        # Linux and HURD
+                	DSOFLAGS="-Wl,-rpath,$libdir $DSOFLAGS"
+                        LDFLAGS="$LDFLAGS -Wl,-rpath,$libdir"
+                        EXPORT_LDFLAGS="-Wl,-rpath,$libdir"
+                        ;;
 	esac
 else
 	DSOLIBS=""
@@ -173,5 +152,5 @@ AC_SUBST(IMGLIBS)
 AC_SUBST(EXPORT_LDFLAGS)
 
 dnl
-dnl End of "$Id: cups-sharedlibs.m4 5568 2006-05-22 15:34:01Z mike $".
+dnl End of "$Id: cups-sharedlibs.m4 5466 2006-04-26 19:52:27Z mike $".
 dnl

config-scripts/cups-ssl.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-ssl.m4 5525 2006-05-15 13:52:16Z mike $"
+dnl "$Id: cups-ssl.m4 5466 2006-04-26 19:52:27Z mike $"
 dnl
 dnl   OpenSSL/GNUTLS stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -55,14 +55,18 @@ if test x$enable_ssl != xno; then
 
     dnl Then look for GNU TLS...
     if test "x${SSLLIBS}" = "x" -a "x${enable_gnutls}" != "xno"; then
-    	AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
-	if test "x$LIBGNUTLSCONFIG" != x; then
-	    SSLLIBS=`$LIBGNUTLSCONFIG --libs`
-	    SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
-	    ENCRYPTION_REQUIRED="  Encryption Required"
-	    AC_DEFINE(HAVE_SSL)
-	    AC_DEFINE(HAVE_GNUTLS)
-	fi
+	AC_CHECK_HEADER(gnutls/gnutls.h,
+	    dnl Save the current libraries so the crypto stuff isn't always
+	    dnl included...
+	    SAVELIBS="$LIBS"
+
+	    AC_CHECK_LIB(gnutls, gnutls_x509_crt_set_dn_by_oid,
+		[SSLLIBS="-lgnutls"
+		 ENCRYPTION_REQUIRED="  Encryption Required"
+		 AC_DEFINE(HAVE_SSL)
+		 AC_DEFINE(HAVE_GNUTLS)])
+
+	    LIBS="$SAVELIBS")
     fi
 
     dnl Check for the OpenSSL library last...
@@ -100,11 +104,6 @@ if test x$enable_ssl != xno; then
     fi
 fi
 
-if test "x$SSLLIBS" != x; then
-    AC_MSG_RESULT([    Using SSLLIBS="$SSLLIBS"])
-    AC_MSG_RESULT([    Using SSLFLAGS="$SSLFLAGS"])
-fi
-
 AC_SUBST(SSLFLAGS)
 AC_SUBST(SSLLIBS)
 AC_SUBST(ENCRYPTION_REQUIRED)
@@ -114,5 +113,5 @@ AC_SUBST(EXPORT_SSLLIBS)
 
 
 dnl
-dnl End of "$Id: cups-ssl.m4 5525 2006-05-15 13:52:16Z mike $".
+dnl End of "$Id: cups-ssl.m4 5466 2006-04-26 19:52:27Z mike $".
 dnl

cups-config.in

@@ -31,7 +31,6 @@ exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
 libdir=@libdir@
-imagelibdir=@libdir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
 cups_datadir=@CUPS_DATADIR@
@@ -45,27 +44,13 @@ LDFLAGS="@EXPORT_LDFLAGS@"
 LIBS="@EXPORT_SSLLIBS@ @LIBS@"
 IMGLIBS="@EXPORT_LIBTIFF@ @EXPORT_LIBJPEG@ @EXPORT_LIBPNG@ @EXPORT_LIBZ@"
 
-# Check for local invocation...
-selfdir=`dirname $0`
-
-if test -f "$selfdir/cups/cups.h"; then
-    CFLAGS="-I$selfdir"
-    LDFLAGS="-L$selfdir/cups -L$selfdir/filter $LDFLAGS"
-    libdir="$selfdir/cups"
-    imagelibdir="$selfdir/filter"
-    if test ! -e "$selfdir/cups/raster.h"; then
-        ln -s ../filter/raster.h "$selfdir/cups"
-    fi
-else
-    if test $includedir != /usr/include; then
-	CFLAGS="$CFLAGS -I$includedir"
-    fi
-
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
-	LDFLAGS="$LDFLAGS -L$libdir"
-    fi
+if test $includedir != /usr/include; then
+    CFLAGS="$CFLAGS -I$includedir"
 fi
 
+if test $libdir != /usr/lib -a $libdir != /usr/lib32; then
+    LDFLAGS="$LDFLAGS -L$libdir"
+fi
 
 usage ()
 {
@@ -121,7 +106,7 @@ while test $# -gt 0; do
 	        if test $image = no; then
 	            echo $libdir/libcups.a $LIBS
 		else
-	            echo $imagelibdir/libcupsimage.a $IMGLIBS $libdir/libcups.a $LIBS
+	            echo $libdir/libcupsimage.a $IMGLIBS $libdir/libcups.a $LIBS
 		fi
 	    fi
 	    ;;

cups/Makefile

@@ -137,8 +137,7 @@ all:	$(TARGETS)
 
 clean:
 	$(RM) $(OBJS) $(TARGETS)
-	$(RM) libcups.so libcups.sl libcups.dylib
-	$(RM) -r 32bit 64it
+	$(RM) libcups.so libcups.sl libcups.dylib libcups.32.so libcups.64.so
 
 
 #
@@ -185,12 +184,12 @@ installhdrs:
 
 install32bit:
 	$(INSTALL_DIR) -m 755 $(LIB32DIR)
-	$(INSTALL_LIB) 32bit/libcups.so.2 $(LIB32DIR)/libcups.so.2
+	$(INSTALL_LIB) libcups.32.so.2 $(LIB32DIR)/libcups.so.2
 	$(LN) libcups.so $(LIB32DIR)/libcups.so.2
 
 install64bit:
 	$(INSTALL_DIR) -m 755 $(LIB64DIR)
-	$(INSTALL_LIB) 64bit/libcups.so.2 $(LIB64DIR)/libcups.so.2
+	$(INSTALL_LIB) libcups.64.so.2 $(LIB64DIR)/libcups.so.2
 	$(LN) libcups.so $(LIB64DIR)/libcups.so.2
 
 
@@ -236,27 +235,21 @@ libcups.so.2 libcups.sl.2:	$(LIBOBJS)
 
 
 #
-# 32bit/libcups.so.2
+# libcups.32.so.2
 #
 
-32bit/libcups.so.2:	$(LIB32OBJS)
+libcups.32.so.2:	$(LIB32OBJS)
 	echo Linking 32-bit $@...
-	-mkdir 32bit
-	$(DSO) $(ARCH32FLAGS) $(DSO32FLAGS) -o $@ $(LIB32OBJS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
-	$(RM) 32bit/libcups.so
-	$(LN) libcups.so.2 32bit/libcups.so
+	$(DSO) $(ARCH32FLAGS) $(DSOFLAGS) -o $@ $(LIB32OBJS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
 
 
 #
-# 64bit/libcups.so.2
+# libcups.64.so.2
 #
 
-64bit/libcups.so.2:	$(LIB64OBJS)
+libcups.64.so.2:	$(LIB64OBJS)
 	echo Linking 64-bit $@...
-	-mkdir 64bit
-	$(DSO) $(ARCH64FLAGS) $(DSO64FLAGS) -o $@ $(LIB64OBJS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
-	$(RM) 64bit/libcups.so
-	$(LN) libcups.so.2 64bit/libcups.so
+	$(DSO) $(ARCH64FLAGS) $(DSOFLAGS) -o $@ $(LIB64OBJS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
 
 
 #

cups/auth.c

@@ -112,8 +112,8 @@ cupsDoAuthentication(http_t     *http,	/* I - HTTP connection to server */
     * Nope - get a new password from the user...
     */
 
-    snprintf(prompt, sizeof(prompt), _("Password for %s on %s? "), cupsUser(),
-             http->hostname[0] == '/' ? "localhost" : http->hostname);
+    snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
+             http->hostname);
 
     http->digest_tries  = strncasecmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE],
                                       "Digest", 5) != 0;

cups/backchannel.c

@@ -161,7 +161,7 @@ cupsBackChannelWrite(
       * Write error - abort on fatal errors...
       */
 
-      if (errno != EINTR)
+      if (errno != EINTR && errno != EAGAIN)
         return (-1);
     }
     else

cups/encode.c

@@ -133,8 +133,6 @@ static const _ipp_option_t ipp_options[] =
   { "raw",			IPP_TAG_MIMETYPE,	IPP_TAG_OPERATION },
   { "resolution",		IPP_TAG_RESOLUTION,	IPP_TAG_JOB },
   { "resolution-default",	IPP_TAG_RESOLUTION,	IPP_TAG_PRINTER },
-  { "requesting-user-name-allowed",	IPP_TAG_NAME,	IPP_TAG_PRINTER },
-  { "requesting-user-name-denied",	IPP_TAG_NAME,	IPP_TAG_PRINTER },
   { "saturation",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
   { "saturation-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
   { "scaling",			IPP_TAG_INTEGER,	IPP_TAG_JOB },

cups/getifaddrs.c

@@ -182,9 +182,8 @@ _cups_getifaddrs(struct ifaddrs **addrs)/* O - List of interfaces */
 	* Got it, make a copy...
 	*/
 
-	if ((temp->ifa_broadaddr =
-	         calloc(1, sizeof(request.ifr_broadaddr))) != NULL)
-	  memcpy(temp->ifa_broadaddr, &(request.ifr_broadaddr),
+	if ((temp->ifa_dstaddr = calloc(1, sizeof(request.ifr_broadaddr))) != NULL)
+	  memcpy(temp->ifa_dstaddr, &(request.ifr_broadaddr),
 		 sizeof(request.ifr_broadaddr));
       }
     }

cups/http-private.h

@@ -161,23 +161,11 @@ struct ifaddrs				/**** Interface Structure ****/
   char			*ifa_name;	/* Name of interface */
   unsigned int		ifa_flags;	/* Flags (up, point-to-point, etc.) */
   struct sockaddr	*ifa_addr,	/* Network address */
-			*ifa_netmask;	/* Address mask */
-  union
-  {
-    struct sockaddr	*ifu_broadaddr;	/* Broadcast address of this interface. */
-    struct sockaddr	*ifu_dstaddr;	/* Point-to-point destination address. */
-  } ifa_ifu;
-
+			*ifa_netmask,	/* Address mask */
+			*ifa_dstaddr;	/* Broadcast or destination address */
   void			*ifa_data;	/* Interface statistics */
 };
 
-#  ifndef ifa_broadaddr
-#    define ifa_broadaddr ifa_ifu.ifu_broadaddr
-#  endif /* !ifa_broadaddr */
-#  ifndef ifa_dstaddr
-#    define ifa_dstaddr ifa_ifu.ifu_dstaddr
-#  endif /* !ifa_dstaddr */
-
 extern int	_cups_getifaddrs(struct ifaddrs **addrs);
 #    define getifaddrs _cups_getifaddrs
 extern void	_cups_freeifaddrs(struct ifaddrs *addrs);

cups/mark.c

@@ -241,6 +241,9 @@ ppd_option_t *				/* O - Pointer to option or NULL */
 ppdFindOption(ppd_file_t *ppd,		/* I - PPD file data */
               const char *option)	/* I - Option/Keyword name */
 {
+  ppd_option_t	key;			/* Option search key */
+
+
  /*
   * Range check input...
   */
@@ -248,39 +251,13 @@ ppdFindOption(ppd_file_t *ppd,		/* I - PPD file data */
   if (!ppd || !option)
     return (NULL);
 
-  if (ppd->options)
-  {
-   /*
-    * Search in the array...
-    */
+ /*
+  * Search...
+  */
 
-    ppd_option_t	key;		/* Option search key */
+  strlcpy(key.keyword, option, sizeof(key.keyword));
 
-
-    strlcpy(key.keyword, option, sizeof(key.keyword));
-
-    return ((ppd_option_t *)cupsArrayFind(ppd->options, &key));
-  }
-  else
-  {
-   /*
-    * Search in each group...
-    */
-
-    int			i, j;		/* Looping vars */
-    ppd_group_t		*group;		/* Current group */
-    ppd_option_t	*optptr;	/* Current option */
-
-
-    for (i = ppd->num_groups, group = ppd->groups; i > 0; i --, group ++)
-      for (j = group->num_options, optptr = group->options;
-           j > 0;
-	   j --, optptr ++)
-        if (!strcasecmp(optptr->keyword, option))
-	  return (optptr);
-
-    return (NULL);
-  }
+  return ((ppd_option_t *)cupsArrayFind(ppd->options, &key));
 }
 
 

cups/page.c

@@ -87,7 +87,7 @@ ppdPageSize(ppd_file_t *ppd,		/* I - PPD file record */
       if (!nameptr || *nameptr != 'x')
         return (NULL);
 
-      l = _cupsStrScand(nameptr + 1, &nameptr, loc);
+      l = _cupsStrScand(nameptr, &nameptr, loc);
       if (!nameptr)
         return (NULL);
 

cups/request.c

@@ -70,7 +70,6 @@ cupsDoFileRequest(http_t     *http,	/* I - HTTP connection to server */
   struct stat	fileinfo;		/* File information */
   int		bytes;			/* Number of bytes read/written */
   char		buffer[32768];		/* Output buffer */
-  http_status_t	expect;			/* Expect: header to use */
 
 
   DEBUG_printf(("cupsDoFileRequest(%p, %p, \'%s\', \'%s\')\n",
@@ -147,7 +146,6 @@ cupsDoFileRequest(http_t     *http,	/* I - HTTP connection to server */
 
   response = NULL;
   status   = HTTP_ERROR;
-  expect   = HTTP_CONTINUE;
 
   while (response == NULL)
   {
@@ -165,7 +163,7 @@ cupsDoFileRequest(http_t     *http,	/* I - HTTP connection to server */
     httpSetLength(http, length);
     httpSetField(http, HTTP_FIELD_CONTENT_TYPE, "application/ipp");
     httpSetField(http, HTTP_FIELD_AUTHORIZATION, http->authstring);
-    httpSetExpect(http, expect);
+    httpSetExpect(http, HTTP_CONTINUE);
 
     DEBUG_printf(("cupsDoFileRequest: authstring=\"%s\"\n", http->authstring));
 
@@ -314,14 +312,6 @@ cupsDoFileRequest(http_t     *http,	/* I - HTTP connection to server */
       continue;
     }
 #endif /* HAVE_SSL */
-    else if (status == HTTP_EXPECTATION_FAILED)
-    {
-     /*
-      * Don't try using the Expect: header the next time around...
-      */
-
-      expect = (http_status_t)0;
-    }
     else if (status != HTTP_OK)
     {
       DEBUG_printf(("cupsDoFileRequest: error %d...\n", status));

cups/snprintf.c

@@ -96,10 +96,7 @@ _cups_vsnprintf(char       *buffer,	/* O - Output buffer */
 
       if (*format == '*')
       {
-       /*
-        * Get width from argument...
-	*/
-
+        // Get width from argument...
 	format ++;
 	width = va_arg(ap, int);
 
@@ -128,10 +125,7 @@ _cups_vsnprintf(char       *buffer,	/* O - Output buffer */
 
         if (*format == '*')
 	{
-         /*
-	  * Get precision from argument...
-	  */
-
+          // Get precision from argument...
 	  format ++;
 	  prec = va_arg(ap, int);
 

doc/help/spec-raster.html

@@ -2,7 +2,6 @@
 <!-- SECTION: Specifications -->
 <HEAD>
 	<TITLE>CUPS Raster Format</TITLE>
-	<LINK REL="STYLESHEET" TYPE="test/css" HREF="../cups.css">
 </HEAD>
 <BODY>
 
@@ -38,16 +37,13 @@ is followed immediately by the (uncompressed, raw) raster data
 for that page.</P>
 
 <DIV CLASS="table"><TABLE SUMMARY="CUPS Version 1 Raster Page Device Dictionary">
-<CAPTION><A NAME="TABLE1">Table 1: CUPS Version 1 Raster Page Device Dictionary</A></CAPTION>
-<THEAD>
+<CAPTION>Table 1: CUPS Version 1 Raster Page Device Dictionary</CAPTION>
 <TR>
 	<TH>Bytes</TH>
 	<TH>Type</TH>
 	<TH>Description</TH>
 	<TH>Values</TH>
 </TR>
-</THEAD>
-<TBODY>
 <TR>
 	<TD>0-63</TD>
 	<TD>C String</TD>
@@ -288,9 +284,9 @@ for that page.</P>
 	<TD>400-403</TD>
 	<TD>Unsigned Integer</TD>
 	<TD>cupsColorSpace</TD>
-	<TD>0 = white (sRGB)<BR>
-	1 = RGB (sRGB)<BR>
-	2 = RGBA (sRGB)<BR>
+	<TD>0 = white<BR>
+	1 = RGB<BR>
+	2 = RGBA<BR>
 	3 = black<BR>
 	4 = CMY<BR>
 	5 = YMC<BR>
@@ -305,22 +301,22 @@ for that page.</P>
 	14 = SILVER<BR>
 	15 = CIE XYZ<BR>
 	16 = CIE Lab<BR>
-	17 = RGBW (sRGB)<BR>
-	32 = ICC1 (CIE Lab with hint for 1 color)<BR>
-	33 = ICC2 (CIE Lab with hint for 2 colors)<BR>
-	34 = ICC3 (CIE Lab with hint for 3 colors)<BR>
-	35 = ICC4 (CIE Lab with hint for 4 colors)<BR>
-	36 = ICC5 (CIE Lab with hint for 5 colors)<BR>
-	37 = ICC6 (CIE Lab with hint for 6 colors)<BR>
-	38 = ICC7 (CIE Lab with hint for 7 colors)<BR>
-	39 = ICC8 (CIE Lab with hint for 8 colors)<BR>
-	40 = ICC9 (CIE Lab with hint for 9 colors)<BR>
-	41 = ICCA (CIE Lab with hint for 10 colors)<BR>
-	42 = ICCB (CIE Lab with hint for 11 colors)<BR>
-	43 = ICCC (CIE Lab with hint for 12 colors)<BR>
-	44 = ICCD (CIE Lab with hint for 13 colors)<BR>
-	45 = ICCE (CIE Lab with hint for 14 colors)<BR>
-	46 = ICCF (CIE Lab with hint for 15 colors)<BR>
+	17 = RGBW<BR>
+	32 = ICC1<BR>
+	33 = ICC2<BR>
+	34 = ICC3<BR>
+	35 = ICC4<BR>
+	36 = ICC5<BR>
+	37 = ICC6<BR>
+	38 = ICC7<BR>
+	39 = ICC8<BR>
+	40 = ICC9<BR>
+	41 = ICCA (10)<BR>
+	42 = ICCB (11)<BR>
+	43 = ICCC (12)<BR>
+	44 = ICCD (13)<BR>
+	45 = ICCE (14)<BR>
+	46 = ICCF (15)<BR>
 	</TD>
 </TR>
 <TR>
@@ -347,7 +343,6 @@ for that page.</P>
 	<TD>cupsRowStep</TD>
 	<TD>Driver-specific 0 to 2<SUP>32</SUP> - 1</TD>
 </TR>
-</TBODY>
 </TABLE></DIV>
 
 
@@ -367,16 +362,13 @@ header and is followed immediately by the compressed raster data
 for that page.</P>
 
 <DIV CLASS="table"><TABLE SUMMARY="CUPS Version 2 Raster Page Device Dictionary">
-<CAPTION><A NAME="TABLE2">Table 2: CUPS Version 2 Raster Page Device Dictionary</A></CAPTION>
-<THEAD>
+<CAPTION>Table 2: CUPS Version 2 Raster Page Device Dictionary</CAPTION>
 <TR>
 	<TH>Bytes</TH>
 	<TH>Type</TH>
 	<TH>Description</TH>
 	<TH>Values</TH>
 </TR>
-</THEAD>
-<TBODY>
 <TR>
 	<TD>0-419</TD>
 	<TD>Version 1 header data</TD>
@@ -444,7 +436,6 @@ for that page.</P>
 	<TD>cupsPageSizeName</TD>
 	<TD>Page size name/keyword string from PPD</TD>
 </TR>
-</TBODY>
 </TABLE></DIV>
 
 <H3><A NAME="COMPRESSION">Compressed Raster Data Format</A></H3>
@@ -455,7 +446,6 @@ color values based upon the <CODE>cupsColorOrder</CODE>
 setting:</P>
 
 <DIV CLASS="table"><TABLE SUMMARY="Color Value Sizes">
-<CAPTION><A NAME="TABLE3">Table 3: Color Value Sizes</A></CAPTION>
 <TR>
 	<TH>cupsColorOrder</TH>
 	<TH>Bytes per color value</TH>
@@ -485,205 +475,9 @@ colors are encoded using an initial byte of "257 - count"
 followed by the color value bytes.</P>
 
 
-<H2 CLASS="title"><A NAME="ENCODING">Pixel Value Coding</A></H2>
-
-<P>The following sections describe the encoding and decoding of
-the color values in a CUPS raster file. In general, colors are
-packed into the minimum number of bytes, with special
-consideration provided for efficiency of encoding and access.
-Multi-byte values are stored in the native byte order and
-automatically swapped as needed when reading them using the CUPS
-imaging API.</P>
-
-<H3>CUPS_ORDER_CHUNKED</H3>
-
-<P>The chunked order provides the pixel value packed in a single
-place. Pixel values with 8 or more bits per color are stored as
-an array of colors in order, e.g. for
-<CODE>CUPS_CSPACE_RGB</CODE> you will see 8/16-bits of red, then
-blue, then green, then red, green, blue, etc. Pixel values with
-less than 8 bits per color are packed together as shown in Table
-4. <I>Multi-byte pixel values are stored in the native word
-order, just as for 16-bit color values.</I></P>
-
-<DIV CLASS="table"><TABLE SUMMARY="Chunked Color Values">
-<CAPTION><A NAME="TABLE4">Table 4: Chunked Color Values</A></CAPTION>
-<THEAD>
-<TR>
-	<TH>Bits</TH>
-	<TH>1-color</TH>
-	<TH>3-color</TH>
-	<TH>4-color</TH>
-	<TH>6-color</TH>
-</TR>
-</THEAD>
-<TBODY>
-<TR>
-	<TD>1</TD>
-	<TD>W/W/W/W/W/W/W/W</TD>
-	<TD>0RGB/0RGB</TD>
-	<TD>CMYK/CMYK</TD>
-	<TD>00KCMYcm</TD>
-</TR>
-<TR>
-	<TD>2</TD>
-	<TD>WW/WW/WW/WW</TD>
-	<TD>00RRGGBB</TD>
-	<TD>CCMMYYKK</TD>
-	<TD>N/A</TD>
-</TR>
-<TR>
-	<TD>4</TD>
-	<TD>WWWW/WWWW</TD>
-	<TD>0000RRRRGGGGBBBB<BR>
-	<I>(multi-byte)</I></TD>
-	<TD>CCCCMMMMYYYYKKKK<BR>
-	<I>(multi-byte)</I></TD>
-	<TD>N/A</TD>
-</TR>
-</TBODY>
-</TABLE></DIV>
-
-<H3>CUPS_ORDER_BANDED</H3>
-
-<P>The banded order provides each color as a separate line of
-data. Each color plane for a line is written in sequence, e.g.
-for the <CODE>CUPS_CSPACE_CMYK</CODE> colorspace you would see
-all of the cyan pixels for a line followed by the magenta,
-yellow, and black pixels for that line. This is repeated for all
-of the lines on the page. Color values are packed starting with
-the most-significant bit (MSB) first.</P>
-
-<H3>CUPS_ORDER_PLANAR</H3>
-
-<P>The planar order provides each color as a separate page of
-data using a shared page header. Each color plane for a page is
-written in sequence, e.g. for the <CODE>CUPS_CSPACE_CMYK</CODE>
-colorspace you would see all of the cyan pixels for a page
-followed by the magenta, yellow, and black pixels for that page.
-Color values are packed starting with the most-significant bit
-(MSB) first. Each line starts on an 8-bit boundary.</P>
-
-<H3>CUPS_CSPACE_W, CUPS_CSPACE_RGB, CUPS_CSPACE_RGBA, and
-CUPS_CSPACE_RGBW</H3>
-
-<P>These colorspaces use the sRGB colorspace definition and
-whitepoint.</P>
-
-<H3>CUPS_CSPACE_KCMYcm</H3>
-
-<P>When <CODE>cupsBitsPerColor</CODE> is 1, 6 color planes are
-provided - black, cyan, magenta, yellow, light cyan, and light
-magenta. When <CODE>cupsBitsPerColor</CODE> is greater than 1, 4
-color planes are provided using the <CODE>CUPS_CSPACE_KCMY</CODE>
-colorspace instead.</P>
-
-<P>When <CODE>cupsColorOrder</CODE> is
-<CODE>CUPS_ORDER_CHUNKED</CODE>, bit 5 corresponds to black and
-bit 0 corresponds to light magenta. For
-<CODE>CUPS_ORDER_BANDED</CODE> and
-<CODE>CUPS_ORDER_PLANAR</CODE>, each color plane is encoded
-separately.</P>
-
-<H3>CUPS_CSPACE_CIELab and CUPS_CSPACE_ICCn</H3>
-
-<P>These colorspaces map a CIE Lab color value with a D65
-whitepoint to either a 8- or 16-bit per color chunked
-(<CODE>CUPS_ORDER_CHUNKED</CODE>) format; the banded
-(<CODE>CUPS_ORDER_BANDED</CODE>) and planar
-(<CODE>CUPS_ORDER_PLANAR</CODE>) color orders are not
-supported.</P>
-
-<P>The values are encoded and decoded using the following
-formulas:</P>
-
-<UL>
-
-	<LI>8-bit Encoding:<BR>
-	<I>L8 = 2.55 * L + 0.5<BR>
-	a8 = a + 128.5<BR>
-	b8 = b + 128.5<BR>
-	&nbsp;</I></LI>
-
-	<LI>8-bit Decoding:<BR>
-	<I>L = L8 / 2.55<BR>
-	a = a8 - 128<BR>
-	b = b8 - 128<BR>
-	&nbsp;</I></LI>
-
-	<LI>16-bit Encoding:<BR>
-	<I>L16 = 655.35 * L + 0.5<BR>
-	a16 = 256 * (a + 128) + 0.5<BR>
-	b16 = 256 * (b + 128) + 0.5<BR>
-	&nbsp;</I></LI>
-
-	<LI>16-bit Decoding:<BR>
-	<I>L = L16 / 655.35<BR>
-	a = a16 / 256 - 128<BR>
-	b = b16 / 256 - 128<BR>
-	&nbsp;</I></LI>
-
-</UL>
-
-<H3>CUPS_CSPACE_CIEXYZ</H3>
-
-<P>These colorspaces map a CIE XYZ color value with a D65
-whitepoint to either a 8- or 16-bit per color chunked
-(<CODE>CUPS_ORDER_CHUNKED</CODE>) format; the banded
-(<CODE>CUPS_ORDER_BANDED</CODE>) and planar
-(<CODE>CUPS_ORDER_PLANAR</CODE>) color orders are not
-supported.</P>
-
-<P>The values are encoded and decoded using the following
-formulas:</P>
-
-<UL>
-
-	<LI>8-bit Encoding:<BR>
-	<I>X8 = 231.8181 * X + 0.5<BR>
-	Y8 = 231.8181 * Y + 0.5<BR>
-	Z8 = 231.8181 * Z + 0.5<BR>
-	&nbsp;</I></LI>
-
-	<LI>8-bit Decoding:<BR>
-	<I>X = X8 / 231.8181<BR>
-	Y = Y8 / 231.8181<BR>
-	Z = Z8 / 231.8181<BR>
-	&nbsp;</I></LI>
-
-	<LI>16-bit Encoding:<BR>
-	<I>X16 = 59577.2727 * X + 0.5<BR>
-	Y16 = 59577.2727 * Y + 0.5<BR>
-	Z16 = 59577.2727 * Z + 0.5<BR>
-	&nbsp;</I></LI>
-
-	<LI>16-bit Decoding:<BR>
-	<I>X = X16 / 59577.2727<BR>
-	Y = Y16 / 59577.2727<BR>
-	Z = Z16 / 59577.2727<BR>
-	&nbsp;</I></LI>
-
-</UL>
-
-<P>The scaling factor for XYZ values is 1/1.1, or 231.8181 for
-8-bit values and 59577.2727 for 16-bit values. This allows for a
-slight overflow of XYZ values when converting from RGB, improving
-accuracy.</P>
-
 
 <H2 CLASS="title"><A NAME="HISTORY">Change History</A></H2>
 
-<H3>Changes in CUPS 1.2.1</H3>
-
-<ul>
-
-	<li>Added new sections on coding pixel values.</li>
-
-	<li>Clarified definitions of color spaces.</li>
-
-</ul>
-
-
 <H3>Changes in CUPS 1.2</H3>
 
 <ul>

doc/pl/index.html.in

@@ -2,7 +2,7 @@
 <HTML>
 <HEAD>
 	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-	<TITLE>Strona domowa - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
+	<TITLE>Home - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
 	<LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
 	<LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
 </HEAD>
@@ -19,7 +19,7 @@ SRC="/images/top-right.gif" WIDTH="15" HEIGHT="15" ALT=""></TD>
 
 <A CLASS="sel" HREF="/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
 HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Strona domowa&nbsp;&nbsp;<IMG
+ALT="">&nbsp;&nbsp;Strona&nbsp;Główna&nbsp;&nbsp;<IMG
 SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
 BORDER="0" ALT=""></A>
 
@@ -31,19 +31,19 @@ BORDER="0" ALT=""></A>
 
 &nbsp;<A CLASS="unsel" HREF="/classes/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
 HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Klasy&nbsp;&nbsp;<IMG
+ALT="">&nbsp;&nbsp;Grupy&nbsp;&nbsp;<IMG
 SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
 BORDER="0" ALT=""></A>
 
 &nbsp;<A CLASS="unsel" HREF="/help/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
 HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Dokumentacja/pomoc&nbsp;&nbsp;<IMG
+ALT="">&nbsp;&nbsp;Dokumentacja/Pomoc&nbsp;&nbsp;<IMG
 SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
 BORDER="0" ALT=""></A>
 
 &nbsp;<A CLASS="unsel" HREF="/jobs/"><IMG SRC="/images/tab-left.gif" WIDTH="4"
 HEIGHT="4" ALIGN="TOP" BORDER="0"
-ALT="">&nbsp;&nbsp;Zadania&nbsp;&nbsp;<IMG
+ALT="">&nbsp;&nbsp;Wydruki&nbsp;&nbsp;<IMG
 SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
 BORDER="0" ALT=""></A>
 
@@ -60,59 +60,49 @@ BORDER="0" ALT=""></A>
 
 <H2 CLASS="title">Witaj!</H2>
 
-<P>Te strony WWW pozwalają na monitorowanie drukarek i zadań oraz 
-przeprowadzanie zadań administracyjnych systemu. Naciśnij na dowolną
-powyższą kartę lub poniższy przycisk, aby przeprowadzić zadanie.</P>
+<P> Poprzez te strony internetowe możesz kontrolować swoje drukarki i wydruki, ale także 
+administrować systemem wydruku. Klikaj na zakładki powyżej lub poniższe przyciski aby wykonać odpowiednie zadania.</P>
 
 <P>
 <A HREF="/help/"><IMG SRC="/images/button-help.gif" CLASS="button" ALT="Pomoc"></A>
 <A HREF="/admin?OP=add-class"><IMG SRC="/images/button-add-class.gif" CLASS="button" ALT="Dodaj klasę"></A>
-<A HREF="/admin?OP=add-printer"><IMG SRC="/images/button-add-printer.gif" CLASS="button" ALT="Dodaj drkarkę"></A>
-<A HREF="/classes"><IMG SRC="/images/button-manage-classes.gif" CLASS="button" ALT="Zarządzaj klasami"></A>
-<A HREF="/jobs"><IMG SRC="/images/button-manage-jobs.gif" CLASS="button" ALT="Zarządzaj zadaniami"></A>
-<A HREF="/printers"><IMG SRC="/images/button-manage-printers.gif" CLASS="button" ALT="Zarządzaj drukarkami"></A>
-<A HREF="/admin"><IMG SRC="/images/button-manage-server.gif" CLASS="button" ALT="Zarządzaj serwerem"></A>
+<A HREF="/admin?OP=add-printer"><IMG SRC="/images/button-add-printer.gif" CLASS="button" ALT="Dodaj drukarkę"></A>
+<A HREF="/classes"><IMG SRC="/images/button-manage-classes.gif" CLASS="button" ALT="Zarządzaj Klasami"></A>
+<A HREF="/jobs"><IMG SRC="/images/button-manage-jobs.gif" CLASS="button" ALT="Zarządzaj wydrukami"></A>
+<A HREF="/printers"><IMG SRC="/images/button-manage-printers.gif" CLASS="button" ALT="Zarządzaj Drukarkami"></A>
+<A HREF="/admin"><IMG SRC="/images/button-manage-server.gif" CLASS="button" ALT="Zarządzaj Serwerem"></A>
 </P>
 
-<P><I>Jeśli zostaniesz poproszony o nazwę użytkownika i hasło, podaj
-swój login i hasło lub nazwę użytkownika "root" i hasło.</I></P>
+<P><I>Jeśli zostaniesz poproszony o nazwę użytkownika i hasło, wprowadź swój login i hasło
+lub login "root" i hasło tego użytkownika.</I></P>
 
-<H2 CLASS="title">Informacje o CUPS</H2>
+<H2 CLASS="title">O systemie CUPS</H2>
 
 <P>
 <IMG SRC="/images/happy.gif" ALIGN="LEFT" WIDTH="196" HEIGHT="144"
-STYLE="padding-right: 10px;" ALT="Szczęśliwy komputer i drukarka">
+STYLE="padding-right: 10px;" ALT="Zadowolony komputer i drukarka">
 
 <A HREF="http://www.easysw.com/"><IMG SRC="/images/esp-logo.gif"
 ALIGN="RIGHT" WIDTH="110" HEIGHT="68" BORDER="0"
 STYLE="padding-left: 10px; padding-bottom: 10px;"
 ALT="Easy Software Products"></A>
 
-CUPS dostarcza przenośną warstwę drukowania dla systemów
-operacyjnych opartych na Uniksie<SUP>&reg;</SUP>. Został napisany
-i utrzymywany przez <A HREF="http://www.easysw.com">Easy Software
-Products</a>, aby wypromować standardowe rozwiązanie drukowania.
-CUPS jest standardowym systemem drukowania używanym na MacOS-ie
-<SUP>&reg;</SUP> X i większości dystrybucji Linuksa<SUP>&reg;</SUP>.</P>
+CUPS zapewnia przenośną warstwę drukowania dla systemów bazujących na 
+UNIX<SUP>&reg;</SUP>. Jest rozbudowywany pod opieką <A HREF="http://www.easysw.com">Easy Software
+Products</a> by promować standard drukowania. CUPS jest domyślnym systemem drukowania używanym w MacOS<SUP>&reg;</SUP>&nbsp;X i większości dystrybucji Linuksa<SUP>&reg;</SUP>.</P>
+<P>CUPS stosuje <A HREF="http://www.pwg.org/ipp/"
+TARGET="_blank"> Internetowy Protokół Drukowania ("IPP")</A> jako podstawy do zarządzania wydrukami i ich kolejkami oraz umożliwia przeglądanie drukarek sieciowych i wydruki w oparciu o PostScriptowe Opisy Drukarek ("PPD") by wspierać w drukowaniu każdego użytkownika.<BR CLEAR="ALL"></P>
 
-<P>CUPS używa <A HREF="http://www.pwg.org/ipp/"
-TARGET="_blank"> Internetowego protokołu drukowania ("IPP")</A>
-jako podstawę zarządzania zadaniami drukowania i kolejkami oraz
-dodaje sieciowe przeglądanie drukarek, a także oparte na
-PostScriptowym opisie drukarek ("PPD") opcje drukowania do
-obsługi prawdziwego drukowania.<BR CLEAR="ALL"></P>
+<H2 CLASS="title">Sterowniki Drukarek i Wsparcie</H2>
 
-<H2 CLASS="title">Sterowniki drukarek i pomoc techniczna</H2>
-
-<P>Odwiedź oficjalną stronę CUPS, aby uzyskać sterowniki drukarek i pomoc techniczną:</P>
+<P>Odwiedź oficjalną stronę CUPS site aby pobrać sterowniki i uzyskać wsparcie:</P>
 
 <PRE>
     <A HREF="http://www.cups.org/" TARGET="_blank">www.cups.org</A>
 </PRE>
 
-<P>Komercyjne wsparcie i ulepszona wersja CUPS o nazwie <A
-HREF="http://www.easysw.com/printpro/">ESP Print Pro</A> są
-dostępne na:</P>
+<P>Komercyjne wsparcie i rozszerzona wersja CUPS zwana <A
+HREF="http://www.easysw.com/printpro/">ESP Print Pro</A> jest dostępna tu:</P>
 
 <PRE>
     <A HREF="http://www.easysw.com/" TARGET="_blank">www.easysw.com</A>
@@ -126,10 +116,10 @@ dostępne na:</P>
 WIDTH="15" HEIGHT="15" ALT=""></TD>
 <TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
 
-<P><SMALL>Common UNIX Printing System, CUPS i logo CUPS są
-zarejestrowanymi znakami towarowymi <A HREF="http://www.easysw.com">Easy Software
-Products</A>. Copyright 1997-2006 Easy Software Products,
-wszelkie prawa zastrzeżone.</SMALL></P>
+<P><SMALL>The Common UNIX Printing System, CUPS, and the CUPS logo are the  
+trademark property of <A HREF="http://www.easysw.com">Easy Software
+Products</A>. CUPS is copyright 1997-2006 by Easy Software Products,
+All Rights Reserved.</SMALL></P>
 
 </TD>
 

filter/Makefile

@@ -65,7 +65,7 @@ all:	$(TARGETS)
 clean:
 	$(RM) $(OBJS) $(TARGETS)
 	$(RM) libcupsimage.so libcupsimage.sl libcupsimage.dylib
-	$(RM) -r 32bit 64bit
+	$(RM) libcupsimage.32.so libcupsimage.64.so
 
 
 #
@@ -117,12 +117,12 @@ installhdrs:
 
 install32bit:
 	$(INSTALL_DIR) -m 755 $(LIB32DIR)
-	$(INSTALL_LIB) 32bit/libcupsimage.so.2 $(LIB32DIR)/libcupsimage.so.2
+	$(INSTALL_LIB) libcupsimage.32.so.2 $(LIB32DIR)/libcupsimage.so.2
 	$(LN) libcupsimage.so $(LIB32DIR)/libcupsimage.so.2
 
 install64bit:
 	$(INSTALL_DIR) -m 755 $(LIB64DIR)
-	$(INSTALL_LIB) 64bit/libcupsimage.so.2 $(LIB64DIR)/libcupsimage.so.2
+	$(INSTALL_LIB) libcupsimage.64.so.2 $(LIB64DIR)/libcupsimage.so.2
 	$(LN) libcupsimage.so $(LIB64DIR)/libcupsimage.so.2
 
 
@@ -212,25 +212,23 @@ libcupsimage.so.2 libcupsimage.sl.2:	$(IMAGEOBJS)
 
 
 #
-# 32bit/libcupsimage.so.2
+# libcupsimage.32.so.2
 #
 
-32bit/libcupsimage.so.2:	$(IMAGE32OBJS)
+libcupsimage.32.so.2:	$(IMAGE32OBJS)
 	echo Linking 32-bit $@...
-	-mkdir 32bit
-	$(DSO) $(ARCH32FLAGS) $(DSO32FLAGS) -o $@ $(IMAGE32OBJS) $(DSOLIBS) \
-		-L../cups/32bit $(LINKCUPS) -lm
+	$(DSO) $(ARCH32FLAGS) $(DSOFLAGS) -o $@ $(IMAGE32OBJS) $(DSOLIBS) \
+		-L../cups $(LINKCUPS) -lm
 
 
 #
-# 64bit/libcupsimage.so.2
+# libcupsimage.64.so.2
 #
 
-64bit/libcupsimage.so.2:	$(IMAGE64OBJS)
+libcupsimage.64.so.2:	$(IMAGE64OBJS)
 	echo Linking 64-bit $@...
-	-mkdir 64bit
-	$(DSO) $(ARCH64FLAGS) $(DSO64FLAGS) -o $@ $(IMAGE64OBJS) $(DSOLIBS) \
-		-L../cups/64bit $(LINKCUPS) -lm
+	$(DSO) $(ARCH64FLAGS) $(DSOFLAGS) -o $@ $(IMAGE64OBJS) $(DSOLIBS) \
+		-L../cups $(LINKCUPS) -lm
 
 
 #

filter/image-bmp.c

@@ -3,7 +3,7 @@
  *
  *   BMP image routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1993-2006 by Easy Software Products.
+ *   Copyright 1993-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -202,7 +202,10 @@ _cupsImageReadBMP(
 
   for (y = img->ysize - 1; y >= 0; y --)
   {
-    ptr = in;
+    if (img->colorspace == CUPS_IMAGE_RGB)
+      ptr = out;
+    else
+      ptr = in;
 
     switch (depth)
     {
@@ -439,33 +442,37 @@ _cupsImageReadBMP(
           break;
     }
 
-    if (saturation != 100 || hue != 0)
-      cupsImageRGBAdjust(in, img->xsize, saturation, hue);
-
-    switch (img->colorspace)
+    if (img->colorspace == CUPS_IMAGE_RGB)
     {
-      default :
-	  break;
+      if (saturation != 100 || hue != 0)
+	cupsImageRGBAdjust(out, img->xsize, saturation, hue);
+    }
+    else
+    {
+      if (saturation != 100 || hue != 0)
+	cupsImageRGBAdjust(in, img->xsize, saturation, hue);
 
-      case CUPS_IMAGE_WHITE :
-	  cupsImageRGBToWhite(in, out, img->xsize);
-	  break;
+      switch (img->colorspace)
+      {
+        default :
+	    break;
 
-      case CUPS_IMAGE_RGB :
-	  cupsImageRGBToRGB(in, out, img->xsize);
-	  break;
+	case CUPS_IMAGE_WHITE :
+	    cupsImageRGBToWhite(in, out, img->xsize);
+	    break;
 
-      case CUPS_IMAGE_BLACK :
-	  cupsImageRGBToBlack(in, out, img->xsize);
-	  break;
+	case CUPS_IMAGE_BLACK :
+	    cupsImageRGBToBlack(in, out, img->xsize);
+	    break;
 
-      case CUPS_IMAGE_CMY :
-	  cupsImageRGBToCMY(in, out, img->xsize);
-	  break;
+	case CUPS_IMAGE_CMY :
+	    cupsImageRGBToCMY(in, out, img->xsize);
+	    break;
 
-      case CUPS_IMAGE_CMYK :
-	  cupsImageRGBToCMYK(in, out, img->xsize);
-	  break;
+	case CUPS_IMAGE_CMYK :
+	    cupsImageRGBToCMYK(in, out, img->xsize);
+	    break;
+      }
     }
 
     if (lut)

filter/image-colorspace.c

@@ -3,7 +3,7 @@
  *
  *   Colorspace conversions for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1993-2006 by Easy Software Products.
+ *   Copyright 1993-2005 by Easy Software Products.
  *
  *   The color saturation/hue matrix stuff is provided thanks to Mr. Paul
  *   Haeberli at "http://www.sgi.com/grafica/matrix/index.html".
@@ -423,8 +423,7 @@ cupsImageCMYKToRGB(
       else
         *out++ = 0;
 
-      if (cupsImageColorSpace == CUPS_CSPACE_CIELab ||
-          cupsImageColorSpace >= CUPS_CSPACE_ICC1)
+      if (cupsImageColorSpace >= CUPS_CSPACE_CIELab)
         rgb_to_lab(out - 3);
       else if (cupsImageColorSpace == CUPS_CSPACE_CIEXYZ)
         rgb_to_xyz(out - 3);
@@ -853,22 +852,14 @@ cupsImageRGBToRGB(
     if (in != out)
       memcpy(out, in, count * 3);
 
-    if (cupsImageColorSpace == CUPS_CSPACE_CIELab ||
-        cupsImageColorSpace >= CUPS_CSPACE_ICC1)
+    if (cupsImageColorSpace >= CUPS_CSPACE_CIEXYZ)
     {
       while (count > 0)
       {
-        rgb_to_lab(out);
-
-	out += 3;
-	count --;
-      }
-    }
-    else if (cupsImageColorSpace == CUPS_CSPACE_CIEXYZ)
-    {
-      while (count > 0)
-      {
-        rgb_to_xyz(out);
+	if (cupsImageColorSpace >= CUPS_CSPACE_CIELab)
+          rgb_to_lab(out);
+	else
+          rgb_to_xyz(out);
 
 	out += 3;
 	count --;
@@ -967,15 +958,13 @@ cupsImageSetRasterColorSpace(
   * Set the destination colorspace...
   */
 
-  cupsImageColorSpace = cs;
+  cupsImageColorSpace  = cs;
 
  /*
   * Don't use color profiles in colorimetric colorspaces...
   */
 
-  if (cs == CUPS_CSPACE_CIEXYZ ||
-      cs == CUPS_CSPACE_CIELab ||
-      cs >= CUPS_CSPACE_ICC1)
+  if (cs >= CUPS_CSPACE_CIEXYZ)
     cupsImageHaveProfile = 0;
 }
 
@@ -1095,8 +1084,7 @@ cupsImageWhiteToRGB(
       *out++ = *in;
       *out++ = *in++;
 
-      if (cupsImageColorSpace == CUPS_CSPACE_CIELab ||
-          cupsImageColorSpace >= CUPS_CSPACE_ICC1)
+      if (cupsImageColorSpace >= CUPS_CSPACE_CIELab)
         rgb_to_lab(out - 3);
       else if (cupsImageColorSpace == CUPS_CSPACE_CIEXYZ)
         rgb_to_xyz(out - 3);
@@ -1295,9 +1283,9 @@ rgb_to_lab(cups_ib_t *val)		/* IO - Color value */
   * Convert sRGB to linear RGB...
   */
 
-  r = pow((val[0] / 255.0 + 0.055) / 1.055, 2.4);
-  g = pow((val[1] / 255.0 + 0.055) / 1.055, 2.4);
-  b = pow((val[2] / 255.0 + 0.055) / 1.055, 2.4);
+  r = pow(val[0] / 255.0, 0.58823529412);
+  g = pow(val[1] / 255.0, 0.58823529412);
+  b = pow(val[2] / 255.0, 0.58823529412);
 
  /*
   * Convert to CIE XYZ...
@@ -1327,9 +1315,9 @@ rgb_to_lab(cups_ib_t *val)		/* IO - Color value */
   * numbers are from 0 to 255.
   */
 
-  ciel = ciel * 2.55 + 0.5;
-  ciea += 128.5;
-  cieb += 128.5;
+  ciel *= 2.55;
+  ciea += 128;
+  cieb += 128;
 
  /*
   * Output 8-bit values...
@@ -1343,14 +1331,14 @@ rgb_to_lab(cups_ib_t *val)		/* IO - Color value */
     val[0] = 255;
 
   if (ciea < 0.0)
-    val[1] = 0;
+    val[1] = 128;
   else if (ciea < 255.0)
     val[1] = (int)ciea;
   else
     val[1] = 255;
 
   if (cieb < 0.0)
-    val[2] = 0;
+    val[2] = 128;
   else if (cieb < 255.0)
     val[2] = (int)cieb;
   else
@@ -1377,9 +1365,9 @@ rgb_to_xyz(cups_ib_t *val)		/* IO - Color value */
   * Convert sRGB to linear RGB...
   */
 
-  r = pow((val[0] / 255.0 + 0.055) / 1.055, 2.4);
-  g = pow((val[1] / 255.0 + 0.055) / 1.055, 2.4);
-  b = pow((val[2] / 255.0 + 0.055) / 1.055, 2.4);
+  r = pow(val[0] / 255.0, 0.58823529412);
+  g = pow(val[1] / 255.0, 0.58823529412);
+  b = pow(val[2] / 255.0, 0.58823529412);
 
  /*
   * Convert to CIE XYZ...
@@ -1390,27 +1378,27 @@ rgb_to_xyz(cups_ib_t *val)		/* IO - Color value */
   ciez = 0.019334 * r + 0.119193 * g + 0.950227 * b;
 
  /*
-  * Encode as 8-bit XYZ...
+  * Output 8-bit values...
   */
 
-  if (ciex < 0.0f)
+  if (ciex < 0.0)
     val[0] = 0;
-  else if (ciex < 1.1f)
-    val[0] = (int)(231.8181f * ciex + 0.5);
+  else if (ciex < 255.0)
+    val[0] = (int)ciex;
   else
     val[0] = 255;
 
-  if (ciey < 0.0f)
+  if (ciey < 0.0)
     val[1] = 0;
-  else if (ciey < 1.1f)
-    val[1] = (int)(231.8181f * ciey + 0.5);
+  else if (ciey < 255.0)
+    val[1] = (int)ciey;
   else
     val[1] = 255;
 
-  if (ciez < 0.0f)
+  if (ciez < 0.0)
     val[2] = 0;
-  else if (ciez < 1.1f)
-    val[2] = (int)(231.8181f * ciez + 0.5);
+  else if (ciez < 255.0)
+    val[2] = (int)ciez;
   else
     val[2] = 255;
 }

filter/image-gif.c

@@ -3,7 +3,7 @@
  *
  *   GIF image routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1993-2006 by Easy Software Products.
+ *   Copyright 1993-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -220,8 +220,6 @@ _cupsImageReadGIF(
         	  break;
               case CUPS_IMAGE_RGB :
               case CUPS_IMAGE_RGB_CMYK :
-        	  for (i = ncolors - 1; i >= 0; i --)
-        	    cupsImageRGBToRGB(cmap[i], cmap[i], 1);
         	  break;
 	    }
 

filter/image-jpeg.c

@@ -3,7 +3,7 @@
  *
  *   JPEG image routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1993-2006 by Easy Software Products.
+ *   Copyright 1993-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -195,6 +195,7 @@ _cupsImageReadJPEG(
       cupsImageRGBAdjust(in, img->xsize, saturation, hue);
 
     if ((img->colorspace == CUPS_IMAGE_WHITE && cinfo.out_color_space == JCS_GRAYSCALE) ||
+        (img->colorspace == CUPS_IMAGE_RGB && cinfo.out_color_space == JCS_RGB) ||
 	(img->colorspace == CUPS_IMAGE_CMYK && cinfo.out_color_space == JCS_CMYK))
     {
 #ifdef DEBUG
@@ -254,9 +255,6 @@ _cupsImageReadJPEG(
         default :
 	    break;
 
-        case CUPS_IMAGE_RGB :
-            cupsImageRGBToRGB(in, out, img->xsize);
-	    break;
         case CUPS_IMAGE_WHITE :
             cupsImageRGBToWhite(in, out, img->xsize);
             break;

filter/image-photocd.c

@@ -7,7 +7,7 @@
  *   is only YCC encoded.  Support for the higher resolution images will
  *   require a lot of extra code...
  *
- *   Copyright 1993-2006 by Easy Software Products.
+ *   Copyright 1993-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -272,29 +272,39 @@ _cupsImageReadPhotoCD(
 	* put it in the image...
 	*/
 
-	switch (img->colorspace)
+        if (img->colorspace == CUPS_IMAGE_RGB)
 	{
-	  default :
-	      break;
+	  if (lut)
+	    cupsImageLut(rgb, 768 * 3, lut);
 
-	  case CUPS_IMAGE_RGB :
-	      cupsImageRGBToRGB(rgb, out, 768);
-	      break;
-	  case CUPS_IMAGE_CMY :
-	      cupsImageRGBToCMY(rgb, out, 768);
-	      break;
-	  case CUPS_IMAGE_CMYK :
-	      cupsImageRGBToCMYK(rgb, out, 768);
-	      break;
+	  if (rotation)
+            _cupsImagePutCol(img, 511 - y - pass, 0, 768, rgb);
+	  else
+            _cupsImagePutRow(img, 0, y + pass, 768, rgb);
 	}
-
-	if (lut)
-	  cupsImageLut(out, 768 * bpp, lut);
-
-	if (rotation)
-          _cupsImagePutCol(img, 511 - y - pass, 0, 768, out);
 	else
-          _cupsImagePutRow(img, 0, y + pass, 768, out);
+	{
+	  switch (img->colorspace)
+	  {
+	    default :
+	        break;
+
+	    case CUPS_IMAGE_CMY :
+		cupsImageRGBToCMY(rgb, out, 768);
+		break;
+	    case CUPS_IMAGE_CMYK :
+		cupsImageRGBToCMYK(rgb, out, 768);
+		break;
+	  }
+
+	  if (lut)
+	    cupsImageLut(out, 768 * bpp, lut);
+
+	  if (rotation)
+            _cupsImagePutCol(img, 511 - y - pass, 0, 768, out);
+	  else
+            _cupsImagePutRow(img, 0, y + pass, 768, out);
+	}
       }
     }
   }

filter/image-pix.c

@@ -3,7 +3,7 @@
  *
  *   Alias PIX image routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1993-2006 by Easy Software Products.
+ *   Copyright 1993-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -159,7 +159,10 @@ _cupsImageReadPIX(
   {
     for (count = 0, y = 0, r = 0, g = 0, b = 0; y < img->ysize; y ++)
     {
-      ptr = in;
+      if (img->colorspace == CUPS_IMAGE_RGB)
+        ptr = out;
+      else
+        ptr = in;
 
       for (x = img->xsize; x > 0; x --, count --)
       {
@@ -176,29 +179,34 @@ _cupsImageReadPIX(
         *ptr++ = b;
       }
 
-      if (saturation != 100 || hue != 0)
-	cupsImageRGBAdjust(in, img->xsize, saturation, hue);
-
-      switch (img->colorspace)
+      if (img->colorspace == CUPS_IMAGE_RGB)
       {
-	default :
-	    break;
+	if (saturation != 100 || hue != 0)
+	  cupsImageRGBAdjust(out, img->xsize, saturation, hue);
+      }
+      else
+      {
+	if (saturation != 100 || hue != 0)
+	  cupsImageRGBAdjust(in, img->xsize, saturation, hue);
 
-	case CUPS_IMAGE_WHITE :
-	    cupsImageRGBToWhite(in, out, img->xsize);
-	    break;
-	case CUPS_IMAGE_RGB :
-	    cupsImageRGBToWhite(in, out, img->xsize);
-	    break;
-	case CUPS_IMAGE_BLACK :
-	    cupsImageRGBToBlack(in, out, img->xsize);
-	    break;
-	case CUPS_IMAGE_CMY :
-	    cupsImageRGBToCMY(in, out, img->xsize);
-	    break;
-	case CUPS_IMAGE_CMYK :
-	    cupsImageRGBToCMYK(in, out, img->xsize);
-	    break;
+	switch (img->colorspace)
+	{
+	  default :
+	      break;
+
+	  case CUPS_IMAGE_WHITE :
+	      cupsImageRGBToWhite(in, out, img->xsize);
+	      break;
+	  case CUPS_IMAGE_BLACK :
+	      cupsImageRGBToBlack(in, out, img->xsize);
+	      break;
+	  case CUPS_IMAGE_CMY :
+	      cupsImageRGBToCMY(in, out, img->xsize);
+	      break;
+	  case CUPS_IMAGE_CMYK :
+	      cupsImageRGBToCMYK(in, out, img->xsize);
+	      break;
+	}
       }
 
       if (lut)

filter/image-png.c

@@ -216,7 +216,7 @@ _cupsImageReadPNG(
 		break;
 	    case CUPS_IMAGE_RGB :
 	    case CUPS_IMAGE_RGB_CMYK :
-		cupsImageRGBToRGB(inptr, out, img->xsize);
+		memcpy(out, inptr, img->xsize * 3);
 		break;
 	    case CUPS_IMAGE_BLACK :
 		cupsImageRGBToBlack(inptr, out, img->xsize);

filter/image-pnm.c

@@ -3,7 +3,7 @@
  *
  *   Portable Any Map file routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1993-2006 by Easy Software Products.
+ *   Copyright 1993-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -261,32 +261,39 @@ _cupsImageReadPNM(
 	  if ((saturation != 100 || hue != 0) && bpp > 1)
 	    cupsImageRGBAdjust(in, img->xsize, saturation, hue);
 
-	  switch (img->colorspace)
+	  if (img->colorspace == CUPS_IMAGE_RGB)
 	  {
-            default :
-		break;
+	    if (lut)
+	      cupsImageLut(in, img->xsize * 3, lut);
 
-	    case CUPS_IMAGE_WHITE :
-		cupsImageRGBToWhite(in, out, img->xsize);
-		break;
-	    case CUPS_IMAGE_RGB :
-		cupsImageRGBToRGB(in, out, img->xsize);
-		break;
-	    case CUPS_IMAGE_BLACK :
-		cupsImageRGBToBlack(in, out, img->xsize);
-		break;
-	    case CUPS_IMAGE_CMY :
-		cupsImageRGBToCMY(in, out, img->xsize);
-		break;
-	    case CUPS_IMAGE_CMYK :
-		cupsImageRGBToCMYK(in, out, img->xsize);
-		break;
+            _cupsImagePutRow(img, 0, y, img->xsize, in);
 	  }
+	  else
+	  {
+	    switch (img->colorspace)
+	    {
+              default :
+		  break;
 
-	  if (lut)
-	    cupsImageLut(out, img->xsize * bpp, lut);
+	      case CUPS_IMAGE_WHITE :
+		  cupsImageRGBToWhite(in, out, img->xsize);
+		  break;
+	      case CUPS_IMAGE_BLACK :
+		  cupsImageRGBToBlack(in, out, img->xsize);
+		  break;
+	      case CUPS_IMAGE_CMY :
+		  cupsImageRGBToCMY(in, out, img->xsize);
+		  break;
+	      case CUPS_IMAGE_CMYK :
+		  cupsImageRGBToCMYK(in, out, img->xsize);
+		  break;
+	    }
 
-          _cupsImagePutRow(img, 0, y, img->xsize, out);
+	    if (lut)
+	      cupsImageLut(out, img->xsize * bpp, lut);
+
+            _cupsImagePutRow(img, 0, y, img->xsize, out);
+	  }
   	  break;
     }
   }

filter/image-sgi.c

@@ -3,7 +3,7 @@
  *
  *   SGI image file routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1993-2006 by Easy Software Products.
+ *   Copyright 1993-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -236,35 +236,45 @@ _cupsImageReadSGI(
     }
     else
     {
-      if ((saturation != 100 || hue != 0) && bpp > 1)
-	cupsImageRGBAdjust(in, img->xsize, saturation, hue);
-
-      switch (img->colorspace)
+      if (img->colorspace == CUPS_IMAGE_RGB)
       {
-	default :
-	    break;
+	if (saturation != 100 || hue != 0)
+	  cupsImageRGBAdjust(in, img->xsize, saturation, hue);
 
-	case CUPS_IMAGE_WHITE :
-	    cupsImageRGBToWhite(in, out, img->xsize);
-	    break;
-	case CUPS_IMAGE_RGB :
-	    cupsImageRGBToRGB(in, out, img->xsize);
-	    break;
-	case CUPS_IMAGE_BLACK :
-	    cupsImageRGBToBlack(in, out, img->xsize);
-	    break;
-	case CUPS_IMAGE_CMY :
-	    cupsImageRGBToCMY(in, out, img->xsize);
-	    break;
-	case CUPS_IMAGE_CMYK :
-	    cupsImageRGBToCMYK(in, out, img->xsize);
-	    break;
+        if (lut)
+	  cupsImageLut(in, img->xsize * 3, lut);
+
+        _cupsImagePutRow(img, 0, y, img->xsize, in);
       }
+      else
+      {
+	if ((saturation != 100 || hue != 0) && bpp > 1)
+	  cupsImageRGBAdjust(in, img->xsize, saturation, hue);
 
-      if (lut)
-	cupsImageLut(out, img->xsize * bpp, lut);
+	switch (img->colorspace)
+	{
+	  default :
+	      break;
 
-      _cupsImagePutRow(img, 0, y, img->xsize, out);
+	  case CUPS_IMAGE_WHITE :
+	      cupsImageRGBToWhite(in, out, img->xsize);
+	      break;
+	  case CUPS_IMAGE_BLACK :
+	      cupsImageRGBToBlack(in, out, img->xsize);
+	      break;
+	  case CUPS_IMAGE_CMY :
+	      cupsImageRGBToCMY(in, out, img->xsize);
+	      break;
+	  case CUPS_IMAGE_CMYK :
+	      cupsImageRGBToCMYK(in, out, img->xsize);
+	      break;
+	}
+
+        if (lut)
+	  cupsImageLut(out, img->xsize * bpp, lut);
+
+        _cupsImagePutRow(img, 0, y, img->xsize, out);
+      }
     }
   }
 

filter/image-sun.c

@@ -3,7 +3,7 @@
  *
  *   Sun Raster image file routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1993-2006 by Easy Software Products.
+ *   Copyright 1993-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -330,32 +330,45 @@ _cupsImageReadSunRaster(
     }
     else
     {
-      if ((saturation != 100 || hue != 0) && bpp > 1)
-	cupsImageRGBAdjust(in, img->xsize, saturation, hue);
-
-      switch (img->colorspace)
+      if (img->colorspace == CUPS_IMAGE_RGB)
       {
-	default :
-	    break;
+	if (saturation != 100 || hue != 0)
+	  cupsImageRGBAdjust(in, img->xsize, saturation, hue);
 
-	case CUPS_IMAGE_WHITE :
-	    cupsImageRGBToWhite(in, out, img->xsize);
-	    break;
-	case CUPS_IMAGE_BLACK :
-	    cupsImageRGBToBlack(in, out, img->xsize);
-	    break;
-	case CUPS_IMAGE_CMY :
-	    cupsImageRGBToCMY(in, out, img->xsize);
-	    break;
-	case CUPS_IMAGE_CMYK :
-	    cupsImageRGBToCMYK(in, out, img->xsize);
-	    break;
+        if (lut)
+	  cupsImageLut(in, img->xsize * 3, lut);
+
+        _cupsImagePutRow(img, 0, y, img->xsize, in);
       }
+      else
+      {
+	if ((saturation != 100 || hue != 0) && bpp > 1)
+	  cupsImageRGBAdjust(in, img->xsize, saturation, hue);
 
-      if (lut)
-	cupsImageLut(out, img->xsize * bpp, lut);
+	switch (img->colorspace)
+	{
+	  default :
+	      break;
 
-      _cupsImagePutRow(img, 0, y, img->xsize, out);
+	  case CUPS_IMAGE_WHITE :
+	      cupsImageRGBToWhite(in, out, img->xsize);
+	      break;
+	  case CUPS_IMAGE_BLACK :
+	      cupsImageRGBToBlack(in, out, img->xsize);
+	      break;
+	  case CUPS_IMAGE_CMY :
+	      cupsImageRGBToCMY(in, out, img->xsize);
+	      break;
+	  case CUPS_IMAGE_CMYK :
+	      cupsImageRGBToCMYK(in, out, img->xsize);
+	      break;
+	}
+
+        if (lut)
+	  cupsImageLut(out, img->xsize * bpp, lut);
+
+        _cupsImagePutRow(img, 0, y, img->xsize, out);
+      }
     }
   }
 

filter/image-tiff.c

@@ -3,7 +3,7 @@
  *
  *   TIFF file routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1993-2006 by Easy Software Products.
+ *   Copyright 1993-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -783,32 +783,39 @@ _cupsImageReadTIFF(
 	      }
             }
 
-	    switch (img->colorspace)
+            if (img->colorspace == CUPS_IMAGE_RGB)
 	    {
-	      default :
-		  break;
+	      if (lut)
+	        cupsImageLut(in, img->xsize * 3, lut);
 
-	      case CUPS_IMAGE_WHITE :
-		  cupsImageRGBToWhite(in, out, img->xsize);
-		  break;
-	      case CUPS_IMAGE_RGB :
-		  cupsImageRGBToRGB(in, out, img->xsize);
-		  break;
-	      case CUPS_IMAGE_BLACK :
-		  cupsImageRGBToBlack(in, out, img->xsize);
-		  break;
-	      case CUPS_IMAGE_CMY :
-		  cupsImageRGBToCMY(in, out, img->xsize);
-		  break;
-	      case CUPS_IMAGE_CMYK :
-		  cupsImageRGBToCMYK(in, out, img->xsize);
-		  break;
+              _cupsImagePutRow(img, 0, y, img->xsize, in);
 	    }
+            else
+            {
+	      switch (img->colorspace)
+	      {
+		default :
+		    break;
 
-	    if (lut)
-	      cupsImageLut(out, img->xsize * bpp, lut);
+		case CUPS_IMAGE_WHITE :
+		    cupsImageRGBToWhite(in, out, img->xsize);
+		    break;
+		case CUPS_IMAGE_BLACK :
+		    cupsImageRGBToBlack(in, out, img->xsize);
+		    break;
+		case CUPS_IMAGE_CMY :
+		    cupsImageRGBToCMY(in, out, img->xsize);
+		    break;
+		case CUPS_IMAGE_CMYK :
+		    cupsImageRGBToCMYK(in, out, img->xsize);
+		    break;
+	      }
 
-            _cupsImagePutRow(img, 0, y, img->xsize, out);
+	      if (lut)
+	        cupsImageLut(out, img->xsize * bpp, lut);
+
+              _cupsImagePutRow(img, 0, y, img->xsize, out);
+	    }
           }
         }
         else
@@ -916,33 +923,40 @@ _cupsImageReadTIFF(
 	      }
             }
 
-	    switch (img->colorspace)
+            if (img->colorspace == CUPS_IMAGE_RGB)
 	    {
-	      default :
-		  break;
+	      if (lut)
+	        cupsImageLut(in, img->ysize * 3, lut);
 
-	      case CUPS_IMAGE_WHITE :
-		  cupsImageRGBToWhite(in, out, img->ysize);
-		  break;
-	      case CUPS_IMAGE_RGB :
-		  cupsImageRGBToRGB(in, out, img->ysize);
-		  break;
-	      case CUPS_IMAGE_BLACK :
-		  cupsImageRGBToBlack(in, out, img->ysize);
-		  break;
-	      case CUPS_IMAGE_CMY :
-		  cupsImageRGBToCMY(in, out, img->ysize);
-		  break;
-	      case CUPS_IMAGE_CMYK :
-		  cupsImageRGBToCMYK(in, out, img->ysize);
-		  break;
+              _cupsImagePutCol(img, x, 0, img->ysize, in);
 	    }
+            else
+            {
+	      switch (img->colorspace)
+	      {
+		default :
+		    break;
 
-	    if (lut)
-	      cupsImageLut(out, img->ysize * bpp, lut);
+		case CUPS_IMAGE_WHITE :
+		    cupsImageRGBToWhite(in, out, img->ysize);
+		    break;
+		case CUPS_IMAGE_BLACK :
+		    cupsImageRGBToBlack(in, out, img->ysize);
+		    break;
+		case CUPS_IMAGE_CMY :
+		    cupsImageRGBToCMY(in, out, img->ysize);
+		    break;
+		case CUPS_IMAGE_CMYK :
+		    cupsImageRGBToCMYK(in, out, img->ysize);
+		    break;
+	      }
 
-            _cupsImagePutCol(img, x, 0, img->ysize, out);
-	  }
+	      if (lut)
+	        cupsImageLut(out, img->ysize * bpp, lut);
+
+              _cupsImagePutCol(img, x, 0, img->ysize, out);
+	    }
+          }
         }
         break;
 
@@ -1060,32 +1074,39 @@ _cupsImageReadTIFF(
             if ((saturation != 100 || hue != 0) && bpp > 1)
               cupsImageRGBAdjust(in, img->xsize, saturation, hue);
 
-	    switch (img->colorspace)
+            if (img->colorspace == CUPS_IMAGE_RGB)
 	    {
-	      default :
-		  break;
+	      if (lut)
+	        cupsImageLut(in, img->xsize * 3, lut);
 
-	      case CUPS_IMAGE_WHITE :
-		  cupsImageRGBToWhite(in, out, img->xsize);
-		  break;
-	      case CUPS_IMAGE_RGB :
-		  cupsImageRGBToRGB(in, out, img->xsize);
-		  break;
-	      case CUPS_IMAGE_BLACK :
-		  cupsImageRGBToBlack(in, out, img->xsize);
-		  break;
-	      case CUPS_IMAGE_CMY :
-		  cupsImageRGBToCMY(in, out, img->xsize);
-		  break;
-	      case CUPS_IMAGE_CMYK :
-		  cupsImageRGBToCMYK(in, out, img->xsize);
-		  break;
+              _cupsImagePutRow(img, 0, y, img->xsize, in);
 	    }
+            else
+            {
+	      switch (img->colorspace)
+	      {
+		default :
+		    break;
 
-	    if (lut)
-	      cupsImageLut(out, img->xsize * bpp, lut);
+		case CUPS_IMAGE_WHITE :
+		    cupsImageRGBToWhite(in, out, img->xsize);
+		    break;
+		case CUPS_IMAGE_BLACK :
+		    cupsImageRGBToBlack(in, out, img->xsize);
+		    break;
+		case CUPS_IMAGE_CMY :
+		    cupsImageRGBToCMY(in, out, img->xsize);
+		    break;
+		case CUPS_IMAGE_CMYK :
+		    cupsImageRGBToCMYK(in, out, img->xsize);
+		    break;
+	      }
 
-            _cupsImagePutRow(img, 0, y, img->xsize, out);
+	      if (lut)
+	        cupsImageLut(out, img->xsize * bpp, lut);
+
+              _cupsImagePutRow(img, 0, y, img->xsize, out);
+	    }
           }
         }
         else
@@ -1201,32 +1222,39 @@ _cupsImageReadTIFF(
             if ((saturation != 100 || hue != 0) && bpp > 1)
               cupsImageRGBAdjust(in, img->ysize, saturation, hue);
 
-	    switch (img->colorspace)
+            if (img->colorspace == CUPS_IMAGE_RGB)
 	    {
-	      default :
-		  break;
+	      if (lut)
+	        cupsImageLut(in, img->ysize * 3, lut);
 
-	      case CUPS_IMAGE_WHITE :
-		  cupsImageRGBToWhite(in, out, img->ysize);
-		  break;
-	      case CUPS_IMAGE_RGB :
-		  cupsImageRGBToRGB(in, out, img->ysize);
-		  break;
-	      case CUPS_IMAGE_BLACK :
-		  cupsImageRGBToBlack(in, out, img->ysize);
-		  break;
-	      case CUPS_IMAGE_CMY :
-		  cupsImageRGBToCMY(in, out, img->ysize);
-		  break;
-	      case CUPS_IMAGE_CMYK :
-		  cupsImageRGBToCMYK(in, out, img->ysize);
-		  break;
+              _cupsImagePutCol(img, x, 0, img->ysize, in);
+            }
+	    else
+            {
+	      switch (img->colorspace)
+	      {
+		default :
+		    break;
+
+		case CUPS_IMAGE_WHITE :
+		    cupsImageRGBToWhite(in, out, img->ysize);
+		    break;
+		case CUPS_IMAGE_BLACK :
+		    cupsImageRGBToBlack(in, out, img->ysize);
+		    break;
+		case CUPS_IMAGE_CMY :
+		    cupsImageRGBToCMY(in, out, img->ysize);
+		    break;
+		case CUPS_IMAGE_CMYK :
+		    cupsImageRGBToCMYK(in, out, img->ysize);
+		    break;
+	      }
+
+	      if (lut)
+	        cupsImageLut(out, img->ysize * bpp, lut);
+
+              _cupsImagePutCol(img, x, 0, img->ysize, out);
 	    }
-
-	    if (lut)
-	      cupsImageLut(out, img->ysize * bpp, lut);
-
-            _cupsImagePutCol(img, x, 0, img->ysize, out);
           }
         }
         break;
@@ -1441,32 +1469,39 @@ _cupsImageReadTIFF(
               if ((saturation != 100 || hue != 0) && bpp > 1)
         	cupsImageRGBAdjust(in, img->xsize, saturation, hue);
 
-	      switch (img->colorspace)
+              if (img->colorspace == CUPS_IMAGE_RGB)
 	      {
-		default :
-		    break;
+	        if (lut)
+	          cupsImageLut(in, img->xsize * 3, lut);
 
-		case CUPS_IMAGE_WHITE :
-		    cupsImageRGBToWhite(in, out, img->xsize);
-		    break;
-		case CUPS_IMAGE_RGB :
-		    cupsImageRGBToRGB(in, out, img->xsize);
-		    break;
-		case CUPS_IMAGE_BLACK :
-		    cupsImageRGBToBlack(in, out, img->xsize);
-		    break;
-		case CUPS_IMAGE_CMY :
-		    cupsImageRGBToCMY(in, out, img->xsize);
-		    break;
-		case CUPS_IMAGE_CMYK :
-		    cupsImageRGBToCMYK(in, out, img->xsize);
-		    break;
+        	_cupsImagePutRow(img, 0, y, img->xsize, in);
 	      }
+              else if (img->colorspace == CUPS_IMAGE_WHITE)
+              {
+		switch (img->colorspace)
+		{
+		  default :
+		      break;
 
-	      if (lut)
-	        cupsImageLut(out, img->xsize * 3, lut);
+		  case CUPS_IMAGE_WHITE :
+		      cupsImageRGBToWhite(in, out, img->xsize);
+		      break;
+		  case CUPS_IMAGE_BLACK :
+		      cupsImageRGBToBlack(in, out, img->xsize);
+		      break;
+		  case CUPS_IMAGE_CMY :
+		      cupsImageRGBToCMY(in, out, img->xsize);
+		      break;
+		  case CUPS_IMAGE_CMYK :
+		      cupsImageRGBToCMYK(in, out, img->xsize);
+		      break;
+		}
 
-              _cupsImagePutRow(img, 0, y, img->xsize, out);
+		if (lut)
+	          cupsImageLut(out, img->xsize * 3, lut);
+
+        	_cupsImagePutRow(img, 0, y, img->xsize, out);
+	      }
             }
           }
           else
@@ -1663,32 +1698,39 @@ _cupsImageReadTIFF(
               if ((saturation != 100 || hue != 0) && bpp > 1)
         	cupsImageRGBAdjust(in, img->ysize, saturation, hue);
 
-	      switch (img->colorspace)
+              if (img->colorspace == CUPS_IMAGE_RGB)
 	      {
-		default :
-		    break;
+		if (lut)
+	          cupsImageLut(in, img->ysize * 3, lut);
 
-		case CUPS_IMAGE_WHITE :
-		    cupsImageRGBToWhite(in, out, img->ysize);
-		    break;
-		case CUPS_IMAGE_RGB :
-		    cupsImageRGBToRGB(in, out, img->ysize);
-		    break;
-		case CUPS_IMAGE_BLACK :
-		    cupsImageRGBToBlack(in, out, img->ysize);
-		    break;
-		case CUPS_IMAGE_CMY :
-		    cupsImageRGBToCMY(in, out, img->ysize);
-		    break;
-		case CUPS_IMAGE_CMYK :
-		    cupsImageRGBToCMYK(in, out, img->ysize);
-		    break;
+        	_cupsImagePutCol(img, x, 0, img->ysize, in);
+              }
+              else if (img->colorspace == CUPS_IMAGE_WHITE)
+              {
+		switch (img->colorspace)
+		{
+		  default :
+		      break;
+
+		  case CUPS_IMAGE_WHITE :
+		      cupsImageRGBToWhite(in, out, img->ysize);
+		      break;
+		  case CUPS_IMAGE_BLACK :
+		      cupsImageRGBToBlack(in, out, img->ysize);
+		      break;
+		  case CUPS_IMAGE_CMY :
+		      cupsImageRGBToCMY(in, out, img->ysize);
+		      break;
+		  case CUPS_IMAGE_CMYK :
+		      cupsImageRGBToCMYK(in, out, img->ysize);
+		      break;
+		}
+
+		if (lut)
+	          cupsImageLut(out, img->ysize * bpp, lut);
+
+        	_cupsImagePutCol(img, x, 0, img->ysize, out);
 	      }
-
-	      if (lut)
-	        cupsImageLut(out, img->ysize * bpp, lut);
-
-              _cupsImagePutCol(img, x, 0, img->ysize, out);
             }
           }
 

filter/interpret.c

@@ -296,7 +296,7 @@ cupsRasterInterpretPPD(
 	break;
 
     case CUPS_CSPACE_KCMYcm :
-	if (h->cupsBitsPerColor == 1)
+	if (h->cupsBitsPerPixel == 1)
 	{
 	  if (h->cupsColorOrder == CUPS_ORDER_CHUNKED)
 	    h->cupsBitsPerPixel = 8;

filter/pstops.c

@@ -184,11 +184,7 @@ static size_t		copy_trailer(cups_file_t *fp, pstops_doc_t *doc,
 				     size_t linelen, size_t linesize);
 static void		do_prolog(pstops_doc_t *doc, ppd_file_t *ppd);
 static void 		do_setup(pstops_doc_t *doc, ppd_file_t *ppd);
-static void		doc_printf(pstops_doc_t *doc, const char *format, ...)
-#ifdef __GNUC__
-__attribute__ ((__format__ (__printf__, 2, 3)))
-#endif /* __GNUC__ */
-;
+static void		doc_printf(pstops_doc_t *doc, const char *format, ...);
 static void		doc_puts(pstops_doc_t *doc, const char *s);
 static void		doc_write(pstops_doc_t *doc, const char *s, size_t len);
 static void		end_nup(pstops_doc_t *doc, int number);
@@ -890,13 +886,6 @@ copy_dsc(cups_file_t  *fp,		/* I - File to read from */
     }
   }
 
- /*
-  * Restore the old showpage operator as needed...
-  */
-
-  if (doc->use_ESPshowpage)
-    puts("userdict/showpage/ESPshowpage load put\n");
-
  /*
   * Write/copy the trailer...
   */
@@ -1072,13 +1061,6 @@ copy_non_dsc(cups_file_t  *fp,		/* I - File to read from */
       }
     }
   }
-
- /*
-  * Restore the old showpage operator as needed...
-  */
-
-  if (doc->use_ESPshowpage)
-    puts("userdict/showpage/ESPshowpage load put\n");
 }
 
 
@@ -1703,14 +1685,6 @@ static void
 do_setup(pstops_doc_t *doc,		/* I - Document information */
          ppd_file_t   *ppd)		/* I - PPD file */
 {
- /*
-  * Disable CTRL-D so that embedded files don't cause printing
-  * errors...
-  */
-
-  puts("% Disable CTRL-D as an end-of-file marker...");
-  puts("userdict dup(\\004)cvn{}put (\\004\\004)cvn{}put");
-
  /*
   * Mark any options from %%IncludeFeature: comments...
   */
@@ -1856,7 +1830,7 @@ end_nup(pstops_doc_t *doc,		/* I - Document information */
         int          number)		/* I - Page number */
 {
   if (doc->mirror || Orientation || doc->number_up > 1)
-    puts("userdict/ESPsave get restore");
+    puts("userdict /ESPsave get restore");
 
   switch (doc->number_up)
   {
@@ -2737,12 +2711,13 @@ start_nup(pstops_doc_t *doc,		/* I - Document information */
           ty = 0.5 * (pagew - 3 * l);
 
           if (doc->normal_landscape)
-            doc_printf(doc, "0 %.1f translate -90 rotate\n", pagel);
+            doc_printf(doc, "0.0 %.1f translate -90 rotate\n", pagel);
 	  else
-	    doc_printf(doc, "%.1f 0 translate 90 rotate\n", pagew);
+	    doc_printf(doc, "%.1f 0.0 translate 90 rotate\n", pagew);
 
           doc_printf(doc, "%.1f %.1f translate %.3f %.3f scale\n",
-                     tx + x * w, ty + y * l, l / bboxl, w / bboxw);
+                     tx + x * y * pagel * 0.5, ty + pagew * 0.333,
+		     w / bboxw, l / bboxl);
         }
 	else
 	{
@@ -2778,17 +2753,17 @@ start_nup(pstops_doc_t *doc,		/* I - Document information */
             l = w * bboxl / bboxw;
           }
 
-	  tx = 0.5 * (pagel - 3 * w);
-	  ty = 0.5 * (pagew - 2 * l);
+          tx = 0.5 * (pagel - 3 * w);
+          ty = 0.5 * (pagew - 2 * l);
 
           if (doc->normal_landscape)
-	    doc_printf(doc, "%.1f 0 translate 90 rotate\n", pagew);
+	    doc_printf(doc, "%.1f 0.0 translate 90 rotate\n", pagew);
 	  else
-            doc_printf(doc, "0 %.1f translate -90 rotate\n", pagel);
+            doc_printf(doc, "0.0 %.1f translate -90 rotate\n", pagel);
 
           doc_printf(doc, "%.1f %.1f translate %.3f %.3f scale\n",
-                     tx + w * x, ty + l * y, w / bboxw, l / bboxl);
-
+                     tx + x * pagel * 0.333, ty + y * pagew * 0.5,
+		     w / bboxw, l / bboxl);
         }
         break;
 

filter/raster.c

@@ -70,24 +70,6 @@
 #endif /* WIN32 || __EMX__ */
 
 
-/*
- * Private structures...
- */
-
-struct _cups_raster_s			/**** Raster stream data ****/
-{
-  unsigned		sync;		/* Sync word from start of stream */
-  int			fd;		/* File descriptor */
-  cups_mode_t		mode;		/* Read/write mode */
-  cups_page_header2_t	header;		/* Raster header for current page */
-  int			count,		/* Current row run-length count */
-			remaining,	/* Remaining rows in page image */
-			bpp;		/* Bytes per pixel/color */
-  unsigned char		*pixels,	/* Pixels for current row */
-			*pend,		/* End of pixel buffer */
-			*pcurrent;	/* Current byte in pixel buffer */
-};
-
 /*
  * Local functions...
  */
@@ -353,9 +335,7 @@ cupsRasterReadPixels(cups_raster_t *r,	/* I - Raster stream */
 	}
       }
 
-      if ((r->header.cupsBitsPerColor == 16 ||
-           r->header.cupsBitsPerPixel == 12 ||
-           r->header.cupsBitsPerPixel == 16) &&
+      if (r->header.cupsBitsPerColor == 16 &&
           (r->sync == CUPS_RASTER_REVSYNC || r->sync == CUPS_RASTER_REVSYNCv1))
       {
        /*
@@ -498,16 +478,12 @@ cupsRasterWritePixels(cups_raster_t *r,	/* I - Raster stream */
   unsigned	remaining;		/* Bytes remaining */
 
 
-#ifdef DEBUG
-  fprintf(stderr, "cupsRasterWritePixels(r=%p, p=%p, len=%u), remaining=%u\n",
-          r, p, len, r->remaining);
-#endif /* DEBUG */
-
   if (r == NULL || r->mode != CUPS_RASTER_WRITE || r->remaining == 0)
     return (0);
 
-  for (remaining = len; remaining > 0; remaining -= bytes, p += bytes)
+  remaining = len;
 
+  while (remaining > 0)
   {
    /*
     * Figure out the number of remaining bytes on the current line...
@@ -551,19 +527,14 @@ cupsRasterWritePixels(cups_raster_t *r,	/* I - Raster stream */
 	  */
 
 	  r->remaining --;
-
 	  if (r->remaining == 0)
 	    return (cups_raster_write(r));
 	  else if (r->count == 256)
 	  {
-	    if (cups_raster_write(r) == 0)
-	      return (0);
-
+	    cups_raster_write(r);
 	    r->count = 0;
 	  }
 	}
-
-	continue;
       }
     }
 
@@ -591,11 +562,13 @@ cupsRasterWritePixels(cups_raster_t *r,	/* I - Raster stream */
 	*/
 
 	r->remaining --;
-
 	if (r->remaining == 0)
 	  return (cups_raster_write(r));
       }
     }
+
+    remaining -= bytes;
+    p         += bytes;
   }
 
   return (len);
@@ -667,8 +640,7 @@ cups_raster_read_header(
 static void
 cups_raster_update(cups_raster_t *r)	/* I - Raster stream */
 {
-  if (r->sync == CUPS_RASTER_SYNCv1 || r->sync == CUPS_RASTER_REVSYNCv1 ||
-      r->header.cupsNumColors == 0)
+  if (r->sync == CUPS_RASTER_SYNCv1 || r->sync == CUPS_RASTER_REVSYNCv1)
   {
    /*
     * Set the "cupsNumColors" field according to the colorspace...
@@ -681,18 +653,41 @@ cups_raster_update(cups_raster_t *r)	/* I - Raster stream */
       case CUPS_CSPACE_WHITE :
       case CUPS_CSPACE_GOLD :
       case CUPS_CSPACE_SILVER :
+      case CUPS_CSPACE_ICC1 :
           r->header.cupsNumColors = 1;
 	  break;
 
+      case CUPS_CSPACE_ICC2 :
+          r->header.cupsNumColors = 2;
+	  break;
+
       case CUPS_CSPACE_RGB :
       case CUPS_CSPACE_CMY :
       case CUPS_CSPACE_YMC :
       case CUPS_CSPACE_CIEXYZ :
       case CUPS_CSPACE_CIELab :
-      case CUPS_CSPACE_ICC1 :
-      case CUPS_CSPACE_ICC2 :
       case CUPS_CSPACE_ICC3 :
+          r->header.cupsNumColors = 3;
+	  break;
+
+      case CUPS_CSPACE_RGBA :
+      case CUPS_CSPACE_RGBW :
+      case CUPS_CSPACE_CMYK :
+      case CUPS_CSPACE_YMCK :
+      case CUPS_CSPACE_KCMY :
+      case CUPS_CSPACE_GMCK :
+      case CUPS_CSPACE_GMCS :
       case CUPS_CSPACE_ICC4 :
+          r->header.cupsNumColors = 4;
+	  break;
+
+      case CUPS_CSPACE_KCMYcm :
+          if (r->header.cupsBitsPerPixel < 8)
+            r->header.cupsNumColors = 6;
+	  else
+            r->header.cupsNumColors = 4;
+	  break;
+
       case CUPS_CSPACE_ICC5 :
       case CUPS_CSPACE_ICC6 :
       case CUPS_CSPACE_ICC7 :
@@ -704,24 +699,8 @@ cups_raster_update(cups_raster_t *r)	/* I - Raster stream */
       case CUPS_CSPACE_ICCD :
       case CUPS_CSPACE_ICCE :
       case CUPS_CSPACE_ICCF :
-          r->header.cupsNumColors = 3;
-	  break;
-
-      case CUPS_CSPACE_RGBA :
-      case CUPS_CSPACE_RGBW :
-      case CUPS_CSPACE_CMYK :
-      case CUPS_CSPACE_YMCK :
-      case CUPS_CSPACE_KCMY :
-      case CUPS_CSPACE_GMCK :
-      case CUPS_CSPACE_GMCS :
-          r->header.cupsNumColors = 4;
-	  break;
-
-      case CUPS_CSPACE_KCMYcm :
-          if (r->header.cupsBitsPerPixel < 8)
-            r->header.cupsNumColors = 6;
-	  else
-            r->header.cupsNumColors = 4;
+          r->header.cupsNumColors = r->header.cupsColorSpace -
+	                            CUPS_CSPACE_ICC1 + 1;
 	  break;
     }
   }
@@ -771,10 +750,6 @@ cups_raster_write(cups_raster_t *r)	/* I - Raster stream */
   int		count;			/* Count */
 
 
-#ifdef DEBUG
-  fprintf(stderr, "cups_raster_write(r=%p)\n", r);
-#endif /* DEBUG */
-
  /*
   * Write the row repeat count...
   */
@@ -782,14 +757,7 @@ cups_raster_write(cups_raster_t *r)	/* I - Raster stream */
   byte = r->count - 1;
 
   if (cups_write(r->fd, &byte, 1) < 1)
-  {
-#ifdef DEBUG
-    fputs("cups_raster_write: Unable to write row repeat count...\n",
-          stderr);
-#endif /* DEBUG */
-
     return (0);
-  }
 
  /*
   * Write using a modified TIFF "packbits" compression...
@@ -808,22 +776,10 @@ cups_raster_write(cups_raster_t *r)	/* I - Raster stream */
 
       byte = 0;
       if (cups_write(r->fd, &byte, 1) < 1)
-      {
-#ifdef DEBUG
-        fputs("cups_raster_write: Unable to write last pixel count...\n", stderr);
-#endif /* DEBUG */
-
         return (0);
-      }
 
       if (cups_write(r->fd, start, r->bpp) < r->bpp)
-      {
-#ifdef DEBUG
-        fputs("cups_raster_write: Unable to write last pixel data...\n", stderr);
-#endif /* DEBUG */
-
         return (0);
-      }
     }
     else if (!memcmp(start, ptr, r->bpp))
     {
@@ -840,22 +796,10 @@ cups_raster_write(cups_raster_t *r)	/* I - Raster stream */
       byte = count - 1;
 
       if (cups_write(r->fd, &byte, 1) < 1)
-      {
-#ifdef DEBUG
-        fputs("cups_raster_write: Unable to write repeated pixel count...\n", stderr);
-#endif /* DEBUG */
-
         return (0);
-      }
 
       if (cups_write(r->fd, start, r->bpp) < r->bpp)
-      {
-#ifdef DEBUG
-        fputs("cups_raster_write: Unable to write repeated pixel data...\n", stderr);
-#endif /* DEBUG */
-
         return (0);
-      }
     }
     else
     {
@@ -876,24 +820,12 @@ cups_raster_write(cups_raster_t *r)	/* I - Raster stream */
       byte = 257 - count;
 
       if (cups_write(r->fd, &byte, 1) < 1)
-      {
-#ifdef DEBUG
-        fputs("cups_raster_write: Unable to write non-repeating pixel count...\n", stderr);
-#endif /* DEBUG */
-
         return (0);
-      }
 
       count *= r->bpp;
 
       if (cups_write(r->fd, start, count) < count)
-      {
-#ifdef DEBUG
-        fputs("cups_raster_write: Unable to write non-repeating pixel data...\n", stderr);
-#endif /* DEBUG */
-
         return (0);
-      }
     }
   }
 

filter/raster.h

@@ -303,8 +303,19 @@ typedef struct cups_page_header2_s	/**** Version 2 Page Header @since CUPS 1.2@
   char		cupsPageSizeName[64];	/* PageSize name @since CUPS 1.2@ */
 } cups_page_header2_t;
 
-typedef struct _cups_raster_s cups_raster_t;
-					/**** Raster stream data ****/
+typedef struct _cups_raster_s		/**** Raster stream data ****/
+{
+  unsigned		sync;		/* Sync word from start of stream */
+  int			fd;		/* File descriptor */
+  cups_mode_t		mode;		/* Read/write mode */
+  cups_page_header2_t	header;		/* Raster header for current page */
+  int			count,		/* Current row run-length count */
+			remaining,	/* Remaining rows in page image */
+			bpp;		/* Bytes per pixel/color */
+  unsigned char		*pixels,	/* Pixels for current row */
+			*pend,		/* End of pixel buffer */
+			*pcurrent;	/* Current byte in pixel buffer */
+} cups_raster_t;
 
 typedef int (*cups_interpret_cb_t)(cups_page_header2_t *header, int preferred_bits);
 

locale/cups.pot

@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.2\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2006-05-21 10:08-0400\n"
+"POT-Creation-Date: 2006-04-14 14:35-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2599,15 +2599,6 @@ msgid ""
 "    Note: this program only validates the DSC comments, not the PostScript itself.\n"
 msgstr ""
 
-#, c-format
-msgid "Password for %s on %s? "
-msgstr ""
-
-msgid ""
-"      **FAIL**  1284DeviceId must be 1284DeviceID!\n"
-"                REF: Page 72, section 5.5\n"
-msgstr ""
-
 
 #
 # End of "$Id$".

locale/cups_es.po

@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.2\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2006-05-21 10:08-0400\n"
+"POT-Creation-Date: 2006-04-14 14:35-0400\n"
 "PO-Revision-Date: 2006-03-25 21:48+0100\n"
 "Last-Translator: Juan Pablo González Riopedre <riopedre@tiscali.es>\n"
 "Language-Team: Spanish\n"
@@ -2990,15 +2990,3 @@ msgstr ""
 "\n"
 "    Nota: este programa sólo valida los comentarios DSC, no el PostScript en "
 "sí mismo.\n"
-
-#, c-format
-msgid "Password for %s on %s? "
-msgstr ""
-
-#, fuzzy
-msgid ""
-"      **FAIL**  1284DeviceId must be 1284DeviceID!\n"
-"                REF: Page 72, section 5.5\n"
-msgstr ""
-"      **FALLO**  Preferencia %s incorrecta %s.\n"
-"                REF: Página 122, sección 5.17\n"

locale/cups_ja.po

@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.2\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2006-05-21 10:08-0400\n"
+"POT-Creation-Date: 2006-04-14 14:35-0400\n"
 "PO-Revision-Date: 2006-03-29 23:44+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Japanese <LL@li.org>\n"
@@ -2926,15 +2926,3 @@ msgstr ""
 "\n"
 "    注意: このプログラムは DSC コメントを検証するだけで、PostScript 自身を検"
 "証するものではありません。\n"
-
-#, c-format
-msgid "Password for %s on %s? "
-msgstr ""
-
-#, fuzzy
-msgid ""
-"      **FAIL**  1284DeviceId must be 1284DeviceID!\n"
-"                REF: Page 72, section 5.5\n"
-msgstr ""
-"      **FAIL**  不正な %s が %s を選んでいます!\n"
-"                REF: 122 ページ、セクション 5.17\n"

locale/cups_sv.po

@@ -28,12 +28,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.2\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2006-05-21 10:08-0400\n"
+"POT-Creation-Date: 2006-03-23 21:52-0500\n"
 "PO-Revision-Date: 2006-04-16 00:55+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "Options Installed"
@@ -78,12 +78,8 @@ msgstr "Nej"
 msgid "Auto"
 msgstr "Auto"
 
-msgid ""
-"Enter your username and password or the root username and password to access "
-"this page."
-msgstr ""
-"Ange ditt användarnamn och lösenord eller root-användnamnet och lösenord för "
-"att komma åt denna sida."
+msgid "Enter your username and password or the root username and password to access this page."
+msgstr "Ange ditt användarnamn och lösenord eller root-användnamnet och lösenord för att komma åt denna sida."
 
 msgid "You must use a https: URL to access this page."
 msgstr "Du måste använda en https:-url för att komma åt denna sida."
@@ -109,10 +105,8 @@ msgstr "%s stöds inte!"
 msgid "The printer or class was not found."
 msgstr "Skrivaren eller klassen hittades inte."
 
-msgid ""
-"The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"."
-msgstr ""
-"Printer-uri måste vara i formatet \"ipp://VÄRDNAMN/classes/KLASSNAMN\"."
+msgid "The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"."
+msgstr "Printer-uri måste vara i formatet \"ipp://VÄRDNAMN/classes/KLASSNAMN\"."
 
 #, c-format
 msgid "The printer-uri \"%s\" contains invalid characters."
@@ -149,27 +143,19 @@ msgstr "Språket \"%s\" stöds inte!"
 msgid "The notify-user-data value is too large (%d > 63 octets)!"
 msgstr "Värdet för notify-user-data är för stort (%d > 63 okteter)!"
 
-msgid ""
-"The notify-lease-duration attribute cannot be used with job subscriptions."
-msgstr ""
-"Attributet notify-lease-duration kan inte användas med jobbprenumerationer."
+msgid "The notify-lease-duration attribute cannot be used with job subscriptions."
+msgstr "Attributet notify-lease-duration kan inte användas med jobbprenumerationer."
 
-msgid ""
-"The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"."
-msgstr ""
-"Printer-uri måste vara i formatet \"ipp://VÄRDNAMN/printers/SKRIVARNAMN\"."
+msgid "The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"."
+msgstr "Printer-uri måste vara i formatet \"ipp://VÄRDNAMN/printers/SKRIVARNAMN\"."
 
 #, c-format
 msgid "A class named \"%s\" already exists!"
 msgstr "En klass med namnet \"%s\" finns redan!"
 
 #, c-format
-msgid ""
-"File device URIs have been disabled! To enable, see the FileDevice directive "
-"in \"%s/cupsd.conf\"."
-msgstr ""
-"Felenhets URI:er har blivit inaktiverat! För att aktivera, se direktivet "
-"FileDevice i \"%s/cupsd.conf\"."
+msgid "File device URIs have been disabled! To enable, see the FileDevice directive in \"%s/cupsd.conf\"."
+msgstr "Felenhets URI:er har blivit inaktiverat! För att aktivera, se direktivet FileDevice i \"%s/cupsd.conf\"."
 
 #, c-format
 msgid "Bad device-uri \"%s\"!"
@@ -462,8 +448,7 @@ msgid "lpq: Unknown destination \"%s\"!\n"
 msgstr "lpq: Okänt mål \"%s\"!\n"
 
 #, c-format
-msgid ""
-"lp: error - %s environment variable names non-existent destination \"%s\"!\n"
+msgid "lp: error - %s environment variable names non-existent destination \"%s\"!\n"
 msgstr "lp: fel - miljövariabeln %s namnger icke-existerande mål \"%s\"!\n"
 
 msgid "lpq: error - no default destination available.\n"
@@ -473,14 +458,11 @@ msgstr "lpq: fel - inget standardmål tillgängligt.\n"
 msgid "lpq: get-jobs failed: %s\n"
 msgstr "lpq: get-jobs misslyckades: %s\n"
 
-msgid ""
-"Rank   Owner      Pri  Job        Files                       Total Size\n"
-msgstr ""
-"Rank   Ägare      Pri  Jobb       Filer                       Total storlek\n"
+msgid "Rank   Owner      Pri  Job        Files                       Total Size\n"
+msgstr "Rank   Ägare      Pri  Jobb       Filer                       Total storlek\n"
 
 msgid "Rank    Owner   Job     File(s)                         Total Size\n"
-msgstr ""
-"Rank    Ägare   Jobb    Fil(er)                         Total storlek\n"
+msgstr "Rank    Ägare   Jobb    Fil(er)                         Total storlek\n"
 
 #, c-format
 msgid "%s: %-33.33s [job %d localhost]\n"
@@ -525,12 +507,8 @@ msgid "lpr: error - expected value after -%c option!\n"
 msgstr "lpr: fel - förväntade värde efter flaggan -%c!\n"
 
 #, c-format
-msgid ""
-"lpr: warning - '%c' format modifier not supported - output may not be "
-"correct!\n"
-msgstr ""
-"lpr: varning - \"%c\"-formatmodifierare stöds inte - utmatning kanske inte "
-"blir korrekt!\n"
+msgid "lpr: warning - '%c' format modifier not supported - output may not be correct!\n"
+msgstr "lpr: varning - \"%c\"-formatmodifierare stöds inte - utmatning kanske inte blir korrekt!\n"
 
 msgid "lpr: error - expected option=value after -o option!\n"
 msgstr "lpr: fel - förväntade alternativ=värde efter flaggan -o!\n"
@@ -564,8 +542,7 @@ msgid "lpr: error - too many files - \"%s\"\n"
 msgstr "lpr: fel - för många filer - \"%s\"\n"
 
 #, c-format
-msgid ""
-"lpr: error - %s environment variable names non-existent destination \"%s\"!\n"
+msgid "lpr: error - %s environment variable names non-existent destination \"%s\"!\n"
 msgstr "lpr: fel - miljövariabeln %s namnger icke-existerande mål \"%s\"!\n"
 
 msgid "lpr: error - no default destination available.\n"
@@ -691,9 +668,7 @@ msgstr "cupsaddsmb: Kunde inte konvertera PPD-fil för %s - %s\n"
 
 #, c-format
 msgid "cupsaddsmb: Unable to copy Windows 2000 printer driver files (%d)!\n"
-msgstr ""
-"cupsaddsmb: Kunde inte kopiera filer för Windows 2000-skrivardrivrutin (%"
-"d)!\n"
+msgstr "cupsaddsmb: Kunde inte kopiera filer för Windows 2000-skrivardrivrutin (%d)!\n"
 
 #, c-format
 msgid "cupsaddsmb: Unable to copy CUPS printer driver files (%d)!\n"
@@ -701,20 +676,15 @@ msgstr "cupsaddsmb: Kunde inte kopiera filer för CUPS-skrivardrivrutin (%d)!\n"
 
 #, c-format
 msgid "cupsaddsmb: Unable to install Windows 2000 printer driver files (%d)!\n"
-msgstr ""
-"cupsaddsmb: Kunde inte installera filer för Windows 2000-skrivardrivrutin (%"
-"d)!\n"
+msgstr "cupsaddsmb: Kunde inte installera filer för Windows 2000-skrivardrivrutin (%d)!\n"
 
 #, c-format
 msgid "cupsaddsmb: Unable to copy Windows 9x printer driver files (%d)!\n"
-msgstr ""
-"cupsaddsmb: Kunde inte kopiera filer för Windows 9x-skrivardrivrutin (%d)!\n"
+msgstr "cupsaddsmb: Kunde inte kopiera filer för Windows 9x-skrivardrivrutin (%d)!\n"
 
 #, c-format
 msgid "cupsaddsmb: Unable to install Windows 9x printer driver files (%d)!\n"
-msgstr ""
-"cupsaddsmb: Kunde inte installera filer för Windows 9x-skrivardrivrutin (%"
-"d)!\n"
+msgstr "cupsaddsmb: Kunde inte installera filer för Windows 9x-skrivardrivrutin (%d)!\n"
 
 #, c-format
 msgid "cupsaddsmb: Unable to set Windows printer driver (%d)!\n"
@@ -1097,12 +1067,10 @@ msgstr " OK\n"
 
 #, c-format
 msgid ""
-"        WARN    Duplex option keyword %s should be named Duplex or "
-"JCLDuplex!\n"
+"        WARN    Duplex option keyword %s should be named Duplex or JCLDuplex!\n"
 "                REF: Page 122, section 5.17\n"
 msgstr ""
-"        VARN    Nyckelord för Duplex-alternativet %s bör vara Duplex eller "
-"JCLDuplex!\n"
+"        VARN    Nyckelord för Duplex-alternativet %s bör vara Duplex eller JCLDuplex!\n"
 "                REF: Sida 122, sektion 5.17\n"
 
 msgid "        WARN    Default choices conflicting!\n"
@@ -1155,8 +1123,7 @@ msgid ""
 "        WARN    Protocols contains PJL but JCL attributes are not set.\n"
 "                REF: Pages 78-79, section 5.7.\n"
 msgstr ""
-"        VARN    Protokollen innehåller PJL men JCL-attributen är inte "
-"inställda.\n"
+"        VARN    Protokollen innehåller PJL men JCL-attributen är inte inställda.\n"
 "                REF: Sidorna 78-79, sektion 5.7.\n"
 
 #, c-format
@@ -1183,12 +1150,10 @@ msgstr ""
 "                (begränsare=\"%s %s %s %s\")\n"
 
 msgid ""
-"Usage: cupstestppd [-q] [-r] [-v[v]] filename1.ppd[.gz] [... filenameN.ppd[."
-"gz]]\n"
+"Usage: cupstestppd [-q] [-r] [-v[v]] filename1.ppd[.gz] [... filenameN.ppd[.gz]]\n"
 "       program | cupstestppd [-q] [-r] [-v[v]] -\n"
 msgstr ""
-"Användning: cupstestppd [-q] [-r] [-v[v]] filnamn1.ppd[.gz] [... filnamnN.ppd"
-"[.gz]]\n"
+"Användning: cupstestppd [-q] [-r] [-v[v]] filnamn1.ppd[.gz] [... filnamnN.ppd[.gz]]\n"
 "            program | cupstestppd [-q] [-r] [-v[v]] -\n"
 
 msgid "lpstat: Need \"completed\" or \"not-completed\" after -W!\n"
@@ -1261,9 +1226,7 @@ msgid "system default destination: %s\n"
 msgstr "systemstandardmål: %s\n"
 
 #, c-format
-msgid ""
-"lpstat: error - %s environment variable names non-existent destination \"%s"
-"\"!\n"
+msgid "lpstat: error - %s environment variable names non-existent destination \"%s\"!\n"
 msgstr "lpstat: fel - miljövariabeln %s namnger icke-existerande mål \"%s\"!\n"
 
 msgid "no system default destination\n"
@@ -1557,12 +1520,10 @@ msgstr ""
 "\n"
 "    lpadmin [-h server] -d mål\n"
 "    lpadmin [-h server] -x mål\n"
-"    lpadmin [-h server] -p skrivare [-c lägg-till-klass] [-i gränssnitt] [-m "
-"modell]\n"
+"    lpadmin [-h server] -p skrivare [-c lägg-till-klass] [-i gränssnitt] [-m modell]\n"
 "                       [-r ta-bort-klass] [-v enhet] [-D beskrivning]\n"
 "                       [-P ppd-fil] [-o namn=värde]\n"
-"                       [-u allow:användare,användare] [-u deny:användare,"
-"användare]\n"
+"                       [-u allow:användare,användare] [-u deny:användare,användare]\n"
 "\n"
 
 #, c-format
@@ -1662,11 +1623,8 @@ msgstr "lp: Varning - flagga för innehållstyp ignorerades!\n"
 msgid "lp: Unknown option '%c'!\n"
 msgstr "lp: Okänd flagga \"%c\"!\n"
 
-msgid ""
-"lp: Error - cannot print from stdin if files or a job ID are provided!\n"
-msgstr ""
-"lp: Fel - kan inte skriva ut från standard in om filer eller ett jobb-id "
-"anges!\n"
+msgid "lp: Error - cannot print from stdin if files or a job ID are provided!\n"
+msgstr "lp: Fel - kan inte skriva ut från standard in om filer eller ett jobb-id anges!\n"
 
 #, c-format
 msgid "lp: Unable to access \"%s\" - %s\n"
@@ -1850,8 +1808,7 @@ msgstr "lppasswd: Lösenordsfil inte uppdaterad!\n"
 
 #, c-format
 msgid "lppasswd: failed to backup old password file: %s\n"
-msgstr ""
-"lppasswd: misslyckades med att säkerhetskopiera gamla lösenordsfilen: %s\n"
+msgstr "lppasswd: misslyckades med att säkerhetskopiera gamla lösenordsfilen: %s\n"
 
 #, c-format
 msgid "lppasswd: failed to rename password file: %s\n"
@@ -1902,12 +1859,8 @@ msgstr "Ändra klass"
 msgid "Add Class"
 msgstr "Lägg till klass"
 
-msgid ""
-"The class name may only contain up to 127 printable characters and may not "
-"contain spaces, slashes (/), or the pound sign (#)."
-msgstr ""
-"Klassnamnet får endast innehålla upp till 127 skrivbara tecken och får inte "
-"innehålla blanksteg, snedstreck (/) eller fyrkantstecknet (#)."
+msgid "The class name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#)."
+msgstr "Klassnamnet får endast innehålla upp till 127 skrivbara tecken och får inte innehålla blanksteg, snedstreck (/) eller fyrkantstecknet (#)."
 
 msgid "Unable to modify class:"
 msgstr "Kunde inte ändra klass:"
@@ -1921,12 +1874,8 @@ msgstr "Ändra skrivare"
 msgid "Add Printer"
 msgstr "Lägg till skrivare"
 
-msgid ""
-"The printer name may only contain up to 127 printable characters and may not "
-"contain spaces, slashes (/), or the pound sign (#)."
-msgstr ""
-"Skrivarnamnet får endast innehålla upp till 127 skrivbara tecken och får "
-"inte innehålla blanksteg, snedstreck (/) eller fyrkantstecknet (#)."
+msgid "The printer name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#)."
+msgstr "Skrivarnamnet får endast innehålla upp till 127 skrivbara tecken och får inte innehålla blanksteg, snedstreck (/) eller fyrkantstecknet (#)."
 
 msgid "Unable to get list of printer drivers:"
 msgstr "Kunde inte få tag på listan av skrivardrivrutiner:"
@@ -2213,8 +2162,7 @@ msgid "cupsaddsmb: No Windows printer drivers are installed!\n"
 msgstr "cupsaddsmb: Inga Windows-skrivardrivrutiner är installerade!\n"
 
 msgid "cupsaddsmb: Warning, no Windows 2000 printer drivers are installed!\n"
-msgstr ""
-"cupsaddsmb: Varning, inga Windows 2000-skrivardrivrutiner är installerade!\n"
+msgstr "cupsaddsmb: Varning, inga Windows 2000-skrivardrivrutiner är installerade!\n"
 
 #, c-format
 msgid "lpadmin: Printer %s is already a member of class %s.\n"
@@ -2257,8 +2205,7 @@ msgid "Usage: lpmove job/src dest\n"
 msgstr "Användning: lpmove jobb/källa mål\n"
 
 msgid "lpstat: Need \"completed\", \"not-completed\", or \"all\" after -W!\n"
-msgstr ""
-"lpstat: Behöver \"completed\", \"not-completed\" eller \"all\" efter -W!\n"
+msgstr "lpstat: Behöver \"completed\", \"not-completed\" eller \"all\" efter -W!\n"
 
 #, c-format
 msgid "%s accepting requests since %s\n"
@@ -2308,19 +2255,15 @@ msgid "%s: Error - expected hostname after '-h' option!\n"
 msgstr "%s: Fel - förväntade värdnamn efter flaggan \"-h\"!\n"
 
 #, c-format
-msgid ""
-"%s: error - %s environment variable names non-existent destination \"%s\"!\n"
+msgid "%s: error - %s environment variable names non-existent destination \"%s\"!\n"
 msgstr "%s: fel - miljövariabeln %s namnger icke-existerande mål \"%s\"!\n"
 
 #, c-format
 msgid "%s: error - no default destination available.\n"
 msgstr "%s: fel - inget standardmål tillgängligt.\n"
 
-msgid ""
-"Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]\n"
-msgstr ""
-"Användning: lpq [-P mål] [-U användarnamn] [-h värdnamn[:port]] [-l] "
-"[+intervall]\n"
+msgid "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]\n"
+msgstr "Användning: lpq [-P mål] [-U användarnamn] [-h värdnamn[:port]] [-l] [+intervall]\n"
 
 #, c-format
 msgid "%s: Error - expected hostname after '-H' option!\n"
@@ -2331,12 +2274,8 @@ msgid "%s: Error - expected value after '-%c' option!\n"
 msgstr "%s: Fel - förväntade värde efter flaggan \"-%c\"!\n"
 
 #, c-format
-msgid ""
-"%s: Warning - '%c' format modifier not supported - output may not be "
-"correct!\n"
-msgstr ""
-"%s: Varning - \"'%c\"- formatmodifieraren stöds inte - utmatning kanske inte "
-"blir korrekt!\n"
+msgid "%s: Warning - '%c' format modifier not supported - output may not be correct!\n"
+msgstr "%s: Varning - \"'%c\"- formatmodifieraren stöds inte - utmatning kanske inte blir korrekt!\n"
 
 #, c-format
 msgid "%s: error - expected option=value after '-o' option!\n"
@@ -2367,8 +2306,7 @@ msgid "%s: Error - too many files - \"%s\"\n"
 msgstr "%s: Fel - för många filer - \"%s\"\n"
 
 #, c-format
-msgid ""
-"%s: Error - %s environment variable names non-existent destination \"%s\"!\n"
+msgid "%s: Error - %s environment variable names non-existent destination \"%s\"!\n"
 msgstr "%s: Fel - miljövariabeln %s namnger icke-existerande mål \"%s\"!\n"
 
 #, c-format
@@ -2488,19 +2426,12 @@ msgid "%s: Warning - content type option ignored!\n"
 msgstr "%s: Varning - flagga för innehållstyp ignorerades!\n"
 
 #, c-format
-msgid ""
-"%s: Error - cannot print from stdin if files or a job ID are provided!\n"
-msgstr ""
-"%s: Fel - kan inte skriva ut från standard in om filer eller ett jobb-id "
-"anges!\n"
+msgid "%s: Error - cannot print from stdin if files or a job ID are provided!\n"
+msgstr "%s: Fel - kan inte skriva ut från standard in om filer eller ett jobb-id anges!\n"
 
 #, c-format
-msgid ""
-"%s: Error - need \"completed\", \"not-completed\", or \"all\" after '-W' "
-"option!\n"
-msgstr ""
-"%s: Fel - behöver \"completed\", \"not-completed\" eller \"all\" efter "
-"flaggan \"-W\"!\n"
+msgid "%s: Error - need \"completed\", \"not-completed\", or \"all\" after '-W' option!\n"
+msgstr "%s: Fel - behöver \"completed\", \"not-completed\" eller \"all\" efter flaggan \"-W\"!\n"
 
 #, c-format
 msgid "%s: Error - expected destination after '-b' option!\n"
@@ -2591,17 +2522,11 @@ msgstr ""
 msgid "        WARN    Line %d only contains whitespace!\n"
 msgstr "        VARN    Rad %d innehåller endast blanktecken!\n"
 
-msgid ""
-"        WARN    File contains a mix of CR, LF, and CR LF line endings!\n"
-msgstr ""
-"        VARN    Filen innehåller en blandning av CR, LF och CR LF-radslut!\n"
+msgid "        WARN    File contains a mix of CR, LF, and CR LF line endings!\n"
+msgstr "        VARN    Filen innehåller en blandning av CR, LF och CR LF-radslut!\n"
 
-msgid ""
-"        WARN    Non-Windows PPD files should use lines ending with only LF, "
-"not CR LF!\n"
-msgstr ""
-"        VARN    Icke-Windows PPD-filer bör använda radslut med endast LF, "
-"inte CR LF!\n"
+msgid "        WARN    Non-Windows PPD files should use lines ending with only LF, not CR LF!\n"
+msgstr "        VARN    Icke-Windows PPD-filer bör använda radslut med endast LF, inte CR LF!\n"
 
 msgid "Printer Maintenance"
 msgstr "Skrivarunderhåll"
@@ -2626,26 +2551,16 @@ msgid "      **FAIL**  Missing \"%s\" translation string for option %s!\n"
 msgstr "      **FEL**   Saknar översättningssträng \"%s\" för flaggan %s!\n"
 
 #, c-format
-msgid ""
-"      **FAIL**  Default translation string for option %s contains 8-bit "
-"characters!\n"
-msgstr ""
-"      **FEL**   Standardöversättningssträng för flaggan %s innehåller 8-"
-"bitars tecken!\n"
+msgid "      **FAIL**  Default translation string for option %s contains 8-bit characters!\n"
+msgstr "      **FEL**   Standardöversättningssträng för flaggan %s innehåller 8-bitars tecken!\n"
 
 #, c-format
-msgid ""
-"      **FAIL**  Missing \"%s\" translation string for option %s, choice %s!\n"
-msgstr ""
-"      **FEL**   Saknar översättningssträng \"%s\" för flaggan %s, val %s!\n"
+msgid "      **FAIL**  Missing \"%s\" translation string for option %s, choice %s!\n"
+msgstr "      **FEL**   Saknar översättningssträng \"%s\" för flaggan %s, val %s!\n"
 
 #, c-format
-msgid ""
-"      **FAIL**  Default translation string for option %s choice %s contains "
-"8-bit characters!\n"
-msgstr ""
-"      **FEL**   Standardöversättningssträng för flaggan %s val %s innehåller "
-"8-bitars tecken!\n"
+msgid "      **FAIL**  Default translation string for option %s choice %s contains 8-bit characters!\n"
+msgstr "      **FEL**   Standardöversättningssträng för flaggan %s val %s innehåller 8-bitars tecken!\n"
 
 #, c-format
 msgid "      **FAIL**  Bad cupsFilter value \"%s\"!\n"
@@ -2676,8 +2591,7 @@ msgstr "Kunde inte kopiera filer för CUPS-skrivardrivrutiner (%d)!\n"
 
 #, c-format
 msgid "Unable to install Windows 2000 printer driver files (%d)!\n"
-msgstr ""
-"Kunde inte installera filer för Windows 2000-skrivardrivrutiner (%d)!\n"
+msgstr "Kunde inte installera filer för Windows 2000-skrivardrivrutiner (%d)!\n"
 
 #, c-format
 msgid "Unable to copy Windows 9x printer driver files (%d)!\n"
@@ -2771,12 +2685,8 @@ msgid "Job #%d is already completed - can't cancel."
 msgstr "Jobb #%d är redan färdigt - kan inte avbryta."
 
 #, c-format
-msgid ""
-"You must access this page using the URL <A HREF=\"https://%s:%d%s\">https://%"
-"s:%d%s</A>."
-msgstr ""
-"Du måste komma åt sidan med url:en <A HREF=\"https://%s:%d%s\">https://%s:%d%"
-"s</A>."
+msgid "You must access this page using the URL <A HREF=\"https://%s:%d%s\">https://%s:%d%s</A>."
+msgstr "Du måste komma åt sidan med url:en <A HREF=\"https://%s:%d%s\">https://%s:%d%s</A>."
 
 #, c-format
 msgid "Unsupported format '%s'!"
@@ -2890,8 +2800,7 @@ msgid ""
 "\n"
 "    -h       Show program usage\n"
 "\n"
-"    Note: this program only validates the DSC comments, not the PostScript "
-"itself.\n"
+"    Note: this program only validates the DSC comments, not the PostScript itself.\n"
 msgstr ""
 "Användning: cupstestdsc [flaggor] filnamn.ps [... filnamn.ps]\n"
 "       cupstestdsc [flaggor] -\n"
@@ -2900,17 +2809,5 @@ msgstr ""
 "\n"
 "    -h       Visa programanvändning\n"
 "\n"
-"    Notera: detta program validerar endast DSC-kommentarer, inte själva "
-"PostScript.\n"
+"    Notera: detta program validerar endast DSC-kommentarer, inte själva PostScript.\n"
 
-#, c-format
-msgid "Password for %s on %s? "
-msgstr ""
-
-#, fuzzy
-msgid ""
-"      **FAIL**  1284DeviceId must be 1284DeviceID!\n"
-"                REF: Page 72, section 5.5\n"
-msgstr ""
-"      **FEL**   Felaktigt %s val %s!\n"
-"                REF: Sida 122, sektion 5.17\n"

ppd/zebra.ppd

@@ -255,7 +255,7 @@
 *MediaType Saved/PrinterDefault: ""
 *MediaType Thermal/Thermal Transfer Media: "<</MediaType(Thermal)>>setpagedevice"
 *MediaType Direct/Direct Thermal Media: "<</MediaType(Direct)>>setpagedevice"
-*CloseUI: *MediaType
+*CloseUI: *zeMediaType
 
 *OpenGroup: PrinterSettings/Printer Settings
 *OpenUI *Darkness/Media Darkness: PickOne

ppd/zebracpl.ppd

@@ -160,7 +160,7 @@
 *OpenUI *zePrintRate/Print Rate: PickOne
 *OrderDependency: 20 AnySetup *zePrintRate
 *DefaultzePrintRate: Default
-*zePrintRate Default/PrinterDefault: ""
+*zePrintRate Default/PrinterDefault: Default
 *zePrintRate 1/1 inch/sec.: ""
 *zePrintRate 2/2 inches/sec.: ""
 *zePrintRate 3/3 inches/sec.: ""

ppd/zebraep1.ppd

@@ -281,7 +281,7 @@
 *OpenUI *zePrintRate/Print Rate: PickOne
 *OrderDependency: 20 AnySetup *zePrintRate
 *DefaultzePrintRate: Default
-*zePrintRate Default/PrinterDefault: ""
+*zePrintRate Default/PrinterDefault: Default
 *zePrintRate 1/1 inch/sec.: ""
 *zePrintRate 1.5/1.5 inch/sec.: ""
 *zePrintRate 2/2 inches/sec.: ""

ppd/zebraep2.ppd

@@ -247,7 +247,7 @@
 *MediaType Saved/PrinterDefault: ""
 *MediaType Thermal/Thermal Transfer Media: "<</MediaType(Thermal)>>setpagedevice"
 *MediaType Direct/Direct Thermal Media: "<</MediaType(Direct)>>setpagedevice"
-*CloseUI: *MediaType
+*CloseUI: *zeMediaType
 
 *OpenGroup: PrinterSettings/Printer Settings
 *OpenUI *Darkness/Media Darkness: PickOne
@@ -289,7 +289,7 @@
 *OpenUI *zePrintRate/Print Rate: PickOne
 *OrderDependency: 20 AnySetup *zePrintRate
 *DefaultzePrintRate: Default
-*zePrintRate Default/PrinterDefault: ""
+*zePrintRate Default/PrinterDefault: Default
 *zePrintRate 1/1 inch/sec.: ""
 *zePrintRate 1.5/1.5 inch/sec.: ""
 *zePrintRate 2/2 inches/sec.: ""

scheduler/auth.c

@@ -119,7 +119,7 @@ typedef struct cupsd_authdata_s		/**** Authentication data ****/
  * Local globals...
  */
 
-#if defined(__hpux) && HAVE_LIBPAM
+#if defined(__hpux) && defined(HAVE_LIBPAM)
 static cupsd_authdata_t	*auth_data;	/* Current client being authenticated */
 #endif /* __hpux && HAVE_LIBPAM */
 
@@ -1497,8 +1497,7 @@ cupsdIsAuthorized(cupsd_client_t *con,	/* I - Connection */
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2,
                   "cupsdIsAuthorized: con->uri=\"%s\", con->best=%p(%s)",
-                  con->uri, con->best, con->best ? con->best->location ?
-                			   con->best->location : "(null)" : "");
+                  con->uri, con->best, con->best ? con->best->location : "");
   if (owner)
     cupsdLogMessage(CUPSD_LOG_DEBUG2,
                     "cupsdIsAuthorized: owner=\"%s\"", owner);

scheduler/client.c

@@ -1376,8 +1376,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
               cupsdLogMessage(CUPSD_LOG_DEBUG2,
 	                      "cupsdReadClient: %d command=\"%s\", "
 			      "options = \"%s\"",
-	        	      con->http.fd, con->command,
-	        	      con->options ? con->options : "(null)");
+	        	      con->http.fd, con->command, con->options);
 
 	      if (con->http.version <= HTTP_1_0)
 		con->http.keep_alive = HTTP_KEEPALIVE_OFF;
@@ -3508,7 +3507,7 @@ pipe_command(cupsd_client_t *con,	/* I - Client connection */
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2,
                   "pipe_command: command=\"%s\", options=\"%s\"",
-                  command, options ? options : "(null)");
+                  command, options);
 
   argv[0]      = command;
   query_string = NULL;

scheduler/dirsvc.c

@@ -665,10 +665,10 @@ cupsdSendBrowseDelete(
   * Announce the deletion...
   */
 
-  if ((BrowseLocalProtocols & BROWSE_CUPS) && BrowseSocket >= 0)
+  if (BrowseLocalProtocols & BROWSE_CUPS)
     send_cups_browse(p);
 #ifdef HAVE_LIBSLP
-  if ((BrowseLocalProtocols & BROWSE_SLP) && BrowseSLPHandle)
+  if (BrowseLocalProtocols & BROWSE_SLP)
     slp_dereg_printer(p);
 #endif /* HAVE_LIBSLP */
 }
@@ -934,8 +934,6 @@ cupsdStartBrowsing(void)
 
     BrowseSLPRefresh = 0;
   }
-  else
-    BrowseSLPHandle = NULL;
 #endif /* HAVE_LIBSLP */
 
 #ifdef HAVE_OPENLDAP
@@ -1163,7 +1161,7 @@ cupsdStopBrowsing(void)
   }
 #endif /* HAVE_LIBSLP */
 
-#ifdef HAVE_OPENLDAP
+#ifdef HAVE_OPENDAP
   if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_LDAP) &&
       BrowseLDAPHandle)
   {

scheduler/ipp.c

@@ -627,15 +627,6 @@ cupsdProcessIPPRequest(
 
     if (cupsdSendHeader(con, HTTP_OK, "application/ipp"))
     {
-#ifdef CUPSD_USE_CHUNKING
-     /*
-      * Because older versions of CUPS (1.1.17 and older) and some IPP
-      * clients do not implement chunking properly, we should not use
-      * chunking by default.  This may become the default in future
-      * CUPS releases, or we might add a configuration directive for
-      * it.
-      */
-
       if (con->http.version == HTTP_1_1)
       {
 	con->http.data_encoding = HTTP_ENCODE_CHUNKED;
@@ -643,7 +634,6 @@ cupsdProcessIPPRequest(
 	httpPrintf(HTTP(con), "Transfer-Encoding: chunked\r\n\r\n");
       }
       else
-#endif /* CUPSD_USE_CHUNKING */
       {
 	con->http.data_encoding  = HTTP_ENCODE_LENGTH;
 	con->http.data_remaining = ippLength(con->response);
@@ -4615,8 +4605,8 @@ create_requested_array(ipp_t *request)	/* I - IPP request */
       cupsArrayAdd(ra, "notify-lease-duration-default");
       cupsArrayAdd(ra, "notify-lease-duration-supported");
       cupsArrayAdd(ra, "notify-max-events-supported");
-      cupsArrayAdd(ra, "notify-events-default");
-      cupsArrayAdd(ra, "notify-events-supported");
+      cupsArrayAdd(ra, "notify-notify-events-default");
+      cupsArrayAdd(ra, "notify-notify-events-supported");
       cupsArrayAdd(ra, "notify-pull-method-supported");
       cupsArrayAdd(ra, "notify-schemes-supported");
       cupsArrayAdd(ra, "operations-supported");
@@ -6842,10 +6832,8 @@ print_job(cupsd_client_t  *con,		/* I - Client connection */
   * See if we need to add the ending sheet...
   */
 
-  attr = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
-
   if (!(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)) &&
-      attr && attr->num_values > 1)
+      attr->num_values > 1)
   {
    /*
     * Yes...
@@ -7687,8 +7675,6 @@ send_document(cupsd_client_t  *con,	/* I - Client connection */
     return;
   }
 
-  printer = cupsdFindDest(job->dest);
-
  /*
   * See if the job is owned by the requesting user...
   */
@@ -7820,6 +7806,8 @@ send_document(cupsd_client_t  *con,	/* I - Client connection */
     return;
   }
 
+  printer = cupsdFindDest(job->dest);
+
   if (printer->filetypes && !cupsArrayFind(printer->filetypes, filetype))
   {
     snprintf(mimetype, sizeof(mimetype), "%s/%s", filetype->super,
@@ -8608,7 +8596,7 @@ set_printer_defaults(
     }
     else if (!strcmp(attr->name, "document-format-default") ||
              !strcmp(attr->name, "notify-lease-duration-default") ||
-             !strcmp(attr->name, "notify-events-default"))
+             !strcmp(attr->name, "notify-notify-events-default"))
       continue;
 
    /*

scheduler/job.c

@@ -879,7 +879,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - Job */
 
   if (job->attrs)
   {
-    if (job->state_value > IPP_JOB_STOPPED)
+    if (job->state_value >= IPP_JOB_STOPPED)
       job->access_time = time(NULL);
 
     return;
@@ -2027,7 +2027,7 @@ load_job_cache(const char *filename)	/* I - job.cache filename */
     {
       cupsArrayAdd(Jobs, job);
 
-      if (job->state_value <= IPP_JOB_STOPPED)
+      if (job->state_value < IPP_JOB_STOPPED)
       {
         cupsArrayAdd(ActiveJobs, job);
 	cupsdLoadJob(job);
@@ -2285,7 +2285,7 @@ load_request_root(void)
 
       cupsArrayAdd(Jobs, job);
 
-      if (job->state_value <= IPP_JOB_STOPPED)
+      if (job->state_value < IPP_JOB_STOPPED)
         cupsArrayAdd(ActiveJobs,job);
       else
         unload_job(job);
@@ -2643,23 +2643,8 @@ start_job(cupsd_job_t     *job,		/* I - Job ID */
 
   if (job->current_file == 0)
   {
-   /*
-    * Set the processing time...
-    */
-
     set_time(job, "time-at-processing");
-
-   /*
-    * Create the backchannel pipes and make them non-blocking...
-    */
-
     cupsdOpenPipe(job->back_pipes);
-
-    fcntl(job->back_pipes[0], F_SETFL,
-          fcntl(job->back_pipes[0], F_GETFL) | O_NONBLOCK);
-
-    fcntl(job->back_pipes[1], F_SETFL,
-          fcntl(job->back_pipes[1], F_GETFL) | O_NONBLOCK);
   }
 
  /*

scheduler/printers.c

@@ -2924,6 +2924,10 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
        type;
        type = mimeNextType(MimeDatabase))
   {
+    if (!strcasecmp(type->super, "application") &&
+	!strcasecmp(type->type, "octet-stream"))
+      continue;
+
     snprintf(mimetype, sizeof(mimetype), "%s/%s", type->super, type->type);
 
     if ((filters = mimeFilter(MimeDatabase, type, p->filetype, NULL)) != NULL)
@@ -2949,20 +2953,14 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
   * Add the file formats that can be filtered...
   */
 
-  if ((type = mimeType(MimeDatabase, "application", "octet-stream")) == NULL ||
-      !cupsArrayFind(p->filetypes, type))
-    i = 1;
-  else
-    i = 0;
 
   attr = ippAddStrings(p->attrs, IPP_TAG_PRINTER, IPP_TAG_MIMETYPE,
                        "document-format-supported",
 		       cupsArrayCount(p->filetypes) + 1, NULL, NULL);
 
-  if (i)
-    attr->values[0].string.text = _cupsStrAlloc("application/octet-stream");
+  attr->values[0].string.text = _cupsStrAlloc("application/octet-stream");
 
-  for (type = (mime_type_t *)cupsArrayFirst(p->filetypes);
+  for (i = 1, type = (mime_type_t *)cupsArrayFirst(p->filetypes);
        type;
        i ++, type = (mime_type_t *)cupsArrayNext(p->filetypes))
   {
@@ -3035,7 +3033,7 @@ write_irix_config(cupsd_printer_t *p)	/* I - Printer to update */
 {
   char		filename[1024];		/* Interface script filename */
   cups_file_t	*fp;			/* Interface script file */
-  ipp_attribute_t *attr;		/* Attribute data */
+
 
 
  /*

scheduler/testmime.c

@@ -98,8 +98,6 @@ main(int  argc,				/* I - Number of command-line args */
       if (src)
 	printf("%s: %s/%s%s\n", argv[i], src->super, src->type,
 	       compression ? " (gzipped)" : "");
-      else if ((src = mimeType(mime, "application", "octet-stream")) != NULL)
-	printf("%s: application/octet-stream\n", argv[i]);
       else
       {
 	printf("%s: unknown\n", argv[i]);
@@ -160,8 +158,7 @@ main(int  argc,				/* I - Number of command-line args */
 	     filter->dst->super, filter->dst->type,
 	     filter->filter, filter->cost);
 
-    type_dir(mime, "../doc");
-    type_dir(mime, "../man");
+    type_dir(mime, "..");
   }
 
   return (0);
@@ -283,9 +280,6 @@ type_dir(mime_t     *mime,		/* I - MIME database */
 
   while ((dent = cupsDirRead(dir)) != NULL)
   {
-    if (dent->filename[0] == '.')
-      continue;
-
     snprintf(filename, sizeof(filename), "%s/%s", dirname, dent->filename);
 
     if (S_ISDIR(dent->fileinfo.st_mode))

systemv/cupstestppd.c

@@ -1176,8 +1176,7 @@ main(int  argc,			/* I - Number of command-line arguments */
 	}
       }
 
-      if ((attr = ppdFindAttr(ppd, "1284DeviceID", NULL)) &&
-          strcmp(attr->name, "1284DeviceID"))
+      if (ppdFindAttr(ppd, "1284DeviceId", NULL))
       {
 	if (verbose >= 0)
 	{

systemv/lpadmin.c

@@ -466,25 +466,6 @@ main(int  argc,			/* I - Number of command-line arguments */
 	      return (1);
 	    break;
 
-        case 'U' : /* Username */
-	    if (argv[i][2] != '\0')
-	      cupsSetUser(argv[i] + 2);
-	    else
-	    {
-	      i ++;
-	      if (i >= argc)
-	      {
-	        _cupsLangPrintf(stderr,
-		                _("%s: Error - expected username after "
-				  "\'-U\' option!\n"),
-		        	argv[0]);
-	        return (1);
-	      }
-
-              cupsSetUser(argv[i]);
-	    }
-	    break;
-	    
         case 'u' : /* Allow/deny users */
 	    if (argv[i][2])
 	      val = argv[i] + 2;

systemv/lpstat.c

@@ -235,10 +235,10 @@ main(int  argc,			/* I - Number of command-line arguments */
 	    }
 	    else
 	    {
-	      _cupsLangPrintf(stderr,
-	                      _("%s: Error - expected destination after "
-			        "\'-b\' option!\n"),
-			      argv[0]);
+	      _cupsLangPuts(stderr,
+	                    _("%s: Error - expected destination after "
+			      "\'-b\' option!\n"),
+			    argv[0]);
 
 	      return (1);
 	    }

templates/es/jobs.tmpl

@@ -18,7 +18,7 @@
 <TD>{job_k_octets}k&nbsp;</TD>
 <TD>{job_media_sheets_completed=0?Desconocido:{?job_media_sheets_completed}}</TD>
 <TD>{job_state=3?pendiente desde<BR>{time_at_creation}:{job_state=4?retenido desde<BR>{time_at_creation}:
-{job_state=5?en proceso desde<BR>{time_at_processing}:{job_state=6?parado:
+{job_state=5?en proceso desde<BR>{time_at_processing}:{job_state=6?parado el<BR>{time_at_completed}:
 {job_state=7?cancelado el<BR>{time_at_completed}:{job_state=8?abandonado:completado el<BR>{time_at_completed}}}}}}}&nbsp;</TD>
 <TD>
 {job_preserved>0?

templates/ja/jobs.tmpl

@@ -18,7 +18,7 @@
 <TD>{job_k_octets}k&nbsp;</TD>
 <TD>{job_media_sheets_completed=0?不明:{?job_media_sheets_completed}}</TD>
 <TD>{job_state=3?{time_at_creation}<BR>から保留中:{job_state=4?{time_at_creation}<BR>からホールド中:
-{job_state=5?{time_at_processing}<BR>から処理中:{job_state=6?に停止:
+{job_state=5?{time_at_processing}<BR>から処理中:{job_state=6?{time_at_completed}<BR>に停止:
 {job_state=7?{time_at_completed}<BR>にキャンセル:{time_at_completed}<BR>{job_state=8?に中断:に完了}}}}}}&nbsp;</TD>
 <TD>
 {job_preserved>0?

templates/jobs.tmpl

@@ -18,7 +18,7 @@
 <TD>{job_k_octets}k&nbsp;</TD>
 <TD>{job_media_sheets_completed=0?Unknown:{?job_media_sheets_completed}}</TD>
 <TD>{job_state=3?pending since<BR>{time_at_creation}:{job_state=4?held since<BR>{time_at_creation}:
-{job_state=5?processing since<BR>{time_at_processing}:{job_state=6?stopped:
+{job_state=5?processing since<BR>{time_at_processing}:{job_state=6?stopped at<BR>{time_at_completed}:
 {job_state=7?cancelled at<BR>{time_at_completed}:{job_state=8?aborted:completed at<BR>{time_at_completed}}}}}}}&nbsp;</TD>
 <TD>
 {job_preserved>0?

templates/pl/add-class.tmpl

@@ -1,7 +1,7 @@
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
 
-<H2 CLASS="title">Dodaj klasę</H2>
+<H2 CLASS="title">Utwórz Grupę</H2>
 
 <TABLE>
 <TR>
@@ -17,7 +17,7 @@
 <TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"></TD>
 </TR>
 <TR>
-<TH CLASS="label">Elementy:</TH>
+<TH CLASS="label">Składniki:</TH>
 <TD>
 <SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
 {[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
@@ -26,7 +26,7 @@
 </TR>
 <TR>
 <TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-add-class.gif" ALT="Dodaj klasę"></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-add-class.gif" ALT="Dodaj Klasę"></TD>
 </TR>
 </TABLE>
 

templates/pl/add-printer.tmpl

@@ -1,27 +1,27 @@
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
 
-<H2 CLASS="title">Dodaj nową drukarkę</H2>
+<H2 CLASS="title">Dodaj Nową Drukarkę</H2>
 
 <TABLE>
 <TR>
 <TH CLASS="label">Nazwa:</TH>
 <TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(Może zawierać dowolne drukowalne znaki z wyjątkiem "/", "#" i spacji)</SMALL></TD>
+<SMALL>(Może zawierać wszystkie drukowalne znaki oprócz "/", "#", i spacji)</SMALL></TD>
 </TR>
 <TR>
 <TH CLASS="label">Położenie:</TH>
 <TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(Położenie czytelne dla człowieka, takie jak "Laboratorium 1")</SMALL></TD>
+<SMALL>(Położenie zrozumiałe dla ludzi takie jak "Laboratorium 1")</SMALL></TD>
 </TR>
 <TR>
 <TH CLASS="label">Opis:</TH>
 <TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(Opis czytelny dla człowieka, taki jak "HP LaserJet z Dupleksem")</SMALL></TD>
+<SMALL>(Opis zrozumiały dla ludzi taki jak "HP LaserJet z Dupleksem")</SMALL></TD>
 </TR>
 <TR>
 <TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Kontynuuj"></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Dalej"></TD>
 </TR>
 </TABLE>
 

templates/pl/admin.tmpl

@@ -1,38 +1,38 @@
-<TABLE CELLPADDING="0" CELLSPACING="0" WIDTH="100%" SUMMARY="Zadania administracyjne">
+<TABLE CELLPADDING="0" CELLSPACING="0" WIDTH="100%" SUMMARY="Administration Tasks">
 <TR><TD VALIGN="TOP" NOWRAP>
 
 <H2 CLASS="title">Drukarki</H2>
 
 <P>
 <A HREF="/admin?op=add-printer"><IMG
-SRC="/images/button-add-printer.gif" ALT="Dodaj drukarkę" CLASS="button"></A>
+SRC="/images/button-add-printer.gif" ALT="Dodaj Drukarkę" CLASS="button"></A>
 <A HREF="/printers/"><IMG SRC="/images/button-manage-printers.gif"
-ALT="Zarządzaj drukarkami" CLASS="button"></A>
+ALT="Manage Printers" CLASS="button"></A>
 {have_samba?<A HREF="/admin/?op=export-samba"><IMG
-SRC="/images/button-export-samba.gif" ALT="Wyeksportuj drukarki do Samby"
+SRC="/images/button-export-samba.gif" ALT="Eksportuj do Samby"
 CLASS="button"></A>:}
 </P>
 
-{#device_uri=0?:<P><B>Znaleziono nowe drukarki:</B></P><UL>{[device_uri]
-<LI><A HREF="/admin?op=add-printer&amp;{device_options}"><IMG
-SRC="/images/button-add-this-printer.gif" ALT="Dodaj tę drukarkę" CLASS="button"
-ALIGN="MIDDLE"></A>
-{device_make_and_model} ({device_info})</LI>
+{#device_uri=0?:<P><B>Znaleziono Nową Drukarkę:</B></P><UL>{[device_uri]
+<LI>{device_make_and_model} ({device_info})
+<A HREF="/admin?op=add-printer&amp;{device_options}"><IMG
+SRC="/images/button-add-this-printer.gif" ALT="Dodaj Tę Drukarkę" CLASS="button"
+ALIGN="MIDDLE"></A></LI>
 }</UL>}
 
-<H2 CLASS="title">Klasy</H2>
+<H2 CLASS="title">Grupy</H2>
 
 <P>
 <A HREF="/admin?op=add-class"><IMG SRC="/images/button-add-class.gif"
-ALT="Dodaj klasę" CLASS="button"></A>
+ALT="Utwórz Grupę" CLASS="button"></A>
 <A HREF="/classes/"><IMG SRC="/images/button-manage-classes.gif"
-ALT="Zarządzaj klasami" CLASS="button"></A>
+ALT="Zarządzaj Grupami" CLASS="button"></A>
 </P>
 
-<H2 CLASS="title">Zadania</H2>
+<H2 CLASS="title">Wydruki</H2>
 
 <P>
-<A HREF="/jobs/"><IMG SRC="/images/button-manage-jobs.gif" ALT="Zarządzaj zadaniami" CLASS="button"></A>
+<A HREF="/jobs/"><IMG SRC="/images/button-manage-jobs.gif" ALT="Zarządzaj Wydrukami" CLASS="button"></A>
 </P>
 
 </TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">
@@ -41,15 +41,15 @@ ALT="Zarządzaj klasami" CLASS="button"></A>
 
 <P>
 <A HREF="/admin?op=config-server"><IMG
-SRC="/images/button-edit-configuration-file.gif" ALT="Edytuj plik konfiguracji" CLASS="button"></A>
+SRC="/images/button-edit-configuration-file.gif" ALT="Edytuj Plik Konfiguracji" CLASS="button"></A>
 <A HREF="/admin/log/access_log" TARGET="_blank"><IMG
-SRC="/images/button-view-access-log.gif" ALT="Wyświetl dziennik dostępu"
+SRC="/images/button-view-access-log.gif" ALT="Pokaż Dziennik Dostępu"
 CLASS="button"></A>
 <A HREF="/admin/log/error_log" TARGET="_blank"><IMG
-SRC="/images/button-view-error-log.gif" ALT="Wyświetl dziennik błędów"
+SRC="/images/button-view-error-log.gif" ALT="Pokaż Dziennik Błędów"
 CLASS="button"></A>
 <A HREF="/admin/log/page_log" TARGET="_blank"><IMG
-SRC="/images/button-view-page-log.gif" ALT="Wyświetl dziennik strony"
+SRC="/images/button-view-page-log.gif" ALT="Pokaż Dziennik Wydruków"
 CLASS="button"></A>
 </P>
 
@@ -58,16 +58,16 @@ CLASS="button"></A>
 
 <FORM METHOD="POST" ACTION="/admin">
 
-<P><B>Podstawowe ustawienia serwera:</B></P>
+<P><B>Podstawowe Ustawienia Serwera:</B></P>
 
 <P><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_PRINTERS" {?remote_printers}> Wyświetl drukarki udostępniane przez inne systemy<BR>
-<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Udostępnij opublikowane drukarki połączone do tego systemu<BR>
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Pozwól na zdalną administrację<BR>
-<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Pozwól użytkownikom na anulowanie każdego zadania (nie tylko ich)<BR>
-<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Zapisz informacje o debugowaniu do rozwiązywania problemów</P>
+<INPUT TYPE="CHECKBOX" NAME="REMOTE_PRINTERS" {?remote_printers}> Pokazuj drukarki udostępnione przez inne systemy<BR>
+<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Udostępniaj opublikowane drukarki podłączone do tego systemu<BR>
+<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Zezwalaj na zdalną administrację<BR>
+<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Zezwalaj użytkownikom na anulowanie wszystkich wydruków  (nie tylko własnych)<BR>
+<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Zachowuj informacje odpluskwiania dla rozwiązania problemów</P>
 
-<P><INPUT TYPE="IMAGE" SRC="/images/button-change-settings.gif" ALT="Zmień ustawienia"></P>
+<P><INPUT TYPE="IMAGE" SRC="/images/button-change-settings.gif" ALT="Zmień Ustawienia"></P>
 
 </FORM>}
 

templates/pl/choose-device.tmpl

@@ -5,11 +5,11 @@
 <INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
 <INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
 
-<H2 CLASS="title">Urządzenie {printer_name}</H2>
+<H2 CLASS="title">Komunikacja z urządzeniem {printer_name}</H2>
 
 <TABLE>
 <TR>
-<TH CLASS="label">Urządzenie:</TH>
+<TH CLASS="label">Interfejs:</TH>
 <TD>
 <SELECT NAME="DEVICE_URI">
 {[device_uri]<OPTION VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" {?current_device_uri={device_uri}?SELECTED:{current_device_scheme={device_uri}?SELECTED:}}>
@@ -19,7 +19,7 @@
 </TR>
 <TR>
 <TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Kontynuuj"></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Dalej"></TD>
 </TR>
 </TABLE>
 

templates/pl/choose-make.tmpl

@@ -9,7 +9,7 @@
 <INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
 <INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 
-<H2 CLASS="title">Producent {printer_name}</H2>
+<H2 CLASS="title">Producent urządzenia {printer_name}</H2>
 
 <TABLE>
 <TR>
@@ -22,20 +22,20 @@
 </TR>
 <TR>
 <TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Kontynuuj"></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Dalej"></TD>
 </TR>
 <TR>
 <TD></TD>
 <TD>&nbsp;</TD>
 </TR>
 <TR>
-<TH CLASS="label">Lub dostarcz plik PPD:</TH>
+<TH CLASS="label">Lub Zaakceptuj Plik PPD:</TH>
 <TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
 TYPE="FILE" NAME="PPD_FILE"></TD>
 </TR>
 <TR>
 <TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Dodaj drukarkę:Zmodyfikuj drukarkę}"></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Dodaj Drukarkę:Modyfikuj Drukarkę}"></TD>
 </TR>
 </TABLE>
 

templates/pl/choose-model.tmpl

@@ -9,11 +9,11 @@
 <INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
 <INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 
-<H2 CLASS="title">Model/sterownik {printer_name}</H2>
+<H2 CLASS="title">Typ/Sterownik urządzenia {printer_name}</H2>
 
 <TABLE>
 <TR>
-<TH CLASS="label">Model:</TH>
+<TH CLASS="label">Typ:</TH>
 <TD>
 <SELECT NAME="PPD_NAME" SIZE="10">
 {[ppd_name]<OPTION VALUE="{ppd_name}" {?current_make_and_model={ppd_make_and_model}?SELECTED:}>{ppd_make_and_model} ({ppd_natural_language})
@@ -21,13 +21,13 @@
 </TD>
 </TR>
 <TR>
-<TH CLASS="label">Lub dostarcz plik PPD:</TH>
+<TH CLASS="label">Lub Zaakceptuj Plik PPD:</TH>
 <TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
 TYPE="FILE" NAME="PPD_FILE"></TD>
 </TR>
 <TR>
 <TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Dodaj drukarkę:Zmodyfikuj drukarkę}"></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Dodaj Drukarkę:Modyfikuj Drukarkę}"></TD>
 </TR>
 </TABLE>
 

templates/pl/choose-serial.tmpl

@@ -5,17 +5,17 @@
 <INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
 <INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
 
-<H2 CLASS="title">Ustawienia portu szeregowego {printer_name}</H2>
+<H2 CLASS="title">Ustawienia Portu Szeregowego dla Urządzenia {printer_name}</H2>
 
 <TABLE>
 <TR>
-<TH CLASS="label">Prędkość transmisji:</TH>
+<TH CLASS="label">Szybkość Transmisji:</TH>
 <TD><SELECT NAME="BAUDRATE">
 {[baudrates]<OPTION {?baudrate={baudrates}?SELECTED:}>{baudrates}}
 </SELECT></TD>
 </TR>
 <TR>
-<TH CLASS="label">Parzystość:</TH>
+<TH CLASS="label">KontrolaParzystości:</TH>
 <TD><SELECT NAME="PARITY">
 <OPTION VALUE="none" {?parity=none?SELECTED:}>Brak
 <OPTION VALUE="even" {?parity=even?SELECTED:}>Parzystość
@@ -23,24 +23,24 @@
 </SELECT></TD>
 </TR>
 <TR>
-<TH CLASS="label">Bity danych:</TH>
+<TH CLASS="label">Bity Danych:</TH>
 <TD><SELECT NAME="BITS">
 <OPTION {?bits=8?SELECTED:}>8
 <OPTION {?bits=7?SELECTED:}>7
 </SELECT></TD>
 </TR>
 <TR>
-<TH CLASS="label">Kontrola przepływu:</TH>
+<TH CLASS="label">Kontrola Przepływu:</TH>
 <TD><SELECT NAME="FLOW">
 <OPTION VALUE="none" {?flow=none?SELECTED:}>Brak
-<OPTION VALUE="soft" {?flow=soft?SELECTED:}>XON/XOFF (programowa)
-<OPTION VALUE="hard" {?flow=hard?SELECTED:}>RTS/CTS (sprzętowa)
-<OPTION VALUE="dtrdsr" {?flow=dtrdsr?SELECTED:}>DTR/DSR (sprzętowa)
+<OPTION VALUE="soft" {?flow=soft?SELECTED:}>XON/XOFF (Programowa)
+<OPTION VALUE="hard" {?flow=hard?SELECTED:}>RTS/CTS (Sprzętowa)
+<OPTION VALUE="dtrdsr" {?flow=dtrdsr?SELECTED:}>DTR/DSR (Sprzętowa)
 </SELECT></TD>
 </TR>
 <TR>
 <TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Kontynuuj"></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Dalej"></TD>
 </TR>
 </TABLE>
 

templates/pl/choose-uri.tmpl

@@ -16,25 +16,25 @@
 <TD></TD>
 <TD>Przykłady:
 <PRE>
-    http://nazwakomputera:631/ipp/
-    http://nazwakomputera:631/ipp/port1
+    http://hostname:631/ipp/
+    http://hostname:631/ipp/port1
 
-    ipp://nazwakomputera/ipp/
-    ipp://nazwakomputera/ipp/port1
+    ipp://hostname/ipp/
+    ipp://hostname/ipp/port1
 
-    lpd://nazwakomputera/kolejka
+    lpd://hostname/queue
 
-    gniazdo://nazwakomputera
-    gniazdo://nazwakomputera:9100
+    socket://hostname
+    socket://hostname:9100
 </PRE>
 
-<P>Zobacz <A HREF="/help/network.html" TARGET="_blank">"Drukarki sieciowe"</A>, aby uzyskać poprawny URI do użycia z drukarką.</P>
+<P>Zobacz <A HREF="/help/network.html" TARGET="_blank">"Używanie Drukarek Sieciowych"</A> aby określić poprawny URI twojej drukarki.</P>
 
 </TD>
 </TR>
 <TR>
 <TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Kontynuuj"></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Dalej"></TD>
 </TR>
 </TABLE>
 

templates/pl/class-added.tmpl

@@ -1 +1 @@
-<P>Klasa <A HREF="/classes/{printer_name}">{printer_name}</A> została pomyślnie dodana.
+<P>Grupa <A HREF="/classes/{printer_name}">{printer_name}</A> została pomyślnie dodana.

templates/pl/class-confirm.tmpl

@@ -1,7 +1,7 @@
-<P><B>Ostrzeżenie:</B> Czy jesteś pewny, że chcesz usunąć klasę
+<P><B>Ostrzeżenie:</B> Czy napewno chcesz usunąć grupę
 {printer_name}?</P>
 
 <P ALIGN="CENTER"><A
 HREF="/admin?op=delete-class&printer_name={printer_name}&confirm=yes"><IMG
-SRC="/images/button-delete-class.gif" ALT="Usuń klasę"
+SRC="/images/button-delete-class.gif" ALT="Usuń Grupę"
 CLASS="button"></A></P>

templates/pl/class-deleted.tmpl

@@ -1 +1 @@
-<P>Klasa {printer_name} została pomyślnie usunięta.
+<P>Grupa {printer_name} została pomyślnie usunięta.

templates/pl/class-jobs-header.tmpl

@@ -1 +1 @@
-<H3 CLASS="title">Zadania</H3>
+<H3 CLASS="title">Wydruki</H3>

templates/pl/class-modified.tmpl

@@ -1 +1 @@
-<P>Klasa <A HREF="/classes/{printer_name}">{printer_name}</A> została pomyślnie zmodyfikowana.
+<P>Grupa <A HREF="/classes/{printer_name}">{printer_name}</A> została pomyślnie zmodyfikowana.

templates/pl/classes-header.tmpl

@@ -1 +1 @@
-<P ALIGN="CENTER">{total=0?Brak klas:Wyświetlanie {#printer_name} z {total} klas{total=1?:}}.</P>
+<P ALIGN="CENTER">{total=0?Brak grup:Wyświetlam {#printer_name} z {total} grup{total=1?y:}}.</P>

templates/pl/classes.tmpl

@@ -1,6 +1,6 @@
 {#printer_name=0?:
 {[printer_name]
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Domyślna drukarka):}
+<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Default Printer):}
 {?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN>}</H2>
 
 <TABLE WIDTH="100%" CLASS="button" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
@@ -9,44 +9,44 @@
 <IMG SRC="/images/classes.gif" CLASS="button" ALT=""></A></TD>
 <TD VALIGN=TOP><B>Opis:</B> {printer_info}<BR>
 <B>Położenie:</B> {printer_location}<BR>
-<B>Stan klasy:</B> {printer_state=3?bezczynna:{printer_state=4?processing:zatrzymana}},
-{printer_is_accepting_jobs=0?odrzucanie zadań:akceptowanie zadań}, {printer_is_shared=0?nie opublikowana:opublikowana}.
-{?member_uris=?:<BR>Elementy: {member_uris}}
+<B>Stan Grupy:</B> {printer_state=3?bezczynna:{printer_state=4?drukuje:zatrzymana}},
+{printer_is_accepting_jobs=0?odrzuca wydruki:akceptuje wydruki}, {printer_is_shared=0?nie: opublikowana}.
+{?member_uris=?:<BR>Składniki: {member_uris}}
 
 <P>
 <A HREF="{printer_uri_supported}?op=print-test-page">
-<IMG SRC="/images/button-print-test-page.gif" ALT="Wydrukuj stronę próbną" CLASS="button"></A>
+<IMG SRC="/images/button-print-test-page.gif" ALT="Drukuj Stronę Testową" CLASS="button"></A>
 {printer_state=5?
-<A HREF="{admin_uri}?op=start-class&amp;printer_name={printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-start-class.gif" ALT="Uruchom klasę" CLASS="button"></A>
+<A HREF="{admin_uri}?op=start-class&amp;printer_name={%printer_name}&amp;is_class=Y">
+<IMG SRC="/images/button-start-class.gif" ALT="Start Grupy" CLASS="button"></A>
 :
-<A HREF="{admin_uri}?op=stop-class&amp;printer_name={printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-stop-class.gif" ALT="Zatrzymaj klasę" CLASS="button"></A>
+<A HREF="{admin_uri}?op=stop-class&amp;printer_name={%printer_name}&amp;is_class=Y">
+<IMG SRC="/images/button-stop-class.gif" ALT="Zatrzymaj Grupę" CLASS="button"></A>
 }
 {printer_is_accepting_jobs=0?
-<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-accept-jobs.gif" ALT="Zaakceptuj zadania" CLASS="button"></A>
+<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
+<IMG SRC="/images/button-accept-jobs.gif" ALT="Akceptuj Wydruki" CLASS="button"></A>
 :
-<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-reject-jobs.gif" ALT="Odrzuć zadania" CLASS="button"></A>
+<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
+<IMG SRC="/images/button-reject-jobs.gif" ALT="Odrzucaj Wydruki" CLASS="button"></A>
 }
-<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="Anuluj wszystkie zadania" CLASS="button"></A>
+<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
+<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="Skasuj Wszystkie Wydruki" CLASS="button"></A>
 {printer_is_shared=0?
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=1&amp;is_class=Y">
-<IMG SRC="/images/button-publish-printer.gif" ALT="Opublikuj drukarkę" CLASS="button"></A>
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1&amp;is_class=Y">
+<IMG SRC="/images/button-publish-printer.gif" ALT="Publikuj Drukarkę" CLASS="button"></A>
 :
-<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={printer_name}&amp;shared=0&amp;is_class=Y">
-<IMG SRC="/images/button-unpublish-printer.gif" ALT="Nie publikuj drukarki" CLASS="button"></A>
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0&amp;is_class=Y">
+<IMG SRC="/images/button-unpublish-printer.gif" ALT="Nie Publikuj Drukarki" CLASS="button"></A>
 }
-<A HREF="{admin_uri}?op=modify-class&amp;printer_name={printer_name}">
-<IMG SRC="/images/button-modify-class.gif" ALT="Zmodyfikuj klasę" CLASS="button"></A>
-<A HREF="{admin_uri}?op=delete-class&amp;printer_name={printer_name}">
-<IMG SRC="/images/button-delete-class.gif" ALT="Usuń klasę" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-set-as-default.gif" ALT="Ustaw jako domyślną" CLASS="button"></A>
-<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={printer_name}&amp;is_class=Y">
-<IMG SRC="/images/button-set-allowed-users.gif" ALT="Pozwól zezwolonym użytkownikom" CLASS="button"></A>
+<A HREF="{admin_uri}?op=modify-class&amp;printer_name={%printer_name}">
+<IMG SRC="/images/button-modify-class.gif" ALT="Modyfikuj Grupę" CLASS="button"></A>
+<A HREF="{admin_uri}?op=delete-class&amp;printer_name={%printer_name}">
+<IMG SRC="/images/button-delete-class.gif" ALT="Usuń Grupę" CLASS="button"></A>
+<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}&amp;is_class=Y">
+<IMG SRC="/images/button-set-as-default.gif" ALT="Ustaw Jako Domyślną" CLASS="button"></A>
+<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
+<IMG SRC="/images/button-set-allowed-users.gif" ALT="Ustaw Uprawnienia Użytkowników" CLASS="button"></A>
 </P>
 </TD>
 </TR>

templates/pl/help-header.tmpl

@@ -1,10 +1,10 @@
 <FORM ACTION="/help/{?HELPFILE}" METHOD="GET">
 {TOPIC?<INPUT TYPE="HIDDEN" NAME="TOPIC" VALUE="{TOPIC}">:}
 
-<P ALIGN="CENTER"><B>Wyszukaj we
-{HELPTITLE?{HELPTITLE}:{TOPIC?{TOPIC}:wszystkich dokumentach}}:</B> <INPUT
+<P ALIGN="CENTER"><B>Przeszukaj 
+{HELPTITLE?{HELPTITLE}:{TOPIC?{TOPIC}:Wszystkie Dokumenty}}:</B> <INPUT
 TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
-TYPE="IMAGE" SRC="/images/button-search.gif" ALT="Wyszukaj">
+TYPE="IMAGE" SRC="/images/button-search.gif" ALT="Szukaj">
 <A HREF="/help/{?HELPFILE}{QUERY?{TOPIC??TOPIC={TOPIC}:}:}"><IMG
 SRC="/images/button-clear.gif" ALT="Wyczyść" CLASS="button"></A></P>
 
@@ -12,36 +12,29 @@ SRC="/images/button-clear.gif" ALT="Wyczyść" CLASS="button"></A></P>
 
 <!-- Bookmarks -->
 <DIV CLASS="sidebar">
-<H3 CLASS="title">Dokumenty pomocy on-line</H3>
+<H3 CLASS="title">Dokumenty Pomocy On-Line</H3>
 
-<P CLASS="l0"><A HREF="/help{QUERY??QUERY={QUERY}:}">Wszystkie dokumenty</A></P>
+<P CLASS="l0"><A HREF="/help{QUERY??QUERY={QUERY}:}">Wszystkie Dokumenty</A></P>
 <HR>
 
 {[BMTEXT]<P CLASS="l{BMINDENT}"><A HREF="{BMLINK}">{BMTEXT}</A></P>
 }
 </DIV>
 
-{QUERY?<P>Wyniki wyszukiwania we {HELPFILE?{HELPTITLE}:{TOPIC?{TOPIC}:wszystkich dokumentach}}\:</P>
+{QUERY?<P>Rezultaty przeszukiwania - {HELPFILE?{HELPTITLE}:{TOPIC?{TOPIC}:Wszystkie Dokumenty}}\:</P>
 {QTEXT?<UL>
 {[QTEXT]<LI><A HREF="{QLINK}">{QTEXT}</A>{QPTEXT? (w <I><A HREF="{QPLINK}">{QPTEXT}</A></I>):}</LI>}
 {QTEXT?</UL>:}
-:<P>Nie znaleziono wyników.</P>}
+:<P>Nie znaleziono.</P>}
 <HR NOSHADE>:}
 {HELPTITLE?<H1>{HELPTITLE}
 <A HREF="/help/{HELPFILE}?PRINTABLE=YES" TARGET="_blank"><IMG
-SRC="/images/button-view-printable-version.gif" ALT="Wyświetl wersję drukowalną"
-CLASS="button"></A></H1>:<H1>Strony pomocy CUPS</H1>
+SRC="/images/button-view-printable-version.gif" ALT="Pokaż wersję do Wydruku"
+CLASS="button"></A></H1>:<H1>Strony Pomocy CUPS</H1>
 
-<P>To jest interfejs on-line pomocy CUPS. Podaj wyszukiwane
-słowa powyżej lub naciśnij na jakiś odnośnik do dokumentacji,
-aby wyświetlić dokumentację pomocy on-line.</P>
+<P>To jest interfejs pomocy on-line CUPS. Wprowadź poszukiwane słowa powyżej lub klikaj na odnośniki aby wyświetlić dokumenty pomocy on-line.</P>
 
-<P>Jeśli jesteś nowy w CUPS-ie, przeczytaj stronę "<a
-href="overview.html">Wstęp do CUPS</a>". Użytkownicy dobrze
-znający CUPS powinni przeczytać stronę "<a href="whatsnew.html">
-Co nowego w CUPS 1.2</a>".</P>
+<P>Jeśli dopiero zaczynasz pracę z  CUPS, przeczytaj stronę "<a
+href="overview.html">Przegląd Możliwości CUPS</a>". Doświadczeni użytkownicy powinni przeczytać stronę "<a href="whatsnew.html">Co Nowego w CUPS 1.2</a>".</P>
 
-<P>The <A HREF="http://www.cups.org/">Strona domowa CUPS</A> także
-dostarcza wielu zasobów, w tym fora dyskusyjne użytkowników,
-odpowiedzi na najczęściej zadawane pytania oraz formularz do
-wysyłania raportów błędów i żądań funkcji.</P>}
+<P>Strona domowa <A HREF="http://www.cups.org/">CUPS Home Page</A> także zawiera wiele informacji, w tym forum dyskusyjne użytkowników, odpowiedzi na często-zadawane pytania oraz formularze do zgłaszania raportów o błędach i prośby o nowe funkcjonalności.</P>}

templates/pl/job-cancel.tmpl

@@ -1 +1 @@
-<P><A HREF="{job_printer_uri}">Zadanie {job_id}</A> zostało anulowane.
+<P><A HREF="{job_printer_uri}">Wydruk {job_id}</A> został anulowany.

templates/pl/job-hold.tmpl

@@ -1 +1 @@
-<P><A HREF="{job_printer_uri}">Zadanie {job_id}</A> zostało wstrzymane od drukowania.
+<P><A HREF="{job_printer_uri}">Wydruk {job_id}</A> został wstrzymany.

templates/pl/job-move.tmpl

@@ -2,11 +2,11 @@
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
 {job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:}
 
-<H2 CLASS="title">{job_id?Przenieś zadanie {job_id}:Przenieś wszystkie zadania}</H2>
+<H2 CLASS="title">{job_id?Przenieś Wydruk {job_id}:Przenieś Wszystkie Wydruki}</H2>
 
 <TABLE>
 <TR>
-<TH CLASS="label">Nowy cel:</TH>
+<TH CLASS="label">Miejsce przeznaczenia:</TH>
 <TD>
 <SELECT NAME="JOB_PRINTER_URI" SIZE="10">
 {[job_printer_uri]<OPTION VALUE="{job_printer_uri}">{job_printer_name}}
@@ -15,7 +15,7 @@
 </TR>
 <TR>
 <TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-move-job{job_id?:s}.gif" ALT="Przenieś zadania{job_id?:}"></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-move-job{job_id?:s}.gif" ALT="{job_id?Przenieś Wydruk:Przenieś Wszystkie Wydruki}"></TD>
 </TR>
 </TABLE>
 

templates/pl/job-moved.tmpl

@@ -1,2 +1,2 @@
-<P>{job_id?<A HREF="/jobs/{job_id}">Zadanie {job_id}</A>:Wszystkie zadania} zostało przeniesione do 
+<P>{job_id?Wydruk <A HREF="/jobs/{job_id}">{job_id}</A> przeniesiony :Wydruki przeniesione} do
 <A HREF="{job_printer_uri}">{job_printer_name}</A>.</P>

templates/pl/job-release.tmpl

@@ -1 +1 @@
-<P><A HREF="{job_printer_uri}">Zadanie {job_id}</A> zostało zwolnione od drukowania.
+<P>Wydruk <A HREF="{job_printer_uri}">{job_id}</A> został wznowiony.

templates/pl/job-restart.tmpl

@@ -1 +1 @@
-<P><A HREF="{job_printer_uri}">Zadanie {job_id}</A> zostało ponownie uruchomione.
+<P><A HREF="{job_printer_uri}">Wydruk {job_id}</A> został powtórzony.

templates/pl/jobs-header.tmpl

@@ -1,15 +1,15 @@
 <P>{?which_jobs=?<A
-HREF="{?printer_name=?/zadania:{printer_uri_supported}}?which_jobs=completed"><IMG
-SRC="/images/button-show-completed.gif" CLASS="button" ALT="Wyświetl zakończone zadania"></A>
-<A HREF="{?printer_name=?/zadania:{printer_uri_supported}}?which_jobs=all"><IMG
-SRC="/images/button-show-all.gif" CLASS="button" ALT="Wyświetl wszystkie zadania">:{which_jobs=all?<A
-HREF="{?printer_name=?/zadania:{printer_uri_supported}}?which_jobs=completed"><IMG
-SRC="/images/button-show-completed.gif" CLASS="button" ALT="Wyświetl zakończone zadania"></A>
-<A HREF="{?printer_name=?/zadania:{printer_uri_supported}}"><IMG
-SRC="/images/button-show-active.gif" CLASS="button" ALT="Wyświetl aktywne zadania">:<A
-HREF="{?printer_name=?/zadania:{printer_uri_supported}}"><IMG
-SRC="/images/button-show-active.gif" CLASS="button" ALT="Wyświetl aktywne zadania"></A>
-<A HREF="{?printer_name=?/zadania:{printer_uri_supported}}?which_jobs=all"><IMG
-SRC="/images/button-show-all.gif" CLASS="button" ALT="Wyświetl wszystkie zadania">}}</A></P>
+HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
+SRC="/images/button-show-completed.gif" CLASS="button" ALT="Pokaż Zakończone Wydruki"></A>
+<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
+SRC="/images/button-show-all.gif" CLASS="button" ALT="Pokaż Wszystkie Wydruki">:{which_jobs=all?<A
+HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
+SRC="/images/button-show-completed.gif" CLASS="button" ALT="Pokaż Zakończone Wydruki"></A>
+<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
+SRC="/images/button-show-active.gif" CLASS="button" ALT="Pokaż Aktywne Wydruki">:<A
+HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
+SRC="/images/button-show-active.gif" CLASS="button" ALT="Pokaż Aktywne Wydruki"></A>
+<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
+SRC="/images/button-show-all.gif" CLASS="button" ALT="Pokaż Aktywne Wydruki">}}</A></P>
 
-<P ALIGN="CENTER">{total=0?Brak zadań:Wyświetlanie {#job_id} z {total} {?which_jobs=?active:{which_jobs=all?:zakończonych}} zadań{total=1?:}}.</P>
+<P ALIGN="CENTER">{total=0?Brak wydruków:Wyświetlam {#job_id} z {total} {?which_jobs=?aktywny{total=1?:ch}:{which_jobs=all?:zakończony{total=1?:ch}}} wydruk{total=1?:ów}}.</P>

templates/pl/jobs.tmpl

@@ -1,40 +1,40 @@
 {#job_id=0?:
-<TABLE CELLPADDING="0" CELLSPACING="0" CLASS="button" WIDTH="100%" SUMMARY="Lista zadań">
+<TABLE CELLPADDING="0" CELLSPACING="0" CLASS="button" WIDTH="100%" SUMMARY="Job List">
 <TR CLASS="data">
 <TH>ID&nbsp;</TH>
-<TH>Nazwa&nbsp;</TH>
-<TH>Użytkownik&nbsp;</TH>
-<TH>Rozmiar&nbsp;</TH>
-<TH>Strony&nbsp;</TH>
-<TH>Stan&nbsp;</TH>
-<TH>Kontrola&nbsp;</TH>
+<TH>Name&nbsp;</TH>
+<TH>User&nbsp;</TH>
+<TH>Size&nbsp;</TH>
+<TH>Pages&nbsp;</TH>
+<TH>State&nbsp;</TH>
+<TH>Control&nbsp;</TH>
 </TR>
 
 {[job_id]
 <TR CLASS="data" VALIGN="TOP">
 <TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id}&nbsp;</TD>
-<TD>{?job_name=?Nieznane:{job_name}}&nbsp;</TD>
+<TD>{?job_name=?Nieznana:{job_name}}&nbsp;</TD>
 <TD>{job_originating_user_name}&nbsp;</TD>
 <TD>{job_k_octets}k&nbsp;</TD>
-<TD>{job_media_sheets_completed=0?Nieznane:{?job_media_sheets_completed}}</TD>
-<TD>{job_state=3?oczekiwanie od<BR>{time_at_creation}:{job_state=4?wstrzymane od<BR>{time_at_creation}:
-{job_state=5?przetwarzanie od<BR>{time_at_processing}:{job_state=6?zatrzymane:
-{job_state=7?anulowane o<BR>{time_at_completed}:{job_state=8?przerwane:zakończone o<BR>{time_at_completed}}}}}}}&nbsp;</TD>
+<TD>{job_media_sheets_completed=0?brak danych:{?job_media_sheets_completed}}</TD>
+<TD>{job_state=3?oczekuje od<BR>{time_at_creation}:{job_state=4?wstrzymany od<BR>{time_at_creation}:
+{job_state=5?drukowany od<BR>{time_at_processing}:{job_state=6?zatrzymany<BR>{time_at_completed}:
+{job_state=7?anulowany<BR>{time_at_completed}:{job_state=8?przerwany:zakończony<BR>{time_at_completed}}}}}}}&nbsp;</TD>
 <TD>
 {job_preserved>0?
 <A HREF="/jobs/?op=restart-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-restart-job.gif" ALT="Ponownie wydrukuj zadanie" CLASS="button"></A>:}
+<IMG SRC="/images/button-restart-job.gif" ALT="Wydrukuj Ponownie" CLASS="button"></A>:}
 {job_state=4?
 <A HREF="/jobs/?op=release-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-release-job.gif" ALT="Zwolnij zadanie" CLASS="button"></A>:}
+<IMG SRC="/images/button-release-job.gif" ALT="Wznów Wydruk" CLASS="button"></A>:}
 {job_state=3?
 <A HREF="/jobs/?op=hold-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-hold-job.gif" ALT="Wstrzymaj zadanie" CLASS="button"></A>:}
+<IMG SRC="/images/button-hold-job.gif" ALT="Wstrzymaj Wydruk" CLASS="button"></A>:}
 {job_state<7?
 <A HREF="/jobs/?op=cancel-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
-<IMG SRC="/images/button-cancel-job.gif" ALT="Anuluj zadanie" CLASS="button"></A>
+<IMG SRC="/images/button-cancel-job.gif" ALT="Anuluj Wydruk" CLASS="button"></A>
 <A HREF="/jobs/?op=move-job&amp;job_id={job_id}"><IMG
-SRC="/images/button-move-job.gif" ALT="Przenieś zadanie" CLASS="button"></A>:}
+SRC="/images/button-move-job.gif" ALT="Przenieś Wydruk" CLASS="button"></A>:}
 &nbsp;</TD>
 </TR>
 }

templates/pl/maintenance.tmpl

@@ -1,2 +1,2 @@
-<P>Polecenia utrzymywania zostały wysłane; ID zadania to <A HREF="/printers/{printer_name}">
+<P>Komendy administracyjne wysłane; ID wydruku to <A HREF="/printers/{printer_name}">
 {printer_name}-{job_id}</A>.</P>

templates/pl/modify-class.tmpl

@@ -1,7 +1,7 @@
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
 
-<H2 CLASS="title">Zmodyfikuj klasę {printer_name}</H2>
+<H2 CLASS="title">Modyfikuj Grupę {printer_name}</H2>
 
 <TABLE>
 <TR>
@@ -18,7 +18,7 @@
 <TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"></TD>
 </TR>
 <TR>
-<TH CLASS="label">Elementy:</TH>
+<TH CLASS="label">Składniki:</TH>
 <TD>
 <SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
 {[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
@@ -27,7 +27,7 @@
 </TR>
 <TR>
 <TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-modify-class.gif" ALT="Zmodyfikuj klasę"></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-modify-class.gif" ALT="Modyfikuj Grupę"></TD>
 </TR>
 </TABLE>
 

templates/pl/modify-printer.tmpl

@@ -3,7 +3,7 @@
 {?device_uri=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_DEVICE_URI" VALUE="{device_uri}">}
 {?printer_make_and_model=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{printer_make_and_model}">}
 
-<H2 CLASS="title">Zmodyfikuj drukarkę {printer_name}</H2>
+<H2 CLASS="title">Modyfikuj Drukarkę {printer_name}</H2>
 
 <TABLE>
 <TR>
@@ -13,16 +13,16 @@
 <TR>
 <TH CLASS="label">Położenie:</TH>
 <TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(Położenie czytelne dla człowieka, takie jak "Laboratorium 1")</SMALL></TD>
+<SMALL>(Położenie zrozumiałe dla ludzi takie jak "Laboratorium 1")</SMALL></TD>
 </TR>
 <TR>
-<TH CLASS="label">Opis:</TH>
+<TH CLASS="label">Description:</TH>
 <TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(Opis czytelny dla człowieka, taki jak "HP LaserJet z Dupleksem")</SMALL></TD>
+<SMALL>(Opis zrozumiały dla ludzi taki jak "HP LaserJet z Dupleksem")</SMALL></TD>
 </TR>
 <TR>
 <TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Kontynuuj"></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Dalej"></TD>
 </TR>
 </TABLE>
 

templates/pl/option-conflict.tmpl

@@ -1,7 +1,7 @@
-<P><B>Błąd:</B> Następujące opcje są w konflikcie:</P>
+<P><B>Error:</B> Poniższe opcje powodują konflikt:</P>
 
 <UL>
 {[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
 }</UL>
 
-<P>Zmień jedną lub więcej opcji, aby rozwiązań konflikty.</P>
+<P>Proszę zmienić jedną lub więcej z tych opcji aby rozwiązać konflikty.</P>

templates/pl/option-trailer.tmpl

@@ -1,5 +1,5 @@
 <TR>
 <TD></TD>
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-set-printer-options.gif" ALT="Ustaw opcje drukarki"></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-set-printer-options.gif" ALT="Ustaw Opcje Drukarki"></TD>
 </TR>
 </TABLE>