Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.4rc1@4306 a1ca3aef-8c08-0410-bb20-df032aa958be
2013-05-10 18:56:23 +00:00
@@ -3,12 +3,6 @@ CHANGES-1.3.txt

 CHANGES IN CUPS V1.3.11

-	- The scheduler did not prevent nested classes (STR #3211)
-	- The scheduler did not reprint processing jobs that were moved to
-	  another destination (STR #3222)
-	- The scheduler did not reset the current job file when stopping a
-	  printer (STR #3226)
-	- The scheduler did not handle POSTs to custom CGIs properly (STR #3221)
 	- The pdftops filter did not print landscape PDF pages properly
 	  (STR #2881)
 	- The scheduler did not handle partial header lines properly from CGI
@@ -1,43 +1,6 @@
-CHANGES.txt - 2009-08-07
+CHANGES.txt - 2009-06-08
 ------------------------

-CHANGES IN CUPS V1.4.0
-
-	- Localization updates (STR #3223, STR #3246, STR #3248, STR #3250)
-	- Documentation updates (STR #3225, STR #3230, STR #3242, STR #3260)
-	- The --with-pdftops configure option did not accept a full path to the
-	  filter (STR #3278)
-	- The banner filter did not position the back side image correctly
-	  (STR #3277)
-	- The dnssd backend could crash (STR #3272)
-	- The 1284 device ID sometimes contained trailing garbage (STR #3266)
-	- The USB backend returned different URIs for some printers than in
-	  CUPS 1.3 (STR #3259)
-	- The scheduler did not do local job-hold-until processing for remote
-	  queues (STR #3258)
-	- The scheduler did not try all possible SSL certificates on Mac OS X.
-	- The scheduler did not always remove a file descriptor when using the
-	  kqueue interface (STR #3256)
-	- The scheduler did not protect against bad job control files in all
-	  cases (STR #3253)
-	- The scheduler did not encode "+" in model names (STR #3254)
-	- The web interface didn't show the default options (STR #3244)
-	- The IPP and LPD backends needed print data before they would do an
-	  SNMP query.
-	- Fixed a GNU TLS compatibility issue (STR #3231)
-	- Fixed a HTML error in the add and modify printer web interface
-	  templates (STR #3229)
-	- The scheduler did not minimize the number of printer state events that
-	  were generated by filter STATE: messages, which could lead to poor
-	  performance.
-	- The USB backend on Mac OS X did not cleanly cancel a job.
-	- The network backends now set the connecting-to-device printer-state-
-	  reasons value when looking up the address and copying the print data
-	  for consistency.
-	- The scheduler now supports the com.apple.print.recoverable-warning
-	  reason on all platforms.
-
-
 CHANGES IN CUPS V1.4rc1

 	- The PPD compiler documentation was missing information on localization
@@ -1,4 +1,4 @@
-CREDITS.txt - 2009-07-07
+CREDITS.txt - 2008-12-08
 ------------------------

 Few projects are completed by one person, and CUPS is no exception.  We'd
@@ -17,7 +17,6 @@ like to thank the following individuals for their contributions:
    Wang Jian                      - CUPS RPM corrections.
    Roderick Johnstone             - Beta tester of the millenium.
    Till Kamppeter                 - Bug fixes, beta testing, evangelism.
-    I–aki Larra–aga                - Basque localization.
    Kenshi Muto                    - Japanese localization, patches, and
                                     testing.
    Tomohiro Kato                  - Japanese localization.
@@ -29,7 +28,6 @@ like to thank the following individuals for their contributions:
    Jason McMullan                 - Original CUPS RPM distributions.
    Wes Morgan                     - *BSD fixes.
    Daniel Nylander                - Swedish localization.
-    Niklas 'Nille' �kerstršm       - Swedish localization.
    Giulio Orsero                  - Bug fixes and testing.
    Michal Osowiecki               - Polish localization.
    Citra Paska                    - Indonesian localization.
@@ -1,5 +1,5 @@
-INSTALL - CUPS v1.4.0 - 2009-06-26
----------------------------------
+INSTALL - CUPS v1.4rc1 - 2009-05-22
+-----------------------------------

 This file describes how to compile and install CUPS from source code. For more
 information on CUPS see the file called "README.txt".  A complete change log can
@@ -43,7 +43,7 @@ COMPILING THE SUBVERSION REPOSITORY CODE
    configure script.  You'll need to run the GNU autoconf software (2.60 or
    higher) to create it:

-	autoconf
+	autoconf -f


 CONFIGURATION
@@ -392,7 +392,6 @@ docset:	apihelp
 	echo Indexing docset...
 	/Developer/usr/bin/docsetutil index org.cups.docset
 	echo Generating docset archive and feed...
-	$(RM) org.cups.docset.atom
 	/Developer/usr/bin/docsetutil package --output org.cups.docset.xar \
 		--atom org.cups.docset.atom \
 		--download-url http://www.cups.org/org.cups.docset.xar \
@@ -1,5 +1,5 @@
-README - CUPS v1.4.0 - 2009-06-26
---------------------------------
+README - CUPS v1.4rc1 - 2009-05-22
+----------------------------------

 Looking for compile instructions?  Read the file "INSTALL.txt"
 instead...
@@ -153,8 +153,8 @@ main(int  argc,				/* I - Number of command-line args */
  memset(&action, 0, sizeof(action));

  sigemptyset(&action.sa_mask);
-  action.sa_handler = sigterm_handler;
-  sigaction(SIGTERM, &action, NULL);
+  action.sa_handler = SIG_IGN;
+  sigaction(SIGTERM, &action, sigterm_handler);
 #else
  signal(SIGTERM, sigterm_handler);
 #endif /* HAVE_SIGSET */
@@ -196,19 +196,12 @@ backendGetDeviceID(
      * and then limit the length to the size of our buffer...
      */

-      if (length > device_id_size)
+      if (length > (device_id_size - 2))
 	length = (((unsigned)device_id[1] & 255) << 8) +
 		 ((unsigned)device_id[0] & 255);

-      if (length > device_id_size)
-	length = device_id_size;
-
-     /*
-      * The length field counts the number of bytes in the string
-      * including the length field itself (2 bytes).
-      */
-
-      length -= 2;
+      if (length > (device_id_size - 2))
+	length = device_id_size - 2;

     /*
      * Copy the device ID text to the beginning of the buffer and
@@ -313,14 +306,6 @@ backendGetDeviceID(
      mfg = temp;
    }

-    if (!strncasecmp(mdl, mfg, strlen(mfg)))
-    {
-      mdl += strlen(mfg);
-
-      while (isspace(*mdl & 255))
-        mdl ++;
-    }
-
   /*
    * Generate the device URI from the manufacturer, make_model, and
    * serial number strings.
@@ -91,7 +91,7 @@ main(int  argc,				/* I - Number of command-line args */
  int		num_options;		/* Number of printer options */
  cups_option_t	*options;		/* Printer options */
  const char	*device_uri;		/* Device URI */
-  char		scheme[255],		/* Scheme in URI */
+  char		method[255],		/* Method in URI */
 		hostname[1024],		/* Hostname */
 		username[255],		/* Username info */
 		resource[1024],		/* Resource info (printer name) */
@@ -236,14 +236,21 @@ main(int  argc,				/* I - Number of command-line args */
  if ((device_uri = cupsBackendDeviceURI(argv)) == NULL)
    return (CUPS_BACKEND_FAILED);

-  httpSeparateURI(HTTP_URI_CODING_ALL, device_uri, scheme, sizeof(scheme),
-                  username, sizeof(username), hostname, sizeof(hostname), &port,
-		  resource, sizeof(resource));
+  if (httpSeparateURI(HTTP_URI_CODING_ALL, device_uri,
+                      method, sizeof(method), username, sizeof(username),
+		      hostname, sizeof(hostname), &port,
+		      resource, sizeof(resource)) < HTTP_URI_OK)
+  {
+    _cupsLangPuts(stderr,
+                  _("ERROR: Missing device URI on command-line and no "
+		    "DEVICE_URI environment variable!\n"));
+    return (CUPS_BACKEND_STOP);
+  }

  if (!port)
    port = IPP_PORT;			/* Default to port 631 */

-  if (!strcmp(scheme, "https"))
+  if (!strcmp(method, "https"))
    cupsSetEncryption(HTTP_ENCRYPT_ALWAYS);
  else
    cupsSetEncryption(HTTP_ENCRYPT_IF_REQUESTED);
@@ -409,12 +416,11 @@ main(int  argc,				/* I - Number of command-line args */

    int			fd;		/* File descriptor */
    http_addrlist_t	*addrlist;	/* Address list */
+    char		buffer[8192];	/* Buffer for copying */
+    int			bytes;		/* Number of bytes read */
    off_t		tbytes;		/* Total bytes copied */


-    fputs("STATE: +connecting-to-device\n", stderr);
-    fprintf(stderr, "DEBUG: Looking up \"%s\"...\n", hostname);
-
    if ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, "1")) == NULL)
    {
      _cupsLangPrintf(stderr, _("ERROR: Unable to locate printer \'%s\'!\n"),
@@ -432,8 +438,23 @@ main(int  argc,				/* I - Number of command-line args */

    _cupsLangPuts(stderr, _("INFO: Copying print data...\n"));

-    tbytes = backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0,
-                            backendNetworkSideCB);
+    tbytes = 0;
+
+    while ((bytes = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
+    {
+      if (write(fd, buffer, bytes) < bytes)
+      {
+        _cupsLangPrintError(_("ERROR: Unable to write to temporary file"));
+	close(fd);
+	unlink(tmpfilename);
+	return (CUPS_BACKEND_FAILED);
+      }
+      else
+        tbytes += bytes;
+
+      if (snmp_fd >= 0)
+	backendCheckSideChannel(snmp_fd, &(addrlist->addr));
+    }

    if (snmp_fd >= 0)
      _cupsSNMPClose(snmp_fd);
@@ -523,7 +544,8 @@ main(int  argc,				/* I - Number of command-line args */

  do
  {
-    fprintf(stderr, "DEBUG: Connecting to %s:%d\n", hostname, port);
+    fprintf(stderr, "DEBUG: Connecting to %s:%d\n",
+	    hostname, port);
    _cupsLangPuts(stderr, _("INFO: Connecting to printer...\n"));

    if ((http = httpConnectEncrypt(hostname, port, cupsEncryption())) == NULL)
@@ -639,8 +661,7 @@ main(int  argc,				/* I - Number of command-line args */
  * might contain username:password information...
  */

-  httpAssembleURI(HTTP_URI_CODING_ALL, uri, sizeof(uri), scheme, NULL, hostname,
-		  port, resource);
+  snprintf(uri, sizeof(uri), "%s://%s:%d%s", method, hostname, port, resource);

 /*
  * First validate the destination and see if the device supports multiple
@@ -113,7 +113,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
     char *argv[])			/* I - Command-line arguments */
 {
  const char	*device_uri;		/* Device URI */
-  char		scheme[255],		/* Scheme in URI */
+  char		method[255],		/* Method in URI */
 		hostname[1024],		/* Hostname */
 		username[255],		/* Username info */
 		resource[1024],		/* Resource info (printer name) */
@@ -193,8 +193,9 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  if ((device_uri = cupsBackendDeviceURI(argv)) == NULL)
    return (CUPS_BACKEND_FAILED);

-  httpSeparateURI(HTTP_URI_CODING_ALL, device_uri, scheme, sizeof(scheme),
-                  username, sizeof(username), hostname, sizeof(hostname), &port,
+  httpSeparateURI(HTTP_URI_CODING_ALL, device_uri,
+                  method, sizeof(method), username, sizeof(username),
+		  hostname, sizeof(hostname), &port,
 		  resource, sizeof(resource));

  if (!port)
@@ -425,11 +426,10 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */

    http_addrlist_t	*addrlist;	/* Address list */
    int			snmp_fd;	/* SNMP socket */
+    char		buffer[8192];	/* Buffer for copying */
+    int			bytes;		/* Number of bytes read */


-    fputs("STATE: +connecting-to-device\n", stderr);
-    fprintf(stderr, "DEBUG: Looking up \"%s\"...\n", hostname);
-
    if ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, "1")) == NULL)
    {
      _cupsLangPrintf(stderr, _("ERROR: Unable to locate printer \'%s\'!\n"),
@@ -447,7 +447,19 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */

    _cupsLangPuts(stderr, _("INFO: Copying print data...\n"));

-    backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, backendNetworkSideCB);
+    while ((bytes = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
+    {
+      if (write(fd, buffer, bytes) < bytes)
+      {
+        _cupsLangPrintError(_("ERROR: Unable to write to temporary file"));
+	close(fd);
+	unlink(tmpfilename);
+	return (CUPS_BACKEND_FAILED);
+      }
+
+      if (snmp_fd >= 0)
+	backendCheckSideChannel(snmp_fd, &(addrlist->addr));
+    }

    if (snmp_fd >= 0)
      _cupsSNMPClose(snmp_fd);
@@ -683,7 +695,6 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */

  sprintf(portname, "%d", port);

-  fputs("STATE: +connecting-to-device\n", stderr);
  fprintf(stderr, "DEBUG: Looking up \"%s\"...\n", hostname);

  if ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, portname)) == NULL)
@@ -710,8 +721,9 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */
    * First try to reserve a port for this connection...
    */

-    fprintf(stderr, "DEBUG: Connecting to %s:%d for printer %s\n", hostname,
-            port, printer);
+    fputs("STATE: +connecting-to-device\n", stderr);
+    fprintf(stderr, "DEBUG: Connecting to %s:%d for printer %s\n",
+	    hostname, port, printer);
    _cupsLangPuts(stderr, _("INFO: Connecting to printer...\n"));

    for (lport = reserve == RESERVE_RFC1179 ? 732 : 1024, addr = addrlist,
@@ -196,14 +196,6 @@ backendRunLoop(
    signal(SIGTERM, SIG_IGN);
 #endif /* HAVE_SIGSET */
  }
-  else if (print_fd < 0)
-  {
-   /*
-    * Copy print data from stdin, but don't mess with the signal handlers...
-    */
-
-    print_fd = 0;
-  }

 /*
  * Figure out the maximum file descriptor value to use with select()...
@@ -3,7 +3,7 @@
 *
 *   AppSocket backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2008 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -62,7 +62,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
     char *argv[])			/* I - Command-line arguments */
 {
  const char	*device_uri;		/* Device URI */
-  char		scheme[255],		/* Scheme in URI */
+  char		method[255],		/* Method in URI */
 		hostname[1024],		/* Hostname */
 		username[255],		/* Username info (not used) */
 		resource[1024],		/* Resource info (not used) */
@@ -168,8 +168,9 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  if ((device_uri = cupsBackendDeviceURI(argv)) == NULL)
    return (CUPS_BACKEND_FAILED);

-  httpSeparateURI(HTTP_URI_CODING_ALL, device_uri, scheme, sizeof(scheme),
-                  username, sizeof(username), hostname, sizeof(hostname), &port,
+  httpSeparateURI(HTTP_URI_CODING_ALL, device_uri,
+                  method, sizeof(method), username, sizeof(username),
+		  hostname, sizeof(hostname), &port,
 		  resource, sizeof(resource));

  if (port == 0)
@@ -260,7 +261,6 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */

  sprintf(portname, "%d", port);

-  fputs("STATE: +connecting-to-device\n", stderr);
  fprintf(stderr, "DEBUG: Looking up \"%s\"...\n", hostname);

  if ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, portname)) == NULL)
@@ -270,9 +270,12 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
    return (CUPS_BACKEND_STOP);
  }

-  fprintf(stderr, "DEBUG: Connecting to %s:%d\n", hostname, port);
+  fprintf(stderr, "DEBUG: Connecting to %s:%d\n",
+	  hostname, port);
  _cupsLangPuts(stderr, _("INFO: Connecting to printer...\n"));

+  fputs("STATE: +connecting-to-device\n", stderr);
+
  for (delay = 5;;)
  {
    if ((addr = httpAddrConnect(addrlist, &device_fd)) == NULL)
@@ -342,8 +345,9 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  if (recoverable)
  {
   /*
-    * If we've shown a recoverable error make sure the printer proxies have a
-    * chance to see the recovered message. Not pretty but necessary for now...
+    * If we've shown a recoverable error make sure the printer proxies
+    * have a chance to see the recovered message. Not pretty but
+    * necessary for now...
    */

    fputs("INFO: recovered: \n", stderr);
@@ -104,14 +104,6 @@
 extern char **environ;


-/*
- * DEBUG_WRITES, if defined, causes the backend to write data to the printer in
- * 512 byte increments, up to 8192 bytes, to make debugging with a USB bus
- * analyzer easier.
- */
-
-#define DEBUG_WRITES 0
-
 /*
 * WAIT_EOF_DELAY is number of seconds we'll wait for responses from
 * the printer after we've finished sending all the data
@@ -240,9 +232,6 @@ typedef struct globals_s

  int			print_fd;	/* File descriptor to print */
  ssize_t		print_bytes;	/* Print bytes read */
-#if DEBUG_WRITES
-  ssize_t		debug_bytes;	/* Current bytes to read */
-#endif /* DEBUG_WRITES */

  Boolean		wait_eof;
  int			drain_output;	/* Drain all pending output */
@@ -329,7 +318,8 @@ print_device(const char *uri,		/* I - Device URI */
 {
  char		  serial[1024];		/* Serial number buffer */
  OSStatus	  status;		/* Function results */
-  IOReturn	  iostatus;		/* Current IO status */
+  IOReturn	  iostatus,		/* Current IO status */
+		  prev_iostatus = 0;	/* Previous IO status */
  pthread_t	  read_thread_id,	/* Read thread */
 		  sidechannel_thread_id;/* Side-channel thread */
  int		  have_sidechannel = 0;	/* Was the side-channel thread started? */
@@ -622,16 +612,7 @@ print_device(const char *uri,		/* I - Device URI */

      if (FD_ISSET(print_fd, &input_set))
      {
-#if DEBUG_WRITES
-	g.debug_bytes += 512;
-        if (g.debug_bytes > sizeof(print_buffer))
-	  g.debug_bytes = 512;
-
-	g.print_bytes = read(print_fd, print_buffer, g.debug_bytes);
-
-#else
 	g.print_bytes = read(print_fd, print_buffer, sizeof(print_buffer));
-#endif /* DEBUG_WRITES */

 	if (g.print_bytes < 0)
 	{
@@ -665,7 +646,8 @@ print_device(const char *uri,		/* I - Device URI */

      if (g.print_bytes)
      {
-	bytes    = g.print_bytes;
+	bytes = g.print_bytes;
+
 	iostatus = (*g.classdriver)->WritePipe(g.classdriver, (UInt8*)print_ptr, &bytes, 0);

       /*
@@ -680,20 +662,26 @@ print_device(const char *uri,		/* I - Device URI */
 	}

       /*
-        * If we've stalled, retry the write...
+        * Ignore the first stall error we get since we try to clear any stalls
+	* in the class driver...
 	*/

 	else if (iostatus == kIOUSBPipeStalled)
 	{
 	  fputs("DEBUG: Got USB pipe stalled during write!\n", stderr);

-	  bytes    = g.print_bytes;
-	  iostatus = (*g.classdriver)->WritePipe(g.classdriver, (UInt8*)print_ptr, &bytes, 0);
+          bytes = 0;
+
+	  if (prev_iostatus != kIOUSBPipeStalled)
+	  {
+	    prev_iostatus = iostatus;
+	    iostatus      = 0;
+	  }
 	}

       /*
-	* Retry a write after an aborted write since we probably just got
-	* SIGTERM (<rdar://problem/6860126>)...
+	* Ignore the first "aborted" status we get, since we might have
+	* received a signal (<rdar://problem/6860126>)...
 	*/

 	else if (iostatus == kIOReturnAborted)
@@ -703,13 +691,16 @@ print_device(const char *uri,		/* I - Device URI */
 	  IOReturn err = (*g.classdriver)->Abort(g.classdriver);
 	  fprintf(stderr, "DEBUG: USB class driver Abort returned %x\n", err);

-#if DEBUG_WRITES
-          sleep(5);
-#endif /* DEBUG_WRITES */
+          bytes = 0;

-	  bytes    = g.print_bytes;
-	  iostatus = (*g.classdriver)->WritePipe(g.classdriver, (UInt8*)print_ptr, &bytes, 0);
+	  if (prev_iostatus != kIOReturnAborted)
+	  {
+	    prev_iostatus = iostatus;
+	    iostatus      = 0;
+	  }
        }
+	else
+          prev_iostatus = iostatus;

 	if (iostatus || bytes < 0)
 	{
@@ -1165,7 +1156,7 @@ static Boolean list_device_cb(void *refcon,
 	snprintf(optionsstr, sizeof(optionsstr), "?location=%x", (unsigned)deviceLocation);

      httpAssembleURI(HTTP_URI_CODING_ALL, uristr, sizeof(uristr), "usb", NULL, makestr, 0, modelstr);
-      strlcat(uristr, optionsstr, sizeof(uristr));
+      strncat(uristr, optionsstr, sizeof(uristr));

      cupsBackendReport("direct", uristr, make_modelstr, make_modelstr, idstr,
                        NULL);
@@ -2210,11 +2201,12 @@ static void get_device_id(cups_sc_status_t *status,
 			  char *data,
 			  int *datalen)
 {
+  UInt32 deviceLocation = 0;
+  UInt8	interfaceNum = 0;
  CFStringRef deviceIDString = NULL;

  /* GetDeviceID */
-  copy_deviceid(g.classdriver, &deviceIDString);
-
+  copy_devicestring(g.printer_obj, &deviceIDString, &deviceLocation, &interfaceNum);
  if (deviceIDString)
  {
    CFStringGetCString(deviceIDString, data, *datalen, kCFStringEncodingUTF8);
@@ -418,14 +418,12 @@ get_device_id(usb_printer_t *printer,	/* I - Printer */
  * and then limit the length to the size of our buffer...
  */

-  if (length > bufsize)
+  if (length > (bufsize - 2))
    length = (((unsigned)buffer[1] & 255) << 8) +
 	     ((unsigned)buffer[0] & 255);

-  if (length > bufsize)
-    length = bufsize;
-
-  length -= 2;
+  if (length > (bufsize - 2))
+    length = bufsize - 2;

 /*
  * Copy the device ID text to the beginning of the buffer and
@@ -492,12 +492,6 @@ do_am_class(http_t *http,		/* I - HTTP connection */

    request = ippNewRequest(CUPS_GET_PRINTERS);

-    ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_ENUM, "printer-type",
-		  CUPS_PRINTER_LOCAL);
-    ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_ENUM, "printer-type-mask",
-		  CUPS_PRINTER_CLASS | CUPS_PRINTER_REMOTE |
-		      CUPS_PRINTER_IMPLICIT);
-
   /*
    * Do the request and get back a response...
    */
@@ -357,7 +357,7 @@ write_index(const char   *path,		/* I - File to write */

 static void
 write_info(const char *path,		/* I - File to write */
-           const char *revision)	/* I - Subversion revision number */
+           const char *revision)	/* I - Version number */
 {
  cups_file_t	*fp;			/* File */

@@ -379,22 +379,14 @@ write_info(const char *path,		/* I - File to write */
 		     "\t<key>CFBundleName</key>\n"
 		     "\t<string>CUPS Documentation</string>\n"
 		     "\t<key>CFBundleVersion</key>\n"
-		     "\t<string>%d.%d.%s</string>\n"
-		     "\t<key>CFBundleShortVersionString</key>\n"
-		     "\t<string>%d.%d.%d</string>\n"
+		     "\t<string>1.4.%s</string>\n"
 		     "\t<key>DocSetFeedName</key>\n"
 		     "\t<string>cups.org</string>\n"
 		     "\t<key>DocSetFeedURL</key>\n"
-		     "\t<string>http://www.cups.org/org.cups.docset.atom"
+		     "\t<string>http://www.cups.org/org.cups.docset.xar"
 		     "</string>\n"
-		     "\t<key>DocSetPublisherIdentifier</key>\n"
-		     "\t<string>org.cups</string>\n"
-		     "\t<key>DocSetPublisherName</key>\n"
-		     "\t<string>CUPS</string>\n"
 		     "</dict>\n"
-		     "</plist>\n",
-		     CUPS_VERSION_MAJOR, CUPS_VERSION_MINOR, revision,
-		     CUPS_VERSION_MAJOR, CUPS_VERSION_MINOR, CUPS_VERSION_PATCH);
+		     "</plist>\n", revision);

  cupsFileClose(fp);
 }
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-common.m4 8708 2009-06-12 04:16:02Z mike $"
+dnl "$Id: cups-common.m4 8686 2009-05-26 23:27:06Z mike $"
 dnl
 dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -20,7 +20,7 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)

 dnl Version number information...
-CUPS_VERSION="1.4.0"
+CUPS_VERSION="1.4rc1"
 CUPS_REVISION=""
 #if test -z "$CUPS_REVISION" -a -d .svn; then
 #	CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
@@ -144,6 +144,9 @@ fi
 dnl Check for random number functions...
 AC_CHECK_FUNCS(random mrand48 lrand48)

+dnl Checks for mkstemp and mkstemps functions.
+AC_CHECK_FUNCS(mkstemp mkstemps)
+
 dnl Check for geteuid function.
 AC_CHECK_FUNCS(geteuid)

@@ -355,5 +358,5 @@ AC_SUBST(FONTS)
 AC_SUBST(LEGACY_BACKENDS)

 dnl
-dnl End of "$Id: cups-common.m4 8708 2009-06-12 04:16:02Z mike $".
+dnl End of "$Id: cups-common.m4 8686 2009-05-26 23:27:06Z mike $".
 dnl
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-pdf.m4 8760 2009-08-07 22:30:30Z mike $"
+dnl "$Id: cups-pdf.m4 8430 2009-03-12 21:50:44Z mike $"
 dnl
 dnl   PDF filter configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -13,7 +13,7 @@ dnl   which should have been included with this file.  If this file is
 dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl

-AC_ARG_WITH(pdftops, [  --with-pdftops          set pdftops filter (gs,/path/to/gs,pdftops,/path/to/pdftops,none), default=pdftops ])
+AC_ARG_WITH(pdftops, [  --with-pdftops          set pdftops filter (gs,pdftops,none), default=pdftops ])

 PDFTOPS=""
 CUPS_PDFTOPS=""
@@ -47,12 +47,6 @@ case "x$with_pdftops" in
 	fi
 	;;

-	x/*/gs) # Use /path/to/gs without any check:
-	CUPS_GHOSTSCRIPT="$with_pdftops"
-	AC_DEFINE(HAVE_GHOSTSCRIPT)
-	PDFTOPS="pdftops"
-	;;
-
 	xpdftops)
 	AC_PATH_PROG(CUPS_PDFTOPS, pdftops)
 	if test "x$CUPS_PDFTOPS" != x; then
@@ -63,20 +57,6 @@ case "x$with_pdftops" in
 		exit 1
 	fi
 	;;
-
-	x/*/pdftops) # Use /path/to/pdftops without any check:
-	CUPS_PDFTOPS="$with_pdftops"
-	AC_DEFINE(HAVE_PDFTOPS)
-	PDFTOPS="pdftops"
-	;;
-
-	xnone) # Make no pdftops filter if with_pdftops=none:
-	;;
-
-	*) # Invalid with_pdftops value:
-	AC_MSG_ERROR(Invalid with_pdftops value!)
-	exit 1
-	;;
 esac

 AC_DEFINE_UNQUOTED(CUPS_PDFTOPS, "$CUPS_PDFTOPS")
@@ -84,5 +64,5 @@ AC_DEFINE_UNQUOTED(CUPS_GHOSTSCRIPT, "$CUPS_GHOSTSCRIPT")
 AC_SUBST(PDFTOPS)

 dnl
-dnl End of "$Id: cups-pdf.m4 8760 2009-08-07 22:30:30Z mike $".
+dnl End of "$Id: cups-pdf.m4 8430 2009-03-12 21:50:44Z mike $".
 dnl
@@ -335,6 +335,14 @@
 #undef HAVE_DNSSD


+/*
+ * Do we have Darwin's CoreFoundation and SystemConfiguration frameworks?
+ */
+
+#undef HAVE_COREFOUNDATION
+#undef HAVE_SYSTEMCONFIGURATION
+
+
 /*
 * Do we have <sys/ioctl.h>?
 */
@@ -342,6 +350,14 @@
 #undef HAVE_SYS_IOCTL_H


+/*
+ * Do we have mkstemp() and/or mkstemps()?
+ */
+
+#undef HAVE_MKSTEMP
+#undef HAVE_MKSTEMPS
+
+
 /*
 * Does the "tm" structure contain the "tm_gmtoff" member?
 */
@@ -1,5 +1,5 @@
 <!--
-  "$Id: api-filter.shtml 8718 2009-06-18 17:41:03Z mike $"
+  "$Id: api-filter.shtml 8628 2009-05-13 22:25:34Z mike $"

  Filter and backend programming introduction for the Common UNIX Printing
  System (CUPS).
@@ -127,7 +127,7 @@ when running print filters and backends:</p>

 <dl class="code">

-	<dt>APPLE_LANGUAGE</dt>
+	<dt>APPLE_LANGUAGES</dt>
 	<dd>The Apple language identifier associated with the job
 	(Mac OS X only).</dd>

@@ -264,16 +264,7 @@ prefix strings:</p>
 	current queue. Typically this is used to indicate persistent media,
 	ink, toner, and configuration conditions or errors on a printer.
 	<a href='#TABLE2'>Table 2</a> lists the standard state keywords -
-	use vendor-prefixed ("com.acme.foo") keywords for custom states.
-
-	<blockquote><b>Note:</b>
-
-	<p>"STATE:" messages often provide visible alerts to the user. For example, on
-	Mac OS X setting a printer-state-reason value with an "-error" or "-warning"
-	suffix will cause the printer's dock item to bounce if the corresponding reason
-	is localized with a cupsIPPReason keyword in the printer's PPD file.</p>
-
-	</blockquote></dd>
+	use vendor-prefixed ("com.acme.foo") keywords for custom states.</dd>

 	<dt>WARNING: message</dt>
 	<dd>Sets the printer-state-message attribute and adds the specified
@@ -285,6 +276,7 @@ prefix strings:</p>
 <p>Messages without one of these prefixes are treated as if they began with
 the "DEBUG:" prefix string.</p>

+
 <div class='table'><table width='80%' summary='Table 1: Standard marker-types Values'>
 <caption>Table 1: <a name='TABLE1'>Standard marker-types Values</a></caption>
 <thead>
@@ -50,7 +50,6 @@
 #include "debug.h"
 #include "globals.h"
 #include <stdlib.h>
-#include <errno.h>
 #ifdef HAVE_DNSSD
 #  include <dns_sd.h>
 #  include <poll.h>
@@ -1407,6 +1406,7 @@ _httpResolveURI(
      fputs("STATE: +connecting-to-device\n", stderr);
      fprintf(stderr, "DEBUG: Resolving \"%s\", regtype=\"%s\", "
                      "domain=\"local.\"...\n", hostname, regtype);
+      _cupsLangPuts(stderr, _("INFO: Looking for printer...\n"));
    }

    uri = NULL;
@@ -1418,65 +1418,36 @@ _httpResolveURI(
 			    hostname, regtype, "local.", resolve_callback,
 			    &uribuf) == kDNSServiceErr_NoError)
      {
-	int	fds;			/* Number of ready descriptors */
-	time_t	timeout,		/* Poll timeout */
-		start_time = time(NULL);/* Start time */
-
-	for (;;)
+        if (strcasecmp(domain, "local."))
 	{
-	  if (logit)
-	    _cupsLangPuts(stderr, _("INFO: Looking for printer...\n"));
-
 	 /*
-	  * For the first minute, wakeup every 2 seconds to emit a
-	  * "looking for printer" message...
+	  * Wait 2 seconds for a response to the local resolve; if nothing comes
+	  * in, do an additional domain resolution...
 	  */

-	  timeout = (time(NULL) < (start_time + 60)) ? 2000 : -1;
-
 	  polldata.fd     = DNSServiceRefSockFD(ref);
 	  polldata.events = POLLIN;

-	  fds = poll(&polldata, 1, timeout);
-
-	  if (fds < 0)
-	  {
-	    if (errno != EINTR && errno != EAGAIN)
-	    {
-	      DEBUG_printf(("5_httpResolveURI: poll error: %s", strerror(errno)));
-	      break;
-	    }
-	  }
-	  else if (fds == 0)
+	  if (poll(&polldata, 1, 2000) != 1)
 	  {
 	   /*
-	    * Wait 2 seconds for a response to the local resolve; if nothing
-	    * comes in, do an additional domain resolution...
+	    * OK, send the domain name resolve...
 	    */

-	    if (domainsent == 0 && strcasecmp(domain, "local."))
-	    {
-	      if (logit)
-		fprintf(stderr,
-		        "DEBUG: Resolving \"%s\", regtype=\"%s\", "
-			"domain=\"%s\"...\n", hostname, regtype, domain);
-  
-	      domainref = ref;
-	      if (DNSServiceResolve(&domainref, kDNSServiceFlagsShareConnection, 0,
-				    hostname, regtype, domain, resolve_callback,
-				    &uribuf) == kDNSServiceErr_NoError)
-		domainsent = 1;
-	    }
+	    if (logit)
+	      fprintf(stderr, "DEBUG: Resolving \"%s\", regtype=\"%s\", "
+		              "domain=\"%s\"...\n", hostname, regtype, domain);
+
+	    domainref = ref;
+	    if (DNSServiceResolve(&domainref, kDNSServiceFlagsShareConnection, 0,
+				  hostname, regtype, domain, resolve_callback,
+				  &uribuf) == kDNSServiceErr_NoError)
+	      domainsent = 1;
 	  }
-	  else
-	  {
-	    if (DNSServiceProcessResult(ref) == kDNSServiceErr_NoError)
-	    {
-	      uri = resolved_uri;
-	      break;
-	    }
-	  }
-	}
+        }
+
+	if (DNSServiceProcessResult(ref) == kDNSServiceErr_NoError)
+	  uri = resolved_uri;

 	if (domainsent)
 	  DNSServiceRefDeallocate(domainref);
@@ -3004,11 +3004,6 @@ http_setup_ssl(http_t *http)		/* I - Connection to server */
    http->error  = errno;
    http->status = HTTP_ERROR;

-    gnutls_deinit(conn->session);
-    gnutls_certificate_free_credentials(*credentials);
-    free(credentials);
-    free(conn);
-
    return (-1);
  }

@@ -3143,13 +3138,6 @@ http_upgrade(http_t *http)		/* I - Connection to server */

  DEBUG_printf(("7http_upgrade(%p)", http));

- /*
-  * Flush the connection to make sure any previous "Upgrade" message
-  * has been read.
-  */
-
-  httpFlush(http);
-
 /*
  * Copy the HTTP data to a local variable so we can do the OPTIONS
  * request without interfering with the existing request data...
@@ -3177,6 +3165,8 @@ http_upgrade(http_t *http)		/* I - Connection to server */
    while (httpUpdate(http) == HTTP_CONTINUE);
  }

+  httpFlush(http);
+
 /*
  * Restore the HTTP request data...
  */
@@ -4,7 +4,7 @@
 *   Hyper-Text Transport Protocol definitions for the Common UNIX Printing
 *   System (CUPS).
 *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -266,9 +266,9 @@ cupsDoIORequest(http_t     *http,	/* I - Connection to server or @code CUPS_HTTP

    DEBUG_printf(("2cupsDoIORequest: status=%d", status));

-    if (status == HTTP_FORBIDDEN || status >= HTTP_SERVER_ERROR)
+    if (status == HTTP_FORBIDDEN || status == HTTP_ERROR ||
+	status >= HTTP_SERVER_ERROR)
    {
-      httpFlush(http);
      _cupsSetHTTPError(status);
      break;
    }
@@ -64,10 +64,8 @@ main(int  argc,				/* I - Number of command-line arguments */
  int		status;			/* Exit status */
  char		filename[1024];		/* Filename buffer */
  cups_file_t	*fp;			/* File pointer */
-#ifndef WIN32
  int		fds[2];			/* Open file descriptors */
  cups_file_t	*fdfile;		/* File opened with cupsFileOpenFd() */
-#endif /* !WIN32 */
  int		count;			/* Number of lines in file */


@@ -95,7 +93,6 @@ main(int  argc,				/* I - Number of command-line arguments */

    status += random_tests();

-#ifndef WIN32
   /*
    * Test fdopen and close without reading...
    */
@@ -129,7 +126,6 @@ main(int  argc,				/* I - Number of command-line arguments */

      puts("PASS");
    }
-#endif /* !WIN32 */

   /*
    * Count lines in euc-jp.txt, rewind, then count again.
@@ -760,7 +756,7 @@ read_write_tests(int compression)	/* I - Use compression? */

    fputs("cupsFileGetChar(partial line): ", stdout);

-    for (i = 0; i < (int)strlen(partial_line); i ++)
+    for (i = 0; i < strlen(partial_line); i ++)
      if ((byte = cupsFileGetChar(fp)) < 0)
        break;
      else if (byte != partial_line[i])
@@ -247,7 +247,7 @@ main(int  argc,				/* I - Number of command-line arguments */
    for (i = 0, j = 0; i < (int)(sizeof(base64_tests) / sizeof(base64_tests[0])); i ++)
    {
      httpEncode64_2(encode, sizeof(encode), base64_tests[i][0],
-                     (int)strlen(base64_tests[i][0]));
+                     strlen(base64_tests[i][0]));
      decodelen = (int)sizeof(decode);
      httpDecode64_2(decode, &decodelen, base64_tests[i][1]);

@@ -809,8 +809,7 @@ cupsGetJobs2(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_D
 * in the class.
 *
 * The returned filename is stored in a static buffer and is overwritten with
- * each call to @code cupsGetPPD@ or @link cupsGetPPD2@.  The caller "owns" the
- * file that is created and must @code unlink@ the returned filename.
+ * each call to @code cupsGetPPD@ or @link cupsGetPPD2@.
 */

 const char *				/* O - Filename for PPD file */
@@ -841,8 +840,7 @@ cupsGetPPD(const char *name)		/* I - Destination name */
 * in the class.
 *
 * The returned filename is stored in a static buffer and is overwritten with
- * each call to @link cupsGetPPD@ or @code cupsGetPPD2@.  The caller "owns" the
- * file that is created and must @code unlink@ the returned filename.
+ * each call to @link cupsGetPPD@ or @code cupsGetPPD2@.
 *
 * @since CUPS 1.1.21/Mac OS X 10.4@
 */
@@ -875,8 +873,7 @@ cupsGetPPD2(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_DE
 *
 * The "buffer" parameter contains the local PPD filename.  If it contains
 * the empty string, a new temporary file is created, otherwise the existing
- * file will be overwritten as needed.  The caller "owns" the file that is
- * created and must @code unlink@ the returned filename.
+ * file will be overwritten as needed.
 *
 * On success, @code HTTP_OK@ is returned for a new PPD file and
 * @code HTTP_NOT_MODIFIED@ if the existing PPD file is up-to-date.  Any other
@@ -15,8 +15,6 @@ Name[es.UTF-8]=Administrar impresión
 Comment[es.UTF-8]=Interfaz Web de CUPS
 Name[et.UTF-8]=Trükkimise haldur
 Comment[et.UTF-8]=CUPS-i veebiliides
-Name[eu.UTF-8]=Kudeatu inprimaketak
-Comment[eu.UTF-8]=CUPSen web interfazea
 Name[fr.UTF-8]=Gestionnaire d'impression
 Comment[fr.UTF-8]=Interface Web de CUPS
 Name[he.UTF-8]=נהל הדפסות
@@ -31,8 +29,6 @@ Name[pl.UTF-8]=Zarządzanie drukowaniem
 Comment[pl.UTF-8]=Interfejs WWW CUPS
 Name[ru.UTF-8]=Настройка печати
 Comment[ru.UTF-8]=Настройка CUPS
-Name[sv.UTF-8]=Hantera skrivare
-Comment[sv.UTF-8]=CUPS webb-gränssnitt
 Name[zh.UTF-8]=打印机管理
 Comment[zh.UTF-8]=CUPS网页界面
 Name[zh_TW.UTF-8]=印表管理
@@ -1,106 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML>
-<HEAD>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-	<TITLE>Hasiera - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
-	<LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
-	<LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png">
-</HEAD>
-<BODY>
-<TABLE CLASS="page" SUMMARY="{title}">
-<TR><TD CLASS="body">
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" SUMMARY="">
-<TR HEIGHT="36">
-<TD><A HREF="http://www.cups.org/" TARGET="_blank"><IMG
-SRC="/images/left.gif" WIDTH="64" HEIGHT="36" BORDER="0" ALT=""></A></TD>
-<TD CLASS="sel"><A HREF="/">&nbsp;&nbsp;Hasiera&nbsp;&nbsp;</A></TD>
-<TD CLASS="unsel"><A HREF="/admin">&nbsp;&nbsp;Administrazioa&nbsp;&nbsp;</A></TD>
-<TD CLASS="unsel"><A HREF="/classes/">&nbsp;&nbsp;Klaseak&nbsp;&nbsp;</A></TD>
-<TD CLASS="unsel"><A HREF="/help/">&nbsp;&nbsp;Lineako&nbsp;laguntza&nbsp;&nbsp;</A></TD>
-<TD CLASS="unsel"><A HREF="/jobs/">&nbsp;&nbsp;Lanak&nbsp;&nbsp;</A></TD>
-<TD CLASS="unsel"><A HREF="/printers/">&nbsp;&nbsp;Inprimagailuak&nbsp;&nbsp;</A></TD>
-<TD CLASS="unsel" WIDTH="100%"><FORM ACTION="/help/" METHOD="GET"><INPUT
-TYPE="SEARCH" NAME="QUERY" SIZE="20" PLACEHOLDER="Bilatu laguntzan"
-AUTOSAVE="org.cups.help" RESULTS="20"></FORM></TD>
-<TD><IMG SRC="/images/right.gif" WIDTH="4" HEIGHT="36" ALT=""></TD>
-</TR>
-</TABLE>
-
-<TABLE CLASS="indent" SUMMARY="">
-<TR><TD STYLE="padding-right: 20px;">
-
-<H1>CUPS @CUPS_VERSION@</H1>
-
-<P><A HREF="http://www.apple.com/">Apple Inc.</A>-ek Mac OS<SUP>&reg;</SUP> X eta
-beste UNIX<SUP>&reg;</SUP> bezalako sistema eragileentzako iturburu irekiko 
-inprimatzeko sisteman oinarrituta dago.</P>
-
-</TD>
-<TD><A HREF="http://www.cups.org/"><IMG SRC="images/cups-icon.png" WIDTH="128"
-HEIGHT="128" ALT="CUPS"></A></TD>
-</TR>
-</TABLE>
-
-<TABLE CLASS="indent" SUMMARY="">
-<TR><TD VALIGN="top" STYLE="border-right: dotted thin #cccccc; padding-right: 20px;">
-
-<H2>CUPS erabiltzaileentzako</H2>
-
-<P><A HREF="help/overview.html">CUPSen gainbegiraketa</A></P>
-
-<P><A HREF="help/options.html">Komando-lerroaren bidez inprimatzea eta aukerak</A></P>
-
-<P><A HREF="help/whatsnew.html">CUPS 1.4 bertsioak dakartzan berrikuntza.</A></P>
-
-<P><A HREF="http://www.cups.org/newsgroups.php?gcups.general">Erabiltzaileen foroa</A></P>
-
-</TD><TD VALIGN="top" STYLE="border-right: dotted thin #cccccc; padding-left: 20px; padding-right: 20px;">
-
-<H2>CUPS administratzaileentzako</H2>
-
-<P><A HREF="admin">Inprimagailuak eta klaseak gehitzea</A></P>
-
-<P><A HREF="help/policies.html">Kudeaketako eragiketen politikak</A></P>
-
-<P><A HREF="help/accounting.html">Inprimagailuaren oinarrizko kontabilitatea</A></P>
-
-<P><A HREF="help/security.html">Zerbitzariaren segurtasuna</A></P>
-
-<P><A HREF="help/kerberos.html">Kerberos autentifikazioa erabiltzea</A></P>
-
-<P><A HREF="help/network.html">Sareko inprimagailuak erabiltzea</A></P>
-
-<P><A HREF="help/ref-cupsd-conf.html">cupsd.conf erreferentzia</A></P>
-
-<P><A HREF="http://www.cups.org/ppd.php">Bilatu inprimagailuaren kontrolatzaileak</A></P>
-
-</TD><TD VALIGN="top" STYLE="padding-left: 20px;">
-
-<H2>CUPS garatzaileentzako</H2>
-
-<P><A HREF="help/api-overview.html">Sarrera CUPSen programaziora</A></P>
-
-<P><A HREF="help/api-cups.html">CUPSen APIa</A></P>
-
-<P><A HREF="help/api-filter.html">Iragazkien eta atzeko planoan programatzeea</A></P>
-
-<P><A HREF="help/api-httpipp.html">HTTP eta IPP APIak</A></P>
-
-<P><A HREF="help/api-ppd.html">PPD APIa</A></P>
-
-<P><A HREF="help/api-raster.html">Bilbearen APIa</A></P>
-
-<P><A HREF="help/ref-ppdcfile.html">PPD kontrolatzaileen konpilatzailearen informazioaren fitxategiaren erreferentzia</A></P>
-
-<P><A HREF="http://www.cups.org/newsgroups.php?gcups.development">Garatzaileen forua</A></P>
-
-</TD></TR>
-</TABLE>
-
-</TD></TR>
-<TR><TD>&nbsp;</TD></TR>
-<TR><TD CLASS="trailer">CUPS eta CUPSen logotipoa <A HREF="http://www.apple.com">Apple Inc.</A>en marka erregistratuaj dira.
-CUPSen copyright-a 2007-2009 Apple Inc. Eskubide guztiak gordeta.</TD></TR>
-</TABLE>
-</BODY>
-</HTML>
@@ -338,7 +338,7 @@ div.contents ul.subcontents li {
 <body>
 <div class='body'>
 <!--
-  "$Id: api-cups.html 8726 2009-06-22 20:46:13Z mike $"
+  "$Id: api-cups.html 8653 2009-05-16 23:53:28Z mike $"

  CUPS API header for the Common UNIX Printing System (CUPS).

@@ -475,7 +475,7 @@ specified server.">cupsPrintFiles2</a></li>
 	<li><a href="#cups_ptype_e" title="Printer type/capability bit constants">cups_ptype_e</a></li>
 </ul></li>
 <!--
-  "$Id: api-cups.html 8726 2009-06-22 20:46:13Z mike $"
+  "$Id: api-cups.html 8653 2009-05-16 23:53:28Z mike $"

  CUPS API introduction for the Common UNIX Printing System (CUPS).

@@ -1491,8 +1491,7 @@ const char *cupsGetPPD (<br>
 in the class.<br>
 <br>
 The returned filename is stored in a static buffer and is overwritten with
-each call to <code>cupsGetPPD</code> or <a href="#cupsGetPPD2"><code>cupsGetPPD2</code></a>.  The caller &quot;owns&quot; the
-file that is created and must <code>unlink</code> the returned filename.</p>
+each call to <code>cupsGetPPD</code> or <a href="#cupsGetPPD2"><code>cupsGetPPD2</code></a>.</p>
 <h3 class="function"><span class="info">&nbsp;CUPS 1.1.21/Mac OS X 10.4&nbsp;</span><a name="cupsGetPPD2">cupsGetPPD2</a></h3>
 <p class="description">Get the PPD file for a printer from the specified server.</p>
 <p class="code">
@@ -1514,8 +1513,7 @@ const char *cupsGetPPD2 (<br>
 in the class.<br>
 <br>
 The returned filename is stored in a static buffer and is overwritten with
-each call to <a href="#cupsGetPPD"><code>cupsGetPPD</code></a> or <code>cupsGetPPD2</code>.  The caller &quot;owns&quot; the
-file that is created and must <code>unlink</code> the returned filename.
+each call to <a href="#cupsGetPPD"><code>cupsGetPPD</code></a> or <code>cupsGetPPD2</code>.

 </p>
 <h3 class="function"><span class="info">&nbsp;CUPS 1.4/Mac OS X 10.6&nbsp;</span><a name="cupsGetPPD3">cupsGetPPD3</a></h3>
@@ -1551,8 +1549,7 @@ the server.<br>
 <br>
 The &quot;buffer&quot; parameter contains the local PPD filename.  If it contains
 the empty string, a new temporary file is created, otherwise the existing
-file will be overwritten as needed.  The caller &quot;owns&quot; the file that is
-created and must <code>unlink</code> the returned filename.<br>
+file will be overwritten as needed.<br>
 <br>
 On success, <code>HTTP_OK</code> is returned for a new PPD file and
 <code>HTTP_NOT_MODIFIED</code> if the existing PPD file is up-to-date.  Any other
@@ -338,7 +338,7 @@ div.contents ul.subcontents li {
 <body>
 <div class='body'>
 <!--
-  "$Id: api-filter.html 8718 2009-06-18 17:41:03Z mike $"
+  "$Id: api-filter.html 8673 2009-05-22 17:34:15Z mike $"

  Filter and backend programming header for the Common UNIX Printing System
  (CUPS).
@@ -421,7 +421,7 @@ div.contents ul.subcontents li {
 	<li><a href="#cups_sc_status_e" title="Response status codes">cups_sc_status_e</a></li>
 </ul></li>
 <!--
-  "$Id: api-filter.html 8718 2009-06-18 17:41:03Z mike $"
+  "$Id: api-filter.html 8673 2009-05-22 17:34:15Z mike $"

  Filter and backend programming introduction for the Common UNIX Printing
  System (CUPS).
@@ -549,7 +549,7 @@ when running print filters and backends:</p>

 <dl class="code">

-	<dt>APPLE_LANGUAGE</dt>
+	<dt>APPLE_LANGUAGES</dt>
 	<dd>The Apple language identifier associated with the job
 	(Mac OS X only).</dd>

@@ -686,16 +686,7 @@ prefix strings:</p>
 	current queue. Typically this is used to indicate persistent media,
 	ink, toner, and configuration conditions or errors on a printer.
 	<a href='#TABLE2'>Table 2</a> lists the standard state keywords -
-	use vendor-prefixed ("com.acme.foo") keywords for custom states.
-
-	<blockquote><b>Note:</b>
-
-	<p>"STATE:" messages often provide visible alerts to the user. For example, on
-	Mac OS X setting a printer-state-reason value with an "-error" or "-warning"
-	suffix will cause the printer's dock item to bounce if the corresponding reason
-	is localized with a cupsIPPReason keyword in the printer's PPD file.</p>
-
-	</blockquote></dd>
+	use vendor-prefixed ("com.acme.foo") keywords for custom states.</dd>

 	<dt>WARNING: message</dt>
 	<dd>Sets the printer-state-message attribute and adds the specified
@@ -707,6 +698,7 @@ prefix strings:</p>
 <p>Messages without one of these prefixes are treated as if they began with
 the "DEBUG:" prefix string.</p>

+
 <div class='table'><table width='80%' summary='Table 1: Standard marker-types Values'>
 <caption>Table 1: <a name='TABLE1'>Standard marker-types Values</a></caption>
 <thead>
@@ -338,7 +338,7 @@ div.contents ul.subcontents li {
 <body>
 <div class='body'>
 <!--
-  "$Id: api-ppdc.html 8704 2009-06-10 15:51:21Z mike $"
+  "$Id: api-ppdc.html 8653 2009-05-16 23:53:28Z mike $"

  PPD Compiler API header for CUPS.

@@ -411,7 +411,7 @@ div.contents ul.subcontents li {
 	<li><a href="#ppdcOptType" title="// Option type">ppdcOptType</a></li>
 </ul></li>
 <!--
-  "$Id: api-ppdc.html 8704 2009-06-10 15:51:21Z mike $"
+  "$Id: api-ppdc.html 8653 2009-05-16 23:53:28Z mike $"

  PPD Compiler API introduction for CUPS.

@@ -865,22 +865,6 @@ void add_size (<br>
 </dl>
 <h5 class="returnvalue">Return Value</h5>
 <p class="description">Matching option or NULL</p>
-<h4 class="method"><a name="find_option_group">find_option_group</a></h4>
-<p class="description"></p>
-<p class="code">
-<a href="#ppdcOption">ppdcOption</a> *find_option_group (<br>
-&nbsp;&nbsp;&nbsp;&nbsp;const char *n,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;<a href="#ppdcGroup">ppdcGroup</a> **mg<br>
-);</p>
-<h5 class="parameters">Parameters</h5>
-<dl>
-<dt>n</dt>
-<dd class="description">Option name</dd>
-<dt>mg</dt>
-<dd class="description">Matching group or NULL</dd>
-</dl>
-<h5 class="returnvalue">Return Value</h5>
-<p class="description">Matching option or NULL</p>
 <h4 class="method"><a name="ppdcDriver">ppdcDriver</a></h4>
 <p class="description"></p>
 <p class="code">
@@ -135,14 +135,8 @@ to the access log file. The following levels are defined:</P>
 address, or network that is allowed access to the server. 
 <CODE>Allow</CODE> directives are cummulative, so multiple
 <CODE>Allow</CODE> directives can be used to allow access for
-multiple hosts or networks.</P>
-
-<P>Host and domain name matching require that you enable the <A
-HREF="#HostNameLookups"><CODE>HostNameLookups</CODE></A>
-directive.</P>
-
-<P>The <CODE>/mm</CODE> notation specifies a CIDR netmask, as shown in
-<A HREF="#TABLE1">Table 1</A>.</P>
+multiple hosts or networks.  The <CODE>/mm</CODE> notation
+specifies a CIDR netmask, as shown in Table 1.</P>

 <DIV CLASS="table"><TABLE SUMMARY="CIDR Netmasks">
 <CAPTION>Table 1: <A NAME="TABLE1">CIDR Netmasks</A></CAPTION>
@@ -394,10 +388,10 @@ browse packets from all hosts.</P>
 HREF="#HostNameLookups"><CODE>HostNameLookups</CODE></A>
 directive.</P>

-<P>IP address matching supports exact matches, partial addresses that match
-networks using netmasks of 255.0.0.0, 255.255.0.0, and 255.255.255.0, or network
-addresses using the specified netmask or bit count. The <CODE>/mm</CODE>
-notation specifies a CIDR netmask, a shown in <A HREF="TABLE1">Table 1</A>.</P>
+<P>IP address matching supports exact matches, partial addresses
+that match networks using netmasks of 255.0.0.0, 255.255.0.0, and
+255.255.255.0, or network addresses using the specified netmask
+or bit count.</P>

 <P>The <CODE>@LOCAL</CODE> name will allow browse data from all
 local interfaces. The <CODE>@IF(name)</CODE> name will allow
@@ -432,10 +426,10 @@ browse packets from any hosts.</P>
 HREF="#HostNameLookups"><CODE>HostNameLookups</CODE></A>
 directive.</P>

-<P>IP address matching supports exact matches, partial addresses that match
-networks using netmasks of 255.0.0.0, 255.255.0.0, and 255.255.255.0, or network
-addresses using the specified netmask or bit count. The <CODE>/mm</CODE>
-notation specifies a CIDR netmask, a shown in <A HREF="TABLE1">Table 1</A>.</P>
+<P>IP address matching supports exact matches, partial addresses
+that match networks using netmasks of 255.0.0.0, 255.255.0.0, and
+255.255.255.0, or network addresses using the specified netmask
+or bit count.</P>

 <P>The <CODE>@LOCAL</CODE> name will block browse data from all
 local interfaces. The <CODE>@IF(name)</CODE> name will block
@@ -1083,14 +1077,9 @@ printers are shared (published) by default. The default is
 address, or network that is denied access to the server.
 <CODE>Deny</CODE> directives are cummulative, so multiple
 <CODE>Deny</CODE> directives can be used to allow access for
-multiple hosts or networks.</P>
-
-<P>Host and domain name matching require that you enable the <A
-HREF="#HostNameLookups"><CODE>HostNameLookups</CODE></A>
-directive.</P>
-
-<P>The <CODE>/mm</CODE> notation specifies a CIDR netmask, a shown in
-<A HREF="TABLE1">Table 1</A>.</P>
+multiple hosts or networks. The <CODE>/mm</CODE> notation
+specifies a CIDR netmask, a shown in <A HREF="TABLE1">Table
+1</A>.</P>

 <P>The <CODE>@LOCAL</CODE> name will deny access from all local
 interfaces. The <CODE>@IF(name)</CODE> name will deny access from
@@ -1104,7 +1093,7 @@ HREF="#Location"><CODE>Location</CODE></A> or <A
 HREF="#Limit"><CODE>Limit</CODE></A> section.</P>


-<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.4/Mac OS X 10.6</SPAN><A NAME="DirtyCleanInterval">DirtyCleanInterval</A></H2>
+<H2 CLASS="title"><A NAME="DirtyCleanInterval">DirtyCleanInterval</A></H2>

 <H3>Examples</H3>

@@ -1117,9 +1106,7 @@ DirtyCleanInterval 0

 <P>The <CODE>DirtyCleanInterval</CODE> directive specifies the number of
 seconds to wait before updating configuration and state files for printers,
-classes, subscriptions, and jobs. The default is 30 seconds. A value of 0
-causes the update to occur as soon as possible, typically within a few
-milliseconds.</P>
+classes, subscriptions, and jobs. The default is 30 seconds.</P>


 <H2 CLASS="title"><A NAME="DocumentRoot">DocumentRoot</A></H2>
@@ -593,7 +593,7 @@ write_banner(banner_file_t *banner,	/* I - Banner file */
      printf("%.1f %.1f translate\n", PageLeft, PageBottom);
    else
      printf("%.1f %.1f translate\n", PageWidth - PageRight,
-             PageLength - PageTop);
+             PageLength - PageRight);
    puts("0 setgray");

    y = info_top;
@@ -29,11 +29,7 @@
 #  include <cups/string.h>
 #  include <stdlib.h>
 #  include <string.h>
-#  ifdef WIN32
-#    include <io.h>
-#  else
-#    include <unistd.h>
-#  endif /* WIN32 */
+#  include <unistd.h>
 #  include <errno.h>
 #  include <math.h>

@@ -204,15 +204,6 @@ cupsRasterInterpretPPD(

  strcpy(h->cupsPageSizeName, "Letter");

-#ifdef __APPLE__
- /*
-  * cupsInteger0 is also used for the total page count on Mac OS X; set an
-  * uncommon default value so we can tell if the driver is using cupsInteger0.
-  */
-
-  h->cupsInteger[0] = 0x80000000;
-#endif /* __APPLE__ */
-
 /*
  * Apply patches and options to the page header...
  */
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.4\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2009-06-18 15:43-0700\n"
+"POT-Creation-Date: 2009-06-05 14:00-0700\n"
 "PO-Revision-Date: 2009-02-16 12:00-0800\n"
 "Last-Translator: Apple Inc.\n"
 "Language-Team: Apple Inc.\n"
@@ -2446,6 +2446,13 @@ msgstr "ERROR: Manglende %%EndProlog!\n"
 msgid "ERROR: Missing %%EndSetup!\n"
 msgstr "ERROR: Manglende %%EndSetup!\n"

+msgid ""
+"ERROR: Missing device URI on command-line and no DEVICE_URI environment "
+"variable!\n"
+msgstr ""
+"ERROR: Manglende enheds-URI på kommandolinjen og ingen DEVICE_URI-"
+"miljøvariabel!\n"
+
 #, c-format
 msgid "ERROR: Missing value on line %d of banner file!\n"
 msgstr "ERROR: Manglende værdi på linje %d i bannerarkiv!\n"
@@ -3433,9 +3440,6 @@ msgstr "NULL PPD-arkivmarkør"
 msgid "Name OID uses indefinite length"
 msgstr "Navn-oid bruger uendelig længde"

-msgid "Nested classes are not allowed!"
-msgstr ""
-
 msgid "Never"
 msgstr "Aldrig"

@@ -5538,13 +5542,6 @@ msgstr "variable-bindings bruger uendelig længde"
 #~ msgid "600 DPI Grayscale"
 #~ msgstr "600 dpi gråtoner"

-#~ msgid ""
-#~ "ERROR: Missing device URI on command-line and no DEVICE_URI environment "
-#~ "variable!\n"
-#~ msgstr ""
-#~ "ERROR: Manglende enheds-URI på kommandolinjen og ingen DEVICE_URI-"
-#~ "miljøvariabel!\n"
-
 #~ msgid "ERROR: Unable to create temporary file - %s.\n"
 #~ msgstr "ERROR: Kan ikke oprette midlertidigt arkiv - %s.\n"

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.4\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2009-06-18 15:43-0700\n"
+"POT-Creation-Date: 2009-06-05 14:00-0700\n"
 "PO-Revision-Date: 2009-02-16 12:00-0800\n"
 "Last-Translator: Apple Inc.\n"
 "Language-Team: Apple Inc.\n"
@@ -2456,6 +2456,13 @@ msgstr "ERROR: Fehlender %%EndProlog!\n"
 msgid "ERROR: Missing %%EndSetup!\n"
 msgstr "ERROR: Fehlendes %%EndSetup!\n"

+msgid ""
+"ERROR: Missing device URI on command-line and no DEVICE_URI environment "
+"variable!\n"
+msgstr ""
+"ERROR: Geräte-URI fehlt in der Befehlszeile und keine DEVICE_URI "
+"Umgebungsvariable vorhanden!\n"
+
 #, c-format
 msgid "ERROR: Missing value on line %d of banner file!\n"
 msgstr "ERROR: Wert fehlt in Zeile %d der Bannerdatei!\n"
@@ -3465,9 +3472,6 @@ msgstr "NULL PPD File Pointer"
 msgid "Name OID uses indefinite length"
 msgstr "Name-OID hat unbestimmte Länge"

-msgid "Nested classes are not allowed!"
-msgstr ""
-
 msgid "Never"
 msgstr "Niemals"

@@ -5583,13 +5587,6 @@ msgstr "variable-bindings hat unbestimmte Länge"
 #~ msgid "600 DPI Grayscale"
 #~ msgstr "600 DPI Graustufen"

-#~ msgid ""
-#~ "ERROR: Missing device URI on command-line and no DEVICE_URI environment "
-#~ "variable!\n"
-#~ msgstr ""
-#~ "ERROR: Geräte-URI fehlt in der Befehlszeile und keine DEVICE_URI "
-#~ "Umgebungsvariable vorhanden!\n"
-
 #~ msgid "ERROR: Unable to create temporary file - %s.\n"
 #~ msgstr "ERROR: Temporäre Datei konnte nicht erstellt werden – %s.\n"

@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.4\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2009-06-18 15:43-0700\n"
-"PO-Revision-Date: 2009-07-02 20:00+0100\n"
+"POT-Creation-Date: 2009-06-05 14:00-0700\n"
+"PO-Revision-Date: 2009-05-23 13:15+0100\n"
 "Last-Translator: Juan Pablo González Riopedre <riopedre13@yahoo.es>\n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
@@ -2490,6 +2490,13 @@ msgstr "ERROR: Falta %%EndProlog.\n"
 msgid "ERROR: Missing %%EndSetup!\n"
 msgstr "ERROR: Falta %%EndSetup.\n"

+msgid ""
+"ERROR: Missing device URI on command-line and no DEVICE_URI environment "
+"variable!\n"
+msgstr ""
+"ERROR: Falta URI del dispositivo en la línea de comandos y no hay variable "
+"de entorno DEVICE_URI.\n"
+
 #, c-format
 msgid "ERROR: Missing value on line %d of banner file!\n"
 msgstr "ERROR: Falta el valor en la línea %d del archivo de rótulo.\n"
@@ -2567,7 +2574,7 @@ msgid "ERROR: Unable to copy PDF file"
 msgstr "ERROR: No se ha podido copiar el archivo PDF"

 msgid "ERROR: Unable to create pipe"
-msgstr "ERROR: No se ha podido crear el canal (pipe)"
+msgstr ""

 msgid "ERROR: Unable to create socket"
 msgstr "ERROR: No se ha podido crear socket"
@@ -2592,7 +2599,7 @@ msgid "ERROR: Unable to execute pdftops program"
 msgstr "ERROR: No se ha podido ejecutar el programa pdftops"

 msgid "ERROR: Unable to execute pstops program"
-msgstr "ERROR: No se ha podido ejecutar el programa pstops"
+msgstr ""

 #, c-format
 msgid "ERROR: Unable to fork pictwpstops: %s\n"
@@ -3496,9 +3503,6 @@ msgstr "Puntero de archivo PPD NULO"
 msgid "Name OID uses indefinite length"
 msgstr "Nombre OID usa una longitud indefinida"

-msgid "Nested classes are not allowed!"
-msgstr "No se permiten clases anidadas."
-
 msgid "Never"
 msgstr "Nunca"

@@ -5519,12 +5523,11 @@ msgstr "ppdc: No se ha proporcionado catálogo de mensajes para el idioma %s.\n"
 #, c-format
 msgid "ppdc: Option %s defined in two different groups on line %d of %s!\n"
 msgstr ""
-"ppdc: Opción %s definida en dos diferentes grupos en la línea %d de %s.\n"

 #, c-format
 msgid "ppdc: Option %s redefined with a different type on line %d of %s!\n"
 msgstr ""
-"ppdc: Opción %s redefinida con un tipo diferente en la línea %d de %s.\n"
+"ppdc: La opción %s redefinida con un tipo diferente en la línea %d de %s.\n"

 #, c-format
 msgid "ppdc: Option constraint must *name on line %d of %s!\n"
@@ -5687,3 +5690,14 @@ msgstr "sin título"
 msgid "variable-bindings uses indefinite length"
 msgstr "variable-bindings usa una longitud indefinida"

+#~ msgid "600 DPI Grayscale"
+#~ msgstr "600 PPP escala de grises"
+
+#~ msgid "ERROR: pdftops filter crashed on signal %d!\n"
+#~ msgstr "ERROR: filtro pdftops se ha colgado con la señal %d.\n"
+
+#~ msgid "ERROR: pdftops filter exited with status %d!\n"
+#~ msgstr "ERROR: filtro pdftops se ha cerrado con el estado %d.\n"
+
+#~ msgid "Unknown printer error (%s)!"
+#~ msgstr "Error de impresión desconocido (%s)."
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.4\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2009-06-18 15:43-0700\n"
+"POT-Creation-Date: 2009-06-05 14:00-0700\n"
 "PO-Revision-Date: 2009-02-12 15:10+0200\n"
 "Last-Translator: Teppo Turtiainen <teppot@iki.fi>\n"
 "Language-Team: Finnish\n"
@@ -2454,6 +2454,13 @@ msgstr "ERROR: %%EndProlog puuttuu!\n"
 msgid "ERROR: Missing %%EndSetup!\n"
 msgstr "ERROR: %%EndSetup puuttuu!\n"

+msgid ""
+"ERROR: Missing device URI on command-line and no DEVICE_URI environment "
+"variable!\n"
+msgstr ""
+"ERROR: Laitteen osoite puuttuu komentoriviltä eikä DEVICE_URI-"
+"ympäristömuuttujaa ole määritelty!\n"
+
 #, c-format
 msgid "ERROR: Missing value on line %d of banner file!\n"
 msgstr "ERROR: Arvo puuttuu otsikkotiedoston riviltä %d!\n"
@@ -3442,9 +3449,6 @@ msgstr "PPD-tiedoston osoitin NULL"
 msgid "Name OID uses indefinite length"
 msgstr "Nimi-OID käyttää määrittelemätöntä pituutta"

-msgid "Nested classes are not allowed!"
-msgstr ""
-
 msgid "Never"
 msgstr "Ei koskaan"

@@ -5554,13 +5558,6 @@ msgstr "variable-bindings käyttää määrittämätöntä pituutta"
 #~ msgid "600 DPI Grayscale"
 #~ msgstr "600 dpi harmaasävy"

-#~ msgid ""
-#~ "ERROR: Missing device URI on command-line and no DEVICE_URI environment "
-#~ "variable!\n"
-#~ msgstr ""
-#~ "ERROR: Laitteen osoite puuttuu komentoriviltä eikä DEVICE_URI-"
-#~ "ympäristömuuttujaa ole määritelty!\n"
-
 #~ msgid "ERROR: Unable to create temporary file - %s.\n"
 #~ msgstr "ERROR: Tilapäistiedostoa ei voida luoda - %s.\n"

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.4\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2009-06-18 15:43-0700\n"
+"POT-Creation-Date: 2009-06-05 14:00-0700\n"
 "PO-Revision-Date: 2009-02-16 12:00-0800\n"
 "Last-Translator: Apple Inc.\n"
 "Language-Team: Apple Inc.\n"
@@ -2476,6 +2476,13 @@ msgstr "ERROR: %%EndProlog manquant.\n"
 msgid "ERROR: Missing %%EndSetup!\n"
 msgstr "ERROR: %%EndSetup manquant.\n"

+msgid ""
+"ERROR: Missing device URI on command-line and no DEVICE_URI environment "
+"variable!\n"
+msgstr ""
+"ERROR: URI du périphérique manquant sur la ligne de commande et aucune "
+"variable d’environnement DEVICE_URI.\n"
+
 #, c-format
 msgid "ERROR: Missing value on line %d of banner file!\n"
 msgstr "ERROR: valeur manquante à la ligne %d du fichier de bannière.\n"
@@ -3481,9 +3488,6 @@ msgstr "Pointeur de fichier PPD NULL."
 msgid "Name OID uses indefinite length"
 msgstr "L’OID du nom s’avère être de longueur indéfinie"

-msgid "Nested classes are not allowed!"
-msgstr ""
-
 msgid "Never"
 msgstr "Jamais"

@@ -5655,13 +5659,6 @@ msgstr "variable-bindings s’avère être de longueur indéfinie"
 #~ msgid "600 DPI Grayscale"
 #~ msgstr "600 ppp (niveaux de gris)"

-#~ msgid ""
-#~ "ERROR: Missing device URI on command-line and no DEVICE_URI environment "
-#~ "variable!\n"
-#~ msgstr ""
-#~ "ERROR: URI du périphérique manquant sur la ligne de commande et aucune "
-#~ "variable d’environnement DEVICE_URI.\n"
-
 #~ msgid "ERROR: Unable to create temporary file - %s.\n"
 #~ msgstr "ERROR: impossible de créer un fichier temporaire - %s.\n"

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.4\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2009-06-18 15:43-0700\n"
+"POT-Creation-Date: 2009-06-05 14:00-0700\n"
 "PO-Revision-Date: 2009-02-16 12:00-0800\n"
 "Last-Translator: Apple Inc.\n"
 "Language-Team: Apple Inc.\n"
@@ -2453,6 +2453,13 @@ msgstr "ERROR: %%EndProlog mancante!\n"
 msgid "ERROR: Missing %%EndSetup!\n"
 msgstr "ERROR: %%EndSetup mancante!\n"

+msgid ""
+"ERROR: Missing device URI on command-line and no DEVICE_URI environment "
+"variable!\n"
+msgstr ""
+"ERROR: manca URI su linea di comando e nessuna variabile ambiente "
+"DEVICE_URI!\n"
+
 #, c-format
 msgid "ERROR: Missing value on line %d of banner file!\n"
 msgstr "ERROR: manca valore alla riga %d del documento banner!\n"
@@ -3444,9 +3451,6 @@ msgstr "Puntatore documento NULL PPD"
 msgid "Name OID uses indefinite length"
 msgstr "Il nome OID utilizza una lunghezza indefinita"

-msgid "Nested classes are not allowed!"
-msgstr ""
-
 msgid "Never"
 msgstr "Mai"

@@ -5579,13 +5583,6 @@ msgstr "variable-bindings utilizza una lunghezza indefinita"
 #~ msgid "600 DPI Grayscale"
 #~ msgstr "Scala di grigi a 600 DPI"

-#~ msgid ""
-#~ "ERROR: Missing device URI on command-line and no DEVICE_URI environment "
-#~ "variable!\n"
-#~ msgstr ""
-#~ "ERROR: manca URI su linea di comando e nessuna variabile ambiente "
-#~ "DEVICE_URI!\n"
-
 #~ msgid "ERROR: Unable to create temporary file - %s.\n"
 #~ msgstr "ERROR: impossibile creare il documento temporaneo: %s.\n"

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.4\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2009-06-18 15:43-0700\n"
+"POT-Creation-Date: 2009-06-05 14:00-0700\n"
 "PO-Revision-Date: 2009-02-16 12:00-0800\n"
 "Last-Translator: Apple Inc.\n"
 "Language-Team: Apple Inc.\n"
@@ -2437,6 +2437,12 @@ msgstr "ERROR: %%EndProlog가 유실됨!\n"
 msgid "ERROR: Missing %%EndSetup!\n"
 msgstr "ERROR: %%EndSetup이 유실됨!\n"

+msgid ""
+"ERROR: Missing device URI on command-line and no DEVICE_URI environment "
+"variable!\n"
+msgstr ""
+"ERROR: 명령 라인의 장비 URI가 유실되었고 DEVICE_URI 환경 변수가 없음!\n"
+
 #, c-format
 msgid "ERROR: Missing value on line %d of banner file!\n"
 msgstr "ERROR: 배너 파일의 %d번째 줄 값이 유실됨!\n"
@@ -3418,9 +3424,6 @@ msgstr "NULL PPD 파일 포인터"
 msgid "Name OID uses indefinite length"
 msgstr "이름 OID 길이가 무제한입니다"

-msgid "Nested classes are not allowed!"
-msgstr ""
-
 msgid "Never"
 msgstr "안 함"

@@ -5504,12 +5507,6 @@ msgstr "variable-bindings의 길이가 무제한입니다"
 #~ msgid "600 DPI Grayscale"
 #~ msgstr "600 DPI 그레이 스케일"

-#~ msgid ""
-#~ "ERROR: Missing device URI on command-line and no DEVICE_URI environment "
-#~ "variable!\n"
-#~ msgstr ""
-#~ "ERROR: 명령 라인의 장비 URI가 유실되었고 DEVICE_URI 환경 변수가 없음!\n"
-
 #~ msgid "ERROR: Unable to create temporary file - %s.\n"
 #~ msgstr "ERROR: 임시 파일을 생성할 수 없음 - %s.\n"

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.4\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2009-06-18 15:43-0700\n"
+"POT-Creation-Date: 2009-06-05 14:00-0700\n"
 "PO-Revision-Date: 2009-02-16 12:00-0800\n"
 "Last-Translator: Apple Inc.\n"
 "Language-Team: Apple Inc.\n"
@@ -2456,6 +2456,13 @@ msgstr "ERROR: Ontbrekende %%EndProlog!\n"
 msgid "ERROR: Missing %%EndSetup!\n"
 msgstr "ERROR: Ontbrekende %%EndSetup!\n"

+msgid ""
+"ERROR: Missing device URI on command-line and no DEVICE_URI environment "
+"variable!\n"
+msgstr ""
+"ERROR: Ontbrekende apparaat-URI op commandoregel en geen DEVICE_URI-"
+"omgevingsvariabele!\n"
+
 #, c-format
 msgid "ERROR: Missing value on line %d of banner file!\n"
 msgstr "ERROR: Ontbrekende waarde in regel %d van bannerbestand!\n"
@@ -3464,9 +3471,6 @@ msgstr "NULL-pointer voor PPD-bestand"
 msgid "Name OID uses indefinite length"
 msgstr "Onbepaalde lengte gebruikt voor naam-OID"

-msgid "Nested classes are not allowed!"
-msgstr ""
-
 msgid "Never"
 msgstr "Nooit"

@@ -5604,13 +5608,6 @@ msgstr "onbepaalde lengte gebruikt voor variable-bindings"
 #~ msgid "600 DPI Grayscale"
 #~ msgstr "600-DPI grijstinten"

-#~ msgid ""
-#~ "ERROR: Missing device URI on command-line and no DEVICE_URI environment "
-#~ "variable!\n"
-#~ msgstr ""
-#~ "ERROR: Ontbrekende apparaat-URI op commandoregel en geen DEVICE_URI-"
-#~ "omgevingsvariabele!\n"
-
 #~ msgid "ERROR: Unable to create temporary file - %s.\n"
 #~ msgstr "ERROR: Niet mogelijk om tijdelijk bestand - %s te maken.\n"

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.4\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2009-06-18 15:43-0700\n"
+"POT-Creation-Date: 2009-06-05 14:00-0700\n"
 "PO-Revision-Date: 2009-02-16 12:00-0800\n"
 "Last-Translator: Apple Inc.\n"
 "Language-Team: Apple Inc.\n"
@@ -2438,6 +2438,13 @@ msgstr "ERROR: %%EndProlog mangler!\n"
 msgid "ERROR: Missing %%EndSetup!\n"
 msgstr "ERROR: %%EndSetup mangler!\n"

+msgid ""
+"ERROR: Missing device URI on command-line and no DEVICE_URI environment "
+"variable!\n"
+msgstr ""
+"ERROR: Mangler enhets-URI på kommandolinje, og ingen DEVICE_URI-"
+"miljøvariabel!\n"
+
 #, c-format
 msgid "ERROR: Missing value on line %d of banner file!\n"
 msgstr "ERROR: Mangler verdi på linje %d i bannerfil!\n"
@@ -3424,9 +3431,6 @@ msgstr "NULL PPD-filpeker"
 msgid "Name OID uses indefinite length"
 msgstr "Navn-OID bruker uendelig lengde"

-msgid "Nested classes are not allowed!"
-msgstr ""
-
 msgid "Never"
 msgstr "Aldri"

@@ -5522,13 +5526,6 @@ msgstr "variable-bindings bruker uendelig lengde"
 #~ msgid "600 DPI Grayscale"
 #~ msgstr "600 DPI gråskala"

-#~ msgid ""
-#~ "ERROR: Missing device URI on command-line and no DEVICE_URI environment "
-#~ "variable!\n"
-#~ msgstr ""
-#~ "ERROR: Mangler enhets-URI på kommandolinje, og ingen DEVICE_URI-"
-#~ "miljøvariabel!\n"
-
 #~ msgid "ERROR: Unable to create temporary file - %s.\n"
 #~ msgstr "ERROR: Kan ikke opprette midlertidig fil – %s.\n"

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.4\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2009-06-18 15:43-0700\n"
+"POT-Creation-Date: 2009-06-05 14:00-0700\n"
 "PO-Revision-Date: 2009-02-16 12:00-0800\n"
 "Last-Translator: Apple Inc.\n"
 "Language-Team: Apple Inc.\n"
@@ -2455,6 +2455,13 @@ msgstr "ERROR: brakujący %%EndProlog!\n"
 msgid "ERROR: Missing %%EndSetup!\n"
 msgstr "ERROR: brakujący %%EndSetup!\n"

+msgid ""
+"ERROR: Missing device URI on command-line and no DEVICE_URI environment "
+"variable!\n"
+msgstr ""
+"ERROR: brak URI urządzenia w wierszu poleceń i zmiennej środowiska "
+"DEVICE_URI!\n"
+
 #, c-format
 msgid "ERROR: Missing value on line %d of banner file!\n"
 msgstr "ERROR: brakująca wartość w linii %d pliku bannera!\n"
@@ -3447,9 +3454,6 @@ msgstr "PUSTY wskaźnik pliku PPD"
 msgid "Name OID uses indefinite length"
 msgstr "OID nazwy używa nieskończonej długości"

-msgid "Nested classes are not allowed!"
-msgstr ""
-
 msgid "Never"
 msgstr "Nigdy"

@@ -5567,13 +5571,6 @@ msgstr "variable-bindings używa nieskończonej długości"
 #~ msgid "600 DPI Grayscale"
 #~ msgstr "600 DPI (szarości)"

-#~ msgid ""
-#~ "ERROR: Missing device URI on command-line and no DEVICE_URI environment "
-#~ "variable!\n"
-#~ msgstr ""
-#~ "ERROR: brak URI urządzenia w wierszu poleceń i zmiennej środowiska "
-#~ "DEVICE_URI!\n"
-
 #~ msgid "ERROR: Unable to create temporary file - %s.\n"
 #~ msgstr "ERROR: nie można utworzyć pliku tymczasowego - %s\n"

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.4\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2009-06-18 15:43-0700\n"
+"POT-Creation-Date: 2009-06-05 14:00-0700\n"
 "PO-Revision-Date: 2009-02-16 12:00-0800\n"
 "Last-Translator: Apple Inc.\n"
 "Language-Team: Apple Inc.\n"
@@ -2452,6 +2452,13 @@ msgstr "ERROR: %%EndProlog inexistente!\n"
 msgid "ERROR: Missing %%EndSetup!\n"
 msgstr "ERROR: %%EndSetup inexistente!\n"

+msgid ""
+"ERROR: Missing device URI on command-line and no DEVICE_URI environment "
+"variable!\n"
+msgstr ""
+"ERROR: URI de periférico inexistente em command-line e sem variável de "
+"ambiente DEVICE_URI!\n"
+
 #, c-format
 msgid "ERROR: Missing value on line %d of banner file!\n"
 msgstr ""
@@ -3452,9 +3459,6 @@ msgstr "Ponteiro do ficheiro PPD NULL"
 msgid "Name OID uses indefinite length"
 msgstr "Nome OID com comprimento indefinido"

-msgid "Nested classes are not allowed!"
-msgstr ""
-
 msgid "Never"
 msgstr "Nunca"

@@ -5583,13 +5587,6 @@ msgstr "variable-bindings com comprimento indefinido"
 #~ msgid "600 DPI Grayscale"
 #~ msgstr "Níveis de cinzento 600 DPI"

-#~ msgid ""
-#~ "ERROR: Missing device URI on command-line and no DEVICE_URI environment "
-#~ "variable!\n"
-#~ msgstr ""
-#~ "ERROR: URI de periférico inexistente em command-line e sem variável de "
-#~ "ambiente DEVICE_URI!\n"
-
 #~ msgid "ERROR: Unable to create temporary file - %s.\n"
 #~ msgstr "ERROR: Não é possível criar ficheiro o temporário - %s.\n"

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.4\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2009-06-18 15:43-0700\n"
+"POT-Creation-Date: 2009-06-05 14:00-0700\n"
 "PO-Revision-Date: 2009-02-16 12:00-0800\n"
 "Last-Translator: Apple Inc.\n"
 "Language-Team: Apple Inc.\n"
@@ -2461,6 +2461,13 @@ msgstr "ERROR: %%EndProlog ausente!\n"
 msgid "ERROR: Missing %%EndSetup!\n"
 msgstr "ERROR: %%EndSetup ausente!\n"

+msgid ""
+"ERROR: Missing device URI on command-line and no DEVICE_URI environment "
+"variable!\n"
+msgstr ""
+"ERROR: URI de dispositivo ausente URI em command-line e nenhuma variável de "
+"ambiente DEVICE_URI!\n"
+
 #, c-format
 msgid "ERROR: Missing value on line %d of banner file!\n"
 msgstr "ERROR: Valor ausente na linha %d do arquivo de banner!\n"
@@ -3458,9 +3465,6 @@ msgstr "Ponteiro de arquivo NULL PPD"
 msgid "Name OID uses indefinite length"
 msgstr "OID do nome usa comprimento indefinido"

-msgid "Nested classes are not allowed!"
-msgstr ""
-
 msgid "Never"
 msgstr "Nunca"

@@ -5587,13 +5591,6 @@ msgstr "variable-bindings usa comprimento indefinido"
 #~ msgid "600 DPI Grayscale"
 #~ msgstr "600 ppp da escala de cinza"

-#~ msgid ""
-#~ "ERROR: Missing device URI on command-line and no DEVICE_URI environment "
-#~ "variable!\n"
-#~ msgstr ""
-#~ "ERROR: URI de dispositivo ausente URI em command-line e nenhuma variável "
-#~ "de ambiente DEVICE_URI!\n"
-
 #~ msgid "ERROR: Unable to create temporary file - %s.\n"
 #~ msgstr "ERROR: Não é possível criar o arquivo temporário - %s.\n"

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.4\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2009-06-18 15:43-0700\n"
+"POT-Creation-Date: 2009-06-05 14:00-0700\n"
 "PO-Revision-Date: 2009-02-16 12:00-0800\n"
 "Last-Translator: Apple Inc.\n"
 "Language-Team: Apple Inc.\n"
@@ -2446,6 +2446,13 @@ msgstr "ERROR: Отсутствует %%EndProlog!\n"
 msgid "ERROR: Missing %%EndSetup!\n"
 msgstr "ERROR: Отсутствует %%EndSetup!\n"

+msgid ""
+"ERROR: Missing device URI on command-line and no DEVICE_URI environment "
+"variable!\n"
+msgstr ""
+"ERROR: Отсутствует идентификатор URI устройства в командной строке и "
+"переменная окружения DEVICE_URI!\n"
+
 #, c-format
 msgid "ERROR: Missing value on line %d of banner file!\n"
 msgstr "ERROR: Отсутствует значение в строке %d в файле баннера!\n"
@@ -3437,9 +3444,6 @@ msgstr "Указатель PPD-файла установлен на NULL"
 msgid "Name OID uses indefinite length"
 msgstr "Для имени OID длина не установлена"

-msgid "Nested classes are not allowed!"
-msgstr ""
-
 msgid "Never"
 msgstr "Никогда"

@@ -5560,13 +5564,6 @@ msgstr "Для variable-bindings длина не установлена"
 #~ msgid "600 DPI Grayscale"
 #~ msgstr "600dpi, оттенки серого"

-#~ msgid ""
-#~ "ERROR: Missing device URI on command-line and no DEVICE_URI environment "
-#~ "variable!\n"
-#~ msgstr ""
-#~ "ERROR: Отсутствует идентификатор URI устройства в командной строке и "
-#~ "переменная окружения DEVICE_URI!\n"
-
 #~ msgid "ERROR: Unable to create temporary file - %s.\n"
 #~ msgstr "ERROR: Не удается создать временный файл – %s.\n"

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.4\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2009-06-18 15:43-0700\n"
+"POT-Creation-Date: 2009-06-05 14:00-0700\n"
 "PO-Revision-Date: 2009-02-16 12:00-0800\n"
 "Last-Translator: Apple Inc.\n"
 "Language-Team: Apple Inc.\n"
@@ -2441,6 +2441,13 @@ msgstr "ERROR: Saknad %%EndProlog!\n"
 msgid "ERROR: Missing %%EndSetup!\n"
 msgstr "ERROR: Saknad %%EndSetup!\n"

+msgid ""
+"ERROR: Missing device URI on command-line and no DEVICE_URI environment "
+"variable!\n"
+msgstr ""
+"ERROR: Saknad enhets-URI i kommandoraden och ingen miljövariabel för "
+"DEVICE_URI!\n"
+
 #, c-format
 msgid "ERROR: Missing value on line %d of banner file!\n"
 msgstr "ERROR: Saknar värde på rad %d i bannerfil!\n"
@@ -3426,9 +3433,6 @@ msgstr "NULL PPD-filspekare"
 msgid "Name OID uses indefinite length"
 msgstr "OID-namn använder obegränsad längd"

-msgid "Nested classes are not allowed!"
-msgstr ""
-
 msgid "Never"
 msgstr "Aldrig"

@@ -5534,13 +5538,6 @@ msgstr "variabelbindningar använder obegränsad längd"
 #~ msgid "600 DPI Grayscale"
 #~ msgstr "600 DPI gråskala"

-#~ msgid ""
-#~ "ERROR: Missing device URI on command-line and no DEVICE_URI environment "
-#~ "variable!\n"
-#~ msgstr ""
-#~ "ERROR: Saknad enhets-URI i kommandoraden och ingen miljövariabel för "
-#~ "DEVICE_URI!\n"
-
 #~ msgid "ERROR: Unable to create temporary file - %s.\n"
 #~ msgstr "ERROR: Kunde inte skapa temporär fil - %s.\n"

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.4\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2009-06-18 15:43-0700\n"
+"POT-Creation-Date: 2009-06-05 14:00-0700\n"
 "PO-Revision-Date: 2009-02-16 12:00-0800\n"
 "Last-Translator: Apple Inc.\n"
 "Language-Team: Apple Inc.\n"
@@ -2418,6 +2418,11 @@ msgstr "ERROR: 缺少 %%EndProlog！\n"
 msgid "ERROR: Missing %%EndSetup!\n"
 msgstr "ERROR: 缺少 %%EndSetup！\n"

+msgid ""
+"ERROR: Missing device URI on command-line and no DEVICE_URI environment "
+"variable!\n"
+msgstr "ERROR: 命令行上缺少设备 URI，且无 DEVICE_URI 环境变量！\n"
+
 #, c-format
 msgid "ERROR: Missing value on line %d of banner file!\n"
 msgstr "ERROR: 标题文件的第 %d 行缺少值！\n"
@@ -3393,9 +3398,6 @@ msgstr "空 PPD 文件指针"
 msgid "Name OID uses indefinite length"
 msgstr "名称 OID 使用不定长度"

-msgid "Nested classes are not allowed!"
-msgstr ""
-
 msgid "Never"
 msgstr "永不"

@@ -5468,11 +5470,6 @@ msgstr "variable-bindings 使用不定长度"
 #~ msgid "600 DPI Grayscale"
 #~ msgstr "600 DPI 灰度"

-#~ msgid ""
-#~ "ERROR: Missing device URI on command-line and no DEVICE_URI environment "
-#~ "variable!\n"
-#~ msgstr "ERROR: 命令行上缺少设备 URI，且无 DEVICE_URI 环境变量！\n"
-
 #~ msgid "ERROR: Unable to create temporary file - %s.\n"
 #~ msgstr "ERROR: 无法创建临时文件 - %s。\n"

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.4\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2009-06-18 15:43-0700\n"
+"POT-Creation-Date: 2009-06-05 14:00-0700\n"
 "PO-Revision-Date: 2009-02-16 12:00-0800\n"
 "Last-Translator: Apple Inc.\n"
 "Language-Team: Apple Inc.\n"
@@ -2419,6 +2419,11 @@ msgstr "ERROR: 遺失 %%EndProlog！\n"
 msgid "ERROR: Missing %%EndSetup!\n"
 msgstr "ERROR: 遺失 %%EndSetup！\n"

+msgid ""
+"ERROR: Missing device URI on command-line and no DEVICE_URI environment "
+"variable!\n"
+msgstr "ERROR: 指令行遺失設備 URI 且沒有 DEVICE_URI 環境變數！\n"
+
 #, c-format
 msgid "ERROR: Missing value on line %d of banner file!\n"
 msgstr "ERROR: 標語檔案的第 %d 行遺失值！\n"
@@ -3394,9 +3399,6 @@ msgstr "NULL PPD 檔案指標"
 msgid "Name OID uses indefinite length"
 msgstr "名稱 OID 使用的長度不確定"

-msgid "Nested classes are not allowed!"
-msgstr ""
-
 msgid "Never"
 msgstr "永不"

@@ -5466,11 +5468,6 @@ msgstr "variable-bindings 使用的長度不確定"
 #~ msgid "600 DPI Grayscale"
 #~ msgstr "600 DPI 灰階"

-#~ msgid ""
-#~ "ERROR: Missing device URI on command-line and no DEVICE_URI environment "
-#~ "variable!\n"
-#~ msgstr "ERROR: 指令行遺失設備 URI 且沒有 DEVICE_URI 環境變數！\n"
-
 #~ msgid "ERROR: Unable to create temporary file - %s.\n"
 #~ msgstr "ERROR: 無法製作暫存檔 - %s。\n"

@@ -12,7 +12,7 @@
 .\"   which should have been included with this file.  If this file is
 .\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.TH cupsd.conf 5 "CUPS" "14 July 2009" "Apple Inc."
+.TH cupsd.conf 5 "CUPS" "19 April 2009" "Apple Inc."
 .SH NAME
 cupsd.conf \- server configuration file for cups
 .SH DESCRIPTION
@@ -307,12 +307,6 @@ Deny @LOCAL
 .br
 Denies access to the named host or address.
 .TP 5
-DirtyCleanInterval seconds
-.br
-Specifies the delay for updating of configuration and state files. A value of 0
-causes the update to happen as soon as possible, typically within a few
-milliseconds.
-.TP 5
 DocumentRoot directory
 .br
 Specifies the root directory for the internal web server documents.
@@ -260,64 +260,64 @@ $DSOLIBS=@DSOLIBS@
 # Server programs
 %system all
 # Server files
-f 0555 root sys $SBINDIR/cupsd scheduler/cupsd
+f 0755 root sys $SBINDIR/cupsd scheduler/cupsd

 d 0755 root sys $SERVERBIN -
 d 0755 root sys $SERVERBIN/backend -
-f 0500 root sys $SERVERBIN/backend/ipp backend/ipp
+f 0700 root sys $SERVERBIN/backend/ipp backend/ipp
 l 0700 root sys $SERVERBIN/backend/http ipp
-f 0500 root sys $SERVERBIN/backend/lpd backend/lpd
+f 0700 root sys $SERVERBIN/backend/lpd backend/lpd
 %if DNSSD_BACKEND
-f 0500 root sys $SERVERBIN/backend/dnssd backend/dnssd
+f 0700 root sys $SERVERBIN/backend/dnssd backend/dnssd
 l 0700 root sys $SERVERBIN/backend/mdns dnssd
 %endif
 %system !darwin
-f 0555 root sys $SERVERBIN/backend/parallel backend/parallel
-f 0555 root sys $SERVERBIN/backend/scsi backend/scsi
+f 0755 root sys $SERVERBIN/backend/parallel backend/parallel
+f 0755 root sys $SERVERBIN/backend/scsi backend/scsi
 %system all
-f 0555 root sys $SERVERBIN/backend/serial backend/serial
-f 0555 root sys $SERVERBIN/backend/snmp backend/snmp
-f 0555 root sys $SERVERBIN/backend/socket backend/socket
-f 0555 root sys $SERVERBIN/backend/usb backend/usb
+f 0755 root sys $SERVERBIN/backend/serial backend/serial
+f 0755 root sys $SERVERBIN/backend/snmp backend/snmp
+f 0755 root sys $SERVERBIN/backend/socket backend/socket
+f 0755 root sys $SERVERBIN/backend/usb backend/usb
 d 0755 root sys $SERVERBIN/cgi-bin -
-f 0555 root sys $SERVERBIN/cgi-bin/admin.cgi cgi-bin/admin.cgi
-f 0555 root sys $SERVERBIN/cgi-bin/classes.cgi cgi-bin/classes.cgi
-f 0555 root sys $SERVERBIN/cgi-bin/help.cgi cgi-bin/help.cgi
-f 0555 root sys $SERVERBIN/cgi-bin/jobs.cgi cgi-bin/jobs.cgi
-f 0555 root sys $SERVERBIN/cgi-bin/printers.cgi cgi-bin/printers.cgi
+f 0755 root sys $SERVERBIN/cgi-bin/admin.cgi cgi-bin/admin.cgi
+f 0755 root sys $SERVERBIN/cgi-bin/classes.cgi cgi-bin/classes.cgi
+f 0755 root sys $SERVERBIN/cgi-bin/help.cgi cgi-bin/help.cgi
+f 0755 root sys $SERVERBIN/cgi-bin/jobs.cgi cgi-bin/jobs.cgi
+f 0755 root sys $SERVERBIN/cgi-bin/printers.cgi cgi-bin/printers.cgi
 d 0755 root sys $SERVERBIN/daemon -
-f 0555 root sys $SERVERBIN/daemon/cups-deviced scheduler/cups-deviced
-f 0555 root sys $SERVERBIN/daemon/cups-driverd scheduler/cups-driverd
-f 0555 root sys $SERVERBIN/daemon/cups-polld scheduler/cups-polld
+f 0755 root sys $SERVERBIN/daemon/cups-deviced scheduler/cups-deviced
+f 0755 root sys $SERVERBIN/daemon/cups-driverd scheduler/cups-driverd
+f 0755 root sys $SERVERBIN/daemon/cups-polld scheduler/cups-polld
 d 0755 root sys $SERVERBIN/driver -
 d 0755 root sys $SERVERBIN/filter -
-f 0555 root sys $SERVERBIN/filter/bannertops filter/bannertops
-f 0555 root sys $SERVERBIN/filter/commandtoespcx driver/commandtoescpx
-f 0555 root sys $SERVERBIN/filter/commandtopclx driver/commandtopclx
-f 0555 root sys $SERVERBIN/filter/commandtops filter/commandtops
-f 0555 root sys $SERVERBIN/filter/gziptoany filter/gziptoany
-f 0555 root sys $SERVERBIN/filter/hpgltops filter/hpgltops
+f 0755 root sys $SERVERBIN/filter/bannertops filter/bannertops
+f 0755 root sys $SERVERBIN/filter/commandtoespcx driver/commandtoescpx
+f 0755 root sys $SERVERBIN/filter/commandtopclx driver/commandtopclx
+f 0755 root sys $SERVERBIN/filter/commandtops filter/commandtops
+f 0755 root sys $SERVERBIN/filter/gziptoany filter/gziptoany
+f 0755 root sys $SERVERBIN/filter/hpgltops filter/hpgltops
 %if IMGFILTERS
-f 0555 root sys $SERVERBIN/filter/imagetops filter/imagetops
-f 0555 root sys $SERVERBIN/filter/imagetoraster filter/imagetoraster
+f 0755 root sys $SERVERBIN/filter/imagetops filter/imagetops
+f 0755 root sys $SERVERBIN/filter/imagetoraster filter/imagetoraster
 %endif
 %if PDFTOPS
-f 0555 root sys $SERVERBIN/filter/pdftops filter/pdftops
+f 0755 root sys $SERVERBIN/filter/pdftops filter/pdftops
 %endif
-f 0555 root sys $SERVERBIN/filter/pstops filter/pstops
-f 0555 root sys $SERVERBIN/filter/rastertoespcx driver/rastertoescpx
-f 0555 root sys $SERVERBIN/filter/rastertolabel filter/rastertolabel
+f 0755 root sys $SERVERBIN/filter/pstops filter/pstops
+f 0755 root sys $SERVERBIN/filter/rastertoespcx driver/rastertoescpx
+f 0755 root sys $SERVERBIN/filter/rastertolabel filter/rastertolabel
 l 0755 root sys $SERVERBIN/filter/rastertodymo rastertolabel
-f 0555 root sys $SERVERBIN/filter/rastertoepson filter/rastertoepson
-f 0555 root sys $SERVERBIN/filter/rastertohp filter/rastertohp
-f 0555 root sys $SERVERBIN/filter/rastertopclx driver/rastertopclx
-f 0555 root sys $SERVERBIN/filter/texttops filter/texttops
+f 0755 root sys $SERVERBIN/filter/rastertoepson filter/rastertoepson
+f 0755 root sys $SERVERBIN/filter/rastertohp filter/rastertohp
+f 0755 root sys $SERVERBIN/filter/rastertopclx driver/rastertopclx
+f 0755 root sys $SERVERBIN/filter/texttops filter/texttops
 d 0755 root sys $SERVERBIN/notifier -
-f 0555 root sys $SERVERBIN/notifier/mailto notifier/mailto
+f 0755 root sys $SERVERBIN/notifier/mailto notifier/mailto

 %subpackage lpd
 d 0755 root sys $SERVERBIN/daemon -
-f 0555 root sys $SERVERBIN/daemon/cups-lpd scheduler/cups-lpd
+f 0755 root sys $SERVERBIN/daemon/cups-lpd scheduler/cups-lpd
 %subpackage

 # Admin commands
@@ -330,16 +330,16 @@ l 0755 root sys $LIBDIR/lpadmin $SBINDIR/lpadmin
 l 0755 root sys $LIBDIR/reject $SBINDIR/cupsaccept
 d 0755 root sys $SBINDIR -
 l 0755 root sys $SBINDIR/accept cupsaccept
-f 0555 root sys $SBINDIR/cupsaccept systemv/cupsaccept
-f 0555 root sys $SBINDIR/cupsaddsmb systemv/cupsaddsmb
-f 0555 root sys $SBINDIR/cupsctl systemv/cupsctl
+f 0755 root sys $SBINDIR/cupsaccept systemv/cupsaccept
+f 0755 root sys $SBINDIR/cupsaddsmb systemv/cupsaddsmb
+f 0755 root sys $SBINDIR/cupsctl systemv/cupsctl
 l 0755 root sys $SBINDIR/cupsdisable accept
 l 0755 root sys $SBINDIR/cupsenable accept
 l 0755 root sys $SBINDIR/cupsreject accept
-f 0555 root sys $SBINDIR/lpadmin systemv/lpadmin
-f 0555 root sys $SBINDIR/lpc berkeley/lpc
-f 0555 root sys $SBINDIR/lpinfo systemv/lpinfo
-f 0555 root sys $SBINDIR/lpmove systemv/lpmove
+f 0755 root sys $SBINDIR/lpadmin systemv/lpadmin
+f 0755 root sys $SBINDIR/lpc berkeley/lpc
+f 0755 root sys $SBINDIR/lpinfo systemv/lpinfo
+f 0755 root sys $SBINDIR/lpmove systemv/lpmove
 l 0755 root sys $SBINDIR/reject cupsaccept

 %system irix
@@ -348,16 +348,16 @@ l 0755 root sys /usr/etc/lpc $SBINDIR/lpc

 # User commands
 d 0755 root sys $BINDIR -
-f 0555 root sys $BINDIR/cancel systemv/cancel
-f 0555 root sys $BINDIR/cupstestdsc systemv/cupstestdsc
-f 0555 root sys $BINDIR/cupstestppd systemv/cupstestppd
-f 0555 root sys $BINDIR/lp systemv/lp
-f 0555 root sys $BINDIR/lpoptions systemv/lpoptions
-f 0555 root sys $BINDIR/lppasswd systemv/lppasswd
-f 0555 root sys $BINDIR/lpq berkeley/lpq
-f 0555 root sys $BINDIR/lpr berkeley/lpr
-f 0555 root sys $BINDIR/lprm berkeley/lprm
-f 0555 root sys $BINDIR/lpstat systemv/lpstat
+f 0755 root sys $BINDIR/cancel systemv/cancel
+f 0755 root sys $BINDIR/cupstestdsc systemv/cupstestdsc
+f 0755 root sys $BINDIR/cupstestppd systemv/cupstestppd
+f 0755 root sys $BINDIR/lp systemv/lp
+f 0755 root sys $BINDIR/lpoptions systemv/lpoptions
+f 0755 root sys $BINDIR/lppasswd systemv/lppasswd
+f 0755 root sys $BINDIR/lpq berkeley/lpq
+f 0755 root sys $BINDIR/lpr berkeley/lpr
+f 0755 root sys $BINDIR/lprm berkeley/lprm
+f 0755 root sys $BINDIR/lpstat systemv/lpstat

 %system irix
 l 0755 root sys /usr/bsd/lpq $BINDIR/lpq
@@ -369,50 +369,50 @@ l 0755 root sys /usr/bsd/lprm $BINDIR/lprm
 %if DSOLIBS
 %subpackage libs
 %system hpux
-f 0555 root sys $LIBDIR/libcups.sl.2 cups/libcups.sl.2 nostrip()
+f 0755 root sys $LIBDIR/libcups.sl.2 cups/libcups.sl.2 nostrip()
 l 0755 root sys $LIBDIR/libcups.sl libcups.sl.2
-f 0555 root sys $LIBDIR/libcupscgi.sl.1 cgi-bin/libcupscgi.sl.1 nostrip()
+f 0755 root sys $LIBDIR/libcupscgi.sl.1 cgi-bin/libcupscgi.sl.1 nostrip()
 l 0755 root sys $LIBDIR/libcupscgi.sl libcupscgi.sl.1
-f 0555 root sys $LIBDIR/libcupsdriver.sl.1 driver/libcupsdriver.sl.1 nostrip()
+f 0755 root sys $LIBDIR/libcupsdriver.sl.1 driver/libcupsdriver.sl.1 nostrip()
 l 0755 root sys $LIBDIR/libcupsdriver.sl libcupsdriver.sl.1
-f 0555 root sys $LIBDIR/libcupsimage.sl.2 filter/libcupsimage.sl.2 nostrip()
+f 0755 root sys $LIBDIR/libcupsimage.sl.2 filter/libcupsimage.sl.2 nostrip()
 l 0755 root sys $LIBDIR/libcupsimage.sl libcupsimage.sl.2
-f 0555 root sys $LIBDIR/libcupsmime.sl.1 scheduler/libcupsmime.sl.1 nostrip()
+f 0755 root sys $LIBDIR/libcupsmime.sl.1 scheduler/libcupsmime.sl.1 nostrip()
 l 0755 root sys $LIBDIR/libcupsmime.sl libcupsmime.sl.1
-f 0555 root sys $LIBDIR/libcupsppdc.sl.1 ppdc/libcupsppdc.sl.1 nostrip()
+f 0755 root sys $LIBDIR/libcupsppdc.sl.1 ppdc/libcupsppdc.sl.1 nostrip()
 l 0755 root sys $LIBDIR/libcupsppdc.sl libcupsppdc.sl.1
 %system aix
-f 0555 root sys $LIBDIR/libcups_s.a cups/libcups_s.a nostrip()
-f 0555 root sys $LIBDIR/libcupscgi_s.a cgi-bin/libcupscgi_s.a nostrip()
-f 0555 root sys $LIBDIR/libcupsdriver_s.a driver/libcupsdriver_s.a nostrip()
-f 0555 root sys $LIBDIR/libcupsimage_s.a filter/libcupsimage_s.a nostrip()
-f 0555 root sys $LIBDIR/libcupsmime_s.a scheduler/libcupsmime_s.a nostrip()
-f 0555 root sys $LIBDIR/libcupsppdc_s.a ppdc/libcupsppdc_s.a nostrip()
+f 0755 root sys $LIBDIR/libcups_s.a cups/libcups_s.a nostrip()
+f 0755 root sys $LIBDIR/libcupscgi_s.a cgi-bin/libcupscgi_s.a nostrip()
+f 0755 root sys $LIBDIR/libcupsdriver_s.a driver/libcupsdriver_s.a nostrip()
+f 0755 root sys $LIBDIR/libcupsimage_s.a filter/libcupsimage_s.a nostrip()
+f 0755 root sys $LIBDIR/libcupsmime_s.a scheduler/libcupsmime_s.a nostrip()
+f 0755 root sys $LIBDIR/libcupsppdc_s.a ppdc/libcupsppdc_s.a nostrip()
 %system darwin
-f 0555 root sys $LIBDIR/libcups.2.dylib cups/libcups.2.dylib nostrip()
+f 0755 root sys $LIBDIR/libcups.2.dylib cups/libcups.2.dylib nostrip()
 l 0755 root sys $LIBDIR/libcups.dylib libcups.2.dylib
-f 0555 root sys $LIBDIR/libcupscgi.1.dylib cgi-bin/libcupscgi.1.dylib nostrip()
+f 0755 root sys $LIBDIR/libcupscgi.1.dylib cgi-bin/libcupscgi.1.dylib nostrip()
 l 0755 root sys $LIBDIR/libcupscgi.dylib libcupscgi.1.dylib
-f 0555 root sys $LIBDIR/libcupsdriver.1.dylib driver/libcupsdriver.1.dylib nostrip()
+f 0755 root sys $LIBDIR/libcupsdriver.1.dylib driver/libcupsdriver.1.dylib nostrip()
 l 0755 root sys $LIBDIR/libcupsdriver.dylib libcupsdriver.1.dylib
-f 0555 root sys $LIBDIR/libcupsimage.2.dylib filter/libcupsimage.2.dylib nostrip()
+f 0755 root sys $LIBDIR/libcupsimage.2.dylib filter/libcupsimage.2.dylib nostrip()
 l 0755 root sys $LIBDIR/libcupsimage.dylib libcupsimage.2.dylib
-f 0555 root sys $LIBDIR/libcupsmime.1.dylib scheduler/libcupsmime.1.dylib nostrip()
+f 0755 root sys $LIBDIR/libcupsmime.1.dylib scheduler/libcupsmime.1.dylib nostrip()
 l 0755 root sys $LIBDIR/libcupsmime.dylib libcupsmime.1.dylib
-f 0555 root sys $LIBDIR/libcupsppdc.1.dylib ppdc/libcupsppdc.1.dylib nostrip()
+f 0755 root sys $LIBDIR/libcupsppdc.1.dylib ppdc/libcupsppdc.1.dylib nostrip()
 l 0755 root sys $LIBDIR/libcupsppdc.dylib libcupsppdc.1.dylib
 %system !hpux !aix !darwin
-f 0555 root sys $LIBDIR/libcups.so.2 cups/libcups.so.2 nostrip()
+f 0755 root sys $LIBDIR/libcups.so.2 cups/libcups.so.2 nostrip()
 l 0755 root sys $LIBDIR/libcups.so libcups.so.2
-f 0555 root sys $LIBDIR/libcupscgi.so.1 cgi-bin/libcupscgi.so.1 nostrip()
+f 0755 root sys $LIBDIR/libcupscgi.so.1 cgi-bin/libcupscgi.so.1 nostrip()
 l 0755 root sys $LIBDIR/libcupscgi.so libcupscgi.so.1
-f 0555 root sys $LIBDIR/libcupsdriver.so.1 driver/libcupsdriver.so.1 nostrip()
+f 0755 root sys $LIBDIR/libcupsdriver.so.1 driver/libcupsdriver.so.1 nostrip()
 l 0755 root sys $LIBDIR/libcupsdriver.so libcupsdriver.so.1
-f 0555 root sys $LIBDIR/libcupsimage.so.2 filter/libcupsimage.so.2 nostrip()
+f 0755 root sys $LIBDIR/libcupsimage.so.2 filter/libcupsimage.so.2 nostrip()
 l 0755 root sys $LIBDIR/libcupsimage.so libcupsimage.so.2
-f 0555 root sys $LIBDIR/libcupsmime.so.1 scheduler/libcupsmime.so.1 nostrip()
+f 0755 root sys $LIBDIR/libcupsmime.so.1 scheduler/libcupsmime.so.1 nostrip()
 l 0755 root sys $LIBDIR/libcupsmime.so libcupsmime.so.1
-f 0555 root sys $LIBDIR/libcupsppdc.so.1 ppdc/libcupsppdc.so.1 nostrip()
+f 0755 root sys $LIBDIR/libcupsppdc.so.1 ppdc/libcupsppdc.so.1 nostrip()
 l 0755 root sys $LIBDIR/libcupsppdc.so libcupsppdc.so.1
 %system all
 %subpackage
@@ -420,17 +420,17 @@ l 0755 root sys $LIBDIR/libcupsppdc.so libcupsppdc.so.1

 %if LIB32DIR
 %subpackage libs
-f 0555 root sys $LIB32DIR/libcups.so.2 cups/libcups.32.so.2 nostrip()
+f 0755 root sys $LIB32DIR/libcups.so.2 cups/libcups.32.so.2 nostrip()
 l 0755 root sys $LIB32DIR/libcups.so libcups.so.2
-f 0555 root sys $LIB32DIR/libcupscgi.so.1 cgi-bin/libcupscgi.32.so.1 nostrip()
+f 0755 root sys $LIB32DIR/libcupscgi.so.1 cgi-bin/libcupscgi.32.so.1 nostrip()
 l 0755 root sys $LIB32DIR/libcupscgi.so libcupscgi.so.1
-f 0555 root sys $LIB32DIR/libcupsdriver.so.1 driver/libcupsdriver.32.so.1 nostrip()
+f 0755 root sys $LIB32DIR/libcupsdriver.so.1 driver/libcupsdriver.32.so.1 nostrip()
 l 0755 root sys $LIB32DIR/libcupsdriver.so libcupsdriver.so.1
-f 0555 root sys $LIB32DIR/libcupsimage.so.2 filter/libcupsimage.32.so.2 nostrip()
+f 0755 root sys $LIB32DIR/libcupsimage.so.2 filter/libcupsimage.32.so.2 nostrip()
 l 0755 root sys $LIB32DIR/libcupsimage.so libcupsimage.so.2
-f 0555 root sys $LIB32DIR/libcupsmime.so.1 scheduler/libcupsmime.32.so.1 nostrip()
+f 0755 root sys $LIB32DIR/libcupsmime.so.1 scheduler/libcupsmime.32.so.1 nostrip()
 l 0755 root sys $LIB32DIR/libcupsmime.so libcupsmime.so.1
-f 0555 root sys $LIB32DIR/libcupsppdc.so.1 ppdc/libcupsppdc.32.so.1 nostrip()
+f 0755 root sys $LIB32DIR/libcupsppdc.so.1 ppdc/libcupsppdc.32.so.1 nostrip()
 l 0755 root sys $LIB32DIR/libcupsppdc.so libcupsppdc.so.1
 %system all
 %subpackage
@@ -438,17 +438,17 @@ l 0755 root sys $LIB32DIR/libcupsppdc.so libcupsppdc.so.1

 %if LIB64DIR
 %subpackage libs
-f 0555 root sys $LIB64DIR/libcups.so.2 cups/libcups.64.so.2 nostrip()
+f 0755 root sys $LIB64DIR/libcups.so.2 cups/libcups.64.so.2 nostrip()
 l 0755 root sys $LIB64DIR/libcups.so libcups.so.2
-f 0555 root sys $LIB64DIR/libcupscgi.so.1 cgi-bin/libcupscgi.64.so.1 nostrip()
+f 0755 root sys $LIB64DIR/libcupscgi.so.1 cgi-bin/libcupscgi.64.so.1 nostrip()
 l 0755 root sys $LIB64DIR/libcupscgi.so libcupscgi.so.1
-f 0555 root sys $LIB64DIR/libcupsdriver.so.1 driver/libcupsdriver.64.so.1 nostrip()
+f 0755 root sys $LIB64DIR/libcupsdriver.so.1 driver/libcupsdriver.64.so.1 nostrip()
 l 0755 root sys $LIB64DIR/libcupsdriver.so libcupsdriver.so.1
-f 0555 root sys $LIB64DIR/libcupsimage.so.2 filter/libcupsimage.64.so.2 nostrip()
+f 0755 root sys $LIB64DIR/libcupsimage.so.2 filter/libcupsimage.64.so.2 nostrip()
 l 0755 root sys $LIB64DIR/libcupsimage.so libcupsimage.so.2
-f 0555 root sys $LIB64DIR/libcupsmime.so.1 scheduler/libcupsmime.64.so.1 nostrip()
+f 0755 root sys $LIB64DIR/libcupsmime.so.1 scheduler/libcupsmime.64.so.1 nostrip()
 l 0755 root sys $LIB64DIR/libcupsmime.so libcupsmime.so.1
-f 0555 root sys $LIB64DIR/libcupsppdc.so.1 ppdc/libcupsppdc.64.so.1 nostrip()
+f 0755 root sys $LIB64DIR/libcupsppdc.so.1 ppdc/libcupsppdc.64.so.1 nostrip()
 l 0755 root sys $LIB64DIR/libcupsppdc.so libcupsppdc.so.1
 %system all
 %subpackage
@@ -465,106 +465,102 @@ d 0755 root $CUPS_GROUP $STATEDIR -
 d 0511 root $CUPS_PRIMARY_SYSTEM_GROUP $STATEDIR/certs -

 # Data files
-#f 0444 root sys $LOCALEDIR/da/cups_da.po locale/cups_da.po
-#f 0444 root sys $LOCALEDIR/de/cups_de.po locale/cups_de.po
-f 0444 root sys $LOCALEDIR/es/cups_es.po locale/cups_es.po
-#f 0444 root sys $LOCALEDIR/et/cups_et.po locale/cups_et.po
-f 0444 root sys $LOCALEDIR/eu/cups_eu.po locale/cups_eu.po
-#f 0444 root sys $LOCALEDIR/fi/cups_fi.po locale/cups_fi.po
-#f 0444 root sys $LOCALEDIR/fr/cups_fr.po locale/cups_fr.po
-#f 0444 root sys $LOCALEDIR/he/cups_he.po locale/cups_he.po
-#f 0444 root sys $LOCALEDIR/it/cups_it.po locale/cups_it.po
-#f 0444 root sys $LOCALEDIR/ja/cups_ja.po locale/cups_ja.po
-#f 0444 root sys $LOCALEDIR/ko/cups_ko.po locale/cups_ko.po
-#f 0444 root sys $LOCALEDIR/nl/cups_nl.po locale/cups_nl.po
-#f 0444 root sys $LOCALEDIR/no/cups_no.po locale/cups_no.po
-#f 0444 root sys $LOCALEDIR/pl/cups_pl.po locale/cups_pl.po
-#f 0444 root sys $LOCALEDIR/pt/cups_pt.po locale/cups_pt.po
-#f 0444 root sys $LOCALEDIR/pt_BR/cups_pt_BR.po locale/cups_pt_BR.po
-#f 0444 root sys $LOCALEDIR/ru/cups_ru.po locale/cups_ru.po
-#f 0444 root sys $LOCALEDIR/sv/cups_sv.po locale/cups_sv.po
-#f 0444 root sys $LOCALEDIR/zh/cups_zh.po locale/cups_zh.po
-#f 0444 root sys $LOCALEDIR/zh_TW/cups_zh_TW.po locale/cups_zh_TW.po
+#f 0644 root sys $LOCALEDIR/da/cups_da.po locale/cups_da.po
+#f 0644 root sys $LOCALEDIR/de/cups_de.po locale/cups_de.po
+f 0644 root sys $LOCALEDIR/es/cups_es.po locale/cups_es.po
+#f 0644 root sys $LOCALEDIR/et/cups_et.po locale/cups_et.po
+#f 0644 root sys $LOCALEDIR/fi/cups_fi.po locale/cups_fi.po
+#f 0644 root sys $LOCALEDIR/fr/cups_fr.po locale/cups_fr.po
+#f 0644 root sys $LOCALEDIR/he/cups_he.po locale/cups_he.po
+#f 0644 root sys $LOCALEDIR/it/cups_it.po locale/cups_it.po
+#f 0644 root sys $LOCALEDIR/ja/cups_ja.po locale/cups_ja.po
+#f 0644 root sys $LOCALEDIR/ko/cups_ko.po locale/cups_ko.po
+#f 0644 root sys $LOCALEDIR/nl/cups_nl.po locale/cups_nl.po
+#f 0644 root sys $LOCALEDIR/no/cups_no.po locale/cups_no.po
+#f 0644 root sys $LOCALEDIR/pl/cups_pl.po locale/cups_pl.po
+#f 0644 root sys $LOCALEDIR/pt/cups_pt.po locale/cups_pt.po
+#f 0644 root sys $LOCALEDIR/pt_BR/cups_pt_BR.po locale/cups_pt_BR.po
+#f 0644 root sys $LOCALEDIR/ru/cups_ru.po locale/cups_ru.po
+#f 0644 root sys $LOCALEDIR/sv/cups_sv.po locale/cups_sv.po
+#f 0644 root sys $LOCALEDIR/zh/cups_zh.po locale/cups_zh.po
+#f 0644 root sys $LOCALEDIR/zh_TW/cups_zh_TW.po locale/cups_zh_TW.po

 d 0755 root sys $DATADIR -

 d 0755 root sys $DATADIR/banners -
-f 0444 root sys $DATADIR/banners/classified data/classified
-f 0444 root sys $DATADIR/banners/confidential data/confidential
-f 0444 root sys $DATADIR/banners/secret data/secret
-f 0444 root sys $DATADIR/banners/standard data/standard
-f 0444 root sys $DATADIR/banners/topsecret data/topsecret
-f 0444 root sys $DATADIR/banners/unclassified data/unclassified
+f 0644 root sys $DATADIR/banners/classified data/classified
+f 0644 root sys $DATADIR/banners/confidential data/confidential
+f 0644 root sys $DATADIR/banners/secret data/secret
+f 0644 root sys $DATADIR/banners/standard data/standard
+f 0644 root sys $DATADIR/banners/topsecret data/topsecret
+f 0644 root sys $DATADIR/banners/unclassified data/unclassified

 d 0755 root sys $DATADIR/charmaps -
-f 0444 root sys $DATADIR/charmaps data/*.txt
+f 0644 root sys $DATADIR/charmaps data/*.txt

 d 0755 root sys $DATADIR/charsets -
-f 0444 root sys $DATADIR/charsets/utf-8 data/utf-8
+f 0644 root sys $DATADIR/charsets/utf-8 data/utf-8

 d 0755 root sys $DATADIR/data -
-f 0444 root sys $DATADIR/data/HPGLprolog data/HPGLprolog
-f 0444 root sys $DATADIR/data/psglyphs data/psglyphs
-f 0444 root sys $DATADIR/data/testprint data/testprint
+f 0644 root sys $DATADIR/data/HPGLprolog data/HPGLprolog
+f 0644 root sys $DATADIR/data/psglyphs data/psglyphs
+f 0644 root sys $DATADIR/data/testprint data/testprint

 d 0755 root sys $DATADIR/drv -
-f 0444 root sys $DATADIR/drv/sample.drv ppdc/sample.drv
+f 0644 root sys $DATADIR/drv/sample.drv ppdc/sample.drv

 d 0755 root sys $DATADIR/examples -
-f 0444 root sys $DATADIR/examples examples/*.drv
+f 0644 root sys $DATADIR/examples examples/*.drv

 d 0755 root sys $DATADIR/fonts -
-f 0444 root sys $DATADIR/fonts fonts/Monospace*
+f 0644 root sys $DATADIR/fonts fonts/Monospace*

 d 0755 root sys $DATADIR/mime -
-f 0444 root sys $DATADIR/mime/mime.convs conf/mime.convs
-f 0444 root sys $DATADIR/mime/mime.types conf/mime.types
+f 0644 root sys $DATADIR/mime/mime.convs conf/mime.convs
+f 0644 root sys $DATADIR/mime/mime.types conf/mime.types

 d 0755 root sys $DATADIR/model -

 d 0755 root sys $DATADIR/ppdc -
-f 0444 root sys $DATADIR/ppdc data/*.defs
-f 0444 root sys $DATADIR/ppdc data/*.h
+f 0644 root sys $DATADIR/ppdc data/*.defs
+f 0644 root sys $DATADIR/ppdc data/*.h

 d 0755 root sys $DATADIR/templates -
-f 0444 root sys $DATADIR/templates templates/*.tmpl
+f 0644 root sys $DATADIR/templates templates/*.tmpl

 ## Template files
 #d 0755 root sys $DATADIR/templates/de
-#f 0444 root sys $DATADIR/templates/de templates/de/*.tmpl
+#f 0644 root sys $DATADIR/templates/de templates/de/*.tmpl

 d 0755 root sys $DATADIR/templates/es
-f 0444 root sys $DATADIR/templates/es templates/es/*.tmpl
+f 0644 root sys $DATADIR/templates/es templates/es/*.tmpl

 #d 0755 root sys $DATADIR/templates/et
-#f 0444 root sys $DATADIR/templates/et templates/et/*.tmpl
-
-d 0755 root sys $DATADIR/templates/eu
-f 0444 root sys $DATADIR/templates/eu templates/eu/*.tmpl
+#f 0644 root sys $DATADIR/templates/et templates/et/*.tmpl

 #d 0755 root sys $DATADIR/templates/fr
-#f 0444 root sys $DATADIR/templates/fr templates/fr/*.tmpl
+#f 0644 root sys $DATADIR/templates/fr templates/fr/*.tmpl

 #d 0755 root sys $DATADIR/templates/he
-#f 0444 root sys $DATADIR/templates/he templates/he/*.tmpl
+#f 0644 root sys $DATADIR/templates/he templates/he/*.tmpl

 #d 0755 root sys $DATADIR/templates/it
-#f 0444 root sys $DATADIR/templates/it templates/it/*.tmpl
+#f 0644 root sys $DATADIR/templates/it templates/it/*.tmpl

 d 0755 root sys $DATADIR/templates/ja
-f 0444 root sys $DATADIR/templates/ja templates/ja/*.tmpl
+f 0644 root sys $DATADIR/templates/ja templates/ja/*.tmpl

 d 0755 root sys $DATADIR/templates/pl
-f 0444 root sys $DATADIR/templates/pl templates/pl/*.tmpl
+f 0644 root sys $DATADIR/templates/pl templates/pl/*.tmpl

 d 0755 root sys $DATADIR/templates/ru
-f 0444 root sys $DATADIR/templates/ru templates/ru/*.tmpl
+f 0644 root sys $DATADIR/templates/ru templates/ru/*.tmpl

 #d 0755 root sys $DATADIR/templates/sv
-#f 0444 root sys $DATADIR/templates/sv templates/sv/*.tmpl
+#f 0644 root sys $DATADIR/templates/sv templates/sv/*.tmpl

 #d 0755 root sys $DATADIR/templates/zh_TW
-#f 0444 root sys $DATADIR/templates/zh_TW templates/zh_TW/*.tmpl
+#f 0644 root sys $DATADIR/templates/zh_TW templates/zh_TW/*.tmpl

 # Config files
 d 0755 root sys $SERVERROOT -
@@ -581,105 +577,102 @@ c 0644 root sys $PAMDIR/cups conf/@PAMFILE@

 %subpackage devel
 # Developer files
-f 0555 root sys $BINDIR/cups-config cups-config
+f 0755 root sys $BINDIR/cups-config cups-config
 d 0755 root sys $INCLUDEDIR/cups -
-f 0444 root sys $INCLUDEDIR/cups/adminutil.h cups/adminutil.h
-f 0444 root sys $INCLUDEDIR/cups/array.h cups/array.h
-f 0444 root sys $INCLUDEDIR/cups/backend.h cups/backend.h
-f 0444 root sys $INCLUDEDIR/cups/cups.h cups/cups.h
-f 0444 root sys $INCLUDEDIR/cups/dir.h cups/dir.h
-f 0444 root sys $INCLUDEDIR/cups/driver.h driver/driver.h
-f 0444 root sys $INCLUDEDIR/cups/file.h cups/file.h
-f 0444 root sys $INCLUDEDIR/cups/http.h cups/http.h
-f 0444 root sys $INCLUDEDIR/cups/image.h filter/image.h
-f 0444 root sys $INCLUDEDIR/cups/ipp.h cups/ipp.h
-f 0444 root sys $INCLUDEDIR/cups/mime.h scheduler/mime.h
-f 0444 root sys $INCLUDEDIR/cups/language.h cups/language.h
-f 0444 root sys $INCLUDEDIR/cups/ppd.h cups/ppd.h
-f 0444 root sys $INCLUDEDIR/cups/raster.h cups/raster.h
-f 0444 root sys $INCLUDEDIR/cups/transcode.h cups/transcode.h
+f 0644 root sys $INCLUDEDIR/cups/adminutil.h cups/adminutil.h
+f 0644 root sys $INCLUDEDIR/cups/array.h cups/array.h
+f 0644 root sys $INCLUDEDIR/cups/backend.h cups/backend.h
+f 0644 root sys $INCLUDEDIR/cups/cups.h cups/cups.h
+f 0644 root sys $INCLUDEDIR/cups/dir.h cups/dir.h
+f 0644 root sys $INCLUDEDIR/cups/driver.h driver/driver.h
+f 0644 root sys $INCLUDEDIR/cups/file.h cups/file.h
+f 0644 root sys $INCLUDEDIR/cups/http.h cups/http.h
+f 0644 root sys $INCLUDEDIR/cups/image.h filter/image.h
+f 0644 root sys $INCLUDEDIR/cups/ipp.h cups/ipp.h
+f 0644 root sys $INCLUDEDIR/cups/mime.h scheduler/mime.h
+f 0644 root sys $INCLUDEDIR/cups/language.h cups/language.h
+f 0644 root sys $INCLUDEDIR/cups/ppd.h cups/ppd.h
+f 0644 root sys $INCLUDEDIR/cups/raster.h cups/raster.h
+f 0644 root sys $INCLUDEDIR/cups/transcode.h cups/transcode.h

 %if INSTALLSTATIC
-f 0444 root sys $LIBDIR/libcups.a cups/libcups.a
-f 0444 root sys $LIBDIR/libcupscgi.a cgi-bin/libcupscgi.a
-f 0444 root sys $LIBDIR/libcupsdriver.a driver/libcupsdriver.a
-f 0444 root sys $LIBDIR/libcupsimage.a filter/libcupsimage.a
-f 0444 root sys $LIBDIR/libcupsmime.a scheduler/libcupsmime.a
-f 0444 root sys $LIBDIR/libcupsppdc.a ppdc/libcupsppdc.a
+f 0644 root sys $LIBDIR/libcups.a cups/libcups.a
+f 0644 root sys $LIBDIR/libcupscgi.a cgi-bin/libcupscgi.a
+f 0644 root sys $LIBDIR/libcupsdriver.a driver/libcupsdriver.a
+f 0644 root sys $LIBDIR/libcupsimage.a filter/libcupsimage.a
+f 0644 root sys $LIBDIR/libcupsmime.a scheduler/libcupsmime.a
+f 0644 root sys $LIBDIR/libcupsppdc.a ppdc/libcupsppdc.a
 %endif

 d 0755 root sys $DOCDIR/help -
-f 0444 root sys $DOCDIR/help doc/help/api*.html
-f 0444 root sys $DOCDIR/help/postscript-driver.html doc/help/postscript-driver.html
-f 0444 root sys $DOCDIR/help/ppd-compiler.html doc/help/ppd-compiler.html
-f 0444 root sys $DOCDIR/help/raster-driver.html doc/help/raster-driver.html
-f 0444 root sys $DOCDIR/help doc/help/spec*.html
+f 0644 root sys $DOCDIR/help doc/help/api*.html
+f 0644 root sys $DOCDIR/help/postscript-driver.html doc/help/postscript-driver.html
+f 0644 root sys $DOCDIR/help/ppd-compiler.html doc/help/ppd-compiler.html
+f 0644 root sys $DOCDIR/help/raster-driver.html doc/help/raster-driver.html
+f 0644 root sys $DOCDIR/help doc/help/spec*.html
 %subpackage

 # Documentation files
 d 0755 root sys $DOCDIR -
-f 0444 root sys $DOCDIR doc/*.css
-f 0444 root sys $DOCDIR doc/*.html
+f 0644 root sys $DOCDIR doc/*.css
+f 0644 root sys $DOCDIR doc/*.html
 d 0755 root sys $DOCDIR/help -
-f 0444 root sys $DOCDIR/help/accounting.html doc/help/accounting.html
-f 0444 root sys $DOCDIR/help/cgi.html doc/help/cgi.html
-f 0444 root sys $DOCDIR/help/glossary.html doc/help/glossary.html
-f 0444 root sys $DOCDIR/help/kerberos.html doc/help/kerberos.html
-f 0444 root sys $DOCDIR/help/license.html doc/help/license.html
-f 0444 root sys $DOCDIR/help/network.html doc/help/network.html
-f 0444 root sys $DOCDIR/help/options.html doc/help/options.html
-f 0444 root sys $DOCDIR/help/overview.html doc/help/overview.html
-f 0444 root sys $DOCDIR/help/policies.html doc/help/policies.html
-f 0444 root sys $DOCDIR/help/security.html doc/help/security.html
-f 0444 root sys $DOCDIR/help/sharing.html doc/help/sharing.html
-f 0444 root sys $DOCDIR/help/standard.html doc/help/standard.html
-f 0444 root sys $DOCDIR/help/translation.html doc/help/translation.html
-f 0444 root sys $DOCDIR/help/whatsnew.html doc/help/whatsnew.html
-f 0444 root sys $DOCDIR/help doc/help/man-*.html
-f 0444 root sys $DOCDIR/help doc/help/ref-*.html
+f 0644 root sys $DOCDIR/help/accounting.html doc/help/accounting.html
+f 0644 root sys $DOCDIR/help/cgi.html doc/help/cgi.html
+f 0644 root sys $DOCDIR/help/glossary.html doc/help/glossary.html
+f 0644 root sys $DOCDIR/help/kerberos.html doc/help/kerberos.html
+f 0644 root sys $DOCDIR/help/license.html doc/help/license.html
+f 0644 root sys $DOCDIR/help/network.html doc/help/network.html
+f 0644 root sys $DOCDIR/help/options.html doc/help/options.html
+f 0644 root sys $DOCDIR/help/overview.html doc/help/overview.html
+f 0644 root sys $DOCDIR/help/policies.html doc/help/policies.html
+f 0644 root sys $DOCDIR/help/security.html doc/help/security.html
+f 0644 root sys $DOCDIR/help/sharing.html doc/help/sharing.html
+f 0644 root sys $DOCDIR/help/standard.html doc/help/standard.html
+f 0644 root sys $DOCDIR/help/translation.html doc/help/translation.html
+f 0644 root sys $DOCDIR/help/whatsnew.html doc/help/whatsnew.html
+f 0644 root sys $DOCDIR/help doc/help/man-*.html
+f 0644 root sys $DOCDIR/help doc/help/ref-*.html
 d 0755 root sys $DOCDIR/images -
-f 0444 root sys $DOCDIR/images doc/images/*.gif
-f 0444 root sys $DOCDIR/images doc/images/*.jpg
-f 0444 root sys $DOCDIR/images doc/images/*.png
-f 0444 root sys $DOCDIR/robots.txt doc/robots.txt
+f 0644 root sys $DOCDIR/images doc/images/*.gif
+f 0644 root sys $DOCDIR/images doc/images/*.jpg
+f 0644 root sys $DOCDIR/images doc/images/*.png
+f 0644 root sys $DOCDIR/robots.txt doc/robots.txt

 # Localized documentation files
 #d 0755 root sys $DOCDIR/de
-#f 0444 root sys $DOCDIR/de doc/de/*.html
+#f 0644 root sys $DOCDIR/de doc/de/*.html

 d 0755 root sys $DOCDIR/es
-f 0444 root sys $DOCDIR/es doc/es/*.html
+f 0644 root sys $DOCDIR/es doc/es/*.html

 #d 0755 root sys $DOCDIR/et
-#f 0444 root sys $DOCDIR/et doc/et/*.html
-
-d 0755 root sys $DOCDIR/eu
-f 0444 root sys $DOCDIR/eu doc/eu/*.html
+#f 0644 root sys $DOCDIR/et doc/et/*.html

 #d 0755 root sys $DOCDIR/fr
-#f 0444 root sys $DOCDIR/fr doc/fr/*.html
+#f 0644 root sys $DOCDIR/fr doc/fr/*.html

 #d 0755 root sys $DOCDIR/he
-#f 0444 root sys $DOCDIR/he doc/he/*.html
-#f 0444 root sys $DOCDIR/he/cups.css doc/he/cups.css
+#f 0644 root sys $DOCDIR/he doc/he/*.html
+#f 0644 root sys $DOCDIR/he/cups.css doc/he/cups.css

 #d 0755 root sys $DOCDIR/it
-#f 0444 root sys $DOCDIR/it doc/it/*.html
+#f 0644 root sys $DOCDIR/it doc/it/*.html

 d 0755 root sys $DOCDIR/ja
-f 0444 root sys $DOCDIR/ja doc/ja/*.html
+f 0644 root sys $DOCDIR/ja doc/ja/*.html

 d 0755 root sys $DOCDIR/pl
-f 0444 root sys $DOCDIR/pl doc/pl/*.html
+f 0644 root sys $DOCDIR/pl doc/pl/*.html

 d 0755 root sys $DOCDIR/ru
-f 0444 root sys $DOCDIR/ru doc/ru/*.html
+f 0644 root sys $DOCDIR/ru doc/ru/*.html

 #d 0755 root sys $DOCDIR/sv
-#f 0444 root sys $DOCDIR/sv doc/sv/*.html
+#f 0644 root sys $DOCDIR/sv doc/sv/*.html

 #d 0755 root sys $DOCDIR/zh_TW
-#f 0444 root sys $DOCDIR/zh_TW doc/zh_TW/*.html
+#f 0644 root sys $DOCDIR/zh_TW doc/zh_TW/*.html

 # Man pages
 d 0755 root sys $AMANDIR -
@@ -689,60 +682,60 @@ d 0755 root sys $MANDIR/man1 -
 d 0755 root sys $MANDIR/man5 -
 d 0755 root sys $MANDIR/man7 -

-f 0444 root sys $MANDIR/man1/cancel.$MAN1EXT man/cancel.$MAN1EXT
-f 0444 root sys $MANDIR/man1/cupstestdsc.$MAN1EXT man/cupstestdsc.$MAN1EXT
-f 0444 root sys $MANDIR/man1/cupstestppd.$MAN1EXT man/cupstestppd.$MAN1EXT
-f 0444 root sys $MANDIR/man1/lpoptions.$MAN1EXT man/lpoptions.$MAN1EXT
-f 0444 root sys $MANDIR/man1/lppasswd.$MAN1EXT man/lppasswd.$MAN1EXT
-f 0444 root sys $MANDIR/man1/lpq.$MAN1EXT man/lpq.$MAN1EXT
-f 0444 root sys $MANDIR/man1/lprm.$MAN1EXT man/lprm.$MAN1EXT
-f 0444 root sys $MANDIR/man1/lpr.$MAN1EXT man/lpr.$MAN1EXT
-f 0444 root sys $MANDIR/man1/lpstat.$MAN1EXT man/lpstat.$MAN1EXT
-f 0444 root sys $MANDIR/man1/lp.$MAN1EXT man/lp.$MAN1EXT
+f 0644 root sys $MANDIR/man1/cancel.$MAN1EXT man/cancel.$MAN1EXT
+f 0644 root sys $MANDIR/man1/cupstestdsc.$MAN1EXT man/cupstestdsc.$MAN1EXT
+f 0644 root sys $MANDIR/man1/cupstestppd.$MAN1EXT man/cupstestppd.$MAN1EXT
+f 0644 root sys $MANDIR/man1/lpoptions.$MAN1EXT man/lpoptions.$MAN1EXT
+f 0644 root sys $MANDIR/man1/lppasswd.$MAN1EXT man/lppasswd.$MAN1EXT
+f 0644 root sys $MANDIR/man1/lpq.$MAN1EXT man/lpq.$MAN1EXT
+f 0644 root sys $MANDIR/man1/lprm.$MAN1EXT man/lprm.$MAN1EXT
+f 0644 root sys $MANDIR/man1/lpr.$MAN1EXT man/lpr.$MAN1EXT
+f 0644 root sys $MANDIR/man1/lpstat.$MAN1EXT man/lpstat.$MAN1EXT
+f 0644 root sys $MANDIR/man1/lp.$MAN1EXT man/lp.$MAN1EXT

-f 0444 root sys $MANDIR/man5/classes.conf.$MAN5EXT man/classes.conf.$MAN5EXT
-f 0444 root sys $MANDIR/man5/cupsd.conf.$MAN5EXT man/cupsd.conf.$MAN5EXT
-f 0444 root sys $MANDIR/man5/mailto.conf.$MAN5EXT man/mailto.conf.$MAN5EXT
-f 0444 root sys $MANDIR/man5/mime.convs.$MAN5EXT man/mime.convs.$MAN5EXT
-f 0444 root sys $MANDIR/man5/mime.types.$MAN5EXT man/mime.types.$MAN5EXT
-f 0444 root sys $MANDIR/man5/printers.conf.$MAN5EXT man/printers.conf.$MAN5EXT
+f 0644 root sys $MANDIR/man5/classes.conf.$MAN5EXT man/classes.conf.$MAN5EXT
+f 0644 root sys $MANDIR/man5/cupsd.conf.$MAN5EXT man/cupsd.conf.$MAN5EXT
+f 0644 root sys $MANDIR/man5/mailto.conf.$MAN5EXT man/mailto.conf.$MAN5EXT
+f 0644 root sys $MANDIR/man5/mime.convs.$MAN5EXT man/mime.convs.$MAN5EXT
+f 0644 root sys $MANDIR/man5/mime.types.$MAN5EXT man/mime.types.$MAN5EXT
+f 0644 root sys $MANDIR/man5/printers.conf.$MAN5EXT man/printers.conf.$MAN5EXT

-f 0444 root sys $MANDIR/man7/drv.$MAN7EXT man/drv.$MAN7EXT
+f 0644 root sys $MANDIR/man7/drv.$MAN7EXT man/drv.$MAN7EXT

 l 0644 root sys $AMANDIR/man$MAN8DIR/accept.$MAN8EXT cupsaccept.$MAN8EXT
-f 0444 root sys $AMANDIR/man$MAN8DIR/cupsaccept.$MAN8EXT man/cupsaccept.$MAN8EXT
+f 0644 root sys $AMANDIR/man$MAN8DIR/cupsaccept.$MAN8EXT man/cupsaccept.$MAN8EXT
 l 0644 root sys $AMANDIR/man$MAN8DIR/cupsreject.$MAN8EXT cupsaccept.$MAN8EXT
-f 0444 root sys $AMANDIR/man$MAN8DIR/cupsaddsmb.$MAN8EXT man/cupsaddsmb.$MAN8EXT
-f 0444 root sys $AMANDIR/man$MAN8DIR/cupsctl.$MAN8EXT man/cupsctl.$MAN8EXT
-f 0444 root sys $AMANDIR/man$MAN8DIR/cupsfilter.$MAN8EXT man/cupsfilter.$MAN8EXT
-f 0444 root sys $AMANDIR/man$MAN8DIR/cups-polld.$MAN8EXT man/cups-polld.$MAN8EXT
-f 0444 root sys $AMANDIR/man$MAN8DIR/cupsd.$MAN8EXT man/cupsd.$MAN8EXT
-f 0444 root sys $AMANDIR/man$MAN8DIR/cupsenable.$MAN8EXT man/cupsenable.$MAN8EXT
+f 0644 root sys $AMANDIR/man$MAN8DIR/cupsaddsmb.$MAN8EXT man/cupsaddsmb.$MAN8EXT
+f 0644 root sys $AMANDIR/man$MAN8DIR/cupsctl.$MAN8EXT man/cupsctl.$MAN8EXT
+f 0644 root sys $AMANDIR/man$MAN8DIR/cupsfilter.$MAN8EXT man/cupsfilter.$MAN8EXT
+f 0644 root sys $AMANDIR/man$MAN8DIR/cups-polld.$MAN8EXT man/cups-polld.$MAN8EXT
+f 0644 root sys $AMANDIR/man$MAN8DIR/cupsd.$MAN8EXT man/cupsd.$MAN8EXT
+f 0644 root sys $AMANDIR/man$MAN8DIR/cupsenable.$MAN8EXT man/cupsenable.$MAN8EXT
 l 0644 root sys $AMANDIR/man$MAN8DIR/cupsdisable.$MAN8EXT cupsenable.$MAN8EXT
 l 0644 root sys $AMANDIR/man$MAN8DIR/disable.$MAN8EXT cupsenable.$MAN8EXT
 l 0644 root sys $AMANDIR/man$MAN8DIR/enable.$MAN8EXT cupsenable.$MAN8EXT
-f 0444 root sys $AMANDIR/man$MAN8DIR/lpadmin.$MAN8EXT man/lpadmin.$MAN8EXT
-f 0444 root sys $AMANDIR/man$MAN8DIR/lpc.$MAN8EXT man/lpc.$MAN8EXT
-f 0444 root sys $AMANDIR/man$MAN8DIR/lpinfo.$MAN8EXT man/lpinfo.$MAN8EXT
-f 0444 root sys $AMANDIR/man$MAN8DIR/lpmove.$MAN8EXT man/lpmove.$MAN8EXT
+f 0644 root sys $AMANDIR/man$MAN8DIR/lpadmin.$MAN8EXT man/lpadmin.$MAN8EXT
+f 0644 root sys $AMANDIR/man$MAN8DIR/lpc.$MAN8EXT man/lpc.$MAN8EXT
+f 0644 root sys $AMANDIR/man$MAN8DIR/lpinfo.$MAN8EXT man/lpinfo.$MAN8EXT
+f 0644 root sys $AMANDIR/man$MAN8DIR/lpmove.$MAN8EXT man/lpmove.$MAN8EXT
 l 0644 root sys $AMANDIR/man$MAN8DIR/reject.$MAN8EXT cupsaccept.$MAN8EXT

 %subpackage devel
-f 0444 root sys $MANDIR/man1/cups-config.$MAN1EXT man/cups-config.$MAN1EXT
-f 0444 root sys $MANDIR/man1/ man/ppd*.$MAN1EXT
-f 0444 root sys $MANDIR/man5/ppdcfile.$MAN5EXT man/ppdcfile.$MAN5EXT
-f 0444 root sys $MANDIR/man7/backend.$MAN7EXT man/backend.$MAN7EXT
-f 0444 root sys $MANDIR/man7/filter.$MAN7EXT man/filter.$MAN7EXT
-f 0444 root sys $MANDIR/man7/notifier.$MAN7EXT man/notifier.$MAN7EXT
+f 0644 root sys $MANDIR/man1/cups-config.$MAN1EXT man/cups-config.$MAN1EXT
+f 0644 root sys $MANDIR/man1/ man/ppd*.$MAN1EXT
+f 0644 root sys $MANDIR/man5/ppdcfile.$MAN5EXT man/ppdcfile.$MAN5EXT
+f 0644 root sys $MANDIR/man7/backend.$MAN7EXT man/backend.$MAN7EXT
+f 0644 root sys $MANDIR/man7/filter.$MAN7EXT man/filter.$MAN7EXT
+f 0644 root sys $MANDIR/man7/notifier.$MAN7EXT man/notifier.$MAN7EXT

 %subpackage lpd
 d 0755 root sys $AMANDIR/man$MAN8DIR -
-f 0444 root sys $AMANDIR/man$MAN8DIR/cups-lpd.$MAN8EXT man/cups-lpd.$MAN8EXT
+f 0644 root sys $AMANDIR/man$MAN8DIR/cups-lpd.$MAN8EXT man/cups-lpd.$MAN8EXT
 %subpackage

 # Startup scripts
 %system darwin
-f 0444 root sys /System/Library/LaunchDaemons/org.cups.cupsd.plist init/org.cups.cupsd.plist
+f 0644 root sys /System/Library/LaunchDaemons/org.cups.cupsd.plist init/org.cups.cupsd.plist
 %preremove <<EOF
 launchctl unload /System/Library/LaunchDaemons/org.cups.cupsd.plist || exit 0
 killall cupsd || exit 0
@@ -755,7 +748,7 @@ EOF
 launchctl load -D system /System/Library/LaunchDaemons/org.cups.cupsd.plist
 EOF
 %subpackage lpd
-f 0444 root sys /System/Library/LaunchDaemons/org.cups.cups-lpd.plist init/org.cups.cups-lpd.plist
+f 0644 root sys /System/Library/LaunchDaemons/org.cups.cups-lpd.plist init/org.cups.cups-lpd.plist
 %preremove <<EOF
 launchctl unload /System/Library/LaunchDaemons/org.cups.cups-lpd.plist || exit 0
 EOF
@@ -772,7 +765,7 @@ EOF
 i 0755 root sys cups init/cups.sh start(@RCSTART@) stop(@RCSTOP) runlevels(@RCLEVELS@)
 %subpackage lpd
 %if XINETD
-f 0444 root sys $XINETD/cups-lpd init/cups-lpd
+f 0644 root sys $XINETD/cups-lpd init/cups-lpd
 %endif
 %subpackage

@@ -238,8 +238,6 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/doc/cups/de/*
 %dir /usr/share/doc/cups/es
 /usr/share/doc/cups/es/*
-%dir /usr/share/doc/cups/eu
-/usr/share/doc/cups/eu/*
 %dir /usr/share/doc/cups/ja
 /usr/share/doc/cups/ja/*
 %dir /usr/share/doc/cups/pl
@@ -3339,9 +3339,8 @@ encrypt_client(cupsd_client_t *con)	/* I - Client to encrypt */
 * 'get_cdsa_certificate()' - Get a SSL/TLS certificate from the System keychain.
 */

-static CFArrayRef			/* O - Array of certificates */
-get_cdsa_certificate(
-    cupsd_client_t *con)		/* I - Client connection */
+static CFArrayRef				/* O - Array of certificates */
+get_cdsa_certificate(cupsd_client_t *con)	/* I - Client connection */
 {
  OSStatus		err;		/* Error info */
  SecKeychainRef	keychain;	/* Keychain reference */
@@ -3369,7 +3368,6 @@ get_cdsa_certificate(
  CSSM_DATA		options;	/* Policy options */
  CSSM_APPLE_TP_SSL_OPTIONS
 			ssl_options;	/* SSL Option for hostname */
-  char			localname[1024];/* Local hostname */


  if (SecPolicySearchCreate(CSSM_CERT_X_509v3, &CSSMOID_APPLE_TP_SSL, 
@@ -3412,35 +3410,6 @@ get_cdsa_certificate(

  err = SecIdentitySearchCreateWithPolicy(policy, NULL, CSSM_KEYUSE_SIGN,
 					  keychain, FALSE, &search);
-  if (err && DNSSDHostName)
-  {
-   /*
-    * Search for the connection server name failed; try the DNS-SD .local
-    * hostname instead...
-    */
-
-    snprintf(localname, sizeof(localname), "%s.local", DNSSDHostName);
-
-    ssl_options.ServerName    = localname;
-    ssl_options.ServerNameLen = strlen(localname);
-
-    cupsdLogMessage(CUPSD_LOG_DEBUG,
-		    "get_cdsa_certificate: Looking for certs for \"%s\"...",
-		    localname);
-
-    if (SecPolicySetValue(policy, &options))
-    {
-      cupsdLogMessage(CUPSD_LOG_ERROR,
-		      "Cannot set policy value to use for searching");
-      CFRelease(keychain);
-      CFRelease(policy_search);
-      return (NULL);
-    }
-
-    err = SecIdentitySearchCreateWithPolicy(policy, NULL, CSSM_KEYUSE_SIGN,
-					    keychain, FALSE, &search);
-  }
-
 #  else
 /*
  * Assume there is exactly one SecIdentity in the keychain...
@@ -3668,6 +3637,9 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
 		  "%s", con, con->http.fd, filestats, filename, len,
 		  status ? "(null)" : filename);

+  if (!status)
+    con->http.data_remaining = (int)filestats->st_size;
+
  if (status)
    return (NULL);
  else
@@ -4041,6 +4013,7 @@ make_certificate(cupsd_client_t *con)	/* I - Client connection */
  char		command[1024],		/* Command */
 		*argv[12],		/* Command-line arguments */
 		*envp[MAX_ENV + 1],	/* Environment variables */
+		home[1024],		/* HOME environment variable */
 		infofile[1024],		/* Type-in information for cert */
 		seedfile[1024];		/* Random number seed file */
  int		envc,			/* Number of environment variables */
@@ -4081,6 +4054,8 @@ make_certificate(cupsd_client_t *con)	/* I - Client connection */
    cupsdLogMessage(CUPSD_LOG_INFO,
                    "Seeding the random number generator...");

+    snprintf(home, sizeof(home), "HOME=%s", TempDir);
+
   /*
    * Write the seed file...
    */
@@ -4109,7 +4084,8 @@ make_certificate(cupsd_client_t *con)	/* I - Client connection */
    argv[5] = NULL;

    envc = cupsdLoadEnv(envp, MAX_ENV);
-    envp[envc] = NULL;
+    envp[envc++] = home;
+    envp[envc]   = NULL;

    if (!cupsdStartProcess(command, argv, envp, -1, -1, -1, -1, -1, 1, NULL,
                           NULL, &pid))
@@ -82,7 +82,6 @@ cupsdInitEnv(void)
  cupsdSetEnv("CUPS_SERVERROOT", ServerRoot);
  cupsdSetEnv("CUPS_STATEDIR", StateDir);
  cupsdSetEnv("DYLD_LIBRARY_PATH", NULL);
-  cupsdSetEnv("HOME", TempDir);
  cupsdSetEnv("LD_ASSUME_KERNEL", NULL);
  cupsdSetEnv("LD_LIBRARY_PATH", NULL);
  cupsdSetEnv("LD_PRELOAD", NULL);
@@ -1190,12 +1190,6 @@ add_class(cupsd_client_t  *con,		/* I - Client connection */
                	_("The printer or class was not found."));
 	return;
      }
-      else if (dtype & CUPS_PRINTER_CLASS)
-      {
-        send_ipp_status(con, IPP_BAD_REQUEST,
-			_("Nested classes are not allowed!"));
-        return;
-      }

     /*
      * Add it to the class...
@@ -1727,7 +1721,8 @@ add_job(cupsd_client_t  *con,		/* I - Client connection */
    attr = ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_KEYWORD,
                        "job-hold-until", NULL, val);
  }
-  if (attr && strcmp(attr->values[0].string.text, "no-hold"))
+  if (attr && strcmp(attr->values[0].string.text, "no-hold") &&
+      !(printer->type & CUPS_PRINTER_REMOTE))
  {
   /*
    * Hold job until specified time...
@@ -11167,7 +11162,7 @@ url_encode_string(const char *s,	/* I - String */

  while (*s && bufptr < bufend)
  {
-    if (*s == ' ' || *s == '%' || *s == '+')
+    if (*s == ' ' || *s == '%')
    {
      if (bufptr >= (bufend - 2))
 	break;
@@ -2637,12 +2637,11 @@ finalize_job(cupsd_job_t *job)		/* I - Job */
  cupsdLogMessage(CUPSD_LOG_DEBUG2, "finalize_job(job=%p(%d))", job, job->id);

 /*
-  * Clear the "connecting-to-device" and "com.apple.print.recoverable-warning"
-  * reasons, which are only valid when a printer is processing...
+  * Clear the "connecting-to-device" reason, which is only valid when a
+  * printer is processing...
  */

  cupsdSetPrinterReasons(job->printer, "-connecting-to-device");
-  cupsdSetPrinterReasons(job->printer, "-com.apple.print.recoverable-warning");

 /*
  * Similarly, clear the "offline-report" reason for non-USB devices since we
@@ -3032,8 +3031,7 @@ get_options(cupsd_job_t *job,		/* I - Job */
 	  attr->value_tag == IPP_TAG_BEGIN_COLLECTION) /* Not yet supported */
 	continue;

-      if (!strncmp(attr->name, "time-", 5) ||
-          !strcmp(attr->name, "job-hold-until"))
+      if (!strncmp(attr->name, "time-", 5))
 	continue;

      if (!strncmp(attr->name, "job-", 4) &&
@@ -3380,8 +3378,11 @@ load_job_cache(const char *filename)	/* I - job.cache filename */
    {
      cupsArrayAdd(Jobs, job);

-      if (job->state_value <= IPP_JOB_STOPPED && cupsdLoadJob(job))
-	cupsArrayAdd(ActiveJobs, job);
+      if (job->state_value <= IPP_JOB_STOPPED)
+      {
+        cupsArrayAdd(ActiveJobs, job);
+	cupsdLoadJob(job);
+      }

      job = NULL;
    }
@@ -3633,19 +3634,18 @@ load_request_root(void)
      * Load the job...
      */

-      if (cupsdLoadJob(job))
-      {
-       /*
-        * Insert the job into the array, sorting by job priority and ID...
-        */
+      cupsdLoadJob(job);

-	cupsArrayAdd(Jobs, job);
+     /*
+      * Insert the job into the array, sorting by job priority and ID...
+      */

-	if (job->state_value <= IPP_JOB_STOPPED)
-	  cupsArrayAdd(ActiveJobs, job);
-	else
-	  unload_job(job);
-      }
+      cupsArrayAdd(Jobs, job);
+
+      if (job->state_value <= IPP_JOB_STOPPED)
+        cupsArrayAdd(ActiveJobs, job);
+      else
+        unload_job(job);
    }

  cupsDirClose(dir);
@@ -4017,8 +4017,9 @@ update_job(cupsd_job_t *job)		/* I - Job to check */
        cupsdStopPrinter(job->printer, 1);
 	return;
      }
-      else if (cupsdSetPrinterReasons(job->printer, message))
+      else
      {
+	cupsdSetPrinterReasons(job->printer, message);
 	cupsdAddPrinterHistory(job->printer);
 	event |= CUPSD_EVENT_PRINTER_STATE;
      }
@@ -4159,6 +4160,7 @@ update_job(cupsd_job_t *job)		/* I - Job to check */

      cupsFreeOptions(num_keywords, keywords);
    }
+#ifdef __APPLE__
    else if (!strncmp(message, "recoverable:", 12))
    {
      ptr = message + 12;
@@ -4167,32 +4169,27 @@ update_job(cupsd_job_t *job)		/* I - Job to check */

      if (*ptr)
      {
-	if (cupsdSetPrinterReasons(job->printer,
-				   "+com.apple.print.recoverable-warning") ||
-	    !job->printer->recoverable ||
-	    strcmp(job->printer->recoverable, ptr))
-	{
-	  cupsdSetString(&(job->printer->recoverable), ptr);
-	  cupsdAddPrinterHistory(job->printer);
-	  event |= CUPSD_EVENT_PRINTER_STATE;
-	}
-      }
-    }
-    else if (!strncmp(message, "recovered:", 10))
-    {
-      ptr = message + 10;
-      while (isspace(*ptr & 255))
-        ptr ++;
-
-      if (cupsdSetPrinterReasons(job->printer,
-                                 "-com.apple.print.recoverable-warning") ||
-	  !job->printer->recoverable || strcmp(job->printer->recoverable, ptr))
-      {
+	cupsdSetPrinterReasons(job->printer,
+	                       "+com.apple.print.recoverable-warning");
 	cupsdSetString(&(job->printer->recoverable), ptr);
 	cupsdAddPrinterHistory(job->printer);
 	event |= CUPSD_EVENT_PRINTER_STATE;
      }
    }
+    else if (!strncmp(message, "recovered:", 10))
+    {
+      cupsdSetPrinterReasons(job->printer,
+                             "-com.apple.print.recoverable-warning");
+
+      ptr = message + 10;
+      while (isspace(*ptr & 255))
+        ptr ++;
+
+      cupsdSetString(&(job->printer->recoverable), ptr);
+      cupsdAddPrinterHistory(job->printer);
+      event |= CUPSD_EVENT_PRINTER_STATE;
+    }
+#endif /* __APPLE__ */
    else
    {
      cupsdLogJob(job, loglevel, "%s", message);
@@ -94,7 +94,10 @@ typedef struct cupsd_printer_s
  time_t	marker_time;		/* Last time marker attributes were updated */
  cups_array_t	*filters,		/* Filters for queue */
 		*pre_filters;		/* Pre-filters for queue */
+
+#ifdef __APPLE__
  char		*recoverable;		/* com.apple.print.recoverable-message */
+#endif /* __APPLE__ */

 #ifdef HAVE_DNSSD
  char		*reg_name,		/* Name used for service registration */
@@ -750,7 +750,7 @@ cupsdRemoveSelect(int fd)		/* I - File descriptor */
    {
      cupsdLogMessage(CUPSD_LOG_EMERG, "kevent() returned %s",
 		      strerror(errno));
-      goto cleanup;
+      return;
    }
  }

@@ -762,10 +762,11 @@ cupsdRemoveSelect(int fd)		/* I - File descriptor */
    {
      cupsdLogMessage(CUPSD_LOG_EMERG, "kevent() returned %s",
 		      strerror(errno));
-      goto cleanup;
+      return;
    }
  }

+
 #elif defined(HAVE_POLL)
 /*
  * Update the pollfds array...
@@ -780,10 +781,6 @@ cupsdRemoveSelect(int fd)		/* I - File descriptor */
  FD_CLR(fd, &cupsd_current_output);
 #endif /* HAVE_EPOLL */

-#ifdef HAVE_KQUEUE
-  cleanup:
-#endif /* HAVE_KQUEUE */
-
 /*
  * Remove the file descriptor from the active array and add to the
  * inactive array (or release, if we don't need the inactive array...)
@@ -50,9 +50,6 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <math.h>
-#ifdef WIN32
-#  define X_OK 0
-#endif /* WIN32 */


 /*
@@ -1544,7 +1541,7 @@ main(int  argc,				/* I - Number of command-line args */
 	for (j = 0, group = ppd->groups; j < ppd->num_groups; j ++, group ++)
 	  for (k = 0, option = group->options; k < group->num_options; k ++, option ++)
 	  {
-	    len = (int)strlen(option->keyword);
+	    len = strlen(option->keyword);

 	    for (m = 0, group2 = ppd->groups;
 		 m < ppd->num_groups;
@@ -1553,7 +1550,7 @@ main(int  argc,				/* I - Number of command-line args */
 	           n < group2->num_options;
 		   n ++, option2 ++)
 		if (option != option2 &&
-	            len < (int)strlen(option2->keyword) &&
+	            len < strlen(option2->keyword) &&
 	            !strncmp(option->keyword, option2->keyword, len))
 		{
 		  _cupsLangPrintf(stdout,
@@ -3073,7 +3070,7 @@ check_translations(ppd_file_t *ppd,	/* I - PPD file */
         language;
 	 language = (char *)cupsArrayNext(languages))
    {
-      langlen = (int)strlen(language);
+      langlen = strlen(language);
      if (langlen != 2 && langlen != 5)
      {
 	if (!warn && !errors && !verbose)
@@ -29,7 +29,7 @@
 </TR>
 <TR>
 <TH CLASS="label">Sharing:</TH>
-<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}">
 Share This Printer</TD>
 </TR>
 <TR>
@@ -29,7 +29,7 @@
 </TR>
 <TR>
 <TH CLASS="label">Freigabe:</TH>
-<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}">
 Diesen Drucker freigeben</TD>
 </TR>
 <TR>
@@ -23,7 +23,7 @@
 </TR>
 <TR>
 <TH CLASS="label">Freigabe:</TH>
-<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}">
 Diesen Drucker freigeben</TD>
 </TR>
 <TR>
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
 </TD>
 </TR>
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT></TD>
 </TR>
@@ -1,7 +1,7 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
-{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT>
 {iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
 <TR><TH CLASS="sublabel">{paramtext}:</TH>
@@ -29,7 +29,7 @@
 </TR>
 <TR>
 <TH CLASS="label">Compartici&oacute;n:</TH>
-<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}">
 Compartir esta impresora</TD>
 </TR>
 <TR>
@@ -23,7 +23,7 @@
 </TR>
 <TR>
 <TH CLASS="label">Compartida:</TH>
-<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}">
 Compartir esta impresora</TD>
 </TR>
 <TR>
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
 </TD>
 </TR>
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT></TD>
 </TR>
@@ -1,7 +1,7 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
-{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT>
 {iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
 <TR><TH CLASS="sublabel">{paramtext}:</TH>
@@ -1,39 +0,0 @@
-<DIV CLASS="indent">
-
-<H2 CLASS="title">Gehitu klasea</H2>
-
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-
-<TABLE>
-<TR>
-<TH CLASS="label">Izena:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(Inprimatu daitekeen edozein karaktere eduki dezake, "/", "#" eta zuriunea izan ezik)</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Deskripzioa:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(Gizakiek irakurtzeko deskripzioa, adibidez "HP LaserJet Duplexatzailearekin")</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Kokalekua:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"><BR>
-<SMALL>(Gizakiek irakurtzeko kokalekua, adibidez "Lab 1")</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Kideak:</TH>
-<TD>
-<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
-{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="SUBMIT" VALUE="Gehitu klasea"></TD>
-</TR>
-</TABLE>
-
-</FORM>
-</DIV>
@@ -1,42 +0,0 @@
-<DIV CLASS="indent">
-
-<H2 CLASS="title">Gehitu inprimagailua</H2>
-
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:}
-{?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}
-
-<TABLE>
-<TR>
-<TH CLASS="label">Izena:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?template_name}"><BR>
-<SMALL>(Inprimatu daitekeen edozein karaktere eduki dezake, "/", "#" eta zuriunea izan ezik)</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Deskripzioa:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_INFO}"><BR>
-<SMALL>(izakiek irakurtzeko deskripzioa, adibidez "HP LaserJet Duplexatzailearekin")</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Kokalekua:</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_LOCATION}"><BR>
-<SMALL>(izakiek irakurtzeko kokalekua, adibidez "Lab 1")</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Konexioa:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
-</TR>
-<TR>
-<TH CLASS="label">Partekatzea:</TH>
-<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}">
-Partekatu inprimagailu hau</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="SUBMIT" VALUE="Jarraitu"></TD>
-</TR>
-</TABLE>
-
-</FORM>
-</DIV>
@@ -1,43 +0,0 @@
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription">
-
-<H2 CLASS="title">Gehitu RSS harpidetza</H2>
-
-<TABLE SUMMARY="RSS harpidetza gehitzeko inprimakia">
-<TR>
-<TH CLASS="label">Izena:</TH>
-<TD COLSPAN="5"><INPUT TYPE="TEXT" NAME="SUBSCRIPTION_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?SUBSCRIPTION_NAME}"><BR>
-<SMALL>(Inprimatu daitekeen edozein karaktere eduki dezake, "/", "#" eta zuriunea izan ezik)</SMALL></TD>
-</TR>
-<TR>
-<TH CLASS="label">Ilara:</TH>
-<TD COLSPAN="5"><SELECT NAME="PRINTER_URI" SIZE="10"><OPTION VALUE="#ALL#"{?PRINTER_URI=#ALL#? SELECTED:}>Ilara guztiak</OPTION>{[printer_name]<OPTION VALUE="{printer_uri_supported}"{?PRINTER_URI={printer_uri_supported}? SELECTED:}>{printer_name}</OPTION>}</SELECT></TD>
-</TR>
-<TR VALIGN="TOP">
-<TH CLASS="label">Gertaerak:</TH>
-<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CREATED" {?EVENT_JOB_CREATED}>Lana sortuta<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_COMPLETED" {?EVENT_JOB_COMPLETED}>Lana burututa<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_STOPPED" {?EVENT_JOB_STOPPED}>Lana geldituta<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CONFIG_CHANGED" {?EVENT_JOB_CONFIG_CHANGED}>Lanaren aukerak aldatuta</TD>
-<TD>&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_STOPPED" {?EVENT_PRINTER_STOPPED}>Ilara geldituta<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_ADDED" {?EVENT_PRINTER_ADDED}>Ilara gehituta<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_MODIFIED" {?EVENT_PRINTER_MODIFIED}>Ilara aldatuta<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_DELETED" {?EVENT_PRINTER_DELETED}>Ilara ezabatuta</TD>
-<TD>&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STARTED" {?EVENT_SERVER_STARTED}>Zerbitzaria abiarazita<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STOPPED" {?EVENT_SERVER_STOPPED}>Zerbitzaria geldituta<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_RESTARTED" {?EVENT_SERVER_RESTARTED}>Zerbitzaria berrabiarazita<BR>
-<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_AUDIT" {?EVENT_SERVER_AUDIT}>Zerbitzariko segurtasun auditoretza</TD>
-</TR>
-<TR>
-<TH CLASS="label">Gehienezko gertaerak iturrian:</TH>
-<TD COLSPAN="5"><INPUT TYPE="TEXT" NAME="MAX_EVENTS" SIZE="4" MAXLENGTH="4" VALUE="{MAX_EVENTS?{MAX_EVENTS}:20}"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD COLSPAN="5"><INPUT TYPE="SUBMIT" VALUE="Gehitu RSS harpidetza"></TD>
-</TR>
-</TABLE>
-
-</FORM>
@@ -1,109 +0,0 @@
-<TABLE CLASS="indent" SUMMARY="Administrazioko atazak">
-<TR><TD VALIGN="TOP">
-
-<H2 CLASS="title">Inprimagailuak</H2>
-
-<P>
-<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="SUBMIT" VALUE="Gehitu inprimagailua"></FORM>
-<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="find-new-printers"><INPUT TYPE="SUBMIT" VALUE="Bilatu inprimagailu berriak"></FORM>
-<FORM ACTION="/printers/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Kudeatu inprimagailuak"></FORM>
-{have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="Esportatu inprimagailuak Samba-ra"></FORM>:}
-</P>
-
-<H2 CLASS="title">Klaseak</H2>
-
-<P>
-<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-class"><INPUT TYPE="SUBMIT" VALUE="Gehitu klasea"></FORM>
-<FORM ACTION="/classes/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Kudeatu klaseak"></FORM>
-</P>
-
-<H2 CLASS="title">Lanak</H2>
-
-<P>
-<FORM ACTION="/jobs/" METHDO="GET"><INPUT TYPE="SUBMIT" VALUE="Kudeatu lanak"></FORM>
-</P>
-
-</TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">
-
-<H2 CLASS="title">Zerbitzaria</H2>
-
-<P>
-<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="Editatu konfigurazioko fitxategia"></FORM>
-<FORM ACTION="/admin/log/access_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Ikusi atzipenen egunkaria"></FORM>
-<FORM ACTION="/admin/log/error_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Ikusi erroreen egunkaria"></FORM>
-<FORM ACTION="/admin/log/page_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Ikusi orrialdeen egunkaria"></FORM>
-</P>
-
-{SETTINGS_ERROR?<P>{SETTINGS_MESSAGE}</P>
-<BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>:
-
-<FORM METHOD="POST" ACTION="/admin">
-
-{ADVANCEDSETTINGS?<P><B>Zerbitzariaren ezarpenak\:</B></P>
-
-<P><A HREF="/admin/">Aurreratua <SMALL>&#x25bc;</SMALL></A><BR>
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-<INPUT TYPE="HIDDEN" NAME="ADVANCEDSETTINGS" VALUE="YES">
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_PRINTERS" {?remote_printers}> Erakutsi beste sistemekin partekatutako inprimagailuak<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Protokoloak\:
-<INPUT TYPE="CHECKBOX" NAME="BROWSE_REMOTE_CUPS" {?browse_remote_cups}> CUPS
-{HAVE_LDAP?<INPUT TYPE="CHECKBOX" NAME="BROWSE_REMOTE_LDAP" {?browse_remote_ldap}> LDAP:}
-{HAVE_LIBSLP?<INPUT TYPE="CHECKBOX" NAME="BROWSE_REMOTE_SLP" {?browse_remote_slp}> SLP:}<BR>
-<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Partekatu sistema honekin konektatutako inprimagailuak<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gehienezko bezeroak\:
-<INPUT TYPE="TEXT" NAME="MAX_CLIENTS" VALUE="{?max_clients}" SIZE="6"><BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Protokoloak\:
-<INPUT TYPE="CHECKBOX" NAME="BROWSE_LOCAL_CUPS" {?browse_local_cups}> CUPS
-{HAVE_DNSSD?<INPUT TYPE="CHECKBOX" NAME="BROWSE_LOCAL_DNSSD" {?browse_local_dnssd}> DNS-SD:}
-{HAVE_LDAP?<INPUT TYPE="CHECKBOX" NAME="BROWSE_LOCAL_LDAP" {?browse_local_ldap}> LDAP:}
-{HAVE_LIBSLP?<INPUT TYPE="CHECKBOX" NAME="BROWSE_LOCAL_SLP" {?browse_local_slp}> SLP:}<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Baimendu Internetetik inprimatzea<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" {?browse_web_if}> Jakinarazi web interfazea<BR>
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Baimendu urruneko administrazioa<BR>
-{have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Erabili Kerberos autentifikazioa (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">MEG</A>)<BR>:}
-<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Baimendu erabiltzaileek edozein lan bertan uztea (beraien lanetaz gain)<BR>
-<INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOB_HISTORY" {?preserve_job_history}> Mantendu lanen historia<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Lan kopurua\:
-<INPUT TYPE="TEXT" NAME="MAX_JOBS" VALUE="{?max_jobs}" SIZE="6"><BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOB_FILES" {?preserve_job_files}> Mantendu lanen inprimatzeko fitxategiak<BR>
-<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Gorde arazketako informazioa arazoak konpontzeko<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Egunkari fitxategiaren gehienezko tamaina\:
-<INPUT TYPE="TEXT" NAME="MAX_LOG_SIZE" VALUE="{?max_log_size}" SIZE="6"></P>
-
-:<P><B>Zerbitzariaren ezarpenak:</B></P>
-
-<P><A HREF="/admin/?ADVANCEDSETTINGS=YES">Aurreratua <SMALL>&#x25b6;</SMALL></A><BR>
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_PRINTERS" {?remote_printers}> Erakutsi beste sistemekin partekatutako inprimagailuak<BR>
-<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Partekatu sistema honekin konektatutako inprimagailuak<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Baimendu Internetetik inprimatzea<BR>
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Baimendu urruneko administrazioa<BR>
-{have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Erabili Kerberos autentifikazioa (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">MEG</A>)<BR>:}
-<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Baimendu erabiltzaileek edozein lan bertan uztea (beraien lanetaz gain)<BR>
-<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Gorde arazketako informazioa arazoak konpontzeko</P>
-
-}
-<P><INPUT TYPE="SUBMIT" NAME="CHANGESETTINGS" VALUE="Aldatu ezarpenak"></P>
-
-</FORM>}
-
-</TD></TR>
-</TABLE>
-
-<DIV CLASS="indent">
-
-<H2 CLASS="title">RSS harpidetzak</H2>
-
-<P>
-<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="Gehitu RSS harpidetza"></FORM>
-</P>
-
-</DIV>
-
-{notify_subscription_id?<TABLE CLASS="list" SUMMARY="RSS harpidetzak">
-<THEAD><TR><TH>Izena</TH><TH>Gertaerak</TH><TH>Ilararen izena</TH></TR></THEAD>
-<TBODY>{[notify_subscription_id]
-<TR><TD><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A><BR>
-<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Utzi RSS harpidetza"></FORM>&nbsp;</TD><TD>{notify_events}</TD><TD NOWRAP>&nbsp;{notify_printer_name?{notify_printer_name}:Ilara guztiak}</TD></TR>}
-</TBODY>
-</TABLE>:}
@@ -1,53 +0,0 @@
-<DIV CLASS="indent">
-
-<H2 CLASS="title">{op=modify-printer?Aldatu {printer_name}:Gehitu inprimagailua}</H2>
-
-{CUPS_GET_DEVICES_DONE?:<P><IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16" ALIGN="ABSMIDDLE"
-ALT="Busy Indicator"> Inprimagailuak bilatzen...</P>}
-
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:}
-
-<TABLE>
-{op=add-printer?:<TR>
-<TH CLASS="label">Uneko konexioa:</TH>
-<TD><INPUT TYPE="RADIO" NAME="DEVICE_URI" VALUE="{current_device_uri}" CHECKED>
-{current_device_uri}</TD>
-</TR>}
-<TR>
-<TH CLASS="label">Inprimagailu lokalak:</TH>
-<TD>
-{[device_uri]{device_class!network?<INPUT TYPE="RADIO" NAME="DEVICE_URI"
-VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
-{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR>
-:}}
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">Aurkitutako sareko inprimagailuak:</TH>
-<TD>
-{[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI"
-VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
-{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR>
-:}:}}
-</TD>
-</TR>
-<TR>
-<TR>
-<TH CLASS="label">Beste sareko inprimagailuak:</TH>
-<TD>
-{[device_uri]{device_class=network?{device_uri~[a-z]+://?:<INPUT TYPE="RADIO" NAME="DEVICE_URI"
-VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
-{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR>
-}:}}
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="SUBMIT" VALUE="Jarraitu"></TD>
-</TR>
-</TABLE>
-
-</FORM>
-</DIV>
@@ -1,63 +0,0 @@
-<DIV CLASS="indent">
-
-<H2 CLASS="title">{op=modify-printer?Aldatu {printer_name}:Gehitu inprimagailua}</H2>
-
-<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:}
-<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
-<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
-<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
-<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
-
-<TABLE>
-{op=modify-printer?:<TR>
-<TH CLASS="label">Izena:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
-</TR>}
-<TR>
-<TH CLASS="label">Deskripzioa:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{printer_info}">{printer_info}</TD>
-</TR>
-<TR>
-<TH CLASS="label">Kokalekua:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{printer_location}">{printer_location}</TD>
-</TR>
-<TR>
-<TH CLASS="label">Konexioa:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
-</TR>
-<TR>
-<TH CLASS="label">Partekatzea:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_IS_SHARED" VALUE="{?printer_is_shared}">
-{?printer_is_shared=?Ez:{?printer_is_shared=0?Ez:}} partekatu inprimagailu hau</TD>
-</TR>
-<TR>
-<TH CLASS="label">Marka:</TH>
-<TD>
-<SELECT NAME="PPD_MAKE" SIZE="10">
-{[ppd_make]<OPTION VALUE="{ppd_make}" {?current_make={ppd_make}?SELECTED:}>{ppd_make}}
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="SUBMIT" VALUE="Jarraitu"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR>
-<TH CLASS="label">edo eman PPD fitxategia:</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="SUBMIT" VALUE="{op=add-printer?Gehitu inprimagailua:Aldatu inprimagailua}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
-</DIV>
@@ -1,59 +0,0 @@
-<DIV CLASS="indent">
-
-<H2 CLASS="title">{op=modify-printer?Aldatu {printer_name}:Gehitu inprimagailua}</H2>
-
-<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:}
-<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
-<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
-<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
-<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
-<TABLE>
-{op=modify-printer?:<TR>
-<TH CLASS="label">Izena:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
-</TR>}
-<TR>
-<TH CLASS="label">Deskripzioa:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{printer_info}">{printer_info}</TD>
-</TR>
-<TR>
-<TH CLASS="label">Kokalekua:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{printer_location}">{printer_location}</TD>
-</TR>
-<TR>
-<TH CLASS="label">Konexioa:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
-</TR>
-<TR>
-<TH CLASS="label">Partekatzea:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_IS_SHARED" VALUE="{?printer_is_shared}">
-{?printer_is_shared=?Ez:{?printer_is_shared=0?Ez:}} partekatu inprimagailu hau</TD>
-</TR>
-<TR>
-<TH CLASS="label">Marka:</TH>
-<TD>{PPD_MAKE} <INPUT TYPE="SUBMIT" NAME="SELECT_MAKE" VALUE="Hautatu beste marka/hornitzailea"></TD>
-</TR>
-<TR>
-<TH CLASS="label">Modeloa:</TH>
-<TD>
-<SELECT NAME="PPD_NAME" SIZE="10">
-{op=add-printer?:<OPTION VALUE="__no_change__" SELECTED>Uneko kontrolatzailea - {current_make_and_model}</OPTION>:}
-{[ppd_name]<OPTION VALUE="{ppd_name}" {op=modify-printer?:{?current_make_and_model={ppd_make_and_model}?SELECTED:}}>{ppd_make_and_model} ({ppd_natural_language})
-}</SELECT>
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">edo eman PPD fitxategia:</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="SUBMIT" VALUE="{op=add-printer?Gehitu inprimagailua:Aldatu inprimagailua}"></TD>
-</TR>
-</TABLE>
-
-</FORM>
-</DIV>
@@ -1,51 +0,0 @@
-<DIV CLASS="indent">
-
-<H2 CLASS="title">{op=modify-printer?Aldatu {printer_name}:Gehitu inprimagailua}</H2>
-
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:}
-
-<TABLE>
-<TR>
-<TH CLASS="label">Konexioa:</TH>
-<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
-</TR>
-<TR>
-<TH CLASS="label">Baudio-emaria:</TH>
-<TD><SELECT NAME="BAUDRATE">
-{[baudrates]<OPTION {?baudrate={baudrates}?SELECTED:}>{baudrates}}
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">Paritatea:</TH>
-<TD><SELECT NAME="PARITY">
-<OPTION VALUE="none" {?parity=none?SELECTED:}>Bat ere ez
-<OPTION VALUE="even" {?parity=even?SELECTED:}>Bikoitia
-<OPTION VALUE="odd" {?parity=odd?SELECTED:}>Bakoitia
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">Datuen bit-ak:</TH>
-<TD><SELECT NAME="BITS">
-<OPTION {?bits=8?SELECTED:}>8
-<OPTION {?bits=7?SELECTED:}>7
-</SELECT></TD>
-</TR>
-<TR>
-<TH CLASS="label">Fluxu-kontrola:</TH>
-<TD><SELECT NAME="FLOW">
-<OPTION VALUE="none" {?flow=none?SELECTED:}>Bat ere ez
-<OPTION VALUE="soft" {?flow=soft?SELECTED:}>XON/XOFF (Ssftwarea)
-<OPTION VALUE="hard" {?flow=hard?SELECTED:}>RTS/CTS (hardwarea)
-<OPTION VALUE="dtrdsr" {?flow=dtrdsr?SELECTED:}>DTR/DSR (hardwarea)
-</SELECT></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="SUBMIT" VALUE="Jarraitu"></TD>
-</TR>
-</TABLE>
-
-</FORM>
-</DIV>
@@ -1,42 +0,0 @@
-<DIV CLASS="indent">
-
-<H2 CLASS="title">{op=modify-printer?Aldatu {printer_name}:Gehitu inprimagailua}</H2>
-
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:}
-<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
-
-<TABLE>
-<TR>
-<TH CLASS="label">Konexioa:</TH>
-<TD><INPUT TYPE="TEXT" SIZE="60" MAXLENGTH="1023" NAME="DEVICE_URI" VALUE="{current_device_uri?{current_device_uri}:{device_uri}}"></TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>Adibideak:
-<PRE>
-    http://ostalari_izena:631/ipp/
-    http://ostalari_izena:631/ipp/ataka1
-
-    ipp://ostalari_izena/ipp/
-    ipp://ostalari_izena/ipp/ataka1
-
-    lpd://ostalari_izena/ilara
-
-    socket://ostalari_izena
-    socket://ostalari_izena:9100
-</PRE>
-
-<P>Ikusi <A HREF="/help/network.html" TARGET="_blank">"Sareko inprimagailuak"</A> URI zuzena erabiltzeko inprimagailuarekin.</P>
-
-</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="SUBMIT" VALUE="Jarraitu"></TD>
-</TR>
-</TABLE>
-
-</FORM>
-</DIV>
@@ -1,7 +0,0 @@
-<DIV CLASS="indent">
-
-<H2 CLASS="title">Gehitu klasea</H2>
-
-<P><A HREF="/classes/{printer_name}">{printer_name}</A> klasea ongi gehitu da.
-
-</DIV>
@@ -1,9 +0,0 @@
-<DIV CLASS="indent">
-
-<H2 CLASS="title">Ezabatu {printer_name} klasea</H2>
-
-<P><B>Abisua:</B> ziur zaude {printer_name} klasea ezabatu nahi duzula?</P>
-
-<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Ezabatu klasea"></FORM></P>
-
-</DIV>
@@ -1,7 +0,0 @@
-<DIV CLASS="indent">
-
-<H2 CLASS="title">Ezabatu {printer_name} klasea</H2>
-
-<P>{printer_name} klasea ongi ezabatu da.
-
-</DIV>
@@ -1,3 +0,0 @@
-<DIV CLASS="indent">
-<H3 CLASS="title">Lanak</H3>
-</DIV>
@@ -1,7 +0,0 @@
-<DIV CLASS="indent">
-
-<H2 CLASS="title">Aldatu {printer_name} klasea</H2>
-
-<P><A HREF="/classes/{printer_name}">{printer_name}</A> klasea ongi aldatu da.
-
-</DIV>
@@ -1,41 +0,0 @@
-<DIV CLASS="indent">
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>
-({printer_state=3?Inaktiboa:{printer_state=4?Prozesatzen:Pausatuta}},
-{printer_is_accepting_jobs=0?Lanak ukatzen:Lanak onartzen},
-{default_name={printer_name}?, zerbitzariaren lehenetsiak:} partekatuta {server_is_sharing_printers=0?ez:{printer_is_shared=0?ez:}} daude)</H2>
-
-<FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance">
-<SELECT NAME="OP" ONCHANGE="document.maintenance.submit();">
-<OPTION VALUE="">Mantenimendua</OPTION>
-<OPTION VALUE="print-test-page">Inprimatu probako orrialdea</OPTION>
-{printer_state=5?<OPTION VALUE="start-class">Jarraitu klasea</OPTION>:<OPTION VALUE="stop-class">Pausatu klasea</OPTION>}
-{printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Onartu lanak</OPTION>:<OPTION VALUE="reject-jobs">Ukatu lanak</OPTION>}
-<OPTION VALUE="move-jobs">Aldatu lan guztiak lekuz</OPTION>
-<OPTION VALUE="purge-jobs">Bertan behera utzi lan guztiak</OPTION>
-</SELECT>
-<INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;">
-</FORM>
-
-<FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration">
-<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">
-<SELECT NAME="OP" ONCHANGE="document.administration.submit();">
-<OPTION VALUE="">Administrazioa</OPTION>
-<OPTION VALUE="modify-class">Aldatu klasea</OPTION>
-<OPTION VALUE="delete-class">Ezabatu klasea</OPTION>
-<OPTION VALUE="set-class-options">Ezarri aukera lehenetsiak</OPTION>
-<OPTION VALUE="set-as-default">Ezarri zerbitzari lehenetsi gisa</OPTION>
-<OPTION VALUE="set-allowed-users">Ezarri baimendutako erabiltzaileak</OPTION>
-</SELECT>
-<INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;">
-</FORM>
-
-<TABLE SUMMARY="{printer_name}">
-<TR><TH ALIGN="RIGHT" VALIGN="TOP">Deskripzioa:</TH><TD>{printer_info}</TD></TR>
-<TR><TH ALIGN="RIGHT" VALIGN="TOP">Kokalekua:</TH><TD>{printer_location}</TD></TR>
-<TR><TH ALIGN="RIGHT" VALIGN="TOP">Kideak:</TH><TD>{?member_uris=?Bat ere ez:{member_uris}}</TD></TR>
-<TR><TH ALIGN="RIGHT" VALIGN="TOP">Aukera lehenetsiak:</TH><TD>job-sheets={job_sheets_default}
-papera={media_default?{media_default}:ezezaguna}
-{sides_default?sides={sides_default}:}</TD></TR>
-</TABLE>
-
-</DIV>
@@ -1 +0,0 @@
-<P ALIGN="CENTER">{total=0?Klaserik ez:{#printer_name}/{total} klase erakusten}.</P>
@@ -1,11 +0,0 @@
-{#printer_name=0?:
-<TABLE CLASS="list" SUMMARY="Klaseen zerrenda">
-<THEAD>
-<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&amp;WHICH_JOBS={?WHICH_JOBS}&amp;FIRST={FIRST}&amp;ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>&#x25b2;</SMALL> Ilararen izena <SMALL>&#x25b2;</SMALL>:<SMALL>&#x25bc;</SMALL> Ilararen izena <SMALL>&#x25bc;</SMALL>}</A></TH><TH>Deskripzioa</TH><TH>Kokalekua</TH><TH>Kideak</TH><TH>Egoera</TH></TR>
-</THEAD>
-<TBODY>
-{[printer_name]
-<TR><TD><A HREF="{printer_uri_supported}">{printer_name}</A></TD><TD>{printer_info}</TD><TD>{printer_location}</TD><TD>{?member_uris=?Bat ere ez:{member_uris}}</TD><TD>{printer_state=3?Inaktibo:{printer_state=4?Prozesatzen:Pausatuta}}{printer_state_message? - "{printer_state_message}":}</TD></TR>
-}
-</TBODY>
-</TABLE></DIV>}
@@ -1,12 +0,0 @@
-<DIV CLASS="indent">
-
-<H2 CLASS="title">{title} {printer_name} inprimagailuan</H2>
-
-<P>{job_state>5?:<IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16"
-ALIGN="ABSMIDDLE" ALT="Lanpetuta egoeraren adierazlea"> }Inprimagailuaren lanaren komandoa
-{job_state=3?zain:{job_state=4?eutsita:
-{job_state=5?processing:{job_state=6?geldituta:
-{job_state=7?bertan behera utzita:{job_state=8?abortatuta:burututa}}}}}}{job_state=9?:{job_printer_state_message?,
-<EM>"{job_printer_state_message}"</EM>:}}</P>
-
-</DIV>
@@ -1,24 +0,0 @@
-<SCRIPT TYPE="text/javascript">
-function reset_config()
-{
-  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
-}
-</SCRIPT>
-
-<DIV CLASS="indent">
-
-<H2 CLASS="title">Editatu konfigurazioko fitxategia</H2>
-
-<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
-
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-
-<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
-
-<P><INPUT TYPE="SUBMIT" NAME="SAVECHANGES" VALUE="Gorde aldaketak">
-<INPUT TYPE="BUTTON" VALUE="Erabili konfigurazioko fitxategi lehenetsia"
-onClick="reset_config();"></P>
-
-</FORM>
-
-</DIV>
@@ -1,9 +0,0 @@
-<DIV CLASS="indent">
-
-<H2 CLASS="title">{?printer_name} errorea: {?title}</H2>
-
-<P>Errorea:</P>
-
-<BLOCKQUOTE>"{op}" eragiketa ezezaguna.</BLOCKQUOTE>
-
-</DIV>
@@ -1,9 +0,0 @@
-<DIV CLASS="indent">
-
-<H2 CLASS="title">{?printer_name} errorea: {?title}</H2>
-
-<P>{?message?{message}:Errorea:}</P>
-
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
-
-</DIV>
--- a/Mostrar Mais
+++ b/Mostrar Mais
				`@@ -1 +0,0 @@`
				`<P ALIGN="CENTER">{total=0?Klaserik ez:{#printer_name}/{total} klase erakusten}.</P>`