Imported Upstream version 1.6.2upstream/1.6.2

author: Didier Raboud <odyx@debian.org> 2013-03-19 11:05:58 +0100
committer: Didier Raboud <odyx@debian.org> 2013-03-19 11:05:58 +0100
commit: ea5667a811b20e235ce1975e763469edd1f7f0de (patch)
tree: a02b8034aba8666f06fdbc971905ca760b1c3aa7
parent: 6fd17d1b328ea9230585f7ad1e3c478343157220 (diff)
download: cups-ea5667a811b20e235ce1975e763469edd1f7f0de.tar.gz
359 files changed, 31242 insertions, 8412 deletions
diff --git a/CHANGES-IPPTOOL.txt b/CHANGES-IPPTOOL.txt
deleted file mode 100644
index d16bbd5d..00000000
--- a/CHANGES-IPPTOOL.txt
+++ /dev/null
@@ -1,128 +0,0 @@
-CHANGES-IPPTOOL.txt - 2012-02-28
---------------------------------
-
-This file provides a list of changes to the ipptool binary distribution posted
-on cups.org.
-
-
-2012-02-28
-
-	- Changed behavior of WITH-VALUES "/regex/" to not require all values to
-	  match.
-	- Added WITH-ALL-VALUES directive for EXPECT predicates that require all
-	  values to match.
-	- Updated test files to use WITH-ALL-VALUES where necessary.
-	- Updated test files to use new ABNF for media names from PWG Media
-	  Names 2.0.
-
-
-2012-02-06
-
-	- Fixed the packaging of ipptool on Windows (removed unnecessary DLLs)
-	- Fixed an crash in ipptool when mixing DISPLAY with -I and a failed
-	  request.
-	- Added a Print-Job test file.
-	- Added a "setdebug" batch file for Windows
-	- Added support for a CUPS_DISABLE_ASYNC_CONNECT environment variable.
-
-
-2012-01-10
-
-	- Fixed an issue with the IPP/1.1 test file where the "waiting for job
-	  completion" test did not work.
-	- The attribute groups out of order error was not shown for the
-	  operation-attributes-tag group.
-
-
-2011-12-02
-
-	- Fixed a truncated XML output bug that would happen for certain errors.
-	- Fixed the order-of-groups tests.
-	- Fixed "WITH-VALUE >N" for rangeOfInteger attributes.
-	- The Windows installer was missing the get-printer-attributes.test
-	  file.
-	- The Linux binaries are now compiled for all LSB 4.x-compliant Linux
-	  distributions.
-	- The Linux binaries no longer support SSL or TLS.
-
-
-2011-10-05
-
-	- Fixed a crasher bug that showed up on Windows.
-	- The IPP/1.1 test would hang if the initial Print-Job test failed.
-	- Fixed a typo in the IPP/2.0 test.
-
-
-2011-10-03
-
-	- Using OF-TYPE with the "no-value" or "unknown" out-of-band value tags
-	  now works without special WITH-VALUE strings.
-	- ipptool now shows an error when an attribute appears more than once
-	  within the same attribute group.
-	- ipptool did not display attributes as specified by the DISPLAY
-	  directive when a test error failed.
-	- Fixed one spot where DEFINE-VALUE was still treated as an error when
-	  the EXPECT test failed.
-	- uriScheme values were not displayed properly.
-	- Updated the IPP/1.1 tests to properly validate support for
-	  job-hold-until-default and job-hold-until-supported when the Hold-Job
-	  operation is supported.
-	- Updated the IPP/1.1 tests to properly check for the various standard
-	  media sizes for the printing tests.
-	- Updated the IPP/1.1 tests to accept "no-value" for media-default an
-	  orientation-requested-default.
-	- Updated the IPP/1.1 tests to accept "unknown" for job-state.
-	- Updated the IPP/1.1 tests to not perform the bogus URI printing tests
-	  unless the "document-uri" variable is defined.
-	- Updated the IPP/2.0 tests to properly validate media-col
-	  "media-xxx-supported" attributes.
-	- Updated the IPP/2.2 tests to properly validate media-ready and
-	  media-col-ready.
-
-
-2011-09-28
-
-	- Test output now includes a summary and overall score at the end.
-	- The MATCH-VALUE predicate now correctly deals with a failed EXPECT
-	  condition.
-	- The IPP/1.1 test suite now looks for legacy media names and uses them
-	  if the corresponding PWG standard names are not present.
-	- The IPP/1.1 test suite now tests the Print-Job+Release-Job when the
-	  printer supports the job-hold-until attribute, Hold-Job operation, and
-	  Release-Job operation.
-
-
-2011-09-21
-
-	- Fixes for HTTP chunking, timeout, and encryption issues reported by
-	  various users.
-	- Greatly improved IPP tests with added IPP/2.2 tests.
-	- New test documents - 1-page and 4-page mixed A4/Letter PDF/PS and a
-	  couple JPEGs.
-	- New REPEAT directives to programmatically repeat tests as needed.
-
-
-2011-08-16
-
-	- The Windows version no longer requires Visual Studio to be installed.
-	- The Windows version now supports SSL.
-	- Added "ipps" URI support.
-	- Added a new "-T" option.
-	- Added support for fractional seconds for the -i option and DELAY
-	  directive.
-	- Added support for authentication.
-	- Added DEFINE-MATCH, DEFINE-NO-MATCH, DEFINE-VALUE, IF-NOT-DEFINED,
-	  IGNORE-ERRORS, SKIP-IF-DEFINED, SKIP-IF-NOT-DEFINED,
-	  SKIP-PREVIOUS-ERROR directives.
-	- WITH-VALUE now supports variable expansion.
-	- Updated the IPP/1.1 conformance test to skip the "my-jobs different
-	  user" test if the printer URI contains a username.
-	- Updated the IPP conformance tests to validate media, media-default,
-	  and media-supported values.
-	- No longer error out if a Printer returns a different version number in
-	  the response when the request contains the version 0.0.
-
-
-2010-10-16
-
-	- Initial release of standalone binary.
diff --git a/CHANGES.txt b/CHANGES.txt
index 53110ff8..972a98f9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,96 @@
-CHANGES.txt - 1.6.1 - 2012-07-27
+CHANGES.txt - 1.6.2 - 2013-03-18
 --------------------------------
 
+
+CHANGES IN CUPS V1.6.2
+
+	- Documentation fixes (STR #4229, STR #4239, STR #4234, STR #4248,
+	  STR #4259)
+	- Security: All file, directory, user, and group settings are now stored
+	  in a separate cups-files.conf configuration file that cannot be set
+	  through the CUPS web interface or APIs (STR #4223)
+	- Added a Czech localization (STR #4201)
+	- Added a French localization (STR #4247)
+	- Added a Russian localization (STR #4228, STR #4285)
+	- Updated the Catalan localization (STR #4202)
+	- Local certificate authentication did not guard against an empty
+	  certification file (STR #4293)
+	- The scheduler did not reject device URIs with spaces.
+	- Added USB quirk rule for Epson Stylus Photo 750 (STR #4286)
+	- The IPP backend could crash if the printer disconnects early
+	  (STR #4284)
+	- cupsGetPPD did not work with statically-configured CUPS shared
+	  queues (STR #4178)
+	- The scheduler did not support long MIME media types (STR #4270)
+	- The cupsfilter command did not set the CHARSET environment variable
+	  for the text filters (STR #4273)
+	- The lp command did not show errors for unknown "--foo" (STR #4261)
+	- Bad IPP responses could crash ipptool (STR #4262)
+	- Updated USB quirk rules for Canon and Xerox printers (STR #4217,
+	  STR #4263)
+	- Added USB blacklisting for printers that require a custom backend
+	  (STR #4218)
+	- The PPD compiler did not correctly JCL options (STR #4115, STR #4203)
+	- The ipptool program now supports DEFINE-MATCH and DEFINE-NO-MATCH
+	  predicates for STATUS directives.
+	- Fixed a problem with local Kerberos authentication (STR #4140)
+	- Coverity scan: fixed some minor issues (STR #4242)
+	- The scheduler did not remove color profiles after deleting a printer
+	  (STR #4232, STR #4276)
+	- The CUPS library did not always detect a timed out connection to the
+	  server which could cause temporary loss of printing from applications
+	  (STR #4187)
+	- The ipptool program now supports variable substitution in OPERATION
+	  and DELAY directives (STR #4175)
+	- The IPP backend now stops queues when the server configuration
+	  prevents successful job submission (STR #4125)
+	- The XML output of ipptool contained empty dictionaries (STR #4136)
+	- The scheduler did not delete job control backup files (STR #4244)
+	- cupsGetPPD3 could return a local PPD instead of the correct remote
+	  PPD.
+	- The scheduler incorrectly advertised auth-info-required for local
+	  queues needing local authentication (STR #4205)
+	- CUPS 1.6 clients using the ServerName directive in client.conf did not
+	  work with CUPS 1.3.x or older servers (STR #4231, STR #4291)
+	- The SNMP backend now tries to work around broken printers that use a
+	  newline to separate key/value pairs.
+	- The IPP backend did not send a cancel request to printers when a job
+	  was canceled and the printer did not support Create-Job.
+	- Fixed EPM packaging files (STR #4199)
+	- OpenBSD build fix (STR #4195, STR #4196, STR #4197)
+	- The scheduler could crash when using Avahi (STR #4183, STR #4192,
+	  STR #4200, STR #4213)
+	- The IPP backend could get stuck in an endless loop on certain network
+	  errors (STR #4194)
+	- 32-bit builds failed on Debian (STR #4133)
+	- The scheduler no longer accepts or sends job description attributes.
+	- The IPP backend now works around some conformance issues for broken
+	  printers (STR #4190)
+	- cupsBackendReport() now filters out all control characters from the
+	  reported 1284 device IDs (STR #4124)
+	- The scheduler no longer allows job-name values that are not valid
+	  network Unicode strings (STR #4072)
+	- The web interface did not preserve the order of classes, jobs, or
+	  printers (STR #4170)
+	- The network backends now support disabling of SNMP supply level
+	  queries via the "snmp" URI option (STR #4106)
+	- The IPP backend did not specify the compression used (STR #4181)
+	- ipptool did not support octetString values.
+	- The scheduler did not recognize dnssd: or ipps: URIs as Bonjour shared
+	  queues (STR #4158)
+	- Applications could not get the PPD file for statically-configured
+	  Bonjour-shared print queues (STR #4159)
+	- The cupsd.conf file included obsolete browsing directives (STR #4157)
+	- Fixed a USB backend compatibility issue on systems using libusb
+	  (STR #4155, STR #4191)
+	- Some Bonjour features were not available on systems with Avahi
+	  (STR #4156)
+	- CUPS now includes the port number in the Host: header for HTTP
+	  requests.
+	- Fixed REPEAT-MATCH for STATUS and EXPECT - was incorrectly erroring
+	  out.
+
+
 CHANGES IN CUPS V1.6.1
 
 	- Documentation fix (STR #4149)
diff --git a/INSTALL.txt b/INSTALL.txt
index 8d12bf9f..25ab9603 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,14 +1,20 @@
-INSTALL - CUPS v1.6.1 - 2012-07-27
+INSTALL - CUPS v1.6.2 - 2013-03-18
 ----------------------------------
 
 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
 be found in "CHANGES.txt".
 
-**** IF YOU HAVE A NON-POSTSCRIPT PRINTER AND ARE NOT       ****
-**** RUNNING OS X, YOU WILL ALSO NEED TO INSTALL GPL        ****
-**** GHOSTSCRIPT WITH THE "cups" DRIVER AFTER YOU INSTALL   ****
-**** CUPS.                                                  ****
+*******************************************************************************
+*******************************************************************************
+****                                                                       ****
+****  USING CUPS REQUIRES ADDITIONAL THIRD-PARTY SUPPORT SOFTWARE AND      ****
+****  PRINTER DRIVERS.  THESE ARE TYPICALLY INCLUDED WITH YOUR OPERATING   ****
+****  SYSTEM DISTRIBUTION.  APPLE DOES NOT ENDORSE OR SUPPORT THIRD-PARTY  ****
+****  SUPPORT SOFTWARE FOR CUPS.                                           ****
+****                                                                       ****
+*******************************************************************************
+*******************************************************************************
 
 
 BEFORE YOU BEGIN
diff --git a/README.txt b/README.txt
index 72c0c628..fb24f555 100644
--- a/README.txt
+++ b/README.txt
@@ -1,8 +1,7 @@
-README - CUPS v1.6.1 - 2012-07-27
+README - CUPS v1.6.2 - 2013-03-18
 ---------------------------------
 
-Looking for compile instructions?  Read the file "INSTALL.txt"
-instead...
+Looking for compile instructions?  Read the file "INSTALL.txt" instead...
 
 
 INTRODUCTION
@@ -150,7 +149,7 @@ PRINTING FILES
 
 LEGAL STUFF
 
-    CUPS is Copyright 2007-2012 by Apple Inc.  CUPS and the CUPS logo are
+    CUPS is Copyright 2007-2013 by Apple Inc.  CUPS and the CUPS logo are
     trademarks of Apple Inc.
 
     The MD5 Digest code is Copyright 1999 Aladdin Enterprises.
diff --git a/backend/ipp.c b/backend/ipp.c
index 83074ebd..bc0e23a9 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.c 10548 2012-07-16 18:21:43Z mike $"
+ * "$Id: ipp.c 10890 2013-03-08 18:42:09Z mike $"
  *
  *   IPP backend for CUPS.
  *
@@ -86,6 +86,7 @@ static int		child_pid = 0;	/* Child process ID */
 #endif /* HAVE_GSSAPI && HAVE_XPC */
 static const char * const jattrs[] =	/* Job attributes we want */
 {
+  "job-id",
   "job-impressions-completed",
   "job-media-sheets-completed",
   "job-name",
@@ -203,6 +204,7 @@ main(int  argc,				/* I - Number of command-line args */
 		*value,			/* Value of option */
 		sep;			/* Separator character */
   http_addrlist_t *addrlist;		/* Address of printer */
+  int		snmp_enabled = 1;	/* Is SNMP enabled? */
   int		snmp_fd,		/* SNMP socket */
 		start_count,		/* Page count via SNMP at start */
 		page_count,		/* Page count via SNMP */
@@ -508,6 +510,16 @@ main(int  argc,				/* I - Number of command-line args */
 			       value);
         }
       }
+      else if (!_cups_strcasecmp(name, "snmp"))
+      {
+        /*
+         * Enable/disable SNMP stuff...
+         */
+
+         snmp_enabled = !value[0] || !_cups_strcasecmp(value, "on") ||
+                        _cups_strcasecmp(value, "yes") ||
+                        _cups_strcasecmp(value, "true");
+      }
       else if (!_cups_strcasecmp(name, "version"))
       {
         if (!strcmp(value, "1.0"))
@@ -659,11 +671,14 @@ main(int  argc,				/* I - Number of command-line args */
   * See if the printer supports SNMP...
   */
 
-  if ((snmp_fd = _cupsSNMPOpen(addrlist->addr.addr.sa_family)) >= 0)
-  {
+  if (snmp_enabled)
+    snmp_fd = _cupsSNMPOpen(addrlist->addr.addr.sa_family);
+  else
+    snmp_fd = -1;
+
+  if (snmp_fd >= 0)
     have_supplies = !backendSNMPSupplies(snmp_fd, &(addrlist->addr),
                                          &start_count, NULL);
-  }
   else
     have_supplies = start_count = 0;
 
@@ -932,6 +947,8 @@ main(int  argc,				/* I - Number of command-line args */
 	_cupsLangPrintFilter(stderr, "ERROR",
 	                     _("Unable to get printer status."));
         sleep(10);
+
+	httpReconnect(http);
       }
 
       ippDelete(supported);
@@ -959,9 +976,15 @@ main(int  argc,				/* I - Number of command-line args */
 
       if ((printer_state = ippFindAttribute(supported,
 					    "printer-state-reasons",
-					    IPP_TAG_KEYWORD)) != NULL && !busy)
+					    IPP_TAG_KEYWORD)) == NULL)
+      {
+        update_reasons(NULL, "+cups-ipp-conformance-failure-report,"
+			     "cups-ipp-missing-printer-state-reasons");
+      }
+      else if (!busy)
       {
 	for (i = 0; i < printer_state->num_values; i ++)
+	{
 	  if (!strcmp(printer_state->values[0].string.text,
 	              "spool-area-full") ||
 	      !strncmp(printer_state->values[0].string.text, "spool-area-full-",
@@ -970,10 +993,8 @@ main(int  argc,				/* I - Number of command-line args */
 	    busy = 1;
 	    break;
 	  }
+	}
       }
-      else
-        update_reasons(NULL, "+cups-ipp-conformance-failure-report,"
-			     "cups-ipp-missing-printer-state-reasons");
 
       if (busy)
       {
@@ -1036,6 +1057,12 @@ main(int  argc,				/* I - Number of command-line args */
     if ((operations_sup = ippFindAttribute(supported, "operations-supported",
 					   IPP_TAG_ENUM)) != NULL)
     {
+      fprintf(stderr, "DEBUG: operations-supported (%d values)\n",
+              operations_sup->num_values);
+      for (i = 0; i < operations_sup->num_values; i ++)
+        fprintf(stderr, "DEBUG: [%d] = %s\n", i,
+                ippOpString(operations_sup->values[i].integer));
+
       for (i = 0; i < operations_sup->num_values; i ++)
         if (operations_sup->values[i].integer == IPP_PRINT_JOB)
 	  break;
@@ -1259,6 +1286,17 @@ main(int  argc,				/* I - Number of command-line args */
   }
 
  /*
+  * If the printer only claims to support IPP/1.0, or if the user specifically
+  * included version=1.0 in the URI, then do not try to use Create-Job or
+  * Send-Document.  This is another dreaded compatibility hack, but
+  * unfortunately there are enough broken printers out there that we need
+  * this for now...
+  */
+
+  if (version == 10)
+    create_job = send_document = 0;
+
+ /*
   * Start monitoring the printer in the background...
   */
 
@@ -1474,10 +1512,9 @@ main(int  argc,				/* I - Number of command-line args */
 	  goto cleanup;
 	}
       }
-      else if (ipp_status == IPP_ERROR_JOB_CANCELED)
+      else if (ipp_status == IPP_ERROR_JOB_CANCELED ||
+               ipp_status == IPP_NOT_AUTHORIZED)
         goto cleanup;
-      else if (ipp_status == IPP_NOT_AUTHORIZED)
-        continue;
       else
       {
        /*
@@ -1578,6 +1615,10 @@ main(int  argc,				/* I - Number of command-line args */
 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
 		       "document-format", NULL, document_format);
 
+        if (compression)
+	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
+		       "compression", NULL, compression);
+
 	fprintf(stderr, "DEBUG: Sending file %d using chunking...\n", i + 1);
 	http_status = cupsSendRequest(http, request, resource, 0);
 	if (http_status == HTTP_CONTINUE && request->state == IPP_DATA)
@@ -1653,13 +1694,70 @@ main(int  argc,				/* I - Number of command-line args */
     else if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
              ipp_status == IPP_NOT_POSSIBLE ||
 	     ipp_status == IPP_PRINTER_BUSY)
+    {
+      if (argc == 6)
+      {
+       /*
+        * Need to reprocess the entire job; if we have a job ID, cancel the
+        * job first...
+        */
+
+	if (job_id > 0)
+	  cancel_job(http, uri, job_id, resource, argv[2], version);
+
+        goto cleanup;
+      }
       continue;
-    else if (ipp_status == IPP_REQUEST_VALUE)
+    }
+    else if (ipp_status == IPP_REQUEST_VALUE ||
+             ipp_status == IPP_ERROR_JOB_CANCELED ||
+             ipp_status == IPP_NOT_AUTHORIZED ||
+             ipp_status == IPP_INTERNAL_ERROR)
+    {
+     /*
+      * Print file is too large, job was canceled, we need new
+      * authentication data, or we had some sort of error...
+      */
+
+      goto cleanup;
+    }
+    else if (ipp_status == IPP_UPGRADE_REQUIRED)
     {
      /*
-      * Print file is too large, abort this job...
+      * Server is configured incorrectly; the policy for Create-Job and
+      * Send-Document has to be the same (auth or no auth, encryption or
+      * no encryption).  Force the queue to stop since printing will never
+      * work.
       */
 
+      fputs("DEBUG: The server or printer is configured incorrectly.\n",
+            stderr);
+      fputs("DEBUG: The policy for Create-Job and Send-Document must have the "
+            "same authentication and encryption requirements.\n", stderr);
+
+      ipp_status = IPP_INTERNAL_ERROR;
+
+      if (job_id > 0)
+	cancel_job(http, uri, job_id, resource, argv[2], version);
+
+      goto cleanup;
+    }
+    else if (ipp_status == IPP_NOT_FOUND)
+    {
+     /*
+      * Printer does not actually implement support for Create-Job/
+      * Send-Document, so log the conformance issue and stop the printer.
+      */
+
+      fputs("DEBUG: This printer claims to support Create-Job and "
+            "Send-Document, but those operations failed.\n", stderr);
+      fputs("DEBUG: Add '?version=1.0' to the device URI to use legacy "
+            "compatibility mode.\n", stderr);
+      update_reasons(NULL, "+cups-ipp-conformance-failure-report,"
+			   "cups-ipp-missing-send-document");
+
+      ipp_status = IPP_INTERNAL_ERROR;	/* Force queue to stop */
+
       goto cleanup;
     }
     else
@@ -1826,7 +1924,8 @@ main(int  argc,				/* I - Number of command-line args */
   */
 
   if (have_supplies &&
-      !backendSNMPSupplies(snmp_fd, http->hostaddr, &page_count, NULL) &&
+      !backendSNMPSupplies(snmp_fd, &(http->addrlist->addr), &page_count,
+                           NULL) &&
       page_count > start_count)
     fprintf(stderr, "PAGE: total %d\n", page_count - start_count);
 
@@ -3277,5 +3376,5 @@ update_reasons(ipp_attribute_t *attr,	/* I - printer-state-reasons or NULL */
 }
 
 /*
- * End of "$Id: ipp.c 10548 2012-07-16 18:21:43Z mike $".
+ * End of "$Id: ipp.c 10890 2013-03-08 18:42:09Z mike $".
  */
diff --git a/backend/lpd.c b/backend/lpd.c
index 160a83ef..37d6c87a 100644
--- a/backend/lpd.c
+++ b/backend/lpd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpd.c 10520 2012-05-31 02:53:59Z mike $"
+ * "$Id: lpd.c 10608 2012-09-15 19:42:21Z mike $"
  *
  *   Line Printer Daemon backend for CUPS.
  *
@@ -126,6 +126,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
   int		port;			/* Port number */
   char		portname[256];		/* Port name (string) */
   http_addrlist_t *addrlist;		/* List of addresses for printer */
+  int		snmp_enabled = 1;	/* Is SNMP enabled? */
   int		snmp_fd;		/* SNMP socket */
   int		fd;			/* Print file */
   int		status;			/* Status of LPD job */
@@ -356,7 +357,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 	*/
 
         if (!value[0] || !_cups_strcasecmp(value, "on") ||
-	    !_cups_strcasecmp(value, "yes") || !_cups_strcasecmp(value, "true") ||
+	    !_cups_strcasecmp(value, "yes") ||
+	    !_cups_strcasecmp(value, "true") ||
 	    !_cups_strcasecmp(value, "rfc1179"))
 	  reserve = RESERVE_RFC1179;
 	else if (!_cups_strcasecmp(value, "any"))
@@ -371,7 +373,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 	*/
 
         manual_copies = !value[0] || !_cups_strcasecmp(value, "on") ||
-	 		!_cups_strcasecmp(value, "yes") || !_cups_strcasecmp(value, "true");
+	 		!_cups_strcasecmp(value, "yes") ||
+	 		!_cups_strcasecmp(value, "true");
       }
       else if (!_cups_strcasecmp(name, "sanitize_title"))
       {
@@ -380,7 +383,18 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 	*/
 
         sanitize_title = !value[0] || !_cups_strcasecmp(value, "on") ||
-	 		 !_cups_strcasecmp(value, "yes") || !_cups_strcasecmp(value, "true");
+	 		 !_cups_strcasecmp(value, "yes") ||
+	 		 !_cups_strcasecmp(value, "true");
+      }
+      else if (!_cups_strcasecmp(name, "snmp"))
+      {
+        /*
+         * Enable/disable SNMP stuff...
+         */
+
+         snmp_enabled = !value[0] || !_cups_strcasecmp(value, "on") ||
+                        _cups_strcasecmp(value, "yes") ||
+                        _cups_strcasecmp(value, "true");
       }
       else if (!_cups_strcasecmp(name, "timeout"))
       {
@@ -428,7 +442,10 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
     }
   }
 
-  snmp_fd = _cupsSNMPOpen(addrlist->addr.addr.sa_family);
+  if (snmp_enabled)
+    snmp_fd = _cupsSNMPOpen(addrlist->addr.addr.sa_family);
+  else
+    snmp_fd = -1;
 
  /*
   * Wait for data from the filter...
@@ -1314,5 +1331,5 @@ sigterm_handler(int sig)		/* I - Signal */
 
 
 /*
- * End of "$Id: lpd.c 10520 2012-05-31 02:53:59Z mike $".
+ * End of "$Id: lpd.c 10608 2012-09-15 19:42:21Z mike $".
  */
diff --git a/backend/snmp.c b/backend/snmp.c
index ca3a24fe..4a887989 100644
--- a/backend/snmp.c
+++ b/backend/snmp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: snmp.c 10535 2012-06-22 03:45:53Z mike $"
+ * "$Id: snmp.c 10643 2012-10-09 03:02:49Z mike $"
  *
  *   SNMP discovery backend for CUPS.
  *
@@ -1025,6 +1025,11 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 	    * Description is the IEEE-1284 device ID...
 	    */
 
+            char *ptr;			/* Pointer into device ID */
+
+            for (ptr = (char *)packet.object_value.string.bytes; *ptr; ptr ++)
+              if (*ptr == '\n')
+                *ptr = ';';		/* A lot of bad printers put a newline */
 	    if (!device->id)
 	      device->id = strdup((char *)packet.object_value.string.bytes);
 
@@ -1066,8 +1071,11 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 	  */
 
 	  char	make_model[256];	/* Make and model */
+          char *ptr;			/* Pointer into device ID */
 
-
+          for (ptr = (char *)packet.object_value.string.bytes; *ptr; ptr ++)
+            if (*ptr == '\n')
+              *ptr = ';';		/* A lot of bad printers put a newline */
 	  if (device->id)
 	    free(device->id);
 
@@ -1383,5 +1391,5 @@ update_cache(snmp_cache_t *device,	/* I - Device */
 
 
 /*
- * End of "$Id: snmp.c 10535 2012-06-22 03:45:53Z mike $".
+ * End of "$Id: snmp.c 10643 2012-10-09 03:02:49Z mike $".
  */
diff --git a/backend/socket.c b/backend/socket.c
index cde27b51..0c7fc75a 100644
--- a/backend/socket.c
+++ b/backend/socket.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: socket.c 10431 2012-04-23 19:19:19Z mike $"
+ * "$Id: socket.c 10608 2012-09-15 19:42:21Z mike $"
  *
  *   AppSocket backend for CUPS.
  *
@@ -87,6 +87,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
   http_addrlist_t *addrlist,		/* Address list */
 		*addr;			/* Connected address */
   char		addrname[256];		/* Address name */
+  int		snmp_enabled = 1;	/* Is SNMP enabled? */
   int		snmp_fd,		/* SNMP socket */
 		start_count,		/* Page count via SNMP at start */
 		page_count,		/* Page count via SNMP */
@@ -246,6 +247,16 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
         waiteof = !value[0] || !_cups_strcasecmp(value, "on") ||
 		  !_cups_strcasecmp(value, "yes") || !_cups_strcasecmp(value, "true");
       }
+      else if (!_cups_strcasecmp(name, "snmp"))
+      {
+        /*
+         * Enable/disable SNMP stuff...
+         */
+
+         snmp_enabled = !value[0] || !_cups_strcasecmp(value, "on") ||
+                        _cups_strcasecmp(value, "yes") ||
+                        _cups_strcasecmp(value, "true");
+      }
       else if (!_cups_strcasecmp(name, "contimeout"))
       {
        /*
@@ -286,11 +297,14 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
   * See if the printer supports SNMP...
   */
 
-  if ((snmp_fd = _cupsSNMPOpen(addrlist->addr.addr.sa_family)) >= 0)
-  {
+  if (snmp_enabled)
+    snmp_fd = _cupsSNMPOpen(addrlist->addr.addr.sa_family);
+  else
+    snmp_fd = -1;
+
+  if (snmp_fd >= 0)
     have_supplies = !backendSNMPSupplies(snmp_fd, &(addrlist->addr),
                                          &start_count, NULL);
-  }
   else
     have_supplies = start_count = 0;
 
@@ -521,5 +535,5 @@ wait_bc(int device_fd,			/* I - Socket */
 
 
 /*
- * End of "$Id: socket.c 10431 2012-04-23 19:19:19Z mike $".
+ * End of "$Id: socket.c 10608 2012-09-15 19:42:21Z mike $".
  */
diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c
index 542a07c4..e83d7097 100644
--- a/backend/usb-libusb.c
+++ b/backend/usb-libusb.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: usb-libusb.c 10543 2012-07-16 17:10:55Z mike $"
+ * "$Id: usb-libusb.c 10908 2013-03-14 14:31:07Z mike $"
  *
  *   LIBUSB interface code for CUPS.
  *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Apple Inc. and are protected by Federal copyright
@@ -70,7 +70,7 @@ typedef struct usb_printer_s		/**** USB Printer Data ****/
 			read_endp,	/* Read endpoint */
 			protocol,	/* Protocol: 1 = Uni-di, 2 = Bi-di. */
 			usblp_attached,	/* "usblp" kernel module attached? */
-			opened_for_job;	/* Set to 1 by print_device() */
+			reset_after_job; /* Set to 1 by print_device() */
   unsigned int		quirks;		/* Quirks flags */
   struct libusb_device_handle *handle;	/* Open handle to device */
 } usb_printer_t;
@@ -122,6 +122,9 @@ struct quirk_printer_struct {
 #define USBLP_QUIRK_USB_INIT	0x2	/* needs vendor USB init string */
 #define USBLP_QUIRK_BAD_CLASS	0x4	/* descriptor uses vendor-specific
 					   Class or SubClass */
+#define USBLP_QUIRK_BLACKLIST	0x8	/* these printers do not conform to the USB print spec */
+#define USBLP_QUIRK_RESET	0x4000	/* After printing do a reset
+					   for clean-up */
 #define USBLP_QUIRK_NO_REATTACH	0x8000	/* After printing we cannot re-attach
 					   the usblp kernel module */
 
@@ -141,15 +144,78 @@ static const struct quirk_printer_struct quirk_printers[] = {
 	{ 0x0409, 0xf1be, USBLP_QUIRK_BIDIR }, /* NEC Picty800 (HP OEM) */
 	{ 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820,
 						  by zut <kernel@zut.de> */
+	{ 0x04a9, 0x10a2, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4200
+			    Printer, http://www.cups.org/str.php?L4155 */
+	{ 0x04a9, 0x10b6, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4300
+			    Printer, https://bugs.launchpad.net/bugs/1032385 */
+	{ 0x04a9, 0x1721, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP210
+		      https://bugzilla.redhat.com/show_bug.cgi?id=847923#c53 */
+	{ 0x04a9, 0x170c, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP500
+			    Printer, https://bugs.launchpad.net/bugs/1032456 */
+	{ 0x04a9, 0x1717, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP510
+			    Printer, https://bugs.launchpad.net/bugs/1050009 */
+	{ 0x04a9, 0x173d, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP550
+			    Printer, http://www.cups.org/str.php?L4155 */
+	{ 0x04a9, 0x173e, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP560
+			    Printer, http://www.cups.org/str.php?L4155 */
+	{ 0x04f9, 0x001a, USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
+						  HL-1430 Laser Printer,
+				     https://bugs.launchpad.net/bugs/1038695 */
 	{ 0x04f9, 0x000d, USBLP_QUIRK_BIDIR |
 			  USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
-						  HL-1440 Laser Printer */
+						  HL-1440 Laser Printer,
+				     https://bugs.launchpad.net/bugs/1000253 */
+	{ 0x06bc, 0x000b, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp.
+						  Okipage 14ex Printer,
+				     https://bugs.launchpad.net/bugs/872483 */
+	{ 0x06bc, 0x01c7, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp. B410d,
+				     https://bugs.launchpad.net/bugs/872483 */
+	{ 0x04b8, 0x0001, USBLP_QUIRK_BIDIR }, /* Seiko Epson Corp. Stylus Color 740 / Photo 750,
+				     http://bugs.debian.org/697970 */
 	{ 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt
 						      Printer M129C */
 	{ 0x067b, 0x2305, USBLP_QUIRK_BIDIR |
-			  USBLP_QUIRK_NO_REATTACH },
+			  USBLP_QUIRK_NO_REATTACH |
+	                  USBLP_QUIRK_RESET },
+	{ 0x0924, 0x3ce9, USBLP_QUIRK_NO_REATTACH }, /* Xerox Phaser 3124
+			  https://bugzilla.redhat.com/show_bug.cgi?id=867392 */
+	{ 0x0924, 0x4293, USBLP_QUIRK_NO_REATTACH }, /* Xerox WorkCentre 3210
+				     https://bugs.launchpad.net/bugs/1102470 */
 	/* Prolific Technology, Inc. PL2305 Parallel Port
-	   (USB -> Parallel adapter) */
+	   (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */
+	{ 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices,
+				     https://bugs.launchpad.net/bugs/1032456 */
+	{ 0x0a5f, 0x0000, USBLP_QUIRK_BIDIR }, /* All Zebra devices,
+				     https://bugs.launchpad.net/bugs/1001028 */
+	/* Canon */
+	{ 0x04a9, 0x304a, USBLP_QUIRK_BLACKLIST }, /* Canon CP-10 */
+	{ 0x04a9, 0x3063, USBLP_QUIRK_BLACKLIST }, /* Canon CP-100 */
+	{ 0x04a9, 0x307c, USBLP_QUIRK_BLACKLIST }, /* Canon CP-200 */
+	{ 0x04a9, 0x307d, USBLP_QUIRK_BLACKLIST }, /* Canon CP-300 */
+	{ 0x04a9, 0x30bd, USBLP_QUIRK_BLACKLIST }, /* Canon CP-220 */
+	{ 0x04a9, 0x30be, USBLP_QUIRK_BLACKLIST }, /* Canon CP-330 */
+	{ 0x04a9, 0x30f6, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP400 */
+	{ 0x04a9, 0x310b, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP600 */
+	{ 0x04a9, 0x3127, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP710 */
+	{ 0x04a9, 0x3128, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP510 */
+	{ 0x04a9, 0x3141, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY ES1 */
+	{ 0x04a9, 0x3142, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP730 */
+	{ 0x04a9, 0x3143, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP720 */
+	{ 0x04a9, 0x3170, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP750 */
+	{ 0x04a9, 0x3171, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP740 */
+	{ 0x04a9, 0x3185, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY ES2 */
+	{ 0x04a9, 0x3186, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY ES20 */
+	{ 0x04a9, 0x31aa, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP770 */
+	{ 0x04a9, 0x31ab, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP760 */
+	{ 0x04a9, 0x31b0, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY ES30 */
+	{ 0x04a9, 0x31dd, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP780 */
+	{ 0x04a9, 0x31ee, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY ES40 */
+	{ 0x04a9, 0x3214, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP800 */
+	{ 0x04a9, 0x3255, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP900 */
+	{ 0x04a9, 0x3256, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP810 */
+	{ 0x04a9, 0x30F5, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP500 */
+	{ 0x04a9, 0x31AF, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY ES3 */
+	 /* MISSING PIDs: CP520, CP530, CP790 */
 	{ 0, 0 }
 };
 
@@ -256,7 +322,12 @@ print_device(const char *uri,		/* I - Device URI */
   }
 
   g.print_fd = print_fd;
-  g.printer->opened_for_job = 1;
+
+ /*
+  * Some devices need a reset after finishing a job, these devices are
+  * marked with the USBLP_QUIRK_RESET quirk.
+  */
+  g.printer->reset_after_job = (g.printer->quirks & USBLP_QUIRK_RESET ? 1 : 0);
 
  /*
   * If we are printing data from a print driver on stdin, ignore SIGTERM
@@ -639,10 +710,10 @@ print_device(const char *uri,		/* I - Device URI */
        * If it didn't exit abort the pending read and wait an additional
        * second...
        */
-  
+
       if (!g.read_thread_done)
       {
-	fputs("DEBUG: Read thread still active, aborting the pending read...\n", 
+	fputs("DEBUG: Read thread still active, aborting the pending read...\n",
 	      stderr);
 
 	g.wait_eof = 0;
@@ -650,7 +721,7 @@ print_device(const char *uri,		/* I - Device URI */
 	gettimeofday(&tv, NULL);
 	cond_timeout.tv_sec  = tv.tv_sec + 1;
 	cond_timeout.tv_nsec = tv.tv_usec * 1000;
-  
+
 	while (!g.read_thread_done)
 	{
 	  if (pthread_cond_timedwait(&g.read_thread_cond, &g.read_thread_mutex,
@@ -663,9 +734,6 @@ print_device(const char *uri,		/* I - Device URI */
     pthread_mutex_unlock(&g.read_thread_mutex);
   }
 
-  if (print_fd)
-    close(print_fd);
-
  /*
   * Close the connection and input file and general clean up...
   */
@@ -725,7 +793,7 @@ close_device(usb_printer_t *printer)	/* I - Printer */
       */
       if (printer->origconf > 0 && printer->origconf != number2)
       {
-	fprintf(stderr, "DEBUG: Restoring USB device configuration: %d -> %d\n", 
+	fprintf(stderr, "DEBUG: Restoring USB device configuration: %d -> %d\n",
 		number2, printer->origconf);
 	if ((errcode = libusb_set_configuration(printer->handle,
 						printer->origconf)) < 0)
@@ -772,7 +840,7 @@ close_device(usb_printer_t *printer)	/* I - Printer */
     * Reset the device to clean up after the job
     */
 
-    if (printer->opened_for_job == 1)
+    if (printer->reset_after_job == 1)
     {
       if ((errcode = libusb_reset_device(printer->handle)) < 0)
 	fprintf(stderr,
@@ -859,7 +927,14 @@ find_device(usb_cb_t   cb,		/* I - Callback function */
           !devdesc.idProduct)
 	continue;
 
-      printer.quirks   = quirks(devdesc.idVendor, devdesc.idProduct);
+      printer.quirks = quirks(devdesc.idVendor, devdesc.idProduct);
+
+     /*
+      * Ignore blacklisted printers...
+      */
+
+      if (printer.quirks & USBLP_QUIRK_BLACKLIST)
+        continue;
 
       for (conf = 0; conf < devdesc.bNumConfigurations; conf ++)
       {
@@ -886,7 +961,7 @@ find_device(usb_cb_t   cb,		/* I - Callback function */
 	    */
 
 	    if (((altptr->bInterfaceClass != LIBUSB_CLASS_PRINTER ||
-		  altptr->bInterfaceSubClass != 1) && 
+		  altptr->bInterfaceSubClass != 1) &&
 		 ((printer.quirks & USBLP_QUIRK_BAD_CLASS) == 0)) ||
 		(altptr->bInterfaceProtocol != 1 &&	/* Unidirectional */
 		 altptr->bInterfaceProtocol != 2) ||	/* Bidirectional */
@@ -964,7 +1039,7 @@ find_device(usb_cb_t   cb,		/* I - Callback function */
 					    bEndpointAddress;
 		}
 		else
-		  fprintf(stderr, "DEBUG: Uni-directional USB communication " 
+		  fprintf(stderr, "DEBUG: Uni-directional USB communication "
 			  "only!\n");
 		printer.write_endp = confptr->interface[printer.iface].
 					   altsetting[printer.altset].
@@ -1288,7 +1363,7 @@ open_device(usb_printer_t *printer,	/* I - Printer */
   }
 
   printer->usblp_attached = 0;
-  printer->opened_for_job = 0;
+  printer->reset_after_job = 0;
 
   if (verbose)
     fputs("STATE: +connecting-to-device\n", stderr);
@@ -1343,7 +1418,7 @@ open_device(usb_printer_t *printer,	/* I - Printer */
 
   printer->origconf = current;
 
-  if ((errcode = 
+  if ((errcode =
        libusb_get_config_descriptor (printer->device, printer->conf, &confptr))
       < 0)
   {
@@ -1355,7 +1430,7 @@ open_device(usb_printer_t *printer,	/* I - Printer */
 
   if (number1 != current)
   {
-    fprintf(stderr, "DEBUG: Switching USB device configuration: %d -> %d\n", 
+    fprintf(stderr, "DEBUG: Switching USB device configuration: %d -> %d\n",
 	    current, number1);
     if ((errcode = libusb_set_configuration(printer->handle, number1)) < 0)
     {
@@ -1586,7 +1661,8 @@ static unsigned int quirks(int vendor, int product)
   for (i = 0; quirk_printers[i].vendorId; i++)
   {
     if (vendor == quirk_printers[i].vendorId &&
-	product == quirk_printers[i].productId)
+	(quirk_printers[i].productId == 0x0000 ||
+	 product == quirk_printers[i].productId))
       return quirk_printers[i].quirks;
   }
   return 0;
@@ -1881,6 +1957,6 @@ static void soft_reset(void)
 
 
 /*
- * End of "$Id: usb-libusb.c 10543 2012-07-16 17:10:55Z mike $".
+ * End of "$Id: usb-libusb.c 10908 2013-03-14 14:31:07Z mike $".
  */
 
diff --git a/cgi-bin/classes.c b/cgi-bin/classes.c
index 489d21c9..e7b9bf48 100644
--- a/cgi-bin/classes.c
+++ b/cgi-bin/classes.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: classes.c 10431 2012-04-23 19:19:19Z mike $"
+ * "$Id: classes.c 10608 2012-09-15 19:42:21Z mike $"
  *
  *   Class status CGI for CUPS.
  *
@@ -380,7 +380,7 @@ show_all_classes(http_t     *http,	/* I - Connection to server */
     sprintf(val, "%d", count);
     cgiSetVariable("TOTAL", val);
 
-    if ((var = cgiGetVariable("ORDER")) != NULL)
+    if ((var = cgiGetVariable("ORDER")) != NULL && *var)
       ascending = !_cups_strcasecmp(var, "asc");
     else
       ascending = 1;
@@ -554,5 +554,5 @@ show_class(http_t     *http,		/* I - Connection to server */
 
 
 /*
- * End of "$Id: classes.c 10431 2012-04-23 19:19:19Z mike $".
+ * End of "$Id: classes.c 10608 2012-09-15 19:42:21Z mike $".
  */
diff --git a/cgi-bin/ipp-var.c b/cgi-bin/ipp-var.c
index 1c7bdb03..85c8195c 100644
--- a/cgi-bin/ipp-var.c
+++ b/cgi-bin/ipp-var.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp-var.c 10431 2012-04-23 19:19:19Z mike $"
+ * "$Id: ipp-var.c 10608 2012-09-15 19:42:21Z mike $"
  *
  *   CGI <-> IPP variable routines for CUPS.
  *
@@ -1432,7 +1432,7 @@ cgiShowJobs(http_t     *http,		/* I - Connection to server */
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL,
         	 "ipp://localhost/");
 
-  if ((which_jobs = cgiGetVariable("which_jobs")) != NULL)
+  if ((which_jobs = cgiGetVariable("which_jobs")) != NULL && *which_jobs)
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "which-jobs",
                  NULL, which_jobs);
 
@@ -1480,10 +1480,11 @@ cgiShowJobs(http_t     *http,		/* I - Connection to server */
     if (first < 0)
       first = 0;
 
-    if ((var = cgiGetVariable("ORDER")) != NULL)
+    if ((var = cgiGetVariable("ORDER")) != NULL && *var)
       ascending = !_cups_strcasecmp(var, "asc");
     else
-      ascending = !which_jobs || !_cups_strcasecmp(which_jobs, "not-completed");
+      ascending = !which_jobs || !*which_jobs ||
+                  !_cups_strcasecmp(which_jobs, "not-completed");
 
     section = cgiGetVariable("SECTION");
 
@@ -1588,5 +1589,5 @@ cgiText(const char *message)		/* I - Message */
 
 
 /*
- * End of "$Id: ipp-var.c 10431 2012-04-23 19:19:19Z mike $".
+ * End of "$Id: ipp-var.c 10608 2012-09-15 19:42:21Z mike $".
  */
diff --git a/cgi-bin/printers.c b/cgi-bin/printers.c
index 0dbb79fc..ed9cb227 100644
--- a/cgi-bin/printers.c
+++ b/cgi-bin/printers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.c 10431 2012-04-23 19:19:19Z mike $"
+ * "$Id: printers.c 10608 2012-09-15 19:42:21Z mike $"
  *
  *   Printer status CGI for CUPS.
  *
@@ -397,7 +397,7 @@ show_all_printers(http_t     *http,	/* I - Connection to server */
     sprintf(val, "%d", count);
     cgiSetVariable("TOTAL", val);
 
-    if ((var = cgiGetVariable("ORDER")) != NULL)
+    if ((var = cgiGetVariable("ORDER")) != NULL && *var)
       ascending = !_cups_strcasecmp(var, "asc");
     else
       ascending = 1;
@@ -574,5 +574,5 @@ show_printer(http_t     *http,		/* I - Connection to server */
 
 
 /*
- * End of "$Id: printers.c 10431 2012-04-23 19:19:19Z mike $".
+ * End of "$Id: printers.c 10608 2012-09-15 19:42:21Z mike $".
  */
diff --git a/conf/Makefile b/conf/Makefile
index 3376f198..7da088b1 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 9771 2011-05-12 05:21:56Z mike $"
+# "$Id: Makefile 10710 2012-11-26 18:26:01Z mike $"
 #
 #   Configuration file makefile for CUPS.
 #
@@ -19,7 +19,7 @@ include ../Makedefs
 # Config files...
 #
 
-KEEP	=	cupsd.conf snmp.conf
+KEEP	=	cups-files.conf cupsd.conf snmp.conf
 REPLACE	=	mime.convs mime.types
 
 
@@ -139,5 +139,5 @@ uninstall:
 
 
 #
-# End of "$Id: Makefile 9771 2011-05-12 05:21:56Z mike $".
+# End of "$Id: Makefile 10710 2012-11-26 18:26:01Z mike $".
 #
diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
new file mode 100644
index 00000000..be5df620
--- /dev/null
+++ b/conf/cups-files.conf.in
@@ -0,0 +1,98 @@
+#
+# "$Id: cups-files.conf.in 10765 2012-12-13 20:36:17Z mike $"
+#
+# Sample file/directory/user/group configuration file for the CUPS scheduler.
+# See "man cups-files.conf" for a complete description of this file.
+#
+
+# List of events that are considered fatal errors for the scheduler...
+#FatalErrors @CUPS_FATAL_ERRORS@
+
+# Default user and group for filters/backends/helper programs; this cannot be
+# any user or group that resolves to ID 0 for security reasons...
+#User @CUPS_USER@
+#Group @CUPS_GROUP@
+
+# Administrator user group, used to match @SYSTEM in cupsd.conf policy rules...
+SystemGroup @CUPS_SYSTEM_GROUPS@
+@CUPS_SYSTEM_AUTHKEY@
+
+# User that is substituted for unauthenticated (remote) root accesses...
+#RemoteRoot remroot
+
+# Do we allow file: device URIs other than to /dev/null?
+#FileDevice No
+
+# Permissions for configuration and log files...
+#ConfigFilePerm 0@CUPS_CONFIG_FILE_PERM@
+#LogFilePerm 0@CUPS_LOG_FILE_PERM@
+
+# Location of the file logging all access to the scheduler; may be the name
+# "syslog". If not an absolute path, the value of ServerRoot is used as the
+# root directory.  Also see the "AccessLogLevel" directive in cupsd.conf.
+AccessLog @CUPS_LOGDIR@/access_log
+
+# Location of cache files used by the scheduler...
+#CacheDir @CUPS_CACHEDIR@
+
+# Location of data files used by the scheduler...
+#DataDir @CUPS_DATADIR@
+
+# Location of the static web content served by the scheduler...
+#DocumentRoot @CUPS_DOCROOT@
+
+# Location of the file logging all messages produced by the scheduler and any
+# helper programs; may be the name "syslog". If not an absolute path, the value
+# of ServerRoot is used as the root directory.  Also see the "LogLevel"
+# directive in cupsd.conf.
+ErrorLog @CUPS_LOGDIR@/error_log
+
+# Location of fonts used by older print filters...
+#FontPath @CUPS_FONTPATH@
+
+# Location of LPD configuration
+#LPDConfigFile @CUPS_DEFAULT_LPD_CONFIG_FILE@
+
+# Location of the file logging all pages printed by the scheduler and any
+# helper programs; may be the name "syslog". If not an absolute path, the value
+# of ServerRoot is used as the root directory.  Also see the "PageLogFormat"
+# directive in cupsd.conf.
+PageLog @CUPS_LOGDIR@/page_log
+
+# Location of the file listing all of the local printers...
+#Printcap @CUPS_DEFAULT_PRINTCAP@
+
+# Format of the Printcap file...
+#PrintcapFormat bsd
+#PrintcapFormat plist
+#PrintcapFormat solaris
+
+# Location of all spool files...
+#RequestRoot @CUPS_REQUESTS@
+
+# Location of helper programs...
+#ServerBin @CUPS_SERVERBIN@
+
+# SSL/TLS certificate for the scheduler...
+#ServerCertificate @CUPS_SERVERCERT@
+
+# SSL/TLS private key for the scheduler...
+#ServerKey @CUPS_SERVERKEY@
+
+# Location of other configuration files...
+#ServerRoot @CUPS_SERVERROOT@
+
+# Location of Samba configuration file...
+#SMBConfigFile @CUPS_DEFAULT_SMB_CONFIG_FILE@
+
+# Location of scheduler state files...
+#StateDir @CUPS_STATEDIR@
+
+# Location of scheduler/helper temporary files. This directory is emptied on
+# scheduler startup and cannot be one of the standard (public) temporary
+# directory locations for security reasons...
+#TempDir @CUPS_REQUESTS@/tmp
+
+#
+# End of "$Id: cups-files.conf.in 10765 2012-12-13 20:36:17Z mike $".
+#
diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index 7ee57fda..256c1e21 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -1,5 +1,5 @@
 #
-# "$Id: cupsd.conf.in 9407 2010-12-09 21:24:51Z mike $"
+# "$Id: cupsd.conf.in 10710 2012-11-26 18:26:01Z mike $"
 #
 # Sample configuration file for the CUPS scheduler.  See "man cupsd.conf" for a
 # complete description of this file.
@@ -9,18 +9,12 @@
 # for troubleshooting...
 LogLevel @CUPS_LOG_LEVEL@
 
-# Administrator user group...
-SystemGroup @CUPS_SYSTEM_GROUPS@
-@CUPS_SYSTEM_AUTHKEY@
-
 # Only listen for connections from the local machine.
 Listen localhost:@DEFAULT_IPP_PORT@
 @CUPS_LISTEN_DOMAINSOCKET@
 
 # Show shared printers on the local network.
 Browsing On
-BrowseOrder allow,deny
-BrowseAllow all
 BrowseLocalProtocols @CUPS_BROWSE_LOCAL_PROTOCOLS@
 
 # Default authentication type, when authentication is required...
@@ -136,5 +130,5 @@ WebInterface @CUPS_WEBIF@
 </Policy>
 
 #
-# End of "$Id: cupsd.conf.in 9407 2010-12-09 21:24:51Z mike $".
+# End of "$Id: cupsd.conf.in 10710 2012-11-26 18:26:01Z mike $".
 #
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 2995b3c3..fa9ef142 100644
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-common.m4 10553 2012-07-27 17:57:34Z mike $"
+dnl "$Id: cups-common.m4 10785 2013-01-08 16:29:26Z mike $"
 dnl
 dnl   Common configuration stuff for 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.6.1
+CUPS_VERSION=1.6.2
 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'`"
@@ -130,6 +130,7 @@ AC_CHECK_HEADER(crypt.h,AC_DEFINE(HAVE_CRYPT_H))
 AC_CHECK_HEADER(langinfo.h,AC_DEFINE(HAVE_LANGINFO_H))
 AC_CHECK_HEADER(malloc.h,AC_DEFINE(HAVE_MALLOC_H))
 AC_CHECK_HEADER(shadow.h,AC_DEFINE(HAVE_SHADOW_H))
+AC_CHECK_HEADER(stdint.h,AC_DEFINE(HAVE_STDINT_H))
 AC_CHECK_HEADER(string.h,AC_DEFINE(HAVE_STRING_H))
 AC_CHECK_HEADER(strings.h,AC_DEFINE(HAVE_STRINGS_H))
 AC_CHECK_HEADER(bstring.h,AC_DEFINE(HAVE_BSTRING_H))
@@ -402,8 +403,8 @@ case $uname in
 		if test $uversion -ge 100; then
 			AC_CHECK_HEADER(sandbox.h,AC_DEFINE(HAVE_SANDBOX_H))
 		fi
-		if test $uversion -ge 110; then
-			# Broken public headers in 10.7...
+		if test $uversion -ge 110 -a $uversion -lt 120; then
+			# Broken public headers in 10.7.x...
 			AC_MSG_CHECKING(for sandbox/private.h presence)
 			if test -f /usr/local/include/sandbox/private.h; then
 				AC_MSG_RESULT(yes)
@@ -452,5 +453,5 @@ esac
 AC_SUBST(BUILDDIRS)
 
 dnl
-dnl End of "$Id: cups-common.m4 10553 2012-07-27 17:57:34Z mike $".
+dnl End of "$Id: cups-common.m4 10785 2013-01-08 16:29:26Z mike $".
 dnl
diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4
index 58497004..4054eb7f 100644
--- a/config-scripts/cups-defaults.m4
+++ b/config-scripts/cups-defaults.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-defaults.m4 10424 2012-04-23 17:26:57Z mike $"
+dnl "$Id: cups-defaults.m4 10710 2012-11-26 18:26:01Z mike $"
 dnl
 dnl   Default cupsd configuration settings for CUPS.
 dnl
@@ -305,6 +305,7 @@ else
 fi
 
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LPD_CONFIG_FILE, "$CUPS_DEFAULT_LPD_CONFIG_FILE")
+AC_SUBST(CUPS_DEFAULT_LPD_CONFIG_FILE)
 
 dnl Default SMB config file...
 AC_ARG_WITH(smbconfigfile, [  --with-smbconfigfile    set default SMBConfigFile URI],
@@ -326,6 +327,7 @@ else
 fi
 
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_SMB_CONFIG_FILE, "$CUPS_DEFAULT_SMB_CONFIG_FILE")
+AC_SUBST(CUPS_DEFAULT_SMB_CONFIG_FILE)
 
 dnl Default MaxCopies value...
 AC_ARG_WITH(max-copies, [  --with-max-copies       set default max copies value, default=9999 ],
@@ -398,5 +400,5 @@ AC_SUBST(CUPS_WEBIF)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_WEBIF, $CUPS_DEFAULT_WEBIF)
 
 dnl
-dnl End of "$Id: cups-defaults.m4 10424 2012-04-23 17:26:57Z mike $".
+dnl End of "$Id: cups-defaults.m4 10710 2012-11-26 18:26:01Z mike $".
 dnl
diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4
index 029c44f9..fa72b112 100644
--- a/config-scripts/cups-directories.m4
+++ b/config-scripts/cups-directories.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-directories.m4 10424 2012-04-23 17:26:57Z mike $"
+dnl "$Id: cups-directories.m4 10622 2012-10-01 01:55:23Z mike $"
 dnl
 dnl   Directory stuff for CUPS.
 dnl
@@ -106,7 +106,7 @@ if test "$libdir" = "\${exec_prefix}/lib"; then
 			libdir="$exec_prefix/lib32"
 			;;
 		Linux*)
-			if test -d /usr/lib64; then
+			if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then
 				libdir="$exec_prefix/lib64"
 			fi
 			;;
@@ -436,5 +436,5 @@ AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
 AC_SUBST(CUPS_STATEDIR)
 
 dnl
-dnl End of "$Id: cups-directories.m4 10424 2012-04-23 17:26:57Z mike $".
+dnl End of "$Id: cups-directories.m4 10622 2012-10-01 01:55:23Z mike $".
 dnl
diff --git a/config-scripts/cups-gssapi.m4 b/config-scripts/cups-gssapi.m4
index fa645c2f..161c6d05 100644
--- a/config-scripts/cups-gssapi.m4
+++ b/config-scripts/cups-gssapi.m4
@@ -1,5 +1,5 @@
 dnl
-dnl   "$Id: cups-gssapi.m4 10424 2012-04-23 17:26:57Z mike $"
+dnl   "$Id: cups-gssapi.m4 10785 2013-01-08 16:29:26Z mike $"
 dnl
 dnl   GSSAPI/Kerberos library detection for CUPS.
 dnl
@@ -86,13 +86,6 @@ if test x$enable_gssapi != xno; then
 			else
 				AC_MSG_RESULT(no)
 			fi
-			AC_MSG_CHECKING(for GSS/gssapi_krb5.h presence)
-			if test -f $gssdir/Headers/gssapi_krb5.h; then
-				AC_DEFINE(HAVE_GSSAPI_KRB5_H)
-				AC_MSG_RESULT(yes)
-			else
-				AC_MSG_RESULT(no)
-			fi
 			AC_MSG_CHECKING(for GSS/gssapi_spi.h presence)
 			if test -f $gssdir/PrivateHeaders/gssapi_spi.h; then
 				AC_MSG_RESULT(yes)
@@ -105,16 +98,14 @@ if test x$enable_gssapi != xno; then
 				fi
 			else
 				AC_MSG_RESULT(no)
-				if test $uversion -ge 110; then
-					# Broken public headers in 10.7...
+				if test $uversion -ge 110 -a $uversion -lt 120; then
+					# Broken public headers in 10.7.x...
 					AC_MSG_ERROR(Run 'sudo mkdir -p $gssdir/PrivateHeaders' and 'sudo touch $gssdir/PrivateHeaders/gssapi_spi.h' to build CUPS.)
 				fi
 			fi
 		else
 			AC_CHECK_HEADER(gssapi.h, AC_DEFINE(HAVE_GSSAPI_H))
 			AC_CHECK_HEADER(gssapi/gssapi.h, AC_DEFINE(HAVE_GSSAPI_GSSAPI_H))
-			AC_CHECK_HEADER(gssapi/gssapi_generic.h, AC_DEFINE(HAVE_GSSAPI_GENERIC_H))
-			AC_CHECK_HEADER(gssapi/gssapi_krb5.h, AC_DEFINE(HAVE_GSSAPI_KRB5_H))
 		fi
 
 		SAVELIBS="$LIBS"
@@ -167,5 +158,5 @@ AC_SUBST(CUPS_DEFAULT_GSSSERVICENAME)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GSSSERVICENAME, "$CUPS_DEFAULT_GSSSERVICENAME")
 
 dnl
-dnl End of "$Id: cups-gssapi.m4 10424 2012-04-23 17:26:57Z mike $".
+dnl End of "$Id: cups-gssapi.m4 10785 2013-01-08 16:29:26Z mike $".
 dnl
diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4
index 4ec5c3ea..3ff0ca26 100644
--- a/config-scripts/cups-ssl.m4
+++ b/config-scripts/cups-ssl.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-ssl.m4 10521 2012-06-15 22:23:24Z mike $"
+dnl "$Id: cups-ssl.m4 10710 2012-11-26 18:26:01Z mike $"
 dnl
 dnl   OpenSSL/GNUTLS stuff for CUPS.
 dnl
@@ -27,6 +27,8 @@ AC_ARG_WITH(openssl-includes, [  --with-openssl-includes set directory for OpenS
 SSLFLAGS=""
 SSLLIBS=""
 have_ssl=0
+CUPS_SERVERCERT=""
+CUPS_SERVERKEY=""
 
 if test x$enable_ssl != xno; then
     dnl Look for CDSA...
@@ -36,6 +38,7 @@ if test x$enable_ssl != xno; then
 	    	have_ssl=1
 		AC_DEFINE(HAVE_SSL)
 		AC_DEFINE(HAVE_CDSASSL)
+		CUPS_SERVERCERT="/Library/Keychains/System.keychain"
 
 		dnl Check for the various security headers...
 		AC_CHECK_HEADER(Security/SecureTransportPriv.h,
@@ -106,6 +109,9 @@ if test x$enable_ssl != xno; then
 	fi
 
 	if test $have_ssl = 1; then
+	    CUPS_SERVERCERT="ssl/server.crt"
+	    CUPS_SERVERKEY="ssl/server.key"
+
             if $PKGCONFIG --exists gcrypt; then
 	        SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
 	        SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
@@ -148,6 +154,9 @@ if test x$enable_ssl != xno; then
 	    done
 
 	    if test "x${SSLLIBS}" != "x"; then
+		CUPS_SERVERCERT="ssl/server.crt"
+		CUPS_SERVERKEY="ssl/server.key"
+
 		LIBS="$SAVELIBS $SSLLIBS"
 		AC_CHECK_FUNCS(SSL_set_tlsext_host_name)
 	    fi
@@ -165,6 +174,8 @@ elif test x$enable_cdsa = xyes -o x$enable_gnutls = xyes -o x$enable_openssl = x
     AC_MSG_ERROR([Unable to enable SSL support.])
 fi
 
+AC_SUBST(CUPS_SERVERCERT)
+AC_SUBST(CUPS_SERVERKEY)
 AC_SUBST(IPPALIASES)
 AC_SUBST(SSLFLAGS)
 AC_SUBST(SSLLIBS)
@@ -173,5 +184,5 @@ EXPORT_SSLLIBS="$SSLLIBS"
 AC_SUBST(EXPORT_SSLLIBS)
 
 dnl
-dnl End of "$Id: cups-ssl.m4 10521 2012-06-15 22:23:24Z mike $".
+dnl End of "$Id: cups-ssl.m4 10710 2012-11-26 18:26:01Z mike $".
 dnl
diff --git a/config.h.in b/config.h.in
index 904083e8..8f5f173d 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,5 +1,5 @@
 /*
- * "$Id: config.h.in 10548 2012-07-16 18:21:43Z mike $"
+ * "$Id: config.h.in 10776 2012-12-17 22:17:08Z mike $"
  *
  *   Configuration file for CUPS.
  *
@@ -175,6 +175,13 @@
 
 
 /*
+ * Use <stdint.h>?
+ */
+
+#undef HAVE_STDINT_H
+
+
+/*
  * Use <string.h>, <strings.h>, and/or <bstring.h>?
  */
 
@@ -575,11 +582,8 @@
 #undef HAVE_GSS_GSSAPI_H
 #undef HAVE_GSS_GSSAPI_SPI_H
 #undef HAVE_GSSAPI
-#undef HAVE_GSSAPI_GENERIC_H
 #undef HAVE_GSSAPI_GSSAPI_H
 #undef HAVE_GSSAPI_H
-#undef HAVE_GSSAPI_KRB5_H
-#undef HAVE_KRB5_H
 
 
 /*
@@ -738,5 +742,5 @@ static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); }
 #endif /* !_CUPS_CONFIG_H_ */
 
 /*
- * End of "$Id: config.h.in 10548 2012-07-16 18:21:43Z mike $".
+ * End of "$Id: config.h.in 10776 2012-12-17 22:17:08Z mike $".
  */
diff --git a/configure b/configure
index 1767e51e..fe41d30a 100755
--- a/configure
+++ b/configure
@@ -615,6 +615,8 @@ CUPS_SNMP_COMMUNITY
 CUPS_SNMP_ADDRESS
 DEFAULT_RAW_PRINTING
 CUPS_MAX_COPIES
+CUPS_DEFAULT_SMB_CONFIG_FILE
+CUPS_DEFAULT_LPD_CONFIG_FILE
 CUPS_DEFAULT_PRINTCAP
 CUPS_PRIMARY_SYSTEM_GROUP
 CUPS_SYSTEM_GROUPS
@@ -645,6 +647,8 @@ EXPORT_SSLLIBS
 SSLLIBS
 SSLFLAGS
 IPPALIASES
+CUPS_SERVERKEY
+CUPS_SERVERCERT
 LIBGCRYPTCONFIG
 LIBGNUTLSCONFIG
 PTHREAD_FLAGS
@@ -2504,7 +2508,7 @@ esac
 ac_config_headers="$ac_config_headers config.h"
 
 
-CUPS_VERSION=1.6.1
+CUPS_VERSION=1.6.2
 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'`"
@@ -4980,6 +4984,13 @@ if test "x$ac_cv_header_shadow_h" = xyes; then :
 fi
 
 
+ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdint_h" = xyes; then :
+  $as_echo "#define HAVE_STDINT_H 1" >>confdefs.h
+
+fi
+
+
 ac_fn_c_check_header_mongrel "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default"
 if test "x$ac_cv_header_string_h" = xyes; then :
   $as_echo "#define HAVE_STRING_H 1" >>confdefs.h
@@ -5861,8 +5872,8 @@ fi
 
 
 		fi
-		if test $uversion -ge 110; then
-			# Broken public headers in 10.7...
+		if test $uversion -ge 110 -a $uversion -lt 120; then
+			# Broken public headers in 10.7.x...
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sandbox/private.h presence" >&5
 $as_echo_n "checking for sandbox/private.h presence... " >&6; }
 			if test -f /usr/local/include/sandbox/private.h; then
@@ -6016,7 +6027,7 @@ if test "$libdir" = "\${exec_prefix}/lib"; then
 			libdir="$exec_prefix/lib32"
 			;;
 		Linux*)
-			if test -d /usr/lib64; then
+			if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then
 				libdir="$exec_prefix/lib64"
 			fi
 			;;
@@ -8106,17 +8117,6 @@ $as_echo "yes" >&6; }
 				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 			fi
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSS/gssapi_krb5.h presence" >&5
-$as_echo_n "checking for GSS/gssapi_krb5.h presence... " >&6; }
-			if test -f $gssdir/Headers/gssapi_krb5.h; then
-				$as_echo "#define HAVE_GSSAPI_KRB5_H 1" >>confdefs.h
-
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-			else
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-			fi
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSS/gssapi_spi.h presence" >&5
 $as_echo_n "checking for GSS/gssapi_spi.h presence... " >&6; }
 			if test -f $gssdir/PrivateHeaders/gssapi_spi.h; then
@@ -8136,8 +8136,8 @@ $as_echo "no" >&6; }
 			else
 				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-				if test $uversion -ge 110; then
-					# Broken public headers in 10.7...
+				if test $uversion -ge 110 -a $uversion -lt 120; then
+					# Broken public headers in 10.7.x...
 					as_fn_error $? "Run 'sudo mkdir -p $gssdir/PrivateHeaders' and 'sudo touch $gssdir/PrivateHeaders/gssapi_spi.h' to build CUPS." "$LINENO" 5
 				fi
 			fi
@@ -8156,20 +8156,6 @@ if test "x$ac_cv_header_gssapi_gssapi_h" = xyes; then :
 fi
 
 
-			ac_fn_c_check_header_mongrel "$LINENO" "gssapi/gssapi_generic.h" "ac_cv_header_gssapi_gssapi_generic_h" "$ac_includes_default"
-if test "x$ac_cv_header_gssapi_gssapi_generic_h" = xyes; then :
-  $as_echo "#define HAVE_GSSAPI_GENERIC_H 1" >>confdefs.h
-
-fi
-
-
-			ac_fn_c_check_header_mongrel "$LINENO" "gssapi/gssapi_krb5.h" "ac_cv_header_gssapi_gssapi_krb5_h" "$ac_includes_default"
-if test "x$ac_cv_header_gssapi_gssapi_krb5_h" = xyes; then :
-  $as_echo "#define HAVE_GSSAPI_KRB5_H 1" >>confdefs.h
-
-fi
-
-
 		fi
 
 		SAVELIBS="$LIBS"
@@ -8384,6 +8370,8 @@ fi
 SSLFLAGS=""
 SSLLIBS=""
 have_ssl=0
+CUPS_SERVERCERT=""
+CUPS_SERVERKEY=""
 
 if test x$enable_ssl != xno; then
         if test $have_ssl = 0 -a "x$enable_cdsassl" != "xno"; then
@@ -8396,6 +8384,7 @@ if test "x$ac_cv_header_Security_SecureTransport_h" = xyes; then :
 
 		$as_echo "#define HAVE_CDSASSL 1" >>confdefs.h
 
+		CUPS_SERVERCERT="/Library/Keychains/System.keychain"
 
 				ac_fn_c_check_header_mongrel "$LINENO" "Security/SecureTransportPriv.h" "ac_cv_header_Security_SecureTransportPriv_h" "$ac_includes_default"
 if test "x$ac_cv_header_Security_SecureTransportPriv_h" = xyes; then :
@@ -8599,6 +8588,9 @@ fi
 	fi
 
 	if test $have_ssl = 1; then
+	    CUPS_SERVERCERT="ssl/server.crt"
+	    CUPS_SERVERKEY="ssl/server.key"
+
             if $PKGCONFIG --exists gcrypt; then
 	        SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
 	        SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
@@ -8674,6 +8666,9 @@ fi
 	    done
 
 	    if test "x${SSLLIBS}" != "x"; then
+		CUPS_SERVERCERT="ssl/server.crt"
+		CUPS_SERVERKEY="ssl/server.key"
+
 		LIBS="$SAVELIBS $SSLLIBS"
 		for ac_func in SSL_set_tlsext_host_name
 do :
@@ -8710,6 +8705,8 @@ fi
 
 
 
+
+
 EXPORT_SSLLIBS="$SSLLIBS"
 
 
@@ -9808,6 +9805,7 @@ _ACEOF
 
 
 
+
 # Check whether --with-smbconfigfile was given.
 if test "${with_smbconfigfile+set}" = set; then :
   withval=$with_smbconfigfile; default_smbconfigfile="$withval"
@@ -9836,6 +9834,7 @@ _ACEOF
 
 
 
+
 # Check whether --with-max-copies was given.
 if test "${with_max_copies+set}" = set; then :
   withval=$with_max_copies; CUPS_MAX_COPIES="$withval"
@@ -10262,7 +10261,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makedefs conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf cups-config data/testprint desktop/cups.desktop doc/help/ref-cupsd-conf.html doc/help/standard.html doc/index.html man/client.conf.man man/cups-deviced.man man/cups-driverd.man man/cups-lpd.man man/cups-snmp.man man/cupsaddsmb.man man/cupsd.conf.man man/cupsd.man man/lpoptions.man scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml scheduler/org.cups.cups-lpd.plist templates/header.tmpl packaging/cups.list $LANGFILES"
+ac_config_files="$ac_config_files Makedefs conf/cups-files.conf conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf cups-config data/testprint desktop/cups.desktop doc/help/ref-cups-files-conf.html doc/help/ref-cupsd-conf.html doc/help/standard.html doc/index.html man/client.conf.man man/cups-deviced.man man/cups-driverd.man man/cups-files.conf.man man/cups-lpd.man man/cups-snmp.man man/cupsaddsmb.man man/cupsd.conf.man man/cupsd.man man/lpoptions.man scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml scheduler/org.cups.cups-lpd.plist templates/header.tmpl packaging/cups.list $LANGFILES"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -10968,6 +10967,7 @@ do
   case $ac_config_target in
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "Makedefs") CONFIG_FILES="$CONFIG_FILES Makedefs" ;;
+    "conf/cups-files.conf") CONFIG_FILES="$CONFIG_FILES conf/cups-files.conf" ;;
     "conf/cupsd.conf") CONFIG_FILES="$CONFIG_FILES conf/cupsd.conf" ;;
     "conf/mime.convs") CONFIG_FILES="$CONFIG_FILES conf/mime.convs" ;;
     "conf/pam.std") CONFIG_FILES="$CONFIG_FILES conf/pam.std" ;;
@@ -10975,12 +10975,14 @@ do
     "cups-config") CONFIG_FILES="$CONFIG_FILES cups-config" ;;
     "data/testprint") CONFIG_FILES="$CONFIG_FILES data/testprint" ;;
     "desktop/cups.desktop") CONFIG_FILES="$CONFIG_FILES desktop/cups.desktop" ;;
+    "doc/help/ref-cups-files-conf.html") CONFIG_FILES="$CONFIG_FILES doc/help/ref-cups-files-conf.html" ;;
     "doc/help/ref-cupsd-conf.html") CONFIG_FILES="$CONFIG_FILES doc/help/ref-cupsd-conf.html" ;;
     "doc/help/standard.html") CONFIG_FILES="$CONFIG_FILES doc/help/standard.html" ;;
     "doc/index.html") CONFIG_FILES="$CONFIG_FILES doc/index.html" ;;
     "man/client.conf.man") CONFIG_FILES="$CONFIG_FILES man/client.conf.man" ;;
     "man/cups-deviced.man") CONFIG_FILES="$CONFIG_FILES man/cups-deviced.man" ;;
     "man/cups-driverd.man") CONFIG_FILES="$CONFIG_FILES man/cups-driverd.man" ;;
+    "man/cups-files.conf.man") CONFIG_FILES="$CONFIG_FILES man/cups-files.conf.man" ;;
     "man/cups-lpd.man") CONFIG_FILES="$CONFIG_FILES man/cups-lpd.man" ;;
     "man/cups-snmp.man") CONFIG_FILES="$CONFIG_FILES man/cups-snmp.man" ;;
     "man/cupsaddsmb.man") CONFIG_FILES="$CONFIG_FILES man/cupsaddsmb.man" ;;
diff --git a/configure.in b/configure.in
index 95a26c93..b6298483 100644
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: configure.in 10424 2012-04-23 17:26:57Z mike $"
+dnl "$Id: configure.in 10913 2013-03-18 17:00:03Z mike $"
 dnl
 dnl   Configuration script for CUPS.
 dnl
-dnl   Copyright 2007-2012 by Apple Inc.
+dnl   Copyright 2007-2013 by Apple Inc.
 dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
@@ -60,6 +60,7 @@ AC_SUBST(INSTALL_LANGUAGES)
 AC_SUBST(UNINSTALL_LANGUAGES)
 
 AC_OUTPUT(Makedefs
+	  conf/cups-files.conf
 	  conf/cupsd.conf
 	  conf/mime.convs
 	  conf/pam.std
@@ -67,12 +68,14 @@ AC_OUTPUT(Makedefs
 	  cups-config
 	  data/testprint
 	  desktop/cups.desktop
+	  doc/help/ref-cups-files-conf.html
 	  doc/help/ref-cupsd-conf.html
 	  doc/help/standard.html
 	  doc/index.html
 	  man/client.conf.man
 	  man/cups-deviced.man
 	  man/cups-driverd.man
+	  man/cups-files.conf.man
 	  man/cups-lpd.man
 	  man/cups-snmp.man
 	  man/cupsaddsmb.man
@@ -90,5 +93,5 @@ AC_OUTPUT(Makedefs
 chmod +x cups-config
 
 dnl
-dnl End of "$Id: configure.in 10424 2012-04-23 17:26:57Z mike $".
+dnl End of "$Id: configure.in 10913 2013-03-18 17:00:03Z mike $".
 dnl
diff --git a/cups/Makefile b/cups/Makefile
index ec599784..e77d04b8 100644
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 10539 2012-06-25 15:46:35Z mike $"
+# "$Id: Makefile 10580 2012-08-29 19:02:00Z mike $"
 #
 #   API library Makefile for CUPS.
 #
@@ -518,7 +518,7 @@ apihelp:
 		--css ../doc/cups-printable.css \
 		--header api-cups.header --intro api-cups.shtml \
 		api-cups.xml \
-		cups.h adminutil.c dest.c language.c notify.c \
+		cups.h adminutil.c dest*.c language.c notify.c \
 		options.c tempfile.c usersys.c \
 		util.c >../doc/help/api-cups.html
 	mxmldoc --tokens help/api-cups.html api-cups.xml >../doc/help/api-cups.tokens
@@ -573,7 +573,7 @@ framedhelp:
 		--section "Programming" --title "CUPS API" \
 		--css ../doc/cups-printable.css \
 		--header api-cups.header --intro api-cups.shtml \
-		cups.h adminutil.c dest.c language.c notify.c \
+		cups.h adminutil.c dest*.c language.c notify.c \
 		options.c tempfile.c usersys.c \
 		util.c
 	mxmldoc --framed api-filedir \
@@ -621,5 +621,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 10539 2012-06-25 15:46:35Z mike $".
+# End of "$Id: Makefile 10580 2012-08-29 19:02:00Z mike $".
 #
diff --git a/cups/adminutil.c b/cups/adminutil.c
index f634f3a5..3539488e 100644
--- a/cups/adminutil.c
+++ b/cups/adminutil.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: adminutil.c 10424 2012-04-23 17:26:57Z mike $"
+ * "$Id: adminutil.c 10586 2012-08-29 21:03:10Z mike $"
  *
  *   Administration utility API definitions for CUPS.
  *
@@ -65,7 +65,7 @@ static void		write_option(cups_file_t *dstfp, int order,
 /*
  * 'cupsAdminCreateWindowsPPD()' - Create the Windows PPD file for a printer.
  *
- * @since CUPS 1.2/OS X 10.5@
+ * @deprecated@
  */
 
 char *					/* O - PPD file or NULL */
@@ -393,7 +393,7 @@ cupsAdminCreateWindowsPPD(
 /*
  * 'cupsAdminExportSamba()' - Export a printer to Samba.
  *
- * @since CUPS 1.2/OS X 10.5@
+ * @deprecated@
  */
 
 int					/* O - 1 on success, 0 on failure */
@@ -2337,5 +2337,5 @@ write_option(cups_file_t     *dstfp,	/* I - PPD file */
 
 
 /*
- * End of "$Id: adminutil.c 10424 2012-04-23 17:26:57Z mike $".
+ * End of "$Id: adminutil.c 10586 2012-08-29 21:03:10Z mike $".
  */
diff --git a/cups/adminutil.h b/cups/adminutil.h
index b23a9da6..2fd87aff 100644
--- a/cups/adminutil.h
+++ b/cups/adminutil.h
@@ -1,9 +1,9 @@
 /*
- * "$Id: adminutil.h 10104 2011-11-04 06:37:03Z mike $"
+ * "$Id: adminutil.h 10586 2012-08-29 21:03:10Z mike $"
  *
  *   Administration utility API definitions for CUPS.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 2001-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -55,16 +55,19 @@ extern int	cupsAdminExportSamba(const char *dest, const char *ppd,
 		                     const char *samba_server,
 			             const char *samba_user,
 				     const char *samba_password,
-				     FILE *logfile) _CUPS_API_1_2;
+				     FILE *logfile) _CUPS_DEPRECATED;
 extern char	*cupsAdminCreateWindowsPPD(http_t *http, const char *dest,
-		                           char *buffer, int bufsize) _CUPS_API_1_2;
+		                           char *buffer, int bufsize)
+		                           _CUPS_DEPRECATED;
 
 extern int	cupsAdminGetServerSettings(http_t *http,
 			                   int *num_settings,
-		                           cups_option_t **settings) _CUPS_API_1_3;
+		                           cups_option_t **settings)
+		                           _CUPS_API_1_3;
 extern int	cupsAdminSetServerSettings(http_t *http,
 		                           int num_settings,
-		                           cups_option_t *settings) _CUPS_API_1_3;
+		                           cups_option_t *settings)
+		                           _CUPS_API_1_3;
 
 
 #  ifdef __cplusplus
@@ -74,5 +77,5 @@ extern int	cupsAdminSetServerSettings(http_t *http,
 #endif /* !_CUPS_ADMINUTIL_H_ */
 
 /*
- * End of "$Id: adminutil.h 10104 2011-11-04 06:37:03Z mike $".
+ * End of "$Id: adminutil.h 10586 2012-08-29 21:03:10Z mike $".
  */
diff --git a/cups/auth.c b/cups/auth.c
index b60b37ad..11a978f8 100644
--- a/cups/auth.c
+++ b/cups/auth.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: auth.c 10424 2012-04-23 17:26:57Z mike $"
+ * "$Id: auth.c 10905 2013-03-13 16:26:25Z mike $"
  *
  *   Authentication functions for CUPS.
  *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   This file contains Kerberos support code, copyright 2006 by
@@ -660,8 +660,7 @@ cups_local_auth(http_t *http)		/* I - HTTP connection to server */
   int			pid;		/* Current process ID */
   FILE			*fp;		/* Certificate file */
   char			trc[16],	/* Try Root Certificate parameter */
-			filename[1024],	/* Certificate filename */
-			certificate[33];/* Certificate string */
+			filename[1024];	/* Certificate filename */
   _cups_globals_t *cg = _cupsGlobals();	/* Global data */
 #  if defined(HAVE_AUTHORIZATION_H)
   OSStatus		status;		/* Status */
@@ -855,19 +854,25 @@ cups_local_auth(http_t *http)		/* I - HTTP connection to server */
     * Read the certificate from the file...
     */
 
-    fgets(certificate, sizeof(certificate), fp);
+    char	certificate[33],	/* Certificate string */
+		*certptr;		/* Pointer to certificate string */
+
+    certptr = fgets(certificate, sizeof(certificate), fp);
     fclose(fp);
 
-   /*
-    * Set the authorization string and return...
-    */
+    if (certptr)
+    {
+     /*
+      * Set the authorization string and return...
+      */
 
-    httpSetAuthString(http, "Local", certificate);
+      httpSetAuthString(http, "Local", certificate);
 
-    DEBUG_printf(("8cups_local_auth: Returning authstring=\"%s\"",
-		  http->authstring));
+      DEBUG_printf(("8cups_local_auth: Returning authstring=\"%s\"",
+		    http->authstring));
 
-    return (0);
+      return (0);
+    }
   }
 
   return (1);
@@ -876,5 +881,5 @@ cups_local_auth(http_t *http)		/* I - HTTP connection to server */
 
 
 /*
- * End of "$Id: auth.c 10424 2012-04-23 17:26:57Z mike $".
+ * End of "$Id: auth.c 10905 2013-03-13 16:26:25Z mike $".
  */
diff --git a/cups/backend.c b/cups/backend.c
index 45cf60e4..404f0ca6 100644
--- a/cups/backend.c
+++ b/cups/backend.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: backend.c 10437 2012-04-23 22:20:09Z mike $"
+ * "$Id: backend.c 10608 2012-09-15 19:42:21Z mike $"
  *
  *   Backend functions for CUPS.
  *
@@ -136,7 +136,7 @@ quote_string(const char *s)		/* I - String to write */
       if (*s == '\\' || *s == '\"')
 	putchar('\\');
 
-      if (*s == '\n')
+      if (((*s & 255) < ' ' && *s != '\t') || *s == 0x7f)
         putchar(' ');
       else
         putchar(*s);
@@ -150,5 +150,5 @@ quote_string(const char *s)		/* I - String to write */
 
 
 /*
- * End of "$Id: backend.c 10437 2012-04-23 22:20:09Z mike $".
+ * End of "$Id: backend.c 10608 2012-09-15 19:42:21Z mike $".
  */
diff --git a/cups/cups-private.h b/cups/cups-private.h
index 03dae571..211de261 100644
--- a/cups/cups-private.h
+++ b/cups/cups-private.h
@@ -1,9 +1,9 @@
 /*
- * "$Id: cups-private.h 10504 2012-05-23 18:20:42Z mike $"
+ * "$Id: cups-private.h 10814 2013-01-14 22:06:21Z mike $"
  *
  *   Private definitions for CUPS.
  *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -158,7 +158,8 @@ typedef struct _cups_globals_s		/**** CUPS global state data ****/
   cups_server_cert_cb_t	server_cert_cb;	/* Server certificate callback */
   void			*server_cert_data;
 					/* Server certificate user data */
-  int			any_root,	/* Allow any root */
+  int			server_version,	/* Server IPP version */
+			any_root,	/* Allow any root */
 			expired_certs,	/* Allow expired certs */
 			expired_root;	/* Allow expired root */
 
@@ -267,5 +268,5 @@ extern char		*_cupsUserDefault(char *name, size_t namesize);
 #endif /* !_CUPS_CUPS_PRIVATE_H_ */
 
 /*
- * End of "$Id: cups-private.h 10504 2012-05-23 18:20:42Z mike $".
+ * End of "$Id: cups-private.h 10814 2013-01-14 22:06:21Z mike $".
  */
diff --git a/cups/cups.h b/cups/cups.h
index e6b16ac3..5bc98886 100644
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: cups.h 10553 2012-07-27 17:57:34Z mike $"
+ * "$Id: cups.h 10688 2012-11-09 03:24:57Z mike $"
  *
  *   API definitions for CUPS.
  *
@@ -52,10 +52,10 @@ extern "C" {
  * Constants...
  */
 
-#  define CUPS_VERSION			1.0601
+#  define CUPS_VERSION			1.0602
 #  define CUPS_VERSION_MAJOR		1
 #  define CUPS_VERSION_MINOR		6
-#  define CUPS_VERSION_PATCH		1
+#  define CUPS_VERSION_PATCH		2
 
 #  define CUPS_BC_FD			3
 					/* Back-channel file descriptor for
@@ -597,5 +597,5 @@ extern http_status_t	cupsStartDestDocument(http_t *http, cups_dest_t *dest,
 #endif /* !_CUPS_CUPS_H_ */
 
 /*
- * End of "$Id: cups.h 10553 2012-07-27 17:57:34Z mike $".
+ * End of "$Id: cups.h 10688 2012-11-09 03:24:57Z mike $".
  */
diff --git a/cups/dest-options.c b/cups/dest-options.c
index 1c7b577d..abc89752 100644
--- a/cups/dest-options.c
+++ b/cups/dest-options.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dest-options.c 10505 2012-05-23 18:22:11Z mike $"
+ * "$Id: dest-options.c 10767 2012-12-13 21:10:03Z mike $"
  *
  *   Destination option/media support for CUPS.
  *
@@ -269,13 +269,13 @@ cupsCheckDestSupported(
  * Returns 1 if there is a conflict, 0 if there are no conflicts, and -1 if
  * there was an unrecoverable error such as a resolver loop.
  *
- * If "num_conflicts" and "conflicts" are not NULL, they are set to contain the
- * list of conflicting option/value pairs.  Similarly, if "num_resolved" and
- * "resolved" are not NULL they will be set to the list of changes needed to
- * resolve the conflict.
+ * If "num_conflicts" and "conflicts" are not @code NULL@, they are set to
+ * contain the list of conflicting option/value pairs.  Similarly, if
+ * "num_resolved" and "resolved" are not @code NULL@ they will be set to the
+ * list of changes needed to resolve the conflict.
  *
  * If cupsCopyDestConflicts returns 1 but "num_resolved" and "resolved" are set
- * to 0 and NULL, respectively, then the conflict cannot be resolved.
+ * to 0 and @code NULL@, respectively, then the conflict cannot be resolved.
  *
  * @since CUPS 1.6/OS X 10.8@
  */
@@ -485,7 +485,7 @@ cupsCopyDestConflicts(
     active = NULL;
   }
 
-  if (tries >= 0)
+  if (tries >= 100)
   {
     DEBUG_puts("1cupsCopyDestConflicts: Unable to resolve after 100 tries.");
     have_conflicts = -1;
@@ -716,14 +716,13 @@ cupsFreeDestInfo(cups_dinfo_t *dinfo)	/* I - Destination information */
 /*
  * 'cupsGetDestMediaByName()' - Get media names, dimensions, and margins.
  *
- * The "media" string is a PWG media name, while "width" and "length" are the
- * dimensions in hundredths of millimeters.  "flags" provides some matching
+ * The "media" string is a PWG media name.  "Flags" provides some matching
  * guidance (multiple flags can be combined):
  *
- * CUPS_MEDIA_FLAGS_DEFAULT    = find the closest size supported by the printer
- * CUPS_MEDIA_FLAGS_BORDERLESS = find a borderless size
- * CUPS_MEDIA_FLAGS_DUPLEX     = find a size compatible with 2-sided printing
- * CUPS_MEDIA_FLAGS_EXACT      = find an exact match for the size
+ * CUPS_MEDIA_FLAGS_DEFAULT    = find the closest size supported by the printer,
+ * CUPS_MEDIA_FLAGS_BORDERLESS = find a borderless size,
+ * CUPS_MEDIA_FLAGS_DUPLEX     = find a size compatible with 2-sided printing,
+ * CUPS_MEDIA_FLAGS_EXACT      = find an exact match for the size, and
  * CUPS_MEDIA_FLAGS_READY      = if the printer supports media sensing, find the
  *                               size amongst the "ready" media.
  *
@@ -782,14 +781,13 @@ cupsGetDestMediaByName(
 /*
  * 'cupsGetDestMediaBySize()' - Get media names, dimensions, and margins.
  *
- * The "media" string is a PWG media name, while "width" and "length" are the
- * dimensions in hundredths of millimeters.  "flags" provides some matching
- * guidance (multiple flags can be combined):
+ * "Width" and "length" are the dimensions in hundredths of millimeters.
+ * "Flags" provides some matching guidance (multiple flags can be combined):
  *
- * CUPS_MEDIA_FLAGS_DEFAULT    = find the closest size supported by the printer
- * CUPS_MEDIA_FLAGS_BORDERLESS = find a borderless size
- * CUPS_MEDIA_FLAGS_DUPLEX     = find a size compatible with 2-sided printing
- * CUPS_MEDIA_FLAGS_EXACT      = find an exact match for the size
+ * CUPS_MEDIA_FLAGS_DEFAULT    = find the closest size supported by the printer,
+ * CUPS_MEDIA_FLAGS_BORDERLESS = find a borderless size,
+ * CUPS_MEDIA_FLAGS_DUPLEX     = find a size compatible with 2-sided printing,
+ * CUPS_MEDIA_FLAGS_EXACT      = find an exact match for the size, and
  * CUPS_MEDIA_FLAGS_READY      = if the printer supports media sensing, find the
  *                               size amongst the "ready" media.
  *
@@ -1761,5 +1759,5 @@ cups_test_constraints(
 
 
 /*
- * End of "$Id: dest-options.c 10505 2012-05-23 18:22:11Z mike $".
+ * End of "$Id: dest-options.c 10767 2012-12-13 21:10:03Z mike $".
  */
diff --git a/cups/dest.c b/cups/dest.c
index 79836cf0..36ded80e 100644
--- a/cups/dest.c
+++ b/cups/dest.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dest.c 10555 2012-07-27 18:01:06Z mike $"
+ * "$Id: dest.c 10814 2013-01-14 22:06:21Z mike $"
  *
  *   User-defined destination (and option) support for CUPS.
  *
@@ -1788,7 +1788,7 @@ cupsGetDests2(http_t      *http,	/* I - Connection to server or @code CUPS_HTTP_
     * need to set a default if one exists...
     */
 
-    if (dest == NULL && defprinter != NULL)
+    if (!dest && *dests && defprinter)
     {
       for (i = 0; i < num_dests; i ++)
         (*dests)[i].is_default = 0;
@@ -2449,7 +2449,7 @@ appleCopyNetwork(void)
  * 'appleGetPaperSize()' - Get the default paper size.
  */
 
-char *					/* O - Default paper size */
+static char *				/* O - Default paper size */
 appleGetPaperSize(char *name,		/* I - Paper size name buffer */
                   int  namesize)	/* I - Size of buffer */
 {
@@ -3904,5 +3904,5 @@ cups_make_string(
 
 
 /*
- * End of "$Id: dest.c 10555 2012-07-27 18:01:06Z mike $".
+ * End of "$Id: dest.c 10814 2013-01-14 22:06:21Z mike $".
  */
diff --git a/cups/encode.c b/cups/encode.c
index 7cb5dd31..8bf5f37f 100644
--- a/cups/encode.c
+++ b/cups/encode.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: encode.c 10424 2012-04-23 17:26:57Z mike $"
+ * "$Id: encode.c 10618 2012-09-28 20:03:54Z mike $"
  *
  *   Option encoding routines for CUPS.
  *
@@ -71,13 +71,22 @@ static const _ipp_option_t ipp_options[] =
   { 0, "hue",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
   { 0, "hue-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
   { 1, "include-schemes",	IPP_TAG_NAME,		IPP_TAG_OPERATION },
-  { 0, "job-impressions",	IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { 0, "job-id",		IPP_TAG_INTEGER,	IPP_TAG_ZERO }, /* never send as option */
+  { 0, "job-impressions",	IPP_TAG_INTEGER,	IPP_TAG_ZERO }, /* never send as option */
+  { 0, "job-impressions-completed", IPP_TAG_INTEGER,	IPP_TAG_ZERO }, /* never send as option */
   { 0, "job-k-limit",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { 0, "job-k-octets",		IPP_TAG_INTEGER,	IPP_TAG_ZERO }, /* never send as option */
+  { 0, "job-k-octets-completed",IPP_TAG_INTEGER,	IPP_TAG_ZERO }, /* never send as option */
+  { 0, "job-media-sheets",	IPP_TAG_INTEGER,	IPP_TAG_ZERO }, /* never send as option */
+  { 0, "job-media-sheets-completed", IPP_TAG_INTEGER,	IPP_TAG_ZERO }, /* never send as option */
   { 0, "job-page-limit",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
   { 0, "job-priority",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
   { 0, "job-quota-period",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
   { 1, "job-sheets",		IPP_TAG_NAME,		IPP_TAG_JOB },
   { 1, "job-sheets-default",	IPP_TAG_NAME,		IPP_TAG_PRINTER },
+  { 0, "job-state",		IPP_TAG_ENUM,		IPP_TAG_ZERO }, /* never send as option */
+  { 0, "job-state-message",	IPP_TAG_TEXT,		IPP_TAG_ZERO }, /* never send as option */
+  { 0, "job-state-reasons",	IPP_TAG_KEYWORD,	IPP_TAG_ZERO }, /* never send as option */
   { 0, "job-uuid",		IPP_TAG_URI,		IPP_TAG_JOB },
   { 0, "landscape",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
   { 1, "marker-change-time",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
@@ -179,6 +188,9 @@ static const _ipp_option_t ipp_options[] =
   { 0, "sides",			IPP_TAG_KEYWORD,	IPP_TAG_JOB,
 							IPP_TAG_DOCUMENT },
   { 0, "sides-default",		IPP_TAG_KEYWORD,	IPP_TAG_PRINTER },
+  { 0, "time-at-completed",	IPP_TAG_INTEGER,	IPP_TAG_ZERO }, /* never send as option */
+  { 0, "time-at-creation",	IPP_TAG_INTEGER,	IPP_TAG_ZERO }, /* never send as option */
+  { 0, "time-at-processing",	IPP_TAG_INTEGER,	IPP_TAG_ZERO }, /* never send as option */
   { 0, "wrap",			IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
   { 0, "wrap-default",		IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
   { 0, "x-dimension",		IPP_TAG_INTEGER,	IPP_TAG_JOB,
@@ -648,5 +660,5 @@ compare_ipp_options(_ipp_option_t *a,	/* I - First option */
 
 
 /*
- * End of "$Id: encode.c 10424 2012-04-23 17:26:57Z mike $".
+ * End of "$Id: encode.c 10618 2012-09-28 20:03:54Z mike $".
  */
diff --git a/cups/globals.c b/cups/globals.c
index f46b370e..364c78fe 100644
--- a/cups/globals.c
+++ b/cups/globals.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: globals.c 10435 2012-04-23 21:49:48Z mike $"
+ * "$Id: globals.c 10814 2013-01-14 22:06:21Z mike $"
  *
  *   Global variable access routines for CUPS.
  *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -210,11 +210,12 @@ cups_globals_alloc(void)
   */
 
   memset(cg, 0, sizeof(_cups_globals_t));
-  cg->encryption    = (http_encryption_t)-1;
-  cg->password_cb   = (cups_password_cb2_t)_cupsGetPassword;
-  cg->any_root      = 1;
-  cg->expired_certs = 1;
-  cg->expired_root  = 1;
+  cg->encryption     = (http_encryption_t)-1;
+  cg->password_cb    = (cups_password_cb2_t)_cupsGetPassword;
+  cg->any_root       = 1;
+  cg->expired_certs  = 1;
+  cg->expired_root   = 1;
+  cg->server_version = 20;
 
  /*
   * Then set directories as appropriate...
@@ -380,5 +381,5 @@ cups_globals_init(void)
 
 
 /*
- * End of "$Id: globals.c 10435 2012-04-23 21:49:48Z mike $".
+ * End of "$Id: globals.c 10814 2013-01-14 22:06:21Z mike $".
  */
diff --git a/cups/http-private.h b/cups/http-private.h
index 5aabfbb1..584d2a70 100644
--- a/cups/http-private.h
+++ b/cups/http-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: http-private.h 10437 2012-04-23 22:20:09Z mike $"
+ * "$Id: http-private.h 10776 2012-12-17 22:17:08Z mike $"
  *
  *   Private HTTP definitions for CUPS.
  *
@@ -44,29 +44,14 @@
 #  ifdef HAVE_GSSAPI
 #    ifdef HAVE_GSS_GSSAPI_H
 #      include <GSS/gssapi.h>
-#      ifdef HAVE_GSSAPI_GENERIC_H
-#        include <GSS/gssapi_generic.h>
-#      endif /* HAVE_GSSAPI_GENERIC_H */
-#      ifdef HAVE_GSSAPI_KRB5_H
-#        include <GSS/gssapi_krb5.h>
-#      endif /* HAVE_GSSAPI_KRB5_H */
 #    elif defined(HAVE_GSSAPI_GSSAPI_H)
 #      include <gssapi/gssapi.h>
-#      ifdef HAVE_GSSAPI_GENERIC_H
-#        include <gssapi/gssapi_generic.h>
-#      endif /* HAVE_GSSAPI_GENERIC_H */
-#      ifdef HAVE_GSSAPI_KRB5_H
-#        include <gssapi/gssapi_krb5.h>
-#      endif /* HAVE_GSSAPI_KRB5_H */
 #    elif defined(HAVE_GSSAPI_H)
 #      include <gssapi.h>
 #    endif /* HAVE_GSS_GSSAPI_H */
 #    ifndef HAVE_GSS_C_NT_HOSTBASED_SERVICE
 #      define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
 #    endif /* !HAVE_GSS_C_NT_HOSTBASED_SERVICE */
-#    ifdef HAVE_KRB5_H
-#      include <krb5.h>
-#    endif /* HAVE_KRB5_H */
 #  endif /* HAVE_GSSAPI */
 
 #  ifdef HAVE_AUTHORIZATION_H
@@ -405,5 +390,5 @@ extern int		_httpWait(http_t *http, int msec, int usessl);
 #endif /* !_CUPS_HTTP_PRIVATE_H_ */
 
 /*
- * End of "$Id: http-private.h 10437 2012-04-23 22:20:09Z mike $".
+ * End of "$Id: http-private.h 10776 2012-12-17 22:17:08Z mike $".
  */
diff --git a/cups/http-support.c b/cups/http-support.c
index 9310e79a..eb24a1a4 100644
--- a/cups/http-support.c
+++ b/cups/http-support.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: http-support.c 10437 2012-04-23 22:20:09Z mike $"
+ * "$Id: http-support.c 10899 2013-03-11 18:44:36Z mike $"
  *
  *   HTTP support routines for CUPS.
  *
@@ -82,6 +82,7 @@ typedef struct _http_uribuf_s		/* URI buffer */
   char			*buffer;	/* Pointer to buffer */
   size_t		bufsize;	/* Size of buffer */
   int			options;	/* Options passed to _httpResolveURI */
+  const char		*resource;	/* Resource from URI */
 } _http_uribuf_t;
 
 
@@ -326,8 +327,7 @@ httpAssembleURI(
      /*
       * Otherwise, just copy the host string...
       */
-
-      ptr = http_copy_encode(ptr, host, end, ":/?#[]@\\\"", NULL,
+      ptr = http_copy_encode(ptr, host, end, "<>{}|^:/?#[]@\\\"", NULL,
                              encoding & HTTP_URI_CODING_HOSTNAME);
 
       if (!ptr)
@@ -1523,6 +1523,7 @@ _httpResolveURI(
     uribuf.buffer   = resolved_uri;
     uribuf.bufsize  = resolved_size;
     uribuf.options  = options;
+    uribuf.resource = resource;
 
     resolved_uri[0] = '\0';
 
@@ -1850,6 +1851,11 @@ http_copy_decode(char       *dst,	/* O - Destination buffer */
 	  return (NULL);
 	}
       }
+      else if ((*src & 255) <= 0x20 || (*src & 255) >= 0x7f)
+      {
+        *ptr = '\0';
+        return (NULL);
+      }
       else
 	*ptr++ = *src;
     }
@@ -2057,6 +2063,8 @@ http_resolve_cb(
 			error));
 #endif /* DEBUG */
       }
+
+      httpAddrFreeList(addrlist);
     }
   }
 
@@ -2064,8 +2072,14 @@ http_resolve_cb(
   * Assemble the final device URI...
   */
 
-  httpAssembleURI(HTTP_URI_CODING_ALL, uribuf->buffer, uribuf->bufsize, scheme,
-                  NULL, hostTarget, ntohs(port), resource);
+  if ((!strcmp(scheme, "ipp") || !strcmp(scheme, "ipps")) &&
+      !strcmp(uribuf->resource, "/cups"))
+    httpAssembleURIf(HTTP_URI_CODING_ALL, uribuf->buffer, uribuf->bufsize,
+                     scheme, NULL, hostTarget, ntohs(port), "%s?snmp=false",
+                     resource);
+  else
+    httpAssembleURI(HTTP_URI_CODING_ALL, uribuf->buffer, uribuf->bufsize,
+                    scheme, NULL, hostTarget, ntohs(port), resource);
 
   DEBUG_printf(("8http_resolve_cb: Resolved URI is \"%s\"...", uribuf->buffer));
 }
@@ -2266,6 +2280,8 @@ http_resolve_cb(
 			error));
 #endif /* DEBUG */
       }
+
+      httpAddrFreeList(addrlist);
     }
   }
 
@@ -2283,5 +2299,5 @@ http_resolve_cb(
 
 
 /*
- * End of "$Id: http-support.c 10437 2012-04-23 22:20:09Z mike $".
+ * End of "$Id: http-support.c 10899 2013-03-11 18:44:36Z mike $".
  */
diff --git a/cups/http.c b/cups/http.c
index c3824146..ff0adb3f 100644
--- a/cups/http.c
+++ b/cups/http.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: http.c 10449 2012-05-04 22:51:10Z mike $"
+ * "$Id: http.c 10905 2013-03-13 16:26:25Z mike $"
  *
  *   HTTP routines for CUPS.
  *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   This file contains Kerberos support code, copyright 2006 by
@@ -133,6 +133,7 @@
 #  include <signal.h>
 #  include <sys/time.h>
 #  include <sys/resource.h>
+#  include <sys/utsname.h>
 #endif /* WIN32 */
 #ifdef HAVE_POLL
 #  include <poll.h>
@@ -3643,7 +3644,39 @@ http_send(http_t       *http,	/* I - Connection to server */
   */
 
   if (!http->fields[HTTP_FIELD_USER_AGENT][0])
-    httpSetField(http, HTTP_FIELD_USER_AGENT, CUPS_MINIMAL);
+  {
+#ifdef WIN32
+    SYSTEM_INFO	sysinfo;		/* System information */
+    OSVERSIONEX	version;		/* OS version info */
+
+    version.dwOSVersionInfoSize = sizeof(OSVERSIONEX);
+    GetVersionInfoEx(&version);
+    GetNativeSystemInfo(&sysinfo);
+
+    snprintf(buf, sizeof(buf), CUPS_MINIMAL " (Windows %d.%d; %s) IPP/2.0",
+	     version.major, version.minor,
+	     sysinfo.wProcessorArchitecture
+		 == PROCESSOR_ARCHITECTURE_AMD64 ? "amd64" :
+		 sysinfo.wProcessorArchitecture
+		     == PROCESSOR_ARCHITECTURE_ARM ? "arm" :
+		 sysinfo.wProcessorArchitecture
+		     == PROCESSOR_ARCHITECTURE_IA64 ? "ia64" :
+		 sysinfo.wProcessorArchitecture
+		     == PROCESSOR_ARCHITECTURE_INTEL ? "intel" :
+		 "unknown");
+
+#else
+    struct utsname	name;		/* uname info */
+
+    uname(&name);
+
+    snprintf(buf, sizeof(buf), CUPS_MINIMAL " (%s %s; %s) IPP/2.0",
+	     name.sysname, name.release, name.machine);
+#endif /* WIN32 */
+
+    DEBUG_printf(("8http_send: Default User-Agent: %s", buf));
+    httpSetField(http, HTTP_FIELD_USER_AGENT, buf);
+  }
 
  /*
   * Encode the URI as needed...
@@ -3702,8 +3735,17 @@ http_send(http_t       *http,	/* I - Connection to server */
       DEBUG_printf(("9http_send: %s: %s", http_fields[i],
                     httpGetField(http, i)));
 
-      if (httpPrintf(http, "%s: %s\r\n", http_fields[i],
-		     httpGetField(http, i)) < 1)
+      if (i == HTTP_FIELD_HOST)
+      {
+	if (httpPrintf(http, "Host: %s:%d\r\n", httpGetField(http, i),
+	               _httpAddrPort(http->hostaddr)) < 1)
+	{
+	  http->status = HTTP_ERROR;
+	  return (-1);
+	}
+      }
+      else if (httpPrintf(http, "%s: %s\r\n", http_fields[i],
+		          httpGetField(http, i)) < 1)
       {
 	http->status = HTTP_ERROR;
 	return (-1);
@@ -3781,63 +3823,6 @@ http_set_credentials(http_t *http)	/* I - Connection to server */
   if ((credentials = http->tls_credentials) == NULL)
     credentials = cg->tls_credentials;
 
-#    if HAVE_SECPOLICYCREATESSL
- /*
-  * Otherwise root around in the user's keychain to see if one can be found...
-  */
-
-  if (!credentials)
-  {
-    CFDictionaryRef	query;		/* Query dictionary */
-    CFTypeRef		matches = NULL;	/* Matching credentials */
-    CFArrayRef		dn_array = NULL;/* Distinguished names array */
-    CFTypeRef		keys[]   = { kSecClass,
-				     kSecMatchLimit,
-				     kSecReturnRef };
-					/* Keys for dictionary */
-    CFTypeRef		values[] = { kSecClassCertificate,
-				     kSecMatchLimitOne,
-				     kCFBooleanTrue };
-					/* Values for dictionary */
-
-   /*
-    * Get the names associated with the server.
-    */
-
-    if ((error = SSLCopyDistinguishedNames(http->tls, &dn_array)) != noErr)
-    {
-      DEBUG_printf(("4http_set_credentials: SSLCopyDistinguishedNames, error=%d",
-                    (int)error));
-      return (error);
-    }
-
-   /*
-    * Create a query which will return all identities that can sign and match
-    * the passed in policy.
-    */
-
-    query = CFDictionaryCreate(NULL,
-			       (const void**)(&keys[0]),
-			       (const void**)(&values[0]),
-			       sizeof(keys) / sizeof(keys[0]),
-			       &kCFTypeDictionaryKeyCallBacks,
-			       &kCFTypeDictionaryValueCallBacks);
-    if (query)
-    {
-      error = SecItemCopyMatching(query, &matches);
-      DEBUG_printf(("4http_set_credentials: SecItemCopyMatching, error=%d",
-		    (int)error));
-      CFRelease(query);
-    }
-
-    if (matches)
-      CFRelease(matches);
-
-    if (dn_array)
-      CFRelease(dn_array);
-  }
-#    endif /* HAVE_SECPOLICYCREATESSL */
-
   if (credentials)
   {
     error = SSLSetCertificate(http->tls, credentials);
@@ -3907,12 +3892,11 @@ http_set_wait(http_t *http)		/* I - Connection to server */
 static int				/* O - 0 on success, -1 on failure */
 http_setup_ssl(http_t *http)		/* I - Connection to server */
 {
-  _cups_globals_t	*cg = _cupsGlobals();
-					/* Pointer to library globals */
   int			any_root;	/* Allow any root */
   char			hostname[256],	/* Hostname */
 			*hostptr;	/* Pointer into hostname */
-
+  _cups_globals_t	*cg = _cupsGlobals();
+					/* Pointer to library globals */
 #  ifdef HAVE_LIBSSL
   SSL_CTX		*context;	/* Context for encryption */
   BIO			*bio;		/* BIO data */
@@ -4222,6 +4206,8 @@ http_setup_ssl(http_t *http)		/* I - Connection to server */
 			       credential->datalen);
 			cupsArrayAdd(names, credential);
 		      }
+		      else
+		        free(credential);
 		    }
 		  }
 		}
@@ -4777,5 +4763,5 @@ http_write_ssl(http_t     *http,	/* I - Connection to server */
 
 
 /*
- * End of "$Id: http.c 10449 2012-05-04 22:51:10Z mike $".
+ * End of "$Id: http.c 10905 2013-03-13 16:26:25Z mike $".
  */
diff --git a/cups/ipp-support.c b/cups/ipp-support.c
index 605ff111..5a44605e 100644
--- a/cups/ipp-support.c
+++ b/cups/ipp-support.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp-support.c 10424 2012-04-23 17:26:57Z mike $"
+ * "$Id: ipp-support.c 10767 2012-12-13 21:10:03Z mike $"
  *
  *   Internet Printing Protocol support functions for CUPS.
  *
@@ -645,8 +645,8 @@ ippEnumString(const char *attrname,	/* I - Attribute name */
 
   if (!strcmp(attrname, "document-state") &&
       enumvalue >= 3 &&
-      enumvalue <= (3 + (int)(sizeof(ipp_document_states) /
-                              sizeof(ipp_document_states[0]))))
+      enumvalue < (3 + (int)(sizeof(ipp_document_states) /
+			     sizeof(ipp_document_states[0]))))
     return (ipp_document_states[enumvalue - 3]);
   else if ((!strcmp(attrname, "finishings") ||
             !strcmp(attrname, "finishings-actual") ||
@@ -654,13 +654,13 @@ ippEnumString(const char *attrname,	/* I - Attribute name */
             !strcmp(attrname, "finishings-ready") ||
             !strcmp(attrname, "finishings-supported")) &&
            enumvalue >= 3 &&
-           enumvalue <= (3 + (int)(sizeof(ipp_finishings) / sizeof(ipp_finishings[0]))))
+           enumvalue < (3 + (int)(sizeof(ipp_finishings) / sizeof(ipp_finishings[0]))))
     return (ipp_finishings[enumvalue - 3]);
   else if ((!strcmp(attrname, "job-collation-type") ||
             !strcmp(attrname, "job-collation-type-actual")) &&
            enumvalue >= 3 &&
-           enumvalue <= (3 + (int)(sizeof(ipp_job_collation_types) /
-                                   sizeof(ipp_job_collation_types[0]))))
+           enumvalue < (3 + (int)(sizeof(ipp_job_collation_types) /
+				  sizeof(ipp_job_collation_types[0]))))
     return (ipp_job_collation_types[enumvalue - 3]);
   else if (!strcmp(attrname, "job-state") &&
 	   enumvalue >= IPP_JOB_PENDING && enumvalue <= IPP_JOB_COMPLETED)
@@ -672,16 +672,16 @@ ippEnumString(const char *attrname,	/* I - Attribute name */
             !strcmp(attrname, "orientation-requested-default") ||
             !strcmp(attrname, "orientation-requested-supported")) &&
            enumvalue >= 3 &&
-           enumvalue <= (3 + (int)(sizeof(ipp_orientation_requesteds) /
-                                   sizeof(ipp_orientation_requesteds[0]))))
+           enumvalue < (3 + (int)(sizeof(ipp_orientation_requesteds) /
+				  sizeof(ipp_orientation_requesteds[0]))))
     return (ipp_orientation_requesteds[enumvalue - 3]);
   else if ((!strcmp(attrname, "print-quality") ||
             !strcmp(attrname, "print-quality-actual") ||
             !strcmp(attrname, "print-quality-default") ||
             !strcmp(attrname, "print-quality-supported")) &&
            enumvalue >= 3 &&
-           enumvalue <= (3 + (int)(sizeof(ipp_print_qualities) /
-                                   sizeof(ipp_print_qualities[0]))))
+           enumvalue < (3 + (int)(sizeof(ipp_print_qualities) /
+				  sizeof(ipp_print_qualities[0]))))
     return (ipp_print_qualities[enumvalue - 3]);
   else if (!strcmp(attrname, "printer-state") &&
            enumvalue >= IPP_PRINTER_IDLE && enumvalue <= IPP_PRINTER_STOPPED)
@@ -1086,5 +1086,5 @@ ipp_col_string(ipp_t  *col,		/* I - Collection attribute */
 
 
 /*
- * End of "$Id: ipp-support.c 10424 2012-04-23 17:26:57Z mike $".
+ * End of "$Id: ipp-support.c 10767 2012-12-13 21:10:03Z mike $".
  */
diff --git a/cups/ipp.c b/cups/ipp.c
index 84ac82fd..33532bcb 100644
--- a/cups/ipp.c
+++ b/cups/ipp.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: ipp.c 10462 2012-05-12 00:07:16Z mike $"
+ * "$Id: ipp.c 10814 2013-01-14 22:06:21Z mike $"
  *
  *   Internet Printing Protocol functions for CUPS.
  *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -2327,7 +2327,9 @@ ippNextAttribute(ipp_t *ipp)		/* I - IPP message */
 ipp_t *					/* O - New IPP message */
 ippNew(void)
 {
-  ipp_t	*temp;				/* New IPP message */
+  ipp_t			*temp;		/* New IPP message */
+  _cups_globals_t	*cg = _cupsGlobals();
+					/* Global data */
 
 
   DEBUG_puts("ippNew()");
@@ -2335,11 +2337,11 @@ ippNew(void)
   if ((temp = (ipp_t *)calloc(1, sizeof(ipp_t))) != NULL)
   {
    /*
-    * Default to IPP 2.0...
+    * Set default version - usually 2.0...
     */
 
-    temp->request.any.version[0] = 2;
-    temp->request.any.version[1] = 0;
+    temp->request.any.version[0] = cg->server_version / 10;
+    temp->request.any.version[1] = cg->server_version % 10;
     temp->use                    = 1;
   }
 
@@ -2771,6 +2773,13 @@ ippReadIO(void       *src,		/* I - Data source */
 	      ipp->prev = ipp->current;
 
 	    attr = ipp->current = ipp_add_attr(ipp, NULL, ipp->curtag, IPP_TAG_ZERO, 1);
+	    if (!attr)
+	    {
+	      _cupsSetHTTPError(HTTP_ERROR);
+	      DEBUG_puts("1ippReadIO: unable to allocate attribute.");
+	      _cupsBufferRelease((char *)buffer);
+	      return (IPP_ERROR);
+	    }
 
 	    DEBUG_printf(("2ippReadIO: membername, ipp->current=%p, ipp->prev=%p",
 	                  ipp->current, ipp->prev));
@@ -3116,7 +3125,15 @@ ippReadIO(void       *src,		/* I - Data source */
 		* we need to carry over...
 		*/
 
-		if (n == 0)
+                if (!attr)
+                {
+		  _cupsSetError(IPP_INTERNAL_ERROR,
+		                _("IPP memberName with no attribute."), 1);
+	          DEBUG_puts("1ippReadIO: Member name without attribute.");
+		  _cupsBufferRelease((char *)buffer);
+		  return (IPP_ERROR);
+                }
+		else if (n == 0)
 		{
 		  _cupsSetError(IPP_INTERNAL_ERROR,
 		                _("IPP memberName value is empty."), 1);
@@ -4996,7 +5013,8 @@ ipp_free_values(ipp_attribute_t *attr,	/* I - Attribute to free values from */
   _ipp_value_t	*value;			/* Current value */
 
 
-  DEBUG_printf(("4ipp_free_values(attr=%p, element=%d, count=%d)", attr, element, count));
+  DEBUG_printf(("4ipp_free_values(attr=%p, element=%d, count=%d)", attr,
+                element, count));
 
   if (!(attr->value_tag & IPP_TAG_COPY))
   {
@@ -5008,8 +5026,13 @@ ipp_free_values(ipp_attribute_t *attr,	/* I - Attribute to free values from */
     {
       case IPP_TAG_TEXTLANG :
       case IPP_TAG_NAMELANG :
-	  if (element == 0 && count == attr->num_values && attr->values[0].string.language)
+	  if (element == 0 && count == attr->num_values &&
+	      attr->values[0].string.language)
+	  {
 	    _cupsStrFree(attr->values[0].string.language);
+	    attr->values[0].string.language = NULL;
+	  }
+	  /* Fall through to other string values */
 
       case IPP_TAG_TEXT :
       case IPP_TAG_NAME :
@@ -5023,7 +5046,10 @@ ipp_free_values(ipp_attribute_t *attr,	/* I - Attribute to free values from */
 	  for (i = count, value = attr->values + element;
 	       i > 0;
 	       i --, value ++)
+	  {
 	    _cupsStrFree(value->string.text);
+	    value->string.text = NULL;
+	  }
 	  break;
 
       case IPP_TAG_DEFAULT :
@@ -5044,7 +5070,10 @@ ipp_free_values(ipp_attribute_t *attr,	/* I - Attribute to free values from */
 	  for (i = count, value = attr->values + element;
 	       i > 0;
 	       i --, value ++)
+	  {
 	    ippDelete(value->collection);
+	    value->collection = NULL;
+	  }
 	  break;
 
       case IPP_TAG_STRING :
@@ -5052,8 +5081,13 @@ ipp_free_values(ipp_attribute_t *attr,	/* I - Attribute to free values from */
 	  for (i = count, value = attr->values + element;
 	       i > 0;
 	       i --, value ++)
+	  {
 	    if (value->unknown.data)
+	    {
 	      free(value->unknown.data);
+	      value->unknown.data = NULL;
+	    }
+	  }
 	  break;
     }
   }
@@ -5533,5 +5567,5 @@ ipp_write_file(int         *fd,		/* I - File descriptor */
 
 
 /*
- * End of "$Id: ipp.c 10462 2012-05-12 00:07:16Z mike $".
+ * End of "$Id: ipp.c 10814 2013-01-14 22:06:21Z mike $".
  */
diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
index 37840ba4..d67a2ddc 100644
--- a/cups/ppd-cache.c
+++ b/cups/ppd-cache.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ppd-cache.c 10339 2012-03-07 17:14:53Z mike $"
+ * "$Id: ppd-cache.c 10728 2012-12-04 20:07:27Z mike $"
  *
  *   PPD cache implementation for CUPS.
  *
@@ -69,7 +69,8 @@ static int	pwg_compare_finishings(_pwg_finishings_t *a,
 		                       _pwg_finishings_t *b);
 static void	pwg_free_finishings(_pwg_finishings_t *f);
 static void	pwg_ppdize_name(const char *ipp, char *name, size_t namesize);
-static void	pwg_unppdize_name(const char *ppd, char *name, size_t namesize);
+static void	pwg_unppdize_name(const char *ppd, char *name, size_t namesize,
+		                  const char *dashchars);
 
 
 /*
@@ -329,7 +330,7 @@ _ppdCacheCreateWithFile(
 	goto create_error;
       }
 
-      if ((num_sizes = atoi(value)) <= 0 || num_sizes > 65536)
+      if ((num_sizes = atoi(value)) < 0 || num_sizes > 65536)
       {
         DEBUG_printf(("_ppdCacheCreateWithFile: Bad NumSizes value %d on line "
 	              "%d.", num_sizes, linenum));
@@ -337,12 +338,15 @@ _ppdCacheCreateWithFile(
 	goto create_error;
       }
 
-      if ((pc->sizes = calloc(num_sizes, sizeof(_pwg_size_t))) == NULL)
+      if (num_sizes > 0)
       {
-        DEBUG_printf(("_ppdCacheCreateWithFile: Unable to allocate %d sizes.",
-	              num_sizes));
-	_cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0);
-	goto create_error;
+	if ((pc->sizes = calloc(num_sizes, sizeof(_pwg_size_t))) == NULL)
+	{
+	  DEBUG_printf(("_ppdCacheCreateWithFile: Unable to allocate %d sizes.",
+			num_sizes));
+	  _cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0);
+	  goto create_error;
+	}
       }
     }
     else if (!_cups_strcasecmp(line, "Size"))
@@ -684,148 +688,145 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd)	/* I - PPD file */
   * Copy and convert size data...
   */
 
-  if (ppd->num_sizes == 0)
-  {
-    DEBUG_puts("_ppdCacheCreateWithPPD: No page sizes in PPD.");
-    goto create_error;
-  }
-
-  if ((pc->sizes = calloc(ppd->num_sizes, sizeof(_pwg_size_t))) == NULL)
-  {
-    DEBUG_printf(("_ppdCacheCreateWithPPD: Unable to allocate %d "
-                  "_pwg_size_t's.", ppd->num_sizes));
-    goto create_error;
-  }
-
-  for (i = ppd->num_sizes, pwg_size = pc->sizes, ppd_size = ppd->sizes;
-       i > 0;
-       i --, ppd_size ++)
+  if (ppd->num_sizes > 0)
   {
-   /*
-    * Don't copy over custom size...
-    */
-
-    if (!_cups_strcasecmp(ppd_size->name, "Custom"))
-      continue;
-
-   /*
-    * Convert the PPD size name to the corresponding PWG keyword name.
-    */
-
-    if ((pwg_media = _pwgMediaForPPD(ppd_size->name)) != NULL)
+    if ((pc->sizes = calloc(ppd->num_sizes, sizeof(_pwg_size_t))) == NULL)
     {
-     /*
-      * Standard name, do we have conflicts?
-      */
-
-      for (j = 0; j < pc->num_sizes; j ++)
-        if (!strcmp(pc->sizes[j].map.pwg, pwg_media->pwg))
-	{
-	  pwg_media = NULL;
-	  break;
-	}
+      DEBUG_printf(("_ppdCacheCreateWithPPD: Unable to allocate %d "
+		    "_pwg_size_t's.", ppd->num_sizes));
+      goto create_error;
     }
 
-    if (pwg_media)
+    for (i = ppd->num_sizes, pwg_size = pc->sizes, ppd_size = ppd->sizes;
+	 i > 0;
+	 i --, ppd_size ++)
     {
      /*
-      * Standard name and no conflicts, use it!
+      * Don't copy over custom size...
       */
 
-      pwg_name      = pwg_media->pwg;
-      new_known_pwg = 1;
-    }
-    else
-    {
+      if (!_cups_strcasecmp(ppd_size->name, "Custom"))
+	continue;
+
      /*
-      * Not a standard name; convert it to a PWG vendor name of the form:
-      *
-      *     pp_lowerppd_WIDTHxHEIGHTuu
+      * Convert the PPD size name to the corresponding PWG keyword name.
       */
 
-      pwg_name      = pwg_keyword;
-      new_known_pwg = 0;
+      if ((pwg_media = _pwgMediaForPPD(ppd_size->name)) != NULL)
+      {
+       /*
+	* Standard name, do we have conflicts?
+	*/
 
-      pwg_unppdize_name(ppd_size->name, ppd_name, sizeof(ppd_name));
-      _pwgGenerateSize(pwg_keyword, sizeof(pwg_keyword), NULL, ppd_name,
-		       _PWG_FROMPTS(ppd_size->width),
-		       _PWG_FROMPTS(ppd_size->length));
-    }
+	for (j = 0; j < pc->num_sizes; j ++)
+	  if (!strcmp(pc->sizes[j].map.pwg, pwg_media->pwg))
+	  {
+	    pwg_media = NULL;
+	    break;
+	  }
+      }
 
-   /*
-    * If we have a similar paper with non-zero margins then we only want to
-    * keep it if it has a larger imageable area length.  The NULL check is for
-    * dimensions that are <= 0...
-    */
+      if (pwg_media)
+      {
+       /*
+	* Standard name and no conflicts, use it!
+	*/
 
-    if ((pwg_media = _pwgMediaForSize(_PWG_FROMPTS(ppd_size->width),
-                                      _PWG_FROMPTS(ppd_size->length))) == NULL)
-      continue;
-
-    new_width      = pwg_media->width;
-    new_length     = pwg_media->length;
-    new_left       = _PWG_FROMPTS(ppd_size->left);
-    new_bottom     = _PWG_FROMPTS(ppd_size->bottom);
-    new_right      = _PWG_FROMPTS(ppd_size->width - ppd_size->right);
-    new_top        = _PWG_FROMPTS(ppd_size->length - ppd_size->top);
-    new_imageable  = new_length - new_top - new_bottom;
-    new_borderless = new_bottom == 0 && new_top == 0 &&
-                     new_left == 0 && new_right == 0;
-
-    for (k = pc->num_sizes, similar = 0, old_size = pc->sizes, new_size = NULL;
-         k > 0 && !similar;
-         k --, old_size ++)
-    {
-      old_imageable  = old_size->length - old_size->top - old_size->bottom;
-      old_borderless = old_size->left == 0 && old_size->bottom == 0 &&
-	               old_size->right == 0 && old_size->top == 0;
-      old_known_pwg  = strncmp(old_size->map.pwg, "oe_", 3) &&
-		       strncmp(old_size->map.pwg, "om_", 3);
-
-      similar = old_borderless == new_borderless &&
-                _PWG_EQUIVALENT(old_size->width, new_width) &&
-	        _PWG_EQUIVALENT(old_size->length, new_length);
-
-      if (similar &&
-          (new_known_pwg || (!old_known_pwg && new_imageable > old_imageable)))
+	pwg_name      = pwg_media->pwg;
+	new_known_pwg = 1;
+      }
+      else
       {
        /*
-	* The new paper has a larger imageable area so it could replace
-	* the older paper.  Regardless of the imageable area, we always
-	* prefer the size with a well-known PWG name.
+	* Not a standard name; convert it to a PWG vendor name of the form:
+	*
+	*     pp_lowerppd_WIDTHxHEIGHTuu
 	*/
 
-	new_size = old_size;
-	_cupsStrFree(old_size->map.ppd);
-	_cupsStrFree(old_size->map.pwg);
+	pwg_name      = pwg_keyword;
+	new_known_pwg = 0;
+
+	pwg_unppdize_name(ppd_size->name, ppd_name, sizeof(ppd_name), "_.");
+	_pwgGenerateSize(pwg_keyword, sizeof(pwg_keyword), NULL, ppd_name,
+			 _PWG_FROMPTS(ppd_size->width),
+			 _PWG_FROMPTS(ppd_size->length));
       }
-    }
 
-    if (!similar)
-    {
      /*
-      * The paper was unique enough to deserve its own entry so add it to the
-      * end.
+      * If we have a similar paper with non-zero margins then we only want to
+      * keep it if it has a larger imageable area length.  The NULL check is for
+      * dimensions that are <= 0...
       */
 
-      new_size = pwg_size ++;
-      pc->num_sizes ++;
-    }
+      if ((pwg_media = _pwgMediaForSize(_PWG_FROMPTS(ppd_size->width),
+					_PWG_FROMPTS(ppd_size->length))) == NULL)
+	continue;
 
-    if (new_size)
-    {
-     /*
-      * Save this size...
-      */
+      new_width      = pwg_media->width;
+      new_length     = pwg_media->length;
+      new_left       = _PWG_FROMPTS(ppd_size->left);
+      new_bottom     = _PWG_FROMPTS(ppd_size->bottom);
+      new_right      = _PWG_FROMPTS(ppd_size->width - ppd_size->right);
+      new_top        = _PWG_FROMPTS(ppd_size->length - ppd_size->top);
+      new_imageable  = new_length - new_top - new_bottom;
+      new_borderless = new_bottom == 0 && new_top == 0 &&
+		       new_left == 0 && new_right == 0;
+
+      for (k = pc->num_sizes, similar = 0, old_size = pc->sizes, new_size = NULL;
+	   k > 0 && !similar;
+	   k --, old_size ++)
+      {
+	old_imageable  = old_size->length - old_size->top - old_size->bottom;
+	old_borderless = old_size->left == 0 && old_size->bottom == 0 &&
+			 old_size->right == 0 && old_size->top == 0;
+	old_known_pwg  = strncmp(old_size->map.pwg, "oe_", 3) &&
+			 strncmp(old_size->map.pwg, "om_", 3);
+
+	similar = old_borderless == new_borderless &&
+		  _PWG_EQUIVALENT(old_size->width, new_width) &&
+		  _PWG_EQUIVALENT(old_size->length, new_length);
+
+	if (similar &&
+	    (new_known_pwg || (!old_known_pwg && new_imageable > old_imageable)))
+	{
+	 /*
+	  * The new paper has a larger imageable area so it could replace
+	  * the older paper.  Regardless of the imageable area, we always
+	  * prefer the size with a well-known PWG name.
+	  */
+
+	  new_size = old_size;
+	  _cupsStrFree(old_size->map.ppd);
+	  _cupsStrFree(old_size->map.pwg);
+	}
+      }
 
-      new_size->map.ppd = _cupsStrAlloc(ppd_size->name);
-      new_size->map.pwg = _cupsStrAlloc(pwg_name);
-      new_size->width   = new_width;
-      new_size->length  = new_length;
-      new_size->left    = new_left;
-      new_size->bottom  = new_bottom;
-      new_size->right   = new_right;
-      new_size->top     = new_top;
+      if (!similar)
+      {
+       /*
+	* The paper was unique enough to deserve its own entry so add it to the
+	* end.
+	*/
+
+	new_size = pwg_size ++;
+	pc->num_sizes ++;
+      }
+
+      if (new_size)
+      {
+       /*
+	* Save this size...
+	*/
+
+	new_size->map.ppd = _cupsStrAlloc(ppd_size->name);
+	new_size->map.pwg = _cupsStrAlloc(pwg_name);
+	new_size->width   = new_width;
+	new_size->length  = new_length;
+	new_size->left    = new_left;
+	new_size->bottom  = new_bottom;
+	new_size->right   = new_right;
+	new_size->top     = new_top;
+      }
     }
   }
 
@@ -913,7 +914,8 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd)	/* I - PPD file */
 	*/
 
         pwg_name = pwg_keyword;
-	pwg_unppdize_name(choice->choice, pwg_keyword, sizeof(pwg_keyword));
+	pwg_unppdize_name(choice->choice, pwg_keyword, sizeof(pwg_keyword),
+	                  "_");
       }
 
       map->pwg = _cupsStrAlloc(pwg_name);
@@ -977,7 +979,8 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd)	/* I - PPD file */
 	*/
 
         pwg_name = pwg_keyword;
-	pwg_unppdize_name(choice->choice, pwg_keyword, sizeof(pwg_keyword));
+	pwg_unppdize_name(choice->choice, pwg_keyword, sizeof(pwg_keyword),
+	                  "_");
       }
 
       map->pwg = _cupsStrAlloc(pwg_name);
@@ -1006,7 +1009,7 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd)	/* I - PPD file */
 	 i > 0;
 	 i --, choice ++, map ++)
     {
-      pwg_unppdize_name(choice->choice, pwg_keyword, sizeof(pwg_keyword));
+      pwg_unppdize_name(choice->choice, pwg_keyword, sizeof(pwg_keyword), "_");
 
       map->pwg = _cupsStrAlloc(pwg_keyword);
       map->ppd = _cupsStrAlloc(choice->choice);
@@ -2602,7 +2605,8 @@ pwg_ppdize_name(const char *ipp,	/* I - IPP keyword */
 static void
 pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
 		  char       *name,	/* I - Name buffer */
-                  size_t     namesize)	/* I - Size of name buffer */
+                  size_t     namesize,	/* I - Size of name buffer */
+                  const char *dashchars)/* I - Characters to be replaced by dashes */
 {
   char	*ptr,				/* Pointer into name buffer */
 	*end;				/* End of name buffer */
@@ -2612,8 +2616,10 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
   {
     if (_cups_isalnum(*ppd) || *ppd == '-')
       *ptr++ = tolower(*ppd & 255);
-    else if (*ppd == '_' || *ppd == '.')
+    else if (strchr(dashchars, *ppd))
       *ptr++ = '-';
+    else
+      *ptr++ = *ppd;
 
     if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
 	_cups_isupper(ppd[1]) && ptr < end)
@@ -2625,5 +2631,5 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
 
 
 /*
- * End of "$Id: ppd-cache.c 10339 2012-03-07 17:14:53Z mike $".
+ * End of "$Id: ppd-cache.c 10728 2012-12-04 20:07:27Z mike $".
  */
diff --git a/cups/request.c b/cups/request.c
index edf22cbe..1b7f2dde 100644
--- a/cups/request.c
+++ b/cups/request.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: request.c 10462 2012-05-12 00:07:16Z mike $"
+ * "$Id: request.c 10762 2012-12-13 20:28:30Z mike $"
  *
  *   IPP utilities for CUPS.
  *
@@ -51,9 +51,9 @@
 /*
  * 'cupsDoFileRequest()' - Do an IPP request with a file.
  *
- * This function sends the IPP request to the specified server, retrying
- * and authenticating as necessary.  The request is freed with @link ippDelete@
- * after receiving a valid IPP response.
+ * This function sends the IPP request and attached file to the specified
+ * server, retrying and authenticating as necessary.  The request is freed with
+ * @link ippDelete@.
  */
 
 ipp_t *					/* O - Response data */
@@ -102,14 +102,14 @@ cupsDoFileRequest(http_t     *http,	/* I - Connection to server or @code CUPS_HT
 /*
  * 'cupsDoIORequest()' - Do an IPP request with file descriptors.
  *
- * This function sends the IPP request to the specified server, retrying
- * and authenticating as necessary.  The request is freed with ippDelete()
- * after receiving a valid IPP response.
+ * This function sends the IPP request with the optional input file "infile" to
+ * the specified server, retrying and authenticating as necessary.  The request
+ * is freed with @link ippDelete@.
  *
- * If "infile" is a valid file descriptor, cupsDoIORequest() copies
+ * If "infile" is a valid file descriptor, @code cupsDoIORequest@ copies
  * all of the data from the file after the IPP request message.
  *
- * If "outfile" is a valid file descriptor, cupsDoIORequest() copies
+ * If "outfile" is a valid file descriptor, @code cupsDoIORequest@ copies
  * all of the data after the IPP response message to the file.
  *
  * @since CUPS 1.3/OS X 10.5@
@@ -309,8 +309,7 @@ cupsDoIORequest(http_t     *http,	/* I - Connection to server or @code CUPS_HTTP
  * 'cupsDoRequest()' - Do an IPP request.
  *
  * This function sends the IPP request to the specified server, retrying
- * and authenticating as necessary.  The request is freed with ippDelete()
- * after receiving a valid IPP response.
+ * and authenticating as necessary.  The request is freed with @link ippDelete@.
  */
 
 ipp_t *					/* O - Response data */
@@ -331,9 +330,9 @@ cupsDoRequest(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_
  * 'cupsGetResponse()' - Get a response to an IPP request.
  *
  * Use this function to get the response for an IPP request sent using
- * cupsSendDocument() or cupsSendRequest(). For requests that return
- * additional data, use httpRead() after getting a successful response,
- * otherwise call httpFlush() to complete the response processing.
+ * @link cupsSendRequest@. For requests that return additional data, use
+ * @link cupsReadResponseData@ after getting a successful response,
+ * otherwise call @link httpFlush@ to complete the response processing.
  *
  * @since CUPS 1.4/OS X 10.6@
  */
@@ -481,7 +480,8 @@ cupsGetResponse(http_t     *http,	/* I - Connection to server or @code CUPS_HTTP
 
 
 /*
- * 'cupsLastError()' - Return the last IPP status code.
+ * 'cupsLastError()' - Return the last IPP status code received on the current
+ *                     thread.
  */
 
 ipp_status_t				/* O - IPP status code from last request */
@@ -492,7 +492,8 @@ cupsLastError(void)
 
 
 /*
- * 'cupsLastErrorString()' - Return the last IPP status-message.
+ * 'cupsLastErrorString()' - Return the last IPP status-message received on the
+ *                           current thread.
  *
  * @since CUPS 1.2/OS X 10.5@
  */
@@ -537,8 +538,9 @@ _cupsNextDelay(int current,		/* I  - Current delay value or 0 */
 /*
  * 'cupsReadResponseData()' - Read additional data after the IPP response.
  *
- * This function is used after cupsGetResponse() to read the PPD or document
- * files for CUPS_GET_PPD and CUPS_GET_DOCUMENT requests, respectively.
+ * This function is used after @link cupsGetResponse@ to read the PPD or document
+ * files from @code CUPS_GET_PPD@ and @code CUPS_GET_DOCUMENT@ requests,
+ * respectively.
  *
  * @since CUPS 1.4/OS X 10.6@
  */
@@ -579,13 +581,17 @@ cupsReadResponseData(
 /*
  * 'cupsSendRequest()' - Send an IPP request.
  *
- * Use httpWrite() to write any additional data (document, PPD file, etc.)
- * for the request, cupsGetResponse() to get the IPP response, and httpRead()
- * to read any additional data following the response. Only one request can be
- * sent/queued at a time.
+ * Use @link cupsWriteRequestData@ to write any additional data (document, PPD
+ * file, etc.) for the request, @link cupsGetResponse@ to get the IPP response,
+ * and @link cupsReadResponseData@ to read any additional data following the
+ * response. Only one request can be sent/queued at a time per @code http_t@
+ * connection.
  *
- * Unlike cupsDoFileRequest(), cupsDoIORequest(), and cupsDoRequest(), the
- * request is not freed.
+ * Returns the initial HTTP status code, which will be @code HTTP_CONTINUE@
+ * on a successful send of the request.
+ *
+ * Note: Unlike @link cupsDoFileRequest@, @link cupsDoIORequest@, and
+ * @link cupsDoRequest@, the request is NOT freed with @link ippDelete@.
  *
  * @since CUPS 1.4/OS X 10.6@
  */
@@ -998,6 +1004,25 @@ _cupsConnect(void)
       httpClose(cg->http);
       cg->http = NULL;
     }
+    else
+    {
+     /*
+      * Same server, see if the connection is still established...
+      */
+
+      char ch;				/* Connection check byte */
+
+      if (recv(cg->http->fd, &ch, 1, MSG_PEEK | MSG_DONTWAIT) < 0 &&
+          errno != EWOULDBLOCK)
+      {
+       /*
+        * Nope, close the connection...
+        */
+
+	httpClose(cg->http);
+	cg->http = NULL;
+      }
+    }
   }
 
  /*
@@ -1139,5 +1164,5 @@ _cupsSetHTTPError(http_status_t status)	/* I - HTTP status code */
 
 
 /*
- * End of "$Id: request.c 10462 2012-05-12 00:07:16Z mike $".
+ * End of "$Id: request.c 10762 2012-12-13 20:28:30Z mike $".
  */
diff --git a/cups/testhttp.c b/cups/testhttp.c
index f3dd60e1..d8f48464 100644
--- a/cups/testhttp.c
+++ b/cups/testhttp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testhttp.c 9992 2011-09-09 21:51:39Z mike $"
+ * "$Id: testhttp.c 10899 2013-03-11 18:44:36Z mike $"
  *
  *   HTTP test program for CUPS.
  *
@@ -131,6 +131,8 @@ static uri_test_t	uri_tests[] =	/* URI test data */
 			    "http", "", "", "", 80, 0 },
 			  { HTTP_URI_BAD_HOSTNAME, "http://serve%7/index.html",
 			    "http", "", "", "", 80, 0 },
+			  { HTTP_URI_BAD_HOSTNAME, "http://server with spaces/index.html",
+			    "http", "", "", "", 80, 0 },
 
 			  /* Bad port number */
 			  { HTTP_URI_BAD_PORT, "http://127.0.0.1:9999a/index.html",
@@ -138,7 +140,9 @@ static uri_test_t	uri_tests[] =	/* URI test data */
 
 			  /* Bad resource */
 			  { HTTP_URI_BAD_RESOURCE, "http://server/index.html%",
-			    "http", "", "server", "", 80, 0 }
+			    "http", "", "server", "", 80, 0 },
+ 			  { HTTP_URI_BAD_RESOURCE, "http://server/index with spaces.html",
+  			    "http", "", "server", "", 80, 0 }
 			};
 static const char * const base64_tests[][2] =
 			{
@@ -596,5 +600,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: testhttp.c 9992 2011-09-09 21:51:39Z mike $".
+ * End of "$Id: testhttp.c 10899 2013-03-11 18:44:36Z mike $".
  */
diff --git a/cups/usersys.c b/cups/usersys.c
index 4db54339..fa02b149 100644
--- a/cups/usersys.c
+++ b/cups/usersys.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: usersys.c 10424 2012-04-23 17:26:57Z mike $"
+ * "$Id: usersys.c 10903 2013-03-12 14:26:28Z mike $"
  *
  *   User, system, and password routines for CUPS.
  *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -341,7 +341,8 @@ cupsSetPasswordCB2(
 void
 cupsSetServer(const char *server)	/* I - Server name */
 {
-  char		*port;			/* Pointer to port */
+  char		*options,		/* Options */
+		*port;			/* Pointer to port */
   _cups_globals_t *cg = _cupsGlobals();	/* Pointer to library globals */
 
 
@@ -349,6 +350,22 @@ cupsSetServer(const char *server)	/* I - Server name */
   {
     strlcpy(cg->server, server, sizeof(cg->server));
 
+    if (cg->server[0] != '/' && (options = strrchr(cg->server, '/')) != NULL)
+    {
+      *options++ = '\0';
+
+      if (!strcmp(options, "version=1.0"))
+        cg->server_version = 10;
+      else if (!strcmp(options, "version=1.1"))
+        cg->server_version = 11;
+      else if (!strcmp(options, "version=2.0"))
+        cg->server_version = 20;
+      else if (!strcmp(options, "version=2.1"))
+        cg->server_version = 21;
+      else if (!strcmp(options, "version=2.2"))
+        cg->server_version = 22;
+    }
+
     if (cg->server[0] != '/' && (port = strrchr(cg->server, ':')) != NULL &&
         !strchr(port, ']') && isdigit(port[1] & 255))
     {
@@ -364,8 +381,9 @@ cupsSetServer(const char *server)	/* I - Server name */
   }
   else
   {
-    cg->server[0]     = '\0';
-    cg->servername[0] = '\0';
+    cg->server[0]      = '\0';
+    cg->servername[0]  = '\0';
+    cg->server_version = 20;
   }
 
   if (cg->http)
@@ -933,36 +951,7 @@ cups_read_client_conf(
   }
 
   if ((!cg->server[0] || !cg->ipp_port) && cups_server)
-  {
-    if (!cg->server[0])
-    {
-     /*
-      * Copy server name...
-      */
-
-      strlcpy(cg->server, cups_server, sizeof(cg->server));
-
-      if (cg->server[0] != '/' && (value = strrchr(cg->server, ':')) != NULL &&
-	  !strchr(value, ']') && isdigit(value[1] & 255))
-        *value++ = '\0';
-      else
-        value = NULL;
-
-      if (cg->server[0] == '/')
-	strcpy(cg->servername, "localhost");
-      else
-	strlcpy(cg->servername, cg->server, sizeof(cg->servername));
-    }
-    else if (cups_server[0] != '/' &&
-             (value = strrchr(cups_server, ':')) != NULL &&
-	     !strchr(value, ']') && isdigit(value[1] & 255))
-      value ++;
-    else
-      value = NULL;
-
-    if (!cg->ipp_port && value)
-      cg->ipp_port = atoi(value);
-  }
+    cupsSetServer(cups_server);
 
   if (!cg->server[0])
   {
@@ -1066,5 +1055,5 @@ cups_read_client_conf(
 
 
 /*
- * End of "$Id: usersys.c 10424 2012-04-23 17:26:57Z mike $".
+ * End of "$Id: usersys.c 10903 2013-03-12 14:26:28Z mike $".
  */
diff --git a/cups/util.c b/cups/util.c
index acf57ca1..5ac73b8a 100644
--- a/cups/util.c
+++ b/cups/util.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: util.c 10482 2012-05-18 19:51:02Z mike $"
+ * "$Id: util.c 10873 2013-02-20 02:16:13Z mike $"
  *
  *   Printing utilities for CUPS.
  *
@@ -935,10 +935,16 @@ cupsGetPPD3(http_t     *http,		/* I  - HTTP connection or @code CUPS_HTTP_DEFAUL
   * See if the PPD file is available locally...
   */
 
-  if (!cg->servername[0])
-    cupsServer();
+  if (http)
+    httpGetHostname(http, hostname, sizeof(hostname));
+  else
+  {
+    strlcpy(hostname, cupsServer(), sizeof(hostname));
+    if (hostname[0] == '/')
+      strlcpy(hostname, "localhost", sizeof(hostname));
+  }
 
-  if (!_cups_strcasecmp(cg->servername, "localhost"))
+  if (!_cups_strcasecmp(hostname, "localhost"))
   {
     char	ppdname[1024];		/* PPD filename */
     struct stat	ppdinfo;		/* PPD file information */
@@ -1636,6 +1642,7 @@ cups_get_printer_uri(
 					/* Hostname associated with connection */
   static const char * const requested_attrs[] =
 		{			/* Requested attributes */
+		  "device-uri",
 		  "member-uris",
 		  "printer-uri-supported",
 		  "printer-type"
@@ -1694,9 +1701,38 @@ cups_get_printer_uri(
   * Do the request and get back a response...
   */
 
-  if ((response = cupsDoRequest(http, request, "/")) != NULL)
+  snprintf(resource, resourcesize, "/printers/%s", name);
+
+  if ((response = cupsDoRequest(http, request, resource)) != NULL)
   {
-    if ((attr = ippFindAttribute(response, "member-uris", IPP_TAG_URI)) != NULL)
+    const char *device_uri = NULL;	/* device-uri value */
+
+    if ((attr = ippFindAttribute(response, "device-uri",
+                                 IPP_TAG_URI)) != NULL)
+      device_uri = attr->values[0].string.text;
+
+    if (device_uri &&
+        (!strncmp(device_uri, "ipp://", 6) ||
+         !strncmp(device_uri, "ipps://", 7) ||
+         ((strstr(device_uri, "._ipp.") != NULL ||
+           strstr(device_uri, "._ipps.") != NULL) &&
+          !strcmp(device_uri + strlen(device_uri) - 5, "/cups"))))
+    {
+     /*
+      * Statically-configured shared printer.
+      */
+
+      httpSeparateURI(HTTP_URI_CODING_ALL,
+                      _httpResolveURI(device_uri, uri, sizeof(uri),
+                                      _HTTP_RESOLVE_DEFAULT, NULL, NULL),
+                      scheme, sizeof(scheme), username, sizeof(username),
+		      host, hostsize, port, resource, resourcesize);
+      ippDelete(response);
+
+      return (1);
+    }
+    else if ((attr = ippFindAttribute(response, "member-uris",
+                                      IPP_TAG_URI)) != NULL)
     {
      /*
       * Get the first actual printer name in the class...
@@ -1808,5 +1844,5 @@ cups_get_printer_uri(
 
 
 /*
- * End of "$Id: util.c 10482 2012-05-18 19:51:02Z mike $".
+ * End of "$Id: util.c 10873 2013-02-20 02:16:13Z mike $".
  */
diff --git a/desktop/cups.desktop.in b/desktop/cups.desktop.in
index 911a75e3..2d521fa2 100644
--- a/desktop/cups.desktop.in
+++ b/desktop/cups.desktop.in
@@ -9,6 +9,8 @@ Name=Manage Printing
 Comment=CUPS Web Interface
 Name[ca]=Gestor d'impressió
 Comment[ca]=Interfície web de CUPS
+Name[cs]=Správa tisku CUPS
+Comment[cs]=Webové rozhraní CUPS
 Name[de]=Druckerverwaltung
 Comment[de]=CUPS Webinterface
 Name[en_US]=Manage Printing
diff --git a/doc/Makefile b/doc/Makefile
index bcd494cc..e599f759 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile 10429 2012-04-23 18:04:24Z mike $"
+# "$Id: Makefile 10752 2012-12-12 18:03:02Z mike $"
 #
 #   Documentation makefile for CUPS.
 #
-#   Copyright 2007-2011 by Apple Inc.
+#   Copyright 2007-2012 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -105,6 +105,7 @@ HELPFILES	=	\
 			help/ref-classes-conf.html \
 			help/ref-client-conf.html \
 			help/ref-cupsd-conf.html \
+			help/ref-cups-files-conf.html \
 			help/ref-error_log.html \
 			help/ref-mailto-conf.html \
 			help/ref-page_log.html \
diff --git a/doc/ca/index.html.in b/doc/ca/index.html.in
index 3cd2c33f..77542d3b 100644
--- a/doc/ca/index.html.in
+++ b/doc/ca/index.html.in
@@ -100,7 +100,7 @@ HEIGHT="128" ALT="CUPS"></A></TD>
 </TD></TR>
 <TR><TD>&nbsp;</TD></TR>
 <TR><TD CLASS="trailer">CUPS i el seu logotip són marques registrades de
-<A HREF="http://www.apple.com">Apple Inc.</A> CUPS té copyright 2007-2012 d'Apple
+<A HREF="http://www.apple.com">Apple Inc.</A> CUPS té copyright 2007-2013 d'Apple
 Inc. Tots els drets reservats.</TD></TR>
 </TABLE>
 </BODY>
diff --git a/doc/cs/index.html.in b/doc/cs/index.html.in
new file mode 100644
index 00000000..38f4a6f4
--- /dev/null
+++ b/doc/cs/index.html.in
@@ -0,0 +1,107 @@
+<!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>Hlavní strana - 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;Hlavní strana&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/admin">&nbsp;&nbsp;Administrace&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/classes/">&nbsp;&nbsp;Třídy tiskáren&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/help/">&nbsp;&nbsp;Nápověda&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/jobs/">&nbsp;&nbsp;Úlohy&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/printers/">&nbsp;&nbsp;Tiskárny&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel" WIDTH="100%"><FORM ACTION="/help/" METHOD="GET"><INPUT
+TYPE="SEARCH" NAME="QUERY" SIZE="20" PLACEHOLDER="Hledat"
+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>CUPS je na bázi standardů otevřený zdrojový kód tiskového systému vyvinutý
+společností <A HREF="http://www.apple.com/">Apple Inc.</A> pro Mac OS<SUP>&reg;</SUP>
+X a jiné UNIX<SUP>&reg;</SUP>ové operační systémy.</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 pro uživatele</H2>
+
+<P><A HREF="help/overview.html">Popis CUPS</A></P>
+
+<P><A HREF="help/options.html">Příkazová řádka tisku a Možnosti</A></P>
+
+<P><A HREF="help/whatsnew.html">Co je nového v CUPS 1.6</A></P>
+
+<P><A HREF="http://www.cups.org/newsgroups.php?gcups.general">Uživatelské fórum</A></P>
+
+</TD><TD VALIGN="top" STYLE="border-right: dotted thin #cccccc; padding-left: 20px; padding-right: 20px;">
+
+<H2>CUPS pro administrátory</H2>
+
+<P><A HREF="admin">Přidání tiskáren a tříd</A></P>
+
+<P><A HREF="help/policies.html">Správa politik</A></P>
+
+<P><A HREF="help/accounting.html">Základní účtování tiskáren</A></P>
+
+<P><A HREF="help/security.html">Zabezpečení serveru</A></P>
+
+<P><A HREF="help/kerberos.html">Použití ověřování pomocí protokolu Kerberos</A></P>
+
+<P><A HREF="help/network.html">Použití síťových tiskáren</A></P>
+
+<P><A HREF="help/ref-cupsd-conf.html">Konfigurační soubor cupsd.conf</A></P>
+
+<P><A HREF="http://www.cups.org/ppd.php">Hedat ovladače tiskárny</A></P>
+
+</TD><TD VALIGN="top" STYLE="padding-left: 20px;">
+
+<H2>CUPS pro vývojáře</H2>
+
+<P><A HREF="help/api-overview.html">Úvod do CUPS programování</A></P>
+
+<P><A HREF="help/api-cups.html">CUPS API knihovny</A></P>
+
+<P><A HREF="help/api-filter.html">Programování filtrů a backendů</A></P>
+
+<P><A HREF="help/api-httpipp.html">HTTP a IPP API knihovny</A></P>
+
+<P><A HREF="help/api-ppd.html">PPD API knihovny</A></P>
+
+<P><A HREF="help/api-raster.html">Raster API knihovny</A></P>
+
+<P><A HREF="help/ref-ppdcfile.html">PPD kompilátor Driver Information File Reference</A></P>
+
+<P><A HREF="http://www.cups.org/newsgroups.php?gcups.development">Vývojářské fórum</A></P>
+
+</TD></TR>
+</TABLE>
+
+</TD></TR>
+<TR><TD>&nbsp;</TD></TR>
+<TR><TD CLASS="trailer">CUPS a logo CUPS jsou ochranné známky společnosti
+<A HREF="http://www.apple.com">Apple Inc.</A> CUPS je chráněn autorskými
+právy 2007-2013 Apple Inc. Všechna práva vyhrazena.</TD></TR>
+</TABLE>
+</BODY>
+</HTML>
diff --git a/doc/es/index.html.in b/doc/es/index.html.in
index 4c57ed5a..d4ef7975 100644
--- a/doc/es/index.html.in
+++ b/doc/es/index.html.in
@@ -101,7 +101,7 @@ HEIGHT="128" ALT="CUPS"></A></TD>
 <TR><TD>&nbsp;</TD></TR>
 <TR><TD CLASS="trailer">CUPS y el logo de CUPS son
 marcas registradas de <A HREF="http://www.apple.com">Apple Inc.</A> Los derechos
-de copia de CUPS 2007-2012 son de Apple Inc. Todos los derechos reservados.</TD></TR>
+de copia de CUPS 2007-2013 son de Apple Inc. Todos los derechos reservados.</TD></TR>
 </TABLE>
 </BODY>
 </HTML>
diff --git a/doc/fr/index.html.in b/doc/fr/index.html.in
new file mode 100644
index 00000000..3345a489
--- /dev/null
+++ b/doc/fr/index.html.in
@@ -0,0 +1,107 @@
+<!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>Accueil - 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;Accueil&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/admin">&nbsp;&nbsp;Administration&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/classes/">&nbsp;&nbsp;Classes&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/help/">&nbsp;&nbsp;Aide&nbsp;En&nbsp;Ligne&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/jobs/">&nbsp;&nbsp;T&acirc;ches&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/printers/">&nbsp;&nbsp;Imprimantes&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel" WIDTH="100%"><FORM ACTION="/help/" METHOD="GET"><INPUT
+TYPE="SEARCH" NAME="QUERY" SIZE="20" PLACEHOLDER="Search Help"
+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>CUPS est le syst&egrave;me d'impression Open Source, bas&eacute; sur des standards, d&eacute;velopp&eacute; par
+<A HREF="http://www.apple.com/">Apple Inc.</A> pour Mac OS<SUP>&reg;</SUP> X et
+les autres OS UNIX<SUP>&reg;</SUP>-like.</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 pour les utilisateurs</H2>
+
+<P><A HREF="help/overview.html">Pr&eacute;sentation de CUPS</A></P>
+
+<P><A HREF="help/options.html">Impression en ligne de commande et options</A></P>
+
+<P><A HREF="help/whatsnew.html">Quoi de neuf dans CUPS 1.6</A></P>
+
+<P><A HREF="http://www.cups.org/newsgroups.php?gcups.general">Forum utilisateur</A></P>
+
+</TD><TD VALIGN="top" STYLE="border-right: dotted thin #cccccc; padding-left: 20px; padding-right: 20px;">
+
+<H2>CUPS pour les administrateurs</H2>
+
+<P><A HREF="admin">Ajout d'imprimantes et de classes</A></P>
+
+<P><A HREF="help/policies.html">G&eacute;rer les politiques</A></P>
+
+<P><A HREF="help/accounting.html">Printer Accounting Basics</A></P>
+
+<P><A HREF="help/security.html">S&eacute;curit&eacute; du serveur</A></P>
+
+<P><A HREF="help/kerberos.html">Utiliser l'authentification Kerberos</A></P>
+
+<P><A HREF="help/network.html">Utiliser des imprimantes r&eacute;seaux</A></P>
+
+<P><A HREF="help/ref-cupsd-conf.html">R&eacute;f&eacute;rences sur cupsd.conf</A></P>
+
+<P><A HREF="http://www.cups.org/ppd.php">Trouver des pilotes d'imprimantes</A></P>
+
+</TD><TD VALIGN="top" STYLE="padding-left: 20px;">
+
+<H2>CUPS pour les d&eacute;veloppeurs</H2>
+
+<P><A HREF="help/api-overview.html">Introduction &agrave; la programmation CUPS</A></P>
+
+<P><A HREF="help/api-cups.html">L'API CUPS</A></P>
+
+<P><A HREF="help/api-filter.html">Programmation de filtres et de backends</A></P>
+
+<P><A HREF="help/api-httpipp.html">Les API HTTP et IPP</A></P>
+
+<P><A HREF="help/api-ppd.html">L'API PPD</A></P>
+
+<P><A HREF="help/api-raster.html">L'API Raster</A></P>
+
+<P><A HREF="help/ref-ppdcfile.html">PPD Compiler Driver Information File Reference</A></P>
+
+<P><A HREF="http://www.cups.org/newsgroups.php?gcups.development">Forum d&eacute;veloppeurs</A></P>
+
+</TD></TR>
+</TABLE>
+
+</TD></TR>
+<TR><TD>&nbsp;</TD></TR>
+<TR><TD CLASS="trailer">CUPS et le logo CUPS sont des marques d&eacute;pos&eacute;es de
+<A HREF="http://www.apple.com">Apple Inc.</A> CUPS est sous copyright 2007-2013 Apple
+Inc. Tous droits r&eacute;serv&eacute;s.</TD></TR>
+</TABLE>
+</BODY>
+</HTML>
diff --git a/doc/help/api-cups.html b/doc/help/api-cups.html
index 2d6c7882..22e4f30f 100644
--- a/doc/help/api-cups.html
+++ b/doc/help/api-cups.html
@@ -341,7 +341,7 @@ div.contents ul.subcontents li {
 <body>
 <div class='body'>
 <!--
-  "$Id: api-cups.html 10507 2012-05-23 22:39:50Z mike $"
+  "$Id: api-cups.html 10584 2012-08-29 19:52:16Z mike $"
 
   CUPS API header for CUPS.
 
@@ -391,23 +391,34 @@ div.contents ul.subcontents li {
 	<li><a href="#PASSWORDS_AND_AUTHENTICATION">Passwords and Authentication</a></li>
 </ul></li>
 <li><a href="#FUNCTIONS">Functions</a><ul class="code">
-	<li><a href="#appleGetPaperSize" title="Get the default paper size.">appleGetPaperSize</a></li>
 	<li><a href="#cupsAddDest" title="Add a destination to the list of destinations.">cupsAddDest</a></li>
 	<li><a href="#cupsAddOption" title="Add an option to an option array.">cupsAddOption</a></li>
 	<li><a href="#cupsAdminCreateWindowsPPD" title="Create the Windows PPD file for a printer.">cupsAdminCreateWindowsPPD</a></li>
 	<li><a href="#cupsAdminExportSamba" title="Export a printer to Samba.">cupsAdminExportSamba</a></li>
 	<li><a href="#cupsAdminGetServerSettings" title="Get settings from the server.">cupsAdminGetServerSettings</a></li>
 	<li><a href="#cupsAdminSetServerSettings" title="Set settings on the server.">cupsAdminSetServerSettings</a></li>
+	<li><a href="#cupsCancelDestJob" title="Include necessary headers...">cupsCancelDestJob</a></li>
 	<li><a href="#cupsCancelJob" title="Cancel a print job on the default server.">cupsCancelJob</a></li>
 	<li><a href="#cupsCancelJob2" title="Cancel or purge a print job.">cupsCancelJob2</a></li>
+	<li><a href="#cupsCheckDestSupported" title="Check that the option and value are supported
+by the destination.">cupsCheckDestSupported</a></li>
+	<li><a href="#cupsCloseDestJob" title="Close a job and start printing.">cupsCloseDestJob</a></li>
 	<li><a href="#cupsConnectDest" title="Connect to the server for a destination.">cupsConnectDest</a></li>
 	<li><a href="#cupsConnectDestBlock" title="Connect to the server for a destination.">cupsConnectDestBlock</a></li>
 	<li><a href="#cupsCopyDest" title="Callback block">cupsCopyDest</a></li>
+	<li><a href="#cupsCopyDestConflicts" title="Get conflicts and resolutions for a new
+option/value pair.">cupsCopyDestConflicts</a></li>
+	<li><a href="#cupsCopyDestInfo" title="Get the supported values/capabilities for the
+destination.">cupsCopyDestInfo</a></li>
+	<li><a href="#cupsCreateDestJob" title="Create a job on a destination.">cupsCreateDestJob</a></li>
 	<li><a href="#cupsCreateJob" title="Create an empty job for streaming.">cupsCreateJob</a></li>
 	<li><a href="#cupsEncryption" title="Get the current encryption settings.">cupsEncryption</a></li>
 	<li><a href="#cupsEnumDests" title="Enumerate available destinations with a callback function.">cupsEnumDests</a></li>
 	<li><a href="#cupsEnumDestsBlock" title="Enumerate available destinations with a block.">cupsEnumDestsBlock</a></li>
+	<li><a href="#cupsFinishDestDocument" title="Finish the current document.">cupsFinishDestDocument</a></li>
 	<li><a href="#cupsFinishDocument" title="Finish sending a document.">cupsFinishDocument</a></li>
+	<li><a href="#cupsFreeDestInfo" title="Free destination information obtained using
+cupsCopyDestInfo.">cupsFreeDestInfo</a></li>
 	<li><a href="#cupsFreeDests" title="Free the memory used by the list of destinations.">cupsFreeDests</a></li>
 	<li><a href="#cupsFreeJobs" title="Free memory used by job data.">cupsFreeJobs</a></li>
 	<li><a href="#cupsFreeOptions" title="Free all memory used by options.">cupsFreeOptions</a></li>
@@ -415,6 +426,8 @@ div.contents ul.subcontents li {
 	<li><a href="#cupsGetDefault" title="Get the default printer or class for the default server.">cupsGetDefault</a></li>
 	<li><a href="#cupsGetDefault2" title="Get the default printer or class for the specified server.">cupsGetDefault2</a></li>
 	<li><a href="#cupsGetDest" title="Get the named destination from the list.">cupsGetDest</a></li>
+	<li><a href="#cupsGetDestMediaByName" title="Get media names, dimensions, and margins.">cupsGetDestMediaByName</a></li>
+	<li><a href="#cupsGetDestMediaBySize" title="Get media names, dimensions, and margins.">cupsGetDestMediaBySize</a></li>
 	<li><a href="#cupsGetDests" title="Get the list of destinations from the default server.">cupsGetDests</a></li>
 	<li><a href="#cupsGetDests2" title="Get the list of destinations from the specified server.">cupsGetDests2</a></li>
 	<li><a href="#cupsGetJobs" title="Get the jobs from the default server.">cupsGetJobs</a></li>
@@ -436,6 +449,10 @@ for the given language.">cupsLangEncoding</a></li>
 	<li><a href="#cupsLangFlush" title="Flush all language data out of the cache.">cupsLangFlush</a></li>
 	<li><a href="#cupsLangFree" title="Free language data.">cupsLangFree</a></li>
 	<li><a href="#cupsLangGet" title="Get a language.">cupsLangGet</a></li>
+	<li><a href="#cupsLocalizeDestOption" title="Get the localized string for a destination
+option.">cupsLocalizeDestOption</a></li>
+	<li><a href="#cupsLocalizeDestValue" title="Get the localized string for a destination
+option+value pair.">cupsLocalizeDestValue</a></li>
 	<li><a href="#cupsNotifySubject" title="Return the subject for the given notification message.">cupsNotifySubject</a></li>
 	<li><a href="#cupsNotifyText" title="Return the text for the given notification message.">cupsNotifyText</a></li>
 	<li><a href="#cupsParseOptions" title="Parse options from a command-line argument.">cupsParseOptions</a></li>
@@ -461,6 +478,7 @@ connections.">cupsSetCredentials</a></li>
 	<li><a href="#cupsSetServer" title="Set the default server name and port.">cupsSetServer</a></li>
 	<li><a href="#cupsSetServerCertCB" title="Set the server certificate callback.">cupsSetServerCertCB</a></li>
 	<li><a href="#cupsSetUser" title="Set the default user name.">cupsSetUser</a></li>
+	<li><a href="#cupsStartDestDocument" title="Start a new document.">cupsStartDestDocument</a></li>
 	<li><a href="#cupsStartDocument" title="Add a document to a job created with cupsCreateJob().">cupsStartDocument</a></li>
 	<li><a href="#cupsTempFd" title="Creates a temporary file.">cupsTempFd</a></li>
 	<li><a href="#cupsTempFile" title="Generates a temporary filename.">cupsTempFile</a></li>
@@ -506,7 +524,7 @@ constants">cups_ptype_e</a></li>
 </ul></li>
 </ul>
 <!--
-  "$Id: api-cups.html 10507 2012-05-23 22:39:50Z mike $"
+  "$Id: api-cups.html 10584 2012-08-29 19:52:16Z mike $"
 
   API introduction for CUPS.
 
@@ -949,22 +967,6 @@ fields for the username and password. The username should default to the
 string returned by the <a href="#cupsUser"><code>cupsUser</code></a>
 function.</p>
 <h2 class="title"><a name="FUNCTIONS">Functions</a></h2>
-<h3 class="function"><a name="appleGetPaperSize">appleGetPaperSize</a></h3>
-<p class="description">Get the default paper size.</p>
-<p class="code">
-char *appleGetPaperSize (<br>
-&nbsp;&nbsp;&nbsp;&nbsp;char *name,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;int namesize<br>
-);</p>
-<h4 class="parameters">Parameters</h4>
-<dl>
-<dt>name</dt>
-<dd class="description">Paper size name buffer</dd>
-<dt>namesize</dt>
-<dd class="description">Size of buffer</dd>
-</dl>
-<h4 class="returnvalue">Return Value</h4>
-<p class="description">Default paper size</p>
 <h3 class="function"><a name="cupsAddDest">cupsAddDest</a></h3>
 <p class="description">Add a destination to the list of destinations.</p>
 <p class="code">
@@ -1116,6 +1118,31 @@ int cupsAdminSetServerSettings (<br>
 </dl>
 <h4 class="returnvalue">Return Value</h4>
 <p class="description">1 on success, 0 on failure</p>
+<h3 class="function"><a name="cupsCancelDestJob">cupsCancelDestJob</a></h3>
+<p class="description">Include necessary headers...</p>
+<p class="code">
+ipp_status_t cupsCancelDestJob (<br>
+&nbsp;&nbsp;&nbsp;&nbsp;http_t *http,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_dest_t">cups_dest_t</a> *dest,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;int job_id<br>
+);</p>
+<h4 class="parameters">Parameters</h4>
+<dl>
+<dt>http</dt>
+<dd class="description">Connection to destination</dd>
+<dt>dest</dt>
+<dd class="description">Destination</dd>
+<dt>job_id</dt>
+<dd class="description">Job ID</dd>
+</dl>
+<h4 class="returnvalue">Return Value</h4>
+<p class="description">Cancel a job on a destination.</p>
+<p class="discussion">The &quot;job_id&quot; is the number returned by cupsCreateDestJob.<br>
+<br>
+Returns IPP_OK on success and IPP_NOT_AUTHORIZED or IPP_FORBIDDEN on
+failure.
+
+</p>
 <h3 class="function"><a name="cupsCancelJob">cupsCancelJob</a></h3>
 <p class="description">Cancel a print job on the default server.</p>
 <p class="code">
@@ -1171,6 +1198,64 @@ Use the <a href="#cupsLastError"><code>cupsLastError</code></a> and <a href="#cu
 the cause of any failure.
 
 </p>
+<h3 class="function"><span class="info">&nbsp;CUPS 1.6/OS X 10.8&nbsp;</span><a name="cupsCheckDestSupported">cupsCheckDestSupported</a></h3>
+<p class="description">Check that the option and value are supported
+by the destination.</p>
+<p class="code">
+int cupsCheckDestSupported (<br>
+&nbsp;&nbsp;&nbsp;&nbsp;http_t *http,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_dest_t">cups_dest_t</a> *dest,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_dinfo_t">cups_dinfo_t</a> *dinfo,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;const char *option,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;const char *value<br>
+);</p>
+<h4 class="parameters">Parameters</h4>
+<dl>
+<dt>http</dt>
+<dd class="description">Connection to destination</dd>
+<dt>dest</dt>
+<dd class="description">Destination</dd>
+<dt>dinfo</dt>
+<dd class="description">Destination information</dd>
+<dt>option</dt>
+<dd class="description">Option</dd>
+<dt>value</dt>
+<dd class="description">Value</dd>
+</dl>
+<h4 class="returnvalue">Return Value</h4>
+<p class="description">1 if supported, 0 otherwise</p>
+<h4 class="discussion">Discussion</h4>
+<p class="discussion">Returns 1 if supported, 0 otherwise.
+
+</p>
+<h3 class="function"><span class="info">&nbsp;CUPS 1.6/OS X 10.8&nbsp;</span><a name="cupsCloseDestJob">cupsCloseDestJob</a></h3>
+<p class="description">Close a job and start printing.</p>
+<p class="code">
+ipp_status_t cupsCloseDestJob (<br>
+&nbsp;&nbsp;&nbsp;&nbsp;http_t *http,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_dest_t">cups_dest_t</a> *dest,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_dinfo_t">cups_dinfo_t</a> *info,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;int job_id<br>
+);</p>
+<h4 class="parameters">Parameters</h4>
+<dl>
+<dt>http</dt>
+<dd class="description">Connection to destination</dd>
+<dt>dest</dt>
+<dd class="description">Destination</dd>
+<dt>info</dt>
+<dd class="description">Destination information</dd>
+<dt>job_id</dt>
+<dd class="description">Job ID</dd>
+</dl>
+<h4 class="returnvalue">Return Value</h4>
+<p class="description">IPP status code</p>
+<h4 class="discussion">Discussion</h4>
+<p class="discussion">Use when the last call to cupsStartDocument passed 0 for &quot;last_document&quot;.
+&quot;job_id&quot; is the job ID returned by cupsCreateDestJob. Returns <code>IPP_OK</code>
+on success.
+
+</p>
 <h3 class="function"><span class="info">&nbsp;CUPS 1.6/OS X 10.8&nbsp;</span><a name="cupsConnectDest">cupsConnectDest</a></h3>
 <p class="description">Connect to the server for a destination.</p>
 <p class="code">
@@ -1273,6 +1358,125 @@ copy) - for use with the cupsEnumDests* functions. The caller is responsible
 for calling cupsFreeDests() on the returned object(s).
 
 </p>
+<h3 class="function"><span class="info">&nbsp;CUPS 1.6/OS X 10.8&nbsp;</span><a name="cupsCopyDestConflicts">cupsCopyDestConflicts</a></h3>
+<p class="description">Get conflicts and resolutions for a new
+option/value pair.</p>
+<p class="code">
+int cupsCopyDestConflicts (<br>
+&nbsp;&nbsp;&nbsp;&nbsp;http_t *http,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_dest_t">cups_dest_t</a> *dest,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_dinfo_t">cups_dinfo_t</a> *dinfo,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;int num_options,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_option_t">cups_option_t</a> *options,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;const char *new_option,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;const char *new_value,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;int *num_conflicts,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_option_t">cups_option_t</a> **conflicts,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;int *num_resolved,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_option_t">cups_option_t</a> **resolved<br>
+);</p>
+<h4 class="parameters">Parameters</h4>
+<dl>
+<dt>http</dt>
+<dd class="description">Connection to destination</dd>
+<dt>dest</dt>
+<dd class="description">Destination</dd>
+<dt>dinfo</dt>
+<dd class="description">Destination information</dd>
+<dt>num_options</dt>
+<dd class="description">Number of current options</dd>
+<dt>options</dt>
+<dd class="description">Current options</dd>
+<dt>new_option</dt>
+<dd class="description">New option</dd>
+<dt>new_value</dt>
+<dd class="description">New value</dd>
+<dt>num_conflicts</dt>
+<dd class="description">Number of conflicting options</dd>
+<dt>conflicts</dt>
+<dd class="description">Conflicting options</dd>
+<dt>num_resolved</dt>
+<dd class="description">Number of options to resolve</dd>
+<dt>resolved</dt>
+<dd class="description">Resolved options</dd>
+</dl>
+<h4 class="returnvalue">Return Value</h4>
+<p class="description">1 if there is a conflict, 0 if none, -1 on error</p>
+<h4 class="discussion">Discussion</h4>
+<p class="discussion">&quot;num_options&quot; and &quot;options&quot; represent the currently selected options by the
+user.  &quot;new_option&quot; and &quot;new_value&quot; are the setting the user has just
+changed.<br>
+<br>
+Returns 1 if there is a conflict, 0 if there are no conflicts, and -1 if
+there was an unrecoverable error such as a resolver loop.<br>
+<br>
+If &quot;num_conflicts&quot; and &quot;conflicts&quot; are not <code>NULL</code>, they are set to
+contain the list of conflicting option/value pairs.  Similarly, if
+&quot;num_resolved&quot; and &quot;resolved&quot; are not <code>NULL</code> they will be set to the
+list of changes needed to resolve the conflict.<br>
+<br>
+If cupsCopyDestConflicts returns 1 but &quot;num_resolved&quot; and &quot;resolved&quot; are set
+to 0 and <code>NULL</code>, respectively, then the conflict cannot be resolved.
+
+</p>
+<h3 class="function"><span class="info">&nbsp;CUPS 1.6/OS X 10.8&nbsp;</span><a name="cupsCopyDestInfo">cupsCopyDestInfo</a></h3>
+<p class="description">Get the supported values/capabilities for the
+destination.</p>
+<p class="code">
+<a href="#cups_dinfo_t">cups_dinfo_t</a> *cupsCopyDestInfo (<br>
+&nbsp;&nbsp;&nbsp;&nbsp;http_t *http,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_dest_t">cups_dest_t</a> *dest<br>
+);</p>
+<h4 class="parameters">Parameters</h4>
+<dl>
+<dt>http</dt>
+<dd class="description">Connection to destination</dd>
+<dt>dest</dt>
+<dd class="description">Destination</dd>
+</dl>
+<h4 class="returnvalue">Return Value</h4>
+<p class="description">Destination information</p>
+<h4 class="discussion">Discussion</h4>
+<p class="discussion">The caller is responsible for calling <a href="#cupsFreeDestInfo"><code>cupsFreeDestInfo</code></a> on the return
+value. <code>NULL</code> is returned on error.
+
+</p>
+<h3 class="function"><span class="info">&nbsp;CUPS 1.6/OS X 10.8&nbsp;</span><a name="cupsCreateDestJob">cupsCreateDestJob</a></h3>
+<p class="description">Create a job on a destination.</p>
+<p class="code">
+ipp_status_t cupsCreateDestJob (<br>
+&nbsp;&nbsp;&nbsp;&nbsp;http_t *http,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_dest_t">cups_dest_t</a> *dest,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_dinfo_t">cups_dinfo_t</a> *info,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;int *job_id,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;const char *title,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;int num_options,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_option_t">cups_option_t</a> *options<br>
+);</p>
+<h4 class="parameters">Parameters</h4>
+<dl>
+<dt>http</dt>
+<dd class="description">Connection to destination</dd>
+<dt>dest</dt>
+<dd class="description">Destination</dd>
+<dt>info</dt>
+<dd class="description">Destination information</dd>
+<dt>job_id</dt>
+<dd class="description">Job ID or 0 on error</dd>
+<dt>title</dt>
+<dd class="description">Job name</dd>
+<dt>num_options</dt>
+<dd class="description">Number of job options</dd>
+<dt>options</dt>
+<dd class="description">Job options</dd>
+</dl>
+<h4 class="returnvalue">Return Value</h4>
+<p class="description">IPP status code</p>
+<h4 class="discussion">Discussion</h4>
+<p class="discussion">Returns <code>IPP_OK</code> or <code>IPP_OK_SUBST</code> on success, saving the job ID
+in the variable pointed to by &quot;job_id&quot;.
+
+</p>
 <h3 class="function"><span class="info">&nbsp;CUPS 1.4/OS X 10.6&nbsp;</span><a name="cupsCreateJob">cupsCreateJob</a></h3>
 <p class="description">Create an empty job for streaming.</p>
 <p class="code">
@@ -1402,6 +1606,29 @@ Enumeration happens on the current thread and does not return until all
 destinations have been enumerated or the block returns 0.
 
 </p>
+<h3 class="function"><span class="info">&nbsp;CUPS 1.6/OS X 10.8&nbsp;</span><a name="cupsFinishDestDocument">cupsFinishDestDocument</a></h3>
+<p class="description">Finish the current document.</p>
+<p class="code">
+ipp_status_t cupsFinishDestDocument (<br>
+&nbsp;&nbsp;&nbsp;&nbsp;http_t *http,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_dest_t">cups_dest_t</a> *dest,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_dinfo_t">cups_dinfo_t</a> *info<br>
+);</p>
+<h4 class="parameters">Parameters</h4>
+<dl>
+<dt>http</dt>
+<dd class="description">Connection to destination</dd>
+<dt>dest</dt>
+<dd class="description">Destination</dd>
+<dt>info</dt>
+<dd class="description">Destination information</dd>
+</dl>
+<h4 class="returnvalue">Return Value</h4>
+<p class="description">Status of document submission</p>
+<h4 class="discussion">Discussion</h4>
+<p class="discussion">Returns <code>IPP_OK</code> or <code>IPP_OK_SUBST</code> on success.
+
+</p>
 <h3 class="function"><span class="info">&nbsp;CUPS 1.4/OS X 10.6&nbsp;</span><a name="cupsFinishDocument">cupsFinishDocument</a></h3>
 <p class="description">Finish sending a document.</p>
 <p class="code">
@@ -1422,6 +1649,18 @@ ipp_status_t cupsFinishDocument (<br>
 <p class="discussion">The document must have been started using <a href="#cupsStartDocument"><code>cupsStartDocument</code></a>.
 
 </p>
+<h3 class="function"><a name="cupsFreeDestInfo">cupsFreeDestInfo</a></h3>
+<p class="description">Free destination information obtained using
+<a href="#cupsCopyDestInfo"><code>cupsCopyDestInfo</code></a>.</p>
+<p class="code">
+void cupsFreeDestInfo (<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_dinfo_t">cups_dinfo_t</a> *dinfo<br>
+);</p>
+<h4 class="parameters">Parameters</h4>
+<dl>
+<dt>dinfo</dt>
+<dd class="description">Destination information</dd>
+</dl>
 <h3 class="function"><a name="cupsFreeDests">cupsFreeDests</a></h3>
 <p class="description">Free the memory used by the list of destinations.</p>
 <p class="code">
@@ -1541,6 +1780,99 @@ not support the lpoptions-defined default printer.
 <h4 class="discussion">Discussion</h4>
 <p class="discussion">Use the <a href="#cupsGetDests"><code>cupsGetDests</code></a> or <a href="#cupsGetDests2"><code>cupsGetDests2</code></a> functions to get a
 list of supported destinations for the current user.</p>
+<h3 class="function"><span class="info">&nbsp;CUPS 1.6/OS X 10.8&nbsp;</span><a name="cupsGetDestMediaByName">cupsGetDestMediaByName</a></h3>
+<p class="description">Get media names, dimensions, and margins.</p>
+<p class="code">
+int cupsGetDestMediaByName (<br>
+&nbsp;&nbsp;&nbsp;&nbsp;http_t *http,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_dest_t">cups_dest_t</a> *dest,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_dinfo_t">cups_dinfo_t</a> *dinfo,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;const char *media,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;unsigned flags,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_size_t">cups_size_t</a> *size<br>
+);</p>
+<h4 class="parameters">Parameters</h4>
+<dl>
+<dt>http</dt>
+<dd class="description">Connection to destination</dd>
+<dt>dest</dt>
+<dd class="description">Destination</dd>
+<dt>dinfo</dt>
+<dd class="description">Destination information</dd>
+<dt>media</dt>
+<dd class="description">Media name</dd>
+<dt>flags</dt>
+<dd class="description">Media matching flags</dd>
+<dt>size</dt>
+<dd class="description">Media size information</dd>
+</dl>
+<h4 class="returnvalue">Return Value</h4>
+<p class="description">1 on match, 0 on failure</p>
+<h4 class="discussion">Discussion</h4>
+<p class="discussion">The &quot;media&quot; string is a PWG media name.  &quot;Flags&quot; provides some matching
+guidance (multiple flags can be combined):<br>
+<br>
+CUPS_MEDIA_FLAGS_DEFAULT    = find the closest size supported by the printer,
+CUPS_MEDIA_FLAGS_BORDERLESS = find a borderless size,
+CUPS_MEDIA_FLAGS_DUPLEX     = find a size compatible with 2-sided printing,
+CUPS_MEDIA_FLAGS_EXACT      = find an exact match for the size, and
+CUPS_MEDIA_FLAGS_READY      = if the printer supports media sensing, find the
+size amongst the &quot;ready&quot; media.<br>
+<br>
+The matching result (if any) is returned in the &quot;cups_size_t&quot; structure.<br>
+<br>
+Returns 1 when there is a match and 0 if there is not a match.
+
+</p>
+<h3 class="function"><span class="info">&nbsp;CUPS 1.6/OS X 10.8&nbsp;</span><a name="cupsGetDestMediaBySize">cupsGetDestMediaBySize</a></h3>
+<p class="description">Get media names, dimensions, and margins.</p>
+<p class="code">
+int cupsGetDestMediaBySize (<br>
+&nbsp;&nbsp;&nbsp;&nbsp;http_t *http,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_dest_t">cups_dest_t</a> *dest,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_dinfo_t">cups_dinfo_t</a> *dinfo,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;int width,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;int length,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;unsigned flags,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_size_t">cups_size_t</a> *size<br>
+);</p>
+<h4 class="parameters">Parameters</h4>
+<dl>
+<dt>http</dt>
+<dd class="description">Connection to destination</dd>
+<dt>dest</dt>
+<dd class="description">Destination</dd>
+<dt>dinfo</dt>
+<dd class="description">Destination information</dd>
+<dt>width</dt>
+<dd class="description">Media width in hundredths of
+of millimeters</dd>
+<dt>length</dt>
+<dd class="description">Media length in hundredths of
+of millimeters</dd>
+<dt>flags</dt>
+<dd class="description">Media matching flags</dd>
+<dt>size</dt>
+<dd class="description">Media size information</dd>
+</dl>
+<h4 class="returnvalue">Return Value</h4>
+<p class="description">1 on match, 0 on failure</p>
+<h4 class="discussion">Discussion</h4>
+<p class="discussion">&quot;Width&quot; and &quot;length&quot; are the dimensions in hundredths of millimeters.
+&quot;Flags&quot; provides some matching guidance (multiple flags can be combined):<br>
+<br>
+CUPS_MEDIA_FLAGS_DEFAULT    = find the closest size supported by the printer,
+CUPS_MEDIA_FLAGS_BORDERLESS = find a borderless size,
+CUPS_MEDIA_FLAGS_DUPLEX     = find a size compatible with 2-sided printing,
+CUPS_MEDIA_FLAGS_EXACT      = find an exact match for the size, and
+CUPS_MEDIA_FLAGS_READY      = if the printer supports media sensing, find the
+size amongst the &quot;ready&quot; media.<br>
+<br>
+The matching result (if any) is returned in the &quot;cups_size_t&quot; structure.<br>
+<br>
+Returns 1 when there is a match and 0 if there is not a match.
+
+</p>
 <h3 class="function"><a name="cupsGetDests">cupsGetDests</a></h3>
 <p class="description">Get the list of destinations from the default server.</p>
 <p class="code">
@@ -1945,6 +2277,65 @@ cups_lang_t *cupsLangGet (<br>
 </dl>
 <h4 class="returnvalue">Return Value</h4>
 <p class="description">Language data</p>
+<h3 class="function"><span class="info">&nbsp;CUPS 1.6/OS X 10.8&nbsp;</span><a name="cupsLocalizeDestOption">cupsLocalizeDestOption</a></h3>
+<p class="description">Get the localized string for a destination
+option.</p>
+<p class="code">
+const char *cupsLocalizeDestOption (<br>
+&nbsp;&nbsp;&nbsp;&nbsp;http_t *http,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_dest_t">cups_dest_t</a> *dest,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_dinfo_t">cups_dinfo_t</a> *dinfo,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;const char *option<br>
+);</p>
+<h4 class="parameters">Parameters</h4>
+<dl>
+<dt>http</dt>
+<dd class="description">Connection to destination</dd>
+<dt>dest</dt>
+<dd class="description">Destination</dd>
+<dt>dinfo</dt>
+<dd class="description">Destination information</dd>
+<dt>option</dt>
+<dd class="description">Option to localize</dd>
+</dl>
+<h4 class="returnvalue">Return Value</h4>
+<p class="description">Localized string</p>
+<h4 class="discussion">Discussion</h4>
+<p class="discussion">The returned string is stored in the destination information and will become
+invalid if the destination information is deleted.
+
+</p>
+<h3 class="function"><span class="info">&nbsp;CUPS 1.6/OS X 10.8&nbsp;</span><a name="cupsLocalizeDestValue">cupsLocalizeDestValue</a></h3>
+<p class="description">Get the localized string for a destination
+option+value pair.</p>
+<p class="code">
+const char *cupsLocalizeDestValue (<br>
+&nbsp;&nbsp;&nbsp;&nbsp;http_t *http,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_dest_t">cups_dest_t</a> *dest,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_dinfo_t">cups_dinfo_t</a> *dinfo,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;const char *option,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;const char *value<br>
+);</p>
+<h4 class="parameters">Parameters</h4>
+<dl>
+<dt>http</dt>
+<dd class="description">Connection to destination</dd>
+<dt>dest</dt>
+<dd class="description">Destination</dd>
+<dt>dinfo</dt>
+<dd class="description">Destination information</dd>
+<dt>option</dt>
+<dd class="description">Option to localize</dd>
+<dt>value</dt>
+<dd class="description">Value to localize</dd>
+</dl>
+<h4 class="returnvalue">Return Value</h4>
+<p class="description">Localized string</p>
+<h4 class="discussion">Discussion</h4>
+<p class="discussion">The returned string is stored in the destination information and will become
+invalid if the destination information is deleted.
+
+</p>
 <h3 class="function"><span class="info">&nbsp;CUPS 1.2/OS X 10.5&nbsp;</span><a name="cupsNotifySubject">cupsNotifySubject</a></h3>
 <p class="description">Return the subject for the given notification message.</p>
 <p class="code">
@@ -2420,6 +2811,52 @@ void cupsSetUser (<br>
 Note: The current user name is tracked separately for each thread in a
 program. Multi-threaded programs that override the user name need to do so
 in each thread for the same user name to be used.</p>
+<h3 class="function"><span class="info">&nbsp;CUPS 1.6/OS X 10.8&nbsp;</span><a name="cupsStartDestDocument">cupsStartDestDocument</a></h3>
+<p class="description">Start a new document.</p>
+<p class="code">
+http_status_t cupsStartDestDocument (<br>
+&nbsp;&nbsp;&nbsp;&nbsp;http_t *http,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_dest_t">cups_dest_t</a> *dest,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_dinfo_t">cups_dinfo_t</a> *info,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;int job_id,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;const char *docname,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;const char *format,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;int num_options,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_option_t">cups_option_t</a> *options,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;int last_document<br>
+);</p>
+<h4 class="parameters">Parameters</h4>
+<dl>
+<dt>http</dt>
+<dd class="description">Connection to destination</dd>
+<dt>dest</dt>
+<dd class="description">Destination</dd>
+<dt>info</dt>
+<dd class="description">Destination information</dd>
+<dt>job_id</dt>
+<dd class="description">Job ID</dd>
+<dt>docname</dt>
+<dd class="description">Document name</dd>
+<dt>format</dt>
+<dd class="description">Document format</dd>
+<dt>num_options</dt>
+<dd class="description">Number of document options</dd>
+<dt>options</dt>
+<dd class="description">Document options</dd>
+<dt>last_document</dt>
+<dd class="description">1 if this is the last document</dd>
+</dl>
+<h4 class="returnvalue">Return Value</h4>
+<p class="description">Status of document creation</p>
+<h4 class="discussion">Discussion</h4>
+<p class="discussion">&quot;job_id&quot; is the job ID returned by cupsCreateDestJob.  &quot;docname&quot; is the name
+of the document/file being printed, &quot;format&quot; is the MIME media type for the
+document (see CUPS_FORMAT_xxx constants), and &quot;num_options&quot; and &quot;options&quot;
+are the options do be applied to the document. &quot;last_document&quot; should be 1
+if this is the last document to be submitted in the job.  Returns
+<code>HTTP_CONTINUE</code> on success.
+
+</p>
 <h3 class="function"><span class="info">&nbsp;CUPS 1.4/OS X 10.6&nbsp;</span><a name="cupsStartDocument">cupsStartDocument</a></h3>
 <p class="description">Add a document to a job created with cupsCreateJob().</p>
 <p class="code">
diff --git a/doc/help/api-httpipp.html b/doc/help/api-httpipp.html
index a49f6d94..d1ea823f 100644
--- a/doc/help/api-httpipp.html
+++ b/doc/help/api-httpipp.html
@@ -341,7 +341,7 @@ div.contents ul.subcontents li {
 <body>
 <div class='body'>
 <!--
-  "$Id: api-httpipp.html 10424 2012-04-23 17:26:57Z mike $"
+  "$Id: api-httpipp.html 10589 2012-08-30 23:01:44Z mike $"
 
   HTTP and IPP API header for CUPS.
 
@@ -395,8 +395,10 @@ div.contents ul.subcontents li {
 	<li><a href="#cupsGetFd" title="Get a file from the server.">cupsGetFd</a></li>
 	<li><a href="#cupsGetFile" title="Get a file from the server.">cupsGetFile</a></li>
 	<li><a href="#cupsGetResponse" title="Get a response to an IPP request.">cupsGetResponse</a></li>
-	<li><a href="#cupsLastError" title="Return the last IPP status code.">cupsLastError</a></li>
-	<li><a href="#cupsLastErrorString" title="Return the last IPP status-message.">cupsLastErrorString</a></li>
+	<li><a href="#cupsLastError" title="Return the last IPP status code received on the current
+thread.">cupsLastError</a></li>
+	<li><a href="#cupsLastErrorString" title="Return the last IPP status-message received on the
+current thread.">cupsLastErrorString</a></li>
 	<li><a href="#cupsPutFd" title="Put a file on the server.">cupsPutFd</a></li>
 	<li><a href="#cupsPutFile" title="Put a file on the server.">cupsPutFile</a></li>
 	<li><a href="#cupsReadResponseData" title="Read additional data after the IPP response.">cupsReadResponseData</a></li>
@@ -646,7 +648,7 @@ are server-oriented...">http_state_e</a></li>
 </ul></li>
 </ul>
 <!--
-  "$Id: api-httpipp.html 10424 2012-04-23 17:26:57Z mike $"
+  "$Id: api-httpipp.html 10589 2012-08-30 23:01:44Z mike $"
 
   HTTP and IPP API introduction for CUPS.
 
@@ -1010,9 +1012,9 @@ status, prior to resubmitting your request.
 <h4 class="returnvalue">Return Value</h4>
 <p class="description">Response data</p>
 <h4 class="discussion">Discussion</h4>
-<p class="discussion">This function sends the IPP request to the specified server, retrying
-and authenticating as necessary.  The request is freed with <a href="#ippDelete"><code>ippDelete</code></a>
-after receiving a valid IPP response.</p>
+<p class="discussion">This function sends the IPP request and attached file to the specified
+server, retrying and authenticating as necessary.  The request is freed with
+<a href="#ippDelete"><code>ippDelete</code></a>.</p>
 <h3 class="function"><span class="info">&nbsp;CUPS 1.3/OS X 10.5&nbsp;</span><a name="cupsDoIORequest">cupsDoIORequest</a></h3>
 <p class="description">Do an IPP request with file descriptors.</p>
 <p class="code">
@@ -1039,14 +1041,14 @@ after receiving a valid IPP response.</p>
 <h4 class="returnvalue">Return Value</h4>
 <p class="description">Response data</p>
 <h4 class="discussion">Discussion</h4>
-<p class="discussion">This function sends the IPP request to the specified server, retrying
-and authenticating as necessary.  The request is freed with ippDelete()
-after receiving a valid IPP response.<br>
+<p class="discussion">This function sends the IPP request with the optional input file &quot;infile&quot; to
+the specified server, retrying and authenticating as necessary.  The request
+is freed with <a href="#ippDelete"><code>ippDelete</code></a>.<br>
 <br>
-If &quot;infile&quot; is a valid file descriptor, cupsDoIORequest() copies
+If &quot;infile&quot; is a valid file descriptor, <code>cupsDoIORequest</code> copies
 all of the data from the file after the IPP request message.<br>
 <br>
-If &quot;outfile&quot; is a valid file descriptor, cupsDoIORequest() copies
+If &quot;outfile&quot; is a valid file descriptor, <code>cupsDoIORequest</code> copies
 all of the data after the IPP response message to the file.
 
 </p>
@@ -1071,8 +1073,7 @@ all of the data after the IPP response message to the file.
 <p class="description">Response data</p>
 <h4 class="discussion">Discussion</h4>
 <p class="discussion">This function sends the IPP request to the specified server, retrying
-and authenticating as necessary.  The request is freed with ippDelete()
-after receiving a valid IPP response.</p>
+and authenticating as necessary.  The request is freed with <a href="#ippDelete"><code>ippDelete</code></a>.</p>
 <h3 class="function"><a name="cupsEncodeOptions">cupsEncodeOptions</a></h3>
 <p class="description">Encode printer options into IPP attributes.</p>
 <p class="code">
@@ -1220,19 +1221,21 @@ the request respectively.
 <p class="description">Response or <code>NULL</code> on HTTP error</p>
 <h4 class="discussion">Discussion</h4>
 <p class="discussion">Use this function to get the response for an IPP request sent using
-cupsSendDocument() or cupsSendRequest(). For requests that return
-additional data, use httpRead() after getting a successful response,
-otherwise call httpFlush() to complete the response processing.
+<a href="#cupsSendRequest"><code>cupsSendRequest</code></a>. For requests that return additional data, use
+<a href="#cupsReadResponseData"><code>cupsReadResponseData</code></a> after getting a successful response,
+otherwise call <a href="#httpFlush"><code>httpFlush</code></a> to complete the response processing.
 
 </p>
 <h3 class="function"><a name="cupsLastError">cupsLastError</a></h3>
-<p class="description">Return the last IPP status code.</p>
+<p class="description">Return the last IPP status code received on the current
+thread.</p>
 <p class="code">
 ipp_status_t cupsLastError (void);</p>
 <h4 class="returnvalue">Return Value</h4>
 <p class="description">IPP status code from last request</p>
 <h3 class="function"><span class="info">&nbsp;CUPS 1.2/OS X 10.5&nbsp;</span><a name="cupsLastErrorString">cupsLastErrorString</a></h3>
-<p class="description">Return the last IPP status-message.</p>
+<p class="description">Return the last IPP status-message received on the
+current thread.</p>
 <p class="code">
 const char *cupsLastErrorString (void);</p>
 <h4 class="returnvalue">Return Value</h4>
@@ -1305,8 +1308,9 @@ ssize_t cupsReadResponseData (<br>
 <h4 class="returnvalue">Return Value</h4>
 <p class="description">Bytes read, 0 on EOF, -1 on error</p>
 <h4 class="discussion">Discussion</h4>
-<p class="discussion">This function is used after cupsGetResponse() to read the PPD or document
-files for CUPS_GET_PPD and CUPS_GET_DOCUMENT requests, respectively.
+<p class="discussion">This function is used after <a href="#cupsGetResponse"><code>cupsGetResponse</code></a> to read the PPD or document
+files from <code>CUPS_GET_PPD</code> and <code>CUPS_GET_DOCUMENT</code> requests,
+respectively.
 
 </p>
 <h3 class="function"><span class="info">&nbsp;CUPS 1.4/OS X 10.6&nbsp;</span><a name="cupsSendRequest">cupsSendRequest</a></h3>
@@ -1332,13 +1336,17 @@ files for CUPS_GET_PPD and CUPS_GET_DOCUMENT requests, respectively.
 <h4 class="returnvalue">Return Value</h4>
 <p class="description">Initial HTTP status</p>
 <h4 class="discussion">Discussion</h4>
-<p class="discussion">Use httpWrite() to write any additional data (document, PPD file, etc.)
-for the request, cupsGetResponse() to get the IPP response, and httpRead()
-to read any additional data following the response. Only one request can be
-sent/queued at a time.<br>
+<p class="discussion">Use <a href="#cupsWriteRequestData"><code>cupsWriteRequestData</code></a> to write any additional data (document, PPD
+file, etc.) for the request, <a href="#cupsGetResponse"><code>cupsGetResponse</code></a> to get the IPP response,
+and <a href="#cupsReadResponseData"><code>cupsReadResponseData</code></a> to read any additional data following the
+response. Only one request can be sent/queued at a time per <code>http_t</code>
+connection.<br>
+<br>
+Returns the initial HTTP status code, which will be <code>HTTP_CONTINUE</code>
+on a successful send of the request.<br>
 <br>
-Unlike cupsDoFileRequest(), cupsDoIORequest(), and cupsDoRequest(), the
-request is not freed.
+Note: Unlike <a href="#cupsDoFileRequest"><code>cupsDoFileRequest</code></a>, <a href="#cupsDoIORequest"><code>cupsDoIORequest</code></a>, and
+<a href="#cupsDoRequest"><code>cupsDoRequest</code></a>, the request is NOT freed with <a href="#ippDelete"><code>ippDelete</code></a>.
 
 </p>
 <h3 class="function"><span class="info">&nbsp;CUPS 1.4/OS X 10.6&nbsp;</span><a name="cupsWriteRequestData">cupsWriteRequestData</a></h3>
diff --git a/doc/help/man-ipptool.html b/doc/help/man-ipptool.html
index 1b523c53..189613a9 100644
--- a/doc/help/man-ipptool.html
+++ b/doc/help/man-ipptool.html
@@ -151,7 +151,7 @@ The following standard files are available:
 <br>
 <a href='http://localhost:631/help'>http://localhost:631/help</a>
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 
 </body>
 </html>
diff --git a/doc/help/man-ipptoolfile.html b/doc/help/man-ipptoolfile.html
index 645fd4a1..8c753896 100644
--- a/doc/help/man-ipptoolfile.html
+++ b/doc/help/man-ipptoolfile.html
@@ -11,7 +11,7 @@
 ipptoolfile - ipptool file format
 
 <h2 class="title"><a name="DESCRIPTION">Description</a></h2>
-The <a href='man-ipptool.html?TOPIC=Man+Pages'>ipptool(1)</a> program accepts free-form plain text files that describe one or more IPP requests. Comments start with the "#" character and continue to the end of the line. Each request is enclosed by curley braces, for example:
+The <a href='man-ipptool.html?TOPIC=Man+Pages'>ipptool(1)</a> program accepts free-form plain text files that describe one or more IPP requests. Comments start with the "#" character and continue to the end of the line. Each request is enclosed by curly braces, for example:
 <pre>
 
     # This is a comment
@@ -402,6 +402,14 @@ parallel attribute.
 <h2 class="title"><a name="STATUS_PREDICATES">Status Predicates</a></h2>
 The following predicates are understood following the STATUS test directive:
 <dl>
+<dt>DEFINE-MATCH variable-name
+</dt>
+<dd>Defines the variable to "1" when the STATUS matches. A side-effect of this predicate is that this STATUS will never fail a test.
+</dd>
+<dt>DEFINE-NO-MATCH variable-name
+</dt>
+<dd>Defines the variable to "1" when the STATUS does not match. A side-effect of this predicate is that this STATUS will never fail a test.
+</dd>
 <dt>IF-DEFINED variable-name
 </dt>
 <dd>Makes the STATUS apply only if the specified variable is defined.
@@ -631,7 +639,7 @@ no job-uri has been seen.
 </dd>
 <dt>$notify-subscription-id
 </dt>
-<dd>Inserts the last notify-subscription-id value returnd in a test response or 0 if
+<dd>Inserts the last notify-subscription-id value returned in a test response or 0 if
 no notify-subscription-id has been seen.
 </dd>
 <dt>$port
@@ -662,7 +670,7 @@ no notify-subscription-id has been seen.
 <a href='http://localhost:631/help'>http://localhost:631/help</a>
 
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 
 </body>
 </html>
diff --git a/doc/help/network.html b/doc/help/network.html
index 6743651f..ebe1b5f9 100644
--- a/doc/help/network.html
+++ b/doc/help/network.html
@@ -93,16 +93,22 @@ page on the device.</P>
 
 <PRE>
 socket://<i>ip-address-or-hostname</i>
-socket://<i>ip-address-or-hostname</i>/?waiteof=false
+socket://<i>ip-address-or-hostname</i>/?option=value
+socket://<i>ip-address-or-hostname</i>/?option=value&option=value
 socket://<i>ip-address-or-hostname</i>:<i>port-number</i>
-socket://<i>ip-address-or-hostname</i>:<i>port-number</i>/?waiteof=false
+socket://<i>ip-address-or-hostname</i>:<i>port-number</i>/?option=value
+socket://<i>ip-address-or-hostname</i>:<i>port-number</i>/?option=value&option=value
 </PRE>
 
+<P>The "contimeout" option controls the number of seconds that the backend will wait to obtain a connection to the printer. The default is 1 week.</P>
+
+<P>The "snmp" option controls whether the <tt>socket</tt> backend queries for supply and page count information via SNMP.</P>
+
 <P>The "waiteof" option controls whether the <tt>socket</tt> backend waits for the printer to complete the printing of the job. The default is to wait.</P>
 
 <H3><A NAME="IPP">Internet Printing Protocol (IPP)</A></H3>
 
-<P>IPP is the only protocol that CUPS supports natively and is supported by some network printers and print servers. However, since many printers do not implement IPP properly, only use IPP when the vendor actually documents official support for it. IPP printing normally happens over port 631 and uses the <tt>http</tt> and <tt>ipp</tt> URI schemes:</P>
+<P>IPP is the only protocol that CUPS supports natively and is supported by some network printers and print servers. However, since many printers do not implement IPP properly, only use IPP when the vendor actually documents official support for it. IPP printing normally happens over port 631 and uses the <tt>http</tt>, <tt>ipp</tt>, and <tt>ipps</tt> URI schemes:</P>
 
 <PRE>
 http://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>
@@ -114,6 +120,12 @@ ipp://<i>ip-address-or-hostname</i>/<i>resource</i>?<i>option=value&option=value
 ipp://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>
 ipp://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>?<i>option=value</i>
 ipp://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>?<i>option=value&option=value</i>
+ipps://<i>ip-address-or-hostname</i>/<i>resource</i>
+ipps://<i>ip-address-or-hostname</i>/<i>resource</i>?<i>option=value</i>
+ipps://<i>ip-address-or-hostname</i>/<i>resource</i>?<i>option=value&option=value</i>
+ipps://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>
+ipps://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>?<i>option=value</i>
+ipps://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>?<i>option=value&option=value</i>
 </PRE>
 
 <P>The <tt>ipp</tt> backend supports many options, which are summarized in <A HREF="#TABLE2">Table 2</A>.</P>
@@ -148,16 +160,20 @@ ipp://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>?<i>option
 	<TD>Specifies that the connection to the IPP server should be encrypted using TLS.</TD>
 </TR>
 <TR>
+	<TD><TT>snmp=false</TT></TD>
+	<TD>Specifies that SNMP supply and page count queries should not be performed.</TD>
+</TR>
+<TR>
 	<TD><TT>version=1.0</TT></TD>
-	<TD>Specifies that version 1.0 of the IPP protocol should be used instead of the default version 1.1.</TD>
+	<TD>Specifies that version 1.0 of the IPP protocol should be used instead of the default version 2.0.</TD>
 </TR>
 <TR>
-	<TD><TT>version=2.0</TT></TD>
-	<TD>Specifies that version 2.0 of the IPP protocol should be used instead of the default version 1.1.</TD>
+	<TD><TT>version=1.1</TT></TD>
+	<TD>Specifies that version 1.1 of the IPP protocol should be used instead of the default version 2.0.</TD>
 </TR>
 <TR>
 	<TD><TT>version=2.1</TT></TD>
-	<TD>Specifies that version 2.1 of the IPP protocol should be used instead of the default version 1.1.</TD>
+	<TD>Specifies that version 2.1 of the IPP protocol should be used instead of the default version 2.0.</TD>
 </TR>
 <TR>
 	<TD><TT>waitjob=false</TT></TD>
@@ -267,6 +283,10 @@ lpd://<i>username@ip-address-or-hostname</i>/<i>queue</i>?<i>option=value&option
 	<TD>Specifies that the job title string should be restricted to ASCII characters.</TD>
 </TR>
 <TR>
+	<TD><TT>snmp=false</TT></TD>
+	<TD>Specifies that SNMP supply and page count queries should not be performed.</TD>
+</TR>
+<TR>
 	<TD><TT>timeout=<I>seconds</I></TT></TD>
 	<TD>Specifies the number of seconds to wait for LPD commands to complete.</TD>
 </TR>
diff --git a/doc/help/ref-cups-files-conf.html.in b/doc/help/ref-cups-files-conf.html.in
new file mode 100644
index 00000000..fa922cb2
--- /dev/null
+++ b/doc/help/ref-cups-files-conf.html.in
@@ -0,0 +1,513 @@
+<HTML>
+<!-- SECTION: References -->
+<HEAD>
+	<TITLE>cups-files.conf</TITLE>
+	<LINK REL="STYLESHEET" TYPE="text/css" HREF="../cups-printable.css">
+</HEAD>
+<BODY>
+
+<H1 CLASS="title">cups-files.conf</H1>
+
+<P>The <VAR>/etc/cups/cups-files.conf</VAR> file contains configuration <I>directives</I> that control the files, directories. users. and groups that are used by the CUPS scheduler, <CODE>cupsd(8)</CODE>. Each directive is listed on a line by itself followed by its value. Comments are introduced using the number sign ("#") character at the beginning of a line.</P>
+
+<H2 CLASS="title"><A NAME="AccessLog">AccessLog</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+AccessLog /var/log/cups/access_log
+AccessLog /var/log/cups/access_log-%s
+AccessLog syslog
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>AccessLog</CODE> directive sets the name of the
+access log file. If the filename is not absolute then it is
+assumed to be relative to the <A
+HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The
+access log file is stored in "common log format" and can be used
+by any web access reporting tool to generate a report on CUPS
+server activity.</P>
+
+<P>The server name can be included in the filename by using
+<CODE>%s</CODE> in the name.</P>
+
+<P>The special name "syslog" can be used to send the access
+information to the system log instead of a plain file.</P>
+
+<P>The default access log file is
+<VAR>@CUPS_LOGDIR@/access_log</VAR>.</P>
+
+
+<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.15</SPAN><A NAME="ConfigFilePerm">ConfigFilePerm</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+ConfigFilePerm 0644
+ConfigFilePerm 0640
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>ConfigFilePerm</CODE> directive specifies the permissions to use when the scheduler writes configuration and cache files, typically in response to IPP or HTTP requests. The default is @CUPS_CONFIG_FILE_PERM@.</P>
+
+<BLOCKQUOTE><B>Note:</B>
+
+<P>The permissions for the <VAR>printers.conf</VAR> file are always masked to only allow access from the scheduler user (typically root). This is done because printer device URIs sometimes contain sensitive authentication information that should not be generally known on the system. There is no way to disable this security feature.</P>
+
+</BLOCKQUOTE>
+
+
+<H2 CLASS="title"><A NAME="DataDir">DataDir</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+DataDir /usr/share/cups
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>DataDir</CODE> directive sets the directory to use
+for data files.</P>
+
+
+<H2 CLASS="title"><A NAME="DocumentRoot">DocumentRoot</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+DocumentRoot /usr/share/doc/cups
+DocumentRoot /foo/bar/doc/cups
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>DocumentRoot</CODE> directive specifies the location
+of web content for the HTTP server in CUPS. If an absolute path
+is not specified then it is assumed to be relative to the <A
+HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The
+default directory is <VAR>@CUPS_DOCROOT@</VAR>.</P>
+
+<P>Documents are first looked up in a sub-directory for the
+primary language requested by the client (e.g.
+<VAR>@CUPS_DOCROOT@/fr/...</VAR>) and then directly under
+the <CODE>DocumentRoot</CODE> directory (e.g.
+<VAR>@CUPS_DOCROOT@/...</VAR>), so it is possible to
+localize the web content by providing subdirectories for each
+language needed.</P>
+
+
+<H2 CLASS="title"><A NAME="ErrorLog">ErrorLog</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+ErrorLog /var/log/cups/error_log
+ErrorLog /var/log/cups/error_log-%s
+ErrorLog syslog
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>ErrorLog</CODE> directive sets the name of the error
+log file. If the filename is not absolute then it is assumed to
+be relative to the <A
+HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The
+default error log file is <VAR>@CUPS_LOGDIR@/error_log</VAR>.</P>
+
+<P>The server name can be included in the filename by using
+<CODE>%s</CODE> in the name.</P>
+
+<P>The special name "syslog" can be used to send the error
+information to the system log instead of a plain file.</P>
+
+
+<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.4/OS X 10.6</SPAN><A NAME="FatalErrors">FatalErrors</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+FatalErrors none
+FatalErrors all
+FatalErrors browse
+FatalErrors config
+FatalErrors listen
+FatalErrors log
+FatalErrors permissions
+FatalErrors all -permissions
+FatalErrors config permissions log
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>FatalErrors</CODE> directive determines whether certain kinds of
+errors are fatal. The following kinds of errors are currently recognized:</P>
+
+<UL>
+
+	<LI><CODE>none</CODE> - No errors are fatal</LI>
+
+	<LI><CODE>all</CODE> - All of the errors below are fatal</LI>
+
+	<LI><CODE>browse</CODE> - Browsing initialization errors are fatal,
+	for example failed binding to the CUPS browse port or failed connections
+	to LDAP servers</LI>
+
+	<LI><CODE>config</CODE> - Configuration file syntax errors are
+	fatal</LI>
+
+	<LI><CODE>listen</CODE> - Listen or Port errors are fatal, except for
+	IPv6 failures on the loopback or "any" addresses</LI>
+
+	<LI><CODE>log</CODE> - Log file creation or write errors are fatal</LI>
+
+	<LI><CODE>permissions</CODE> - Bad startup file permissions are
+	fatal, for example shared SSL certificate and key files with world-
+	read permissions</LI>
+
+</UL>
+
+<P>Multiple errors can be listed, and the form "-kind" can be used with
+<CODE>all</CODE> to remove specific kinds of errors. The default setting is
+<CODE>@CUPS_FATAL_ERRORS@</CODE>.</P>
+
+
+<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.18</SPAN><A NAME="FileDevice">FileDevice</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+FileDevice Yes
+FileDevice No
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>FileDevice</CODE> directive determines whether the
+scheduler allows new printers to be added using device URIs of
+the form <CODE>file:/filename</CODE>. File devices are most often
+used to test new printer drivers and do not support raw file
+printing.</P>
+
+<P>The default setting is <CODE>No</CODE>.</P>
+
+<BLOCKQUOTE><B>Note:</B>
+
+<P>File devices are managed by the scheduler. Since the
+scheduler normally runs as the root user, file devices
+can be used to overwrite system files and potentially
+gain unauthorized access to the system. If you must
+create printers using file devices, we recommend that
+you set the <CODE>FileDevice</CODE> directive to
+<CODE>Yes</CODE> for only as long as you need to add the
+printers to the system, and then reset the directive to
+<CODE>No</CODE>.</P>
+
+</BLOCKQUOTE>
+
+
+<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.3</SPAN><A NAME="FontPath">FontPath</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+FontPath /foo/bar/fonts
+FontPath /usr/share/cups/fonts:/foo/bar/fonts
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>FontPath</CODE> directive specifies the font path to
+use when searching for fonts. The default font path is
+<CODE>/usr/share/cups/fonts</CODE>.</P>
+
+
+<H2 CLASS="title"><A NAME="Group">Group</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+Group lp
+Group nobody
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>Group</CODE> directive specifies the UNIX group that
+filter and CGI programs run as. The default group is
+system-specific but is usually <CODE>lp</CODE> or
+<CODE>nobody</CODE>.</P>
+
+
+<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.15</SPAN><A NAME="LogFilePerm">LogFilePerm</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+LogFilePerm 0644
+LogFilePerm 0600
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>LogFilePerm</CODE> directive specifies the
+permissions to use when writing log files. The default
+is @CUPS_LOG_FILE_PERM@.</P>
+
+
+<H2 CLASS="title"><A NAME="PageLog">PageLog</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+PageLog /var/log/cups/page_log
+PageLog /var/log/cups/page_log-%s
+PageLog syslog
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>PageLog</CODE> directive sets the name of the page
+log file. If the filename is not absolute then it is assumed to
+be relative to the <A
+HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The
+default page log file is <VAR>@CUPS_LOGDIR@/page_log</VAR>.</P>
+
+<P>The server name can be included in the filename by using
+<CODE>%s</CODE> in the name.</P>
+
+<P>The special name "syslog" can be used to send the page
+information to the system log instead of a plain file.</P>
+
+
+<H2 CLASS="title"><A NAME="Printcap">Printcap</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+Printcap
+Printcap /etc/printcap
+Printcap /etc/printers.conf
+Printcap /Library/Preferences/org.cups.printers.plist
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>Printcap</CODE> directive controls whether or not a
+printcap file is automatically generated and updated with a list
+of available printers. If specified with no value, then no
+printcap file will be generated. The default is to generate a
+file named <VAR>@CUPS_DEFAULT_PRINTCAP@</VAR>.</P>
+
+<P>When a filename is specified (e.g. <VAR>@CUPS_DEFAULT_PRINTCAP@</VAR>),
+the printcap file is written whenever a printer is added or
+removed. The printcap file can then be used by applications that
+are hardcoded to look at the printcap file for the available
+printers.</P>
+
+
+<H2 CLASS="title"><A NAME="PrintcapFormat">PrintcapFormat</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+PrintcapFormat BSD
+PrintcapFormat Solaris
+PrintcapFormat plist
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>PrintcapFormat</CODE> directive controls the output format of the
+printcap file. The default is to generate the plist format on OS X, the
+Solaris format on Solaris, and the BSD format on other operating systems.</P>
+
+
+<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.3</SPAN><A NAME="RemoteRoot">RemoteRoot</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+RemoteRoot remroot
+RemoteRoot root
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>RemoteRoot</CODE> directive sets the username for
+unauthenticated root requests from remote hosts. The default
+username is <VAR>remroot</VAR>. Setting <CODE>RemoteRoot</CODE>
+to <VAR>root</VAR> effectively disables this security
+mechanism.</P>
+
+
+<H2 CLASS="title"><A NAME="RequestRoot">RequestRoot</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+RequestRoot /var/spool/cups
+RequestRoot /foo/bar/spool/cups
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>RequestRoot</CODE> directive sets the directory for
+incoming IPP requests and HTML forms. If an absolute path is not
+provided then it is assumed to be relative to the <A
+HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The
+default request directory is <VAR>@CUPS_REQUESTS@</VAR>.</P>
+
+
+<H2 CLASS="title"><A NAME="ServerBin">ServerBin</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+ServerBin /usr/lib/cups
+ServerBin /foo/bar/lib/cups
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>ServerBin</CODE> directive sets the directory for
+server-run executables. If an absolute path is not provided then
+it is assumed to be relative to the <A
+HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The
+default executable directory is <VAR>/usr/lib/cups</VAR>,
+<VAR>/usr/lib32/cups</VAR>, or <VAR>/usr/libexec/cups</VAR>
+depending on the operating system.</P>
+
+
+<H2 CLASS="title"><A NAME="ServerCertificate">ServerCertificate</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+ServerCertificate /etc/cups/ssl/server.crt
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>ServerCertificate</CODE> directive specifies the
+location of the SSL certificate file used by the server when
+negotiating encrypted connections. The certificate must not be
+encrypted (password protected) since the scheduler normally runs
+in the background and will be unable to ask for a password.</P>
+
+<P>The default certificate file is
+<VAR>/etc/cups/ssl/server.crt</VAR>.</P>
+
+
+<H2 CLASS="title"><A NAME="ServerKey">ServerKey</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+ServerKey /etc/cups/ssl/server.key
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>ServerKey</CODE> directive specifies the location of
+the SSL private key file used by the server when negotiating
+encrypted connections.</P>
+
+<P>The default key file is
+<VAR>/etc/cups/ssl/server.crt</VAR>.</P>
+
+
+<H2 CLASS="title"><A NAME="ServerRoot">ServerRoot</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+ServerRoot /etc/cups
+ServerRoot /foo/bar/cups
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>ServerRoot</CODE> directive specifies the absolute
+path to the server configuration and state files. It is also used
+to resolve relative paths in the <VAR>cupsd.conf</VAR> file. The
+default server directory is <VAR>/etc/cups</VAR>.</P>
+
+
+<H2 CLASS="title"><A NAME="SystemGroup">SystemGroup</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+SystemGroup lpadmin
+SystemGroup sys
+SystemGroup system
+SystemGroup root
+SystemGroup root lpadmin
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>SystemGroup</CODE> directive specifies the system
+administration group for <CODE>System</CODE> authentication.
+Multiple groups can be listed, separated with spaces. The default
+group list is <CODE>@CUPS_SYSTEM_GROUPS@</CODE>.</P>
+
+
+<H2 CLASS="title"><A NAME="TempDir">TempDir</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+TempDir /var/tmp
+TempDir /foo/bar/tmp
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>TempDir</CODE> directive specifies an absolute path
+for the directory to use for temporary files. The default
+directory is <VAR>@CUPS_REQUESTS@/tmp</VAR>.</P>
+
+<P>Temporary directories must be world-writable and should have
+the "sticky" permission bit enabled so that other users cannot
+delete filter temporary files. The following commands will create
+an appropriate temporary directory called
+<VAR>/foo/bar/tmp</VAR>:</P>
+
+<PRE CLASS="command">
+<KBD>mkdir /foo/bar/tmp</KBD>
+<KBD>chmod a+rwxt /foo/bar/tmp</KBD>
+</PRE>
+
+
+<H2 CLASS="title"><A NAME="User">User</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+User lp
+User guest
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>User</CODE> directive specifies the UNIX user that
+filter and CGI programs run as. The default user is
+<CODE>@CUPS_USER@</CODE>.</P>
+
+<BLOCKQUOTE><B>Note:</B>
+
+<P>You may not use user <CODE>root</CODE>, as that would expose
+the system to unacceptable security risks. The scheduler will
+automatically choose user <CODE>nobody</CODE> if you specify a
+user whose ID is 0.</P>
+
+</BLOCKQUOTE>
+
+
+</BODY>
+</HTML>
diff --git a/doc/help/ref-cupsd-conf.html.in b/doc/help/ref-cupsd-conf.html.in
index 8454cf78..989765d0 100644
--- a/doc/help/ref-cupsd-conf.html.in
+++ b/doc/help/ref-cupsd-conf.html.in
@@ -49,36 +49,6 @@ automatically handles restarting the scheduler.</P>
 </BLOCKQUOTE>
 
 
-<H2 CLASS="title"><A NAME="AccessLog">AccessLog</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-AccessLog /var/log/cups/access_log
-AccessLog /var/log/cups/access_log-%s
-AccessLog syslog
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>AccessLog</CODE> directive sets the name of the
-access log file. If the filename is not absolute then it is
-assumed to be relative to the <A
-HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The
-access log file is stored in "common log format" and can be used
-by any web access reporting tool to generate a report on CUPS
-server activity.</P>
-
-<P>The server name can be included in the filename by using
-<CODE>%s</CODE> in the name.</P>
-
-<P>The special name "syslog" can be used to send the access
-information to the system log instead of a plain file.</P>
-
-<P>The default access log file is
-<VAR>@CUPS_LOGDIR@/access_log</VAR>.</P>
-
-
 <H2 CLASS="title"><A NAME="AccessLogLevel">AccessLogLevel</A></H2>
 
 <H3>Examples</H3>
@@ -197,82 +167,6 @@ HREF="#Location"><CODE>Location</CODE></A> or <A
 HREF="#Limit"><CODE>Limit</CODE></A> section.</P>
 
 
-<H2 CLASS="title"><SPAN CLASS="info">Deprecated</SPAN><A NAME="AuthClass">AuthClass</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-&lt;Location /path&gt;
-  ...
-  AuthClass Anonymous
-  AuthClass User
-  AuthClass System
-  AuthClass Group
-&lt;/Location&gt;
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>AuthClass</CODE> directive defines what level of
-authentication is required:</P>
-
-<UL>
-
-	<LI><CODE>Anonymous</CODE> - No authentication should be
-	performed (default)</LI>
-
-	<LI><CODE>User</CODE> - A valid username and password is
-	required</LI>
-
-	<LI><CODE>System</CODE> - A valid username and password
-	is required, and the username must belong to the "sys"
-	group; this can be changed using the <A
-	HREF="#SystemGroup"><CODE>SystemGroup</CODE></A>
-	directive</LI>
-
-	<LI><CODE>Group</CODE> - A valid username and password is
-	required, and the username must belong to the group named
-	by the <A
-	HREF="#AuthGroupName"><CODE>AuthGroupName</CODE></A>
-	directive</LI>
-
-</UL>
-
-<P>The <CODE>AuthClass</CODE> directive must appear inside a <A
-HREF="#Location"><CODE>Location</CODE></A> or <A
-HREF="#Limit"><CODE>Limit</CODE></A> section.</P>
-
-<P><B>This directive is deprecated and will be removed from a
-future release of CUPS.</B> Consider using the more flexible <A
-HREF="#Require"><CODE>Require</CODE></A> directive instead.</P>
-
-
-<H2 CLASS="title"><SPAN CLASS="info">Deprecated</SPAN><A NAME="AuthGroupName">AuthGroupName</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-&lt;Location /path&gt;
-  ...
-  AuthGroupName mygroup
-  AuthGroupName lp
-&lt;/Location&gt;
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>AuthGroupName</CODE> directive sets the group to use
-for <CODE>Group</CODE> authentication.</P>
-
-<P>The <CODE>AuthGroupName</CODE> directive must appear inside a
-<A HREF="#Location"><CODE>Location</CODE></A> or <A
-HREF="#Limit"><CODE>Limit</CODE></A> section.</P>
-
-<P><B>This directive is deprecated and will be removed from a
-future release of CUPS.</B> Consider using the more flexible <A
-HREF="#Require"><CODE>Require</CODE></A> directive instead.</P>
-
-
 <H2 CLASS="title"><A NAME="AuthType">AuthType</A></H2>
 
 <H3>Examples</H3>
@@ -436,40 +330,6 @@ used.</P>
 <P>The default is to not allow classification overrides.</P>
 
 
-<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.15</SPAN><A NAME="ConfigFilePerm">ConfigFilePerm</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-ConfigFilePerm 0644
-ConfigFilePerm 0640
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>ConfigFilePerm</CODE> directive specifies the permissions to use when the scheduler writes configuration and cache files, typically in response to IPP or HTTP requests. The default is @CUPS_CONFIG_FILE_PERM@.</P>
-
-<BLOCKQUOTE><B>Note:</B>
-
-<P>The permissions for the <VAR>printers.conf</VAR> file are always masked to only allow access from the scheduler user (typically root). This is done because printer device URIs sometimes contain sensitive authentication information that should not be generally known on the system. There is no way to disable this security feature.</P>
-
-</BLOCKQUOTE>
-
-
-<H2 CLASS="title"><A NAME="DataDir">DataDir</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-DataDir /usr/share/cups
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>DataDir</CODE> directive sets the directory to use
-for data files.</P>
-
-
 <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.2/OS X 10.5</SPAN><A NAME="DefaultAuthType">DefaultAuthType</A></H2>
 
 <H3>Examples</H3>
@@ -653,32 +513,6 @@ DirtyCleanInterval 0
 <P>The default value is <CODE>30</CODE> (30 seconds).</P>
 
 
-<H2 CLASS="title"><A NAME="DocumentRoot">DocumentRoot</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-DocumentRoot /usr/share/doc/cups
-DocumentRoot /foo/bar/doc/cups
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>DocumentRoot</CODE> directive specifies the location
-of web content for the HTTP server in CUPS. If an absolute path
-is not specified then it is assumed to be relative to the <A
-HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The
-default directory is <VAR>@CUPS_DOCROOT@</VAR>.</P>
-
-<P>Documents are first looked up in a sub-directory for the
-primary language requested by the client (e.g.
-<VAR>@CUPS_DOCROOT@/fr/...</VAR>) and then directly under
-the <CODE>DocumentRoot</CODE> directory (e.g.
-<VAR>@CUPS_DOCROOT@/...</VAR>), so it is possible to
-localize the web content by providing subdirectories for each
-language needed.</P>
-
-
 <H2 CLASS="title"><A NAME="Encryption">Encryption</A></H2>
 
 <H3>Examples</H3>
@@ -701,31 +535,6 @@ encryption settings for that location. The default setting is
 <CODE>IfRequested</CODE> for all locations.</P>
 
 
-<H2 CLASS="title"><A NAME="ErrorLog">ErrorLog</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-ErrorLog /var/log/cups/error_log
-ErrorLog /var/log/cups/error_log-%s
-ErrorLog syslog
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>ErrorLog</CODE> directive sets the name of the error
-log file. If the filename is not absolute then it is assumed to
-be relative to the <A
-HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The
-default error log file is <VAR>@CUPS_LOGDIR@/error_log</VAR>.</P>
-
-<P>The server name can be included in the filename by using
-<CODE>%s</CODE> in the name.</P>
-
-<P>The special name "syslog" can be used to send the error
-information to the system log instead of a plain file.</P>
-
-
 <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.3/OS X 10.5</SPAN><A NAME="ErrorPolicy">ErrorPolicy</A></H2>
 
 <H3>Examples</H3>
@@ -764,91 +573,6 @@ printer.</P>
 </UL>
 
 
-
-<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.4/OS X 10.6</SPAN><A NAME="FatalErrors">FatalErrors</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-FatalErrors none
-FatalErrors all
-FatalErrors browse
-FatalErrors config
-FatalErrors listen
-FatalErrors log
-FatalErrors permissions
-FatalErrors all -permissions
-FatalErrors config permissions log
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>FatalErrors</CODE> directive determines whether certain kinds of
-errors are fatal. The following kinds of errors are currently recognized:</P>
-
-<UL>
-
-	<LI><CODE>none</CODE> - No errors are fatal</LI>
-
-	<LI><CODE>all</CODE> - All of the errors below are fatal</LI>
-
-	<LI><CODE>browse</CODE> - Browsing initialization errors are fatal,
-	for example failed binding to the CUPS browse port or failed connections
-	to LDAP servers</LI>
-
-	<LI><CODE>config</CODE> - Configuration file syntax errors are
-	fatal</LI>
-
-	<LI><CODE>listen</CODE> - Listen or Port errors are fatal, except for
-	IPv6 failures on the loopback or "any" addresses</LI>
-
-	<LI><CODE>log</CODE> - Log file creation or write errors are fatal</LI>
-
-	<LI><CODE>permissions</CODE> - Bad startup file permissions are
-	fatal, for example shared SSL certificate and key files with world-
-	read permissions</LI>
-
-</UL>
-
-<P>Multiple errors can be listed, and the form "-kind" can be used with
-<CODE>all</CODE> to remove specific kinds of errors. The default setting is
-<CODE>@CUPS_FATAL_ERRORS@</CODE>.</P>
-
-
-<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.18</SPAN><A NAME="FileDevice">FileDevice</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-FileDevice Yes
-FileDevice No
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>FileDevice</CODE> directive determines whether the
-scheduler allows new printers to be added using device URIs of
-the form <CODE>file:/filename</CODE>. File devices are most often
-used to test new printer drivers and do not support raw file
-printing.</P>
-
-<P>The default setting is <CODE>No</CODE>.</P>
-
-<BLOCKQUOTE><B>Note:</B>
-
-<P>File devices are managed by the scheduler. Since the
-scheduler normally runs as the root user, file devices
-can be used to overwrite system files and potentially
-gain unauthorized access to the system. If you must
-create printers using file devices, we recommend that
-you set the <CODE>FileDevice</CODE> directive to
-<CODE>Yes</CODE> for only as long as you need to add the
-printers to the system, and then reset the directive to
-<CODE>No</CODE>.</P>
-
-</BLOCKQUOTE>
-
-
 <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.3</SPAN><A NAME="FilterLimit">FilterLimit</A></H2>
 
 <H3>Examples</H3>
@@ -893,39 +617,6 @@ value to assign to filter processes. The nice value ranges from
 is 0.</P>
 
 
-<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.3</SPAN><A NAME="FontPath">FontPath</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-FontPath /foo/bar/fonts
-FontPath /usr/share/cups/fonts:/foo/bar/fonts
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>FontPath</CODE> directive specifies the font path to
-use when searching for fonts. The default font path is
-<CODE>/usr/share/cups/fonts</CODE>.</P>
-
-
-<H2 CLASS="title"><A NAME="Group">Group</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-Group lp
-Group nobody
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>Group</CODE> directive specifies the UNIX group that
-filter and CGI programs run as. The default group is
-system-specific but is usually <CODE>lp</CODE> or
-<CODE>nobody</CODE>.</P>
-
-
 <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.6/OS X 10.8</SPAN><A NAME="GSSServiceName">GSSServiceName</A></H2>
 
 <H3>Examples</H3>
@@ -980,7 +671,7 @@ Include /foo/bar/filename
 <P>The <CODE>Include</CODE> directive includes the named file in
 the <CODE>cupsd.conf</CODE> file. If no leading path is provided,
 the file is assumed to be relative to the <A
-HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory.</P>
+HREF="ref-cups-files-conf.html#ServerRoot"><CODE>ServerRoot</CODE></A> directory.</P>
 
 
 <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.5</SPAN><A NAME="JobPrivateAccess">JobPrivateAccess</A></H2>
@@ -1533,22 +1224,6 @@ error occurs during printing. The default is 200 messages. A value of 0
 disables debugging history entirely and is not recommended.</P>
 
 
-<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.15</SPAN><A NAME="LogFilePerm">LogFilePerm</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-LogFilePerm 0644
-LogFilePerm 0600
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>LogFilePerm</CODE> directive specifies the
-permissions to use when writing log files. The default
-is @CUPS_LOG_FILE_PERM@.</P>
-
-
 <H2 CLASS="title"><A NAME="LogLevel">LogLevel</A></H2>
 
 <H3>Examples</H3>
@@ -1569,7 +1244,7 @@ LogLevel debug2
 <H3>Description</H3>
 
 <P>The <CODE>LogLevel</CODE> directive specifies the level of
-logging for the <A HREF="#ErrorLog"><CODE>ErrorLog</CODE></A>
+logging for the <A HREF="ref-cups-files-conf.html#ErrorLog"><CODE>ErrorLog</CODE></A>
 file. The following values are recognized (each level logs
 everything under the preceding levels):</P>
 
@@ -1893,31 +1568,6 @@ HREF="#Location"><CODE>Location</CODE></A> or <A
 HREF="#Limit"><CODE>Limit</CODE></A> section.</P>
 
 
-<H2 CLASS="title"><A NAME="PageLog">PageLog</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-PageLog /var/log/cups/page_log
-PageLog /var/log/cups/page_log-%s
-PageLog syslog
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>PageLog</CODE> directive sets the name of the page
-log file. If the filename is not absolute then it is assumed to
-be relative to the <A
-HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The
-default page log file is <VAR>@CUPS_LOGDIR@/page_log</VAR>.</P>
-
-<P>The server name can be included in the filename by using
-<CODE>%s</CODE> in the name.</P>
-
-<P>The special name "syslog" can be used to send the page
-information to the system log instead of a plain file.</P>
-
-
 <H2 CLASS="title"><A NAME="PageLogFormat">PageLogFormat</A></H2>
 
 <H3>Examples</H3>
@@ -2096,65 +1746,6 @@ PreserveJobFiles 604800
 </BLOCKQUOTE>
 
 
-<H2 CLASS="title"><A NAME="Printcap">Printcap</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-Printcap
-Printcap /etc/printcap
-Printcap /etc/printers.conf
-Printcap /Library/Preferences/org.cups.printers.plist
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>Printcap</CODE> directive controls whether or not a
-printcap file is automatically generated and updated with a list
-of available printers. If specified with no value, then no
-printcap file will be generated. The default is to generate a
-file named <VAR>@CUPS_DEFAUL_PRINTCAP@</VAR>.</P>
-
-<P>When a filename is specified (e.g. <VAR>@CUPS_DEFAULT_PRINTCAP@</VAR>),
-the printcap file is written whenever a printer is added or
-removed. The printcap file can then be used by applications that
-are hardcoded to look at the printcap file for the available
-printers.</P>
-
-
-<H2 CLASS="title"><A NAME="PrintcapFormat">PrintcapFormat</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-PrintcapFormat BSD
-PrintcapFormat Solaris
-PrintcapFormat plist
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>PrintcapFormat</CODE> directive controls the output format of the
-printcap file. The default is to generate the plist format on OS X, the
-Solaris format on Solaris, and the BSD format on other operating systems.</P>
-
-
-<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.13</SPAN><A NAME="PrintcapGUI">PrintcapGUI</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-PrintGUI /usr/bin/glpoptions
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>PrintcapGUI</CODE> directive sets the program to
-associate with the IRIX printer GUI interface script which is
-used by IRIX applications to display printer-specific options.
-There is no default program.</P>
-
-
 <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.21</SPAN><A NAME="ReloadTimeout">ReloadTimeout</A></H2>
 
 <H3>Examples</H3>
@@ -2171,42 +1762,6 @@ of seconds the scheduler will wait for active jobs to complete
 before doing a restart. The default is 30 seconds.</P>
 
 
-<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.3</SPAN><A NAME="RemoteRoot">RemoteRoot</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-RemoteRoot remroot
-RemoteRoot root
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>RemoteRoot</CODE> directive sets the username for
-unauthenticated root requests from remote hosts. The default
-username is <VAR>remroot</VAR>. Setting <CODE>RemoteRoot</CODE>
-to <VAR>root</VAR> effectively disables this security
-mechanism.</P>
-
-
-<H2 CLASS="title"><A NAME="RequestRoot">RequestRoot</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-RequestRoot /var/spool/cups
-RequestRoot /foo/bar/spool/cups
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>RequestRoot</CODE> directive sets the directory for
-incoming IPP requests and HTML forms. If an absolute path is not
-provided then it is assumed to be relative to the <A
-HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The
-default request directory is <VAR>@CUPS_REQUESTS@</VAR>.</P>
-
-
 <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.7</SPAN><A NAME="Require">Require</A></H2>
 
 <H3>Examples</H3>
@@ -2359,64 +1914,6 @@ alternate name with a ServerAlias directive instead of using "*".</P>
 </BLOCKQUOTE>
 
 
-<H2 CLASS="title"><A NAME="ServerBin">ServerBin</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-ServerBin /usr/lib/cups
-ServerBin /foo/bar/lib/cups
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>ServerBin</CODE> directive sets the directory for
-server-run executables. If an absolute path is not provided then
-it is assumed to be relative to the <A
-HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The
-default executable directory is <VAR>/usr/lib/cups</VAR>,
-<VAR>/usr/lib32/cups</VAR>, or <VAR>/usr/libexec/cups</VAR>
-depending on the operating system.</P>
-
-
-<H2 CLASS="title"><A NAME="ServerCertificate">ServerCertificate</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-ServerCertificate /etc/cups/ssl/server.crt
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>ServerCertificate</CODE> directive specifies the
-location of the SSL certificate file used by the server when
-negotiating encrypted connections. The certificate must not be
-encrypted (password protected) since the scheduler normally runs
-in the background and will be unable to ask for a password.</P>
-
-<P>The default certificate file is
-<VAR>/etc/cups/ssl/server.crt</VAR>.</P>
-
-
-<H2 CLASS="title"><A NAME="ServerKey">ServerKey</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-ServerKey /etc/cups/ssl/server.key
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>ServerKey</CODE> directive specifies the location of
-the SSL private key file used by the server when negotiating
-encrypted connections.</P>
-
-<P>The default key file is
-<VAR>/etc/cups/ssl/server.crt</VAR>.</P>
-
-
 <H2 CLASS="title"><A NAME="ServerName">ServerName</A></H2>
 
 <H3>Examples</H3>
@@ -2433,23 +1930,6 @@ that is reported to clients. By default the server name is the
 hostname.</P>
 
 
-<H2 CLASS="title"><A NAME="ServerRoot">ServerRoot</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-ServerRoot /etc/cups
-ServerRoot /foo/bar/cups
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>ServerRoot</CODE> directive specifies the absolute
-path to the server configuration and state files. It is also used
-to resolve relative paths in the <VAR>cupsd.conf</VAR> file. The
-default server directory is <VAR>/etc/cups</VAR>.</P>
-
-
 <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.21</SPAN><A NAME="ServerTokens">ServerTokens</A></H2>
 
 <H3>Examples</H3>
@@ -2645,53 +2125,6 @@ subscription values to make private. The "default" values are "notify-events",
 HREF="#Policy"><CODE>Policy</CODE></A> section.</P>
 
 
-<H2 CLASS="title"><A NAME="SystemGroup">SystemGroup</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-SystemGroup lpadmin
-SystemGroup sys
-SystemGroup system
-SystemGroup root
-SystemGroup root lpadmin
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>SystemGroup</CODE> directive specifies the system
-administration group for <CODE>System</CODE> authentication.
-Multiple groups can be listed, separated with spaces. The default
-group list is <CODE>@CUPS_SYSTEM_GROUPS@</CODE>.</P>
-
-
-<H2 CLASS="title"><A NAME="TempDir">TempDir</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-TempDir /var/tmp
-TempDir /foo/bar/tmp
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>TempDir</CODE> directive specifies an absolute path
-for the directory to use for temporary files. The default
-directory is <VAR>@CUPS_REQUESTS@/tmp</VAR>.</P>
-
-<P>Temporary directories must be world-writable and should have
-the "sticky" permission bit enabled so that other users cannot
-delete filter temporary files. The following commands will create
-an appropriate temporary directory called
-<VAR>/foo/bar/tmp</VAR>:</P>
-
-<PRE CLASS="command">
-<KBD>mkdir /foo/bar/tmp</KBD>
-<KBD>chmod a+rwxt /foo/bar/tmp</KBD>
-</PRE>
-
-
 <H2 CLASS="title"><A NAME="Timeout">Timeout</A></H2>
 
 <H3>Examples</H3>
@@ -2712,53 +2145,6 @@ to wait before an active HTTP or IPP request times out in seconds (no suffix), m
 <P>The default timeout is <CODE>5m</CODE> (five minutes).</P>
 
 
-<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.2/OS X 10.5</SPAN><A NAME="UseNetworkDefault">UseNetworkDefault</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-UseNetworkDefault yes
-UseNetworkDefault no
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>UseNetworkDefault</CODE> directive controls whether
-the client will use a network/remote printer as a default
-printer. If enabled, the default printer of a server is used as
-the default printer on a client. When multiple servers are
-advertising a default printer, the client's default printer is
-set to the first discovered printer, or to the implicit class for
-the same printer available from multiple servers.</P>
-
-<P>The default is <CODE>@CUPS_USE_NETWORK_DEFAULT@</CODE>.</P>
-
-
-<H2 CLASS="title"><A NAME="User">User</A></H2>
-
-<H3>Examples</H3>
-
-<PRE CLASS="command">
-User lp
-User guest
-</PRE>
-
-<H3>Description</H3>
-
-<P>The <CODE>User</CODE> directive specifies the UNIX user that
-filter and CGI programs run as. The default user is
-<CODE>@CUPS_USER@</CODE>.</P>
-
-<BLOCKQUOTE><B>Note:</B>
-
-<P>You may not use user <CODE>root</CODE>, as that would expose
-the system to unacceptable security risks. The scheduler will
-automatically choose user <CODE>nobody</CODE> if you specify a
-user whose ID is 0.</P>
-
-</BLOCKQUOTE>
-
-
 <H2 CLASS="title"><SPAN CLASS="INFO">CUPS 1.5</SPAN><A NAME="WebInterface">WebInterface</A></H2>
 
 <H3>Examples</H3>
diff --git a/doc/help/spec-browsing.html b/doc/help/spec-browsing.html
index 4583731d..33f60b62 100644
--- a/doc/help/spec-browsing.html
+++ b/doc/help/spec-browsing.html
@@ -8,11 +8,11 @@
 </head>
 <body>
 <!--
-  "$Id: spec-browsing.html 9727 2011-04-28 21:20:12Z mike $"
+  "$Id: spec-browsing.html 10762 2012-12-13 20:28:30Z mike $"
 
   CUPS Browse Protocol specification for CUPS.
 
-  Copyright 2008-2011 by Apple Inc.
+  Copyright 2008-2012 by Apple Inc.
   Copyright 1997-2005 by Easy Software Products.
 
   These coded instructions, statements, and computer programs are the
@@ -24,7 +24,7 @@
 
 <BLOCKQUOTE><B>Note:</B>
 
-<P>The CUPS Browse Protocol is deprecated and will no longer be used in a future release of CUPS.</P>
+<P>The CUPS Browse Protocol was deprecated in CUPS 1.4 and is no longer supported.</P>
 
 </BLOCKQUOTE>
 
@@ -32,37 +32,37 @@
 
 <h2><a name='INTRO'>Introduction</a></h2>
 
-<p>This specification describes the CUPS browsing protocol which is used for
-printer sharing. The protocol is a UDP/IP-based broadcast service that
-operates on IP service port 631 by default. Each broadcast packet describes
+<p>This specification describes the CUPS browsing protocol which was used for
+printer sharing. The protocol was a UDP/IP-based broadcast service that
+operated on IP service port 631 by default. Each broadcast packet described
 a single printer or class being shared.</p>
 
 <p>For simple networks with a single subnet, a CUPS system sharing a printer
-(the <em>server</em>) will periodically broadcast that printer's availability
+(the <em>server</em>) would periodically broadcast that printer's availability
 and status information to the subnet. Every other CUPS system on the subnet
-(the <em>clients</em>) will receive the broadcast and make that printer
-available to local users. If a client stops receiving broadcasts from the
-server, or if the server sends a special "deleted" broadcast message, the
-client will remove its copy of the printer.</p>
+(the <em>clients</em>) would receive the broadcast and make that printer
+available to local users. If a client stopped receiving broadcasts from the
+server, or if the server sent a special "deleted" broadcast message, the
+client would remove its copy of the printer.</p>
 
-<p>For larger networks with multiple subnets, a relay configuration can be used
-where one or more client systems poll the server and then broadcast the
+<p>For larger networks with multiple subnets, a relay configuration could be used
+where one or more client systems polled the server and then broadcast the
 availability and status information for the server's shared printers to the
 clients' local subnets.</p>
 
-<p>A key feature of CUPS printer sharing is support for <em>implicit
+<p>A key feature of CUPS printer sharing was support for <em>implicit
 classes</em>, which are automatically-created classes for printers that are
-shared by multiple servers. These implicit classes provide automatic load
+shared by multiple servers. These implicit classes provided automatic load
 balancing and fail-safe printing functionality transparently to the user.</p>
 
 
 <h2><a name='SECURITY'>Security Considerations</a></h2>
 
-<p>Like most discovery protocols, CUPS browse packets are not encrypted or
-signed, so it is possible for malicious systems on a network to advertise
+<p>Like most discovery protocols, CUPS browse packets were not encrypted or
+signed, so it was possible for malicious systems on a network to advertise
 or remove printers on that network to cause denial of service or information
-disclosure. In order to combat this, CUPS logs incoming browse packets and
-provides access controls to limit browse packet reception to known hosts.</p>
+disclosure. In order to combat this, CUPS logged incoming browse packets and
+provided access controls to limit browse packet reception to known hosts.</p>
 
 
 <h2><a name='FORMAT'>Browse Packet Format</a></h2>
diff --git a/doc/index.html.in b/doc/index.html.in
index e79d52ef..58381441 100644
--- a/doc/index.html.in
+++ b/doc/index.html.in
@@ -100,7 +100,7 @@ HEIGHT="128" ALT="CUPS"></A></TD>
 </TD></TR>
 <TR><TD>&nbsp;</TD></TR>
 <TR><TD CLASS="trailer">CUPS and the CUPS logo are trademarks of
-<A HREF="http://www.apple.com">Apple Inc.</A> CUPS is copyright 2007-2012 Apple
+<A HREF="http://www.apple.com">Apple Inc.</A> Copyright 2007-2013 Apple
 Inc. All rights reserved.</TD></TR>
 </TABLE>
 </BODY>
diff --git a/doc/ja/index.html.in b/doc/ja/index.html.in
index d43a2ac7..e62d8f1e 100644
--- a/doc/ja/index.html.in
+++ b/doc/ja/index.html.in
@@ -100,7 +100,7 @@ HEIGHT="128" ALT="CUPS"></A></TD>
 </TD></TR>
 <TR><TD>&nbsp;</TD></TR>
 <TR><TD CLASS="trailer">CUPS and the CUPS logo are trademarks of
-<A HREF="http://www.apple.com">Apple Inc.</A> CUPS is copyright 2007-2012 Apple
+<A HREF="http://www.apple.com">Apple Inc.</A> CUPS is copyright 2007-2013 Apple
 Inc. All rights reserved.</TD></TR>
 </TABLE>
 </BODY>
diff --git a/doc/ru/index.html.in b/doc/ru/index.html.in
new file mode 100644
index 00000000..fda6cbcd
--- /dev/null
+++ b/doc/ru/index.html.in
@@ -0,0 +1,206 @@
+<!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>Начало - 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;Начало&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/admin">&nbsp;&nbsp;Администрирование&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/classes/">&nbsp;&nbsp;Группы&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/help/">&nbsp;&nbsp;Справка&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/jobs/">&nbsp;&nbsp;Задания&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/printers/">&nbsp;&nbsp;Принтеры&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel" WIDTH="100%"><FORM ACTION="/help/" METHOD="GET"><INPUT
+TYPE="SEARCH" NAME="QUERY" SIZE="20" PLACEHOLDER="Search Help"
+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>CUPS — поддерживающая большинство стандартов, свободная подсистема печати, разрабатываемая компанией <A HREF="http://www.apple.com/">Apple Inc.</A> для операционной системы Mac OS<SUP>&reg;</SUP> X и других UNIX<SUP>&reg;</SUP>-подобных операционных систем.</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 для пользователей</H2>
+
+<P><A HREF="help/overview.html">Введение в CUPS</A></P>
+
+<P><A HREF="help/options.html">Печать из командной строки</A></P>
+
+<P><A HREF="help/whatsnew.html">Что нового в CUPS 1.6</A></P>
+
+<P><A HREF="http://www.cups.org/newsgroups.php?gcups.general">Форум пользователей</A></P>
+
+</TD><TD VALIGN="top" STYLE="border-right: dotted thin #cccccc; padding-left: 20px; padding-right: 20px;">
+
+<H2>CUPS для администраторов</H2>
+
+<P><A HREF="admin">Добавление принтеров и групп</A></P>
+
+<P><A HREF="help/policies.html">Управление доступом</A></P>
+
+<P><A HREF="help/accounting.html">Использование ресурсов</A></P>
+
+<P><A HREF="help/security.html">Безопасность системы</A></P>
+
+<P><A HREF="help/kerberos.html">Использование аутентификации Kerberos</A></P>
+
+<P><A HREF="help/network.html">Использование сетевых принтеров</A></P>
+
+<P><A HREF="help/ref-cupsd-conf.html">Справочник по cupsd.conf</A></P>
+
+<P><A HREF="http://www.cups.org/ppd.php">Поиск драйверов принтера</A></P>
+
+</TD><TD VALIGN="top" STYLE="padding-left: 20px;">
+
+<H2>CUPS для разработчиков</H2>
+
+<P><A HREF="help/api-overview.html">Введение в разработку CUPS</A></P>
+
+<P><A HREF="help/api-cups.html">CUPS API</A></P>
+
+<P><A HREF="help/api-filter.html">Разработка фильтров и модулей</A></P>
+
+<P><A HREF="help/api-httpipp.html">API доступа по HTTP и IPP</A></P>
+
+<P><A HREF="help/api-ppd.html">PPD API</A></P>
+
+<P><A HREF="help/api-raster.html">Raster API</A></P>
+
+<P><A HREF="help/ref-ppdcfile.html">Справочник по компилятору PPD</A></P>
+
+<P><A HREF="http://www.cups.org/newsgroups.php?gcups.development">Форум разработчиков</A></P>
+
+</TD></TR>
+</TABLE>
+
+</TD></TR>
+<TR><TD>&nbsp;</TD></TR>
+<TR><TD CLASS="trailer">CUPS а также логотип CUPS являются зарегистрированными торговыми марками <A HREF="http://www.apple.com">Apple Inc.</A> Авторские права на CUPS принадлежат (2007-2013) компании Apple Inc. Все права защищены.</TD></TR>
+</TABLE>
+</BODY>
+</HTML>
+<!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>Начало - 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;Начало&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/admin">&nbsp;&nbsp;Администрирование&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/classes/">&nbsp;&nbsp;Группы&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/help/">&nbsp;&nbsp;Справка&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/jobs/">&nbsp;&nbsp;Задания&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/printers/">&nbsp;&nbsp;Принтеры&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel" WIDTH="100%"><FORM ACTION="/help/" METHOD="GET"><INPUT
+TYPE="SEARCH" NAME="QUERY" SIZE="20" PLACEHOLDER="Search Help"
+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>CUPS — поддерживающая большинство стандартов, свободная подсистема печати, разрабатываемая компанией <A HREF="http://www.apple.com/">Apple Inc.</A> для операционной системы Mac OS<SUP>&reg;</SUP> X и других UNIX<SUP>&reg;</SUP>-подобных операционных систем.</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 для пользователей</H2>
+
+<P><A HREF="help/overview.html">Введение в CUPS</A></P>
+
+<P><A HREF="help/options.html">Печать из командной строки</A></P>
+
+<P><A HREF="help/whatsnew.html">Что нового в CUPS 1.6</A></P>
+
+<P><A HREF="http://www.cups.org/newsgroups.php?gcups.general">Форум пользователей</A></P>
+
+</TD><TD VALIGN="top" STYLE="border-right: dotted thin #cccccc; padding-left: 20px; padding-right: 20px;">
+
+<H2>CUPS для администраторов</H2>
+
+<P><A HREF="admin">Добавление принтеров и групп</A></P>
+
+<P><A HREF="help/policies.html">Управление доступом</A></P>
+
+<P><A HREF="help/accounting.html">Использование ресурсов</A></P>
+
+<P><A HREF="help/security.html">Безопасность системы</A></P>
+
+<P><A HREF="help/kerberos.html">Использование аутентификации Kerberos</A></P>
+
+<P><A HREF="help/network.html">Использование сетевых принтеров</A></P>
+
+<P><A HREF="help/ref-cupsd-conf.html">Справочник по cupsd.conf</A></P>
+
+<P><A HREF="http://www.cups.org/ppd.php">Поиск драйверов принтера</A></P>
+
+</TD><TD VALIGN="top" STYLE="padding-left: 20px;">
+
+<H2>CUPS для разработчиков</H2>
+
+<P><A HREF="help/api-overview.html">Введение в разработку CUPS</A></P>
+
+<P><A HREF="help/api-cups.html">CUPS API</A></P>
+
+<P><A HREF="help/api-filter.html">Разработка фильтров и модулей</A></P>
+
+<P><A HREF="help/api-httpipp.html">API доступа по HTTP и IPP</A></P>
+
+<P><A HREF="help/api-ppd.html">PPD API</A></P>
+
+<P><A HREF="help/api-raster.html">Raster API</A></P>
+
+<P><A HREF="help/ref-ppdcfile.html">Справочник по компилятору PPD</A></P>
+
+<P><A HREF="http://www.cups.org/newsgroups.php?gcups.development">Форум разработчиков</A></P>
+
+</TD></TR>
+</TABLE>
+
+</TD></TR>
+<TR><TD>&nbsp;</TD></TR>
+<TR><TD CLASS="trailer">CUPS а также логотип CUPS являются зарегистрированными торговыми марками <A HREF="http://www.apple.com">Apple Inc.</A> Авторские права на CUPS принадлежат (2007-2013) компании Apple Inc. Все права защищены.</TD></TR>
+</TABLE>
+</BODY>
+</HTML>
diff --git a/filter/raster.c b/filter/raster.c
index 3e979fe6..adede6db 100644
--- a/filter/raster.c
+++ b/filter/raster.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: raster.c 10424 2012-04-23 17:26:57Z mike $"
+ * "$Id: raster.c 10629 2012-10-01 02:51:48Z mike $"
  *
  *   Raster file routines for CUPS.
  *
@@ -46,6 +46,9 @@
  */
 
 #include <cups/raster-private.h>
+#ifdef HAVE_STDINT_H
+#  include <stdint.h>
+#endif /* HAVE_STDINT_H */
 
 
 /*
@@ -1472,5 +1475,5 @@ cups_write_fd(void          *ctx,	/* I - File descriptor pointer */
 
 
 /*
- * End of "$Id: raster.c 10424 2012-04-23 17:26:57Z mike $".
+ * End of "$Id: raster.c 10629 2012-10-01 02:51:48Z mike $".
  */
diff --git a/locale/cups.pot b/locale/cups.pot
index ddb65575..12a4da4b 100644
--- a/locale/cups.pot
+++ b/locale/cups.pot
@@ -30,7 +30,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2012-05-23 16:24-0700\n"
+"POT-Creation-Date: 2013-03-08 13:25-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -250,7 +250,7 @@ msgstr ""
 msgid "                REF: Pages 52-54, section 5.2."
 msgstr ""
 
-#: berkeley/lpq.c:554
+#: berkeley/lpq.c:558
 #, c-format
 msgid "        %-39.39s %.0f bytes"
 msgstr ""
@@ -1007,19 +1007,19 @@ msgstr ""
 msgid "  --lf                    End lines with LF (UNIX/Linux/OS X)."
 msgstr ""
 
-#: test/ipptool.c:4404
+#: test/ipptool.c:4485
 msgid "  -4                      Connect using IPv4."
 msgstr ""
 
-#: test/ipptool.c:4405
+#: test/ipptool.c:4486
 msgid "  -6                      Connect using IPv6."
 msgstr ""
 
-#: test/ipptool.c:4406
+#: test/ipptool.c:4487
 msgid "  -C                      Send requests using chunking (default)."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1431
+#: scheduler/cupsfilter.c:1434
 msgid "  -D                      Remove the input file when finished."
 msgstr ""
 
@@ -1031,11 +1031,11 @@ msgstr ""
 msgid "  -E                      Encrypt the connection."
 msgstr ""
 
-#: test/ipptool.c:4408
+#: test/ipptool.c:4489
 msgid "  -E                      Test with HTTP Upgrade to TLS."
 msgstr ""
 
-#: scheduler/main.c:2021
+#: scheduler/main.c:2057
 msgid "  -F                      Run in the foreground but detach from console."
 msgstr ""
 
@@ -1043,7 +1043,7 @@ msgstr ""
 msgid "  -H samba-server         Use the named SAMBA server."
 msgstr ""
 
-#: test/ipptool.c:4410
+#: test/ipptool.c:4491
 msgid "  -I                      Ignore errors."
 msgstr ""
 
@@ -1055,11 +1055,11 @@ msgstr ""
 msgid "  -I {filename,filters,none,profiles}"
 msgstr ""
 
-#: test/ipptool.c:4411
+#: test/ipptool.c:4492
 msgid "  -L                      Send requests using content-length."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1433
+#: scheduler/cupsfilter.c:1436
 msgid "  -P filename.ppd         Set PPD file."
 msgstr ""
 
@@ -1067,19 +1067,19 @@ msgstr ""
 msgid "  -R root-directory       Set alternate root."
 msgstr ""
 
-#: test/ipptool.c:4413
+#: test/ipptool.c:4494
 msgid "  -S                      Test with SSL encryption."
 msgstr ""
 
-#: test/ipptool.c:4415
+#: test/ipptool.c:4496
 msgid "  -T seconds              Set the receive/send timeout in seconds."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1434 systemv/cupsaddsmb.c:288 systemv/cupsctl.c:206
+#: scheduler/cupsfilter.c:1437 systemv/cupsaddsmb.c:288 systemv/cupsctl.c:206
 msgid "  -U username             Specify username."
 msgstr ""
 
-#: test/ipptool.c:4417
+#: test/ipptool.c:4498
 msgid "  -V version              Set default IPP version."
 msgstr ""
 
@@ -1087,7 +1087,7 @@ msgstr ""
 msgid "  -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,translations}"
 msgstr ""
 
-#: test/ipptool.c:4419
+#: test/ipptool.c:4500
 msgid "  -X                      Produce XML plist instead of plain text."
 msgstr ""
 
@@ -1099,11 +1099,11 @@ msgstr ""
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1435 scheduler/main.c:2019
+#: scheduler/cupsfilter.c:1438 scheduler/main.c:2055
 msgid "  -c cupsd.conf           Set cupsd.conf file to use."
 msgstr ""
 
-#: test/ipptool.c:4421
+#: test/ipptool.c:4502
 msgid "  -d name=value           Set named variable to value."
 msgstr ""
 
@@ -1111,23 +1111,23 @@ msgstr ""
 msgid "  -d output-dir           Specify the output directory."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1437
+#: scheduler/cupsfilter.c:1440
 msgid "  -d printer              Use the named printer."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1439
+#: scheduler/cupsfilter.c:1442
 msgid "  -e                      Use every filter from the PPD file."
 msgstr ""
 
-#: scheduler/main.c:2020
+#: scheduler/main.c:2056
 msgid "  -f                      Run in the foreground."
 msgstr ""
 
-#: test/ipptool.c:4423
+#: test/ipptool.c:4504
 msgid "  -f filename             Set default request filename."
 msgstr ""
 
-#: scheduler/main.c:2023
+#: scheduler/main.c:2059
 msgid "  -h                      Show this usage message."
 msgstr ""
 
@@ -1135,19 +1135,19 @@ msgstr ""
 msgid "  -h server[:port]        Specify server address."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1441
+#: scheduler/cupsfilter.c:1444
 msgid "  -i mime/type            Set input MIME type (otherwise auto-typed)."
 msgstr ""
 
-#: test/ipptool.c:4425
+#: test/ipptool.c:4506
 msgid "  -i seconds              Repeat the last file with the given time interval."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1443
+#: scheduler/cupsfilter.c:1446
 msgid "  -j job-id[,N]           Filter file N from the specified job (default is file 1)."
 msgstr ""
 
-#: scheduler/main.c:2024
+#: scheduler/main.c:2060
 msgid "  -l                      Run cupsd from launchd(8)."
 msgstr ""
 
@@ -1159,15 +1159,15 @@ msgstr ""
 msgid "  -m                      Use the ModelName value as the filename."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1445
+#: scheduler/cupsfilter.c:1448
 msgid "  -m mime/type            Set output MIME type (otherwise application/pdf)."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1447
+#: scheduler/cupsfilter.c:1450
 msgid "  -n copies               Set number of copies."
 msgstr ""
 
-#: test/ipptool.c:4427
+#: test/ipptool.c:4508
 msgid "  -n count                Repeat the last file the given number of times."
 msgstr ""
 
@@ -1179,15 +1179,15 @@ msgstr ""
 msgid "  -o filename.ppd[.gz]    Set output file (otherwise stdout)."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1448
+#: scheduler/cupsfilter.c:1451
 msgid "  -o name=value           Set option(s)."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1449
+#: scheduler/cupsfilter.c:1452
 msgid "  -p filename.ppd         Set PPD file."
 msgstr ""
 
-#: systemv/cupstestppd.c:3806 test/ipptool.c:4429
+#: systemv/cupstestppd.c:3806 test/ipptool.c:4510
 msgid "  -q                      Run silently."
 msgstr ""
 
@@ -1195,7 +1195,7 @@ msgstr ""
 msgid "  -r                      Use 'relaxed' open mode."
 msgstr ""
 
-#: test/ipptool.c:4430
+#: test/ipptool.c:4511
 msgid "  -t                      Produce a test report."
 msgstr ""
 
@@ -1203,19 +1203,19 @@ msgstr ""
 msgid "  -t                      Test PPDs instead of generating them."
 msgstr ""
 
-#: scheduler/main.c:2025
+#: scheduler/main.c:2061
 msgid "  -t                      Test the configuration file."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1450
+#: scheduler/cupsfilter.c:1453
 msgid "  -t title                Set title."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1451
+#: scheduler/cupsfilter.c:1454
 msgid "  -u                      Remove the PPD file when finished."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:291 systemv/cupstestppd.c:3808 test/ipptool.c:4431
+#: systemv/cupsaddsmb.c:291 systemv/cupstestppd.c:3808 test/ipptool.c:4512
 #: ppdc/ppdc.cxx:452 ppdc/ppdpo.cxx:259
 msgid "  -v                      Be verbose."
 msgstr ""
@@ -1289,12 +1289,12 @@ msgstr ""
 msgid " PASS"
 msgstr ""
 
-#: berkeley/lpq.c:560
+#: berkeley/lpq.c:564
 #, c-format
 msgid "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes"
 msgstr ""
 
-#: berkeley/lpq.c:565
+#: berkeley/lpq.c:569
 #, c-format
 msgid "%-7s %-7.7s %-7d %-31.31s %.0f bytes"
 msgstr ""
@@ -1304,7 +1304,7 @@ msgstr ""
 msgid "%s accepting requests since %s"
 msgstr ""
 
-#: scheduler/ipp.c:10045
+#: scheduler/ipp.c:10143
 #, c-format
 msgid "%s cannot be changed."
 msgstr ""
@@ -1314,17 +1314,17 @@ msgstr ""
 msgid "%s is not implemented by the CUPS version of lpc."
 msgstr ""
 
-#: berkeley/lpq.c:651
+#: berkeley/lpq.c:655
 #, c-format
 msgid "%s is not ready"
 msgstr ""
 
-#: berkeley/lpq.c:644
+#: berkeley/lpq.c:648
 #, c-format
 msgid "%s is ready"
 msgstr ""
 
-#: berkeley/lpq.c:647
+#: berkeley/lpq.c:651
 #, c-format
 msgid "%s is ready and printing"
 msgstr ""
@@ -1355,13 +1355,13 @@ msgstr ""
 msgid "%s/%s not accepting requests since %s -"
 msgstr ""
 
-#: berkeley/lpq.c:552
+#: berkeley/lpq.c:556
 #, c-format
 msgid "%s: %-33.33s [job %d localhost]"
 msgstr ""
 
 #. TRANSLATORS: Message is "subject: error"
-#: cups/langprintf.c:86 scheduler/cupsfilter.c:714 systemv/lpadmin.c:805
+#: cups/langprintf.c:86 scheduler/cupsfilter.c:716 systemv/lpadmin.c:805
 #: systemv/lpadmin.c:856 systemv/lpadmin.c:906 systemv/lpadmin.c:962
 #: systemv/lpadmin.c:1060 systemv/lpadmin.c:1112 systemv/lpadmin.c:1168
 #: systemv/lpadmin.c:1478
@@ -1379,7 +1379,7 @@ msgstr ""
 msgid "%s: Don't know what to do."
 msgstr ""
 
-#: berkeley/lpq.c:236 berkeley/lpr.c:344 systemv/lp.c:584
+#: berkeley/lpq.c:236 berkeley/lpr.c:344 systemv/lp.c:591
 #, c-format
 msgid "%s: Error - %s environment variable names non-existent destination \"%s\"."
 msgstr ""
@@ -1394,7 +1394,7 @@ msgstr ""
 msgid "%s: Error - cannot print files and alter jobs simultaneously."
 msgstr ""
 
-#: systemv/lp.c:505
+#: systemv/lp.c:512
 #, c-format
 msgid "%s: Error - cannot print from stdin if files or a job ID are provided."
 msgstr ""
@@ -1512,7 +1512,7 @@ msgstr ""
 msgid "%s: Error - need \"completed\", \"not-completed\", or \"all\" after \"-W\" option."
 msgstr ""
 
-#: berkeley/lpq.c:241 berkeley/lpr.c:349 systemv/lp.c:589
+#: berkeley/lpq.c:241 berkeley/lpr.c:349 systemv/lp.c:596
 #, c-format
 msgid "%s: Error - no default destination available."
 msgstr ""
@@ -1522,22 +1522,22 @@ msgstr ""
 msgid "%s: Error - priority must be between 1 and 100."
 msgstr ""
 
-#: berkeley/lpr.c:352 systemv/lp.c:592
+#: berkeley/lpr.c:352 systemv/lp.c:599
 #, c-format
 msgid "%s: Error - scheduler not responding."
 msgstr ""
 
-#: berkeley/lpr.c:305 systemv/lp.c:537
+#: berkeley/lpr.c:305 systemv/lp.c:544
 #, c-format
 msgid "%s: Error - too many files - \"%s\"."
 msgstr ""
 
-#: berkeley/lpr.c:287 systemv/lp.c:520
+#: berkeley/lpr.c:287 systemv/lp.c:527
 #, c-format
 msgid "%s: Error - unable to access \"%s\" - %s"
 msgstr ""
 
-#: berkeley/lpr.c:395 systemv/lp.c:623
+#: berkeley/lpr.c:395 systemv/lp.c:630
 #, c-format
 msgid "%s: Error - unable to queue from stdin - %s."
 msgstr ""
@@ -1553,12 +1553,12 @@ msgid "%s: Error - unknown destination \"%s/%s\"."
 msgstr ""
 
 #: berkeley/lpr.c:274 berkeley/lprm.c:139 systemv/cancel.c:156
-#: systemv/cupsaccept.c:164 systemv/lp.c:496 systemv/lpstat.c:452
+#: systemv/cupsaccept.c:164 systemv/lp.c:503 systemv/lpstat.c:452
 #, c-format
 msgid "%s: Error - unknown option \"%c\"."
 msgstr ""
 
-#: systemv/cupsaccept.c:157
+#: systemv/cupsaccept.c:157 systemv/lp.c:494
 #, c-format
 msgid "%s: Error - unknown option \"%s\"."
 msgstr ""
@@ -1573,7 +1573,7 @@ msgstr ""
 msgid "%s: Invalid destination name in list \"%s\"."
 msgstr ""
 
-#: scheduler/cupsfilter.c:567
+#: scheduler/cupsfilter.c:569
 #, c-format
 msgid "%s: Invalid filter string \"%s\"."
 msgstr ""
@@ -1583,7 +1583,7 @@ msgstr ""
 msgid "%s: Need job ID (\"-i jobid\") before \"-H restart\"."
 msgstr ""
 
-#: scheduler/cupsfilter.c:458
+#: scheduler/cupsfilter.c:460
 #, c-format
 msgid "%s: No filter to convert from %s/%s to %s/%s."
 msgstr ""
@@ -1596,12 +1596,12 @@ msgstr ""
 #: berkeley/lpq.c:97 berkeley/lpr.c:70 berkeley/lprm.c:67 systemv/cancel.c:81
 #: systemv/cupsaccept.c:88 systemv/cupsaddsmb.c:86 systemv/lp.c:102
 #: systemv/lpadmin.c:239 systemv/lpinfo.c:88 systemv/lpmove.c:73
-#: systemv/lpstat.c:102 test/ipptool.c:304 test/ipptool.c:321
+#: systemv/lpstat.c:102 test/ipptool.c:307 test/ipptool.c:324
 #, c-format
 msgid "%s: Sorry, no encryption support."
 msgstr ""
 
-#: berkeley/lpq.c:295 scheduler/cupsfilter.c:1221 systemv/cancel.c:237
+#: berkeley/lpq.c:295 scheduler/cupsfilter.c:1224 systemv/cancel.c:237
 #: systemv/cupsaddsmb.c:144 systemv/cupsaddsmb.c:171
 #, c-format
 msgid "%s: Unable to connect to server."
@@ -1612,7 +1612,7 @@ msgstr ""
 msgid "%s: Unable to contact server."
 msgstr ""
 
-#: scheduler/cupsfilter.c:424
+#: scheduler/cupsfilter.c:425
 #, c-format
 msgid "%s: Unable to determine MIME type of \"%s\"."
 msgstr ""
@@ -1622,7 +1622,7 @@ msgstr ""
 msgid "%s: Unable to open %s: %s"
 msgstr ""
 
-#: scheduler/cupsfilter.c:662 ppdc/ppdmerge.cxx:112
+#: scheduler/cupsfilter.c:664 ppdc/ppdmerge.cxx:112
 #, c-format
 msgid "%s: Unable to open PPD file: %s on line %d."
 msgstr ""
@@ -1637,17 +1637,17 @@ msgstr ""
 msgid "%s: Unknown destination \"%s\"."
 msgstr ""
 
-#: scheduler/cupsfilter.c:435
+#: scheduler/cupsfilter.c:437
 #, c-format
 msgid "%s: Unknown destination MIME type %s/%s."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1426
+#: scheduler/cupsfilter.c:1429
 #, c-format
 msgid "%s: Unknown option \"%c\"."
 msgstr ""
 
-#: scheduler/cupsfilter.c:416
+#: scheduler/cupsfilter.c:417
 #, c-format
 msgid "%s: Unknown source MIME type %s/%s."
 msgstr ""
@@ -2481,7 +2481,7 @@ msgstr ""
 msgid "A Samba username is required to export printer drivers"
 msgstr ""
 
-#: scheduler/ipp.c:2283
+#: scheduler/ipp.c:2381
 #, c-format
 msgid "A class named \"%s\" already exists."
 msgstr ""
@@ -2660,7 +2660,7 @@ msgstr ""
 msgid "Always"
 msgstr ""
 
-#: backend/socket.c:129
+#: backend/socket.c:130
 msgid "AppSocket/HP JetDirect"
 msgstr ""
 
@@ -2726,6 +2726,11 @@ msgstr ""
 msgid "B9"
 msgstr ""
 
+#: scheduler/ipp.c:11068
+#, c-format
+msgid "Bad 'document-format' value \"%s\"."
+msgstr ""
+
 #: cups/dest.c:1680
 msgid "Bad NULL dests pointer"
 msgstr ""
@@ -2742,16 +2747,16 @@ msgstr ""
 msgid "Bad OrderDependency"
 msgstr ""
 
-#: cups/ppd-cache.c:148 cups/ppd-cache.c:195 cups/ppd-cache.c:233
-#: cups/ppd-cache.c:239 cups/ppd-cache.c:255 cups/ppd-cache.c:271
-#: cups/ppd-cache.c:280 cups/ppd-cache.c:288 cups/ppd-cache.c:305
-#: cups/ppd-cache.c:313 cups/ppd-cache.c:328 cups/ppd-cache.c:336
-#: cups/ppd-cache.c:354 cups/ppd-cache.c:366 cups/ppd-cache.c:381
-#: cups/ppd-cache.c:393 cups/ppd-cache.c:415 cups/ppd-cache.c:423
-#: cups/ppd-cache.c:441 cups/ppd-cache.c:449 cups/ppd-cache.c:464
-#: cups/ppd-cache.c:472 cups/ppd-cache.c:490 cups/ppd-cache.c:498
-#: cups/ppd-cache.c:525 cups/ppd-cache.c:571 cups/ppd-cache.c:579
-#: cups/ppd-cache.c:587
+#: cups/ppd-cache.c:149 cups/ppd-cache.c:196 cups/ppd-cache.c:234
+#: cups/ppd-cache.c:240 cups/ppd-cache.c:256 cups/ppd-cache.c:272
+#: cups/ppd-cache.c:281 cups/ppd-cache.c:289 cups/ppd-cache.c:306
+#: cups/ppd-cache.c:314 cups/ppd-cache.c:329 cups/ppd-cache.c:337
+#: cups/ppd-cache.c:358 cups/ppd-cache.c:370 cups/ppd-cache.c:385
+#: cups/ppd-cache.c:397 cups/ppd-cache.c:419 cups/ppd-cache.c:427
+#: cups/ppd-cache.c:445 cups/ppd-cache.c:453 cups/ppd-cache.c:468
+#: cups/ppd-cache.c:476 cups/ppd-cache.c:494 cups/ppd-cache.c:502
+#: cups/ppd-cache.c:529 cups/ppd-cache.c:575 cups/ppd-cache.c:583
+#: cups/ppd-cache.c:591
 msgid "Bad PPD cache file."
 msgstr ""
 
@@ -2767,7 +2772,7 @@ msgstr ""
 msgid "Bad UIConstraints"
 msgstr ""
 
-#: scheduler/ipp.c:1380
+#: scheduler/ipp.c:1416
 #, c-format
 msgid "Bad copies value %d."
 msgstr ""
@@ -2776,23 +2781,22 @@ msgstr ""
 msgid "Bad custom parameter"
 msgstr ""
 
-#: cups/http-support.c:1451 scheduler/ipp.c:2350
+#: cups/http-support.c:1451 scheduler/ipp.c:2448
 #, c-format
 msgid "Bad device-uri \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:2391
+#: scheduler/ipp.c:2489
 #, c-format
 msgid "Bad device-uri scheme \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:8224 scheduler/ipp.c:8240 scheduler/ipp.c:9454
-#: scheduler/ipp.c:10968
+#: scheduler/ipp.c:8322 scheduler/ipp.c:8338 scheduler/ipp.c:9552
 #, c-format
 msgid "Bad document-format \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:9470
+#: scheduler/ipp.c:9568
 #, c-format
 msgid "Bad document-format-default \"%s\"."
 msgstr ""
@@ -2801,42 +2805,54 @@ msgstr ""
 msgid "Bad filename buffer"
 msgstr ""
 
-#: scheduler/ipp.c:10060
+#: scheduler/ipp.c:1631
+msgid "Bad job-name value: Bad UTF-8 sequence."
+msgstr ""
+
+#: scheduler/ipp.c:1634
+msgid "Bad job-name value: Name too long."
+msgstr ""
+
+#: scheduler/ipp.c:1585
+msgid "Bad job-name value: Wrong type or count."
+msgstr ""
+
+#: scheduler/ipp.c:10158
 msgid "Bad job-priority value."
 msgstr ""
 
-#: scheduler/ipp.c:1410
+#: scheduler/ipp.c:1446
 #, c-format
 msgid "Bad job-sheets value \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:1394
+#: scheduler/ipp.c:1430
 msgid "Bad job-sheets value type."
 msgstr ""
 
-#: scheduler/ipp.c:10090
+#: scheduler/ipp.c:10188
 msgid "Bad job-state value."
 msgstr ""
 
-#: scheduler/ipp.c:2974 scheduler/ipp.c:3426 scheduler/ipp.c:6078
-#: scheduler/ipp.c:6225 scheduler/ipp.c:7658 scheduler/ipp.c:7927
-#: scheduler/ipp.c:8775 scheduler/ipp.c:9001 scheduler/ipp.c:9350
-#: scheduler/ipp.c:9953
+#: scheduler/ipp.c:3072 scheduler/ipp.c:3524 scheduler/ipp.c:6176
+#: scheduler/ipp.c:6323 scheduler/ipp.c:7756 scheduler/ipp.c:8025
+#: scheduler/ipp.c:8873 scheduler/ipp.c:9099 scheduler/ipp.c:9448
+#: scheduler/ipp.c:10051
 #, c-format
 msgid "Bad job-uri \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:2049 scheduler/ipp.c:5622
+#: scheduler/ipp.c:2147 scheduler/ipp.c:5720
 #, c-format
 msgid "Bad notify-pull-method \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:2013 scheduler/ipp.c:5586
+#: scheduler/ipp.c:2111 scheduler/ipp.c:5684
 #, c-format
 msgid "Bad notify-recipient-uri \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:1426
+#: scheduler/ipp.c:1462
 #, c-format
 msgid "Bad number-up value %d."
 msgstr ""
@@ -2846,12 +2862,12 @@ msgstr ""
 msgid "Bad option + choice on line %d."
 msgstr ""
 
-#: scheduler/ipp.c:1443
+#: scheduler/ipp.c:1479
 #, c-format
 msgid "Bad page-ranges values %d-%d."
 msgstr ""
 
-#: scheduler/ipp.c:2434
+#: scheduler/ipp.c:2532
 #, c-format
 msgid "Bad port-monitor \"%s\"."
 msgstr ""
@@ -2860,7 +2876,7 @@ msgstr ""
 msgid "Bad printer URI."
 msgstr ""
 
-#: scheduler/ipp.c:2495
+#: scheduler/ipp.c:2593
 #, c-format
 msgid "Bad printer-state value %d."
 msgstr ""
@@ -2912,11 +2928,11 @@ msgstr ""
 msgid "Cancel RSS Subscription"
 msgstr ""
 
-#: backend/ipp.c:1921
+#: backend/ipp.c:2020
 msgid "Canceling print job."
 msgstr ""
 
-#: scheduler/ipp.c:2475
+#: scheduler/ipp.c:2573
 msgid "Cannot share a remote Kerberized printer."
 msgstr ""
 
@@ -2929,7 +2945,7 @@ msgstr ""
 msgid "Change Settings"
 msgstr ""
 
-#: scheduler/ipp.c:2061 scheduler/ipp.c:5634
+#: scheduler/ipp.c:2159 scheduler/ipp.c:5732
 #, c-format
 msgid "Character set \"%s\" not supported."
 msgstr ""
@@ -2942,7 +2958,7 @@ msgstr ""
 msgid "Clean Print Heads"
 msgstr ""
 
-#: scheduler/ipp.c:3878
+#: scheduler/ipp.c:3976
 msgid "Close-Job doesn't support the job-uri attribute."
 msgstr ""
 
@@ -2965,11 +2981,11 @@ msgstr ""
 msgid "Community name uses indefinite length"
 msgstr ""
 
-#: backend/ipp.c:786 backend/lpd.c:871 backend/socket.c:395
+#: backend/ipp.c:801 backend/lpd.c:888 backend/socket.c:409
 msgid "Connected to printer."
 msgstr ""
 
-#: backend/ipp.c:691 backend/lpd.c:694 backend/socket.c:314
+#: backend/ipp.c:706 backend/lpd.c:711 backend/socket.c:328
 msgid "Connecting to printer."
 msgstr ""
 
@@ -2981,11 +2997,11 @@ msgstr ""
 msgid "Continuous"
 msgstr ""
 
-#: backend/lpd.c:1020 backend/lpd.c:1152
+#: backend/lpd.c:1037 backend/lpd.c:1169
 msgid "Control file sent successfully."
 msgstr ""
 
-#: backend/ipp.c:1233 backend/lpd.c:464
+#: backend/ipp.c:1260 backend/lpd.c:481
 msgid "Copying print data."
 msgstr ""
 
@@ -3021,7 +3037,7 @@ msgstr ""
 msgid "Darkness"
 msgstr ""
 
-#: backend/lpd.c:1105
+#: backend/lpd.c:1122
 msgid "Data file sent successfully."
 msgstr ""
 
@@ -3037,7 +3053,7 @@ msgstr ""
 msgid "DeskJet Series"
 msgstr ""
 
-#: scheduler/ipp.c:1346
+#: scheduler/ipp.c:1361
 #, c-format
 msgid "Destination \"%s\" is not accepting jobs."
 msgstr ""
@@ -3086,7 +3102,7 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: scheduler/ipp.c:6127
+#: scheduler/ipp.c:6225
 #, c-format
 msgid "Document #%d does not exist in job #%d."
 msgstr ""
@@ -3138,7 +3154,7 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: scheduler/client.c:2427
+#: scheduler/client.c:2435
 msgid "Enter your username and password or the root username and password to access this page. If you are using Kerberos authentication, make sure you have a valid Kerberos ticket."
 msgstr ""
 
@@ -3474,9 +3490,9 @@ msgstr ""
 msgid "File Folder "
 msgstr ""
 
-#: scheduler/ipp.c:2370
+#: scheduler/ipp.c:2468
 #, c-format
-msgid "File device URIs have been disabled. To enable, see the FileDevice directive in \"%s/cupsd.conf\"."
+msgid "File device URIs have been disabled. To enable, see the FileDevice directive in \"%s/cups-files.conf\"."
 msgstr ""
 
 #: filter/rastertoepson.c:1117 filter/rastertohp.c:845
@@ -3509,10 +3525,10 @@ msgstr ""
 msgid "Glossy Paper"
 msgstr ""
 
-#: scheduler/ipp.c:2952 scheduler/ipp.c:3352 scheduler/ipp.c:3890
-#: scheduler/ipp.c:6056 scheduler/ipp.c:6203 scheduler/ipp.c:7635
-#: scheduler/ipp.c:8753 scheduler/ipp.c:8979 scheduler/ipp.c:9328
-#: scheduler/ipp.c:9931
+#: scheduler/ipp.c:3050 scheduler/ipp.c:3450 scheduler/ipp.c:3988
+#: scheduler/ipp.c:6154 scheduler/ipp.c:6301 scheduler/ipp.c:7733
+#: scheduler/ipp.c:8851 scheduler/ipp.c:9077 scheduler/ipp.c:9426
+#: scheduler/ipp.c:10029
 msgid "Got a printer-uri attribute but no job-id."
 msgstr ""
 
@@ -3532,83 +3548,87 @@ msgstr ""
 msgid "Help file not in index."
 msgstr ""
 
-#: cups/ipp.c:2687 cups/ipp.c:2714 cups/ipp.c:2737
+#: cups/ipp.c:2689 cups/ipp.c:2716 cups/ipp.c:2739
 msgid "IPP 1setOf attribute with incompatible value tags."
 msgstr ""
 
-#: cups/ipp.c:2650
+#: cups/ipp.c:2652
 msgid "IPP attribute has no name."
 msgstr ""
 
-#: cups/ipp.c:5487
+#: cups/ipp.c:5521
 msgid "IPP attribute is not a member of the message."
 msgstr ""
 
-#: cups/ipp.c:3083
+#: cups/ipp.c:3092
 msgid "IPP begCollection value not 0 bytes."
 msgstr ""
 
-#: cups/ipp.c:2873
+#: cups/ipp.c:2882
 msgid "IPP boolean value not 1 byte."
 msgstr ""
 
-#: cups/ipp.c:2934
+#: cups/ipp.c:2943
 msgid "IPP date value not 11 bytes."
 msgstr ""
 
-#: cups/ipp.c:3104
+#: cups/ipp.c:3113
 msgid "IPP endCollection value not 0 bytes."
 msgstr ""
 
-#: cups/ipp.c:2848
+#: cups/ipp.c:2857
 msgid "IPP enum value not 4 bytes."
 msgstr ""
 
-#: cups/ipp.c:2579
+#: cups/ipp.c:2581
 msgid "IPP extension tag larger than 0x7FFFFFFF."
 msgstr ""
 
-#: cups/ipp.c:2845
+#: cups/ipp.c:2854
 msgid "IPP integer value not 4 bytes."
 msgstr ""
 
-#: cups/ipp.c:3045
+#: cups/ipp.c:3054
 msgid "IPP language length overflows value."
 msgstr ""
 
-#: cups/ipp.c:2764
+#: cups/ipp.c:2766
 msgid "IPP member name is not empty."
 msgstr ""
 
-#: cups/ipp.c:3122
+#: cups/ipp.c:3139
 msgid "IPP memberName value is empty."
 msgstr ""
 
-#: cups/ipp.c:2633
+#: cups/ipp.c:3131
+msgid "IPP memberName with no attribute."
+msgstr ""
+
+#: cups/ipp.c:2635
 msgid "IPP name larger than 32767 bytes."
 msgstr ""
 
-#: cups/ipp.c:3011
+#: cups/ipp.c:3020
 msgid "IPP nameWithLanguage value less than minimum 4 bytes."
 msgstr ""
 
-#: cups/ipp.c:2979
+#: cups/ipp.c:2988
 msgid "IPP rangeOfInteger value not 8 bytes."
 msgstr ""
 
-#: cups/ipp.c:2952
+#: cups/ipp.c:2961
 msgid "IPP resolution value not 9 bytes."
 msgstr ""
 
-#: cups/ipp.c:3063
+#: cups/ipp.c:3072
 msgid "IPP string length overflows value."
 msgstr ""
 
-#: cups/ipp.c:3007
+#: cups/ipp.c:3016
 msgid "IPP textWithLanguage value less than minimum 4 bytes."
 msgstr ""
 
-#: cups/ipp.c:2831
+#: cups/ipp.c:2840
 msgid "IPP value larger than 32767 bytes."
 msgstr ""
 
@@ -3668,11 +3688,11 @@ msgstr ""
 msgid "Internet Postage 3-Part"
 msgstr ""
 
-#: backend/ipp.c:307
+#: backend/ipp.c:309
 msgid "Internet Printing Protocol"
 msgstr ""
 
-#: cups/dest-options.c:839
+#: cups/dest-options.c:837
 msgid "Invalid media size."
 msgstr ""
 
@@ -3741,52 +3761,52 @@ msgstr ""
 msgid "JIS B9"
 msgstr ""
 
-#: scheduler/ipp.c:9051
+#: scheduler/ipp.c:9149
 #, c-format
 msgid "Job #%d cannot be restarted - no files."
 msgstr ""
 
-#: scheduler/ipp.c:2992 scheduler/ipp.c:3222 scheduler/ipp.c:3277
-#: scheduler/ipp.c:3454 scheduler/ipp.c:3900 scheduler/ipp.c:5720
-#: scheduler/ipp.c:6096 scheduler/ipp.c:6243 scheduler/ipp.c:6543
-#: scheduler/ipp.c:7482 scheduler/ipp.c:7504 scheduler/ipp.c:7676
-#: scheduler/ipp.c:7901 scheduler/ipp.c:7944 scheduler/ipp.c:8793
-#: scheduler/ipp.c:9019 scheduler/ipp.c:9368 scheduler/ipp.c:9971
+#: scheduler/ipp.c:3090 scheduler/ipp.c:3320 scheduler/ipp.c:3375
+#: scheduler/ipp.c:3552 scheduler/ipp.c:3998 scheduler/ipp.c:5818
+#: scheduler/ipp.c:6194 scheduler/ipp.c:6341 scheduler/ipp.c:6641
+#: scheduler/ipp.c:7580 scheduler/ipp.c:7602 scheduler/ipp.c:7774
+#: scheduler/ipp.c:7999 scheduler/ipp.c:8042 scheduler/ipp.c:8891
+#: scheduler/ipp.c:9117 scheduler/ipp.c:9466 scheduler/ipp.c:10069
 #, c-format
 msgid "Job #%d does not exist."
 msgstr ""
 
-#: scheduler/ipp.c:3486
+#: scheduler/ipp.c:3584
 #, c-format
 msgid "Job #%d is already aborted - can't cancel."
 msgstr ""
 
-#: scheduler/ipp.c:3480
+#: scheduler/ipp.c:3578
 #, c-format
 msgid "Job #%d is already canceled - can't cancel."
 msgstr ""
 
-#: scheduler/ipp.c:3492
+#: scheduler/ipp.c:3590
 #, c-format
 msgid "Job #%d is already completed - can't cancel."
 msgstr ""
 
-#: scheduler/ipp.c:7702 scheduler/ipp.c:7986 scheduler/ipp.c:9986
+#: scheduler/ipp.c:7800 scheduler/ipp.c:8084 scheduler/ipp.c:10084
 #, c-format
 msgid "Job #%d is finished and cannot be altered."
 msgstr ""
 
-#: scheduler/ipp.c:9033
+#: scheduler/ipp.c:9131
 #, c-format
 msgid "Job #%d is not complete."
 msgstr ""
 
-#: scheduler/ipp.c:3007
+#: scheduler/ipp.c:3105
 #, c-format
 msgid "Job #%d is not held for authentication."
 msgstr ""
 
-#: scheduler/ipp.c:8807
+#: scheduler/ipp.c:8905
 #, c-format
 msgid "Job #%d is not held."
 msgstr ""
@@ -3807,7 +3827,7 @@ msgstr ""
 msgid "Job Stopped"
 msgstr ""
 
-#: scheduler/ipp.c:10068
+#: scheduler/ipp.c:10166
 msgid "Job is completed and cannot be changed."
 msgstr ""
 
@@ -3815,11 +3835,11 @@ msgstr ""
 msgid "Job operation failed"
 msgstr ""
 
-#: scheduler/ipp.c:10104 scheduler/ipp.c:10123 scheduler/ipp.c:10134
+#: scheduler/ipp.c:10202 scheduler/ipp.c:10221 scheduler/ipp.c:10232
 msgid "Job state cannot be changed."
 msgstr ""
 
-#: scheduler/ipp.c:8899
+#: scheduler/ipp.c:8997
 msgid "Job subscriptions cannot be renewed."
 msgstr ""
 
@@ -3827,7 +3847,7 @@ msgstr ""
 msgid "Jobs"
 msgstr ""
 
-#: backend/lpd.c:185
+#: backend/lpd.c:186
 msgid "LPD/LPR Host or Printer"
 msgstr ""
 
@@ -3839,7 +3859,7 @@ msgstr ""
 msgid "Label Top"
 msgstr ""
 
-#: scheduler/ipp.c:2070 scheduler/ipp.c:5643
+#: scheduler/ipp.c:2168 scheduler/ipp.c:5741
 #, c-format
 msgid "Language \"%s\" not supported."
 msgstr ""
@@ -3876,7 +3896,7 @@ msgstr ""
 msgid "Long-Edge (Portrait)"
 msgstr ""
 
-#: cups/http-support.c:1558
+#: cups/http-support.c:1559
 msgid "Looking for printer."
 msgstr ""
 
@@ -3920,7 +3940,7 @@ msgstr ""
 msgid "Missing asterisk in column 1"
 msgstr ""
 
-#: scheduler/ipp.c:6119
+#: scheduler/ipp.c:6217
 msgid "Missing document-number attribute."
 msgstr ""
 
@@ -3935,7 +3955,7 @@ msgstr ""
 msgid "Missing form variable"
 msgstr ""
 
-#: scheduler/ipp.c:9422
+#: scheduler/ipp.c:9520
 msgid "Missing last-document attribute in request."
 msgstr ""
 
@@ -3947,7 +3967,7 @@ msgstr ""
 msgid "Missing media-size in media-col."
 msgstr ""
 
-#: scheduler/ipp.c:6673
+#: scheduler/ipp.c:6771
 msgid "Missing notify-subscription-ids attribute."
 msgstr ""
 
@@ -3955,7 +3975,7 @@ msgstr ""
 msgid "Missing option keyword"
 msgstr ""
 
-#: scheduler/ipp.c:3133 scheduler/ipp.c:3158
+#: scheduler/ipp.c:3231 scheduler/ipp.c:3256
 msgid "Missing requesting-user-name attribute."
 msgstr ""
 
@@ -4041,7 +4061,7 @@ msgstr ""
 msgid "No Content"
 msgstr ""
 
-#: cups/util.c:1298
+#: cups/util.c:1304
 msgid "No PPD name"
 msgstr ""
 
@@ -4053,11 +4073,11 @@ msgstr ""
 msgid "No Windows printer drivers are installed."
 msgstr ""
 
-#: cups/request.c:566 cups/request.c:908
+#: cups/request.c:568 cups/request.c:914
 msgid "No active connection"
 msgstr ""
 
-#: scheduler/ipp.c:3403
+#: scheduler/ipp.c:3501
 #, c-format
 msgid "No active jobs on %s."
 msgstr ""
@@ -4066,7 +4086,7 @@ msgstr ""
 msgid "No attributes in request."
 msgstr ""
 
-#: scheduler/ipp.c:3034
+#: scheduler/ipp.c:3132
 msgid "No authentication information provided."
 msgstr ""
 
@@ -4074,11 +4094,11 @@ msgstr ""
 msgid "No community name"
 msgstr ""
 
-#: scheduler/ipp.c:5919
+#: scheduler/ipp.c:6017
 msgid "No default printer."
 msgstr ""
 
-#: cgi-bin/ipp-var.c:436 scheduler/ipp.c:7248
+#: cgi-bin/ipp-var.c:436 scheduler/ipp.c:7346
 msgid "No destinations added."
 msgstr ""
 
@@ -4094,7 +4114,7 @@ msgstr ""
 msgid "No error-status"
 msgstr ""
 
-#: scheduler/ipp.c:8190 scheduler/ipp.c:9436
+#: scheduler/ipp.c:8288 scheduler/ipp.c:9534
 msgid "No file in print request."
 msgstr ""
 
@@ -4115,15 +4135,15 @@ msgstr ""
 msgid "No printer name"
 msgstr ""
 
-#: cups/util.c:1801
+#: cups/util.c:1837
 msgid "No printer-uri found"
 msgstr ""
 
-#: cups/util.c:1786
+#: cups/util.c:1822
 msgid "No printer-uri found for class"
 msgstr ""
 
-#: scheduler/ipp.c:6322
+#: scheduler/ipp.c:6420
 msgid "No printer-uri in request."
 msgstr ""
 
@@ -4131,11 +4151,11 @@ msgstr ""
 msgid "No request-id"
 msgstr ""
 
-#: scheduler/ipp.c:5528
+#: scheduler/ipp.c:5626
 msgid "No subscription attributes in request."
 msgstr ""
 
-#: scheduler/ipp.c:7575
+#: scheduler/ipp.c:7673
 msgid "No subscriptions found."
 msgstr ""
 
@@ -4179,7 +4199,7 @@ msgstr ""
 msgid "Not Supported"
 msgstr ""
 
-#: scheduler/ipp.c:1518 scheduler/ipp.c:10666
+#: scheduler/ipp.c:1554 scheduler/ipp.c:10764
 msgid "Not allowed to print."
 msgstr ""
 
@@ -4233,18 +4253,18 @@ msgstr ""
 msgid "Options Installed"
 msgstr ""
 
-#: scheduler/cupsfilter.c:1430 scheduler/main.c:2018 systemv/cupsaddsmb.c:284
+#: scheduler/cupsfilter.c:1433 scheduler/main.c:2054 systemv/cupsaddsmb.c:284
 #: systemv/cupsctl.c:203 systemv/cupstestdsc.c:429 systemv/cupstestppd.c:3797
-#: test/ipptool.c:4403 ppdc/ppdc.cxx:437 ppdc/ppdhtml.cxx:174
+#: test/ipptool.c:4484 ppdc/ppdc.cxx:437 ppdc/ppdhtml.cxx:174
 #: ppdc/ppdi.cxx:130 ppdc/ppdmerge.cxx:369 ppdc/ppdpo.cxx:254
 msgid "Options:"
 msgstr ""
 
-#: cups/ppd-cache.c:156
+#: cups/ppd-cache.c:157
 msgid "Out of date PPD cache file."
 msgstr ""
 
-#: cups/ppd-cache.c:1381
+#: cups/ppd-cache.c:1384
 msgid "Out of memory."
 msgstr ""
 
@@ -4418,28 +4438,28 @@ msgstr ""
 msgid "Print and Tear"
 msgstr ""
 
-#: backend/ipp.c:1537
+#: backend/ipp.c:1574
 #, c-format
 msgid "Print file accepted - job ID %d."
 msgstr ""
 
-#: backend/ipp.c:1527
+#: backend/ipp.c:1564
 msgid "Print file accepted - job ID unknown."
 msgstr ""
 
-#: backend/socket.c:424 backend/usb-unix.c:191
+#: backend/socket.c:438 backend/usb-unix.c:191
 msgid "Print file sent."
 msgstr ""
 
-#: backend/ipp.c:1488
+#: backend/ipp.c:1525
 msgid "Print file was not accepted."
 msgstr ""
 
-#: backend/ipp.c:1895
+#: backend/ipp.c:1994
 msgid "Print job canceled at printer."
 msgstr ""
 
-#: backend/ipp.c:1890
+#: backend/ipp.c:1989
 msgid "Print job too large."
 msgstr ""
 
@@ -4467,7 +4487,7 @@ msgstr ""
 msgid "Printer Settings"
 msgstr ""
 
-#: backend/ipp.c:1893
+#: backend/ipp.c:1992
 msgid "Printer cannot print supplied content."
 msgstr ""
 
@@ -4493,16 +4513,16 @@ msgstr ""
 msgid "Quarto"
 msgstr ""
 
-#: scheduler/ipp.c:1513 scheduler/ipp.c:10661
+#: scheduler/ipp.c:1549 scheduler/ipp.c:10759
 msgid "Quota limit reached."
 msgstr ""
 
-#: berkeley/lpq.c:515
+#: berkeley/lpq.c:519
 msgid "Rank    Owner   Job     File(s)                         Total Size"
 msgstr ""
 
 #. TRANSLATORS: Pri is job priority.
-#: berkeley/lpq.c:511
+#: berkeley/lpq.c:515
 msgid "Rank   Owner      Pri  Job        Files                       Total Size"
 msgstr ""
 
@@ -4510,12 +4530,12 @@ msgstr ""
 msgid "Reject Jobs"
 msgstr ""
 
-#: backend/lpd.c:1016 backend/lpd.c:1148
+#: backend/lpd.c:1033 backend/lpd.c:1165
 #, c-format
 msgid "Remote host did not accept control file (%d)."
 msgstr ""
 
-#: backend/lpd.c:1101
+#: backend/lpd.c:1118
 #, c-format
 msgid "Remote host did not accept data file (%d)."
 msgstr ""
@@ -4565,7 +4585,7 @@ msgstr ""
 msgid "See Other"
 msgstr ""
 
-#: backend/usb-darwin.c:543 backend/usb-libusb.c:273
+#: backend/usb-darwin.c:543 backend/usb-libusb.c:441
 msgid "Sending data to printer."
 msgstr ""
 
@@ -4622,7 +4642,7 @@ msgstr ""
 msgid "Special Paper"
 msgstr ""
 
-#: backend/lpd.c:1057
+#: backend/lpd.c:1074
 #, c-format
 msgid "Spooling job, %.0f%% complete."
 msgstr ""
@@ -4654,8 +4674,8 @@ msgstr ""
 msgid "Stylus Photo Series"
 msgstr ""
 
-#: scheduler/ipp.c:3549 scheduler/ipp.c:6689 scheduler/ipp.c:7388
-#: scheduler/ipp.c:8887
+#: scheduler/ipp.c:3647 scheduler/ipp.c:6787 scheduler/ipp.c:7486
+#: scheduler/ipp.c:8985
 #, c-format
 msgid "Subscription #%d does not exist."
 msgstr ""
@@ -4700,23 +4720,28 @@ msgstr ""
 msgid "Tear-Off Adjust Position"
 msgstr ""
 
-#: scheduler/ipp.c:6393 scheduler/ipp.c:6471 scheduler/ipp.c:6487
-#: scheduler/ipp.c:6505
+#: scheduler/ipp.c:6491 scheduler/ipp.c:6569 scheduler/ipp.c:6585
+#: scheduler/ipp.c:6603
 #, c-format
 msgid "The %s attribute cannot be provided with job-ids."
 msgstr ""
 
-#: scheduler/ipp.c:5118
+#: scheduler/ipp.c:1381
+#, c-format
+msgid "The '%s' Job Description attribute cannot be supplied in a job creation request."
+msgstr ""
+
+#: scheduler/ipp.c:5216
 #, c-format
 msgid "The '%s' operation attribute cannot be supplied in a Create-Job request."
 msgstr ""
 
-#: scheduler/ipp.c:6919
+#: scheduler/ipp.c:7017
 #, c-format
 msgid "The PPD file \"%s\" could not be found."
 msgstr ""
 
-#: scheduler/ipp.c:6906
+#: scheduler/ipp.c:7004
 #, c-format
 msgid "The PPD file \"%s\" could not be opened: %s"
 msgstr ""
@@ -4746,11 +4771,11 @@ msgstr ""
 msgid "The fuser's temperature is low."
 msgstr ""
 
-#: scheduler/ipp.c:2097
+#: scheduler/ipp.c:2195
 msgid "The notify-lease-duration attribute cannot be used with job subscriptions."
 msgstr ""
 
-#: scheduler/ipp.c:2080 scheduler/ipp.c:5653
+#: scheduler/ipp.c:2178 scheduler/ipp.c:5751
 #, c-format
 msgid "The notify-user-data value is too large (%d > 63 octets)."
 msgstr ""
@@ -4791,21 +4816,21 @@ msgstr ""
 msgid "The paper tray needs to be filled."
 msgstr ""
 
-#: backend/ipp.c:909
+#: backend/ipp.c:924
 msgid "The printer URI is incorrect or no longer exists."
 msgstr ""
 
-#: backend/lpd.c:619 backend/lpd.c:1009 backend/lpd.c:1091 backend/lpd.c:1141
+#: backend/lpd.c:636 backend/lpd.c:1026 backend/lpd.c:1108 backend/lpd.c:1158
 msgid "The printer did not respond."
 msgstr ""
 
-#: backend/ipp.c:892 backend/ipp.c:899
+#: backend/ipp.c:907 backend/ipp.c:914
 #, c-format
 msgid "The printer does not support IPP/%d.%d, trying IPP/%s."
 msgstr ""
 
-#: backend/ipp.c:757 backend/ipp.c:874 backend/ipp.c:980 backend/ipp.c:1313
-#: backend/ipp.c:1464 backend/lpd.c:828 backend/socket.c:374
+#: backend/ipp.c:772 backend/ipp.c:889 backend/ipp.c:1001 backend/ipp.c:1351
+#: backend/ipp.c:1502 backend/lpd.c:845 backend/socket.c:388
 #: backend/usb-unix.c:131 backend/usb-unix.c:424 backend/usb-unix.c:507
 msgid "The printer is in use."
 msgstr ""
@@ -4814,8 +4839,8 @@ msgstr ""
 msgid "The printer is not connected."
 msgstr ""
 
-#: backend/ipp.c:735 backend/ipp.c:768 backend/ipp.c:870 backend/lpd.c:807
-#: backend/lpd.c:848 backend/socket.c:353 backend/socket.c:386
+#: backend/ipp.c:750 backend/ipp.c:783 backend/ipp.c:885 backend/lpd.c:824
+#: backend/lpd.c:865 backend/socket.c:367 backend/socket.c:400
 msgid "The printer is not responding."
 msgstr ""
 
@@ -4839,7 +4864,7 @@ msgstr ""
 msgid "The printer is running low on toner."
 msgstr ""
 
-#: backend/ipp.c:750 backend/lpd.c:821 backend/socket.c:367
+#: backend/ipp.c:765 backend/lpd.c:838 backend/socket.c:381
 msgid "The printer is unreachable at this time."
 msgstr ""
 
@@ -4851,7 +4876,7 @@ msgstr ""
 msgid "The printer may be out of toner."
 msgstr ""
 
-#: backend/ipp.c:744 backend/lpd.c:815 backend/socket.c:361
+#: backend/ipp.c:759 backend/lpd.c:832 backend/socket.c:375
 msgid "The printer may not exist or is unavailable at this time."
 msgstr ""
 
@@ -4859,18 +4884,18 @@ msgstr ""
 msgid "The printer name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#)."
 msgstr ""
 
-#: scheduler/ipp.c:876 scheduler/ipp.c:1136 scheduler/ipp.c:3198
-#: scheduler/ipp.c:3369 scheduler/ipp.c:5101 scheduler/ipp.c:5487
-#: scheduler/ipp.c:5801 scheduler/ipp.c:6359 scheduler/ipp.c:7124
-#: scheduler/ipp.c:7180 scheduler/ipp.c:7494 scheduler/ipp.c:7760
-#: scheduler/ipp.c:7849 scheduler/ipp.c:7882 scheduler/ipp.c:8205
-#: scheduler/ipp.c:8598 scheduler/ipp.c:8679 scheduler/ipp.c:9840
-#: scheduler/ipp.c:10294 scheduler/ipp.c:10624 scheduler/ipp.c:10706
-#: scheduler/ipp.c:10998
+#: scheduler/ipp.c:876 scheduler/ipp.c:1136 scheduler/ipp.c:3296
+#: scheduler/ipp.c:3467 scheduler/ipp.c:5199 scheduler/ipp.c:5585
+#: scheduler/ipp.c:5899 scheduler/ipp.c:6457 scheduler/ipp.c:7222
+#: scheduler/ipp.c:7278 scheduler/ipp.c:7592 scheduler/ipp.c:7858
+#: scheduler/ipp.c:7947 scheduler/ipp.c:7980 scheduler/ipp.c:8303
+#: scheduler/ipp.c:8696 scheduler/ipp.c:8777 scheduler/ipp.c:9938
+#: scheduler/ipp.c:10392 scheduler/ipp.c:10722 scheduler/ipp.c:10804
+#: scheduler/ipp.c:11178
 msgid "The printer or class does not exist."
 msgstr ""
 
-#: scheduler/ipp.c:1304
+#: scheduler/ipp.c:1319
 msgid "The printer or class is not shared."
 msgstr ""
 
@@ -4894,12 +4919,12 @@ msgstr ""
 msgid "The printer's waste bin is full."
 msgstr ""
 
-#: scheduler/ipp.c:982 scheduler/ipp.c:2261
+#: scheduler/ipp.c:982 scheduler/ipp.c:2359
 #, c-format
 msgid "The printer-uri \"%s\" contains invalid characters."
 msgstr ""
 
-#: scheduler/ipp.c:3175
+#: scheduler/ipp.c:3273
 msgid "The printer-uri attribute is required."
 msgstr ""
 
@@ -4907,7 +4932,7 @@ msgstr ""
 msgid "The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"."
 msgstr ""
 
-#: scheduler/ipp.c:2245
+#: scheduler/ipp.c:2343
 msgid "The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"."
 msgstr ""
 
@@ -4915,16 +4940,16 @@ msgstr ""
 msgid "The subscription name may not contain spaces, slashes (/), question marks (?), or the pound sign (#)."
 msgstr ""
 
-#: scheduler/client.c:2450
+#: scheduler/client.c:2458
 msgid "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to enable it."
 msgstr ""
 
-#: scheduler/ipp.c:6454
+#: scheduler/ipp.c:6552
 #, c-format
 msgid "The which-jobs value \"%s\" is not supported."
 msgstr ""
 
-#: scheduler/ipp.c:5731
+#: scheduler/ipp.c:5829
 msgid "There are too many subscriptions."
 msgstr ""
 
@@ -4933,7 +4958,7 @@ msgid "There is a paper jam."
 msgstr ""
 
 #: backend/usb-darwin.c:379 backend/usb-darwin.c:438 backend/usb-darwin.c:505
-#: backend/usb-darwin.c:526 backend/usb-libusb.c:235 backend/usb-libusb.c:256
+#: backend/usb-darwin.c:526 backend/usb-libusb.c:366 backend/usb-libusb.c:420
 msgid "There was an unrecoverable USB error."
 msgstr ""
 
@@ -4941,16 +4966,16 @@ msgstr ""
 msgid "Thermal Transfer Media"
 msgstr ""
 
-#: scheduler/ipp.c:1507
+#: scheduler/ipp.c:1543
 msgid "Too many active jobs."
 msgstr ""
 
-#: scheduler/ipp.c:1401
+#: scheduler/ipp.c:1437
 #, c-format
 msgid "Too many job-sheets values (%d > 2)."
 msgstr ""
 
-#: scheduler/ipp.c:2529
+#: scheduler/ipp.c:2627
 #, c-format
 msgid "Too many printer-state-reasons values (%d > %d)."
 msgstr ""
@@ -5031,11 +5056,11 @@ msgstr ""
 msgid "Unable to add class"
 msgstr ""
 
-#: backend/ipp.c:1635
+#: backend/ipp.c:1676
 msgid "Unable to add document to print job."
 msgstr ""
 
-#: scheduler/ipp.c:1548
+#: scheduler/ipp.c:1646
 #, c-format
 msgid "Unable to add job for destination \"%s\"."
 msgstr ""
@@ -5060,7 +5085,7 @@ msgstr ""
 msgid "Unable to cancel RSS subscription"
 msgstr ""
 
-#: backend/ipp.c:1942
+#: backend/ipp.c:2041
 msgid "Unable to cancel print job."
 msgstr ""
 
@@ -5080,11 +5105,11 @@ msgstr ""
 msgid "Unable to configure printer options."
 msgstr ""
 
-#: cups/adminutil.c:911 cups/request.c:1016
+#: cups/adminutil.c:911 cups/request.c:1041
 msgid "Unable to connect to host."
 msgstr ""
 
-#: backend/ipp.c:713 backend/ipp.c:1138 backend/lpd.c:787 backend/socket.c:333
+#: backend/ipp.c:728 backend/ipp.c:1165 backend/lpd.c:804 backend/socket.c:347
 #: backend/usb-unix.c:117
 msgid "Unable to contact printer, queuing on next printer in class."
 msgstr ""
@@ -5104,12 +5129,12 @@ msgstr ""
 msgid "Unable to copy CUPS printer driver files (%d)."
 msgstr ""
 
-#: scheduler/ipp.c:2649
+#: scheduler/ipp.c:2747
 #, c-format
 msgid "Unable to copy PPD file - %s"
 msgstr ""
 
-#: scheduler/ipp.c:2704
+#: scheduler/ipp.c:2802
 msgid "Unable to copy PPD file."
 msgstr ""
 
@@ -5123,20 +5148,20 @@ msgstr ""
 msgid "Unable to copy Windows 9x printer driver files (%d)."
 msgstr ""
 
-#: scheduler/ipp.c:2626
+#: scheduler/ipp.c:2724
 #, c-format
 msgid "Unable to copy interface script - %s"
 msgstr ""
 
-#: backend/ipp.c:2034
+#: backend/ipp.c:2133
 msgid "Unable to create compressed print file"
 msgstr ""
 
-#: cups/util.c:602 cups/util.c:1656
+#: cups/util.c:602 cups/util.c:1663
 msgid "Unable to create printer-uri"
 msgstr ""
 
-#: cgi-bin/admin.c:1850 cgi-bin/admin.c:1862 scheduler/cupsfilter.c:1236
+#: cgi-bin/admin.c:1850 cgi-bin/admin.c:1862 scheduler/cupsfilter.c:1239
 msgid "Unable to create temporary file"
 msgstr ""
 
@@ -5156,35 +5181,35 @@ msgstr ""
 msgid "Unable to edit cupsd.conf files larger than 1MB"
 msgstr ""
 
-#: cups/http.c:4272
+#: cups/http.c:4259
 msgid "Unable to establish a secure connection to host (certificate chain invalid)."
 msgstr ""
 
-#: cups/http.c:4262
+#: cups/http.c:4249
 msgid "Unable to establish a secure connection to host (certificate not yet valid)."
 msgstr ""
 
-#: cups/http.c:4257
+#: cups/http.c:4244
 msgid "Unable to establish a secure connection to host (expired certificate)."
 msgstr ""
 
-#: cups/http.c:4267
+#: cups/http.c:4254
 msgid "Unable to establish a secure connection to host (host name mismatch)."
 msgstr ""
 
-#: cups/http.c:4277
+#: cups/http.c:4264
 msgid "Unable to establish a secure connection to host (peer dropped connection before responding)."
 msgstr ""
 
-#: cups/http.c:4252
+#: cups/http.c:4239
 msgid "Unable to establish a secure connection to host (self-signed certificate)."
 msgstr ""
 
-#: cups/http.c:4247
+#: cups/http.c:4234
 msgid "Unable to establish a secure connection to host (untrusted certificate)."
 msgstr ""
 
-#: cups/http.c:4008 cups/http.c:4304 cups/http.c:4337 cups/http.c:4354
+#: cups/http.c:3993 cups/http.c:4291 cups/http.c:4324 cups/http.c:4341
 msgid "Unable to establish a secure connection to host."
 msgstr ""
 
@@ -5192,15 +5217,15 @@ msgstr ""
 msgid "Unable to find destination for job"
 msgstr ""
 
-#: cups/http-support.c:1748
+#: cups/http-support.c:1749
 msgid "Unable to find printer."
 msgstr ""
 
-#: backend/ipp.c:2056
+#: backend/ipp.c:2155
 msgid "Unable to generate compressed print file"
 msgstr ""
 
-#: backend/ipp.c:3009
+#: backend/ipp.c:3107
 msgid "Unable to get backend exit status."
 msgstr ""
 
@@ -5228,7 +5253,7 @@ msgstr ""
 msgid "Unable to get printer status"
 msgstr ""
 
-#: backend/ipp.c:933
+#: backend/ipp.c:948
 msgid "Unable to get printer status."
 msgstr ""
 
@@ -5246,13 +5271,13 @@ msgstr ""
 msgid "Unable to load help index."
 msgstr ""
 
-#: backend/ipp.c:642 backend/lpd.c:421 backend/socket.c:275
+#: backend/ipp.c:654 backend/lpd.c:435 backend/socket.c:286
 #, c-format
 msgid "Unable to locate printer \"%s\"."
 msgstr ""
 
-#: backend/dnssd.c:781 backend/ipp.c:324 backend/lpd.c:204
-#: backend/socket.c:171
+#: backend/dnssd.c:781 backend/ipp.c:326 backend/lpd.c:205
+#: backend/socket.c:172
 msgid "Unable to locate printer."
 msgstr ""
 
@@ -5276,7 +5301,7 @@ msgstr ""
 msgid "Unable to open PPD file"
 msgstr ""
 
-#: backend/ipp.c:2040
+#: backend/ipp.c:2139
 msgid "Unable to open compressed print file"
 msgstr ""
 
@@ -5288,7 +5313,7 @@ msgstr ""
 msgid "Unable to open device file"
 msgstr ""
 
-#: scheduler/ipp.c:6140
+#: scheduler/ipp.c:6238
 #, c-format
 msgid "Unable to open document #%d in job #%d."
 msgstr ""
@@ -5297,8 +5322,8 @@ msgstr ""
 msgid "Unable to open help file."
 msgstr ""
 
-#: backend/ipp.c:365 backend/ipp.c:1398 backend/ipp.c:1594 backend/ipp.c:2046
-#: backend/lpd.c:488 backend/socket.c:158 backend/usb.c:237
+#: backend/ipp.c:367 backend/ipp.c:1436 backend/ipp.c:1635 backend/ipp.c:2145
+#: backend/lpd.c:505 backend/socket.c:159 backend/usb.c:237
 #: filter/gziptoany.c:71 filter/pstops.c:300
 msgid "Unable to open print file"
 msgstr ""
@@ -5313,11 +5338,11 @@ msgid "Unable to print test page"
 msgstr ""
 
 #: backend/runloop.c:96 backend/runloop.c:325 backend/usb-darwin.c:613
-#: backend/usb-darwin.c:657 backend/usb-libusb.c:343 backend/usb-libusb.c:378
+#: backend/usb-darwin.c:657 backend/usb-libusb.c:511 backend/usb-libusb.c:546
 msgid "Unable to read print data."
 msgstr ""
 
-#: cups/dest.c:3402
+#: cups/dest.c:3406
 msgid "Unable to resolve printer URI."
 msgstr ""
 
@@ -5334,7 +5359,7 @@ msgstr ""
 msgid "Unable to send command to printer driver"
 msgstr ""
 
-#: backend/usb-darwin.c:735 backend/usb-libusb.c:454
+#: backend/usb-darwin.c:735 backend/usb-libusb.c:622
 msgid "Unable to send data to printer."
 msgstr ""
 
@@ -5351,7 +5376,7 @@ msgstr ""
 msgid "Unable to set server default"
 msgstr ""
 
-#: backend/ipp.c:2868 backend/ipp.c:2945 backend/ipp.c:2953
+#: backend/ipp.c:2966 backend/ipp.c:3043 backend/ipp.c:3051
 msgid "Unable to start backend process."
 msgstr ""
 
@@ -5389,26 +5414,26 @@ msgstr ""
 msgid "Unknown choice \"%s\" for option \"%s\"."
 msgstr ""
 
-#: backend/ipp.c:507
+#: backend/ipp.c:509
 #, c-format
 msgid "Unknown encryption option value: \"%s\"."
 msgstr ""
 
-#: backend/lpd.c:350
+#: backend/lpd.c:351
 #, c-format
 msgid "Unknown file order: \"%s\"."
 msgstr ""
 
-#: backend/lpd.c:321
+#: backend/lpd.c:322
 #, c-format
 msgid "Unknown format character: \"%c\"."
 msgstr ""
 
-#: cups/dest-options.c:770
+#: cups/dest-options.c:769
 msgid "Unknown media size name."
 msgstr ""
 
-#: backend/ipp.c:554
+#: backend/ipp.c:566
 #, c-format
 msgid "Unknown option \"%s\" with value \"%s\"."
 msgstr ""
@@ -5418,17 +5443,17 @@ msgstr ""
 msgid "Unknown option \"%s\"."
 msgstr ""
 
-#: backend/lpd.c:336
+#: backend/lpd.c:337
 #, c-format
 msgid "Unknown print mode: \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:10496
+#: scheduler/ipp.c:10594
 #, c-format
 msgid "Unknown printer-error-policy \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:10479
+#: scheduler/ipp.c:10577
 #, c-format
 msgid "Unknown printer-op-policy \"%s\"."
 msgstr ""
@@ -5437,37 +5462,51 @@ msgstr ""
 msgid "Unknown service name."
 msgstr ""
 
-#: backend/ipp.c:526
+#: backend/ipp.c:538
 #, c-format
 msgid "Unknown version option value: \"%s\"."
 msgstr ""
 
+#: scheduler/ipp.c:11049
+#, c-format
+msgid "Unsupported 'compression' value \"%s\"."
+msgstr ""
+
+#: scheduler/ipp.c:11079
+#, c-format
+msgid "Unsupported 'document-format' value \"%s\"."
+msgstr ""
+
+#: scheduler/ipp.c:11154
+msgid "Unsupported 'job-name' value."
+msgstr ""
+
 #: scheduler/ipp.c:402
 #, c-format
 msgid "Unsupported character set \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:8171 scheduler/ipp.c:9401 scheduler/ipp.c:10950
+#: scheduler/ipp.c:8269 scheduler/ipp.c:9499
 #, c-format
 msgid "Unsupported compression \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:8305 scheduler/ipp.c:9551 scheduler/ipp.c:10979
+#: scheduler/ipp.c:8403 scheduler/ipp.c:9649
 #, c-format
 msgid "Unsupported document-format \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:9534
+#: scheduler/ipp.c:9632
 #, c-format
 msgid "Unsupported document-format \"%s/%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:1367
+#: scheduler/ipp.c:1403
 #, c-format
 msgid "Unsupported format \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:1465
+#: scheduler/ipp.c:1501
 msgid "Unsupported margins."
 msgstr ""
 
@@ -5514,8 +5553,8 @@ msgid ""
 "                       [-u allow:user,user] [-u deny:user,user]"
 msgstr ""
 
-#: backend/dnssd.c:241 backend/ipp.c:313 backend/lpd.c:191
-#: backend/socket.c:135 backend/usb.c:183 filter/commandtops.c:74
+#: backend/dnssd.c:241 backend/ipp.c:315 backend/lpd.c:192
+#: backend/socket.c:136 backend/usb.c:183 filter/commandtops.c:74
 #: filter/gziptoany.c:50 filter/pstops.c:264 monitor/bcp.c:62
 #: monitor/tbcp.c:61
 #, c-format
@@ -5530,11 +5569,11 @@ msgstr ""
 msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
 msgstr ""
 
-#: scheduler/main.c:2017
+#: scheduler/main.c:2053
 msgid "Usage: cupsd [options]"
 msgstr ""
 
-#: scheduler/cupsfilter.c:1429
+#: scheduler/cupsfilter.c:1432
 msgid "Usage: cupsfilter [ options ] filename"
 msgstr ""
 
@@ -5546,7 +5585,7 @@ msgstr ""
 msgid "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]"
 msgstr ""
 
-#: test/ipptool.c:4401
+#: test/ipptool.c:4482
 msgid "Usage: ipptool [options] URI filename [ ... filenameN ]"
 msgstr ""
 
@@ -5573,7 +5612,7 @@ msgid ""
 "       lppasswd [-g groupname] -x [username]"
 msgstr ""
 
-#: berkeley/lpq.c:670
+#: berkeley/lpq.c:674
 msgid "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]"
 msgstr ""
 
@@ -5613,15 +5652,15 @@ msgstr ""
 msgid "Version uses indefinite length"
 msgstr ""
 
-#: backend/ipp.c:1675
+#: backend/ipp.c:1773
 msgid "Waiting for job to complete."
 msgstr ""
 
-#: backend/usb-darwin.c:457 backend/usb-libusb.c:193
+#: backend/usb-darwin.c:457 backend/usb-libusb.c:318
 msgid "Waiting for printer to become available."
 msgstr ""
 
-#: backend/socket.c:444
+#: backend/socket.c:458
 msgid "Waiting for printer to finish."
 msgstr ""
 
@@ -5637,7 +5676,7 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: scheduler/client.c:2437
+#: scheduler/client.c:2445
 #, c-format
 msgid "You must access this page using the URL <A HREF=\"https://%s:%d%s\">https://%s:%d%s</A>."
 msgstr ""
@@ -5666,11 +5705,11 @@ msgstr ""
 msgid "completed"
 msgstr ""
 
-#: scheduler/ipp.c:6012
+#: scheduler/ipp.c:6110
 msgid "cups-deviced failed to execute."
 msgstr ""
 
-#: scheduler/ipp.c:6842 scheduler/ipp.c:7091
+#: scheduler/ipp.c:6940 scheduler/ipp.c:7189
 msgid "cups-driverd failed to execute."
 msgstr ""
 
@@ -5698,34 +5737,46 @@ msgstr ""
 msgid "cupsctl: Unknown option \"-%c\""
 msgstr ""
 
-#: scheduler/main.c:189
+#: scheduler/main.c:194
 msgid "cupsd: Expected config filename after \"-c\" option."
 msgstr ""
 
-#: scheduler/main.c:221 scheduler/main.c:228
+#: scheduler/main.c:282
+msgid "cupsd: Expected cups-files.conf filename after \"-s\" option."
+msgstr ""
+
+#: scheduler/main.c:293
+msgid "cupsd: Relative cups-files.conf filename not allowed."
+msgstr ""
+
+#: scheduler/main.c:225 scheduler/main.c:232
 msgid "cupsd: Unable to get current directory."
 msgstr ""
 
-#: scheduler/main.c:295
+#: scheduler/main.c:343 scheduler/main.c:352
+msgid "cupsd: Unable to get path to cups-files.conf file."
+msgstr ""
+
+#: scheduler/main.c:322
 #, c-format
 msgid "cupsd: Unknown argument \"%s\" - aborting."
 msgstr ""
 
-#: scheduler/main.c:288
+#: scheduler/main.c:315
 #, c-format
 msgid "cupsd: Unknown option \"%c\" - aborting."
 msgstr ""
 
-#: scheduler/main.c:255
+#: scheduler/main.c:259
 msgid "cupsd: launchd(8) support not compiled in, running in normal mode."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1209
+#: scheduler/cupsfilter.c:1212
 #, c-format
 msgid "cupsfilter: Invalid document number %d."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1203
+#: scheduler/cupsfilter.c:1206
 #, c-format
 msgid "cupsfilter: Invalid job ID %d."
 msgstr ""
@@ -5734,7 +5785,7 @@ msgstr ""
 msgid "cupsfilter: Only one filename can be specified."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1251
+#: scheduler/cupsfilter.c:1254
 #, c-format
 msgid "cupsfilter: Unable to get job file - %s"
 msgstr ""
@@ -5777,62 +5828,62 @@ msgstr ""
 msgid "idle"
 msgstr ""
 
-#: test/ipptool.c:373 test/ipptool.c:515 test/ipptool.c:539
+#: test/ipptool.c:376 test/ipptool.c:518 test/ipptool.c:542
 msgid "ipptool: \"-i\" and \"-n\" are incompatible with -X\"."
 msgstr ""
 
-#: test/ipptool.c:597
+#: test/ipptool.c:600
 #, c-format
 msgid "ipptool: Bad URI - %s."
 msgstr ""
 
-#: test/ipptool.c:362
+#: test/ipptool.c:365
 #, c-format
 msgid "ipptool: Bad version %s for \"-V\"."
 msgstr ""
 
-#: test/ipptool.c:508
+#: test/ipptool.c:511
 msgid "ipptool: Invalid seconds for \"-i\"."
 msgstr ""
 
-#: test/ipptool.c:578
+#: test/ipptool.c:581
 msgid "ipptool: May only specify a single URI."
 msgstr ""
 
-#: test/ipptool.c:531
+#: test/ipptool.c:534
 msgid "ipptool: Missing count for \"-n\"."
 msgstr ""
 
-#: test/ipptool.c:408
+#: test/ipptool.c:411
 msgid "ipptool: Missing filename for \"-f\"."
 msgstr ""
 
-#: test/ipptool.c:389
+#: test/ipptool.c:392
 msgid "ipptool: Missing name=value for \"-d\"."
 msgstr ""
 
-#: test/ipptool.c:498
+#: test/ipptool.c:501
 msgid "ipptool: Missing seconds for \"-i\"."
 msgstr ""
 
-#: test/ipptool.c:332
+#: test/ipptool.c:335
 msgid "ipptool: Missing timeout for \"-T\"."
 msgstr ""
 
-#: test/ipptool.c:345
+#: test/ipptool.c:348
 msgid "ipptool: Missing version for \"-V\"."
 msgstr ""
 
-#: test/ipptool.c:624
+#: test/ipptool.c:627
 msgid "ipptool: URI required before test file."
 msgstr ""
 
-#: test/ipptool.c:558
+#: test/ipptool.c:561
 #, c-format
 msgid "ipptool: Unknown option \"-%c\"."
 msgstr ""
 
-#: scheduler/ipp.c:7838
+#: scheduler/ipp.c:7936
 msgid "job-printer-uri attribute missing."
 msgstr ""
 
@@ -6130,7 +6181,7 @@ msgstr ""
 msgid "members of class %s:"
 msgstr ""
 
-#: berkeley/lpq.c:582
+#: berkeley/lpq.c:586
 msgid "no entries"
 msgstr ""
 
@@ -6138,16 +6189,16 @@ msgstr ""
 msgid "no system default destination"
 msgstr ""
 
-#: scheduler/ipp.c:5702
+#: scheduler/ipp.c:5800
 msgid "notify-events not specified."
 msgstr ""
 
-#: scheduler/ipp.c:2034 scheduler/ipp.c:5607
+#: scheduler/ipp.c:2132 scheduler/ipp.c:5705
 #, c-format
 msgid "notify-recipient-uri URI \"%s\" is already used."
 msgstr ""
 
-#: scheduler/ipp.c:2024 scheduler/ipp.c:5597
+#: scheduler/ipp.c:2122 scheduler/ipp.c:5695
 #, c-format
 msgid "notify-recipient-uri URI \"%s\" uses unknown scheme."
 msgstr ""
@@ -6663,7 +6714,7 @@ msgstr ""
 msgid "processing"
 msgstr ""
 
-#: systemv/lp.c:644
+#: systemv/lp.c:651
 #, c-format
 msgid "request id is %s-%d (%d file(s))"
 msgstr ""
diff --git a/locale/cups.strings b/locale/cups.strings
index 745be0f8..7ce8b5ac 100644
--- a/locale/cups.strings
+++ b/locale/cups.strings
@@ -579,6 +579,7 @@
 "B7" = "B7";
 "B8" = "B8";
 "B9" = "B9";
+"Bad 'document-format' value \"%s\"." = "Bad 'document-format' value \"%s\".";
 "Bad NULL dests pointer" = "Bad NULL dests pointer";
 "Bad OpenGroup" = "Bad OpenGroup";
 "Bad OpenUI/JCLOpenUI" = "Bad OpenUI/JCLOpenUI";
@@ -594,6 +595,9 @@
 "Bad document-format \"%s\"." = "Bad document-format \"%s\".";
 "Bad document-format-default \"%s\"." = "Bad document-format-default \"%s\".";
 "Bad filename buffer" = "Bad filename buffer";
+"Bad job-name value: Bad UTF-8 sequence." = "Bad job-name value: Bad UTF-8 sequence.";
+"Bad job-name value: Name too long." = "Bad job-name value: Name too long.";
+"Bad job-name value: Wrong type or count." = "Bad job-name value: Wrong type or count.";
 "Bad job-priority value." = "Bad job-priority value.";
 "Bad job-sheets value \"%s\"." = "Bad job-sheets value \"%s\".";
 "Bad job-sheets value type." = "Bad job-sheets value type.";
@@ -751,7 +755,7 @@
 "File \"%s\" not available: %s" = "File \"%s\" not available: %s";
 "File \"%s\" permissions OK (0%o/uid=%d/gid=%d)." = "File \"%s\" permissions OK (0%o/uid=%d/gid=%d).";
 "File Folder " = "File Folder ";
-"File device URIs have been disabled. To enable, see the FileDevice directive in \"%s/cupsd.conf\"." = "File device URIs have been disabled. To enable, see the FileDevice directive in \"%s/cupsd.conf\".";
+"File device URIs have been disabled. To enable, see the FileDevice directive in \"%s/cups-files.conf\"." = "File device URIs have been disabled. To enable, see the FileDevice directive in \"%s/cups-files.conf\".";
 "Finished page %d." = "Finished page %d.";
 "Folio" = "Folio";
 "Forbidden" = "Forbidden";
@@ -777,6 +781,7 @@
 "IPP language length overflows value." = "IPP language length overflows value.";
 "IPP member name is not empty." = "IPP member name is not empty.";
 "IPP memberName value is empty." = "IPP memberName value is empty.";
+"IPP memberName with no attribute." = "IPP memberName with no attribute.";
 "IPP name larger than 32767 bytes." = "IPP name larger than 32767 bytes.";
 "IPP nameWithLanguage value less than minimum 4 bytes." = "IPP nameWithLanguage value less than minimum 4 bytes.";
 "IPP rangeOfInteger value not 8 bytes." = "IPP rangeOfInteger value not 8 bytes.";
@@ -1046,6 +1051,7 @@
 "Tear-Off" = "Tear-Off";
 "Tear-Off Adjust Position" = "Tear-Off Adjust Position";
 "The %s attribute cannot be provided with job-ids." = "The %s attribute cannot be provided with job-ids.";
+"The '%s' Job Description attribute cannot be supplied in a job creation request." = "The '%s' Job Description attribute cannot be supplied in a job creation request.";
 "The '%s' operation attribute cannot be supplied in a Create-Job request." = "The '%s' operation attribute cannot be supplied in a Create-Job request.";
 "The PPD file \"%s\" could not be found." = "The PPD file \"%s\" could not be found.";
 "The PPD file \"%s\" could not be opened: %s" = "The PPD file \"%s\" could not be opened: %s";
@@ -1217,6 +1223,9 @@
 "Unknown printer-op-policy \"%s\"." = "Unknown printer-op-policy \"%s\".";
 "Unknown service name." = "Unknown service name.";
 "Unknown version option value: \"%s\"." = "Unknown version option value: \"%s\".";
+"Unsupported 'compression' value \"%s\"." = "Unsupported 'compression' value \"%s\".";
+"Unsupported 'document-format' value \"%s\"." = "Unsupported 'document-format' value \"%s\".";
+"Unsupported 'job-name' value." = "Unsupported 'job-name' value.";
 "Unsupported character set \"%s\"." = "Unsupported character set \"%s\".";
 "Unsupported compression \"%s\"." = "Unsupported compression \"%s\".";
 "Unsupported document-format \"%s\"." = "Unsupported document-format \"%s\".";
@@ -1274,7 +1283,10 @@
 "cupsctl: Unknown option \"%s\"" = "cupsctl: Unknown option \"%s\"";
 "cupsctl: Unknown option \"-%c\"" = "cupsctl: Unknown option \"-%c\"";
 "cupsd: Expected config filename after \"-c\" option." = "cupsd: Expected config filename after \"-c\" option.";
+"cupsd: Expected cups-files.conf filename after \"-s\" option." = "cupsd: Expected cups-files.conf filename after \"-s\" option.";
+"cupsd: Relative cups-files.conf filename not allowed." = "cupsd: Relative cups-files.conf filename not allowed.";
 "cupsd: Unable to get current directory." = "cupsd: Unable to get current directory.";
+"cupsd: Unable to get path to cups-files.conf file." = "cupsd: Unable to get path to cups-files.conf file.";
 "cupsd: Unknown argument \"%s\" - aborting." = "cupsd: Unknown argument \"%s\" - aborting.";
 "cupsd: Unknown option \"%c\" - aborting." = "cupsd: Unknown option \"%c\" - aborting.";
 "cupsd: launchd(8) support not compiled in, running in normal mode." = "cupsd: launchd(8) support not compiled in, running in normal mode.";
diff --git a/locale/cups_ca.po b/locale/cups_ca.po
index cde14d65..885d4345 100644
--- a/locale/cups_ca.po
+++ b/locale/cups_ca.po
@@ -32,170 +32,132 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.4.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2012-05-23 16:24-0700\n"
-"PO-Revision-Date: 2012-05-26 12:28+0200\n"
+"POT-Creation-Date: 2013-03-08 13:25-0500\n"
+"PO-Revision-Date: 2012-09-29 11:21+0200\n"
 "Last-Translator: Àngel Mompó <mecatxis@gmail.com>\n"
-"Language-Team: Catalan <ca@dodds.net> <>\n"
+"Language-Team: Catalan <ca@dodds.net>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: systemv/lpstat.c:1876 systemv/lpstat.c:2001
 msgid "\t\t(all)"
 msgstr "\t\t(tots)"
 
-#: systemv/lpstat.c:1879 systemv/lpstat.c:1882 systemv/lpstat.c:2004
-#: systemv/lpstat.c:2007
 msgid "\t\t(none)"
 msgstr "\t\t(cap)"
 
-#: berkeley/lpc.c:434
 #, c-format
 msgid "\t%d entries"
 msgstr "\t%d entrades"
 
-#: systemv/lpstat.c:756 systemv/lpstat.c:772
 #, c-format
 msgid "\t%s"
 msgstr "\t%s"
 
-#: systemv/lpstat.c:1857 systemv/lpstat.c:1982
 msgid "\tAfter fault: continue"
 msgstr "\tDesprés d'una fallada: continua"
 
-#: systemv/lpstat.c:1481 systemv/lpstat.c:1826 systemv/lpstat.c:1952
 #, c-format
 msgid "\tAlerts: %s"
 msgstr "\tAlertes: %s"
 
-#: systemv/lpstat.c:1880 systemv/lpstat.c:2005
 msgid "\tBanner required"
 msgstr "\tNecessita un bàner"
 
-#: systemv/lpstat.c:1881 systemv/lpstat.c:2006
 msgid "\tCharset sets:"
 msgstr "\tConjunt de caràcters:"
 
-#: systemv/lpstat.c:1845 systemv/lpstat.c:1970
 msgid "\tConnection: direct"
 msgstr "\tConnexió: directa"
 
-#: systemv/lpstat.c:1836 systemv/lpstat.c:1962
 msgid "\tConnection: remote"
 msgstr "\tConnexió: remota"
 
-#: systemv/lpstat.c:1800 systemv/lpstat.c:1926
 msgid "\tContent types: any"
 msgstr "\tTipus de contingut: qualsevol"
 
-#: systemv/lpstat.c:1884 systemv/lpstat.c:2009
 msgid "\tDefault page size:"
 msgstr "\tMida de la pàgina per defecte:"
 
-#: systemv/lpstat.c:1883 systemv/lpstat.c:2008
 msgid "\tDefault pitch:"
 msgstr "\tDensitat per defecte:"
 
-#: systemv/lpstat.c:1885 systemv/lpstat.c:2010
 msgid "\tDefault port settings:"
 msgstr "\tConfiguració del port per defecte:"
 
-#: systemv/lpstat.c:1806 systemv/lpstat.c:1932
 #, c-format
 msgid "\tDescription: %s"
 msgstr "\tDescripció: %s"
 
-#: systemv/lpstat.c:1799 systemv/lpstat.c:1925
 msgid "\tForm mounted:"
 msgstr "\tFormularis muntats:"
 
-#: systemv/lpstat.c:1878 systemv/lpstat.c:2003
 msgid "\tForms allowed:"
 msgstr "\tFormularis admesos:"
 
-#: systemv/lpstat.c:1840 systemv/lpstat.c:1966
 #, c-format
 msgid "\tInterface: %s.ppd"
 msgstr "\tInterfície: %s.ppd"
 
-#: systemv/lpstat.c:1849 systemv/lpstat.c:1974
 #, c-format
 msgid "\tInterface: %s/interfaces/%s"
 msgstr "\tInterfície: %s/interfícies/%s"
 
-#: systemv/lpstat.c:1853 systemv/lpstat.c:1978
 #, c-format
 msgid "\tInterface: %s/ppd/%s.ppd"
 msgstr "\tInterfície: %s/ppd/%s.ppd"
 
-#: systemv/lpstat.c:1831 systemv/lpstat.c:1957
 #, c-format
 msgid "\tLocation: %s"
 msgstr "\tUbicació: %s"
 
-#: systemv/lpstat.c:1856 systemv/lpstat.c:1981
 msgid "\tOn fault: no alert"
 msgstr "\tEn cas de fallada: no avisis"
 
-#: systemv/lpstat.c:1801 systemv/lpstat.c:1927
 msgid "\tPrinter types: unknown"
 msgstr "\tTipus d'impresores: desconeguts"
 
-#: systemv/lpstat.c:1462
 #, c-format
 msgid "\tStatus: %s"
 msgstr "\tEstat: %s"
 
-#: systemv/lpstat.c:1861 systemv/lpstat.c:1875 systemv/lpstat.c:1986
-#: systemv/lpstat.c:2000
 msgid "\tUsers allowed:"
 msgstr "\tUsuaris permesos:"
 
-#: systemv/lpstat.c:1868 systemv/lpstat.c:1993
 msgid "\tUsers denied:"
 msgstr "\tUsuaris sense permís:"
 
-#: berkeley/lpc.c:436
 msgid "\tdaemon present"
 msgstr "\tpresència del dimoni"
 
-#: berkeley/lpc.c:432
 msgid "\tno entries"
 msgstr "\tcap entrada"
 
-#: berkeley/lpc.c:404 berkeley/lpc.c:416
 #, c-format
 msgid "\tprinter is on device '%s' speed -1"
 msgstr "\tLa impressora és al dispositiu «%s» velocitat -1"
 
-#: berkeley/lpc.c:429
 msgid "\tprinting is disabled"
 msgstr "\tLa impressora està deshabilitada"
 
-#: berkeley/lpc.c:427
 msgid "\tprinting is enabled"
 msgstr "\tLa impressora està habilitada"
 
-#: systemv/lpstat.c:1484
 #, c-format
 msgid "\tqueued for %s"
 msgstr "\ten cua per %s"
 
-#: berkeley/lpc.c:424
 msgid "\tqueuing is disabled"
 msgstr "\tla cua està deshabilitada"
 
-#: berkeley/lpc.c:422
 msgid "\tqueuing is enabled"
 msgstr "\tla cua està habilitada"
 
-#: systemv/lpstat.c:1792 systemv/lpstat.c:1918
 msgid "\treason unknown"
 msgstr "\traó desconeguda"
 
-#: systemv/cupstestppd.c:454
 msgid ""
 "\n"
 "    DETAILED CONFORMANCE TEST RESULTS"
@@ -203,134 +165,102 @@ msgstr ""
 "\n"
 "     RESULTAT DETALLAT DEL TEST DE CONFORMITAT"
 
-#: systemv/cupstestppd.c:3800
 msgid "                          Ignore specific warnings."
 msgstr "                          Ignora els avisos específics."
 
-#: systemv/cupstestppd.c:3804
 msgid "                          Issue warnings instead of errors."
 msgstr "                          Mostra avisos enlloc d'errors."
 
-#: systemv/cupstestppd.c:410 systemv/cupstestppd.c:415
 msgid "                REF: Page 15, section 3.1."
 msgstr "                REF: pàgina 15, secció 3.1."
 
-#: systemv/cupstestppd.c:405
 msgid "                REF: Page 15, section 3.2."
 msgstr "                REF: pàgina 15, secció 3.2."
 
-#: systemv/cupstestppd.c:425
 msgid "                REF: Page 19, section 3.3."
 msgstr "                REF: pàgina 19, secció 3.3."
 
-#: systemv/cupstestppd.c:378
 msgid "                REF: Page 20, section 3.4."
 msgstr "                REF: pàgina 20, secció 3.4."
 
-#: systemv/cupstestppd.c:430
 msgid "                REF: Page 27, section 3.5."
 msgstr "                REF: pàgina 27, secció 3.5."
 
-#: systemv/cupstestppd.c:373
 msgid "                REF: Page 42, section 5.2."
 msgstr "                REF: pàgina 42, secció 5.2."
 
-#: systemv/cupstestppd.c:420
 msgid "                REF: Pages 16-17, section 3.2."
 msgstr "                REF: pàgines 16-17, secció 3.2."
 
-#: systemv/cupstestppd.c:390
 msgid "                REF: Pages 42-45, section 5.2."
 msgstr "                REF: pàgines 42-45, secció 5.2."
 
-#: systemv/cupstestppd.c:384
 msgid "                REF: Pages 45-46, section 5.2."
 msgstr "                REF: pàgines 45-46, secció 5.2."
 
-#: systemv/cupstestppd.c:395
 msgid "                REF: Pages 48-49, section 5.2."
 msgstr "                REF: pàgines 48-49, secció 5.2."
 
-#: systemv/cupstestppd.c:400
 msgid "                REF: Pages 52-54, section 5.2."
 msgstr "                REF: pàgines 52-54, secció 5.2."
 
-#: berkeley/lpq.c:554
 #, c-format
 msgid "        %-39.39s %.0f bytes"
 msgstr "        %-39.39s %.0f bytes"
 
-#: systemv/cupstestppd.c:589
 #, c-format
 msgid "        PASS    Default%s"
 msgstr "        VALIDA    Default%s"
 
-#: systemv/cupstestppd.c:524
 msgid "        PASS    DefaultImageableArea"
 msgstr "        VALIDA    DefaultImageableArea"
 
-#: systemv/cupstestppd.c:558
 msgid "        PASS    DefaultPaperDimension"
 msgstr "        VALIDA    DefaultPaperDimension"
 
-#: systemv/cupstestppd.c:631
 msgid "        PASS    FileVersion"
 msgstr "        VALIDA    FileVersion"
 
-#: systemv/cupstestppd.c:675
 msgid "        PASS    FormatVersion"
 msgstr "        VALIDA    FileVersion"
 
-#: systemv/cupstestppd.c:695
 msgid "        PASS    LanguageEncoding"
 msgstr "       VALIDA    LanguageEncoding"
 
-#: systemv/cupstestppd.c:715
 msgid "        PASS    LanguageVersion"
 msgstr "        VALIDA    LanguageVersion"
 
-#: systemv/cupstestppd.c:769
 msgid "        PASS    Manufacturer"
 msgstr "        VALIDA    Manufacturer"
 
-#: systemv/cupstestppd.c:809
 msgid "        PASS    ModelName"
 msgstr "        VALIDA    ModelName"
 
-#: systemv/cupstestppd.c:829
 msgid "        PASS    NickName"
 msgstr "        VALIDA    NickName"
 
-#: systemv/cupstestppd.c:889
 msgid "        PASS    PCFileName"
 msgstr "        VALIDA    PCFileName"
 
-#: systemv/cupstestppd.c:964
 msgid "        PASS    PSVersion"
 msgstr "        VALIDA    PSVersion"
 
-#: systemv/cupstestppd.c:869
 msgid "        PASS    PageRegion"
 msgstr "        VALIDA    PageRegion"
 
-#: systemv/cupstestppd.c:849
 msgid "        PASS    PageSize"
 msgstr "        VALIDA    PageSize"
 
-#: systemv/cupstestppd.c:924
 msgid "        PASS    Product"
 msgstr "        VALIDA    Product"
 
-#: systemv/cupstestppd.c:999
 msgid "        PASS    ShortNickName"
 msgstr "        VALIDA    ShortNickName"
 
-#: systemv/cupstestppd.c:1374
 #, c-format
 msgid "        WARN    %s has no corresponding options."
 msgstr "        AVÍS    %s no té les opcions corresponents."
 
-#: systemv/cupstestppd.c:1486
 #, c-format
 msgid ""
 "        WARN    %s shares a common prefix with %s\n"
@@ -339,7 +269,6 @@ msgstr ""
 "        AVÍS    %s té un prefixe comú amb %s\n"
 "                REF: pàgina 15, secció 3.2."
 
-#: systemv/cupstestppd.c:1345
 #, c-format
 msgid ""
 "        WARN    Duplex option keyword %s may not work as expected and should "
@@ -350,13 +279,11 @@ msgstr ""
 "s'espera i s'hauria de dir Duplex.\n"
 "                REF: pàgina 122, secció 5.17"
 
-#: systemv/cupstestppd.c:1744
 msgid "        WARN    File contains a mix of CR, LF, and CR LF line endings."
 msgstr ""
 "        AVÍS    El fitxer conté una barreja de CR, LF, i CR LF com a finals "
 "de línia."
 
-#: systemv/cupstestppd.c:1390
 msgid ""
 "        WARN    LanguageEncoding required by PPD 4.3 spec.\n"
 "                REF: Pages 56-57, section 5.3."
@@ -365,12 +292,10 @@ msgstr ""
 "4.3\n"
 "                REF: pàgines 56-57, secció 5.3."
 
-#: systemv/cupstestppd.c:1726
 #, c-format
 msgid "        WARN    Line %d only contains whitespace."
 msgstr "        AVÍS    La línia %d només conté espais en blanc."
 
-#: systemv/cupstestppd.c:1398
 msgid ""
 "        WARN    Manufacturer required by PPD 4.3 spec.\n"
 "                REF: Pages 58-59, section 5.3."
@@ -378,7 +303,6 @@ msgstr ""
 "        AVÍS    El fabricant requereix les espec. del PPD 4.3.\n"
 "                REF: pàgines 58-59, secció 5.3."
 
-#: systemv/cupstestppd.c:1749
 msgid ""
 "        WARN    Non-Windows PPD files should use lines ending with only LF, "
 "not CR LF."
@@ -386,7 +310,6 @@ msgstr ""
 "        AVÍS    Els fitxers PPD que no són del Windows han de fer servir "
 "només LF com a final de línia, no CR LF."
 
-#: systemv/cupstestppd.c:1382
 #, c-format
 msgid ""
 "        WARN    Obsolete PPD version %.1f.\n"
@@ -395,7 +318,6 @@ msgstr ""
 "        AVÍS     La versió del PPD %.1f és obsoleta!\n"
 "                REF: pàgina 42, secció 5.2."
 
-#: systemv/cupstestppd.c:1413
 msgid ""
 "        WARN    PCFileName longer than 8.3 in violation of PPD spec.\n"
 "                REF: Pages 61-62, section 5.3."
@@ -404,7 +326,6 @@ msgstr ""
 "PPD.\n"
 "                REF: pàgines 61-62, secció 5.3."
 
-#: systemv/cupstestppd.c:1421
 msgid ""
 "        WARN    PCFileName should contain a unique filename.\n"
 "                REF: Pages 61-62, section 5.3."
@@ -413,7 +334,6 @@ msgstr ""
 "PPD.\n"
 "                REF: pàgines 61-62, secció 5.3."
 
-#: systemv/cupstestppd.c:1456
 msgid ""
 "        WARN    Protocols contains PJL but JCL attributes are not set.\n"
 "                REF: Pages 78-79, section 5.7."
@@ -422,7 +342,6 @@ msgstr ""
 "s'han definit.\n"
 "                REF: pàgines 78-79, secció 5.7."
 
-#: systemv/cupstestppd.c:1447
 msgid ""
 "        WARN    Protocols contains both PJL and BCP; expected TBCP.\n"
 "                REF: Pages 78-79, section 5.7."
@@ -431,7 +350,6 @@ msgstr ""
 "TBCP.\n"
 "                REF: pàgines 78-79, secció 5.7."
 
-#: systemv/cupstestppd.c:1430
 msgid ""
 "        WARN    ShortNickName required by PPD 4.3 spec.\n"
 "                REF: Pages 64-65, section 5.3."
@@ -439,19 +357,15 @@ msgstr ""
 "        AVÍS    Es requereix un ShortNickName segons les espec.del PPD 4.3.\n"
 "                REF: pàgines 64-65, secció 5.3."
 
-#: systemv/cupsaddsmb.c:282
 msgid "       cupsaddsmb [options] -a"
 msgstr "       cupsaddsmb [opcions] -a"
 
-#: systemv/cupstestdsc.c:427
 msgid "       cupstestdsc [options] -"
 msgstr "       cupstestdsc [opcions] -"
 
-#: systemv/cupstestppd.c:3795
 msgid "       program | cupstestppd [options] -"
 msgstr "       programa | cupstestppd [opcions] -"
 
-#: systemv/cupstestppd.c:3727
 #, c-format
 msgid ""
 "      %s  \"%s %s\" conflicts with \"%s %s\"\n"
@@ -460,17 +374,14 @@ msgstr ""
 "      %s  «%s %s» entra en conflicte amb «%s %s»\n"
 "                (restricció=«%s %s %s %s»)."
 
-#: systemv/cupstestppd.c:2248
 #, c-format
 msgid "      %s  %s %s does not exist."
 msgstr "      %s  %s %s no existeix."
 
-#: systemv/cupstestppd.c:3884
 #, c-format
 msgid "      %s  %s file \"%s\" has the wrong capitalization."
 msgstr "      %s  %s el fitxer «%s» fa un ús incorrecte de les majúscules."
 
-#: systemv/cupstestppd.c:2318
 #, c-format
 msgid ""
 "      %s  Bad %s choice %s.\n"
@@ -479,100 +390,71 @@ msgstr ""
 "      %s  Mala %s elecció %s!\n"
 "                REF: pàgina 122, secció 5.17"
 
-#: systemv/cupstestppd.c:3487 systemv/cupstestppd.c:3536
-#: systemv/cupstestppd.c:3575
 #, c-format
 msgid "      %s  Bad UTF-8 \"%s\" translation string for option %s, choice %s."
 msgstr ""
 "      %s  UTF-8 incorrecte «%s» a la traducció de l'opció %s, elecció %s."
 
-#: systemv/cupstestppd.c:3441
 #, c-format
 msgid "      %s  Bad UTF-8 \"%s\" translation string for option %s."
 msgstr "      %s  UTF-8 Incorrecte «%s» a la traducció de l'opció %s."
 
-#: systemv/cupstestppd.c:2389
 #, c-format
 msgid "      %s  Bad cupsFilter value \"%s\"."
 msgstr "      %s  Valor incorrecte del cupsFilter «%s»."
 
-#: systemv/cupstestppd.c:2475
 #, c-format
 msgid "      %s  Bad cupsFilter2 value \"%s\"."
 msgstr "      %s  Valor incorrecte del cupsFilter2 «%s»"
 
-#: systemv/cupstestppd.c:2964
 #, c-format
 msgid "      %s  Bad cupsICCProfile %s."
 msgstr "      %s  cupsICCProfile incorrecte %s."
 
-#: systemv/cupstestppd.c:2571
 #, c-format
 msgid "      %s  Bad cupsPreFilter value \"%s\"."
 msgstr "      %s  Valor de la cupsPreFilter incorrecte «%s»."
 
-#: systemv/cupstestppd.c:1822
 #, c-format
 msgid "      %s  Bad cupsUIConstraints %s: \"%s\""
 msgstr "      %s  cupsUIConstraints incorrecte %s: «%s»"
 
-#: systemv/cupstestppd.c:3391
 #, c-format
 msgid "      %s  Bad language \"%s\"."
 msgstr "      %s  language incorrecte «%s»."
 
-#: systemv/cupstestppd.c:2433 systemv/cupstestppd.c:2529
-#: systemv/cupstestppd.c:2615 systemv/cupstestppd.c:2673
-#: systemv/cupstestppd.c:2728 systemv/cupstestppd.c:2783
-#: systemv/cupstestppd.c:2838 systemv/cupstestppd.c:2891
-#: systemv/cupstestppd.c:3013
 #, c-format
 msgid "      %s  Bad permissions on %s file \"%s\"."
 msgstr "      %s  Permisos del fitxer %s incorrectes «%s»."
 
-#: systemv/cupstestppd.c:2373 systemv/cupstestppd.c:2459
-#: systemv/cupstestppd.c:2555 systemv/cupstestppd.c:2642
-#: systemv/cupstestppd.c:2697 systemv/cupstestppd.c:2752
-#: systemv/cupstestppd.c:2807 systemv/cupstestppd.c:2862
 #, c-format
 msgid "      %s  Bad spelling of %s - should be %s."
 msgstr "      %s  %s Està mal escrit: hauria de ser %s."
 
-#: systemv/cupstestppd.c:2907
 #, c-format
 msgid "      %s  Cannot provide both APScanAppPath and APScanAppBundleID."
 msgstr "      %s  No hi pot haver APScanAppPath i APScanAppBundleID alhora."
 
-#: systemv/cupstestppd.c:2205
 #, c-format
 msgid "      %s  Default choices conflicting."
 msgstr "      %s  Conflictes amb les opcions per defecte."
 
-#: systemv/cupstestppd.c:1803
 #, c-format
 msgid "      %s  Empty cupsUIConstraints %s"
 msgstr "      %s  cupsUIConstraints buit %s"
 
-#: systemv/cupstestppd.c:3519 systemv/cupstestppd.c:3559
 #, c-format
 msgid "      %s  Missing \"%s\" translation string for option %s, choice %s."
 msgstr "      %s  Falta la traducció de «%s» per l'opció %s, elecció %s."
 
-#: systemv/cupstestppd.c:3427
 #, c-format
 msgid "      %s  Missing \"%s\" translation string for option %s."
 msgstr "      %s  Falta la traducció de «%s» per l'opció %s."
 
-#: systemv/cupstestppd.c:2418 systemv/cupstestppd.c:2514
-#: systemv/cupstestppd.c:2600 systemv/cupstestppd.c:2658
-#: systemv/cupstestppd.c:2713 systemv/cupstestppd.c:2768
-#: systemv/cupstestppd.c:2823 systemv/cupstestppd.c:2875
-#: systemv/cupstestppd.c:2998
 #, c-format
 msgid "      %s  Missing %s file \"%s\"."
 msgstr "      %s  Falta el fitxer %s «%s»."
 
-#: systemv/cupstestppd.c:3121
 #, c-format
 msgid ""
 "      %s  Missing REQUIRED PageRegion option.\n"
@@ -581,7 +463,6 @@ msgstr ""
 "      %s  Falta l'opció PageRegion NECESSÀRIA .\n"
 "                REF: pàgina 100, secció 5.14."
 
-#: systemv/cupstestppd.c:3106
 #, c-format
 msgid ""
 "      %s  Missing REQUIRED PageSize option.\n"
@@ -590,37 +471,30 @@ msgstr ""
 "      %s  Falta l'opció PageSize NECESSÀRIA.\n"
 "                REF: pàgina 99, secció 5.14."
 
-#: systemv/cupstestppd.c:2013 systemv/cupstestppd.c:2054
 #, c-format
 msgid "      %s  Missing choice *%s %s in UIConstraints \"*%s %s *%s %s\"."
 msgstr "      %s  Falta l'elecció *%s %s a UIConstraints «*%s %s *%s %s»."
 
-#: systemv/cupstestppd.c:1908
 #, c-format
 msgid "      %s  Missing choice *%s %s in cupsUIConstraints %s: \"%s\""
 msgstr "      %s  Falta l'elecció *%s %s a cupsUIConstraints %s: «%s»"
 
-#: systemv/cupstestppd.c:1840
 #, c-format
 msgid "      %s  Missing cupsUIResolver %s"
 msgstr "      %s  Falta el cupsUIResolver %s"
 
-#: systemv/cupstestppd.c:1999 systemv/cupstestppd.c:2040
 #, c-format
 msgid "      %s  Missing option %s in UIConstraints \"*%s %s *%s %s\"."
 msgstr "      %s  Falta l'opció %s a UIConstraints «*%s %s *%s %s»."
 
-#: systemv/cupstestppd.c:1892
 #, c-format
 msgid "      %s  Missing option %s in cupsUIConstraints %s: \"%s\""
 msgstr "      %s  Falta l'opció %s a cupsUIConstraints %s: «%s»"
 
-#: systemv/cupstestppd.c:3613
 #, c-format
 msgid "      %s  No base translation \"%s\" is included in file."
 msgstr "      %s  No s'ha inclòs cap traducció de base «%s» al fitxer."
 
-#: systemv/cupstestppd.c:2294
 #, c-format
 msgid ""
 "      %s  REQUIRED %s does not define choice None.\n"
@@ -629,44 +503,36 @@ msgstr ""
 "      %s  NECESSARI %s no defineix l'eleció «Cap»!\n"
 "                REF: pàgina 122, secció 5.17"
 
-#: systemv/cupstestppd.c:3180 systemv/cupstestppd.c:3194
 #, c-format
 msgid "      %s  Size \"%s\" defined for %s but not for %s."
 msgstr "      %s  Mida \"%s\" definida per %s però no per %s."
 
-#: systemv/cupstestppd.c:3160
 #, c-format
 msgid "      %s  Size \"%s\" has unexpected dimensions (%gx%g)."
 msgstr "      %s  Mida \"%s\" té unes dimensions inesperades (%gx%g)."
 
-#: systemv/cupstestppd.c:3332
 #, c-format
 msgid "      %s  Size \"%s\" should be \"%s\"."
 msgstr "      %s  Mida «%s» hauria de ser «%s»."
 
-#: systemv/cupstestppd.c:3292
 #, c-format
 msgid "      %s  Size \"%s\" should be the Adobe standard name \"%s\"."
 msgstr "      %s  Mida \"%s\" hauria de ser el nom estàndard d'Adobe «%s»."
 
-#: systemv/cupstestppd.c:3041
 #, c-format
 msgid "      %s  cupsICCProfile %s hash value collides with %s."
 msgstr "      %s  cupsICCProfile %s el valor resum (hash) col·lideix amb %s."
 
-#: systemv/cupstestppd.c:1963
 #, c-format
 msgid "      %s  cupsUIResolver %s causes a loop."
 msgstr "      %s  cupsUIResolver %s entra en bucle."
 
-#: systemv/cupstestppd.c:1945
 #, c-format
 msgid ""
 "      %s  cupsUIResolver %s does not list at least two different options."
 msgstr ""
 "      %s  cupsUIResolver %s no llista com a mínim dues opcions diferents."
 
-#: systemv/cupstestppd.c:1168
 #, c-format
 msgid ""
 "      **FAIL**  %s must be 1284DeviceID\n"
@@ -675,7 +541,6 @@ msgstr ""
 "      **ERROR**  %s ha de ser 1284DeviceID!\n"
 "                REF: pàgina 72, secció 5.5"
 
-#: systemv/cupstestppd.c:580
 #, c-format
 msgid ""
 "      **FAIL**  Bad Default%s %s\n"
@@ -684,7 +549,6 @@ msgstr ""
 "      **ERROR**  Default%s incorrecte %s\n"
 "                REF: pàgina 40, secció 4.5."
 
-#: systemv/cupstestppd.c:514
 #, c-format
 msgid ""
 "      **FAIL**  Bad DefaultImageableArea %s\n"
@@ -693,7 +557,6 @@ msgstr ""
 "      **ERROR**  DefaultImageableArea incorrecte %s\n"
 "                REF: pàgina 102, secció 5.15."
 
-#: systemv/cupstestppd.c:550
 #, c-format
 msgid ""
 "      **FAIL**  Bad DefaultPaperDimension %s\n"
@@ -702,7 +565,6 @@ msgstr ""
 "      **ERROR**  DefaultPaperDimension incorrecte %s\n"
 "                REF: pàgina 103, secció 5.15."
 
-#: systemv/cupstestppd.c:623
 #, c-format
 msgid ""
 "      **FAIL**  Bad FileVersion \"%s\"\n"
@@ -711,7 +573,6 @@ msgstr ""
 "      **ERROR**  FileVersion incorrecte «%s»\n"
 "                REF: pàgina 56, secció 5.3."
 
-#: systemv/cupstestppd.c:667
 #, c-format
 msgid ""
 "      **FAIL**  Bad FormatVersion \"%s\"\n"
@@ -720,7 +581,6 @@ msgstr ""
 "      **ERROR**  FormatVersion incorrecte «%s»\n"
 "                REF: pàgina 56, secció 5.3."
 
-#: systemv/cupstestppd.c:1025
 msgid ""
 "      **FAIL**  Bad JobPatchFile attribute in file\n"
 "                REF: Page 24, section 3.4."
@@ -728,17 +588,14 @@ msgstr ""
 "      **ERROR**  atribut de JobPatchFile incorrecte al fitxer\n"
 "                REF: pàgina 24, secció 3.4."
 
-#: systemv/cupstestppd.c:1213
 #, c-format
 msgid "      **FAIL**  Bad LanguageEncoding %s - must be ISOLatin1."
 msgstr "      **ERROR**  LanguageEncoding incorrecte %s: ha de ser ISOLatin1."
 
-#: systemv/cupstestppd.c:1227
 #, c-format
 msgid "      **FAIL**  Bad LanguageVersion %s - must be English."
 msgstr "      **ERROR**  LanguageVersion incorrecta %s: ha de ser anglès."
 
-#: systemv/cupstestppd.c:743 systemv/cupstestppd.c:760
 #, c-format
 msgid ""
 "      **FAIL**  Bad Manufacturer (should be \"%s\")\n"
@@ -747,7 +604,6 @@ msgstr ""
 "      **ERROR**  Manufacturer incorrecte (hauria de ser «%s»)\n"
 "                REF: pàgina 211, taula D.1."
 
-#: systemv/cupstestppd.c:800
 #, c-format
 msgid ""
 "      **FAIL**  Bad ModelName - \"%c\" not allowed in string.\n"
@@ -756,7 +612,6 @@ msgstr ""
 "      **ERROR**  ModelName incorrecte - no es permet «%c» a la cadena.\n"
 "                REF: pàgines 59-60, secció 5.3."
 
-#: systemv/cupstestppd.c:956
 msgid ""
 "      **FAIL**  Bad PSVersion - not \"(string) int\".\n"
 "                REF: Pages 62-64, section 5.3."
@@ -764,7 +619,6 @@ msgstr ""
 "      **ERROR**  PSVersion incorrecte - no és «(cadena) enter».\n"
 "                REF: pàgines 62-64, secció 5.3."
 
-#: systemv/cupstestppd.c:917
 msgid ""
 "      **FAIL**  Bad Product - not \"(string)\".\n"
 "                REF: Page 62, section 5.3."
@@ -772,7 +626,6 @@ msgstr ""
 "      **ERROR**  Product incorrecte - no és «(cadena)».\n"
 "                REF: pàgina 62, secció 5.3."
 
-#: systemv/cupstestppd.c:991
 msgid ""
 "      **FAIL**  Bad ShortNickName - longer than 31 chars.\n"
 "                REF: Pages 64-65, section 5.3."
@@ -780,7 +633,6 @@ msgstr ""
 "      **ERROR**  ShortNickName incorrecte - més llarg de 31 caràcters.\n"
 "                REF: pàgines 64-65, secció 5.3."
 
-#: systemv/cupstestppd.c:1149
 #, c-format
 msgid ""
 "      **FAIL**  Bad option %s choice %s\n"
@@ -789,13 +641,11 @@ msgstr ""
 "      **ERROR**  Elecció %s incorrecta %s\n"
 "                REF: pàgina 84, secció 5.9"
 
-#: systemv/cupstestppd.c:3754 systemv/cupstestppd.c:3776
 #, c-format
 msgid "      **FAIL**  Default option code cannot be interpreted: %s"
 msgstr ""
 "      **ERROR**  El codi de l'opció per defecte no es pot interpretar: %s"
 
-#: systemv/cupstestppd.c:1286
 #, c-format
 msgid ""
 "      **FAIL**  Default translation string for option %s choice %s contains "
@@ -804,7 +654,6 @@ msgstr ""
 "      **ERROR**  La traducció per defecte de l'opció %s elecció %s conté "
 "caràcters de 8 bits."
 
-#: systemv/cupstestppd.c:1259
 #, c-format
 msgid ""
 "      **FAIL**  Default translation string for option %s contains 8-bit "
@@ -813,34 +662,29 @@ msgstr ""
 "      **ERROR**  La traducció per defecte de l'opció %s conté caràcters de 8 "
 "bits."
 
-#: systemv/cupstestppd.c:2101
 #, c-format
 msgid "      **FAIL**  Group names %s and %s differ only by case."
 msgstr ""
 "      **ERROR**  Els noms dels grups %s i %s només es diferencien en les "
 "majúscules."
 
-#: systemv/cupstestppd.c:2146
 #, c-format
 msgid "      **FAIL**  Multiple occurrences of option %s choice name %s."
 msgstr ""
 "      **ERROR**  Coincidències múltiples de l'opció %s nom de l'elecció %s."
 
-#: systemv/cupstestppd.c:2163
 #, c-format
 msgid "      **FAIL**  Option %s choice names %s and %s differ only by case."
 msgstr ""
 "      **ERROR**  L'opció %s noms de les opcions %s i %s només es diferencien "
 "per les majúscules."
 
-#: systemv/cupstestppd.c:2123
 #, c-format
 msgid "      **FAIL**  Option names %s and %s differ only by case."
 msgstr ""
 "      **ERROR**  Els noms de les opcions %s i %s només es diferencien per "
 "les majúscules."
 
-#: systemv/cupstestppd.c:600
 #, c-format
 msgid ""
 "      **FAIL**  REQUIRED Default%s\n"
@@ -849,7 +693,6 @@ msgstr ""
 "      **ERROR**  ES NECESSITA Default%s\n"
 "                REF: pàgina 40, secció 4.5."
 
-#: systemv/cupstestppd.c:499
 msgid ""
 "      **FAIL**  REQUIRED DefaultImageableArea\n"
 "                REF: Page 102, section 5.15."
@@ -857,7 +700,6 @@ msgstr ""
 "      **ERROR**  ES NECESSITA DefaultImageableArea\n"
 "                REF: pàgina 102, secció 5.15."
 
-#: systemv/cupstestppd.c:535
 msgid ""
 "      **FAIL**  REQUIRED DefaultPaperDimension\n"
 "                REF: Page 103, section 5.15."
@@ -865,7 +707,6 @@ msgstr ""
 "      **ERROR**  ES NECESSITA DefaultPaperDimension\n"
 "                REF: pàgina 103, secció 5.15."
 
-#: systemv/cupstestppd.c:641
 msgid ""
 "      **FAIL**  REQUIRED FileVersion\n"
 "                REF: Page 56, section 5.3."
@@ -873,7 +714,6 @@ msgstr ""
 "      **ERROR**  ES NECESSITA FileVersion\n"
 "                REF: pàgina 56, secció 5.3."
 
-#: systemv/cupstestppd.c:685
 msgid ""
 "      **FAIL**  REQUIRED FormatVersion\n"
 "                REF: Page 56, section 5.3."
@@ -881,7 +721,6 @@ msgstr ""
 "      **ERROR**  ES NECESSITA FormatVersion\n"
 "                REF: pàgina 56, secció 5.3."
 
-#: systemv/cupstestppd.c:1076
 #, c-format
 msgid ""
 "      **FAIL**  REQUIRED ImageableArea for PageSize %s\n"
@@ -892,7 +731,6 @@ msgstr ""
 "                REF: pàgina 41, secció 5.\n"
 "                REF: pàgina 102, secció 5.15."
 
-#: systemv/cupstestppd.c:705
 msgid ""
 "      **FAIL**  REQUIRED LanguageEncoding\n"
 "                REF: Pages 56-57, section 5.3."
@@ -900,7 +738,6 @@ msgstr ""
 "      **ERROR**  ES NECESSITA LanguageEncoding\n"
 "                REF: pàgines 56-57, secció 5.3."
 
-#: systemv/cupstestppd.c:725
 msgid ""
 "      **FAIL**  REQUIRED LanguageVersion\n"
 "                REF: Pages 57-58, section 5.3."
@@ -908,7 +745,6 @@ msgstr ""
 "      **ERROR**  ES NECESSITA LanguageVersion\n"
 "                REF: pàgines 57-58, secció 5.3."
 
-#: systemv/cupstestppd.c:779
 msgid ""
 "      **FAIL**  REQUIRED Manufacturer\n"
 "                REF: Pages 58-59, section 5.3."
@@ -916,7 +752,6 @@ msgstr ""
 "      **ERROR**  ES NECESSITA Manufacturer\n"
 "                REF: pàgines 58-59, secció 5.3."
 
-#: systemv/cupstestppd.c:819
 msgid ""
 "      **FAIL**  REQUIRED ModelName\n"
 "                REF: Pages 59-60, section 5.3."
@@ -924,7 +759,6 @@ msgstr ""
 "      **ERROR**  ES NECESSITA ModelName\n"
 "                REF: pàgines 59-60, secció 5.3."
 
-#: systemv/cupstestppd.c:839
 msgid ""
 "      **FAIL**  REQUIRED NickName\n"
 "                REF: Page 60, section 5.3."
@@ -932,7 +766,6 @@ msgstr ""
 "      **ERROR**  ES NECESSITA NickName\n"
 "                REF: pàgina 60, secció 5.3."
 
-#: systemv/cupstestppd.c:899
 msgid ""
 "      **FAIL**  REQUIRED PCFileName\n"
 "                REF: Pages 61-62, section 5.3."
@@ -940,7 +773,6 @@ msgstr ""
 "      **ERROR**  ES NECESSITA PCFileName\n"
 "                REF: pàgines 61-62, secció 5.3."
 
-#: systemv/cupstestppd.c:974
 msgid ""
 "      **FAIL**  REQUIRED PSVersion\n"
 "                REF: Pages 62-64, section 5.3."
@@ -948,7 +780,6 @@ msgstr ""
 "      **ERROR**  ES NECESSITA PSVersion\n"
 "                REF: pàgines 62-64, secció 5.3."
 
-#: systemv/cupstestppd.c:879
 msgid ""
 "      **FAIL**  REQUIRED PageRegion\n"
 "                REF: Page 100, section 5.14."
@@ -956,7 +787,6 @@ msgstr ""
 "      **ERROR**  ES NECESSITA PageRegion\n"
 "                REF: pàgina 100, secció 5.14."
 
-#: systemv/cupstestppd.c:1045
 msgid ""
 "      **FAIL**  REQUIRED PageSize\n"
 "                REF: Page 41, section 5.\n"
@@ -966,7 +796,6 @@ msgstr ""
 "                REF: pàgina 41, secció 5.\n"
 "                REF: pàgina 99, secció 5.14."
 
-#: systemv/cupstestppd.c:859
 msgid ""
 "      **FAIL**  REQUIRED PageSize\n"
 "                REF: Pages 99-100, section 5.14."
@@ -974,7 +803,6 @@ msgstr ""
 "      **ERROR**  ES NECESSITA PageSize\n"
 "                REF: pàgines 99-100, secció 5.14."
 
-#: systemv/cupstestppd.c:1098
 #, c-format
 msgid ""
 "      **FAIL**  REQUIRED PaperDimension for PageSize %s\n"
@@ -985,7 +813,6 @@ msgstr ""
 "                REF: pàgina 41, secció 5.\n"
 "                REF: pàgina 103, secció 5.15."
 
-#: systemv/cupstestppd.c:934
 msgid ""
 "      **FAIL**  REQUIRED Product\n"
 "                REF: Page 62, section 5.3."
@@ -993,7 +820,6 @@ msgstr ""
 "      **ERROR**  ES NECESSITA Product\n"
 "                REF: pàgina 62, secció 5.3."
 
-#: systemv/cupstestppd.c:1009
 msgid ""
 "      **FAIL**  REQUIRED ShortNickName\n"
 "                REF: Page 64-65, section 5.3."
@@ -1001,22 +827,17 @@ msgstr ""
 "      **FAIL**  ES NECESSITA ShortNickName\n"
 "                REF: pàgina 64-65, secció 5.3."
 
-#: systemv/cupstestppd.c:334 systemv/cupstestppd.c:353
-#: systemv/cupstestppd.c:365
 #, c-format
 msgid "      **FAIL**  Unable to open PPD file - %s on line %d."
 msgstr "      **ERROR** No es pot obrir el fitxer PPD - %s a la línia %d."
 
-#: systemv/cupstestppd.c:1498
 #, c-format
 msgid "    %d ERRORS FOUND"
 msgstr "    %d S'HAN TROBAT ERRORS"
 
-#: systemv/cupstestdsc.c:431
 msgid "    -h       Show program usage"
 msgstr "    -h       Mostra la sintaxi del programa"
 
-#: systemv/cupstestdsc.c:234 systemv/cupstestdsc.c:276
 #, c-format
 msgid ""
 "    Bad %%%%BoundingBox: on line %d.\n"
@@ -1025,7 +846,6 @@ msgstr ""
 "    %%%%BoundingBox incorrecte: a la línia %d.\n"
 "        REF: pàgina 39, %%%%BoundingBox:"
 
-#: systemv/cupstestdsc.c:305
 #, c-format
 msgid ""
 "    Bad %%%%Page: on line %d.\n"
@@ -1034,7 +854,6 @@ msgstr ""
 "    %%%%Page incorrecte: a la línia %d.\n"
 "        REF: pàgina 53, %%%%Page:"
 
-#: systemv/cupstestdsc.c:218 systemv/cupstestdsc.c:258
 #, c-format
 msgid ""
 "    Bad %%%%Pages: on line %d.\n"
@@ -1043,7 +862,6 @@ msgstr ""
 "    %%%%Pages incorrecte: a la línia %d!\n"
 "        REF: pàgina 43, %%%%Pages:"
 
-#: systemv/cupstestdsc.c:176
 #, c-format
 msgid ""
 "    Line %d is longer than 255 characters (%d).\n"
@@ -1052,7 +870,6 @@ msgstr ""
 "    La línia %d és més llarga de 255 caràcters (%d)\n"
 "        REF: pàgina 25, Longitud de línia"
 
-#: systemv/cupstestdsc.c:192
 msgid ""
 "    Missing %!PS-Adobe-3.0 on first line.\n"
 "        REF: Page 17, 3.1 Conforming Documents"
@@ -1060,13 +877,11 @@ msgstr ""
 "    Falta %!PS-Adobe-3.0 a la primera línia.\n"
 "        REF: pàgina 17, 3.1 Adaptació de documents"
 
-#: systemv/cupstestdsc.c:362
 #, c-format
 msgid "    Missing %%EndComments comment.        REF: Page 41, %%EndComments"
 msgstr ""
 "    Falta el comentari %%EndComments.        REF: pàgina 41, %%EndComments"
 
-#: systemv/cupstestdsc.c:342
 #, c-format
 msgid ""
 "    Missing or bad %%BoundingBox: comment.\n"
@@ -1075,7 +890,6 @@ msgstr ""
 "     %%BoundingBox incorrecte o inexistent: comentari.\n"
 "        REF: pàgina 39, %%BoundingBox:"
 
-#: systemv/cupstestdsc.c:372
 #, c-format
 msgid ""
 "    Missing or bad %%Page: comments.\n"
@@ -1084,7 +898,6 @@ msgstr ""
 "    %%Page incorrecte o inexistent: comentaris.\n"
 "        REF: pàgina 53, %%Page:"
 
-#: systemv/cupstestdsc.c:352
 #, c-format
 msgid ""
 "    Missing or bad %%Pages: comment.\n"
@@ -1093,159 +906,124 @@ msgstr ""
 "    %%Pages incorrecte o inexistent: comentari.\n"
 "        REF: pàgina 43, %%Pages:"
 
-#: systemv/cupstestppd.c:1500
 msgid "    NO ERRORS FOUND"
 msgstr "    NO S'HA TROBAT CAP ERROR"
 
-#: systemv/cupstestdsc.c:395
 #, c-format
 msgid "    Saw %d lines that exceeded 255 characters."
 msgstr "     S'han trobat %d línies que superen els 255 caràcters."
 
-#: systemv/cupstestdsc.c:390
 #, c-format
 msgid "    Too many %%BeginDocument comments."
 msgstr "     Massa comentaris %%BeginDocument."
 
-#: systemv/cupstestdsc.c:382
 #, c-format
 msgid "    Too many %%EndDocument comments."
 msgstr "     Massa comentaris %%EndDocument."
 
-#: systemv/cupstestdsc.c:402
 msgid "    Warning: file contains binary data."
 msgstr "     Avís: el fitxer conté dades binàries."
 
-#: systemv/cupstestdsc.c:410
 #, c-format
 msgid "    Warning: no %%EndComments comment in file."
 msgstr "     Avís: no hi ha cap %%EndComments al fitxer."
 
-#: systemv/cupstestdsc.c:406
 #, c-format
 msgid "    Warning: obsolete DSC version %.1f in file."
 msgstr "     Avís: versió del DSC %.1f obsoleta al fitxer."
 
-#: systemv/cupsctl.c:210
 msgid "  --[no-]debug-logging    Turn debug logging on/off."
 msgstr "  --[no-]debug-logging    Activa o desactiva el registre de depuració."
 
-#: systemv/cupsctl.c:212
 msgid "  --[no-]remote-admin     Turn remote administration on/off."
 msgstr "  --[no-]remote-admin     Activa o desactiva l'administració remota."
 
-#: systemv/cupsctl.c:214
 msgid "  --[no-]remote-any       Allow/prevent access from the Internet."
 msgstr "  --[no-]remote-any       Permet o impedeix l'accés des d'Internet."
 
-#: systemv/cupsctl.c:216
 msgid "  --[no-]share-printers   Turn printer sharing on/off."
 msgstr ""
 "  --[no-]share-printers   Activa o desactiva la compartició d'impressores."
 
-#: systemv/cupsctl.c:218
 msgid "  --[no-]user-cancel-any  Allow/prevent users to cancel any job."
 msgstr ""
 "  --[no-]user-cancel-any  Permet o impedeix que els usuaris cancel·lin "
 "tasques."
 
-#: ppdc/ppdc.cxx:455
 msgid "  --cr                    End lines with CR (Mac OS 9)."
 msgstr "  --cr                    Final de línia amb CR (Mac OS 9)."
 
-#: ppdc/ppdc.cxx:457
 msgid "  --crlf                  End lines with CR + LF (Windows)."
 msgstr "  --crlf                  Final de línia amb CR + LF (Windows)."
 
-#: ppdc/ppdc.cxx:459
 msgid "  --lf                    End lines with LF (UNIX/Linux/OS X)."
 msgstr "  --lf                    Final de línia amb LF (UNIX/Linux/OS X)."
 
-#: test/ipptool.c:4404
 msgid "  -4                      Connect using IPv4."
 msgstr "  -4                      Connecta fent servir IPv4."
 
-#: test/ipptool.c:4405
 msgid "  -6                      Connect using IPv6."
 msgstr "  -6                      Connecta fent servir IPv6."
 
-#: test/ipptool.c:4406
 msgid "  -C                      Send requests using chunking (default)."
 msgstr ""
 "  -C                      Envia les sol·licituds fent servir la fragmentació "
 "(per defecte)."
 
-#: scheduler/cupsfilter.c:1431
 msgid "  -D                      Remove the input file when finished."
 msgstr "  -D                      Elimina el fitxer d'entrada quan ha acabat."
 
-#: ppdc/ppdc.cxx:438 ppdc/ppdhtml.cxx:175 ppdc/ppdpo.cxx:255
 msgid "  -D name=value           Set named variable to value."
 msgstr "  -D nom=valor            Estableix la variable indicada al valor."
 
-#: systemv/cupsaddsmb.c:285 systemv/cupsctl.c:205
 msgid "  -E                      Encrypt the connection."
 msgstr "  -E                      Xifra la connexió."
 
-#: test/ipptool.c:4408
 msgid "  -E                      Test with HTTP Upgrade to TLS."
 msgstr ""
 "  -E                      Fa una prova amb l'actualització d'HTTP a TLS."
 
-#: scheduler/main.c:2021
 msgid ""
 "  -F                      Run in the foreground but detach from console."
 msgstr ""
 "  -F                      Executa en primer pla però separat de la consola."
 
-#: systemv/cupsaddsmb.c:286
 msgid "  -H samba-server         Use the named SAMBA server."
 msgstr "  -H servidor-samba         Fa servir el servidor SAMBA indicat."
 
-#: test/ipptool.c:4410
 msgid "  -I                      Ignore errors."
 msgstr "  -I                      Ignora els errors."
 
-#: ppdc/ppdc.cxx:440 ppdc/ppdhtml.cxx:177 ppdc/ppdi.cxx:131 ppdc/ppdpo.cxx:257
 msgid "  -I include-dir          Add include directory to search path."
 msgstr "  -I dir-inclòs          Afegeix el directori inclòs al camí de cerca."
 
-#: systemv/cupstestppd.c:3799
 msgid "  -I {filename,filters,none,profiles}"
 msgstr "  -I {nomfitxer,filtres,cap,perfils}"
 
-#: test/ipptool.c:4411
 msgid "  -L                      Send requests using content-length."
 msgstr ""
 "  -L                      Envia les peticions fent servir content-length."
 
-#: scheduler/cupsfilter.c:1433
 msgid "  -P filename.ppd         Set PPD file."
 msgstr "  -P nomfitxer.ppd         Estableix el fitxer PPD."
 
-#: systemv/cupstestppd.c:3801
 msgid "  -R root-directory       Set alternate root."
 msgstr "  -R directori-arrel       Estableix una arrel alternativa."
 
-#: test/ipptool.c:4413
 msgid "  -S                      Test with SSL encryption."
 msgstr "  -S                      Fa una prova amb xifrat SSL."
 
-#: test/ipptool.c:4415
 msgid "  -T seconds              Set the receive/send timeout in seconds."
 msgstr ""
 "  -T segons              Estableix el temps d'espera màxim per enviar i "
 "rebre en segons."
 
-#: scheduler/cupsfilter.c:1434 systemv/cupsaddsmb.c:288 systemv/cupsctl.c:206
 msgid "  -U username             Specify username."
 msgstr "  -U nomusuari             Especifica un nom d'usuari."
 
-#: test/ipptool.c:4417
 msgid "  -V version              Set default IPP version."
 msgstr "  -V versió              Estableix la versió per defecte del IPP."
 
-#: systemv/cupstestppd.c:3802
 msgid ""
 "  -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,"
 "translations}"
@@ -1253,327 +1031,214 @@ msgstr ""
 "  -W {tots,cap,restringits,per defecte,dúplex,filtres,perfils,mides,"
 "traduccions}"
 
-#: test/ipptool.c:4419
 msgid "  -X                      Produce XML plist instead of plain text."
 msgstr ""
 "  -X                      Retorna els plist en XML en comptes de text pla."
 
-#: systemv/cupsaddsmb.c:289
 msgid "  -a                      Export all printers."
 msgstr "  -a                      Exporta totes les impressores."
 
-#: ppdc/ppdc.cxx:442
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr "  -c catàleg.po           Carrega el catàleg de missatges indicat."
 
-#: scheduler/cupsfilter.c:1435 scheduler/main.c:2019
 msgid "  -c cupsd.conf           Set cupsd.conf file to use."
 msgstr ""
 "  -c cupsd.conf           Estableix el fitxer cupsd.conf que cal fer servir."
 
-#: test/ipptool.c:4421
 msgid "  -d name=value           Set named variable to value."
 msgstr "  -d nom=valor           Estableix la variable indicada al valor."
 
-#: ppdc/ppdc.cxx:444
 msgid "  -d output-dir           Specify the output directory."
 msgstr "  -d dir-sortida           Especifica el directori de sortida."
 
-#: scheduler/cupsfilter.c:1437
 msgid "  -d printer              Use the named printer."
 msgstr "  -d impressora              Fa servir la impressora indicada."
 
-#: scheduler/cupsfilter.c:1439
 msgid "  -e                      Use every filter from the PPD file."
 msgstr "  -e                      Fa servir tots els filtres del fitxer PPD."
 
-#: scheduler/main.c:2020
 msgid "  -f                      Run in the foreground."
 msgstr "  -f                      Executa en primer pla."
 
-#: test/ipptool.c:4423
 msgid "  -f filename             Set default request filename."
 msgstr ""
 "  -f nomfitxer             Estableix el nom del fitxer per defecte de la "
 "sol·licitud."
 
-#: scheduler/main.c:2023
 msgid "  -h                      Show this usage message."
 msgstr "  -h                      Mostra aquest missatge de sintaxi."
 
-#: systemv/cupsaddsmb.c:290 systemv/cupsctl.c:207
 msgid "  -h server[:port]        Specify server address."
 msgstr "  -h servidor[:port]        Especifica l'adreça del servidor."
 
-#: scheduler/cupsfilter.c:1441
 msgid "  -i mime/type            Set input MIME type (otherwise auto-typed)."
 msgstr ""
 "  -i tipus/mime            Estableix el tipus MIME d'entrada (auto-typed si "
 "no s'especifica)."
 
-#: test/ipptool.c:4425
 msgid ""
 "  -i seconds              Repeat the last file with the given time interval."
 msgstr ""
 "  -i segons              Repeteix l'últim fitxer amb l'interval especificat."
 
-#: scheduler/cupsfilter.c:1443
 msgid ""
 "  -j job-id[,N]           Filter file N from the specified job (default is "
 "file 1)."
 msgstr ""
-"  -j id-tasca[,N]           Filtra el fitxer N a la tasca especificada (el "
+"  -j id-feina[,N]           Filtra el fitxer N a la feina especificada (el "
 "fitxer per defecte és 1)."
 
-#: scheduler/main.c:2024
 msgid "  -l                      Run cupsd from launchd(8)."
 msgstr "  -l                      Executa cupsd des de launchd(8)."
 
-#: ppdc/ppdc.cxx:446
 msgid "  -l lang[,lang,...]      Specify the output language(s) (locale)."
 msgstr ""
 "  -l idioma[,idioma,...]      Especifica els idiomes de sortida (locale)."
 
-#: ppdc/ppdc.cxx:448
 msgid "  -m                      Use the ModelName value as the filename."
 msgstr ""
 "  -m                      Fa servir el valor de ModelName com a nom de "
 "fitxer."
 
-#: scheduler/cupsfilter.c:1445
 msgid ""
 "  -m mime/type            Set output MIME type (otherwise application/pdf)."
 msgstr ""
 "  -m tipus/mime            Estableix el tipus MIME de sortida (application/"
 "pdf si no s'especifica)."
 
-#: scheduler/cupsfilter.c:1447
 msgid "  -n copies               Set number of copies."
 msgstr "  -n còpies               Estableix el nombre de còpies."
 
-#: test/ipptool.c:4427
 msgid ""
 "  -n count                Repeat the last file the given number of times."
 msgstr ""
 "  -n comptador                Repeteix l'últim fitxer el nombre indicat de "
 "vegades."
 
-#: ppdc/ppdi.cxx:133
 msgid ""
 "  -o filename.drv         Set driver information file (otherwise ppdi.drv)."
 msgstr ""
 "  -o nomfitxer.drv         Estableix el fitxer d'informació del controlador "
 "(ppdi.drv si no s'especifica)."
 
-#: ppdc/ppdmerge.cxx:370
 msgid "  -o filename.ppd[.gz]    Set output file (otherwise stdout)."
 msgstr ""
 "  -o nomfitxer.ppd[.gz]    Estableix el fitxer de sortida (stdout si no "
 "s'especifica)."
 
-#: scheduler/cupsfilter.c:1448
 msgid "  -o name=value           Set option(s)."
 msgstr "  -o nom=valor           Estableix les opcions."
 
-#: scheduler/cupsfilter.c:1449
 msgid "  -p filename.ppd         Set PPD file."
 msgstr "  -p nomfitxer.ppd         Estableix el fitxer PPD."
 
-#: systemv/cupstestppd.c:3806 test/ipptool.c:4429
 msgid "  -q                      Run silently."
 msgstr "  -q                      S'executa en mode silenciós."
 
-#: systemv/cupstestppd.c:3807
 msgid "  -r                      Use 'relaxed' open mode."
 msgstr "  -r                      Fa servir el mode obert «relaxat»."
 
-#: test/ipptool.c:4430
 msgid "  -t                      Produce a test report."
 msgstr "  -t                      Genera un informe de prova."
 
-#: ppdc/ppdc.cxx:450
 msgid "  -t                      Test PPDs instead of generating them."
 msgstr "  -t                      Prova els  PPDs en comptes de generar-los."
 
-#: scheduler/main.c:2025
 msgid "  -t                      Test the configuration file."
 msgstr "  -t                      Prova el fitxer de configuració."
 
-#: scheduler/cupsfilter.c:1450
 msgid "  -t title                Set title."
 msgstr "  -t títol                Estableix el títol."
 
-#: scheduler/cupsfilter.c:1451
 msgid "  -u                      Remove the PPD file when finished."
 msgstr "  -u                      Elimina el fitxer PPD quan ha acabat."
 
-#: systemv/cupsaddsmb.c:291 systemv/cupstestppd.c:3808 test/ipptool.c:4431
-#: ppdc/ppdc.cxx:452 ppdc/ppdpo.cxx:259
 msgid "  -v                      Be verbose."
 msgstr "  -v                      Mode detallat."
 
-#: systemv/cupstestppd.c:3809
 msgid "  -vv                     Be very verbose."
 msgstr "  -vv                     Mode molt detallat."
 
-#: ppdc/ppdc.cxx:453
 msgid "  -z                      Compress PPD files using GNU zip."
 msgstr ""
 "  -z                      Comprimeix els fitxers PPD fent servir el zip de "
 "GNU."
 
-#: systemv/cupstestppd.c:332 systemv/cupstestppd.c:351
-#: systemv/cupstestppd.c:363 systemv/cupstestppd.c:496
-#: systemv/cupstestppd.c:511 systemv/cupstestppd.c:532
-#: systemv/cupstestppd.c:547 systemv/cupstestppd.c:577
-#: systemv/cupstestppd.c:597 systemv/cupstestppd.c:620
-#: systemv/cupstestppd.c:638 systemv/cupstestppd.c:664
-#: systemv/cupstestppd.c:682 systemv/cupstestppd.c:702
-#: systemv/cupstestppd.c:722 systemv/cupstestppd.c:740
-#: systemv/cupstestppd.c:757 systemv/cupstestppd.c:776
-#: systemv/cupstestppd.c:797 systemv/cupstestppd.c:816
-#: systemv/cupstestppd.c:836 systemv/cupstestppd.c:856
-#: systemv/cupstestppd.c:876 systemv/cupstestppd.c:896
-#: systemv/cupstestppd.c:914 systemv/cupstestppd.c:931
-#: systemv/cupstestppd.c:953 systemv/cupstestppd.c:971
-#: systemv/cupstestppd.c:988 systemv/cupstestppd.c:1006
-#: systemv/cupstestppd.c:1022 systemv/cupstestppd.c:1042
-#: systemv/cupstestppd.c:1073 systemv/cupstestppd.c:1095
-#: systemv/cupstestppd.c:1146 systemv/cupstestppd.c:1165
-#: systemv/cupstestppd.c:1209 systemv/cupstestppd.c:1223
-#: systemv/cupstestppd.c:1255 systemv/cupstestppd.c:1282
-#: systemv/cupstestppd.c:1800 systemv/cupstestppd.c:1819
-#: systemv/cupstestppd.c:1837 systemv/cupstestppd.c:1889
-#: systemv/cupstestppd.c:1905 systemv/cupstestppd.c:1942
-#: systemv/cupstestppd.c:1960 systemv/cupstestppd.c:1996
-#: systemv/cupstestppd.c:2010 systemv/cupstestppd.c:2037
-#: systemv/cupstestppd.c:2051 systemv/cupstestppd.c:2097
-#: systemv/cupstestppd.c:2119 systemv/cupstestppd.c:2142
-#: systemv/cupstestppd.c:2159 systemv/cupstestppd.c:2201
-#: systemv/cupstestppd.c:2244 systemv/cupstestppd.c:2291
-#: systemv/cupstestppd.c:2315 systemv/cupstestppd.c:2369
-#: systemv/cupstestppd.c:2385 systemv/cupstestppd.c:2415
-#: systemv/cupstestppd.c:2429 systemv/cupstestppd.c:2455
-#: systemv/cupstestppd.c:2471 systemv/cupstestppd.c:2511
-#: systemv/cupstestppd.c:2525 systemv/cupstestppd.c:2551
-#: systemv/cupstestppd.c:2567 systemv/cupstestppd.c:2597
-#: systemv/cupstestppd.c:2611 systemv/cupstestppd.c:2638
-#: systemv/cupstestppd.c:2655 systemv/cupstestppd.c:2669
-#: systemv/cupstestppd.c:2693 systemv/cupstestppd.c:2710
-#: systemv/cupstestppd.c:2724 systemv/cupstestppd.c:2748
-#: systemv/cupstestppd.c:2765 systemv/cupstestppd.c:2779
-#: systemv/cupstestppd.c:2803 systemv/cupstestppd.c:2820
-#: systemv/cupstestppd.c:2834 systemv/cupstestppd.c:2858
-#: systemv/cupstestppd.c:2872 systemv/cupstestppd.c:2887
-#: systemv/cupstestppd.c:2904 systemv/cupstestppd.c:2960
-#: systemv/cupstestppd.c:2995 systemv/cupstestppd.c:3009
-#: systemv/cupstestppd.c:3037 systemv/cupstestppd.c:3102
-#: systemv/cupstestppd.c:3117 systemv/cupstestppd.c:3156
-#: systemv/cupstestppd.c:3176 systemv/cupstestppd.c:3190
-#: systemv/cupstestppd.c:3387 systemv/cupstestppd.c:3423
-#: systemv/cupstestppd.c:3437 systemv/cupstestppd.c:3483
-#: systemv/cupstestppd.c:3515 systemv/cupstestppd.c:3532
-#: systemv/cupstestppd.c:3555 systemv/cupstestppd.c:3571
-#: systemv/cupstestppd.c:3609 systemv/cupstestppd.c:3750
-#: systemv/cupstestppd.c:3772 systemv/cupstestppd.c:3880
 msgid " FAIL"
 msgstr " ERROR"
 
-#: systemv/cupstestppd.c:1306
 msgid " PASS"
 msgstr " VÀLID"
 
-#: berkeley/lpq.c:560
 #, c-format
 msgid "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes"
 msgstr "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes"
 
-#: berkeley/lpq.c:565
 #, c-format
 msgid "%-7s %-7.7s %-7d %-31.31s %.0f bytes"
 msgstr "%-7s %-7.7s %-7d %-31.31s %.0f bytes"
 
-#: systemv/lpstat.c:750
 #, c-format
 msgid "%s accepting requests since %s"
 msgstr "%s accepta peticions des de %s"
 
-#: scheduler/ipp.c:10045
 #, c-format
 msgid "%s cannot be changed."
 msgstr "%s no es pot canviar."
 
-#: berkeley/lpc.c:189
 #, c-format
 msgid "%s is not implemented by the CUPS version of lpc."
 msgstr "%s no està implementat en la versió del CUPS del lpc."
 
-#: berkeley/lpq.c:651
 #, c-format
 msgid "%s is not ready"
 msgstr "%s no està preparada"
 
-#: berkeley/lpq.c:644
 #, c-format
 msgid "%s is ready"
 msgstr "%s està preparada"
 
-#: berkeley/lpq.c:647
 #, c-format
 msgid "%s is ready and printing"
 msgstr "%s està preparada i imprimeix"
 
-#: filter/rastertoepson.c:985 filter/rastertohp.c:711
-#: filter/rastertolabel.c:1134
 #, c-format
 msgid "%s job-id user title copies options [file]"
-msgstr "%s identificador-tasca usuari títol còpies opcions [fitxer]"
+msgstr "%s identificador-feina usuari títol còpies opcions [fitxer]"
 
-#: systemv/lpstat.c:754
 #, c-format
 msgid "%s not accepting requests since %s -"
 msgstr "%s no accepta peticions des de %s -"
 
-#: scheduler/ipp.c:691
 #, c-format
 msgid "%s not supported."
-msgstr "no es permet l'ús de %s."
+msgstr "no és compatible amb l'ús de %s."
 
-#: systemv/lpstat.c:765
 #, c-format
 msgid "%s/%s accepting requests since %s"
 msgstr "%s/%s accepta peticions des de %s"
 
-#: systemv/lpstat.c:770
 #, c-format
 msgid "%s/%s not accepting requests since %s -"
 msgstr "%s/%s no accepta peticions des de %s -"
 
-#: berkeley/lpq.c:552
 #, c-format
 msgid "%s: %-33.33s [job %d localhost]"
-msgstr "%s: %-33.33s [tasca %d localhost]"
+msgstr "%s: %-33.33s [feina %d localhost]"
 
 #. TRANSLATORS: Message is "subject: error"
-#: cups/langprintf.c:86 scheduler/cupsfilter.c:714 systemv/lpadmin.c:805
-#: systemv/lpadmin.c:856 systemv/lpadmin.c:906 systemv/lpadmin.c:962
-#: systemv/lpadmin.c:1060 systemv/lpadmin.c:1112 systemv/lpadmin.c:1168
-#: systemv/lpadmin.c:1478
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: systemv/cancel.c:294 systemv/cancel.c:357
 #, c-format
 msgid "%s: %s failed: %s"
 msgstr "%s: %s ha fallat: %s"
 
-#: systemv/cupsaccept.c:68
 #, c-format
 msgid "%s: Don't know what to do."
 msgstr "%s: no sé que fer."
 
-#: berkeley/lpq.c:236 berkeley/lpr.c:344 systemv/lp.c:584
 #, c-format
 msgid ""
 "%s: Error - %s environment variable names non-existent destination \"%s\"."
@@ -1581,136 +1246,106 @@ msgstr ""
 "%s: error - els noms de les variables d'entorn %s tenen un destí inexistent "
 "«%s»."
 
-#: systemv/lp.c:231
 #, c-format
 msgid "%s: Error - bad job ID."
-msgstr "%s: error - ID de la tasca incorrecte."
+msgstr "%s: error - ID de la feina incorrecte."
 
-#: systemv/lp.c:219
 #, c-format
 msgid "%s: Error - cannot print files and alter jobs simultaneously."
 msgstr ""
 "%s: error - no es poden imprimir fitxers i modificar tasques al mateix temps."
 
-#: systemv/lp.c:505
 #, c-format
 msgid "%s: Error - cannot print from stdin if files or a job ID are provided."
 msgstr ""
 "%s: error - no es pot imprimir des d'stdin si s'indiquen els fitxers o "
-"l'identificador de la tasca."
+"l'identificador de la feina."
 
-#: systemv/lp.c:461
 #, c-format
 msgid "%s: Error - expected character set after \"-S\" option."
 msgstr ""
 "%s: error - s'esperava un conjunt de caràcters després de l'opció «-S»."
 
-#: systemv/lp.c:480
 #, c-format
 msgid "%s: Error - expected content type after \"-T\" option."
 msgstr "%s: error - s'esperava un tipus de contingut després de l'opció «-T»."
 
-#: berkeley/lpr.c:240
 #, c-format
 msgid "%s: Error - expected copies after \"-#\" option."
 msgstr "%s: error - s'esperaven còpies després de l'opció «-#»."
 
-#: systemv/lp.c:264
 #, c-format
 msgid "%s: Error - expected copies after \"-n\" option."
 msgstr "%s: error - s'esperaven còpies després de l'opció «-n»."
 
-#: berkeley/lpr.c:209
 #, c-format
 msgid "%s: Error - expected destination after \"-P\" option."
 msgstr "%s: error - s'esperava un destí després de l'opció «-P»."
 
-#: systemv/lpstat.c:231
 #, c-format
 msgid "%s: Error - expected destination after \"-b\" option."
 msgstr "%s: error - s'esperava un destí després de l'opció «-b»."
 
-#: systemv/lp.c:138
 #, c-format
 msgid "%s: Error - expected destination after \"-d\" option."
 msgstr "%s: error - s'esperava un destí després de l'opció «-d»."
 
-#: systemv/lp.c:168
 #, c-format
 msgid "%s: Error - expected form after \"-f\" option."
 msgstr "%s: error - s'esperava un formulari després de l'opció «-f»."
 
-#: systemv/lp.c:391
 #, c-format
 msgid "%s: Error - expected hold name after \"-H\" option."
 msgstr "%s: error - s'esperava un nom per pausa després de l'opció «-H»."
 
-#: berkeley/lpr.c:103
 #, c-format
 msgid "%s: Error - expected hostname after \"-H\" option."
-msgstr ""
-"%s: error - s'esperava el nom de l'ordinador central després de l'opció «-H»."
+msgstr "%s: error - s'esperava el nom de l'amfitrió després de l'opció «-H»."
 
-#: berkeley/lpq.c:180 berkeley/lprm.c:123 systemv/cancel.c:124
-#: systemv/cupsaccept.c:123 systemv/lp.c:189 systemv/lpstat.c:291
 #, c-format
 msgid "%s: Error - expected hostname after \"-h\" option."
-msgstr ""
-"%s: error - s'esperava el nom de l'ordinador central després de l'opció «-h»."
+msgstr "%s: error - s'esperava el nom de l'amfitrió després de l'opció «-h»."
 
-#: systemv/lp.c:371
 #, c-format
 msgid "%s: Error - expected mode list after \"-y\" option."
 msgstr "%s: error - s'esperava una llista de modes després de l'opció «-y»."
 
-#: berkeley/lpr.c:263
 #, c-format
 msgid "%s: Error - expected name after \"-%c\" option."
 msgstr "%s: error - s'esperava un nom després de l'opció «-%c»."
 
-#: berkeley/lpr.c:153 systemv/lp.c:288
 #, c-format
 msgid "%s: Error - expected option=value after \"-o\" option."
 msgstr "%s: error - s'esperava opció=valor després de l'opció «-o»."
 
-#: systemv/lp.c:441
 #, c-format
 msgid "%s: Error - expected page list after \"-P\" option."
 msgstr "%s: error - s'esperava una llista de pàgines després de l'opció «-P»."
 
-#: systemv/lp.c:308
 #, c-format
 msgid "%s: Error - expected priority after \"-%c\" option."
 msgstr "%s: error - s'esperava una prioritat després de l'opció «-%c»."
 
-#: systemv/cupsaccept.c:141
 #, c-format
 msgid "%s: Error - expected reason text after \"-r\" option."
 msgstr "%s: error - s'esperava una explicació després de l'opció «-r»."
 
-#: systemv/lp.c:354
 #, c-format
 msgid "%s: Error - expected title after \"-t\" option."
 msgstr "%s: error - s'esperava un títol després de l'opció «-t»."
 
-#: berkeley/lpq.c:111 berkeley/lpr.c:84 berkeley/lprm.c:104
-#: systemv/cancel.c:94 systemv/cupsaccept.c:101 systemv/lp.c:116
-#: systemv/lpadmin.c:438 systemv/lpstat.c:137
 #, c-format
 msgid "%s: Error - expected username after \"-U\" option."
 msgstr "%s: error - s'esperava un nom d'usuari després de l'opció «-U»."
 
-#: systemv/cancel.c:145
 #, c-format
 msgid "%s: Error - expected username after \"-u\" option."
 msgstr "%s: error - s'esperava un nom d'usuari després de l'opció «-u»."
 
-#: berkeley/lpr.c:125
 #, c-format
 msgid "%s: Error - expected value after \"-%c\" option."
 msgstr "%s: error - s'esperava un valor després de l'opció «-%c»."
 
-#: systemv/lpstat.c:157 systemv/lpstat.c:171
 #, c-format
 msgid ""
 "%s: Error - need \"completed\", \"not-completed\", or \"all\" after \"-W\" "
@@ -1719,1458 +1354,1108 @@ msgstr ""
 "%s: error - es requereix «completed», «not-completed», o «all» després de "
 "l'opció «-W»."
 
-#: berkeley/lpq.c:241 berkeley/lpr.c:349 systemv/lp.c:589
 #, c-format
 msgid "%s: Error - no default destination available."
 msgstr "%s: error - no hi ha un destí per defecte."
 
-#: systemv/lp.c:330
 #, c-format
 msgid "%s: Error - priority must be between 1 and 100."
 msgstr "%s: error - la prioritat ha de ser entre 1 i 100."
 
-#: berkeley/lpr.c:352 systemv/lp.c:592
 #, c-format
 msgid "%s: Error - scheduler not responding."
 msgstr "%s: error - el planificador no està responent."
 
-#: berkeley/lpr.c:305 systemv/lp.c:537
 #, c-format
 msgid "%s: Error - too many files - \"%s\"."
 msgstr "%s: error - massa fitxers - «%s»."
 
-#: berkeley/lpr.c:287 systemv/lp.c:520
 #, c-format
 msgid "%s: Error - unable to access \"%s\" - %s"
 msgstr "%s: error - no es pot accedir a «%s» - %s"
 
-#: berkeley/lpr.c:395 systemv/lp.c:623
 #, c-format
 msgid "%s: Error - unable to queue from stdin - %s."
 msgstr "%s: error - no es pot posar en cua des d'stdin - %s."
 
-#: berkeley/lprm.c:87 berkeley/lprm.c:172 systemv/cancel.c:214
 #, c-format
 msgid "%s: Error - unknown destination \"%s\"."
 msgstr "%s: error - el destí «%s» és desconegut."
 
-#: berkeley/lpq.c:150
 #, c-format
 msgid "%s: Error - unknown destination \"%s/%s\"."
 msgstr "%s: error - el destí «%s/%s» és desconegut."
 
-#: berkeley/lpr.c:274 berkeley/lprm.c:139 systemv/cancel.c:156
-#: systemv/cupsaccept.c:164 systemv/lp.c:496 systemv/lpstat.c:452
 #, c-format
 msgid "%s: Error - unknown option \"%c\"."
-msgstr "%s: error - la opció «%c» és desconeguda."
+msgstr "%s: error - l'opció «%c» és desconeguda."
 
-#: systemv/cupsaccept.c:157
 #, c-format
 msgid "%s: Error - unknown option \"%s\"."
-msgstr "%s: error - la opció «%s» és desconeguda."
+msgstr "%s: error - l'opció «%s» és desconeguda."
 
-#: systemv/lp.c:208
 #, c-format
 msgid "%s: Expected job ID after \"-i\" option."
-msgstr "%s: s'esperava l'ID d'una tasca després de l'opció «-i»."
+msgstr "%s: s'esperava l'ID d'una feina després de l'opció «-i»."
 
-#: systemv/lpstat.c:504 systemv/lpstat.c:543
 #, c-format
 msgid "%s: Invalid destination name in list \"%s\"."
 msgstr "%s: el nom del destí no és vàlid a la llista «%s»."
 
-#: scheduler/cupsfilter.c:567
 #, c-format
 msgid "%s: Invalid filter string \"%s\"."
 msgstr "%s: la cadena del filtre «%s» no és vàlida."
 
-#: systemv/lp.c:418
 #, c-format
 msgid "%s: Need job ID (\"-i jobid\") before \"-H restart\"."
-msgstr "%s: es necessita l'ID de la tasca («-i jobid») abans de «-H restart»."
+msgstr "%s: es necessita l'ID de la feina («-i jobid») abans de «-H restart»."
 
-#: scheduler/cupsfilter.c:458
 #, c-format
 msgid "%s: No filter to convert from %s/%s to %s/%s."
 msgstr "%s: no hi ha cap filtre per convertir de %s/%s a %s/%s."
 
-#: systemv/cupsaccept.c:198
 #, c-format
 msgid "%s: Operation failed: %s"
 msgstr "%s: ha fallat l'operació: %s"
 
-#: berkeley/lpq.c:97 berkeley/lpr.c:70 berkeley/lprm.c:67 systemv/cancel.c:81
-#: systemv/cupsaccept.c:88 systemv/cupsaddsmb.c:86 systemv/lp.c:102
-#: systemv/lpadmin.c:239 systemv/lpinfo.c:88 systemv/lpmove.c:73
-#: systemv/lpstat.c:102 test/ipptool.c:304 test/ipptool.c:321
 #, c-format
 msgid "%s: Sorry, no encryption support."
 msgstr "%s: ho sento, no està compilada la compatibilitat pel xifrat."
 
-#: berkeley/lpq.c:295 scheduler/cupsfilter.c:1221 systemv/cancel.c:237
-#: systemv/cupsaddsmb.c:144 systemv/cupsaddsmb.c:171
 #, c-format
 msgid "%s: Unable to connect to server."
 msgstr "%s: no es pot connectar al servidor."
 
-#: systemv/cancel.c:317
 #, c-format
 msgid "%s: Unable to contact server."
 msgstr "%s: no es pot contactar amb el servidor."
 
-#: scheduler/cupsfilter.c:424
 #, c-format
 msgid "%s: Unable to determine MIME type of \"%s\"."
 msgstr "%s: no es pot determinar el tips de MIME de «%s»."
 
-#: ppdc/ppdmerge.cxx:96
 #, c-format
 msgid "%s: Unable to open %s: %s"
 msgstr "%s: no es pot obrir %s: %s"
 
-#: scheduler/cupsfilter.c:662 ppdc/ppdmerge.cxx:112
 #, c-format
 msgid "%s: Unable to open PPD file: %s on line %d."
 msgstr "%s: no es pot obrir el fitxer PPD: %s a la línia %d."
 
-#: scheduler/cupsfilter.c:392
 #, c-format
 msgid "%s: Unable to read MIME database from \"%s\" or \"%s\"."
 msgstr "%s: no es pot llegir la base de dades MIME de «%s» o «%s»."
 
-#: berkeley/lpq.c:153 systemv/lpstat.c:558
 #, c-format
 msgid "%s: Unknown destination \"%s\"."
 msgstr "%s: el destí «%s» és desconegut."
 
-#: scheduler/cupsfilter.c:435
 #, c-format
 msgid "%s: Unknown destination MIME type %s/%s."
 msgstr "%s: es destí de tipus MIME %s/%s és desconegut."
 
-#: scheduler/cupsfilter.c:1426
 #, c-format
 msgid "%s: Unknown option \"%c\"."
 msgstr "%s: l'opció «%c» és desconeguda."
 
-#: scheduler/cupsfilter.c:416
 #, c-format
 msgid "%s: Unknown source MIME type %s/%s."
 msgstr "%s: la font del tipus de MIME %s/%s és desconeguda."
 
-#: berkeley/lpr.c:139
 #, c-format
 msgid ""
 "%s: Warning - \"%c\" format modifier not supported - output may not be "
 "correct."
 msgstr ""
-"%s: avís - no es permet l'us del modificador de format «%c» - el resultat "
-"pot no ser correcte."
+"%s: avís - no és compatible amb l'ús del modificador de format «%c» - el "
+"resultat pot no ser correcte."
 
-#: systemv/lp.c:468
 #, c-format
 msgid "%s: Warning - character set option ignored."
 msgstr "%s: avís - s'ignora l'opció del grup de caràcters."
 
-#: systemv/lp.c:487
 #, c-format
 msgid "%s: Warning - content type option ignored."
 msgstr "%s: avís - s'ignora l'opció de tipus de contingut."
 
-#: systemv/lp.c:175
 #, c-format
 msgid "%s: Warning - form option ignored."
 msgstr "%s: avís - s'ignora l'opció de formulari."
 
-#: systemv/lp.c:378
 #, c-format
 msgid "%s: Warning - mode option ignored."
 msgstr "%s: avís - s'ignora l'opció de mode."
 
-#: ppdc/sample.c:310
 msgid "-1"
 msgstr "-1"
 
-#: ppdc/sample.c:301
 msgid "-10"
 msgstr "-10"
 
-#: ppdc/sample.c:393
 msgid "-100"
 msgstr "-100"
 
-#: ppdc/sample.c:392
 msgid "-105"
 msgstr "-105"
 
-#: ppdc/sample.c:300
 msgid "-11"
 msgstr "-11"
 
-#: ppdc/sample.c:391
 msgid "-110"
 msgstr "-110"
 
-#: ppdc/sample.c:390
 msgid "-115"
 msgstr "-115"
 
-#: ppdc/sample.c:299
 msgid "-12"
 msgstr "-12"
 
-#: ppdc/sample.c:389
 msgid "-120"
 msgstr "-120"
 
-#: ppdc/sample.c:298
 msgid "-13"
 msgstr "-13"
 
-#: ppdc/sample.c:297
 msgid "-14"
 msgstr "-14"
 
-#: ppdc/sample.c:296
 msgid "-15"
 msgstr "-15"
 
-#: ppdc/sample.c:309
 msgid "-2"
 msgstr "-2"
 
-#: ppdc/sample.c:409
 msgid "-20"
 msgstr "-20"
 
-#: ppdc/sample.c:408
 msgid "-25"
 msgstr "-25"
 
-#: ppdc/sample.c:308
 msgid "-3"
 msgstr "-3"
 
-#: ppdc/sample.c:407
 msgid "-30"
 msgstr "-30"
 
-#: ppdc/sample.c:406
 msgid "-35"
 msgstr "-35"
 
-#: ppdc/sample.c:307
 msgid "-4"
 msgstr "-4"
 
-#: ppdc/sample.c:405
 msgid "-40"
 msgstr "-40"
 
-#: ppdc/sample.c:404
 msgid "-45"
 msgstr "-45"
 
-#: ppdc/sample.c:306
 msgid "-5"
 msgstr "-5"
 
-#: ppdc/sample.c:403
 msgid "-50"
 msgstr "-50"
 
-#: ppdc/sample.c:402
 msgid "-55"
 msgstr "-55"
 
-#: ppdc/sample.c:305
 msgid "-6"
 msgstr "-6"
 
-#: ppdc/sample.c:401
 msgid "-60"
 msgstr "-60"
 
-#: ppdc/sample.c:400
 msgid "-65"
 msgstr "-65"
 
-#: ppdc/sample.c:304
 msgid "-7"
 msgstr "-7"
 
-#: ppdc/sample.c:399
 msgid "-70"
 msgstr "-70"
 
-#: ppdc/sample.c:398
 msgid "-75"
 msgstr "-75"
 
-#: ppdc/sample.c:303
 msgid "-8"
 msgstr "-8"
 
-#: ppdc/sample.c:397
 msgid "-80"
 msgstr "-80"
 
-#: ppdc/sample.c:396
 msgid "-85"
 msgstr "-85"
 
-#: ppdc/sample.c:302
 msgid "-9"
 msgstr "-9"
 
-#: ppdc/sample.c:395
 msgid "-90"
 msgstr "-90"
 
-#: ppdc/sample.c:394
 msgid "-95"
 msgstr "-95"
 
-#: ppdc/sample.c:311
 msgid "0"
 msgstr "0"
 
-#: ppdc/sample.c:312
 msgid "1"
 msgstr "1"
 
-#: ppdc/sample.c:384
 msgid "1 inch/sec."
 msgstr "1 polzada/seg."
 
-#: ppdc/sample.c:172
 msgid "1.25x0.25\""
 msgstr "1.25x0.25\""
 
-#: ppdc/sample.c:173
 msgid "1.25x2.25\""
 msgstr "1.25x2.25\""
 
-#: ppdc/sample.c:432
 msgid "1.5 inch/sec."
 msgstr "1.5 polzades/seg."
 
-#: ppdc/sample.c:174
 msgid "1.50x0.25\""
 msgstr "1.50x0.25\""
 
-#: ppdc/sample.c:175
 msgid "1.50x0.50\""
 msgstr "1.50x0.50\""
 
-#: ppdc/sample.c:176
 msgid "1.50x1.00\""
 msgstr "1.50x1.00\""
 
-#: ppdc/sample.c:177
 msgid "1.50x2.00\""
 msgstr "1.50x2.00\""
 
-#: ppdc/sample.c:321
 msgid "10"
 msgstr "10"
 
-#: ppdc/sample.c:443
 msgid "10 inches/sec."
 msgstr "10 polzades/seg."
 
-#: ppdc/sample.c:6
 msgid "10 x 11"
 msgstr "10 x 11"
 
-#: ppdc/sample.c:7
 msgid "10 x 13"
 msgstr "10 x 13"
 
-#: ppdc/sample.c:8
 msgid "10 x 14"
 msgstr "10 x 14"
 
-#: ppdc/sample.c:423
 msgid "100"
 msgstr "100"
 
-#: ppdc/sample.c:334
 msgid "100 mm/sec."
 msgstr "100 mm/seg."
 
-#: ppdc/sample.c:424
 msgid "105"
 msgstr "105"
 
-#: ppdc/sample.c:322
 msgid "11"
 msgstr "11"
 
-#: ppdc/sample.c:444
 msgid "11 inches/sec."
 msgstr "11 polzades/seg."
 
-#: ppdc/sample.c:425
 msgid "110"
 msgstr "110"
 
-#: ppdc/sample.c:426
 msgid "115"
 msgstr "115"
 
-#: ppdc/sample.c:323
 msgid "12"
 msgstr "12"
 
-#: ppdc/sample.c:445
 msgid "12 inches/sec."
 msgstr "12 polzades/seg."
 
-#: ppdc/sample.c:9
 msgid "12 x 11"
 msgstr "12 x 11"
 
-#: ppdc/sample.c:427
 msgid "120"
 msgstr "120"
 
-#: ppdc/sample.c:335
 msgid "120 mm/sec."
 msgstr "120 mm/seg."
 
-#: ppdc/sample.c:243
 msgid "120x60dpi"
 msgstr "120x60ppp"
 
-#: ppdc/sample.c:249
 msgid "120x72dpi"
 msgstr "120x72ppp"
 
-#: ppdc/sample.c:324
 msgid "13"
 msgstr "13"
 
-#: ppdc/sample.c:232
 msgid "136dpi"
 msgstr "136ppp"
 
-#: ppdc/sample.c:325
 msgid "14"
 msgstr "14"
 
-#: ppdc/sample.c:326
 msgid "15"
 msgstr "15"
 
-#: ppdc/sample.c:328
 msgid "15 mm/sec."
 msgstr "15 mm/seg."
 
-#: ppdc/sample.c:10
 msgid "15 x 11"
 msgstr "15 x 11"
 
-#: ppdc/sample.c:336
 msgid "150 mm/sec."
 msgstr "150 mm/seg."
 
-#: ppdc/sample.c:283
 msgid "150dpi"
 msgstr "150ppp"
 
-#: ppdc/sample.c:368
 msgid "16"
 msgstr "16"
 
-#: ppdc/sample.c:369
 msgid "17"
 msgstr "17"
 
-#: ppdc/sample.c:370
 msgid "18"
 msgstr "18"
 
-#: ppdc/sample.c:244
 msgid "180dpi"
 msgstr "180ppp"
 
-#: ppdc/sample.c:371
 msgid "19"
 msgstr "19"
 
-#: ppdc/sample.c:313
 msgid "2"
 msgstr "2"
 
-#: ppdc/sample.c:385
 msgid "2 inches/sec."
 msgstr "2 polzades/seg."
 
-#: ppdc/sample.c:270
 msgid "2-Sided Printing"
 msgstr "Impressió a doble cara"
 
-#: ppdc/sample.c:178
 msgid "2.00x0.37\""
 msgstr "2.00x0.37\""
 
-#: ppdc/sample.c:179
 msgid "2.00x0.50\""
 msgstr "2.00x0.50\""
 
-#: ppdc/sample.c:180
 msgid "2.00x1.00\""
 msgstr "2.00x1.00\""
 
-#: ppdc/sample.c:181
 msgid "2.00x1.25\""
 msgstr "2.00x1.25\""
 
-#: ppdc/sample.c:182
 msgid "2.00x2.00\""
 msgstr "2.00x2.00\""
 
-#: ppdc/sample.c:183
 msgid "2.00x3.00\""
 msgstr "2.00x3.00\""
 
-#: ppdc/sample.c:184
 msgid "2.00x4.00\""
 msgstr "2.00x4.00\""
 
-#: ppdc/sample.c:185
 msgid "2.00x5.50\""
 msgstr "2.00x5.50\""
 
-#: ppdc/sample.c:186
 msgid "2.25x0.50\""
 msgstr "2.25x0.50\""
 
-#: ppdc/sample.c:187
 msgid "2.25x1.25\""
 msgstr "2.25x1.25\""
 
-#: ppdc/sample.c:188
 msgid "2.25x4.00\""
 msgstr "2.25x4.00\""
 
-#: ppdc/sample.c:189
 msgid "2.25x5.50\""
 msgstr "2.25x5.50\""
 
-#: ppdc/sample.c:190
 msgid "2.38x5.50\""
 msgstr "2.38x5.50\""
 
-#: ppdc/sample.c:433
 msgid "2.5 inches/sec."
 msgstr "2.5 polzades/seg."
 
-#: ppdc/sample.c:191
 msgid "2.50x1.00\""
 msgstr "2.50x1.00\""
 
-#: ppdc/sample.c:192
 msgid "2.50x2.00\""
 msgstr "2.50x2.00\""
 
-#: ppdc/sample.c:193
 msgid "2.75x1.25\""
 msgstr "2.75x1.25\""
 
-#: ppdc/sample.c:194
 msgid "2.9 x 1\""
 msgstr "2.9 x 1\""
 
-#: ppdc/sample.c:372
 msgid "20"
 msgstr "20"
 
-#: ppdc/sample.c:329
 msgid "20 mm/sec."
 msgstr "20 mm/seg."
 
-#: ppdc/sample.c:337
 msgid "200 mm/sec."
 msgstr "200 mm/seg."
 
-#: ppdc/sample.c:233
 msgid "203dpi"
 msgstr "203ppp"
 
-#: ppdc/sample.c:373
 msgid "21"
 msgstr "21"
 
-#: ppdc/sample.c:374
 msgid "22"
 msgstr "22"
 
-#: ppdc/sample.c:375
 msgid "23"
 msgstr "23"
 
-#: ppdc/sample.c:376
 msgid "24"
 msgstr "24"
 
-#: ppdc/sample.c:241
 msgid "24-Pin Series"
 msgstr "Sèrie de 24 pins"
 
-#: ppdc/sample.c:250
 msgid "240x72dpi"
 msgstr "240x72ppp"
 
-#: ppdc/sample.c:377
 msgid "25"
 msgstr "25"
 
-#: ppdc/sample.c:338
 msgid "250 mm/sec."
 msgstr "250 mm/seg."
 
-#: ppdc/sample.c:378
 msgid "26"
 msgstr "26"
 
-#: ppdc/sample.c:379
 msgid "27"
 msgstr "27"
 
-#: ppdc/sample.c:380
 msgid "28"
 msgstr "28"
 
-#: ppdc/sample.c:381
 msgid "29"
 msgstr "29"
 
-#: ppdc/sample.c:314
 msgid "3"
 msgstr "3"
 
-#: ppdc/sample.c:386
 msgid "3 inches/sec."
 msgstr "3 polzades/seg."
 
-#: ppdc/sample.c:3
 msgid "3 x 5"
 msgstr "3 x 5"
 
-#: ppdc/sample.c:195
 msgid "3.00x1.00\""
 msgstr "3.00x1.00\""
 
-#: ppdc/sample.c:196
 msgid "3.00x1.25\""
 msgstr "3.00x1.25\""
 
-#: ppdc/sample.c:197
 msgid "3.00x2.00\""
 msgstr "3.00x2.00\""
 
-#: ppdc/sample.c:198
 msgid "3.00x3.00\""
 msgstr "3.00x3.00\""
 
-#: ppdc/sample.c:199
 msgid "3.00x5.00\""
 msgstr "3.00x5.00\""
 
-#: ppdc/sample.c:200
 msgid "3.25x2.00\""
 msgstr "3.25x2.00\""
 
-#: ppdc/sample.c:201
 msgid "3.25x5.00\""
 msgstr "3.25x5.00\""
 
-#: ppdc/sample.c:202
 msgid "3.25x5.50\""
 msgstr "3.25x5.50\""
 
-#: ppdc/sample.c:203
 msgid "3.25x5.83\""
 msgstr "3.25x5.83\""
 
-#: ppdc/sample.c:204
 msgid "3.25x7.83\""
 msgstr "3.25x7.83\""
 
-#: ppdc/sample.c:4
 msgid "3.5 x 5"
 msgstr "3.5 x 5"
 
-#: ppdc/sample.c:171
 msgid "3.5\" Disk"
 msgstr "Disc de 3.5\""
 
-#: ppdc/sample.c:205
 msgid "3.50x1.00\""
 msgstr "3.5x1.00\""
 
-#: ppdc/sample.c:382
 msgid "30"
 msgstr "30"
 
-#: ppdc/sample.c:330
 msgid "30 mm/sec."
 msgstr "30 mm/seg."
 
-#: ppdc/sample.c:339
 msgid "300 mm/sec."
 msgstr "300 mm/seg."
 
-#: ppdc/sample.c:234
 msgid "300dpi"
 msgstr "300ppp"
 
-#: ppdc/sample.c:410
 msgid "35"
 msgstr "35"
 
-#: ppdc/sample.c:246
 msgid "360dpi"
 msgstr "360ppp"
 
-#: ppdc/sample.c:245
 msgid "360x180dpi"
 msgstr "360x180ppp"
 
-#: ppdc/sample.c:315
 msgid "4"
 msgstr "4"
 
-#: ppdc/sample.c:387
 msgid "4 inches/sec."
 msgstr "4 polzades/seg."
 
-#: ppdc/sample.c:206
 msgid "4.00x1.00\""
 msgstr "4.00x1.00\""
 
-#: ppdc/sample.c:214
 msgid "4.00x13.00\""
 msgstr "4.00x13.00\""
 
-#: ppdc/sample.c:207
 msgid "4.00x2.00\""
 msgstr "4.00x2.00\""
 
-#: ppdc/sample.c:208
 msgid "4.00x2.50\""
 msgstr "4.00x2.50\""
 
-#: ppdc/sample.c:209
 msgid "4.00x3.00\""
 msgstr "4.00x3.00\""
 
-#: ppdc/sample.c:210
 msgid "4.00x4.00\""
 msgstr "4.00x4.00\""
 
-#: ppdc/sample.c:211
 msgid "4.00x5.00\""
 msgstr "4.00x5.00\""
 
-#: ppdc/sample.c:212
 msgid "4.00x6.00\""
 msgstr "4.00x6.00\""
 
-#: ppdc/sample.c:213
 msgid "4.00x6.50\""
 msgstr "4.00x6.50\""
 
-#: ppdc/sample.c:411
 msgid "40"
 msgstr "40"
 
-#: ppdc/sample.c:331
 msgid "40 mm/sec."
 msgstr "40 mm/seg."
 
-#: ppdc/sample.c:412
 msgid "45"
 msgstr "45"
 
-#: ppdc/sample.c:316
 msgid "5"
 msgstr "5"
 
-#: ppdc/sample.c:437
 msgid "5 inches/sec."
 msgstr "5 polzades/seg."
 
-#: ppdc/sample.c:5
 msgid "5 x 7"
 msgstr "15 x 11"
 
-#: ppdc/sample.c:413
 msgid "50"
 msgstr "50"
 
-#: ppdc/sample.c:414
 msgid "55"
 msgstr "55"
 
-#: ppdc/sample.c:317
 msgid "6"
 msgstr "6"
 
-#: ppdc/sample.c:438
 msgid "6 inches/sec."
 msgstr "6 polzades/seg."
 
-#: ppdc/sample.c:215
 msgid "6.00x1.00\""
 msgstr "6.00x1.00\""
 
-#: ppdc/sample.c:216
 msgid "6.00x2.00\""
 msgstr "6.00x2.00\""
 
-#: ppdc/sample.c:217
 msgid "6.00x3.00\""
 msgstr "6.00x3.00\""
 
-#: ppdc/sample.c:218
 msgid "6.00x4.00\""
 msgstr "6.00x4.00\""
 
-#: ppdc/sample.c:219
 msgid "6.00x5.00\""
 msgstr "6.00x5.00\""
 
-#: ppdc/sample.c:220
 msgid "6.00x6.00\""
 msgstr "6.00x6.00\""
 
-#: ppdc/sample.c:221
 msgid "6.00x6.50\""
 msgstr "6.00x6.50\""
 
-#: ppdc/sample.c:415
 msgid "60"
 msgstr "60"
 
-#: ppdc/sample.c:332
 msgid "60 mm/sec."
 msgstr "60 mm/seg."
 
-#: ppdc/sample.c:261
 msgid "600dpi"
 msgstr "600ppp"
 
-#: ppdc/sample.c:242
 msgid "60dpi"
 msgstr "60ppp"
 
-#: ppdc/sample.c:248
 msgid "60x72dpi"
 msgstr "60x72ppp"
 
-#: ppdc/sample.c:416
 msgid "65"
 msgstr "65"
 
-#: ppdc/sample.c:318
 msgid "7"
 msgstr "7"
 
-#: ppdc/sample.c:440
 msgid "7 inches/sec."
 msgstr "7 polzades/seg."
 
-#: ppdc/sample.c:11
 msgid "7 x 9"
 msgstr "7 x 9"
 
-#: ppdc/sample.c:417
 msgid "70"
 msgstr "70"
 
-#: ppdc/sample.c:252
 msgid "720dpi"
 msgstr "720ppp"
 
-#: ppdc/sample.c:418
 msgid "75"
 msgstr "75"
 
-#: ppdc/sample.c:319
 msgid "8"
 msgstr "8"
 
-#: ppdc/sample.c:441
 msgid "8 inches/sec."
 msgstr "8 polzades/seg."
 
-#: ppdc/sample.c:12
 msgid "8 x 10"
 msgstr "8 x 10"
 
-#: ppdc/sample.c:222
 msgid "8.00x1.00\""
 msgstr "8.00x1.00\""
 
-#: ppdc/sample.c:223
 msgid "8.00x2.00\""
 msgstr "8.00x2.00\""
 
-#: ppdc/sample.c:224
 msgid "8.00x3.00\""
 msgstr "8.00x3.00\""
 
-#: ppdc/sample.c:225
 msgid "8.00x4.00\""
 msgstr "8.00x4.00\""
 
-#: ppdc/sample.c:226
 msgid "8.00x5.00\""
 msgstr "8.00x5.00\""
 
-#: ppdc/sample.c:227
 msgid "8.00x6.00\""
 msgstr "8.00x6.00\""
 
-#: ppdc/sample.c:228
 msgid "8.00x6.50\""
 msgstr "8.00x6.50\""
 
-#: ppdc/sample.c:419
 msgid "80"
 msgstr "80"
 
-#: ppdc/sample.c:333
 msgid "80 mm/sec."
 msgstr "80 mm/seg."
 
-#: ppdc/sample.c:420
 msgid "85"
 msgstr "85"
 
-#: ppdc/sample.c:320
 msgid "9"
 msgstr "9"
 
-#: ppdc/sample.c:442
 msgid "9 inches/sec."
 msgstr "9 polzades/seg."
 
-#: ppdc/sample.c:13
 msgid "9 x 11"
 msgstr "9 x 11"
 
-#: ppdc/sample.c:14
 msgid "9 x 12"
 msgstr "9 x 12"
 
-#: ppdc/sample.c:247
 msgid "9-Pin Series"
 msgstr "Sèrie de 9 pins"
 
-#: ppdc/sample.c:421
 msgid "90"
 msgstr "90"
 
-#: ppdc/sample.c:422
 msgid "95"
 msgstr "95"
 
-#: berkeley/lpc.c:213
 msgid "?Invalid help command unknown."
 msgstr "?Comanda d'ajuda no vàlida desconeguda."
 
-#: cgi-bin/admin.c:2368
 msgid "A Samba password is required to export printer drivers"
 msgstr ""
 "Necessiteu una contrasenya de Samba per exportar els controladors "
 "d'impressora"
 
-#: cgi-bin/admin.c:2364
 msgid "A Samba username is required to export printer drivers"
 msgstr ""
 "Necessiteu una nom d'usuari de Samba per exportar els controladors "
 "d'impressora"
 
-#: scheduler/ipp.c:2283
 #, c-format
 msgid "A class named \"%s\" already exists."
 msgstr "Ja existeix una classe anomenada «%s»."
 
-#: scheduler/ipp.c:1004
 #, c-format
 msgid "A printer named \"%s\" already exists."
 msgstr "Ja existeix una impressora anomenada «%s»."
 
-#: ppdc/sample.c:15
 msgid "A0"
 msgstr "A0"
 
-#: ppdc/sample.c:16
 msgid "A0 Long Edge"
 msgstr "A0 costat llarg"
 
-#: ppdc/sample.c:17
 msgid "A1"
 msgstr "A1"
 
-#: ppdc/sample.c:18
 msgid "A1 Long Edge"
 msgstr "A1 costat llarg"
 
-#: ppdc/sample.c:37
 msgid "A10"
 msgstr "A10"
 
-#: ppdc/sample.c:19
 msgid "A2"
 msgstr "A2"
 
-#: ppdc/sample.c:20
 msgid "A2 Long Edge"
 msgstr "A2 costat llarg"
 
-#: ppdc/sample.c:21
 msgid "A3"
 msgstr "A3"
 
-#: ppdc/sample.c:22
 msgid "A3 Long Edge"
 msgstr "A3 costat llarg"
 
-#: ppdc/sample.c:23
 msgid "A3 Oversize"
 msgstr "A3 estès"
 
-#: ppdc/sample.c:24
 msgid "A3 Oversize Long Edge"
 msgstr "A3 estès pel costat llarg"
 
-#: ppdc/sample.c:25
 msgid "A4"
 msgstr "A4"
 
-#: ppdc/sample.c:27
 msgid "A4 Long Edge"
 msgstr "A4 costat llarg"
 
-#: ppdc/sample.c:26
 msgid "A4 Oversize"
 msgstr "A4 estès"
 
-#: ppdc/sample.c:28
 msgid "A4 Small"
 msgstr "A4 reduït"
 
-#: ppdc/sample.c:29
 msgid "A5"
 msgstr "A5"
 
-#: ppdc/sample.c:31
 msgid "A5 Long Edge"
 msgstr "A5 costat llarg"
 
-#: ppdc/sample.c:30
 msgid "A5 Oversize"
 msgstr "A5 estès"
 
-#: ppdc/sample.c:32
 msgid "A6"
 msgstr "A6"
 
-#: ppdc/sample.c:33
 msgid "A6 Long Edge"
 msgstr "A6 costat llarg"
 
-#: ppdc/sample.c:34
 msgid "A7"
 msgstr "A7"
 
-#: ppdc/sample.c:35
 msgid "A8"
 msgstr "A8"
 
-#: ppdc/sample.c:36
 msgid "A9"
 msgstr "A9"
 
-#: ppdc/sample.c:38
 msgid "ANSI A"
 msgstr "ANSI A"
 
-#: ppdc/sample.c:39
 msgid "ANSI B"
 msgstr "ANSI B"
 
-#: ppdc/sample.c:40
 msgid "ANSI C"
 msgstr "ANSI C"
 
-#: ppdc/sample.c:41
 msgid "ANSI D"
 msgstr "ANSI D"
 
-#: ppdc/sample.c:42
 msgid "ANSI E"
 msgstr "ANSI E"
 
-#: ppdc/sample.c:47
 msgid "ARCH C"
 msgstr "ARCH C"
 
-#: ppdc/sample.c:48
 msgid "ARCH C Long Edge"
 msgstr "ARCH C costat llarg"
 
-#: ppdc/sample.c:49
 msgid "ARCH D"
 msgstr "ARCH D"
 
-#: ppdc/sample.c:50
 msgid "ARCH D Long Edge"
 msgstr "ARCH D costat llarg"
 
-#: ppdc/sample.c:51
 msgid "ARCH E"
 msgstr "ARCH E"
 
-#: ppdc/sample.c:52
 msgid "ARCH E Long Edge"
 msgstr "ARCH E costat llarg"
 
-#: cgi-bin/classes.c:169 cgi-bin/printers.c:172
 msgid "Accept Jobs"
-msgstr "Accepta tasques"
+msgstr "Accepta feines"
 
-#: cups/http-support.c:1284
 msgid "Accepted"
 msgstr "Acceptada"
 
-#: cgi-bin/admin.c:570
 msgid "Add Class"
 msgstr "Afegeix una classe"
 
-#: cgi-bin/admin.c:882
 msgid "Add Printer"
 msgstr "Afegeix una impressora"
 
-#: cgi-bin/admin.c:444 cgi-bin/admin.c:477 cgi-bin/admin.c:525
-#: cgi-bin/admin.c:535
 msgid "Add RSS Subscription"
 msgstr "Afegeix una subscripció RSS"
 
-#: ppdc/sample.c:163
 msgid "Address"
 msgstr "Adreça"
 
-#: cgi-bin/admin.c:210 cgi-bin/admin.c:284 cgi-bin/admin.c:2745
 msgid "Administration"
 msgstr "Administració"
 
-#: ppdc/sample.c:429
 msgid "Always"
 msgstr "Sempre"
 
-#: backend/socket.c:129
 msgid "AppSocket/HP JetDirect"
 msgstr "AppSocket/HP JetDirect"
 
-#: ppdc/sample.c:450
 msgid "Applicator"
 msgstr "Aplicador"
 
-#: scheduler/ipp.c:1079
 #, c-format
 msgid "Attempt to set %s printer-state to bad value %d."
 msgstr ""
 "S'ha intentat posar l'estat de la impressora %s a un valor incorrecte %d."
 
-#: scheduler/ipp.c:325
 #, c-format
 msgid "Attribute groups are out of order (%x < %x)."
 msgstr "Grups d'atribut desordenats (%x < %x)."
 
-#: ppdc/sample.c:126
 msgid "B0"
 msgstr "B0"
 
-#: ppdc/sample.c:127
 msgid "B1"
 msgstr "B1"
 
-#: ppdc/sample.c:137
 msgid "B10"
 msgstr "B10"
 
-#: ppdc/sample.c:128
 msgid "B2"
 msgstr "B2"
 
-#: ppdc/sample.c:129
 msgid "B3"
 msgstr "B3"
 
-#: ppdc/sample.c:130
 msgid "B4"
 msgstr "B4"
 
-#: ppdc/sample.c:131
 msgid "B5"
 msgstr "B5"
 
-#: ppdc/sample.c:132
 msgid "B5 Oversize"
 msgstr "A5 estès"
 
-#: ppdc/sample.c:133
 msgid "B6"
 msgstr "B6"
 
-#: ppdc/sample.c:134
 msgid "B7"
 msgstr "B7"
 
-#: ppdc/sample.c:135
 msgid "B8"
 msgstr "B8"
 
-#: ppdc/sample.c:136
 msgid "B9"
 msgstr "B9"
 
-#: cups/dest.c:1680
+#, c-format
+msgid "Bad 'document-format' value \"%s\"."
+msgstr ""
+
 msgid "Bad NULL dests pointer"
 msgstr "El punter de dests NULL és incorrecte"
 
-#: cups/ppd.c:345
 msgid "Bad OpenGroup"
 msgstr "La OpenGroup és incorrecta"
 
-#: cups/ppd.c:347
 msgid "Bad OpenUI/JCLOpenUI"
 msgstr "La OpenUI/JCLOpenUI és incorrecta"
 
-#: cups/ppd.c:349
 msgid "Bad OrderDependency"
 msgstr "La OrderDependency és incorrecta"
 
-#: cups/ppd-cache.c:148 cups/ppd-cache.c:195 cups/ppd-cache.c:233
-#: cups/ppd-cache.c:239 cups/ppd-cache.c:255 cups/ppd-cache.c:271
-#: cups/ppd-cache.c:280 cups/ppd-cache.c:288 cups/ppd-cache.c:305
-#: cups/ppd-cache.c:313 cups/ppd-cache.c:328 cups/ppd-cache.c:336
-#: cups/ppd-cache.c:354 cups/ppd-cache.c:366 cups/ppd-cache.c:381
-#: cups/ppd-cache.c:393 cups/ppd-cache.c:415 cups/ppd-cache.c:423
-#: cups/ppd-cache.c:441 cups/ppd-cache.c:449 cups/ppd-cache.c:464
-#: cups/ppd-cache.c:472 cups/ppd-cache.c:490 cups/ppd-cache.c:498
-#: cups/ppd-cache.c:525 cups/ppd-cache.c:571 cups/ppd-cache.c:579
-#: cups/ppd-cache.c:587
 msgid "Bad PPD cache file."
 msgstr "El fitxer PPD de memòria cau és incorrecte."
 
-#: cups/http-support.c:1299
 msgid "Bad Request"
 msgstr "La petició és incorrecta"
 
-#: cups/snmp.c:1002
 msgid "Bad SNMP version number"
 msgstr "El número de versió del SNMP és incorrecte"
 
-#: cups/ppd.c:350
 msgid "Bad UIConstraints"
 msgstr "La UIConstraints és incorrecta"
 
-#: scheduler/ipp.c:1380
 #, c-format
 msgid "Bad copies value %d."
 msgstr "El valor de copies %d és incorrecte"
 
-#: cups/ppd.c:358
 msgid "Bad custom parameter"
 msgstr "El paràmetre personalitzat és incorrecte"
 
-#: cups/http-support.c:1451 scheduler/ipp.c:2350
 #, c-format
 msgid "Bad device-uri \"%s\"."
 msgstr "La device-uri «%s» és incorrecta."
 
-#: scheduler/ipp.c:2391
 #, c-format
 msgid "Bad device-uri scheme \"%s\"."
 msgstr "L'esquema «%s» de la device-uri és incorrecte."
 
-#: scheduler/ipp.c:8224 scheduler/ipp.c:8240 scheduler/ipp.c:9454
-#: scheduler/ipp.c:10968
 #, c-format
 msgid "Bad document-format \"%s\"."
 msgstr "La document-format «%s» és incorrecta."
 
-#: scheduler/ipp.c:9470
 #, c-format
 msgid "Bad document-format-default \"%s\"."
 msgstr "La document-format-default «%s» és incorrecta."
 
-#: cups/util.c:929
 msgid "Bad filename buffer"
 msgstr "El nom del fitxer de la memòria cau és incorrecte"
 
-#: scheduler/ipp.c:10060
+msgid "Bad job-name value: Bad UTF-8 sequence."
+msgstr ""
+
+msgid "Bad job-name value: Name too long."
+msgstr ""
+
+msgid "Bad job-name value: Wrong type or count."
+msgstr ""
+
 msgid "Bad job-priority value."
 msgstr "El valor de la job-priority és incorrecte."
 
-#: scheduler/ipp.c:1410
 #, c-format
 msgid "Bad job-sheets value \"%s\"."
 msgstr "El valor «%s» de la job-sheets és incorrecte."
 
-#: scheduler/ipp.c:1394
 msgid "Bad job-sheets value type."
 msgstr "El tipus de valor de la job-sheets és incorrecte."
 
-#: scheduler/ipp.c:10090
 msgid "Bad job-state value."
 msgstr "El valor de la job-state és incorrecte."
 
-#: scheduler/ipp.c:2974 scheduler/ipp.c:3426 scheduler/ipp.c:6078
-#: scheduler/ipp.c:6225 scheduler/ipp.c:7658 scheduler/ipp.c:7927
-#: scheduler/ipp.c:8775 scheduler/ipp.c:9001 scheduler/ipp.c:9350
-#: scheduler/ipp.c:9953
 #, c-format
 msgid "Bad job-uri \"%s\"."
 msgstr "La job-uri «%s» és incorrecta."
 
-#: scheduler/ipp.c:2049 scheduler/ipp.c:5622
 #, c-format
 msgid "Bad notify-pull-method \"%s\"."
 msgstr "La notify-pull-method «%s» és incorrecta."
 
-#: scheduler/ipp.c:2013 scheduler/ipp.c:5586
 #, c-format
 msgid "Bad notify-recipient-uri \"%s\"."
 msgstr "La notify-recipient-uri «%s» és incorrecta."
 
-#: scheduler/ipp.c:1426
 #, c-format
 msgid "Bad number-up value %d."
 msgstr "El valor de number-up %d és incorrecte."
 
-#: cups/adminutil.c:292
 #, c-format
 msgid "Bad option + choice on line %d."
 msgstr "L'opció + elecció de la línia %d és incorrecta."
 
-#: scheduler/ipp.c:1443
 #, c-format
 msgid "Bad page-ranges values %d-%d."
 msgstr "Els valors de page-ranges %d-%d són incorrectes."
 
-#: scheduler/ipp.c:2434
 #, c-format
 msgid "Bad port-monitor \"%s\"."
 msgstr "La port-monitor «%s» és incorrecta."
 
-#: cups/dest.c:676 cups/dest.c:1333
 msgid "Bad printer URI."
 msgstr "L'URI de la impressora és incorrecte."
 
-#: scheduler/ipp.c:2495
 #, c-format
 msgid "Bad printer-state value %d."
 msgstr "El valor %d de printer-state és incorrecte."
 
-#: scheduler/ipp.c:293
 #, c-format
 msgid "Bad request ID %d."
-msgstr "L'Identificador %d de la sol·licitud és incorrecte."
+msgstr "L'identificador %d de la sol·licitud és incorrecte."
 
-#: scheduler/ipp.c:278
 #, c-format
 msgid "Bad request version number %d.%d."
 msgstr "El número de versió %d.%d de la sol·licitud és incorrecte."
 
-#: cgi-bin/admin.c:1484
 msgid "Bad subscription ID"
 msgstr "L'identificador de la subscripció és incorrecte."
 
-#: cups/ppd.c:360
 msgid "Bad value string"
 msgstr "El valor de la cadena és incorrecte"
 
-#: cgi-bin/admin.c:3290 cgi-bin/admin.c:3536
 msgid "Banners"
 msgstr "Bàners"
 
-#: ppdc/sample.c:287
 msgid "Bond Paper"
 msgstr "Paper de valors"
 
-#: backend/usb-darwin.c:1846
 #, c-format
 msgid "Boolean expected for waiteof option \"%s\"."
 msgstr "S'esperava un booleà per l'opció waiteof «%s»."
 
-#: filter/pstops.c:2057
 msgid "Buffer overflow detected, aborting."
 msgstr "S'ha detectat un desbordament la memòria cau. S'interromp."
 
-#: ppdc/sample.c:254
 msgid "CMYK"
 msgstr "CMYK"
 
-#: ppdc/sample.c:363
 msgid "CPCL Label Printer"
 msgstr "Impressora d'etiquetes CPCL"
 
-#: cgi-bin/admin.c:1485 cgi-bin/admin.c:1524 cgi-bin/admin.c:1534
 msgid "Cancel RSS Subscription"
 msgstr "Cancel·la la subscripció RSS"
 
-#: backend/ipp.c:1921
 msgid "Canceling print job."
-msgstr "Es cancel·la la tasca."
+msgstr "Es cancel·la feina."
 
-#: scheduler/ipp.c:2475
 msgid "Cannot share a remote Kerberized printer."
 msgstr "No es pot compartir una impressora remota sobre Kerberos."
 
-#: ppdc/sample.c:279
 msgid "Cassette"
 msgstr "Classet"
 
-#: cgi-bin/admin.c:1655 cgi-bin/admin.c:1797 cgi-bin/admin.c:1810
-#: cgi-bin/admin.c:1821
 msgid "Change Settings"
 msgstr "Canvia la configuració"
 
-#: scheduler/ipp.c:2061 scheduler/ipp.c:5634
 #, c-format
 msgid "Character set \"%s\" not supported."
 msgstr "No es permet l'ús del grup de caràcters «%s»."
 
-#: cgi-bin/classes.c:195 cgi-bin/classes.c:322
 msgid "Classes"
 msgstr "Classes"
 
-#: cgi-bin/printers.c:182
 msgid "Clean Print Heads"
 msgstr "Neteja els capçals de la impressora"
 
-#: scheduler/ipp.c:3878
 msgid "Close-Job doesn't support the job-uri attribute."
 msgstr "Close-Job no permet l'ús de l'atribut job-uri."
 
-#: ppdc/sample.c:282
 msgid "Color"
 msgstr "Color"
 
-#: ppdc/sample.c:253
 msgid "Color Mode"
 msgstr "Mode de color"
 
-#: berkeley/lpc.c:204
 msgid ""
 "Commands may be abbreviated.  Commands are:\n"
 "\n"
@@ -3180,88 +2465,67 @@ msgstr ""
 "\n"
 "exit    help    quit    status  ?"
 
-#: cups/snmp.c:1006
 msgid "Community name uses indefinite length"
 msgstr "Els noms de comunitat tenen longitud indefinida"
 
-#: backend/ipp.c:786 backend/lpd.c:871 backend/socket.c:395
 msgid "Connected to printer."
 msgstr "S'ha connectat a la impressora."
 
-#: backend/ipp.c:691 backend/lpd.c:694 backend/socket.c:314
 msgid "Connecting to printer."
 msgstr "Es connecta a la impressora."
 
-#: cups/http-support.c:1272
 msgid "Continue"
 msgstr "Continua"
 
-#: ppdc/sample.c:365
 msgid "Continuous"
 msgstr "Contínua"
 
-#: backend/lpd.c:1020 backend/lpd.c:1152
 msgid "Control file sent successfully."
 msgstr "El fitxer de control s'ha enviat correctament."
 
-#: backend/ipp.c:1233 backend/lpd.c:464
 msgid "Copying print data."
 msgstr "Es copien les dades d'impressió."
 
-#: cups/http-support.c:1281
 msgid "Created"
 msgstr "Creat"
 
-#: cups/ppd.c:1113 cups/ppd.c:1153 cups/ppd.c:1398 cups/ppd.c:1501
 msgid "Custom"
 msgstr "Personalitzat"
 
-#: ppdc/sample.c:359
 msgid "CustominCutInterval"
 msgstr "CustominCutInterval"
 
-#: ppdc/sample.c:357
 msgid "CustominTearInterval"
 msgstr "CustominTearInterval"
 
-#: ppdc/sample.c:343
 msgid "Cut"
 msgstr "Tall"
 
-#: ppdc/sample.c:451
 msgid "Cutter"
 msgstr "Ganiveta"
 
-#: ppdc/sample.c:239
 msgid "Dark"
 msgstr "Fosc"
 
-#: ppdc/sample.c:235
 msgid "Darkness"
 msgstr "Foscor"
 
-#: backend/lpd.c:1105
 msgid "Data file sent successfully."
 msgstr "El fitxer de dades s'ha enviat correctament."
 
-#: cgi-bin/admin.c:2094 cgi-bin/admin.c:2105 cgi-bin/admin.c:2150
 msgid "Delete Class"
 msgstr "Elimina la classe"
 
-#: cgi-bin/admin.c:2179 cgi-bin/admin.c:2190 cgi-bin/admin.c:2235
 msgid "Delete Printer"
 msgstr "Elimina la impressora"
 
-#: ppdc/sample.c:281
 msgid "DeskJet Series"
 msgstr "Sèrie Deskjet"
 
-#: scheduler/ipp.c:1346
 #, c-format
 msgid "Destination \"%s\" is not accepting jobs."
 msgstr "El Destí «%s» no accepta tasques."
 
-#: systemv/lpinfo.c:300
 #, c-format
 msgid ""
 "Device: uri = %s\n"
@@ -3278,92 +2542,70 @@ msgstr ""
 "            identificador = %s\n"
 "            ubicació = %s"
 
-#: ppdc/sample.c:436
 msgid "Direct Thermal Media"
 msgstr "Paper per impressió tèrmica directa"
 
-#: cups/file.c:296
 #, c-format
 msgid "Directory \"%s\" contains a relative path."
 msgstr "El directori «%s» conté un camí relatiu."
 
-#: cups/file.c:268
 #, c-format
 msgid "Directory \"%s\" has insecure permissions (0%o/uid=%d/gid=%d)."
 msgstr "El directori «%s» té permisos que no són segurs (0%o/uid=%d/gid=%d)."
 
-#: cups/file.c:285
 #, c-format
 msgid "Directory \"%s\" is a file."
 msgstr "El directori «%s» és un fitxer."
 
-#: cups/file.c:256
 #, c-format
 msgid "Directory \"%s\" not available: %s"
 msgstr "El directori «%s» no està disponible: %s"
 
-#: cups/file.c:241
 #, c-format
 msgid "Directory \"%s\" permissions OK (0%o/uid=%d/gid=%d)."
 msgstr "El directori «%s» té els permisos correctes (0%o/uid=%d/gid=%d)."
 
-#: ppdc/sample.c:345
 msgid "Disabled"
 msgstr "Desabilitat"
 
-#: scheduler/ipp.c:6127
 #, c-format
 msgid "Document #%d does not exist in job #%d."
-msgstr "No s'ha trobat el document #%d a la tasca #%d."
+msgstr "No s'ha trobat el document #%d a la feina #%d."
 
-#: ppdc/sample.c:275
 msgid "Duplexer"
 msgstr "Unitat d'impressió a dues cares"
 
-#: ppdc/sample.c:229
 msgid "Dymo"
 msgstr "Dymo"
 
-#: ppdc/sample.c:431
 msgid "EPL1 Label Printer"
 msgstr "Impressora d'etiquetes EPL1"
 
-#: ppdc/sample.c:434
 msgid "EPL2 Label Printer"
 msgstr "Impressora d'etiquetes EPL2"
 
-#: cgi-bin/admin.c:1849 cgi-bin/admin.c:1861 cgi-bin/admin.c:1915
-#: cgi-bin/admin.c:1922 cgi-bin/admin.c:1957 cgi-bin/admin.c:1970
-#: cgi-bin/admin.c:1994 cgi-bin/admin.c:2067
 msgid "Edit Configuration File"
 msgstr "Edita el fitxer de configuració"
 
-#: cups/adminutil.c:337
 msgid "Empty PPD file."
 msgstr "El fitxer PPD és buit."
 
 #. TRANSLATORS: Banner/cover sheet after the print job.
-#: cgi-bin/admin.c:3561
 msgid "Ending Banner"
 msgstr "S'està acabant el bàner"
 
-#: ppdc/sample.c:2
 msgid "English"
 msgstr "Anglès"
 
-#: systemv/lppasswd.c:193
 msgid "Enter old password:"
 msgstr "Introduïu la contrasenya antiga:"
 
-#: systemv/lppasswd.c:224
 msgid "Enter password again:"
 msgstr "Introduïu la contrasenya un altre cop:"
 
-#: systemv/lppasswd.c:212
 msgid "Enter password:"
 msgstr "Introduïu la contrasenya:"
 
-#: scheduler/client.c:2427
 msgid ""
 "Enter your username and password or the root username and password to access "
 "this page. If you are using Kerberos authentication, make sure you have a "
@@ -3374,852 +2616,634 @@ msgstr ""
 "l'autenticació Kerberos, assegureu-vos de tenir un tiquet Kerberos que sigui "
 "vàlid."
 
-#: ppdc/sample.c:73
 msgid "Envelope #10 "
 msgstr "Sobre #10"
 
-#: ppdc/sample.c:74
 msgid "Envelope #11"
 msgstr "Sobre #11"
 
-#: ppdc/sample.c:75
 msgid "Envelope #12"
 msgstr "Sobre #12"
 
-#: ppdc/sample.c:76
 msgid "Envelope #14"
 msgstr "Sobre #14"
 
-#: ppdc/sample.c:77
 msgid "Envelope #9"
 msgstr "Sobre #9"
 
-#: ppdc/sample.c:89
 msgid "Envelope B4"
 msgstr "Sobre B4"
 
-#: ppdc/sample.c:90
 msgid "Envelope B5"
 msgstr "Sobre B5"
 
-#: ppdc/sample.c:91
 msgid "Envelope B6"
 msgstr "Sobre B6"
 
-#: ppdc/sample.c:78
 msgid "Envelope C0"
 msgstr "Sobre C0"
 
-#: ppdc/sample.c:79
 msgid "Envelope C1"
 msgstr "Sobre C1"
 
-#: ppdc/sample.c:80
 msgid "Envelope C2"
 msgstr "Sobre C2"
 
-#: ppdc/sample.c:81
 msgid "Envelope C3"
 msgstr "Sobre C3"
 
-#: ppdc/sample.c:67
 msgid "Envelope C4"
 msgstr "Sobre C4"
 
-#: ppdc/sample.c:68
 msgid "Envelope C5"
 msgstr "Sobre C5"
 
-#: ppdc/sample.c:69
 msgid "Envelope C6"
 msgstr "Sobre C6"
 
-#: ppdc/sample.c:82
 msgid "Envelope C65"
 msgstr "Sobre C65"
 
-#: ppdc/sample.c:83
 msgid "Envelope C7"
 msgstr "Sobre C7"
 
-#: ppdc/sample.c:84
 msgid "Envelope Choukei 3"
 msgstr "Sobre Choukei 3"
 
-#: ppdc/sample.c:85
 msgid "Envelope Choukei 3 Long Edge"
 msgstr "Sobre Choukei 3 costat llarg"
 
-#: ppdc/sample.c:86
 msgid "Envelope Choukei 4"
 msgstr "Sobre Choukei 4"
 
-#: ppdc/sample.c:87
 msgid "Envelope Choukei 4 Long Edge"
 msgstr "Sobre Choukei 4 costat llarg"
 
-#: ppdc/sample.c:70
 msgid "Envelope DL"
 msgstr "Sobre DL"
 
-#: ppdc/sample.c:269
 msgid "Envelope Feed"
 msgstr "Alimentació de sobres"
 
-#: ppdc/sample.c:88
 msgid "Envelope Invite"
 msgstr "Sobre d'invitació"
 
-#: ppdc/sample.c:92
 msgid "Envelope Italian"
 msgstr "Sobre italià"
 
-#: ppdc/sample.c:93
 msgid "Envelope Kaku2"
 msgstr "Sobre Kaku2"
 
-#: ppdc/sample.c:94
 msgid "Envelope Kaku2 Long Edge"
 msgstr "Sobre Kaku2 costat llarg"
 
-#: ppdc/sample.c:95
 msgid "Envelope Kaku3"
 msgstr "Sobre Kaku3"
 
-#: ppdc/sample.c:96
 msgid "Envelope Kaku3 Long Edge"
 msgstr "Sobre Kaku3 costat llarg"
 
-#: ppdc/sample.c:97
 msgid "Envelope Monarch"
 msgstr "Sobre monarch"
 
-#: ppdc/sample.c:99
 msgid "Envelope PRC1 "
 msgstr "Sobre PRC1"
 
-#: ppdc/sample.c:100
 msgid "Envelope PRC1 Long Edge"
 msgstr "Sobre PRC1 costat llarg"
 
-#: ppdc/sample.c:117
 msgid "Envelope PRC10"
 msgstr "Sobre PRC10"
 
-#: ppdc/sample.c:118
 msgid "Envelope PRC10 Long Edge"
 msgstr "Sobre PRC10 costat llarg"
 
-#: ppdc/sample.c:101
 msgid "Envelope PRC2"
 msgstr "Sobre PRC2"
 
-#: ppdc/sample.c:102
 msgid "Envelope PRC2 Long Edge"
 msgstr "Sobre PRC2 costat llarg"
 
-#: ppdc/sample.c:103
 msgid "Envelope PRC3"
 msgstr "Sobre PRC3"
 
-#: ppdc/sample.c:104
 msgid "Envelope PRC3 Long Edge"
 msgstr "Sobre PRC3 costat llarg"
 
-#: ppdc/sample.c:105
 msgid "Envelope PRC4"
 msgstr "Sobre PRC4"
 
-#: ppdc/sample.c:106
 msgid "Envelope PRC4 Long Edge"
 msgstr "Sobre PRC4 costat llarg"
 
-#: ppdc/sample.c:108
 msgid "Envelope PRC5 Long Edge"
 msgstr "Sobre PRC5 costat llarg"
 
-#: ppdc/sample.c:107
 msgid "Envelope PRC5PRC5"
 msgstr "Sobre PRC5"
 
-#: ppdc/sample.c:109
 msgid "Envelope PRC6"
 msgstr "Sobre PRC6"
 
-#: ppdc/sample.c:110
 msgid "Envelope PRC6 Long Edge"
 msgstr "Sobre PRC6 costat llarg"
 
-#: ppdc/sample.c:111
 msgid "Envelope PRC7"
 msgstr "Sobre PRC7"
 
-#: ppdc/sample.c:112
 msgid "Envelope PRC7 Long Edge"
 msgstr "Sobre PRC7 costat llarg"
 
-#: ppdc/sample.c:113
 msgid "Envelope PRC8"
 msgstr "Sobre PRC8"
 
-#: ppdc/sample.c:114
 msgid "Envelope PRC8 Long Edge"
 msgstr "Sobre PRC8 costat llarg"
 
-#: ppdc/sample.c:115
 msgid "Envelope PRC9"
 msgstr "Sobre PRC9"
 
-#: ppdc/sample.c:116
 msgid "Envelope PRC9 Long Edge"
 msgstr "Sobre PRC9 costat llarg"
 
-#: ppdc/sample.c:98
 msgid "Envelope Personal"
 msgstr "Sobre personalitzat"
 
-#: ppdc/sample.c:119
 msgid "Envelope You4"
 msgstr "Sobre You4"
 
-#: ppdc/sample.c:120
 msgid "Envelope You4 Long Edge"
 msgstr "Sobre You4 costat llarg"
 
-#: ppdc/sample.c:240
 msgid "Epson"
 msgstr "Epson"
 
-#: cgi-bin/admin.c:3604
 msgid "Error Policy"
 msgstr "Normes d'error"
 
-#: filter/rastertopwg.c:403 filter/rastertopwg.c:418 filter/rastertopwg.c:429
-#: filter/rastertopwg.c:440
 msgid "Error sending raster data."
 msgstr "S'ha produït un error quan s'enviaven les dades de la trama."
 
-#: systemv/lpinfo.c:103 systemv/lpmove.c:88
 msgid "Error: need hostname after \"-h\" option."
 msgstr "ERROR: es necessita un nom d'amfitrió després de l'opció «-h»."
 
-#: ppdc/sample.c:355
 msgid "Every 10 Labels"
 msgstr "Cada 10 etiquetes"
 
-#: ppdc/sample.c:347
 msgid "Every 2 Labels"
 msgstr "Cada 2 etiquetes"
 
-#: ppdc/sample.c:348
 msgid "Every 3 Labels"
 msgstr "Cada 3 etiquetes"
 
-#: ppdc/sample.c:349
 msgid "Every 4 Labels"
 msgstr "Cada 4 etiquetes"
 
-#: ppdc/sample.c:350
 msgid "Every 5 Labels"
 msgstr "Cada 5 etiquetes"
 
-#: ppdc/sample.c:351
 msgid "Every 6 Labels"
 msgstr "Cada 6 etiquetes"
 
-#: ppdc/sample.c:352
 msgid "Every 7 Labels"
 msgstr "Cada 7 etiquetes"
 
-#: ppdc/sample.c:353
 msgid "Every 8 Labels"
 msgstr "Cada 8 etiquetes"
 
-#: ppdc/sample.c:354
 msgid "Every 9 Labels"
 msgstr "Cada 9 etiquetes"
 
-#: ppdc/sample.c:346
 msgid "Every Label"
 msgstr "Cada etiqueta"
 
-#: ppdc/sample.c:121
 msgid "Executive"
 msgstr "Executiu"
 
-#: cups/http-support.c:1327
 msgid "Expectation Failed"
 msgstr "Ha fallat la condició del valor que s'esperava"
 
-#: cgi-bin/admin.c:2356 cgi-bin/admin.c:2375
 msgid "Export Printers to Samba"
 msgstr "Exportar les impressores al Samba"
 
-#: systemv/cupstestdsc.c:172 systemv/cupstestdsc.c:189
-#: systemv/cupstestdsc.c:214 systemv/cupstestdsc.c:231
-#: systemv/cupstestdsc.c:255 systemv/cupstestdsc.c:273
-#: systemv/cupstestdsc.c:302 systemv/cupstestdsc.c:339
-#: systemv/cupstestdsc.c:349 systemv/cupstestdsc.c:359
-#: systemv/cupstestdsc.c:369 systemv/cupstestdsc.c:379
-#: systemv/cupstestdsc.c:387
 msgid "FAIL"
 msgstr "ERROR"
 
-#: ppdc/sample.c:122
 msgid "FanFold German"
 msgstr "Paper continu alemany"
 
-#: ppdc/sample.c:123
 msgid "FanFold Legal German"
 msgstr "Paper continu legal alemany"
 
-#: ppdc/sample.c:124
 msgid "Fanfold US"
 msgstr "Paper continu americà"
 
-#: cups/file.c:300
 #, c-format
 msgid "File \"%s\" contains a relative path."
 msgstr "El fitxer «%s» conté un camí relatiu."
 
-#: cups/file.c:275
 #, c-format
 msgid "File \"%s\" has insecure permissions (0%o/uid=%d/gid=%d)."
 msgstr "El fitxer «%s» té permisos que no són segurs (0%o/uid=%d/gid=%d)."
 
-#: cups/file.c:289
 #, c-format
 msgid "File \"%s\" is a directory."
 msgstr "El fitxer «%s» és un directori."
 
-#: cups/file.c:261
 #, c-format
 msgid "File \"%s\" not available: %s"
 msgstr "El fitxer «%s» no està disponible: %s"
 
-#: cups/file.c:247
 #, c-format
 msgid "File \"%s\" permissions OK (0%o/uid=%d/gid=%d)."
 msgstr "El fitxer «%s» té els permisos correctes (0%o/uid=%d/gid=%d)."
 
-#: ppdc/sample.c:169
 msgid "File Folder "
 msgstr "Carpeta d'arxivador "
 
-#: scheduler/ipp.c:2370
 #, c-format
 msgid ""
 "File device URIs have been disabled. To enable, see the FileDevice directive "
-"in \"%s/cupsd.conf\"."
+"in \"%s/cups-files.conf\"."
 msgstr ""
-"S'han deshabilitat els URIs dels dispositius de fitxers. Per habilitar-los, "
-"vegeu la directriu FileDevice a «%s/cupsd.conf»."
 
-#: filter/rastertoepson.c:1117 filter/rastertohp.c:845
-#: filter/rastertolabel.c:1273
 #, c-format
 msgid "Finished page %d."
 msgstr "S'ha acabat la pàgina %d."
 
-#: ppdc/sample.c:125
 msgid "Folio"
 msgstr "Foli"
 
-#: cups/http-support.c:1306
 msgid "Forbidden"
 msgstr "Prohibit"
 
-#: cups/ppd.c:742 cups/ppd.c:1302
 msgid "General"
 msgstr "General"
 
-#: ppdc/sample.c:259
 msgid "Generic"
 msgstr "Genèric"
 
-#: cups/snmp.c:1016
 msgid "Get-Response-PDU uses indefinite length"
 msgstr "La Get-Response-PDU fa servir una longitud indefinida"
 
-#: ppdc/sample.c:290
 msgid "Glossy Paper"
 msgstr "Paper fotogràfic"
 
-#: scheduler/ipp.c:2952 scheduler/ipp.c:3352 scheduler/ipp.c:3890
-#: scheduler/ipp.c:6056 scheduler/ipp.c:6203 scheduler/ipp.c:7635
-#: scheduler/ipp.c:8753 scheduler/ipp.c:8979 scheduler/ipp.c:9328
-#: scheduler/ipp.c:9931
 msgid "Got a printer-uri attribute but no job-id."
 msgstr "S'ha obtingut l'atribut printer-uri però no el job-id."
 
-#: ppdc/sample.c:255
 msgid "Grayscale"
 msgstr "Escala de grisos"
 
-#: ppdc/sample.c:280
 msgid "HP"
 msgstr "HP"
 
-#: ppdc/sample.c:170
 msgid "Hanging Folder"
 msgstr "Carpeta per penjar"
 
-#: cgi-bin/help.c:143
 msgid "Help file not in index."
 msgstr "El fitxer d'ajuda no és a l'índex."
 
-#: cups/ipp.c:2687 cups/ipp.c:2714 cups/ipp.c:2737
 msgid "IPP 1setOf attribute with incompatible value tags."
 msgstr ""
 "L'atribut 1setOf del IPP té etiquetes amb valors que no són compatibles."
 
-#: cups/ipp.c:2650
 msgid "IPP attribute has no name."
 msgstr "L'atribut del IPP no té nom."
 
-#: cups/ipp.c:5487
 msgid "IPP attribute is not a member of the message."
 msgstr "L'atribut del IPP no és membre del missatge."
 
-#: cups/ipp.c:3083
 msgid "IPP begCollection value not 0 bytes."
 msgstr "El valor de begColletion del IPP no té 0 bytes."
 
-#: cups/ipp.c:2873
 msgid "IPP boolean value not 1 byte."
 msgstr "El valor booleà del IPP no té 1 byte."
 
-#: cups/ipp.c:2934
 msgid "IPP date value not 11 bytes."
 msgstr "El valor de date del IPP no té 11 bytes."
 
-#: cups/ipp.c:3104
 msgid "IPP endCollection value not 0 bytes."
 msgstr "El valor de endColletion del IPP no té 0 bytes."
 
-#: cups/ipp.c:2848
 msgid "IPP enum value not 4 bytes."
 msgstr "El valor de enum del IPP no té 4 bytes."
 
-#: cups/ipp.c:2579
 msgid "IPP extension tag larger than 0x7FFFFFFF."
 msgstr "La etiqueta d'extension del IPP és més llarga de 0x7FFFFFFF."
 
-#: cups/ipp.c:2845
 msgid "IPP integer value not 4 bytes."
 msgstr "El valor enter de IPP no té 4 bytes."
 
-#: cups/ipp.c:3045
 msgid "IPP language length overflows value."
 msgstr "El valor de la longitud del llenguatge del IPP desborda."
 
-#: cups/ipp.c:2764
 msgid "IPP member name is not empty."
 msgstr "El nom del membre del IPP no està buit."
 
-#: cups/ipp.c:3122
 msgid "IPP memberName value is empty."
 msgstr "El valor de memberName de l'IPP està buit."
 
-#: cups/ipp.c:2633
+msgid "IPP memberName with no attribute."
+msgstr ""
+
 msgid "IPP name larger than 32767 bytes."
 msgstr "EL nom del IPP és més llarg de 32767 bytes."
 
-#: cups/ipp.c:3011
 msgid "IPP nameWithLanguage value less than minimum 4 bytes."
 msgstr ""
 "El valor de nameWithLanguage del IPP és més petit que el mínim, 4 bytes."
 
-#: cups/ipp.c:2979
 msgid "IPP rangeOfInteger value not 8 bytes."
 msgstr "El valor de rangeOfInteger del IPP no té 8 bytes."
 
-#: cups/ipp.c:2952
 msgid "IPP resolution value not 9 bytes."
 msgstr "El valor de resolution del IPP no té 9 bytes."
 
-#: cups/ipp.c:3063
 msgid "IPP string length overflows value."
 msgstr "El valor de la longitud de la cadena del IPP desborda."
 
-#: cups/ipp.c:3007
 msgid "IPP textWithLanguage value less than minimum 4 bytes."
 msgstr ""
 "EL valor de textWithLanguage del IPP és més petit que el mínim, 4 bytes."
 
-#: cups/ipp.c:2831
 msgid "IPP value larger than 32767 bytes."
 msgstr "El valor del IPP és més llarg de 32767 bytes."
 
-#: ppdc/sample.c:1
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: cups/ppd.c:353
 msgid "Illegal control character"
 msgstr "Caràcter de control no permès"
 
-#: cups/ppd.c:354
 msgid "Illegal main keyword string"
 msgstr "Cadena de paraula clau principal no permesa"
 
-#: cups/ppd.c:355
 msgid "Illegal option keyword string"
 msgstr "Cadena de paraula clau d'opció no permesa"
 
-#: cups/ppd.c:356
 msgid "Illegal translation string"
 msgstr "Cadena de traducció no permesa"
 
-#: cups/ppd.c:357
 msgid "Illegal whitespace character"
 msgstr "Caràcter d'espai en blanc no permés"
 
-#: ppdc/sample.c:274
 msgid "Installable Options"
 msgstr "Opcions instal·lables"
 
-#: ppdc/sample.c:277
 msgid "Installed"
 msgstr "Instal·lat"
 
-#: ppdc/sample.c:293
 msgid "IntelliBar Label Printer"
 msgstr "Impressora d'etiquetes IntelliBar"
 
-#: ppdc/sample.c:292
 msgid "Intellitech"
 msgstr "Intellitech"
 
-#: cups/http-support.c:1333
 msgid "Internal Server Error"
 msgstr "Error intern del servidor"
 
-#: cups/ppd.c:344
 msgid "Internal error"
 msgstr "Error intern"
 
-#: ppdc/sample.c:167
 msgid "Internet Postage 2-Part"
 msgstr "Franqueig per Internet en 2 parts"
 
-#: ppdc/sample.c:168
 msgid "Internet Postage 3-Part"
 msgstr "Franqueig per Internet en 3 parts"
 
-#: backend/ipp.c:307
 msgid "Internet Printing Protocol"
 msgstr "Protocol d'impressió per Internet"
 
-#: cups/dest-options.c:839
 msgid "Invalid media size."
 msgstr "Mida del suport no vàlida."
 
-#: filter/commandtops.c:125
 #, c-format
 msgid "Invalid printer command \"%s\"."
 msgstr "La comanda de la impressora «%s» no és vàlida."
 
-#: cups/ppd.c:1420
 msgid "JCL"
 msgstr "Llenguatge de control de tasques (JCL)"
 
-#: ppdc/sample.c:53
 msgid "JIS B0"
 msgstr "JIS B0"
 
-#: ppdc/sample.c:55
 msgid "JIS B1"
 msgstr "JIS B1"
 
-#: ppdc/sample.c:54
 msgid "JIS B10"
 msgstr "JIS B10"
 
-#: ppdc/sample.c:56
 msgid "JIS B2"
 msgstr "JIS B2"
 
-#: ppdc/sample.c:57
 msgid "JIS B3"
 msgstr "JIS B3"
 
-#: ppdc/sample.c:58
 msgid "JIS B4"
 msgstr "JIS B4"
 
-#: ppdc/sample.c:59
 msgid "JIS B4 Long Edge"
 msgstr "JIS B4 costat llarg"
 
-#: ppdc/sample.c:60
 msgid "JIS B5"
 msgstr "JIS B5"
 
-#: ppdc/sample.c:61
 msgid "JIS B5 Long Edge"
 msgstr "JIS B5 costat llarg"
 
-#: ppdc/sample.c:62
 msgid "JIS B6"
 msgstr "JIS B6"
 
-#: ppdc/sample.c:63
 msgid "JIS B6 Long Edge"
 msgstr "JIS B6 costat llarg"
 
-#: ppdc/sample.c:64
 msgid "JIS B7"
 msgstr "JIS B7"
 
-#: ppdc/sample.c:65
 msgid "JIS B8"
 msgstr "JIS B8"
 
-#: ppdc/sample.c:66
 msgid "JIS B9"
 msgstr "JIS B9"
 
-#: scheduler/ipp.c:9051
 #, c-format
 msgid "Job #%d cannot be restarted - no files."
-msgstr "La tasca #%d no es pot tornar a iniciar - no hi ha fitxers."
+msgstr "La feina #%d no es pot tornar a iniciar - no hi ha fitxers."
 
-#: scheduler/ipp.c:2992 scheduler/ipp.c:3222 scheduler/ipp.c:3277
-#: scheduler/ipp.c:3454 scheduler/ipp.c:3900 scheduler/ipp.c:5720
-#: scheduler/ipp.c:6096 scheduler/ipp.c:6243 scheduler/ipp.c:6543
-#: scheduler/ipp.c:7482 scheduler/ipp.c:7504 scheduler/ipp.c:7676
-#: scheduler/ipp.c:7901 scheduler/ipp.c:7944 scheduler/ipp.c:8793
-#: scheduler/ipp.c:9019 scheduler/ipp.c:9368 scheduler/ipp.c:9971
 #, c-format
 msgid "Job #%d does not exist."
-msgstr "La tasca #%d no existeix."
+msgstr "La feina #%d no existeix."
 
-#: scheduler/ipp.c:3486
 #, c-format
 msgid "Job #%d is already aborted - can't cancel."
-msgstr "La tasca #%d ja s'ha interromput: no es pot cancel·lar."
+msgstr "La feina #%d ja s'ha interromput: no es pot cancel·lar."
 
-#: scheduler/ipp.c:3480
 #, c-format
 msgid "Job #%d is already canceled - can't cancel."
-msgstr "La tasca #%d ja està cancel·lada: no es pot cancel·lar."
+msgstr "La feina #%d ja està cancel·lada: no es pot cancel·lar."
 
-#: scheduler/ipp.c:3492
 #, c-format
 msgid "Job #%d is already completed - can't cancel."
-msgstr "La tasca #%d ja s'ha acabat: no es pot cancel·lar."
+msgstr "La feina #%d ja s'ha acabat: no es pot cancel·lar."
 
-#: scheduler/ipp.c:7702 scheduler/ipp.c:7986 scheduler/ipp.c:9986
 #, c-format
 msgid "Job #%d is finished and cannot be altered."
-msgstr "La tasca #%d s'ha acabat i no es pot canviar."
+msgstr "La feina #%d s'ha acabat i no es pot canviar."
 
-#: scheduler/ipp.c:9033
 #, c-format
 msgid "Job #%d is not complete."
-msgstr "La tasca #%d no s'ha acabat."
+msgstr "La feina #%d no s'ha acabat."
 
-#: scheduler/ipp.c:3007
 #, c-format
 msgid "Job #%d is not held for authentication."
-msgstr "La tasca #%d no està aturada per ser autenticada."
+msgstr "La feina #%d no està aturada per ser autenticada."
 
-#: scheduler/ipp.c:8807
 #, c-format
 msgid "Job #%d is not held."
-msgstr "La tasca #%d no està aturada."
+msgstr "La feina #%d no està aturada."
 
-#: cgi-bin/ipp-var.c:1055
 msgid "Job Completed"
-msgstr "S'ha acabat la tasca"
+msgstr "S'ha acabat la feina"
 
-#: cgi-bin/ipp-var.c:1053
 msgid "Job Created"
-msgstr "S'ha creat la tasca"
+msgstr "S'ha creat la feina"
 
-#: cgi-bin/ipp-var.c:1059
 msgid "Job Options Changed"
-msgstr "S'han canviat les opcions de la tasca"
+msgstr "S'han canviat les opcions de la feina"
 
-#: cgi-bin/ipp-var.c:1057
 msgid "Job Stopped"
-msgstr "S'ha aturat la tasca"
+msgstr "S'ha aturat la feina"
 
-#: scheduler/ipp.c:10068
 msgid "Job is completed and cannot be changed."
-msgstr "La tasca s'ha finalitzat i no es pot canviar."
+msgstr "La feina s'ha finalitzat i no es pot canviar."
 
-#: cgi-bin/jobs.c:198
 msgid "Job operation failed"
-msgstr "Ha fallat l'operació de la tasca"
+msgstr "Ha fallat l'operació de la feina"
 
-#: scheduler/ipp.c:10104 scheduler/ipp.c:10123 scheduler/ipp.c:10134
 msgid "Job state cannot be changed."
-msgstr "L'estat de la tasca no es pot canviar."
+msgstr "L'estat de la feina no es pot canviar."
 
-#: scheduler/ipp.c:8899
 msgid "Job subscriptions cannot be renewed."
-msgstr "Les subscripcions a les tasca no es poden renovar."
+msgstr "Les subscripcions a les feines no es poden renovar."
 
-#: cgi-bin/jobs.c:103 cgi-bin/jobs.c:114 cgi-bin/jobs.c:195
 msgid "Jobs"
-msgstr "Tasques"
+msgstr "Feines"
 
-#: backend/lpd.c:185
 msgid "LPD/LPR Host or Printer"
 msgstr "Amfitrió o impressora LPD/LPR"
 
-#: ppdc/sample.c:230
 msgid "Label Printer"
 msgstr "Impressora d'etiquetes"
 
-#: ppdc/sample.c:446
 msgid "Label Top"
 msgstr "Capçalera de l'etiqueta"
 
-#: scheduler/ipp.c:2070 scheduler/ipp.c:5643
 #, c-format
 msgid "Language \"%s\" not supported."
-msgstr "No s'admet l'idioma «%s»."
+msgstr "L'idioma «%s» no està disponible."
 
-#: ppdc/sample.c:164
 msgid "Large Address"
 msgstr "Adreça gran"
 
-#: ppdc/sample.c:291
 msgid "LaserJet Series PCL 4/5"
 msgstr "Sèrie Laser Jet PCL 4/5"
 
-#: ppdc/sample.c:43
 msgid "Letter Oversize"
 msgstr "Carta gran"
 
-#: ppdc/sample.c:44
 msgid "Letter Oversize Long Edge"
 msgstr "Carta americà gran costat llarg"
 
-#: ppdc/sample.c:236
 msgid "Light"
 msgstr "Lluminós"
 
-#: cups/ppd.c:352
 msgid "Line longer than the maximum allowed (255 characters)"
 msgstr "La línia la longitud màxima permesa (255 caràcters)"
 
-#: cgi-bin/admin.c:2393
 msgid "List Available Printers"
 msgstr "Llista les impressores disponibles"
 
-#: ppdc/sample.c:272
 msgid "Long-Edge (Portrait)"
 msgstr "Costat-llarg (vertical)"
 
-#: cups/http-support.c:1558
 msgid "Looking for printer."
 msgstr "S'està buscant la impressora."
 
-#: ppdc/sample.c:268
 msgid "Manual Feed"
 msgstr "Alimentació manual"
 
-#: cups/ppd.c:789 cups/ppd.c:1357
 msgid "Media Size"
 msgstr "Mida del paper"
 
-#: cups/ppd.c:793 cups/ppd.c:1361 ppdc/sample.c:262
 msgid "Media Source"
 msgstr "Font del paper"
 
-#: ppdc/sample.c:364
 msgid "Media Tracking"
 msgstr "Seguiment del paper"
 
-#: cups/ppd.c:791 cups/ppd.c:1359 ppdc/sample.c:285
 msgid "Media Type"
 msgstr "Tipus de paper"
 
-#: ppdc/sample.c:237
 msgid "Medium"
 msgstr "Mitjà"
 
-#: cups/ppd.c:341
 msgid "Memory allocation error"
 msgstr "S'ha produït un error d'ubicació de memòria"
 
-#: cups/ppd.c:361
 msgid "Missing CloseGroup"
 msgstr "Falta el CloseGroup"
 
-#: cups/ppd.c:342
 msgid "Missing PPD-Adobe-4.x header"
 msgstr "Falta la capçalera PPD-ADOBE-4.x"
 
-#: cups/ppd.c:351
 msgid "Missing asterisk in column 1"
 msgstr "Falta un asterisc a la columna 1"
 
-#: scheduler/ipp.c:6119
 msgid "Missing document-number attribute."
 msgstr "Falta l'atribut document-number."
 
-#: cups/adminutil.c:273
 #, c-format
 msgid "Missing double quote on line %d."
 msgstr "Falta una cometa doble a la línia %d."
 
-#: cgi-bin/admin.c:736 cgi-bin/admin.c:2106 cgi-bin/admin.c:2191
-#: cgi-bin/admin.c:2785 cgi-bin/admin.c:3039 cgi-bin/admin.c:3150
-#: cgi-bin/admin.c:3860
 msgid "Missing form variable"
 msgstr "Falta una variable del formulari"
 
-#: scheduler/ipp.c:9422
 msgid "Missing last-document attribute in request."
 msgstr "Falta l'atribut last-document-number a la petició."
 
-#: cups/pwg-media.c:535
 msgid "Missing media or media-col."
 msgstr "Falta el media o el media-col."
 
-#: cups/pwg-media.c:454
 msgid "Missing media-size in media-col."
 msgstr "Falta el media-size al media-col."
 
-#: scheduler/ipp.c:6673
 msgid "Missing notify-subscription-ids attribute."
 msgstr "Falta l'atribut notify-subscription-ids."
 
-#: cups/ppd.c:359
 msgid "Missing option keyword"
 msgstr "Falta l'opció keyword"
 
-#: scheduler/ipp.c:3133 scheduler/ipp.c:3158
 msgid "Missing requesting-user-name attribute."
 msgstr "Falta l'atribut requesting-user-name."
 
-#: scheduler/ipp.c:461
 msgid "Missing required attributes."
 msgstr "Falten alguns atributs necessaris."
 
-#: cups/adminutil.c:254
 #, c-format
 msgid "Missing value on line %d."
 msgstr "Falta un valor a la línia %d."
 
-#: cups/ppd.c:343
 msgid "Missing value string"
 msgstr "Falta la cadena de valor"
 
-#: cups/pwg-media.c:442
 msgid "Missing x-dimension in media-size."
 msgstr "Falta la mida x a la mida del suport."
 
-#: cups/pwg-media.c:448
 msgid "Missing y-dimension in media-size."
 msgstr "Falta la mida y a la mida del suport."
 
-#: systemv/lpinfo.c:470
 #, c-format
 msgid ""
 "Model:  name = %s\n"
@@ -4232,734 +3256,558 @@ msgstr ""
 "        fabricant i model = %s\n"
 "        id del dispositiu = %s"
 
-#: cgi-bin/admin.c:570
 msgid "Modify Class"
 msgstr "Modifica la classe"
 
-#: cgi-bin/admin.c:882
 msgid "Modify Printer"
 msgstr "Modifica la impressora"
 
-#: cgi-bin/ipp-var.c:425 cgi-bin/ipp-var.c:516
 msgid "Move All Jobs"
-msgstr "Mou totes les tasques"
+msgstr "Mou totes les feines"
 
-#: cgi-bin/ipp-var.c:364 cgi-bin/ipp-var.c:423 cgi-bin/ipp-var.c:514
 msgid "Move Job"
-msgstr "Mou la tasca"
+msgstr "Mou la feina"
 
-#: cups/http-support.c:1290
 msgid "Moved Permanently"
 msgstr "S'ha mogut de manera permanent"
 
-#: cups/ppd.c:340
 msgid "NULL PPD file pointer"
 msgstr "Punter del fitxer PPD NUL"
 
-#: cups/snmp.c:1053
 msgid "Name OID uses indefinite length"
 msgstr "El nom de l'OID fa servir una longitud indefinida"
 
-#: scheduler/ipp.c:1142
 msgid "Nested classes are not allowed."
 msgstr "No es permeten les classes imbricades."
 
-#: ppdc/sample.c:430
 msgid "Never"
 msgstr "Mai"
 
-#: ppdc/sample.c:256
 msgid "New Stylus Color Series"
 msgstr "Sèrie New Stylus Color"
 
-#: ppdc/sample.c:258
 msgid "New Stylus Photo Series"
 msgstr "Sèrie New Stylus Photo"
 
-#: cups/ppd.c:1949
 msgid "No"
 msgstr "No"
 
-#: cups/http-support.c:1287
 msgid "No Content"
 msgstr "No hi ha contingut"
 
-#: cups/util.c:1298
 msgid "No PPD name"
 msgstr "El PPD no té nom"
 
-#: cups/snmp.c:1047
 msgid "No VarBind SEQUENCE"
 msgstr "No hi ha cap SEQUENCE VarBind"
 
-#: cups/adminutil.c:788
 msgid "No Windows printer drivers are installed."
 msgstr "No hi ha cap controlador d'impressores de Windows instal·lat."
 
-#: cups/request.c:566 cups/request.c:908
 msgid "No active connection"
 msgstr "No hi ha cap connexió activa"
 
-#: scheduler/ipp.c:3403
 #, c-format
 msgid "No active jobs on %s."
-msgstr "No hi ha cap tasca activa a %s."
+msgstr "No hi ha cap feina activa a %s."
 
-#: scheduler/ipp.c:302
 msgid "No attributes in request."
 msgstr "No hi ha atributs en demanda."
 
-#: scheduler/ipp.c:3034
 msgid "No authentication information provided."
 msgstr "No s'ha donat cap informació d'autenticació."
 
-#: cups/snmp.c:1004
 msgid "No community name"
 msgstr "Ho hi na cap nom de comunitat"
 
-#: scheduler/ipp.c:5919
 msgid "No default printer."
 msgstr "No hi ha cap impressora per defecte."
 
-#: cgi-bin/ipp-var.c:436 scheduler/ipp.c:7248
 msgid "No destinations added."
 msgstr "No s'ha afegit cap destí."
 
-#: backend/usb.c:200
 msgid "No device URI found in argv[0] or in DEVICE_URI environment variable."
 msgstr ""
 "No s'ha trobat cap URI de dispositiu a argv[0] o a la variable d'entorn "
 "DEVICE_URI."
 
-#: cups/snmp.c:1034
 msgid "No error-index"
 msgstr "No hi ca cap error-index"
 
-#: cups/snmp.c:1026
 msgid "No error-status"
 msgstr "No hi ha cap status-error"
 
-#: scheduler/ipp.c:8190 scheduler/ipp.c:9436
 msgid "No file in print request."
 msgstr "No hi ha cap printer-uri a la sol·licitud."
 
-#: cups/util.c:923
 msgid "No modification time"
 msgstr "No hi ha hora de modificació"
 
-#: cups/snmp.c:1051
 msgid "No name OID"
 msgstr "No hi ha cap nom d'OID"
 
-#: filter/rastertoepson.c:1147 filter/rastertohp.c:876
-#: filter/rastertolabel.c:1302
 msgid "No pages were found."
 msgstr "No s'ha trobat cap pàgina."
 
-#: cups/util.c:917
 msgid "No printer name"
 msgstr "No hi ha cap nom d'impressora"
 
-#: cups/util.c:1801
 msgid "No printer-uri found"
 msgstr "No s'ha trobat cap printer-uri"
 
-#: cups/util.c:1786
 msgid "No printer-uri found for class"
 msgstr "No s'ha trobat cap printer-uri per la classe"
 
-#: scheduler/ipp.c:6322
 msgid "No printer-uri in request."
 msgstr "No hi ha cap printer-uri a la sol·licitud."
 
-#: cups/snmp.c:1018
 msgid "No request-id"
 msgstr "No hi ha cap request-id"
 
-#: scheduler/ipp.c:5528
 msgid "No subscription attributes in request."
 msgstr "No hi ha cap atribut de la subscripció a la sol·licitud."
 
-#: scheduler/ipp.c:7575
 msgid "No subscriptions found."
 msgstr "No s'ha trobat cap sol·licitud."
 
-#: cups/snmp.c:1042
 msgid "No variable-bindings SEQUENCE"
 msgstr "No hi ha cap SEQUENCE variable-bindings"
 
-#: cups/snmp.c:997
 msgid "No version number"
 msgstr "No hi ha cap número de versió"
 
-#: ppdc/sample.c:367
 msgid "Non-continuous (Mark sensing)"
 msgstr "Discontinu (sensible a les marques)"
 
-#: ppdc/sample.c:366
 msgid "Non-continuous (Web sensing)"
 msgstr "Discontinu (Sensible al web)"
 
-#: ppdc/sample.c:238
 msgid "Normal"
 msgstr "Normal"
 
-#: cups/http-support.c:1309
 msgid "Not Found"
 msgstr "No s'ha trobat"
 
-#: cups/http-support.c:1321
 msgid "Not Implemented"
 msgstr "No implementat"
 
-#: ppdc/sample.c:276
 msgid "Not Installed"
 msgstr "No està instal·lat"
 
-#: cups/http-support.c:1296
 msgid "Not Modified"
 msgstr "No està modificat"
 
-#: cups/http-support.c:1324
 msgid "Not Supported"
 msgstr "No és compatible"
 
-#: scheduler/ipp.c:1518 scheduler/ipp.c:10666
 msgid "Not allowed to print."
 msgstr "No teniu permís per imprimir."
 
-#: ppdc/sample.c:146
 msgid "Note"
 msgstr "Nota"
 
-#: systemv/cupstestdsc.c:433
 msgid ""
 "Note: this program only validates the DSC comments, not the PostScript "
 "itself."
 msgstr ""
 "Nota: aquest programa només valida els comentaris DSC, no el PostScript."
 
-#: cups/http-support.c:1278 cups/ppd.c:338
 msgid "OK"
 msgstr "D'acord"
 
-#: ppdc/sample.c:271
 msgid "Off (1-Sided)"
 msgstr "Inactiu (Una cara)"
 
-#: ppdc/sample.c:361
 msgid "Oki"
 msgstr "Oki"
 
-#: cgi-bin/help.c:91 cgi-bin/help.c:132 cgi-bin/help.c:142 cgi-bin/help.c:172
 msgid "Online Help"
 msgstr "Ajuda en línia"
 
-#: cups/adminutil.c:955
 #, c-format
 msgid "Open of %s failed: %s"
 msgstr "No s'ha pogut obrir %s: %s"
 
-#: cups/ppd.c:346
 msgid "OpenGroup without a CloseGroup first"
 msgstr "OpenGroup sense un CloseGroup abans"
 
-#: cups/ppd.c:348
 msgid "OpenUI/JCLOpenUI without a CloseUI/JCLCloseUI first"
 msgstr "OpenUI/JCLOpenUI sense un CloseUI/JCLCloseUI abans"
 
-#: cgi-bin/admin.c:3631
 msgid "Operation Policy"
 msgstr "Política d'operacions"
 
-#: filter/pstops.c:2205
 #, c-format
 msgid "Option \"%s\" cannot be included via %%%%IncludeFeature."
 msgstr "L'opció «%s» no es pot incloure a través de %%%%IncludeFeature."
 
-#: cgi-bin/admin.c:3281 cgi-bin/admin.c:3365
 msgid "Options Installed"
 msgstr "Opcions instal·lades"
 
-#: scheduler/cupsfilter.c:1430 scheduler/main.c:2018 systemv/cupsaddsmb.c:284
-#: systemv/cupsctl.c:203 systemv/cupstestdsc.c:429 systemv/cupstestppd.c:3797
-#: test/ipptool.c:4403 ppdc/ppdc.cxx:437 ppdc/ppdhtml.cxx:174
-#: ppdc/ppdi.cxx:130 ppdc/ppdmerge.cxx:369 ppdc/ppdpo.cxx:254
 msgid "Options:"
 msgstr "Opcions:"
 
-#: cups/ppd-cache.c:156
 msgid "Out of date PPD cache file."
 msgstr "El fitxer de memòria cau del PPD no està actualitzat."
 
-#: cups/ppd-cache.c:1381
 msgid "Out of memory."
 msgstr "Sense memòria."
 
-#: cups/ppd.c:795 cups/ppd.c:1363
 msgid "Output Mode"
 msgstr "Mode de sortida"
 
-#: systemv/lpstat.c:1191 systemv/lpstat.c:1195
 #, c-format
 msgid "Output for printer %s is sent to %s"
 msgstr "La sortida de la impressora %s s'envia a %s"
 
-#: systemv/lpstat.c:1185
 #, c-format
 msgid "Output for printer %s is sent to remote printer %s on %s"
 msgstr "La sortida de la impressora %s s'envia a la impressora remota %s a %s"
 
-#: systemv/lpstat.c:1209 systemv/lpstat.c:1213
 #, c-format
 msgid "Output for printer %s/%s is sent to %s"
 msgstr "La sortida per la impressora %s/%s s'envia a la impressora %s"
 
-#: systemv/lpstat.c:1203
 #, c-format
 msgid "Output for printer %s/%s is sent to remote printer %s on %s"
 msgstr ""
 "La sortida per la impressora %s/%s s'envia a la impressora remota %s a %s"
 
-#: systemv/cupstestdsc.c:399
 msgid "PASS"
 msgstr "VÀLID"
 
-#: ppdc/sample.c:260
 msgid "PCL Laser Printer"
 msgstr "Impressora làser PCL"
 
-#: ppdc/sample.c:149
 msgid "PRC16K"
 msgstr "PRC16K"
 
-#: ppdc/sample.c:150
 msgid "PRC16K Long Edge"
 msgstr "PRC16K costat llarg"
 
-#: ppdc/sample.c:151
 msgid "PRC32K"
 msgstr "PRC32K"
 
-#: ppdc/sample.c:154
 msgid "PRC32K Long Edge"
 msgstr "PRC32K costat llarg"
 
-#: ppdc/sample.c:152
 msgid "PRC32K Oversize"
 msgstr "PRC32K gran"
 
-#: ppdc/sample.c:153
 msgid "PRC32K Oversize Long Edge"
 msgstr "PRC32K gran costat llarg"
 
-#: cups/snmp.c:1014
 msgid "Packet does not contain a Get-Response-PDU"
 msgstr "El paquet no conté cap Get-Response-PDU"
 
-#: cups/snmp.c:993
 msgid "Packet does not start with SEQUENCE"
 msgstr "El paquet no comença amb SEQUENCE"
 
-#: ppdc/sample.c:360
 msgid "ParamCustominCutInterval"
 msgstr "ParamCustominCutInterval"
 
-#: ppdc/sample.c:358
 msgid "ParamCustominTearInterval"
 msgstr "ParamCustominTearInterval"
 
-#: cups/auth.c:199 cups/auth.c:367
 #, c-format
 msgid "Password for %s on %s? "
 msgstr "Contrasenya per %s a %s? "
 
-#: systemv/cupsaddsmb.c:252
 #, c-format
 msgid "Password for %s required to access %s via SAMBA: "
 msgstr "Es necessita la contrasenya de %s per accedir a %s a través de SAMBA: "
 
-#: cgi-bin/classes.c:167
 msgid "Pause Class"
 msgstr "Posa la classe en pausa"
 
-#: cgi-bin/printers.c:170
 msgid "Pause Printer"
 msgstr "Posa la impressora en pausa"
 
-#: ppdc/sample.c:448
 msgid "Peel-Off"
 msgstr "Desenganxar"
 
-#: ppdc/sample.c:160
 msgid "Photo"
 msgstr "Fotografia"
 
-#: ppdc/sample.c:161
 msgid "Photo Labels"
 msgstr "Etiquetes de fotografia"
 
-#: ppdc/sample.c:286
 msgid "Plain Paper"
 msgstr "Paper normal"
 
-#: cgi-bin/admin.c:3299 cgi-bin/admin.c:3580
 msgid "Policies"
 msgstr "Polítiques"
 
-#: cgi-bin/admin.c:3306 cgi-bin/admin.c:3649 cgi-bin/admin.c:3662
 msgid "Port Monitor"
 msgstr "Seguiment del port"
 
-#: ppdc/sample.c:278
 msgid "PostScript Printer"
 msgstr "Impressora PostScript"
 
-#: ppdc/sample.c:147
 msgid "Postcard"
 msgstr "Postal"
 
-#: ppdc/sample.c:71
 msgid "Postcard Double "
 msgstr "Postal doble"
 
-#: ppdc/sample.c:72
 msgid "Postcard Double Long Edge"
 msgstr "Postal doble costat llarg"
 
-#: ppdc/sample.c:148
 msgid "Postcard Long Edge"
 msgstr "Postal costat llarg"
 
-#: ppdc/sample.c:295
 msgid "Print Density"
 msgstr "Densitat de la impressió"
 
-#: cups/notify.c:82
 msgid "Print Job:"
-msgstr "Tasca d'impressió:"
+msgstr "Feina d'impressió:"
 
-#: ppdc/sample.c:340
 msgid "Print Mode"
 msgstr "Mode d'impressió"
 
-#: ppdc/sample.c:383
 msgid "Print Rate"
 msgstr "Ritme d'impressió"
 
-#: cgi-bin/printers.c:179
 msgid "Print Self-Test Page"
 msgstr "Imprimeix la pàgina de prova pròpia"
 
-#: ppdc/sample.c:327
 msgid "Print Speed"
 msgstr "Velocitat d'impressió"
 
-#: cgi-bin/ipp-var.c:792
 msgid "Print Test Page"
 msgstr "Imprimeix una pàgina de prova"
 
-#: ppdc/sample.c:356
 msgid "Print and Cut"
 msgstr "Imprimeix i talla"
 
-#: ppdc/sample.c:344
 msgid "Print and Tear"
 msgstr "Imprimeix i estripa"
 
-#: backend/ipp.c:1537
 #, c-format
 msgid "Print file accepted - job ID %d."
-msgstr "S'ha acceptat el fitxer d'impressió - ID de la tasca %d."
+msgstr "S'ha acceptat el fitxer d'impressió - ID de la feina %d."
 
-#: backend/ipp.c:1527
 msgid "Print file accepted - job ID unknown."
-msgstr "S'ha acceptat el fitxer d'impressió - l'ID de la tasca és desconegut."
+msgstr "S'ha acceptat el fitxer d'impressió - l'ID de la feina és desconegut."
 
-#: backend/socket.c:424 backend/usb-unix.c:191
 msgid "Print file sent."
 msgstr "S'ha enviat el fitxer d'impressió."
 
-#: backend/ipp.c:1488
 msgid "Print file was not accepted."
 msgstr "No s'ha acceptat el fitxer d'impressió."
 
-#: backend/ipp.c:1895
 msgid "Print job canceled at printer."
-msgstr "S'ha cancel·lat la tasca a la impressora."
+msgstr "S'ha cancel·lat la feina a la impressora."
 
-#: backend/ipp.c:1890
 msgid "Print job too large."
-msgstr "La tasca d'impressió és massa llarga."
+msgstr "La feina d'impressió és massa llarga."
 
-#: cgi-bin/ipp-var.c:1047
 msgid "Printer Added"
 msgstr "S'ha afegit una impressora"
 
-#: ppdc/sample.c:263
 msgid "Printer Default"
 msgstr "Impressora per defecte"
 
-#: cgi-bin/ipp-var.c:1051
 msgid "Printer Deleted"
 msgstr "S'ha eliminat la impressora"
 
-#: cgi-bin/ipp-var.c:1049
 msgid "Printer Modified"
 msgstr "S'ha modificat la impressora"
 
-#: cgi-bin/ipp-var.c:1045
 msgid "Printer Paused"
 msgstr "S'ha posat la impressora en pausa"
 
-#: ppdc/sample.c:294
 msgid "Printer Settings"
 msgstr "Configuració de la impressora"
 
-#: backend/ipp.c:1893
 msgid "Printer cannot print supplied content."
 msgstr "La impressora no pot imprimir el contingut subministrat."
 
-#: cups/notify.c:126
 msgid "Printer:"
 msgstr "Impressora:"
 
-#: cgi-bin/printers.c:204 cgi-bin/printers.c:332
 msgid "Printers"
 msgstr "Impressores"
 
-#: filter/rastertoepson.c:1093 filter/rastertohp.c:817
-#: filter/rastertolabel.c:1249
 #, c-format
 msgid "Printing page %d, %d%% complete."
 msgstr "S'està imprimint la pàgina %d. S'ha completat el %d%%."
 
-#: cgi-bin/classes.c:173 cgi-bin/printers.c:176
 msgid "Purge Jobs"
-msgstr "Purga les tasques"
+msgstr "Purga les feines"
 
-#: ppdc/sample.c:155
 msgid "Quarto"
 msgstr "Quart"
 
-#: scheduler/ipp.c:1513 scheduler/ipp.c:10661
 msgid "Quota limit reached."
 msgstr "S'ha assolit el límit de la quota."
 
-#: berkeley/lpq.c:515
 msgid "Rank    Owner   Job     File(s)                         Total Size"
 msgstr ""
-"Rang    Propietari   Tasca     Fitxer(s)                         Mida total"
+"Rang    Propietari   Feina     Fitxer(s)                         Mida total"
 
 #. TRANSLATORS: Pri is job priority.
-#: berkeley/lpq.c:511
 msgid ""
 "Rank   Owner      Pri  Job        Files                       Total Size"
 msgstr ""
-"Rang   Propietari      Pri  Tasca        Fitxers                       Mida "
+"Rang   Propietari      Pri  Feina        Fitxers                       Mida "
 "total"
 
-#: cgi-bin/classes.c:171 cgi-bin/printers.c:174
 msgid "Reject Jobs"
-msgstr "Rebutja tasques"
+msgstr "Rebutja feines"
 
-#: backend/lpd.c:1016 backend/lpd.c:1148
 #, c-format
 msgid "Remote host did not accept control file (%d)."
 msgstr "L'amfitrió remot no accepta el fitxer de control (%d)."
 
-#: backend/lpd.c:1101
 #, c-format
 msgid "Remote host did not accept data file (%d)."
 msgstr "L'amfitrió remot no accepta el fitxer de dades (%d)."
 
-#: ppdc/sample.c:428
 msgid "Reprint After Error"
 msgstr "Torna a imprimir després d'un error"
 
-#: cups/http-support.c:1312
 msgid "Request Entity Too Large"
 msgstr "Entitat de petició massa gran"
 
-#: cups/ppd.c:797 cups/ppd.c:1365 ppdc/sample.c:231
 msgid "Resolution"
 msgstr "Resolució"
 
-#: cgi-bin/classes.c:165
 msgid "Resume Class"
 msgstr "Reprèn la classe"
 
-#: cgi-bin/printers.c:167
 msgid "Resume Printer"
 msgstr "Reprèn la impressora"
 
-#: ppdc/sample.c:165
 msgid "Return Address"
 msgstr "Remitent"
 
-#: ppdc/sample.c:449
 msgid "Rewind"
 msgstr "Rebobina"
 
-#: cups/adminutil.c:2052
 #, c-format
 msgid "Running command: %s %s -N -A %s -c '%s'"
 msgstr "S'està executant l'ordre: %s %s -N -A %s -c «%s»"
 
-#: cups/snmp.c:995
 msgid "SEQUENCE uses indefinite length"
 msgstr "SEQUENCE té una longitud indefinida"
 
-#: cups/http-support.c:1336
 msgid "SSL/TLS Negotiation Error"
 msgstr "S'ha produït un error mentre es negociava el SSL/TLS"
 
-#: cups/http-support.c:1293
 msgid "See Other"
 msgstr "Vegeu altres"
 
-#: backend/usb-darwin.c:543 backend/usb-libusb.c:273
 msgid "Sending data to printer."
 msgstr "S'envien les dades a la impressora."
 
-#: cgi-bin/ipp-var.c:1061
 msgid "Server Restarted"
 msgstr "S'ha reiniciat el servidor"
 
-#: cgi-bin/ipp-var.c:1067
 msgid "Server Security Auditing"
 msgstr "S'està auditant la seguretat del servidor"
 
-#: cgi-bin/ipp-var.c:1063
 msgid "Server Started"
 msgstr "S'ha iniciat el servidor"
 
-#: cgi-bin/ipp-var.c:1065
 msgid "Server Stopped"
 msgstr "S'ha aturat el servidor"
 
-#: cups/http-support.c:1330
 msgid "Service Unavailable"
 msgstr "El servei no està disponible"
 
-#: cgi-bin/admin.c:2786 cgi-bin/admin.c:2832 cgi-bin/admin.c:2989
-#: cgi-bin/admin.c:3008
 msgid "Set Allowed Users"
 msgstr "Definir els permisos dels usuaris"
 
-#: cgi-bin/admin.c:3035
 msgid "Set As Server Default"
 msgstr "Establir com a servidor per defecte"
 
-#: cgi-bin/admin.c:3135
 msgid "Set Class Options"
 msgstr "Definir les opcions de la classe"
 
-#: cgi-bin/admin.c:3135 cgi-bin/admin.c:3309 cgi-bin/admin.c:3691
 msgid "Set Printer Options"
 msgstr "Definir les opcions de la impressora"
 
-#: cgi-bin/admin.c:3861 cgi-bin/admin.c:3905 cgi-bin/admin.c:3923
 msgid "Set Publishing"
 msgstr "Establir com a pública"
 
-#: ppdc/sample.c:166
 msgid "Shipping Address"
 msgstr "Adreça de lliurament"
 
-#: ppdc/sample.c:273
 msgid "Short-Edge (Landscape)"
 msgstr "Costat curt (horitzontal)"
 
-#: ppdc/sample.c:288
 msgid "Special Paper"
 msgstr "Paper especial"
 
-#: backend/lpd.c:1057
 #, c-format
 msgid "Spooling job, %.0f%% complete."
-msgstr "S'està posant a la cua la tasca. S'ha completat el %.0f%%."
+msgstr "S'està posant a la cua la feina. S'ha completat el %.0f%%."
 
-#: ppdc/sample.c:341
 msgid "Standard"
 msgstr "Estàndard"
 
 #. TRANSLATORS: Banner/cover sheet before the print job.
-#: cgi-bin/admin.c:3552
 msgid "Starting Banner"
 msgstr "Bàner inicial"
 
-#: filter/rastertoepson.c:1069 filter/rastertohp.c:793
-#: filter/rastertolabel.c:1225
 #, c-format
 msgid "Starting page %d."
 msgstr "S'està començant la pàgina %d."
 
-#: ppdc/sample.c:156
 msgid "Statement"
 msgstr "Declaració"
 
-#: ppdc/sample.c:251
 msgid "Stylus Color Series"
 msgstr "Sèrie Stylus Color"
 
-#: ppdc/sample.c:257
 msgid "Stylus Photo Series"
 msgstr "Sèrie Stylus Photo"
 
-#: scheduler/ipp.c:3549 scheduler/ipp.c:6689 scheduler/ipp.c:7388
-#: scheduler/ipp.c:8887
 #, c-format
 msgid "Subscription #%d does not exist."
 msgstr "La subscripció #%d no existeix."
 
-#: ppdc/sample.c:157
 msgid "Super A"
 msgstr "Super A"
 
-#: ppdc/sample.c:158
 msgid "Super B"
 msgstr "Super B"
 
-#: ppdc/sample.c:162
 msgid "Super B/A3"
 msgstr "Super B/A3"
 
-#: cups/http-support.c:1275
 msgid "Switching Protocols"
 msgstr "Intercanviar els protocols"
 
-#: ppdc/sample.c:159
 msgid "Tabloid"
 msgstr "Tabloide"
 
-#: ppdc/sample.c:45
 msgid "Tabloid Oversize"
 msgstr "Tabloide gran"
 
-#: ppdc/sample.c:46
 msgid "Tabloid Oversize Long Edge"
 msgstr "Tabloide gran costat llarg"
 
-#: ppdc/sample.c:342
 msgid "Tear"
 msgstr "Estripar"
 
-#: ppdc/sample.c:447
 msgid "Tear-Off"
 msgstr "Estripar"
 
-#: ppdc/sample.c:388
 msgid "Tear-Off Adjust Position"
 msgstr "Posició d'ajust d'estripat"
 
-#: scheduler/ipp.c:6393 scheduler/ipp.c:6471 scheduler/ipp.c:6487
-#: scheduler/ipp.c:6505
 #, c-format
 msgid "The %s attribute cannot be provided with job-ids."
 msgstr "No es pot fer servir l'atribut %s amb les job-ids."
 
-#: scheduler/ipp.c:5118
+#, c-format
+msgid ""
+"The '%s' Job Description attribute cannot be supplied in a job creation "
+"request."
+msgstr ""
+
 #, c-format
 msgid ""
 "The '%s' operation attribute cannot be supplied in a Create-Job request."
@@ -4967,22 +3815,17 @@ msgstr ""
 "L'atribut d'operació «%s» no es pot subministrar en una petició de Create-"
 "Job."
 
-#: scheduler/ipp.c:6919
 #, c-format
 msgid "The PPD file \"%s\" could not be found."
 msgstr "No s'ha pogut trobar el fitxer PPD «%s»."
 
-#: scheduler/ipp.c:6906
 #, c-format
 msgid "The PPD file \"%s\" could not be opened: %s"
 msgstr "No s'ha pogut obrir el fitxer PPD «%s»: %s"
 
-#: filter/rastertoepson.c:1038 filter/rastertohp.c:764
-#: filter/rastertolabel.c:1189
 msgid "The PPD file could not be opened."
 msgstr "No s'ha pogut obrir el fitxer PPD."
 
-#: cgi-bin/admin.c:749
 msgid ""
 "The class name may only contain up to 127 printable characters and may not "
 "contain spaces, slashes (/), or the pound sign (#)."
@@ -4990,137 +3833,104 @@ msgstr ""
 "El nom de la classe només pot tenir fins a 127 caràcters imprimibles i no "
 "pot contenir espais, barres (/) o el símbol coixinet (#)."
 
-#: cups/localize.c:353
 msgid "The developer unit needs to be replaced."
 msgstr "S'ha de canviar la unitat de desenvolupament."
 
-#: cups/localize.c:351
 msgid "The developer unit will need to be replaced soon."
 msgstr "La unitat de desenvolupament s'haurà de canviar aviat."
 
-#: cups/localize.c:343
 msgid "The fuser's temperature is high."
 msgstr "La temperatura del fusor és alta."
 
-#: cups/localize.c:345
 msgid "The fuser's temperature is low."
 msgstr "La temperatura del fusor és baixa."
 
-#: scheduler/ipp.c:2097
 msgid ""
 "The notify-lease-duration attribute cannot be used with job subscriptions."
 msgstr ""
 "No es pot fer servir l'atribut notify-lease-duration amb les subscripcions a "
 "tasques."
 
-#: scheduler/ipp.c:2080 scheduler/ipp.c:5653
 #, c-format
 msgid "The notify-user-data value is too large (%d > 63 octets)."
 msgstr "El valor de notify-user-data és massa llarg (%d > 63 octets)."
 
-#: cups/localize.c:349
 msgid "The optical photoconductor needs to be replaced."
 msgstr "S'ha de canviar el fotoconductor òptic."
 
-#: cups/localize.c:347
 msgid "The optical photoconductor will need to be replaced soon."
 msgstr "El fotoconductor òptic s'haurà de canviar aviat."
 
-#: cups/localize.c:331
 msgid "The output bin is almost full."
 msgstr "La safata de sortida és gairebé plena."
 
-#: cups/localize.c:333
 msgid "The output bin is full."
 msgstr "La safata de sortida és plena."
 
-#: cups/localize.c:329
 msgid "The output bin is missing."
 msgstr "Falta la safata de sortida."
 
-#: cups/localize.c:325
 msgid "The paper tray is almost empty."
 msgstr "La safata de paper és gairebé buida."
 
-#: cups/localize.c:327
 msgid "The paper tray is empty."
 msgstr "La safata de paper és buida."
 
-#: cups/localize.c:323
 msgid "The paper tray is missing."
 msgstr "Falta la safata de paper."
 
-#: cups/localize.c:306
 msgid "The paper tray needs to be filled."
 msgstr "S'ha d'omplir la safata de paper."
 
-#: backend/ipp.c:909
 msgid "The printer URI is incorrect or no longer exists."
 msgstr "L'URI de la impressora no és correcte o ja no existeix."
 
-#: backend/lpd.c:619 backend/lpd.c:1009 backend/lpd.c:1091 backend/lpd.c:1141
 msgid "The printer did not respond."
 msgstr "La impressora no ha respost."
 
-#: backend/ipp.c:892 backend/ipp.c:899
 #, c-format
 msgid "The printer does not support IPP/%d.%d, trying IPP/%s."
-msgstr "La impressora no admet el IPP/%d.%d, s'està intentant el IPP/%s."
+msgstr ""
+"La impressora no és compatible amb el IPP/%d.%d, s'està intentant el IPP/%s."
 
-#: backend/ipp.c:757 backend/ipp.c:874 backend/ipp.c:980 backend/ipp.c:1313
-#: backend/ipp.c:1464 backend/lpd.c:828 backend/socket.c:374
-#: backend/usb-unix.c:131 backend/usb-unix.c:424 backend/usb-unix.c:507
 msgid "The printer is in use."
 msgstr "La impressora està ocupada."
 
-#: backend/runloop.c:254 backend/runloop.c:374 cups/localize.c:311
 msgid "The printer is not connected."
 msgstr "La impressora no està connectada."
 
-#: backend/ipp.c:735 backend/ipp.c:768 backend/ipp.c:870 backend/lpd.c:807
-#: backend/lpd.c:848 backend/socket.c:353 backend/socket.c:386
 msgid "The printer is not responding."
 msgstr "La impressora no respòn."
 
-#: backend/runloop.c:396
 msgid "The printer is now connected."
 msgstr "Ara la impressora està connectada."
 
-#: backend/usb-darwin.c:1286
 msgid "The printer is now online."
 msgstr "Ara la impressora està en línia."
 
-#: backend/usb-darwin.c:1307
 msgid "The printer is offline."
 msgstr "La impressora està fora de línia."
 
-#: cups/localize.c:335
 msgid "The printer is running low on ink."
 msgstr "S'està acabant la tinta de la impressora."
 
-#: cups/localize.c:313
 msgid "The printer is running low on toner."
 msgstr "S'està acabant el tòner de la impressora."
 
-#: backend/ipp.c:750 backend/lpd.c:821 backend/socket.c:367
 msgid "The printer is unreachable at this time."
 msgstr "Ara mateix no es pot accedir a la impressora."
 
-#: cups/localize.c:337
 msgid "The printer may be out of ink."
 msgstr "Es deu haver acabat la tinta de la impressora."
 
-#: cups/localize.c:315
 msgid "The printer may be out of toner."
 msgstr "Es deu haver acabat el tòner de la impressora."
 
-#: backend/ipp.c:744 backend/lpd.c:815 backend/socket.c:361
 msgid "The printer may not exist or is unavailable at this time."
 msgstr ""
 "Pot ser que la impressora no existeixi o que ara mateix no estigui "
 "accessible."
 
-#: cgi-bin/admin.c:931
 msgid ""
 "The printer name may only contain up to 127 printable characters and may not "
 "contain spaces, slashes (/), or the pound sign (#)."
@@ -5128,64 +3938,45 @@ msgstr ""
 "El nom de la impressora només pot tenir fins a 127 caràcters imprimibles i "
 "no pot contenir espais, barres (/) o el símbol coixinet (#)."
 
-#: scheduler/ipp.c:876 scheduler/ipp.c:1136 scheduler/ipp.c:3198
-#: scheduler/ipp.c:3369 scheduler/ipp.c:5101 scheduler/ipp.c:5487
-#: scheduler/ipp.c:5801 scheduler/ipp.c:6359 scheduler/ipp.c:7124
-#: scheduler/ipp.c:7180 scheduler/ipp.c:7494 scheduler/ipp.c:7760
-#: scheduler/ipp.c:7849 scheduler/ipp.c:7882 scheduler/ipp.c:8205
-#: scheduler/ipp.c:8598 scheduler/ipp.c:8679 scheduler/ipp.c:9840
-#: scheduler/ipp.c:10294 scheduler/ipp.c:10624 scheduler/ipp.c:10706
-#: scheduler/ipp.c:10998
 msgid "The printer or class does not exist."
 msgstr "La impressora o la classe no existeix."
 
-#: scheduler/ipp.c:1304
 msgid "The printer or class is not shared."
 msgstr "La impressora o la classe no estan compartides."
 
-#: cups/localize.c:317
 msgid "The printer's cover is open."
 msgstr "La tapa de la impressora està oberta."
 
-#: cups/localize.c:321
 msgid "The printer's door is open."
 msgstr "La porta de la impressora està oberta."
 
-#: cups/localize.c:319
 msgid "The printer's interlock is open."
 msgstr "L'enclavament de seguretat de la impressora està obert."
 
-#: cups/localize.c:339
 msgid "The printer's waste bin is almost full."
 msgstr "El dipòsit de residus és gairebé ple."
 
-#: cups/localize.c:341
 msgid "The printer's waste bin is full."
 msgstr "El dipòsit de residus és ple."
 
-#: scheduler/ipp.c:982 scheduler/ipp.c:2261
 #, c-format
 msgid "The printer-uri \"%s\" contains invalid characters."
 msgstr "El printer-uri «%s» conté caràcters no vàlids."
 
-#: scheduler/ipp.c:3175
 msgid "The printer-uri attribute is required."
 msgstr "L'atribut printer-uri és obligatori."
 
-#: scheduler/ipp.c:966
 msgid ""
 "The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"."
 msgstr ""
 "El printer-uri ha de tenir la forma «ipp://NOMAMFITRIÓ/classes/NOMCLASSE»."
 
-#: scheduler/ipp.c:2245
 msgid ""
 "The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"."
 msgstr ""
 "El printer-uri ha de tenir la forma «ipp://NOMAMFITRIÓ/printers/"
 "NOMIMPRESSORA»."
 
-#: cgi-bin/admin.c:474
 msgid ""
 "The subscription name may not contain spaces, slashes (/), question marks "
 "(?), or the pound sign (#)."
@@ -5193,7 +3984,6 @@ msgstr ""
 "La subscripció no pot contenir espais, barres (/), interrogacions (?), o el "
 "símbol coixinet (#)."
 
-#: scheduler/client.c:2450
 msgid ""
 "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to "
 "enable it."
@@ -5201,279 +3991,216 @@ msgstr ""
 "La interfície web està deshabilitada. Executeu «cupsctl WebInterface=yes» "
 "per habilitar-la."
 
-#: scheduler/ipp.c:6454
 #, c-format
 msgid "The which-jobs value \"%s\" is not supported."
 msgstr "El valor «%s» de which-jobs no està implementat."
 
-#: scheduler/ipp.c:5731
 msgid "There are too many subscriptions."
 msgstr "Hi ha massa subscripcions."
 
-#: cups/localize.c:308
 msgid "There is a paper jam."
 msgstr "S'ha encallat el paper."
 
-#: backend/usb-darwin.c:379 backend/usb-darwin.c:438 backend/usb-darwin.c:505
-#: backend/usb-darwin.c:526 backend/usb-libusb.c:235 backend/usb-libusb.c:256
 msgid "There was an unrecoverable USB error."
 msgstr "Hi ha un error de l'USB irrecuperable."
 
-#: ppdc/sample.c:435
 msgid "Thermal Transfer Media"
 msgstr "Mitjà de transferència tèrmica"
 
-#: scheduler/ipp.c:1507
 msgid "Too many active jobs."
 msgstr "Hi ha massa tasques actives."
 
-#: scheduler/ipp.c:1401
 #, c-format
 msgid "Too many job-sheets values (%d > 2)."
 msgstr "Hi ha massa valors de job-sheets (%d > 2)."
 
-#: scheduler/ipp.c:2529
 #, c-format
 msgid "Too many printer-state-reasons values (%d > %d)."
 msgstr "Hi ha massa valors de printer-state-reasons (%d > %d)."
 
-#: ppdc/sample.c:289
 msgid "Transparency"
 msgstr "Transparència"
 
-#: ppdc/sample.c:284
 msgid "Tray"
 msgstr "Safata"
 
-#: ppdc/sample.c:264
 msgid "Tray 1"
 msgstr "Safata 1"
 
-#: ppdc/sample.c:265
 msgid "Tray 2"
 msgstr "Safata 2"
 
-#: ppdc/sample.c:266
 msgid "Tray 3"
 msgstr "Safata 3"
 
-#: ppdc/sample.c:267
 msgid "Tray 4"
 msgstr "Safata 4"
 
-#: cups/http-support.c:1315
 msgid "URI Too Long"
 msgstr "L'URI és massa llarg"
 
-#: ppdc/sample.c:138
 msgid "US Ledger"
 msgstr "Llibre major americà"
 
-#: ppdc/sample.c:139
 msgid "US Legal"
 msgstr "Legal americà"
 
-#: ppdc/sample.c:140
 msgid "US Legal Oversize"
 msgstr "Legal americà gran"
 
-#: ppdc/sample.c:141
 msgid "US Letter"
 msgstr "Carta americà"
 
-#: ppdc/sample.c:142
 msgid "US Letter Long Edge"
 msgstr "Carta americà costat llarg"
 
-#: ppdc/sample.c:143
 msgid "US Letter Oversize"
 msgstr "Carta americà gran"
 
-#: ppdc/sample.c:144
 msgid "US Letter Oversize Long Edge"
 msgstr "Carta americà gran costat llarg"
 
-#: ppdc/sample.c:145
 msgid "US Letter Small"
 msgstr "Carta americà petit"
 
-#: cgi-bin/admin.c:1959 cgi-bin/admin.c:1972 cgi-bin/admin.c:1996
 msgid "Unable to access cupsd.conf file"
 msgstr "No es pot accedir al fitxer cups.conf"
 
-#: cgi-bin/help.c:133
 msgid "Unable to access help file."
 msgstr "No es pot accedir al fitxer d'ajuda."
 
-#: cgi-bin/admin.c:526
 msgid "Unable to add RSS subscription"
 msgstr "No es pot afegir la subscripció RSS"
 
-#: cgi-bin/admin.c:814
 msgid "Unable to add class"
 msgstr "No es pot afegir la classe"
 
-#: backend/ipp.c:1635
 msgid "Unable to add document to print job."
-msgstr "No es pot obrir el documenta la tasca."
+msgstr "No es pot obrir el documenta la feina."
 
-#: scheduler/ipp.c:1548
 #, c-format
 msgid "Unable to add job for destination \"%s\"."
-msgstr "No es pot afegir la tasca al destí «%s»."
+msgstr "No es pot afegir la feina al destí «%s»."
 
-#: cgi-bin/admin.c:1059 cgi-bin/admin.c:1419
 msgid "Unable to add printer"
 msgstr "No es pot afegir la impressora"
 
-#: scheduler/ipp.c:1246
 msgid "Unable to allocate memory for file types."
 msgstr "No es pot assignar la memòria pels tipus de fitxers."
 
-#: filter/pstops.c:451
 msgid "Unable to allocate memory for page info"
 msgstr "No s'ha pogut assignar memòria per la pàgina d'informació"
 
-#: filter/pstops.c:445
 msgid "Unable to allocate memory for pages array"
 msgstr "No s'ha pogut assignar memòria per la matriu de pàgines"
 
-#: cgi-bin/admin.c:1525
 msgid "Unable to cancel RSS subscription"
 msgstr "No es pot cancel·lar la subscripció RSS"
 
-#: backend/ipp.c:1942
 msgid "Unable to cancel print job."
-msgstr "No es pot cancel·lar la tasca d'impressió."
+msgstr "No es pot cancel·lar la feina d'impressió."
 
-#: cgi-bin/admin.c:2990
 msgid "Unable to change printer"
 msgstr "No es pot canviar la impressora"
 
-#: cgi-bin/admin.c:3906
 msgid "Unable to change printer-is-shared attribute"
 msgstr "No es pot canviar l'atribut printer-is-shared"
 
-#: cgi-bin/admin.c:1657 cgi-bin/admin.c:1799
 msgid "Unable to change server settings"
 msgstr "No es pot canviar la configuració del servidor"
 
-#: filter/commandtops.c:420
 msgid "Unable to configure printer options."
 msgstr "No es poden configurar les opcions de la impressora."
 
-#: cups/adminutil.c:911 cups/request.c:1016
 msgid "Unable to connect to host."
-msgstr "No es pot connectar a l'ordinador central."
+msgstr "No es pot connectar a l'amfitrió."
 
-#: backend/ipp.c:713 backend/ipp.c:1138 backend/lpd.c:787 backend/socket.c:333
-#: backend/usb-unix.c:117
 msgid "Unable to contact printer, queuing on next printer in class."
 msgstr ""
 "No es pot contactar amb la impressora. Es posa a la cua de la següent "
 "impressora de la classe."
 
-#: cups/adminutil.c:726
 #, c-format
 msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
 msgstr ""
 "No es poden copiar els fitxers del controlador d'impressora CUPS de 64 bits "
 "(%d)."
 
-#: cups/adminutil.c:691
 #, c-format
 msgid "Unable to copy 64-bit Windows printer driver files (%d)."
 msgstr ""
 "No es poden copiar els fitxers del controlador d'impressora Windows de 64 "
 "bits (%d)."
 
-#: cups/adminutil.c:522
 #, c-format
 msgid "Unable to copy CUPS printer driver files (%d)."
 msgstr "No es poden copiar els fitxers del controlador d'impressora CUPS (%d)."
 
-#: scheduler/ipp.c:2649
 #, c-format
 msgid "Unable to copy PPD file - %s"
 msgstr "No es pot copiar el fitxer PPD - %s"
 
-#: scheduler/ipp.c:2704
 msgid "Unable to copy PPD file."
 msgstr "No es pot copiar el fitxer PPD."
 
-#: cups/adminutil.c:487
 #, c-format
 msgid "Unable to copy Windows 2000 printer driver files (%d)."
 msgstr ""
 "No es poden copiar els fitxers del controlador d'impressora Windows 2000 "
 "(%d)."
 
-#: cups/adminutil.c:610
 #, c-format
 msgid "Unable to copy Windows 9x printer driver files (%d)."
 msgstr ""
 "No es poden copiar els fitxers del controlador d'impressora Windows 9x (%d)."
 
-#: scheduler/ipp.c:2626
 #, c-format
 msgid "Unable to copy interface script - %s"
 msgstr "No es pot copiar l'script de la interfície - %s"
 
-#: backend/ipp.c:2034
 msgid "Unable to create compressed print file"
 msgstr "No es pot crear el fitxer d'impressió comprimit"
 
-#: cups/util.c:602 cups/util.c:1656
 msgid "Unable to create printer-uri"
 msgstr "No es pot crear el printer-uri"
 
-#: cgi-bin/admin.c:1850 cgi-bin/admin.c:1862 scheduler/cupsfilter.c:1236
 msgid "Unable to create temporary file"
 msgstr "No es pot crear el fitxer temporal"
 
-#: cgi-bin/admin.c:2153
 msgid "Unable to delete class"
 msgstr "No es pot esborrar la classe"
 
-#: cgi-bin/admin.c:2238
 msgid "Unable to delete printer"
 msgstr "No es pot esborrar la impressora"
 
-#: cgi-bin/classes.c:260 cgi-bin/printers.c:269
 msgid "Unable to do maintenance command"
 msgstr "No es pot executar la comanda de manteniment"
 
-#: cgi-bin/admin.c:1974
 msgid "Unable to edit cupsd.conf files larger than 1MB"
 msgstr "No es poden editar fitxers cupsd.conf més grans d'1MB"
 
-#: cups/http.c:4272
 msgid ""
 "Unable to establish a secure connection to host (certificate chain invalid)."
 msgstr ""
 "No s'ha pogut establir una connexió segura amb l'amfitrió (la cadena del "
 "certificat no és vàlida)."
 
-#: cups/http.c:4262
 msgid ""
 "Unable to establish a secure connection to host (certificate not yet valid)."
 msgstr ""
 "No s'ha pogut establir una connexió segura amb l'amfitrió (el certificat "
 "encara no és vàlid)."
 
-#: cups/http.c:4257
 msgid "Unable to establish a secure connection to host (expired certificate)."
 msgstr ""
 "No s'ha pogut establir una connexió segura amb l'amfitrió (ha expirat el "
 "certificat)."
 
-#: cups/http.c:4267
 msgid "Unable to establish a secure connection to host (host name mismatch)."
 msgstr ""
 "No s'ha pogut establir una connexió segura amb l'amfitrió (hi ha un error en "
 "el nom de l'amfitrió)."
 
-#: cups/http.c:4277
 msgid ""
 "Unable to establish a secure connection to host (peer dropped connection "
 "before responding)."
@@ -5481,345 +4208,276 @@ msgstr ""
 "No s'ha pogut establir una connexió segura amb l'amfitrió (s'ha tallat la "
 "connexió abans de respondre)."
 
-#: cups/http.c:4252
 msgid ""
 "Unable to establish a secure connection to host (self-signed certificate)."
 msgstr ""
 "No s'ha pogut establir una connexió segura amb l'amfitrió (el certificat és "
 "autosignat)."
 
-#: cups/http.c:4247
 msgid ""
 "Unable to establish a secure connection to host (untrusted certificate)."
 msgstr ""
 "No s'ha pogut establir una connexió segura amb l'amfitrió (el certificat no "
 "és de confiança)."
 
-#: cups/http.c:4008 cups/http.c:4304 cups/http.c:4337 cups/http.c:4354
 msgid "Unable to establish a secure connection to host."
-msgstr "No es pot establir una connexió segura amb l'ordinador central."
+msgstr "No es pot establir una connexió segura amb l'amfitrió."
 
-#: cgi-bin/ipp-var.c:365
 msgid "Unable to find destination for job"
-msgstr "No es pot trobar el destí de la tasca"
+msgstr "No es pot trobar el destí de la feina"
 
-#: cups/http-support.c:1748
 msgid "Unable to find printer."
 msgstr "No es pot trobar la impressora."
 
-#: backend/ipp.c:2056
 msgid "Unable to generate compressed print file"
 msgstr "No es pot generar el fitxer d'impressió comprimit"
 
-#: backend/ipp.c:3009
 msgid "Unable to get backend exit status."
-msgstr "No es pot obtenir el motiu de la sortida en segon pla"
+msgstr "No es pot obtenir el motiu de la sortida de l'execució en segon pla"
 
-#: cgi-bin/classes.c:450
 msgid "Unable to get class list"
 msgstr "No es pot obtenir la llista de classes"
 
-#: cgi-bin/classes.c:549
 msgid "Unable to get class status"
 msgstr "No es pot obtenir l'estat de la classe"
 
-#: cgi-bin/admin.c:1320
 msgid "Unable to get list of printer drivers"
 msgstr "No es pot obtenir la llista dels controladors d'impressora"
 
-#: cgi-bin/admin.c:2840
 msgid "Unable to get printer attributes"
 msgstr "No es poden obtenir els atributs de la impressora"
 
-#: cgi-bin/printers.c:467
 msgid "Unable to get printer list"
 msgstr "No es pot obtenir la llista d'impressores"
 
-#: cgi-bin/printers.c:569
 msgid "Unable to get printer status"
 msgstr "No es pot obtenir l'estat de la impressora"
 
-#: backend/ipp.c:933
 msgid "Unable to get printer status."
 msgstr "No es pot obtenir l'estat de la impressora."
 
-#: cups/adminutil.c:565 cups/adminutil.c:769
 #, c-format
 msgid "Unable to install Windows 2000 printer driver files (%d)."
 msgstr ""
 "No es poden instal·lar els fitxers del controlador d'impressores per Windows "
 "2000 (%d)."
 
-#: cups/adminutil.c:639
 #, c-format
 msgid "Unable to install Windows 9x printer driver files (%d)."
 msgstr ""
 "No es poden instal·lar els fitxers del controlador d'impressores per Windows "
 "9x (%d)."
 
-#: cgi-bin/help.c:92
 msgid "Unable to load help index."
 msgstr "No es pot carregar l'índex de l'ajuda."
 
-#: backend/ipp.c:642 backend/lpd.c:421 backend/socket.c:275
 #, c-format
 msgid "Unable to locate printer \"%s\"."
 msgstr "No es pot ubicar la impressora «%s»."
 
-#: backend/dnssd.c:781 backend/ipp.c:324 backend/lpd.c:204
-#: backend/socket.c:171
 msgid "Unable to locate printer."
 msgstr "No es pot ubicar la impressora."
 
-#: cgi-bin/admin.c:813
 msgid "Unable to modify class"
 msgstr "No es pot modificar la classe"
 
-#: cgi-bin/admin.c:1058 cgi-bin/admin.c:1418
 msgid "Unable to modify printer"
 msgstr "No es pot modificar la impressora"
 
-#: cgi-bin/ipp-var.c:432 cgi-bin/ipp-var.c:521
 msgid "Unable to move job"
-msgstr "No es pot moure la tasca"
+msgstr "No es pot moure la feina"
 
-#: cgi-bin/ipp-var.c:434 cgi-bin/ipp-var.c:523
 msgid "Unable to move jobs"
 msgstr "No es poden moure les tasques"
 
-#: cgi-bin/admin.c:3186 cups/ppd.c:339
 msgid "Unable to open PPD file"
 msgstr "No es pot obrir el fitxer PPD"
 
-#: backend/ipp.c:2040
 msgid "Unable to open compressed print file"
 msgstr "No es pot obrir el fitxer d'impressió comprimit"
 
-#: cgi-bin/admin.c:2608
 msgid "Unable to open cupsd.conf file:"
 msgstr "No es pot obrir el fitxer cups.conf"
 
-#: backend/usb-unix.c:141
 msgid "Unable to open device file"
 msgstr "No es pot obrir el fitxer de dispositiu"
 
-#: scheduler/ipp.c:6140
 #, c-format
 msgid "Unable to open document #%d in job #%d."
-msgstr "No es pot obrir el document #%d a la tasca #%d."
+msgstr "No es pot obrir el document #%d a la feina #%d."
 
-#: cgi-bin/help.c:364
 msgid "Unable to open help file."
 msgstr "No es pot obrir el fitxer d'impressió."
 
-#: backend/ipp.c:365 backend/ipp.c:1398 backend/ipp.c:1594 backend/ipp.c:2046
-#: backend/lpd.c:488 backend/socket.c:158 backend/usb.c:237
-#: filter/gziptoany.c:71 filter/pstops.c:300
 msgid "Unable to open print file"
 msgstr "No es pot obrir el fitxer d'impressió"
 
-#: filter/rastertoepson.c:998 filter/rastertohp.c:724
-#: filter/rastertolabel.c:1147
 msgid "Unable to open raster file"
 msgstr "No es pot obrir el fitxer de trama"
 
-#: cgi-bin/ipp-var.c:795
 msgid "Unable to print test page"
 msgstr "No es pot imprimir la pàgina de prova"
 
-#: backend/runloop.c:96 backend/runloop.c:325 backend/usb-darwin.c:613
-#: backend/usb-darwin.c:657 backend/usb-libusb.c:343 backend/usb-libusb.c:378
 msgid "Unable to read print data."
 msgstr "No es poden llegir les dades d'impressió."
 
-#: cups/dest.c:3402
 msgid "Unable to resolve printer URI."
 msgstr "No es pot resoldre l'URI de la impressora."
 
-#: cups/adminutil.c:2088
 #, c-format
 msgid "Unable to run \"%s\": %s"
 msgstr "No es pot executar «%s»: %s"
 
-#: filter/pstops.c:563
 msgid "Unable to see in file"
 msgstr "No es pot veure al fitxer"
 
-#: cgi-bin/ipp-var.c:598 cgi-bin/ipp-var.c:618
 msgid "Unable to send command to printer driver"
 msgstr "No es pot enviar la comanda al controlador de la impressora"
 
-#: backend/usb-darwin.c:735 backend/usb-libusb.c:454
 msgid "Unable to send data to printer."
 msgstr "No es poden enviar dades a la impressora."
 
-#: cups/adminutil.c:821
 #, c-format
 msgid "Unable to set Windows printer driver (%d)."
 msgstr "No es pot configurar el controlador d'impressores per Windows (%d)"
 
-#: cgi-bin/admin.c:3807
 msgid "Unable to set options"
 msgstr "No es poden configurar les opcions"
 
-#: cgi-bin/admin.c:3077
 msgid "Unable to set server default"
 msgstr "No es pot posar la configuració per defecte al servidor"
 
-#: backend/ipp.c:2868 backend/ipp.c:2945 backend/ipp.c:2953
 msgid "Unable to start backend process."
 msgstr "No es pot iniciar el procés en segon pla."
 
-#: cgi-bin/admin.c:1912
 msgid "Unable to upload cupsd.conf file"
 msgstr "No es pot penjar el fitxer cups.conf"
 
-#: backend/usb-darwin.c:1985 backend/usb-darwin.c:2009
 msgid "Unable to use legacy USB class driver."
 msgstr "No es pot fer servir el controlador de la classe USB antic."
 
-#: backend/runloop.c:125 backend/runloop.c:380
 msgid "Unable to write print data"
 msgstr "No es poden escriure les dades d'impressió"
 
-#: filter/gziptoany.c:90
 #, c-format
 msgid "Unable to write uncompressed print data: %s"
 msgstr "No es poden escriure les dades sense comprimir: %s"
 
-#: cups/http-support.c:1303
 msgid "Unauthorized"
 msgstr "No autoritzat"
 
-#: cgi-bin/admin.c:3503
 msgid "Units"
 msgstr "Unitats"
 
-#: cups/http-support.c:1343 cups/ppd.c:366
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: filter/pstops.c:2213
 #, c-format
 msgid "Unknown choice \"%s\" for option \"%s\"."
 msgstr "La tria de «%s» per l'opció «%s» és desconeguda."
 
-#: backend/ipp.c:507
 #, c-format
 msgid "Unknown encryption option value: \"%s\"."
 msgstr "El valor de l'opció de xifrat «%s» és desconegut."
 
-#: backend/lpd.c:350
 #, c-format
 msgid "Unknown file order: \"%s\"."
 msgstr "Ordre desconegut del fitxer: «%s»."
 
-#: backend/lpd.c:321
 #, c-format
 msgid "Unknown format character: \"%c\"."
 msgstr "Format del caràcter desconegut: «%c»."
 
-#: cups/dest-options.c:770
 msgid "Unknown media size name."
 msgstr "El nom de la mida del suport no és conegut."
 
-#: backend/ipp.c:554
 #, c-format
 msgid "Unknown option \"%s\" with value \"%s\"."
 msgstr "L'opció «%s» amb valor «%s» és desconeguda."
 
-#: filter/pstops.c:2196
 #, c-format
 msgid "Unknown option \"%s\"."
 msgstr "L'opció «%s» és desconeguda."
 
-#: backend/lpd.c:336
 #, c-format
 msgid "Unknown print mode: \"%s\"."
 msgstr "El mode d'impressió «%s» és desconegut."
 
-#: scheduler/ipp.c:10496
 #, c-format
 msgid "Unknown printer-error-policy \"%s\"."
 msgstr "El paràmetre printer-error-policy «%s» és desconegut."
 
-#: scheduler/ipp.c:10479
 #, c-format
 msgid "Unknown printer-op-policy \"%s\"."
 msgstr "El paràmetre printer-op-policy «%s» és desconegut."
 
-#: cups/http-addrlist.c:710
 msgid "Unknown service name."
 msgstr "El nom del servei és desconegut."
 
-#: backend/ipp.c:526
 #, c-format
 msgid "Unknown version option value: \"%s\"."
 msgstr "El valor de l'opció de la versió és desconegut: «%s»."
 
-#: scheduler/ipp.c:402
+#, c-format
+msgid "Unsupported 'compression' value \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unsupported 'document-format' value \"%s\"."
+msgstr ""
+
+msgid "Unsupported 'job-name' value."
+msgstr ""
+
 #, c-format
 msgid "Unsupported character set \"%s\"."
 msgstr "No s'admet el grup de caràcters «%s»."
 
-#: scheduler/ipp.c:8171 scheduler/ipp.c:9401 scheduler/ipp.c:10950
 #, c-format
 msgid "Unsupported compression \"%s\"."
 msgstr "No s'admet la compressió «%s»."
 
-#: scheduler/ipp.c:8305 scheduler/ipp.c:9551 scheduler/ipp.c:10979
 #, c-format
 msgid "Unsupported document-format \"%s\"."
 msgstr "No s'admet el document-format «%s»."
 
-#: scheduler/ipp.c:9534
 #, c-format
 msgid "Unsupported document-format \"%s/%s\"."
 msgstr "No s'admet el document-format «%s/%s»."
 
-#: scheduler/ipp.c:1367
 #, c-format
 msgid "Unsupported format \"%s\"."
 msgstr "No s'admet el format «%s»."
 
-#: scheduler/ipp.c:1465
 msgid "Unsupported margins."
 msgstr "No s'admeten els marges."
 
-#: cups/pwg-media.c:529
 msgid "Unsupported media value."
 msgstr "No s'admet el valor del suport."
 
-#: filter/pstops.c:2478
 #, c-format
 msgid "Unsupported number-up value %d, using number-up=1."
 msgstr "No s'admet el valor %d a number-up. Es fa servir number-up=1."
 
-#: filter/pstops.c:2512
 #, c-format
 msgid "Unsupported number-up-layout value %s, using number-up-layout=lrtb."
 msgstr ""
 "No s'admet el valor %s a number-up-layout. Es fa servir number-up-"
 "layout=lrtb."
 
-#: filter/pstops.c:2563
 #, c-format
 msgid "Unsupported page-border value %s, using page-border=none."
 msgstr "No s'admet el valor %s a page-border. Es fa servir page-border=none."
 
-#: filter/rastertopwg.c:147 filter/rastertopwg.c:155 filter/rastertopwg.c:164
 msgid "Unsupported raster data."
 msgstr "No s'admet les dades en trama."
 
-#: cups/snmp.c:1112
 msgid "Unsupported value type"
 msgstr "El tipus de valor no és compatible"
 
-#: cups/http-support.c:1318
 msgid "Upgrade Required"
 msgstr "S'ha d'actualitzar"
 
-#: systemv/lpadmin.c:668
 msgid ""
 "Usage:\n"
 "\n"
@@ -5840,49 +4498,36 @@ msgstr ""
 "                       [-P fitxer-ppd] [-o nom=valor]\n"
 "                       [-u allow:usuari,usuari] [-u deny:usuari,usuari]"
 
-#: backend/dnssd.c:241 backend/ipp.c:313 backend/lpd.c:191
-#: backend/socket.c:135 backend/usb.c:183 filter/commandtops.c:74
-#: filter/gziptoany.c:50 filter/pstops.c:264 monitor/bcp.c:62
-#: monitor/tbcp.c:61
 #, c-format
 msgid "Usage: %s job-id user title copies options [file]"
-msgstr "Sintaxi: %s id-tasca usuari títol còpies opcions [fitxer]"
+msgstr "Sintaxi: %s id-feina usuari títol còpies opcions [fitxer]"
 
-#: systemv/cupsaddsmb.c:281
 msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
 msgstr "Sintaxi: cupsaddsmb [opcions] impressora1 ... impressoraN"
 
-#: systemv/cupsctl.c:200
 msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
 msgstr "Sintaxi: cupsctl [opcions] [param=valor ... paramN=valorN]"
 
-#: scheduler/main.c:2017
 msgid "Usage: cupsd [options]"
 msgstr "Sintaxi: cupsd [opcions]"
 
-#: scheduler/cupsfilter.c:1429
 msgid "Usage: cupsfilter [ options ] filename"
 msgstr "Sintaxi: cupsfilter [ opcions ] nomfitxer"
 
-#: systemv/cupstestdsc.c:425
 msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
 msgstr "Sintaxi: cupstestdsc [opcions] nomfitxer.ps [...nomfitxer.ps]"
 
-#: systemv/cupstestppd.c:3793
 msgid ""
 "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]"
 msgstr ""
 "Sintaxi: cupstestppd [opcions] nomfitxer1.ppd[.gz] [... nomfitxerN.ppd[.gz]]"
 
-#: test/ipptool.c:4401
 msgid "Usage: ipptool [options] URI filename [ ... filenameN ]"
 msgstr "Sintaxi: ipptool [opcions] URI nomfitxer[ ... nomfitxerN]"
 
-#: systemv/lpmove.c:125
 msgid "Usage: lpmove job/src dest"
-msgstr "Sintaxi: lpmove tasca/font destí"
+msgstr "Sintaxi: lpmove feina/font destí"
 
-#: systemv/lpoptions.c:553
 msgid ""
 "Usage: lpoptions [-h server] [-E] -d printer\n"
 "       lpoptions [-h server] [-E] [-p printer] -l\n"
@@ -5894,11 +4539,9 @@ msgstr ""
 "         lpoptions [-h servidor] [-E] -p impressora -o opció[=valor] ...\n"
 "         lpoptions [-h servidor] [-E] -x impressora"
 
-#: systemv/lppasswd.c:476
 msgid "Usage: lppasswd [-g groupname]"
 msgstr "Sintaxi: lppasswd [-g nomgrup]"
 
-#: systemv/lppasswd.c:479
 msgid ""
 "Usage: lppasswd [-g groupname] [username]\n"
 "       lppasswd [-g groupname] -a [username]\n"
@@ -5908,76 +4551,59 @@ msgstr ""
 "         lppasswd [-g nomgrup] -a [nomusuari]\n"
 "         lppasswd [-g nomgrup] -x [nomusuari]"
 
-#: berkeley/lpq.c:670
 msgid ""
 "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]"
 msgstr ""
 "Sintaxi: lpq [-P destí] [-U nomusuari] [-h nomamfitrió[:port]] [-l] "
 "[+interval]"
 
-#: ppdc/ppdc.cxx:435
 msgid "Usage: ppdc [options] filename.drv [ ... filenameN.drv ]"
 msgstr "Sintaxi: ppdc [opcions] nomfitxer.rv [ ... nomfitxerN.drv ]"
 
-#: ppdc/ppdhtml.cxx:172
 msgid "Usage: ppdhtml [options] filename.drv >filename.html"
 msgstr "Sintaxi: ppdhtml [opcions] nomfitxer.drv >nomfitxer.html"
 
-#: ppdc/ppdi.cxx:128
 msgid "Usage: ppdi [options] filename.ppd [ ... filenameN.ppd ]"
 msgstr "Sintaxi: ppdi [opcions] nomfitxer.ppd [ ... nomfitxerN.ppd ]"
 
-#: ppdc/ppdmerge.cxx:367
 msgid "Usage: ppdmerge [options] filename.ppd [ ... filenameN.ppd ]"
 msgstr "Sintaxi: ppdmerge [opcions] nomfitxer.ppd [ ... nomfitxerN.ppd ]"
 
-#: ppdc/ppdpo.cxx:252
 msgid ""
 "Usage: ppdpo [options] -o filename.po filename.drv [ ... filenameN.drv ]"
 msgstr ""
 "Sintaxi: ppdpo [opcions] -o nomfitxer.po nomfitxer.drv [ ... nomfitxerN.drv]"
 
-#: backend/snmp.c:218
 msgid "Usage: snmp [host-or-ip-address]"
 msgstr "Sintaxi: snmp [adreça-amfitrió-o-ip]"
 
-#: cups/snmp.c:1064
 msgid "Value uses indefinite length"
 msgstr "El valor té una longitud indefinida"
 
-#: cups/snmp.c:1049
 msgid "VarBind uses indefinite length"
 msgstr "VarBind té una longitud indefinida"
 
-#: cups/snmp.c:999
 msgid "Version uses indefinite length"
 msgstr "Version té una longitud indefinida"
 
-#: backend/ipp.c:1675
 msgid "Waiting for job to complete."
-msgstr "S'està esperant que acabi la tasca."
+msgstr "S'està esperant que acabi la feina."
 
-#: backend/usb-darwin.c:457 backend/usb-libusb.c:193
 msgid "Waiting for printer to become available."
 msgstr "S'està esperant que la impressora estigui disponible."
 
-#: backend/socket.c:444
 msgid "Waiting for printer to finish."
 msgstr "S'està esperant que la impressora acabi."
 
-#: cups/adminutil.c:793
 msgid "Warning, no Windows 2000 printer drivers are installed."
 msgstr "AVÍS. No hi ha cap controlador per Windows 2000 instal·lat."
 
-#: cups/http-support.c:1339
 msgid "Web Interface is Disabled"
 msgstr "La interfície web està deshabilitada"
 
-#: cups/ppd.c:1947
 msgid "Yes"
 msgstr "Sí"
 
-#: scheduler/client.c:2437
 #, c-format
 msgid ""
 "You must access this page using the URL <A HREF=\"https://%s:%d%s\">https://"
@@ -5986,7 +4612,6 @@ msgstr ""
 "Heu d'accedir a aquesta pagina a través de la URL <A HREF=\"https://%s:%d%s"
 "\">https://%s:%d%s</A>."
 
-#: systemv/lppasswd.c:254
 msgid ""
 "Your password must be at least 6 characters long, cannot contain your "
 "username, and must contain at least one letter and number."
@@ -5994,288 +4619,230 @@ msgstr ""
 "La contrasenya ha de tenir com a mínim 6 caràcters, no pot contenir el nom "
 "d'usuari, i ha de tenir com a mínim una lletra i un número."
 
-#: ppdc/sample.c:439
 msgid "ZPL Label Printer"
 msgstr "Impressora d'etiquetes ZPL"
 
-#: ppdc/sample.c:362
 msgid "Zebra"
 msgstr "Zebra"
 
-#: cups/notify.c:102
 msgid "aborted"
 msgstr "interromput"
 
-#: cups/notify.c:99
 msgid "canceled"
 msgstr "cancel·lat"
 
-#: cups/notify.c:105
 msgid "completed"
 msgstr "completat"
 
-#: scheduler/ipp.c:6012
 msgid "cups-deviced failed to execute."
 msgstr "no s'ha pogut executar correctament la cups-deviced."
 
-#: scheduler/ipp.c:6842 scheduler/ipp.c:7091
 msgid "cups-driverd failed to execute."
 msgstr "no s'ha pogut executar correctament la cups-driverd"
 
-#: systemv/cupsaddsmb.c:233
 #, c-format
 msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
 msgstr "cupsaddsmb: falta el fitxer PPD per la impressora «%s» - %s"
 
-#: systemv/cupsctl.c:141
 msgid "cupsctl: Cannot set Listen or Port directly."
 msgstr "cupsctl: no es pot establir Listen o Port directament."
 
-#: systemv/cupsctl.c:152
 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
 msgstr "cupsctl: no es pot connectar al servidor: %s"
 
-#: systemv/cupsctl.c:195
 #, c-format
 msgid "cupsctl: Unknown option \"%s\""
 msgstr "cupsctl: l'opció «%s» és desconeguda"
 
-#: systemv/cupsctl.c:197
 #, c-format
 msgid "cupsctl: Unknown option \"-%c\""
 msgstr "cupsctl: l'opció «-%c» és desconeguda"
 
-#: scheduler/main.c:189
 msgid "cupsd: Expected config filename after \"-c\" option."
 msgstr ""
 "cupsd: s'esperava un nom de fitxer de configuració després de l'opció «-c»."
 
-#: scheduler/main.c:221 scheduler/main.c:228
+msgid "cupsd: Expected cups-files.conf filename after \"-s\" option."
+msgstr ""
+
+msgid "cupsd: Relative cups-files.conf filename not allowed."
+msgstr ""
+
 msgid "cupsd: Unable to get current directory."
 msgstr "cupsd: No es pot obtenir el directori actual."
 
-#: scheduler/main.c:295
+msgid "cupsd: Unable to get path to cups-files.conf file."
+msgstr ""
+
 #, c-format
 msgid "cupsd: Unknown argument \"%s\" - aborting."
 msgstr "cupsd: l'argument «%s» és desconegut - s'interromp."
 
-#: scheduler/main.c:288
 #, c-format
 msgid "cupsd: Unknown option \"%c\" - aborting."
 msgstr "cupsd: l'opció «%c» és desconeguda - s'interromp."
 
-#: scheduler/main.c:255
 msgid "cupsd: launchd(8) support not compiled in, running in normal mode."
 msgstr ""
 "cupsd: no s'ha compilat amb compatibilitat per launchd(8). S'executa en mode "
 "normal."
 
-#: scheduler/cupsfilter.c:1209
 #, c-format
 msgid "cupsfilter: Invalid document number %d."
 msgstr "cupsfilter: el document número %d no és vàlid."
 
-#: scheduler/cupsfilter.c:1203
 #, c-format
 msgid "cupsfilter: Invalid job ID %d."
-msgstr "cupsfilter: la tasca %d no és vàlida."
+msgstr "cupsfilter: la feina %d no és vàlida."
 
-#: scheduler/cupsfilter.c:358
 msgid "cupsfilter: Only one filename can be specified."
 msgstr "cupsfilter: només es pot especificar un nom de fitxer."
 
-#: scheduler/cupsfilter.c:1251
 #, c-format
 msgid "cupsfilter: Unable to get job file - %s"
-msgstr "cupsfilter: no es pot obtenir el fitxer de la tasca - %s"
+msgstr "cupsfilter: no es pot obtenir el fitxer de la feina - %s"
 
-#: systemv/cupstestppd.c:261
 msgid "cupstestppd: The -q option is incompatible with the -v option."
-msgstr "cupstestppd: l'opció -q no és compatible amb la opció -v."
+msgstr "cupstestppd: l'opció -q no és compatible amb l'opció -v."
 
-#: systemv/cupstestppd.c:277
 msgid "cupstestppd: The -v option is incompatible with the -q option."
-msgstr "cupstestppd: la opció -v no és compatible amb la opció -q."
+msgstr "cupstestppd: l'opció -v no és compatible amb l'opció -q."
 
-#: systemv/lpstat.c:1231 systemv/lpstat.c:1234 systemv/lpstat.c:1237
 #, c-format
 msgid "device for %s/%s: %s"
 msgstr "dispositiu per %s/%s: %s"
 
-#: systemv/lpstat.c:1218 systemv/lpstat.c:1221 systemv/lpstat.c:1224
 #, c-format
 msgid "device for %s: %s"
 msgstr "dispositiu per %s: %s"
 
-#: cups/snmp.c:1036
 msgid "error-index uses indefinite length"
 msgstr "error-index fa servir una longitud indefinida"
 
-#: cups/snmp.c:1028
 msgid "error-status uses indefinite length"
 msgstr "error-status fa servir una longitud indefinida"
 
-#: cups/notify.c:90
 msgid "held"
 msgstr "En pausa"
 
-#: berkeley/lpc.c:209
 msgid "help\t\tGet help on commands."
 msgstr "help\t\tproporciona ajuda sobre les comandes."
 
-#: cups/notify.c:131
 msgid "idle"
 msgstr "inactiva"
 
-#: test/ipptool.c:373 test/ipptool.c:515 test/ipptool.c:539
 msgid "ipptool: \"-i\" and \"-n\" are incompatible with -X\"."
 msgstr "ipptool: «-i» i «-n» no són compatibles amb «-X»."
 
-#: test/ipptool.c:597
 #, c-format
 msgid "ipptool: Bad URI - %s."
 msgstr "ipptool: l'URI no es correcte - %s."
 
-#: test/ipptool.c:362
 #, c-format
 msgid "ipptool: Bad version %s for \"-V\"."
 msgstr "ipptool: la versió %s de «-V» no és correcta."
 
-#: test/ipptool.c:508
 msgid "ipptool: Invalid seconds for \"-i\"."
 msgstr "ipptool: els segons de «-i» no són correctes."
 
-#: test/ipptool.c:578
 msgid "ipptool: May only specify a single URI."
 msgstr "ipptool: heu d'especificar només un URI."
 
-#: test/ipptool.c:531
 msgid "ipptool: Missing count for \"-n\"."
 msgstr "ipptool: falta el comptador de «-n»."
 
-#: test/ipptool.c:408
 msgid "ipptool: Missing filename for \"-f\"."
 msgstr "ipptool: falta el nom del fitxer a «-f»."
 
-#: test/ipptool.c:389
 msgid "ipptool: Missing name=value for \"-d\"."
 msgstr "ipptool: falta nom=valor a «-d»."
 
-#: test/ipptool.c:498
 msgid "ipptool: Missing seconds for \"-i\"."
 msgstr "ipptool: falten els segons a «-i»."
 
-#: test/ipptool.c:332
 msgid "ipptool: Missing timeout for \"-T\"."
 msgstr "ipptool: falta el temps màxim d'espera a «-T»."
 
-#: test/ipptool.c:345
 msgid "ipptool: Missing version for \"-V\"."
 msgstr "ipptool: falta la versió a «-V»."
 
-#: test/ipptool.c:624
 msgid "ipptool: URI required before test file."
 msgstr "ipptool: falta l'URI abans del fitxer de prova."
 
-#: test/ipptool.c:558
 #, c-format
 msgid "ipptool: Unknown option \"-%c\"."
 msgstr "ipptool: l'opció «-%c» és desconeguda."
 
-#: scheduler/ipp.c:7838
 msgid "job-printer-uri attribute missing."
 msgstr "Falta l'atribut de job-printer-uri."
 
-#: systemv/lpadmin.c:131 systemv/lpadmin.c:375
 msgid "lpadmin: Class name can only contain printable characters."
 msgstr "lpadmin: el nom de la classe només pot tenir caràcters imprimibles."
 
-#: systemv/lpadmin.c:614
 msgid "lpadmin: Expected PPD after \"-P\" option."
-msgstr "lpadmin: s'esperava un PPD després de la opció «-P»."
+msgstr "lpadmin: s'esperava un PPD després de l'opció «-P»."
 
-#: systemv/lpadmin.c:457
 msgid "lpadmin: Expected allow/deny:userlist after \"-u\" option."
-msgstr "lpadmin: s'esperava allow/deny:llistausuaris després de la opció «-u»."
+msgstr "lpadmin: s'esperava allow/deny:llistausuaris després de l'opció «-u»."
 
-#: systemv/lpadmin.c:364
 msgid "lpadmin: Expected class after \"-r\" option."
-msgstr "lpadmin: s'esperava una classe després de la opció «-r»."
+msgstr "lpadmin: s'esperava una classe després de l'opció «-r»."
 
-#: systemv/lpadmin.c:120
 msgid "lpadmin: Expected class name after \"-c\" option."
-msgstr "lpadmin: s'esperava un nom de classe després de la opció «-c»."
+msgstr "lpadmin: s'esperava un nom de classe després de l'opció «-c»."
 
-#: systemv/lpadmin.c:558
 msgid "lpadmin: Expected description after \"-D\" option."
-msgstr "lpadmin: s'esperava una descripció després de la opció «-D»."
+msgstr "lpadmin: s'esperava una descripció després de l'opció «-D»."
 
-#: systemv/lpadmin.c:491
 msgid "lpadmin: Expected device URI after \"-v\" option."
-msgstr "lpadmin: s'esperava un URI de dispositiu després de la opció «-v»."
+msgstr "lpadmin: s'esperava un URI de dispositiu després de l'opció «-v»."
 
-#: systemv/lpadmin.c:574
 msgid "lpadmin: Expected file type(s) after \"-I\" option."
-msgstr "lpadmin: s'esperava un(s) tipus de fitxer(s) després de la opció «-I»."
+msgstr "lpadmin: s'esperava un(s) tipus de fitxer(s) després de l'opció «-I»."
 
-#: systemv/lpadmin.c:202
 msgid "lpadmin: Expected hostname after \"-h\" option."
-msgstr ""
-"lpadmin: s'esperava un nom d'ordinador central després de la opció «-h»."
+msgstr "lpadmin: s'esperava un nom d'amfitrió després de l'opció «-h»."
 
-#: systemv/lpadmin.c:221
 msgid "lpadmin: Expected interface after \"-i\" option."
-msgstr "lpadmin: s'esperava una interfície després de la opció «-i»."
+msgstr "lpadmin: s'esperava una interfície després de l'opció «-i»."
 
-#: systemv/lpadmin.c:594
 msgid "lpadmin: Expected location after \"-L\" option."
-msgstr "lpadmin: s'esperava una ubicació després de la opció «-L»."
+msgstr "lpadmin: s'esperava una ubicació després de l'opció «-L»."
 
-#: systemv/lpadmin.c:274
 msgid "lpadmin: Expected model after \"-m\" option."
-msgstr "lpadmin: s'esperava un model després de la opció «-m»."
+msgstr "lpadmin: s'esperava un model després de l'opció «-m»."
 
-#: systemv/lpadmin.c:417
 msgid "lpadmin: Expected name after \"-R\" option."
-msgstr "lpadmin: s'esperava un nom després de la opció «-R»."
+msgstr "lpadmin: s'esperava un nom després de l'opció «-R»."
 
-#: systemv/lpadmin.c:294
 msgid "lpadmin: Expected name=value after \"-o\" option."
-msgstr "lpadmin: s'esperava nom=valor després de la opció «-o»."
+msgstr "lpadmin: s'esperava nom=valor després de l'opció «-o»."
 
-#: systemv/lpadmin.c:313
 msgid "lpadmin: Expected printer after \"-p\" option."
-msgstr "lpadmin: s'esperava una impressora després de la opció «-p»."
+msgstr "lpadmin: s'esperava una impressora després de l'opció «-p»."
 
-#: systemv/lpadmin.c:164
 msgid "lpadmin: Expected printer name after \"-d\" option."
-msgstr "lpadmin: s'esperava un nom d'impressora després de la opció «-d»."
+msgstr "lpadmin: s'esperava un nom d'impressora després de l'opció «-d»."
 
-#: systemv/lpadmin.c:525
 msgid "lpadmin: Expected printer or class after \"-x\" option."
-msgstr "lpadmin: s'esperava un impressora o classe després de la opció «-x»."
+msgstr "lpadmin: s'esperava un impressora o classe després de l'opció «-x»."
 
-#: systemv/lpadmin.c:975
 msgid "lpadmin: No member names were seen."
 msgstr "lpadmin: no s'ha trobat cap nom de membre."
 
-#: systemv/lpadmin.c:762
 #, c-format
 msgid "lpadmin: Printer %s is already a member of class %s."
 msgstr "lpadmin: la impressora %s ja és membre de la classe %s."
 
-#: systemv/lpadmin.c:989
 #, c-format
 msgid "lpadmin: Printer %s is not a member of class %s."
 msgstr "lpadmin: la impressora %s no és membre de la classe %s."
 
-#: systemv/lpadmin.c:175 systemv/lpadmin.c:324 systemv/lpadmin.c:536
 msgid "lpadmin: Printer name can only contain printable characters."
 msgstr ""
 "lpadmin: el nom de la impressora només pot contenir caràcters imprimibles."
 
-#: systemv/lpadmin.c:105
 msgid ""
 "lpadmin: Unable to add a printer to the class:\n"
 "         You must specify a printer name first."
@@ -6283,31 +4850,24 @@ msgstr ""
 "lpadmin: no s'ha pogut afegir una impressora a la classe:\n"
 "         Heu d'especificar primer un nom d'impressora."
 
-#: systemv/lpadmin.c:96 systemv/lpadmin.c:149 systemv/lpadmin.c:253
-#: systemv/lpadmin.c:339 systemv/lpadmin.c:393 systemv/lpadmin.c:510
-#: systemv/lpadmin.c:647
 #, c-format
 msgid "lpadmin: Unable to connect to server: %s"
 msgstr "lpadmin: no s'ha pogut connectar al servidor: %s"
 
-#: systemv/lpadmin.c:1329
 msgid "lpadmin: Unable to create temporary file"
 msgstr "lpadmin: no s'ha pogut crear el fitxer temporal"
 
-#: systemv/lpadmin.c:402
 msgid ""
 "lpadmin: Unable to delete option:\n"
 "         You must specify a printer name first."
 msgstr ""
-"lpadmin: no s'ha pogut esborrar la opció:\n"
+"lpadmin: no s'ha pogut esborrar l'opció:\n"
 "         Heu d'especificar primer un nom d'impressora."
 
-#: systemv/lpadmin.c:1339
 #, c-format
 msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 msgstr "lpadmin: no s'ha pogut obrir el fitxer PPD «%s» - %s"
 
-#: systemv/lpadmin.c:348
 msgid ""
 "lpadmin: Unable to remove a printer from the class:\n"
 "         You must specify a printer name first."
@@ -6315,7 +4875,6 @@ msgstr ""
 "lpadmin: no es pot esborrar una impressora de la classe:\n"
 "         Heu d'especificar primer un nom d'impressora."
 
-#: systemv/lpadmin.c:656
 msgid ""
 "lpadmin: Unable to set the printer options:\n"
 "         You must specify a printer name first."
@@ -6323,174 +4882,138 @@ msgstr ""
 "lpadmin: no es pot establir les opcions de la impressora:\n"
 "         Heu d'especificar primer un nom d'impressora."
 
-#: systemv/lpadmin.c:474
 #, c-format
 msgid "lpadmin: Unknown allow/deny option \"%s\"."
 msgstr "lpadmin: l'opció allow/deny «%s» és desconeguda."
 
-#: systemv/lpadmin.c:629
 #, c-format
 msgid "lpadmin: Unknown argument \"%s\"."
 msgstr "lpadmin: l'argument «%s» és desconegut."
 
-#: systemv/lpadmin.c:624
 #, c-format
 msgid "lpadmin: Unknown option \"%c\"."
 msgstr "lpadmin: l'opció «%c» és desconeguda."
 
-#: systemv/lpadmin.c:580
 msgid "lpadmin: Warning - content type list ignored."
 msgstr "lpadmin: avís - s'ignora el contingut de la llista de tipus."
 
-#: berkeley/lpc.c:76 berkeley/lpc.c:104 berkeley/lpc.c:140
 msgid "lpc> "
 msgstr "lpc> "
 
-#: systemv/lpinfo.c:137
 msgid "lpinfo: Expected 1284 device ID string after \"--device-id\"."
 msgstr ""
 "lpinfo: s'esperava una cadena d'ID de dispositiu 1284 després de «--device-"
 "id»."
 
-#: systemv/lpinfo.c:190
 msgid "lpinfo: Expected language after \"--language\"."
 msgstr "lpinfo: s'esperava un idioma després de «--language»."
 
-#: systemv/lpinfo.c:207
 msgid "lpinfo: Expected make and model after \"--make-and-model\"."
 msgstr "lpinfo: s'esperava una marca i model després de «--make-and-model»."
 
-#: systemv/lpinfo.c:224
 msgid "lpinfo: Expected product string after \"--product\"."
 msgstr "lpinfo: s'esperava una cadena de producte després de «--product!»."
 
-#: systemv/lpinfo.c:155
 msgid "lpinfo: Expected scheme list after \"--exclude-schemes\"."
 msgstr ""
-"lpinfo: s'esperava una llista d'esquemes després de la opció «--exclude-"
+"lpinfo: s'esperava una llista d'esquemes després de l'opció «--exclude-"
 "schemes»."
 
-#: systemv/lpinfo.c:173
 msgid "lpinfo: Expected scheme list after \"--include-schemes\"."
 msgstr ""
-"lpinfo: s'esperava una llista d'esquemes després de la opció «--include-"
+"lpinfo: s'esperava una llista d'esquemes després de l'opció «--include-"
 "schemes»."
 
-#: systemv/lpinfo.c:241
 msgid "lpinfo: Expected timeout after \"--timeout\"."
 msgstr "lpinfo: s'esperava un temps d'espera després de «--timeout»."
 
-#: systemv/lpinfo.c:265
 #, c-format
 msgid "lpinfo: Unknown argument \"%s\"."
 msgstr "lpinfo: l'argument «%s» és desconegut."
 
-#: systemv/lpinfo.c:259
 #, c-format
 msgid "lpinfo: Unknown option \"%c\"."
 msgstr "lpinfo: l'opció «%c» és desconeguda."
 
-#: systemv/lpinfo.c:252
 #, c-format
 msgid "lpinfo: Unknown option \"%s\"."
 msgstr "lpinfo: l'opció «%s» és desconeguda."
 
-#: systemv/lpmove.c:133
 #, c-format
 msgid "lpmove: Unable to connect to server: %s"
 msgstr "lpmove: no s'ha pogut connectar al servidor: %s"
 
-#: systemv/lpmove.c:119
 #, c-format
 msgid "lpmove: Unknown argument \"%s\"."
 msgstr "lpmove: l'argument «%s» és desconegut."
 
-#: systemv/lpmove.c:97
 #, c-format
 msgid "lpmove: Unknown option \"%c\"."
 msgstr "lpmove: l'opció «%c» és desconeguda."
 
-#: systemv/lpoptions.c:150 systemv/lpoptions.c:168 systemv/lpoptions.c:244
 msgid "lpoptions: No printers."
 msgstr "lpoptions: no hi ha cap impressora."
 
-#: systemv/lpoptions.c:219
 #, c-format
 msgid "lpoptions: Unable to add printer or instance: %s"
 msgstr "lpoptions: no s'ha pogut afegir la impressora o la instància: %s"
 
-#: systemv/lpoptions.c:521
 #, c-format
 msgid "lpoptions: Unable to get PPD file for %s: %s"
 msgstr "lpoptions: no s'ha pogut obtenir el fitxer PPD de %s: %s"
 
-#: systemv/lpoptions.c:529
 #, c-format
 msgid "lpoptions: Unable to open PPD file for %s."
 msgstr "lpoptions: no s'ha pogut obrir el fitxer PPD per %s."
 
-#: systemv/lpoptions.c:99
 msgid "lpoptions: Unknown printer or class."
 msgstr "lpoptions: la impressora o la classe són desconegudes."
 
-#: systemv/lppasswd.c:173
 msgid "lppasswd: Only root can add or delete passwords."
 msgstr ""
 "lppasswd: només l'usuari primari (root) pot afegir o esborrar contrasenyes."
 
-#: systemv/lppasswd.c:302
 msgid "lppasswd: Password file busy."
 msgstr "lppaswd: el fitxer de contrasenyes està ocupat."
 
-#: systemv/lppasswd.c:431
 msgid "lppasswd: Password file not updated."
 msgstr "lppaswd: el fitxer de contrasenyes no està actualitzat."
 
-#: systemv/lppasswd.c:398
 msgid "lppasswd: Sorry, password doesn't match."
 msgstr "lppaswwd: la contrasenya no coincideix."
 
-#: systemv/lppasswd.c:253
 msgid "lppasswd: Sorry, password rejected."
 msgstr "lppaswwd: s'ha refusat la contrasenya."
 
-#: systemv/lppasswd.c:230
 msgid "lppasswd: Sorry, passwords don't match."
 msgstr "lppaswwd: les contrasenyes no coincideixen."
 
-#: systemv/lppasswd.c:199 systemv/lppasswd.c:218
 #, c-format
 msgid "lppasswd: Unable to copy password string: %s"
 msgstr "lppasswd: no s'ha pogut copiar la cadena de contrasenya: %s"
 
-#: systemv/lppasswd.c:304 systemv/lppasswd.c:312 systemv/lppasswd.c:329
 #, c-format
 msgid "lppasswd: Unable to open password file: %s"
 msgstr "lppasswd: no s'ha pogut obrir el fitxer de contrasenyes: %s"
 
-#: systemv/lppasswd.c:364 systemv/lppasswd.c:377 systemv/lppasswd.c:408
 #, c-format
 msgid "lppasswd: Unable to write to password file: %s"
 msgstr "lppasswd: no s'ha pogut escriure al fitxer de contrasenyes: %s"
 
-#: systemv/lppasswd.c:446
 #, c-format
 msgid "lppasswd: failed to backup old password file: %s"
 msgstr ""
 "lppasswd: no s'ha pogut fer la còpia de seguretat del fitxer de contrasenyes "
 "antic: %s"
 
-#: systemv/lppasswd.c:458
 #, c-format
 msgid "lppasswd: failed to rename password file: %s"
 msgstr "lppasswd: no s'ha pogut canviar el nom del fitxer de contrasenyes: %s"
 
-#: systemv/lppasswd.c:389
 #, c-format
 msgid "lppasswd: user \"%s\" and group \"%s\" do not exist."
 msgstr "lppaswd: l'usuari «%s» i el grup «%s» no existeixen."
 
-#: systemv/lpstat.c:1039
 #, c-format
 msgid ""
 "lpstat: error - %s environment variable names non-existent destination \"%s"
@@ -6499,139 +5022,112 @@ msgstr ""
 "lpstat: error - la variable d'entorn %s esmenta el destí «%s» que no "
 "existeix."
 
-#: systemv/lpstat.c:970
 #, c-format
 msgid "members of class %s:"
 msgstr "membres de la classe %s:"
 
-#: berkeley/lpq.c:582
 msgid "no entries"
 msgstr "no hi ha cap entrada"
 
-#: systemv/lpstat.c:1043
 msgid "no system default destination"
 msgstr "no hi ha cap destí per defecte"
 
-#: scheduler/ipp.c:5702
 msgid "notify-events not specified."
 msgstr "no s'ha especificat cap notify-events."
 
-#: scheduler/ipp.c:2034 scheduler/ipp.c:5607
 #, c-format
 msgid "notify-recipient-uri URI \"%s\" is already used."
 msgstr "L'URI de notify-recipient-uri «%s» ja s'ha fet servir."
 
-#: scheduler/ipp.c:2024 scheduler/ipp.c:5597
 #, c-format
 msgid "notify-recipient-uri URI \"%s\" uses unknown scheme."
 msgstr "L'URI de notify-recipient-uri «%s» fa servir un esquema desconegut."
 
-#: cups/notify.c:87
 msgid "pending"
 msgstr "pendent"
 
-#: ppdc/ppdc.cxx:113 ppdc/ppdpo.cxx:93
 #, c-format
 msgid "ppdc: Adding include directory \"%s\"."
 msgstr "ppdc: s'afegeix el directori inclòs «%s»."
 
-#: ppdc/ppdpo.cxx:134
 #, c-format
 msgid "ppdc: Adding/updating UI text from %s."
 msgstr "ppdc: s'afegeix/actualitza el text de l'UI des de %s."
 
-#: ppdc/ppdc-source.cxx:410
 #, c-format
 msgid "ppdc: Bad boolean value (%s) on line %d of %s."
 msgstr "ppdc: valor booleà incorrecte (%s) a la línia %d de %s."
 
-#: ppdc/ppdc-import.cxx:264
 #, c-format
 msgid "ppdc: Bad font attribute: %s"
 msgstr "ppdc: l'atribut del tipus de lletra és incorrecte: %s"
 
-#: ppdc/ppdc-source.cxx:1796
 #, c-format
 msgid "ppdc: Bad resolution name \"%s\" on line %d of %s."
 msgstr "ppdc: el nom de resolució «%s» de la línia %d de %s és incorrecte."
 
-#: ppdc/ppdc-source.cxx:1113
 #, c-format
 msgid "ppdc: Bad status keyword %s on line %d of %s."
 msgstr "ppdc: la paraula clau d'estat %s de la línia %d de %s és incorrecta."
 
-#: ppdc/ppdc-source.cxx:2033
 #, c-format
 msgid "ppdc: Bad variable substitution ($%c) on line %d of %s."
 msgstr ""
 "ppdc: la variable de substitució ($%c) de la línia %d de %s és incorrecta."
 
-#: ppdc/ppdc-source.cxx:2719
 #, c-format
 msgid "ppdc: Choice found on line %d of %s with no Option."
 msgstr "ppdc: s'ha trobat una elecció a la línia %d de %s sense cap opció."
 
-#: ppdc/ppdc-source.cxx:1698
 #, c-format
 msgid "ppdc: Duplicate #po for locale %s on line %d of %s."
 msgstr "ppdc: #po duplicat per l'idioma %s a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:932
 #, c-format
 msgid "ppdc: Expected a filter definition on line %d of %s."
 msgstr "ppdc: s'esperava una definició de filtre a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:955
 #, c-format
 msgid "ppdc: Expected a program name on line %d of %s."
 msgstr "ppdc: s'esperava un nom de programa a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:394
 #, c-format
 msgid "ppdc: Expected boolean value on line %d of %s."
 msgstr "ppdc: s'esperava un valor booleà a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:1093
 #, c-format
 msgid "ppdc: Expected charset after Font on line %d of %s."
 msgstr ""
 "ppdc: s'esperava un joc de caràcters després de Font a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:447
 #, c-format
 msgid "ppdc: Expected choice code on line %d of %s."
 msgstr "ppdc: s'esperava un codi d'elecció a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:435
 #, c-format
 msgid "ppdc: Expected choice name/text on line %d of %s."
 msgstr "ppdc: s'esperava un nom/text d'elecció a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:503
 #, c-format
 msgid "ppdc: Expected color order for ColorModel on line %d of %s."
 msgstr ""
 "ppdc: s'esperava un ordre de colors per ColorModel a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:492
 #, c-format
 msgid "ppdc: Expected colorspace for ColorModel on line %d of %s."
 msgstr ""
 "ppdc: s'esperava un espai de colors per ColorModel a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:514
 #, c-format
 msgid "ppdc: Expected compression for ColorModel on line %d of %s."
 msgstr "ppdc: s'esperava una compressió per ColorModel a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:695
 #, c-format
 msgid "ppdc: Expected constraints string for UIConstraints on line %d of %s."
 msgstr ""
 "ppdc: s'esperava una cadena de restriccions per UIConstraints a la línia %d "
 "de %s."
 
-#: ppdc/ppdc-source.cxx:2905
 #, c-format
 msgid ""
 "ppdc: Expected driver type keyword following DriverType on line %d of %s."
@@ -6639,135 +5135,110 @@ msgstr ""
 "ppdc: s'esperava una paraula clau de tipus de controlador després de "
 "DriverType a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:826
 #, c-format
 msgid "ppdc: Expected duplex type after Duplex on line %d of %s."
 msgstr ""
 "ppdc: s'esperava un tipus de dúplex després de Duplex a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:1077
 #, c-format
 msgid "ppdc: Expected encoding after Font on line %d of %s."
 msgstr "ppdc: s'esperava una codificació després de Font a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:1689
 #, c-format
 msgid "ppdc: Expected filename after #po %s on line %d of %s."
 msgstr ""
 "ppdc: s'esperava un nom de fitxer després de #po %s a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:1205
 #, c-format
 msgid "ppdc: Expected group name/text on line %d of %s."
 msgstr "ppdc: s'esperava un nom/text de grup a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:2619
 #, c-format
 msgid "ppdc: Expected include filename on line %d of %s."
 msgstr "ppdc: s'esperava un nom de fitxer d'inclusió a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:1502
 #, c-format
 msgid "ppdc: Expected integer on line %d of %s."
 msgstr "ppdc: s'esperava un enter a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:1681
 #, c-format
 msgid "ppdc: Expected locale after #po on line %d of %s."
 msgstr "ppdc: s'esperava un idioma després de #po a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:353
 #, c-format
 msgid "ppdc: Expected name after %s on line %d of %s."
 msgstr "ppdc: s'esperava un nom després de %s a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:3277
 #, c-format
 msgid "ppdc: Expected name after FileName on line %d of %s."
 msgstr "ppdc: s'esperava un nom després de FileName a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:1058
 #, c-format
 msgid "ppdc: Expected name after Font on line %d of %s."
 msgstr "ppdc: s'esperava un nom després de Font a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:3108
 #, c-format
 msgid "ppdc: Expected name after Manufacturer on line %d of %s."
 msgstr "ppdc: s'esperava un nom després de Manufacturer a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:3141
 #, c-format
 msgid "ppdc: Expected name after MediaSize on line %d of %s."
 msgstr "ppdc: s'esperava un nom després de MediaSize a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:3231
 #, c-format
 msgid "ppdc: Expected name after ModelName on line %d of %s."
 msgstr "ppdc: s'esperava un nom després de ModelName a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:3294
 #, c-format
 msgid "ppdc: Expected name after PCFileName on line %d of %s."
 msgstr "ppdc: s'esperava un nom després de PCFileName a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:1156
 #, c-format
 msgid "ppdc: Expected name/text after %s on line %d of %s."
 msgstr "ppdc: s'esperava un nom/text després de %s a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:1245
 #, c-format
 msgid "ppdc: Expected name/text after Installable on line %d of %s."
 msgstr ""
 "ppdc: s'esperava un nom/text després d'Installable a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:1782
 #, c-format
 msgid "ppdc: Expected name/text after Resolution on line %d of %s."
 msgstr ""
 "ppdc: s'esperava un nom/text després de Resolution a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:479
 #, c-format
 msgid "ppdc: Expected name/text combination for ColorModel on line %d of %s."
 msgstr ""
 "ppdc: s'esperava una combinació de nom/text per ColorModel a la línia %d de "
 "%s."
 
-#: ppdc/ppdc-source.cxx:1574
 #, c-format
 msgid "ppdc: Expected option name/text on line %d of %s."
 msgstr "ppdc: s'esperava un nom/text d'opció a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:1608
 #, c-format
 msgid "ppdc: Expected option section on line %d of %s."
 msgstr "ppdc: s'esperava una secció d'opció a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:1586
 #, c-format
 msgid "ppdc: Expected option type on line %d of %s."
 msgstr "ppdc: s'esperava un tipus d'opció a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:1765
 #, c-format
 msgid "ppdc: Expected override field after Resolution on line %d of %s."
 msgstr ""
 "ppdc: s'esperava un camp de substitució després de Resolution a la línia %d "
 "de %s."
 
-#: ppdc/ppdc-catalog.cxx:341 ppdc/ppdc-catalog.cxx:353
 #, c-format
 msgid "ppdc: Expected quoted string on line %d of %s."
-msgstr "ppdc: s'esperava una cadena entre cometes a la línia %d de %s."
+msgstr "ppdc: s'esperava una cadena entre cometes dobles a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:1004
 #, c-format
 msgid "ppdc: Expected real number on line %d of %s."
 msgstr "ppdc: s'esperava un número real a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:572
 #, c-format
 msgid ""
 "ppdc: Expected resolution/mediatype following ColorProfile on line %d of %s."
@@ -6775,7 +5246,6 @@ msgstr ""
 "ppdc: s'esperava una resolució/tipus de mitjà després de ColorProfile a la "
 "línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:1863
 #, c-format
 msgid ""
 "ppdc: Expected resolution/mediatype following SimpleColorProfile on line %d "
@@ -6784,99 +5254,79 @@ msgstr ""
 "ppdc: s'esperava una resolució/tipus de mitjà després de SimpleColorProfile "
 "a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:361
 #, c-format
 msgid "ppdc: Expected selector after %s on line %d of %s."
 msgstr "ppdc: s'esperava un selector després de %s a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:1101
 #, c-format
 msgid "ppdc: Expected status after Font on line %d of %s."
 msgstr "ppdc: s'esperava un estat després de Font a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:2794
 #, c-format
 msgid "ppdc: Expected string after Copyright on line %d of %s."
 msgstr "ppdc: s'esperava una cadena després de Copyright a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:3397
 #, c-format
 msgid "ppdc: Expected string after Version on line %d of %s."
 msgstr "ppdc: s'esperava una cadena després de Version a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:728
 #, c-format
 msgid "ppdc: Expected two option names on line %d of %s."
 msgstr "ppdc: s'esperava dos noms d'opció a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:372
 #, c-format
 msgid "ppdc: Expected value after %s on line %d of %s."
 msgstr "ppdc: s'esperava un valor després de %s a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:1085
 #, c-format
 msgid "ppdc: Expected version after Font on line %d of %s."
 msgstr "ppdc: s'esperava una versió després de Font a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:227
 #, c-format
 msgid "ppdc: Invalid #include/#po filename \"%s\"."
 msgstr "ppdc: el nom de fitxer #include/#po «%s» no és vàlid."
 
-#: ppdc/ppdc-source.cxx:972
 #, c-format
 msgid "ppdc: Invalid cost for filter on line %d of %s."
 msgstr "ppdc: el cost del filtre no és vàlid a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:964
 #, c-format
 msgid "ppdc: Invalid empty MIME type for filter on line %d of %s."
 msgstr "ppdc: el tipus MIME buit no és vàlid pel filtre a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:980
 #, c-format
 msgid "ppdc: Invalid empty program name for filter on line %d of %s."
 msgstr ""
 "ppdc: el nom de programa buit no és vàlid pel filtre a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:1628
 #, c-format
 msgid "ppdc: Invalid option section \"%s\" on line %d of %s."
 msgstr "ppdc: la secció d'opció «%s» no és vàlida a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:1600
 #, c-format
 msgid "ppdc: Invalid option type \"%s\" on line %d of %s."
 msgstr "ppdc: el tipus d'opció «%s» no és vàlid a la línia %d de %s."
 
-#: ppdc/ppdc.cxx:251 ppdc/ppdpo.cxx:123
 #, c-format
 msgid "ppdc: Loading driver information file \"%s\"."
 msgstr "ppdc: s'està carregant el fitxer d'informació del controlador «%s»."
 
-#: ppdc/ppdc.cxx:187
 #, c-format
 msgid "ppdc: Loading messages for locale \"%s\"."
 msgstr "ppdc: s'està carregant l'idioma «%s»."
 
-#: ppdc/ppdc.cxx:126
 #, c-format
 msgid "ppdc: Loading messages from \"%s\"."
 msgstr "ppdc: s'està carregant els missatges des de «%s»."
 
-#: ppdc/ppdc-source.cxx:2412 ppdc/ppdc-source.cxx:2644
 #, c-format
 msgid "ppdc: Missing #endif at end of \"%s\"."
 msgstr "ppdc: falta un #endif al final de «%s»."
 
-#: ppdc/ppdc-source.cxx:2513 ppdc/ppdc-source.cxx:2548
-#: ppdc/ppdc-source.cxx:2578
 #, c-format
 msgid "ppdc: Missing #if on line %d of %s."
 msgstr "ppdc: falta un #if a la línia %d de %s."
 
-#: ppdc/ppdc-catalog.cxx:418
 #, c-format
 msgid ""
 "ppdc: Need a msgid line before any translation strings on line %d of %s."
@@ -6884,117 +5334,93 @@ msgstr ""
 "oodc: es necessita un msgid abans de la cadena per traduir a la línia %d de "
 "%s."
 
-#: ppdc/ppdc-driver.cxx:730
 #, c-format
 msgid "ppdc: No message catalog provided for locale %s."
 msgstr "ppdc: no s'ha donat el catàleg de missatges per l'idioma %s."
 
-#: ppdc/ppdc-source.cxx:1651 ppdc/ppdc-source.cxx:2882
-#: ppdc/ppdc-source.cxx:2968 ppdc/ppdc-source.cxx:3061
-#: ppdc/ppdc-source.cxx:3194 ppdc/ppdc-source.cxx:3327
 #, c-format
 msgid "ppdc: Option %s defined in two different groups on line %d of %s."
 msgstr ""
-"ppdc: la opció %s està definida a dos grups diferents a la línia %d de %s."
+"ppdc: l'opció %s està definida a dos grups diferents a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:1644
 #, c-format
 msgid "ppdc: Option %s redefined with a different type on line %d of %s."
 msgstr ""
-"ppdc: la opció %s està redefinida amb un tipus diferent a la línia %d de %s."
+"ppdc: l'opció %s està redefinida amb un tipus diferent a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:705
 #, c-format
 msgid "ppdc: Option constraint must *name on line %d of %s."
-msgstr "ppdc: la opció de restricció ha d'incloure *nom a la línia %d de %s."
+msgstr "ppdc: l'opció de restricció ha d'incloure *nom a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:2495
 #, c-format
 msgid "ppdc: Too many nested #if's on line %d of %s."
 msgstr "ppdc: hi ha massa #if imbricats a la línia %d de %s."
 
-#: ppdc/ppdc.cxx:374
 #, c-format
 msgid "ppdc: Unable to create PPD file \"%s\" - %s."
 msgstr "ppdc: no s'ha pogut crear el fitxer PPD «%s» - %s."
 
-#: ppdc/ppdc.cxx:266
 #, c-format
 msgid "ppdc: Unable to create output directory %s: %s"
 msgstr "ppdc: no s'ha pogut crear el directori de sortida %s: %s"
 
-#: ppdc/ppdc.cxx:287
 #, c-format
 msgid "ppdc: Unable to create output pipes: %s"
 msgstr "ppdc: no s'ha pogut crear els conductes de sortida: %s"
 
-#: ppdc/ppdc.cxx:303 ppdc/ppdc.cxx:309
 #, c-format
 msgid "ppdc: Unable to execute cupstestppd: %s"
 msgstr "ppdc: no s'ha pogut executar cupstestppd: %s"
 
-#: ppdc/ppdc-source.cxx:1730
 #, c-format
 msgid "ppdc: Unable to find #po file %s on line %d of %s."
 msgstr "ppdc: no s'ha pogut trobar el fitxer #po %s a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:2651
 #, c-format
 msgid "ppdc: Unable to find include file \"%s\" on line %d of %s."
 msgstr ""
 "ppdc: no s'ha pogut trobar el fitxer d'inclusió «%s» a la línia %d de %s."
 
-#: ppdc/ppdc.cxx:198
 #, c-format
 msgid "ppdc: Unable to find localization for \"%s\" - %s"
 msgstr "ppdc: no s'ha pogut trobar la localització de «%s» - %s"
 
-#: ppdc/ppdc.cxx:135
 #, c-format
 msgid "ppdc: Unable to load localization file \"%s\" - %s"
 msgstr "ppdc: no s'ha pogut carregar el fitxer de localització «%s» - %s"
 
-#: ppdc/ppdc-file.cxx:50
 #, c-format
 msgid "ppdc: Unable to open %s: %s"
 msgstr "ppdc: no s'ha pogut obrir %s: %s"
 
-#: ppdc/ppdc-source.cxx:2054
 #, c-format
 msgid "ppdc: Undefined variable (%s) on line %d of %s."
 msgstr "ppdc: la variable (%s) de la línia %d de %s no està definida."
 
-#: ppdc/ppdc-catalog.cxx:435
 #, c-format
 msgid "ppdc: Unexpected text on line %d of %s."
 msgstr "ppdc: hi ha un text inesperat a la línia %d de %s."
 
-#: ppdc/ppdc-source.cxx:2924
 #, c-format
 msgid "ppdc: Unknown driver type %s on line %d of %s."
 msgstr "ppdc: el tipus de controlador %s de la línia %d de %s no és conegut."
 
-#: ppdc/ppdc-source.cxx:906
 #, c-format
 msgid "ppdc: Unknown duplex type \"%s\" on line %d of %s."
 msgstr "ppdc: el tipus de dúplex «%s» de la línia %d de %s no és conegut."
 
-#: ppdc/ppdc-source.cxx:3154
 #, c-format
 msgid "ppdc: Unknown media size \"%s\" on line %d of %s."
 msgstr "ppdc: la mida del mitjà «%s» de la línia %d de %s no és coneguda."
 
-#: ppdc/ppdc-catalog.cxx:463
 #, c-format
 msgid "ppdc: Unknown message catalog format for \"%s\"."
 msgstr "ppdc: el format del catàleg de missatges de «%s» no és conegut."
 
-#: ppdc/ppdc-source.cxx:3408
 #, c-format
 msgid "ppdc: Unknown token \"%s\" seen on line %d of %s."
 msgstr "ppdc: el testimoni «%s» de la línia %d de %s no és conegut."
 
-#: ppdc/ppdc-source.cxx:1014
 #, c-format
 msgid ""
 "ppdc: Unknown trailing characters in real number \"%s\" on line %d of %s."
@@ -7002,125 +5428,99 @@ msgstr ""
 "ppdc: els caràcters finals del número real «%s» de la línia %d de %s no són "
 "coneguts."
 
-#: ppdc/ppdc-source.cxx:2164
 #, c-format
 msgid "ppdc: Unterminated string starting with %c on line %d of %s."
 msgstr ""
 "ppdc: la cadena que comença per %c de la línia %d de %s no està acabada."
 
-#: ppdc/ppdc.cxx:365
 #, c-format
 msgid "ppdc: Warning - overlapping filename \"%s\"."
-msgstr "ppdc: avís - es superposa el nom del fitxer «%s»."
+msgstr "ppdc: avís - se superposa el nom del fitxer «%s»."
 
-#: ppdc/ppdc.cxx:380
 #, c-format
 msgid "ppdc: Writing %s."
 msgstr "ppdc: s'escriu %s."
 
-#: ppdc/ppdc.cxx:148
 #, c-format
 msgid "ppdc: Writing PPD files to directory \"%s\"."
 msgstr "ppdc: s'escriuen els fitxers PPD a la carpeta «%s»."
 
-#: ppdc/ppdmerge.cxx:136
 #, c-format
 msgid "ppdmerge: Bad LanguageVersion \"%s\" in %s."
 msgstr "ppdmerge: LanguageVersion «%s» incorrecte a %s."
 
-#: ppdc/ppdmerge.cxx:176
 #, c-format
 msgid "ppdmerge: Ignoring PPD file %s."
-msgstr "ppdmerge: el fitxer PPD %s s'ignora."
+msgstr "ppdmerge: s'ignora el fitxer PPD %s."
 
-#: ppdc/ppdmerge.cxx:160
 #, c-format
 msgid "ppdmerge: Unable to backup %s to %s - %s"
 msgstr "ppdmerge: no s'ha pogut fer la còpia de seguretat %s a %s- %s"
 
-#: systemv/lpstat.c:1784
 #, c-format
 msgid "printer %s disabled since %s -"
 msgstr "la impressora %s està deshabilitada des de %s -"
 
-#: systemv/lpstat.c:1773
 #, c-format
 msgid "printer %s is idle.  enabled since %s"
 msgstr "la impressora %s està inactiva. Està activada des de %s"
 
-#: systemv/lpstat.c:1778
 #, c-format
 msgid "printer %s now printing %s-%d.  enabled since %s"
 msgstr "la impressora %s està imprimint %s-%d. Està habilitada des de %s"
 
-#: systemv/lpstat.c:1909
 #, c-format
 msgid "printer %s/%s disabled since %s -"
 msgstr "la impressora %s/%s està deshabilitada des de %s -"
 
-#: systemv/lpstat.c:1895
 #, c-format
 msgid "printer %s/%s is idle.  enabled since %s"
 msgstr "la impressora %s/%s està inactiva. Està activada des de %s"
 
-#: systemv/lpstat.c:1902
 #, c-format
 msgid "printer %s/%s now printing %s-%d.  enabled since %s"
 msgstr "la impressora %s/%s està imprimint %s-%d. Està activada des de %s"
 
-#: cups/notify.c:93 cups/notify.c:134
 msgid "processing"
 msgstr "s'està processant"
 
-#: systemv/lp.c:644
 #, c-format
 msgid "request id is %s-%d (%d file(s))"
 msgstr "l'identificador de la petició és %s-%d (%d fitxer(s))"
 
-#: cups/snmp.c:1020
 msgid "request-id uses indefinite length"
 msgstr "la request-id fa servir una longitud indefinida"
 
-#: systemv/lpstat.c:2048
 msgid "scheduler is not running"
 msgstr "el programador de tasques no s'està executant"
 
-#: systemv/lpstat.c:2044
 msgid "scheduler is running"
 msgstr "el programador de tasques s'està executant"
 
-#: cups/adminutil.c:2159
 #, c-format
 msgid "stat of %s failed: %s"
 msgstr "stat de %s ha fallat: %s"
 
-#: berkeley/lpc.c:211
 msgid "status\t\tShow status of daemon and queue."
 msgstr "status\t\tmostra l'estat del dimoni i la cua."
 
-#: cups/notify.c:96 cups/notify.c:137
 msgid "stopped"
 msgstr "aturat"
 
-#: systemv/lpstat.c:1017
 #, c-format
 msgid "system default destination: %s"
 msgstr "destí per defecte del sistema: %s"
 
-#: systemv/lpstat.c:1014
 #, c-format
 msgid "system default destination: %s/%s"
 msgstr "destí per defecte del sistema: %s/%s"
 
-#: cups/notify.c:108 cups/notify.c:140
 msgid "unknown"
 msgstr "desconegut"
 
-#: cups/notify.c:117
 msgid "untitled"
 msgstr "sense títol"
 
-#: cups/snmp.c:1045
 msgid "variable-bindings uses indefinite length"
 msgstr "La variable-bindings fa servir una longitud indefinida"
 
@@ -7209,6 +5609,13 @@ msgstr "La variable-bindings fa servir una longitud indefinida"
 #~ msgid "File Folder - 9/16 x 3 7/16\""
 #~ msgstr "Carpeta d'arxivador: 9/16 x 3 7/16\""
 
+#~ msgid ""
+#~ "File device URIs have been disabled. To enable, see the FileDevice "
+#~ "directive in \"%s/cupsd.conf\"."
+#~ msgstr ""
+#~ "S'han deshabilitat els URIs dels dispositius de fitxers. Per habilitar-"
+#~ "los, vegeu la directriu FileDevice a «%s/cupsd.conf»."
+
 #~ msgid "Hanging Folder - 9/16 x 2\""
 #~ msgstr "Carpeta per penjar: 9/16 x 2\""
 
diff --git a/locale/cups_cs.po b/locale/cups_cs.po
new file mode 100644
index 00000000..d689543a
--- /dev/null
+++ b/locale/cups_cs.po
@@ -0,0 +1,6721 @@
+#
+# "$Id$"
+#
+#   Czech message catalog for CUPS.
+#
+#   Copyright 2007-2012 by Apple Inc.
+#   Copyright 2005-2007 by Easy Software Products.
+#
+#   These coded instructions, statements, and computer programs are the
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   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/".
+#
+
+#
+# Notes for Translators:
+#
+# The "checkpo" program located in the "locale" source directory can be used
+# to verify that your translations do not introduce formatting errors or other
+# problems.  Run with:
+#
+#    cd locale
+#    ./checkpo cups_LL.po
+#
+# where "LL" is your locale.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: CUPS 1.6\n"
+"Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
+"POT-Creation-Date: 2012-05-23 16:24-0700\n"
+"PO-Revision-Date: 2012-09-14 10:26+0100\n"
+"Last-Translator: Jan Bartos <jan.bartos@madeta.cz>\n"
+"Language-Team: Czech\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: systemv/lpstat.c:1876 systemv/lpstat.c:2001
+msgid "\t\t(all)"
+msgstr ""
+
+#: systemv/lpstat.c:1879 systemv/lpstat.c:1882 systemv/lpstat.c:2004
+#: systemv/lpstat.c:2007
+msgid "\t\t(none)"
+msgstr ""
+
+#: berkeley/lpc.c:434
+#, c-format
+msgid "\t%d entries"
+msgstr ""
+
+#: systemv/lpstat.c:756 systemv/lpstat.c:772
+#, c-format
+msgid "\t%s"
+msgstr ""
+
+#: systemv/lpstat.c:1857 systemv/lpstat.c:1982
+msgid "\tAfter fault: continue"
+msgstr ""
+
+#: systemv/lpstat.c:1481 systemv/lpstat.c:1826 systemv/lpstat.c:1952
+#, c-format
+msgid "\tAlerts: %s"
+msgstr ""
+
+#: systemv/lpstat.c:1880 systemv/lpstat.c:2005
+msgid "\tBanner required"
+msgstr ""
+
+#: systemv/lpstat.c:1881 systemv/lpstat.c:2006
+msgid "\tCharset sets:"
+msgstr ""
+
+#: systemv/lpstat.c:1845 systemv/lpstat.c:1970
+msgid "\tConnection: direct"
+msgstr ""
+
+#: systemv/lpstat.c:1836 systemv/lpstat.c:1962
+msgid "\tConnection: remote"
+msgstr ""
+
+#: systemv/lpstat.c:1800 systemv/lpstat.c:1926
+msgid "\tContent types: any"
+msgstr ""
+
+#: systemv/lpstat.c:1884 systemv/lpstat.c:2009
+msgid "\tDefault page size:"
+msgstr ""
+
+#: systemv/lpstat.c:1883 systemv/lpstat.c:2008
+msgid "\tDefault pitch:"
+msgstr ""
+
+#: systemv/lpstat.c:1885 systemv/lpstat.c:2010
+msgid "\tDefault port settings:"
+msgstr ""
+
+#: systemv/lpstat.c:1806 systemv/lpstat.c:1932
+#, c-format
+msgid "\tDescription: %s"
+msgstr ""
+
+#: systemv/lpstat.c:1799 systemv/lpstat.c:1925
+msgid "\tForm mounted:"
+msgstr ""
+
+#: systemv/lpstat.c:1878 systemv/lpstat.c:2003
+msgid "\tForms allowed:"
+msgstr ""
+
+#: systemv/lpstat.c:1840 systemv/lpstat.c:1966
+#, c-format
+msgid "\tInterface: %s.ppd"
+msgstr ""
+
+#: systemv/lpstat.c:1849 systemv/lpstat.c:1974
+#, c-format
+msgid "\tInterface: %s/interfaces/%s"
+msgstr ""
+
+#: systemv/lpstat.c:1853 systemv/lpstat.c:1978
+#, c-format
+msgid "\tInterface: %s/ppd/%s.ppd"
+msgstr ""
+
+#: systemv/lpstat.c:1831 systemv/lpstat.c:1957
+#, c-format
+msgid "\tLocation: %s"
+msgstr ""
+
+#: systemv/lpstat.c:1856 systemv/lpstat.c:1981
+msgid "\tOn fault: no alert"
+msgstr ""
+
+#: systemv/lpstat.c:1801 systemv/lpstat.c:1927
+msgid "\tPrinter types: unknown"
+msgstr ""
+
+#: systemv/lpstat.c:1462
+#, c-format
+msgid "\tStatus: %s"
+msgstr ""
+
+#: systemv/lpstat.c:1861 systemv/lpstat.c:1875 systemv/lpstat.c:1986
+#: systemv/lpstat.c:2000
+msgid "\tUsers allowed:"
+msgstr ""
+
+#: systemv/lpstat.c:1868 systemv/lpstat.c:1993
+msgid "\tUsers denied:"
+msgstr ""
+
+#: berkeley/lpc.c:436
+msgid "\tdaemon present"
+msgstr ""
+
+#: berkeley/lpc.c:432
+msgid "\tno entries"
+msgstr ""
+
+#: berkeley/lpc.c:404 berkeley/lpc.c:416
+#, c-format
+msgid "\tprinter is on device '%s' speed -1"
+msgstr ""
+
+#: berkeley/lpc.c:429
+msgid "\tprinting is disabled"
+msgstr ""
+
+#: berkeley/lpc.c:427
+msgid "\tprinting is enabled"
+msgstr ""
+
+#: systemv/lpstat.c:1484
+#, c-format
+msgid "\tqueued for %s"
+msgstr ""
+
+#: berkeley/lpc.c:424
+msgid "\tqueuing is disabled"
+msgstr ""
+
+#: berkeley/lpc.c:422
+msgid "\tqueuing is enabled"
+msgstr ""
+
+#: systemv/lpstat.c:1792 systemv/lpstat.c:1918
+msgid "\treason unknown"
+msgstr ""
+
+#: systemv/cupstestppd.c:454
+msgid ""
+"\n"
+"    DETAILED CONFORMANCE TEST RESULTS"
+msgstr ""
+
+#: systemv/cupstestppd.c:3800
+msgid "                          Ignore specific warnings."
+msgstr ""
+
+#: systemv/cupstestppd.c:3804
+msgid "                          Issue warnings instead of errors."
+msgstr ""
+
+#: systemv/cupstestppd.c:410 systemv/cupstestppd.c:415
+msgid "                REF: Page 15, section 3.1."
+msgstr ""
+
+#: systemv/cupstestppd.c:405
+msgid "                REF: Page 15, section 3.2."
+msgstr ""
+
+#: systemv/cupstestppd.c:425
+msgid "                REF: Page 19, section 3.3."
+msgstr ""
+
+#: systemv/cupstestppd.c:378
+msgid "                REF: Page 20, section 3.4."
+msgstr ""
+
+#: systemv/cupstestppd.c:430
+msgid "                REF: Page 27, section 3.5."
+msgstr ""
+
+#: systemv/cupstestppd.c:373
+msgid "                REF: Page 42, section 5.2."
+msgstr ""
+
+#: systemv/cupstestppd.c:420
+msgid "                REF: Pages 16-17, section 3.2."
+msgstr ""
+
+#: systemv/cupstestppd.c:390
+msgid "                REF: Pages 42-45, section 5.2."
+msgstr ""
+
+#: systemv/cupstestppd.c:384
+msgid "                REF: Pages 45-46, section 5.2."
+msgstr ""
+
+#: systemv/cupstestppd.c:395
+msgid "                REF: Pages 48-49, section 5.2."
+msgstr ""
+
+#: systemv/cupstestppd.c:400
+msgid "                REF: Pages 52-54, section 5.2."
+msgstr ""
+
+#: berkeley/lpq.c:554
+#, c-format
+msgid "        %-39.39s %.0f bytes"
+msgstr ""
+
+#: systemv/cupstestppd.c:589
+#, c-format
+msgid "        PASS    Default%s"
+msgstr ""
+
+#: systemv/cupstestppd.c:524
+msgid "        PASS    DefaultImageableArea"
+msgstr ""
+
+#: systemv/cupstestppd.c:558
+msgid "        PASS    DefaultPaperDimension"
+msgstr ""
+
+#: systemv/cupstestppd.c:631
+msgid "        PASS    FileVersion"
+msgstr ""
+
+#: systemv/cupstestppd.c:675
+msgid "        PASS    FormatVersion"
+msgstr ""
+
+#: systemv/cupstestppd.c:695
+msgid "        PASS    LanguageEncoding"
+msgstr ""
+
+#: systemv/cupstestppd.c:715
+msgid "        PASS    LanguageVersion"
+msgstr ""
+
+#: systemv/cupstestppd.c:769
+msgid "        PASS    Manufacturer"
+msgstr ""
+
+#: systemv/cupstestppd.c:809
+msgid "        PASS    ModelName"
+msgstr ""
+
+#: systemv/cupstestppd.c:829
+msgid "        PASS    NickName"
+msgstr ""
+
+#: systemv/cupstestppd.c:889
+msgid "        PASS    PCFileName"
+msgstr ""
+
+#: systemv/cupstestppd.c:964
+msgid "        PASS    PSVersion"
+msgstr ""
+
+#: systemv/cupstestppd.c:869
+msgid "        PASS    PageRegion"
+msgstr ""
+
+#: systemv/cupstestppd.c:849
+msgid "        PASS    PageSize"
+msgstr ""
+
+#: systemv/cupstestppd.c:924
+msgid "        PASS    Product"
+msgstr ""
+
+#: systemv/cupstestppd.c:999
+msgid "        PASS    ShortNickName"
+msgstr ""
+
+#: systemv/cupstestppd.c:1374
+#, c-format
+msgid "        WARN    %s has no corresponding options."
+msgstr ""
+
+#: systemv/cupstestppd.c:1486
+#, c-format
+msgid ""
+"        WARN    %s shares a common prefix with %s\n"
+"                REF: Page 15, section 3.2."
+msgstr ""
+
+#: systemv/cupstestppd.c:1345
+#, c-format
+msgid ""
+"        WARN    Duplex option keyword %s may not work as expected and should be named Duplex.\n"
+"                REF: Page 122, section 5.17"
+msgstr ""
+
+#: systemv/cupstestppd.c:1744
+msgid "        WARN    File contains a mix of CR, LF, and CR LF line endings."
+msgstr ""
+
+#: systemv/cupstestppd.c:1390
+msgid ""
+"        WARN    LanguageEncoding required by PPD 4.3 spec.\n"
+"                REF: Pages 56-57, section 5.3."
+msgstr ""
+
+#: systemv/cupstestppd.c:1726
+#, c-format
+msgid "        WARN    Line %d only contains whitespace."
+msgstr ""
+
+#: systemv/cupstestppd.c:1398
+msgid ""
+"        WARN    Manufacturer required by PPD 4.3 spec.\n"
+"                REF: Pages 58-59, section 5.3."
+msgstr ""
+
+#: systemv/cupstestppd.c:1749
+msgid "        WARN    Non-Windows PPD files should use lines ending with only LF, not CR LF."
+msgstr ""
+
+#: systemv/cupstestppd.c:1382
+#, c-format
+msgid ""
+"        WARN    Obsolete PPD version %.1f.\n"
+"                REF: Page 42, section 5.2."
+msgstr ""
+
+#: systemv/cupstestppd.c:1413
+msgid ""
+"        WARN    PCFileName longer than 8.3 in violation of PPD spec.\n"
+"                REF: Pages 61-62, section 5.3."
+msgstr ""
+
+#: systemv/cupstestppd.c:1421
+msgid ""
+"        WARN    PCFileName should contain a unique filename.\n"
+"                REF: Pages 61-62, section 5.3."
+msgstr ""
+
+#: systemv/cupstestppd.c:1456
+msgid ""
+"        WARN    Protocols contains PJL but JCL attributes are not set.\n"
+"                REF: Pages 78-79, section 5.7."
+msgstr ""
+
+#: systemv/cupstestppd.c:1447
+msgid ""
+"        WARN    Protocols contains both PJL and BCP; expected TBCP.\n"
+"                REF: Pages 78-79, section 5.7."
+msgstr ""
+
+#: systemv/cupstestppd.c:1430
+msgid ""
+"        WARN    ShortNickName required by PPD 4.3 spec.\n"
+"                REF: Pages 64-65, section 5.3."
+msgstr ""
+
+#: systemv/cupsaddsmb.c:282
+msgid "       cupsaddsmb [options] -a"
+msgstr ""
+
+#: systemv/cupstestdsc.c:427
+msgid "       cupstestdsc [options] -"
+msgstr ""
+
+#: systemv/cupstestppd.c:3795
+msgid "       program | cupstestppd [options] -"
+msgstr ""
+
+#: systemv/cupstestppd.c:3727
+#, c-format
+msgid ""
+"      %s  \"%s %s\" conflicts with \"%s %s\"\n"
+"                (constraint=\"%s %s %s %s\")."
+msgstr ""
+
+#: systemv/cupstestppd.c:2248
+#, c-format
+msgid "      %s  %s %s does not exist."
+msgstr ""
+
+#: systemv/cupstestppd.c:3884
+#, c-format
+msgid "      %s  %s file \"%s\" has the wrong capitalization."
+msgstr ""
+
+#: systemv/cupstestppd.c:2318
+#, c-format
+msgid ""
+"      %s  Bad %s choice %s.\n"
+"                REF: Page 122, section 5.17"
+msgstr ""
+
+#: systemv/cupstestppd.c:3487 systemv/cupstestppd.c:3536
+#: systemv/cupstestppd.c:3575
+#, c-format
+msgid "      %s  Bad UTF-8 \"%s\" translation string for option %s, choice %s."
+msgstr ""
+
+#: systemv/cupstestppd.c:3441
+#, c-format
+msgid "      %s  Bad UTF-8 \"%s\" translation string for option %s."
+msgstr ""
+
+#: systemv/cupstestppd.c:2389
+#, c-format
+msgid "      %s  Bad cupsFilter value \"%s\"."
+msgstr ""
+
+#: systemv/cupstestppd.c:2475
+#, c-format
+msgid "      %s  Bad cupsFilter2 value \"%s\"."
+msgstr ""
+
+#: systemv/cupstestppd.c:2964
+#, c-format
+msgid "      %s  Bad cupsICCProfile %s."
+msgstr ""
+
+#: systemv/cupstestppd.c:2571
+#, c-format
+msgid "      %s  Bad cupsPreFilter value \"%s\"."
+msgstr ""
+
+#: systemv/cupstestppd.c:1822
+#, c-format
+msgid "      %s  Bad cupsUIConstraints %s: \"%s\""
+msgstr ""
+
+#: systemv/cupstestppd.c:3391
+#, c-format
+msgid "      %s  Bad language \"%s\"."
+msgstr ""
+
+#: systemv/cupstestppd.c:2433 systemv/cupstestppd.c:2529
+#: systemv/cupstestppd.c:2615 systemv/cupstestppd.c:2673
+#: systemv/cupstestppd.c:2728 systemv/cupstestppd.c:2783
+#: systemv/cupstestppd.c:2838 systemv/cupstestppd.c:2891
+#: systemv/cupstestppd.c:3013
+#, c-format
+msgid "      %s  Bad permissions on %s file \"%s\"."
+msgstr ""
+
+#: systemv/cupstestppd.c:2373 systemv/cupstestppd.c:2459
+#: systemv/cupstestppd.c:2555 systemv/cupstestppd.c:2642
+#: systemv/cupstestppd.c:2697 systemv/cupstestppd.c:2752
+#: systemv/cupstestppd.c:2807 systemv/cupstestppd.c:2862
+#, c-format
+msgid "      %s  Bad spelling of %s - should be %s."
+msgstr ""
+
+#: systemv/cupstestppd.c:2907
+#, c-format
+msgid "      %s  Cannot provide both APScanAppPath and APScanAppBundleID."
+msgstr ""
+
+#: systemv/cupstestppd.c:2205
+#, c-format
+msgid "      %s  Default choices conflicting."
+msgstr ""
+
+#: systemv/cupstestppd.c:1803
+#, c-format
+msgid "      %s  Empty cupsUIConstraints %s"
+msgstr ""
+
+#: systemv/cupstestppd.c:3519 systemv/cupstestppd.c:3559
+#, c-format
+msgid "      %s  Missing \"%s\" translation string for option %s, choice %s."
+msgstr ""
+
+#: systemv/cupstestppd.c:3427
+#, c-format
+msgid "      %s  Missing \"%s\" translation string for option %s."
+msgstr ""
+
+#: systemv/cupstestppd.c:2418 systemv/cupstestppd.c:2514
+#: systemv/cupstestppd.c:2600 systemv/cupstestppd.c:2658
+#: systemv/cupstestppd.c:2713 systemv/cupstestppd.c:2768
+#: systemv/cupstestppd.c:2823 systemv/cupstestppd.c:2875
+#: systemv/cupstestppd.c:2998
+#, c-format
+msgid "      %s  Missing %s file \"%s\"."
+msgstr ""
+
+#: systemv/cupstestppd.c:3121
+#, c-format
+msgid ""
+"      %s  Missing REQUIRED PageRegion option.\n"
+"                REF: Page 100, section 5.14."
+msgstr ""
+
+#: systemv/cupstestppd.c:3106
+#, c-format
+msgid ""
+"      %s  Missing REQUIRED PageSize option.\n"
+"                REF: Page 99, section 5.14."
+msgstr ""
+
+#: systemv/cupstestppd.c:2013 systemv/cupstestppd.c:2054
+#, c-format
+msgid "      %s  Missing choice *%s %s in UIConstraints \"*%s %s *%s %s\"."
+msgstr ""
+
+#: systemv/cupstestppd.c:1908
+#, c-format
+msgid "      %s  Missing choice *%s %s in cupsUIConstraints %s: \"%s\""
+msgstr ""
+
+#: systemv/cupstestppd.c:1840
+#, c-format
+msgid "      %s  Missing cupsUIResolver %s"
+msgstr ""
+
+#: systemv/cupstestppd.c:1999 systemv/cupstestppd.c:2040
+#, c-format
+msgid "      %s  Missing option %s in UIConstraints \"*%s %s *%s %s\"."
+msgstr ""
+
+#: systemv/cupstestppd.c:1892
+#, c-format
+msgid "      %s  Missing option %s in cupsUIConstraints %s: \"%s\""
+msgstr ""
+
+#: systemv/cupstestppd.c:3613
+#, c-format
+msgid "      %s  No base translation \"%s\" is included in file."
+msgstr ""
+
+#: systemv/cupstestppd.c:2294
+#, c-format
+msgid ""
+"      %s  REQUIRED %s does not define choice None.\n"
+"                REF: Page 122, section 5.17"
+msgstr ""
+
+#: systemv/cupstestppd.c:3180 systemv/cupstestppd.c:3194
+#, c-format
+msgid "      %s  Size \"%s\" defined for %s but not for %s."
+msgstr ""
+
+#: systemv/cupstestppd.c:3160
+#, c-format
+msgid "      %s  Size \"%s\" has unexpected dimensions (%gx%g)."
+msgstr ""
+
+#: systemv/cupstestppd.c:3332
+#, c-format
+msgid "      %s  Size \"%s\" should be \"%s\"."
+msgstr ""
+
+#: systemv/cupstestppd.c:3292
+#, c-format
+msgid "      %s  Size \"%s\" should be the Adobe standard name \"%s\"."
+msgstr ""
+
+#: systemv/cupstestppd.c:3041
+#, c-format
+msgid "      %s  cupsICCProfile %s hash value collides with %s."
+msgstr ""
+
+#: systemv/cupstestppd.c:1963
+#, c-format
+msgid "      %s  cupsUIResolver %s causes a loop."
+msgstr ""
+
+#: systemv/cupstestppd.c:1945
+#, c-format
+msgid "      %s  cupsUIResolver %s does not list at least two different options."
+msgstr ""
+
+#: systemv/cupstestppd.c:1168
+#, c-format
+msgid ""
+"      **FAIL**  %s must be 1284DeviceID\n"
+"                REF: Page 72, section 5.5"
+msgstr ""
+
+#: systemv/cupstestppd.c:580
+#, c-format
+msgid ""
+"      **FAIL**  Bad Default%s %s\n"
+"                REF: Page 40, section 4.5."
+msgstr ""
+
+#: systemv/cupstestppd.c:514
+#, c-format
+msgid ""
+"      **FAIL**  Bad DefaultImageableArea %s\n"
+"                REF: Page 102, section 5.15."
+msgstr ""
+
+#: systemv/cupstestppd.c:550
+#, c-format
+msgid ""
+"      **FAIL**  Bad DefaultPaperDimension %s\n"
+"                REF: Page 103, section 5.15."
+msgstr ""
+
+#: systemv/cupstestppd.c:623
+#, c-format
+msgid ""
+"      **FAIL**  Bad FileVersion \"%s\"\n"
+"                REF: Page 56, section 5.3."
+msgstr ""
+
+#: systemv/cupstestppd.c:667
+#, c-format
+msgid ""
+"      **FAIL**  Bad FormatVersion \"%s\"\n"
+"                REF: Page 56, section 5.3."
+msgstr ""
+
+#: systemv/cupstestppd.c:1025
+msgid ""
+"      **FAIL**  Bad JobPatchFile attribute in file\n"
+"                REF: Page 24, section 3.4."
+msgstr ""
+
+#: systemv/cupstestppd.c:1213
+#, c-format
+msgid "      **FAIL**  Bad LanguageEncoding %s - must be ISOLatin1."
+msgstr ""
+
+#: systemv/cupstestppd.c:1227
+#, c-format
+msgid "      **FAIL**  Bad LanguageVersion %s - must be English."
+msgstr ""
+
+#: systemv/cupstestppd.c:743 systemv/cupstestppd.c:760
+#, c-format
+msgid ""
+"      **FAIL**  Bad Manufacturer (should be \"%s\")\n"
+"                REF: Page 211, table D.1."
+msgstr ""
+
+#: systemv/cupstestppd.c:800
+#, c-format
+msgid ""
+"      **FAIL**  Bad ModelName - \"%c\" not allowed in string.\n"
+"                REF: Pages 59-60, section 5.3."
+msgstr ""
+
+#: systemv/cupstestppd.c:956
+msgid ""
+"      **FAIL**  Bad PSVersion - not \"(string) int\".\n"
+"                REF: Pages 62-64, section 5.3."
+msgstr ""
+
+#: systemv/cupstestppd.c:917
+msgid ""
+"      **FAIL**  Bad Product - not \"(string)\".\n"
+"                REF: Page 62, section 5.3."
+msgstr ""
+
+#: systemv/cupstestppd.c:991
+msgid ""
+"      **FAIL**  Bad ShortNickName - longer than 31 chars.\n"
+"                REF: Pages 64-65, section 5.3."
+msgstr ""
+
+#: systemv/cupstestppd.c:1149
+#, c-format
+msgid ""
+"      **FAIL**  Bad option %s choice %s\n"
+"                REF: Page 84, section 5.9"
+msgstr ""
+
+#: systemv/cupstestppd.c:3754 systemv/cupstestppd.c:3776
+#, c-format
+msgid "      **FAIL**  Default option code cannot be interpreted: %s"
+msgstr ""
+
+#: systemv/cupstestppd.c:1286
+#, c-format
+msgid "      **FAIL**  Default translation string for option %s choice %s contains 8-bit characters."
+msgstr ""
+
+#: systemv/cupstestppd.c:1259
+#, c-format
+msgid "      **FAIL**  Default translation string for option %s contains 8-bit characters."
+msgstr ""
+
+#: systemv/cupstestppd.c:2101
+#, c-format
+msgid "      **FAIL**  Group names %s and %s differ only by case."
+msgstr ""
+
+#: systemv/cupstestppd.c:2146
+#, c-format
+msgid "      **FAIL**  Multiple occurrences of option %s choice name %s."
+msgstr ""
+
+#: systemv/cupstestppd.c:2163
+#, c-format
+msgid "      **FAIL**  Option %s choice names %s and %s differ only by case."
+msgstr ""
+
+#: systemv/cupstestppd.c:2123
+#, c-format
+msgid "      **FAIL**  Option names %s and %s differ only by case."
+msgstr ""
+
+#: systemv/cupstestppd.c:600
+#, c-format
+msgid ""
+"      **FAIL**  REQUIRED Default%s\n"
+"                REF: Page 40, section 4.5."
+msgstr ""
+
+#: systemv/cupstestppd.c:499
+msgid ""
+"      **FAIL**  REQUIRED DefaultImageableArea\n"
+"                REF: Page 102, section 5.15."
+msgstr ""
+
+#: systemv/cupstestppd.c:535
+msgid ""
+"      **FAIL**  REQUIRED DefaultPaperDimension\n"
+"                REF: Page 103, section 5.15."
+msgstr ""
+
+#: systemv/cupstestppd.c:641
+msgid ""
+"      **FAIL**  REQUIRED FileVersion\n"
+"                REF: Page 56, section 5.3."
+msgstr ""
+
+#: systemv/cupstestppd.c:685
+msgid ""
+"      **FAIL**  REQUIRED FormatVersion\n"
+"                REF: Page 56, section 5.3."
+msgstr ""
+
+#: systemv/cupstestppd.c:1076
+#, c-format
+msgid ""
+"      **FAIL**  REQUIRED ImageableArea for PageSize %s\n"
+"                REF: Page 41, section 5.\n"
+"                REF: Page 102, section 5.15."
+msgstr ""
+
+#: systemv/cupstestppd.c:705
+msgid ""
+"      **FAIL**  REQUIRED LanguageEncoding\n"
+"                REF: Pages 56-57, section 5.3."
+msgstr ""
+
+#: systemv/cupstestppd.c:725
+msgid ""
+"      **FAIL**  REQUIRED LanguageVersion\n"
+"                REF: Pages 57-58, section 5.3."
+msgstr ""
+
+#: systemv/cupstestppd.c:779
+msgid ""
+"      **FAIL**  REQUIRED Manufacturer\n"
+"                REF: Pages 58-59, section 5.3."
+msgstr ""
+
+#: systemv/cupstestppd.c:819
+msgid ""
+"      **FAIL**  REQUIRED ModelName\n"
+"                REF: Pages 59-60, section 5.3."
+msgstr ""
+
+#: systemv/cupstestppd.c:839
+msgid ""
+"      **FAIL**  REQUIRED NickName\n"
+"                REF: Page 60, section 5.3."
+msgstr ""
+
+#: systemv/cupstestppd.c:899
+msgid ""
+"      **FAIL**  REQUIRED PCFileName\n"
+"                REF: Pages 61-62, section 5.3."
+msgstr ""
+
+#: systemv/cupstestppd.c:974
+msgid ""
+"      **FAIL**  REQUIRED PSVersion\n"
+"                REF: Pages 62-64, section 5.3."
+msgstr ""
+
+#: systemv/cupstestppd.c:879
+msgid ""
+"      **FAIL**  REQUIRED PageRegion\n"
+"                REF: Page 100, section 5.14."
+msgstr ""
+
+#: systemv/cupstestppd.c:1045
+msgid ""
+"      **FAIL**  REQUIRED PageSize\n"
+"                REF: Page 41, section 5.\n"
+"                REF: Page 99, section 5.14."
+msgstr ""
+
+#: systemv/cupstestppd.c:859
+msgid ""
+"      **FAIL**  REQUIRED PageSize\n"
+"                REF: Pages 99-100, section 5.14."
+msgstr ""
+
+#: systemv/cupstestppd.c:1098
+#, c-format
+msgid ""
+"      **FAIL**  REQUIRED PaperDimension for PageSize %s\n"
+"                REF: Page 41, section 5.\n"
+"                REF: Page 103, section 5.15."
+msgstr ""
+
+#: systemv/cupstestppd.c:934
+msgid ""
+"      **FAIL**  REQUIRED Product\n"
+"                REF: Page 62, section 5.3."
+msgstr ""
+
+#: systemv/cupstestppd.c:1009
+msgid ""
+"      **FAIL**  REQUIRED ShortNickName\n"
+"                REF: Page 64-65, section 5.3."
+msgstr ""
+
+#: systemv/cupstestppd.c:334 systemv/cupstestppd.c:353
+#: systemv/cupstestppd.c:365
+#, c-format
+msgid "      **FAIL**  Unable to open PPD file - %s on line %d."
+msgstr ""
+
+#: systemv/cupstestppd.c:1498
+#, c-format
+msgid "    %d ERRORS FOUND"
+msgstr ""
+
+#: systemv/cupstestdsc.c:431
+msgid "    -h       Show program usage"
+msgstr ""
+
+#: systemv/cupstestdsc.c:234 systemv/cupstestdsc.c:276
+#, c-format
+msgid ""
+"    Bad %%%%BoundingBox: on line %d.\n"
+"        REF: Page 39, %%%%BoundingBox:"
+msgstr ""
+
+#: systemv/cupstestdsc.c:305
+#, c-format
+msgid ""
+"    Bad %%%%Page: on line %d.\n"
+"        REF: Page 53, %%%%Page:"
+msgstr ""
+
+#: systemv/cupstestdsc.c:218 systemv/cupstestdsc.c:258
+#, c-format
+msgid ""
+"    Bad %%%%Pages: on line %d.\n"
+"        REF: Page 43, %%%%Pages:"
+msgstr ""
+
+#: systemv/cupstestdsc.c:176
+#, c-format
+msgid ""
+"    Line %d is longer than 255 characters (%d).\n"
+"        REF: Page 25, Line Length"
+msgstr ""
+
+#: systemv/cupstestdsc.c:192
+msgid ""
+"    Missing %!PS-Adobe-3.0 on first line.\n"
+"        REF: Page 17, 3.1 Conforming Documents"
+msgstr ""
+
+#: systemv/cupstestdsc.c:362
+#, c-format
+msgid "    Missing %%EndComments comment.        REF: Page 41, %%EndComments"
+msgstr ""
+
+#: systemv/cupstestdsc.c:342
+#, c-format
+msgid ""
+"    Missing or bad %%BoundingBox: comment.\n"
+"        REF: Page 39, %%BoundingBox:"
+msgstr ""
+
+#: systemv/cupstestdsc.c:372
+#, c-format
+msgid ""
+"    Missing or bad %%Page: comments.\n"
+"        REF: Page 53, %%Page:"
+msgstr ""
+
+#: systemv/cupstestdsc.c:352
+#, c-format
+msgid ""
+"    Missing or bad %%Pages: comment.\n"
+"        REF: Page 43, %%Pages:"
+msgstr ""
+
+#: systemv/cupstestppd.c:1500
+msgid "    NO ERRORS FOUND"
+msgstr ""
+
+#: systemv/cupstestdsc.c:395
+#, c-format
+msgid "    Saw %d lines that exceeded 255 characters."
+msgstr ""
+
+#: systemv/cupstestdsc.c:390
+#, c-format
+msgid "    Too many %%BeginDocument comments."
+msgstr ""
+
+#: systemv/cupstestdsc.c:382
+#, c-format
+msgid "    Too many %%EndDocument comments."
+msgstr ""
+
+#: systemv/cupstestdsc.c:402
+msgid "    Warning: file contains binary data."
+msgstr ""
+
+#: systemv/cupstestdsc.c:410
+#, c-format
+msgid "    Warning: no %%EndComments comment in file."
+msgstr ""
+
+#: systemv/cupstestdsc.c:406
+#, c-format
+msgid "    Warning: obsolete DSC version %.1f in file."
+msgstr ""
+
+#: systemv/cupsctl.c:210
+msgid "  --[no-]debug-logging    Turn debug logging on/off."
+msgstr ""
+
+#: systemv/cupsctl.c:212
+msgid "  --[no-]remote-admin     Turn remote administration on/off."
+msgstr ""
+
+#: systemv/cupsctl.c:214
+msgid "  --[no-]remote-any       Allow/prevent access from the Internet."
+msgstr ""
+
+#: systemv/cupsctl.c:216
+msgid "  --[no-]share-printers   Turn printer sharing on/off."
+msgstr ""
+
+#: systemv/cupsctl.c:218
+msgid "  --[no-]user-cancel-any  Allow/prevent users to cancel any job."
+msgstr ""
+
+#: ppdc/ppdc.cxx:455
+msgid "  --cr                    End lines with CR (Mac OS 9)."
+msgstr ""
+
+#: ppdc/ppdc.cxx:457
+msgid "  --crlf                  End lines with CR + LF (Windows)."
+msgstr ""
+
+#: ppdc/ppdc.cxx:459
+msgid "  --lf                    End lines with LF (UNIX/Linux/OS X)."
+msgstr ""
+
+#: test/ipptool.c:4404
+msgid "  -4                      Connect using IPv4."
+msgstr ""
+
+#: test/ipptool.c:4405
+msgid "  -6                      Connect using IPv6."
+msgstr ""
+
+#: test/ipptool.c:4406
+msgid "  -C                      Send requests using chunking (default)."
+msgstr ""
+
+#: scheduler/cupsfilter.c:1431
+msgid "  -D                      Remove the input file when finished."
+msgstr ""
+
+#: ppdc/ppdc.cxx:438 ppdc/ppdhtml.cxx:175 ppdc/ppdpo.cxx:255
+msgid "  -D name=value           Set named variable to value."
+msgstr ""
+
+#: systemv/cupsaddsmb.c:285 systemv/cupsctl.c:205
+msgid "  -E                      Encrypt the connection."
+msgstr ""
+
+#: test/ipptool.c:4408
+msgid "  -E                      Test with HTTP Upgrade to TLS."
+msgstr ""
+
+#: scheduler/main.c:2021
+msgid "  -F                      Run in the foreground but detach from console."
+msgstr ""
+
+#: systemv/cupsaddsmb.c:286
+msgid "  -H samba-server         Use the named SAMBA server."
+msgstr ""
+
+#: test/ipptool.c:4410
+msgid "  -I                      Ignore errors."
+msgstr ""
+
+#: ppdc/ppdc.cxx:440 ppdc/ppdhtml.cxx:177 ppdc/ppdi.cxx:131 ppdc/ppdpo.cxx:257
+msgid "  -I include-dir          Add include directory to search path."
+msgstr ""
+
+#: systemv/cupstestppd.c:3799
+msgid "  -I {filename,filters,none,profiles}"
+msgstr ""
+
+#: test/ipptool.c:4411
+msgid "  -L                      Send requests using content-length."
+msgstr ""
+
+#: scheduler/cupsfilter.c:1433
+msgid "  -P filename.ppd         Set PPD file."
+msgstr ""
+
+#: systemv/cupstestppd.c:3801
+msgid "  -R root-directory       Set alternate root."
+msgstr ""
+
+#: test/ipptool.c:4413
+msgid "  -S                      Test with SSL encryption."
+msgstr ""
+
+#: test/ipptool.c:4415
+msgid "  -T seconds              Set the receive/send timeout in seconds."
+msgstr ""
+
+#: scheduler/cupsfilter.c:1434 systemv/cupsaddsmb.c:288 systemv/cupsctl.c:206
+msgid "  -U username             Specify username."
+msgstr ""
+
+#: test/ipptool.c:4417
+msgid "  -V version              Set default IPP version."
+msgstr ""
+
+#: systemv/cupstestppd.c:3802
+msgid "  -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,translations}"
+msgstr ""
+
+#: test/ipptool.c:4419
+msgid "  -X                      Produce XML plist instead of plain text."
+msgstr ""
+
+#: systemv/cupsaddsmb.c:289
+msgid "  -a                      Export all printers."
+msgstr ""
+
+#: ppdc/ppdc.cxx:442
+msgid "  -c catalog.po           Load the specified message catalog."
+msgstr ""
+
+#: scheduler/cupsfilter.c:1435 scheduler/main.c:2019
+msgid "  -c cupsd.conf           Set cupsd.conf file to use."
+msgstr ""
+
+#: test/ipptool.c:4421
+msgid "  -d name=value           Set named variable to value."
+msgstr ""
+
+#: ppdc/ppdc.cxx:444
+msgid "  -d output-dir           Specify the output directory."
+msgstr ""
+
+#: scheduler/cupsfilter.c:1437
+msgid "  -d printer              Use the named printer."
+msgstr ""
+
+#: scheduler/cupsfilter.c:1439
+msgid "  -e                      Use every filter from the PPD file."
+msgstr ""
+
+#: scheduler/main.c:2020
+msgid "  -f                      Run in the foreground."
+msgstr ""
+
+#: test/ipptool.c:4423
+msgid "  -f filename             Set default request filename."
+msgstr ""
+
+#: scheduler/main.c:2023
+msgid "  -h                      Show this usage message."
+msgstr ""
+
+#: systemv/cupsaddsmb.c:290 systemv/cupsctl.c:207
+msgid "  -h server[:port]        Specify server address."
+msgstr ""
+
+#: scheduler/cupsfilter.c:1441
+msgid "  -i mime/type            Set input MIME type (otherwise auto-typed)."
+msgstr ""
+
+#: test/ipptool.c:4425
+msgid "  -i seconds              Repeat the last file with the given time interval."
+msgstr ""
+
+#: scheduler/cupsfilter.c:1443
+msgid "  -j job-id[,N]           Filter file N from the specified job (default is file 1)."
+msgstr ""
+
+#: scheduler/main.c:2024
+msgid "  -l                      Run cupsd from launchd(8)."
+msgstr ""
+
+#: ppdc/ppdc.cxx:446
+msgid "  -l lang[,lang,...]      Specify the output language(s) (locale)."
+msgstr ""
+
+#: ppdc/ppdc.cxx:448
+msgid "  -m                      Use the ModelName value as the filename."
+msgstr ""
+
+#: scheduler/cupsfilter.c:1445
+msgid "  -m mime/type            Set output MIME type (otherwise application/pdf)."
+msgstr ""
+
+#: scheduler/cupsfilter.c:1447
+msgid "  -n copies               Set number of copies."
+msgstr ""
+
+#: test/ipptool.c:4427
+msgid "  -n count                Repeat the last file the given number of times."
+msgstr ""
+
+#: ppdc/ppdi.cxx:133
+msgid "  -o filename.drv         Set driver information file (otherwise ppdi.drv)."
+msgstr ""
+
+#: ppdc/ppdmerge.cxx:370
+msgid "  -o filename.ppd[.gz]    Set output file (otherwise stdout)."
+msgstr ""
+
+#: scheduler/cupsfilter.c:1448
+msgid "  -o name=value           Set option(s)."
+msgstr ""
+
+#: scheduler/cupsfilter.c:1449
+msgid "  -p filename.ppd         Set PPD file."
+msgstr ""
+
+#: systemv/cupstestppd.c:3806 test/ipptool.c:4429
+msgid "  -q                      Run silently."
+msgstr ""
+
+#: systemv/cupstestppd.c:3807
+msgid "  -r                      Use 'relaxed' open mode."
+msgstr ""
+
+#: test/ipptool.c:4430
+msgid "  -t                      Produce a test report."
+msgstr ""
+
+#: ppdc/ppdc.cxx:450
+msgid "  -t                      Test PPDs instead of generating them."
+msgstr ""
+
+#: scheduler/main.c:2025
+msgid "  -t                      Test the configuration file."
+msgstr ""
+
+#: scheduler/cupsfilter.c:1450
+msgid "  -t title                Set title."
+msgstr ""
+
+#: scheduler/cupsfilter.c:1451
+msgid "  -u                      Remove the PPD file when finished."
+msgstr ""
+
+#: systemv/cupsaddsmb.c:291 systemv/cupstestppd.c:3808 test/ipptool.c:4431
+#: ppdc/ppdc.cxx:452 ppdc/ppdpo.cxx:259
+msgid "  -v                      Be verbose."
+msgstr ""
+
+#: systemv/cupstestppd.c:3809
+msgid "  -vv                     Be very verbose."
+msgstr ""
+
+#: ppdc/ppdc.cxx:453
+msgid "  -z                      Compress PPD files using GNU zip."
+msgstr ""
+
+#: systemv/cupstestppd.c:332 systemv/cupstestppd.c:351
+#: systemv/cupstestppd.c:363 systemv/cupstestppd.c:496
+#: systemv/cupstestppd.c:511 systemv/cupstestppd.c:532
+#: systemv/cupstestppd.c:547 systemv/cupstestppd.c:577
+#: systemv/cupstestppd.c:597 systemv/cupstestppd.c:620
+#: systemv/cupstestppd.c:638 systemv/cupstestppd.c:664
+#: systemv/cupstestppd.c:682 systemv/cupstestppd.c:702
+#: systemv/cupstestppd.c:722 systemv/cupstestppd.c:740
+#: systemv/cupstestppd.c:757 systemv/cupstestppd.c:776
+#: systemv/cupstestppd.c:797 systemv/cupstestppd.c:816
+#: systemv/cupstestppd.c:836 systemv/cupstestppd.c:856
+#: systemv/cupstestppd.c:876 systemv/cupstestppd.c:896
+#: systemv/cupstestppd.c:914 systemv/cupstestppd.c:931
+#: systemv/cupstestppd.c:953 systemv/cupstestppd.c:971
+#: systemv/cupstestppd.c:988 systemv/cupstestppd.c:1006
+#: systemv/cupstestppd.c:1022 systemv/cupstestppd.c:1042
+#: systemv/cupstestppd.c:1073 systemv/cupstestppd.c:1095
+#: systemv/cupstestppd.c:1146 systemv/cupstestppd.c:1165
+#: systemv/cupstestppd.c:1209 systemv/cupstestppd.c:1223
+#: systemv/cupstestppd.c:1255 systemv/cupstestppd.c:1282
+#: systemv/cupstestppd.c:1800 systemv/cupstestppd.c:1819
+#: systemv/cupstestppd.c:1837 systemv/cupstestppd.c:1889
+#: systemv/cupstestppd.c:1905 systemv/cupstestppd.c:1942
+#: systemv/cupstestppd.c:1960 systemv/cupstestppd.c:1996
+#: systemv/cupstestppd.c:2010 systemv/cupstestppd.c:2037
+#: systemv/cupstestppd.c:2051 systemv/cupstestppd.c:2097
+#: systemv/cupstestppd.c:2119 systemv/cupstestppd.c:2142
+#: systemv/cupstestppd.c:2159 systemv/cupstestppd.c:2201
+#: systemv/cupstestppd.c:2244 systemv/cupstestppd.c:2291
+#: systemv/cupstestppd.c:2315 systemv/cupstestppd.c:2369
+#: systemv/cupstestppd.c:2385 systemv/cupstestppd.c:2415
+#: systemv/cupstestppd.c:2429 systemv/cupstestppd.c:2455
+#: systemv/cupstestppd.c:2471 systemv/cupstestppd.c:2511
+#: systemv/cupstestppd.c:2525 systemv/cupstestppd.c:2551
+#: systemv/cupstestppd.c:2567 systemv/cupstestppd.c:2597
+#: systemv/cupstestppd.c:2611 systemv/cupstestppd.c:2638
+#: systemv/cupstestppd.c:2655 systemv/cupstestppd.c:2669
+#: systemv/cupstestppd.c:2693 systemv/cupstestppd.c:2710
+#: systemv/cupstestppd.c:2724 systemv/cupstestppd.c:2748
+#: systemv/cupstestppd.c:2765 systemv/cupstestppd.c:2779
+#: systemv/cupstestppd.c:2803 systemv/cupstestppd.c:2820
+#: systemv/cupstestppd.c:2834 systemv/cupstestppd.c:2858
+#: systemv/cupstestppd.c:2872 systemv/cupstestppd.c:2887
+#: systemv/cupstestppd.c:2904 systemv/cupstestppd.c:2960
+#: systemv/cupstestppd.c:2995 systemv/cupstestppd.c:3009
+#: systemv/cupstestppd.c:3037 systemv/cupstestppd.c:3102
+#: systemv/cupstestppd.c:3117 systemv/cupstestppd.c:3156
+#: systemv/cupstestppd.c:3176 systemv/cupstestppd.c:3190
+#: systemv/cupstestppd.c:3387 systemv/cupstestppd.c:3423
+#: systemv/cupstestppd.c:3437 systemv/cupstestppd.c:3483
+#: systemv/cupstestppd.c:3515 systemv/cupstestppd.c:3532
+#: systemv/cupstestppd.c:3555 systemv/cupstestppd.c:3571
+#: systemv/cupstestppd.c:3609 systemv/cupstestppd.c:3750
+#: systemv/cupstestppd.c:3772 systemv/cupstestppd.c:3880
+msgid " FAIL"
+msgstr ""
+
+#: systemv/cupstestppd.c:1306
+msgid " PASS"
+msgstr ""
+
+#: berkeley/lpq.c:560
+#, c-format
+msgid "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes"
+msgstr ""
+
+#: berkeley/lpq.c:565
+#, c-format
+msgid "%-7s %-7.7s %-7d %-31.31s %.0f bytes"
+msgstr ""
+
+#: systemv/lpstat.c:750
+#, c-format
+msgid "%s accepting requests since %s"
+msgstr ""
+
+#: scheduler/ipp.c:10045
+#, c-format
+msgid "%s cannot be changed."
+msgstr "%s nelze změnit."
+
+#: berkeley/lpc.c:189
+#, c-format
+msgid "%s is not implemented by the CUPS version of lpc."
+msgstr ""
+
+#: berkeley/lpq.c:651
+#, c-format
+msgid "%s is not ready"
+msgstr ""
+
+#: berkeley/lpq.c:644
+#, c-format
+msgid "%s is ready"
+msgstr ""
+
+#: berkeley/lpq.c:647
+#, c-format
+msgid "%s is ready and printing"
+msgstr ""
+
+#: filter/rastertoepson.c:985 filter/rastertohp.c:711
+#: filter/rastertolabel.c:1134
+#, c-format
+msgid "%s job-id user title copies options [file]"
+msgstr ""
+
+#: systemv/lpstat.c:754
+#, c-format
+msgid "%s not accepting requests since %s -"
+msgstr ""
+
+#: scheduler/ipp.c:691
+#, c-format
+msgid "%s not supported."
+msgstr ""
+
+#: systemv/lpstat.c:765
+#, c-format
+msgid "%s/%s accepting requests since %s"
+msgstr ""
+
+#: systemv/lpstat.c:770
+#, c-format
+msgid "%s/%s not accepting requests since %s -"
+msgstr ""
+
+#: berkeley/lpq.c:552
+#, c-format
+msgid "%s: %-33.33s [job %d localhost]"
+msgstr ""
+
+#. TRANSLATORS: Message is "subject: error"
+#: cups/langprintf.c:86 scheduler/cupsfilter.c:714 systemv/lpadmin.c:805
+#: systemv/lpadmin.c:856 systemv/lpadmin.c:906 systemv/lpadmin.c:962
+#: systemv/lpadmin.c:1060 systemv/lpadmin.c:1112 systemv/lpadmin.c:1168
+#: systemv/lpadmin.c:1478
+#, c-format
+msgid "%s: %s"
+msgstr ""
+
+#: systemv/cancel.c:294 systemv/cancel.c:357
+#, c-format
+msgid "%s: %s failed: %s"
+msgstr ""
+
+#: systemv/cupsaccept.c:68
+#, c-format
+msgid "%s: Don't know what to do."
+msgstr ""
+
+#: berkeley/lpq.c:236 berkeley/lpr.c:344 systemv/lp.c:584
+#, c-format
+msgid "%s: Error - %s environment variable names non-existent destination \"%s\"."
+msgstr ""
+
+#: systemv/lp.c:231
+#, c-format
+msgid "%s: Error - bad job ID."
+msgstr ""
+
+#: systemv/lp.c:219
+#, c-format
+msgid "%s: Error - cannot print files and alter jobs simultaneously."
+msgstr ""
+
+#: systemv/lp.c:505
+#, c-format
+msgid "%s: Error - cannot print from stdin if files or a job ID are provided."
+msgstr ""
+
+#: systemv/lp.c:461
+#, c-format
+msgid "%s: Error - expected character set after \"-S\" option."
+msgstr ""
+
+#: systemv/lp.c:480
+#, c-format
+msgid "%s: Error - expected content type after \"-T\" option."
+msgstr ""
+
+#: berkeley/lpr.c:240
+#, c-format
+msgid "%s: Error - expected copies after \"-#\" option."
+msgstr ""
+
+#: systemv/lp.c:264
+#, c-format
+msgid "%s: Error - expected copies after \"-n\" option."
+msgstr ""
+
+#: berkeley/lpr.c:209
+#, c-format
+msgid "%s: Error - expected destination after \"-P\" option."
+msgstr ""
+
+#: systemv/lpstat.c:231
+#, c-format
+msgid "%s: Error - expected destination after \"-b\" option."
+msgstr ""
+
+#: systemv/lp.c:138
+#, c-format
+msgid "%s: Error - expected destination after \"-d\" option."
+msgstr ""
+
+#: systemv/lp.c:168
+#, c-format
+msgid "%s: Error - expected form after \"-f\" option."
+msgstr ""
+
+#: systemv/lp.c:391
+#, c-format
+msgid "%s: Error - expected hold name after \"-H\" option."
+msgstr ""
+
+#: berkeley/lpr.c:103
+#, c-format
+msgid "%s: Error - expected hostname after \"-H\" option."
+msgstr ""
+
+#: berkeley/lpq.c:180 berkeley/lprm.c:123 systemv/cancel.c:124
+#: systemv/cupsaccept.c:123 systemv/lp.c:189 systemv/lpstat.c:291
+#, c-format
+msgid "%s: Error - expected hostname after \"-h\" option."
+msgstr ""
+
+#: systemv/lp.c:371
+#, c-format
+msgid "%s: Error - expected mode list after \"-y\" option."
+msgstr ""
+
+#: berkeley/lpr.c:263
+#, c-format
+msgid "%s: Error - expected name after \"-%c\" option."
+msgstr ""
+
+#: berkeley/lpr.c:153 systemv/lp.c:288
+#, c-format
+msgid "%s: Error - expected option=value after \"-o\" option."
+msgstr ""
+
+#: systemv/lp.c:441
+#, c-format
+msgid "%s: Error - expected page list after \"-P\" option."
+msgstr ""
+
+#: systemv/lp.c:308
+#, c-format
+msgid "%s: Error - expected priority after \"-%c\" option."
+msgstr ""
+
+#: systemv/cupsaccept.c:141
+#, c-format
+msgid "%s: Error - expected reason text after \"-r\" option."
+msgstr ""
+
+#: systemv/lp.c:354
+#, c-format
+msgid "%s: Error - expected title after \"-t\" option."
+msgstr ""
+
+#: berkeley/lpq.c:111 berkeley/lpr.c:84 berkeley/lprm.c:104
+#: systemv/cancel.c:94 systemv/cupsaccept.c:101 systemv/lp.c:116
+#: systemv/lpadmin.c:438 systemv/lpstat.c:137
+#, c-format
+msgid "%s: Error - expected username after \"-U\" option."
+msgstr ""
+
+#: systemv/cancel.c:145
+#, c-format
+msgid "%s: Error - expected username after \"-u\" option."
+msgstr ""
+
+#: berkeley/lpr.c:125
+#, c-format
+msgid "%s: Error - expected value after \"-%c\" option."
+msgstr ""
+
+#: systemv/lpstat.c:157 systemv/lpstat.c:171
+#, c-format
+msgid "%s: Error - need \"completed\", \"not-completed\", or \"all\" after \"-W\" option."
+msgstr ""
+
+#: berkeley/lpq.c:241 berkeley/lpr.c:349 systemv/lp.c:589
+#, c-format
+msgid "%s: Error - no default destination available."
+msgstr ""
+
+#: systemv/lp.c:330
+#, c-format
+msgid "%s: Error - priority must be between 1 and 100."
+msgstr ""
+
+#: berkeley/lpr.c:352 systemv/lp.c:592
+#, c-format
+msgid "%s: Error - scheduler not responding."
+msgstr ""
+
+#: berkeley/lpr.c:305 systemv/lp.c:537
+#, c-format
+msgid "%s: Error - too many files - \"%s\"."
+msgstr ""
+
+#: berkeley/lpr.c:287 systemv/lp.c:520
+#, c-format
+msgid "%s: Error - unable to access \"%s\" - %s"
+msgstr ""
+
+#: berkeley/lpr.c:395 systemv/lp.c:623
+#, c-format
+msgid "%s: Error - unable to queue from stdin - %s."
+msgstr ""
+
+#: berkeley/lprm.c:87 berkeley/lprm.c:172 systemv/cancel.c:214
+#, c-format
+msgid "%s: Error - unknown destination \"%s\"."
+msgstr ""
+
+#: berkeley/lpq.c:150
+#, c-format
+msgid "%s: Error - unknown destination \"%s/%s\"."
+msgstr ""
+
+#: berkeley/lpr.c:274 berkeley/lprm.c:139 systemv/cancel.c:156
+#: systemv/cupsaccept.c:164 systemv/lp.c:496 systemv/lpstat.c:452
+#, c-format
+msgid "%s: Error - unknown option \"%c\"."
+msgstr ""
+
+#: systemv/cupsaccept.c:157
+#, c-format
+msgid "%s: Error - unknown option \"%s\"."
+msgstr ""
+
+#: systemv/lp.c:208
+#, c-format
+msgid "%s: Expected job ID after \"-i\" option."
+msgstr ""
+
+#: systemv/lpstat.c:504 systemv/lpstat.c:543
+#, c-format
+msgid "%s: Invalid destination name in list \"%s\"."
+msgstr ""
+
+#: scheduler/cupsfilter.c:567
+#, c-format
+msgid "%s: Invalid filter string \"%s\"."
+msgstr ""
+
+#: systemv/lp.c:418
+#, c-format
+msgid "%s: Need job ID (\"-i jobid\") before \"-H restart\"."
+msgstr ""
+
+#: scheduler/cupsfilter.c:458
+#, c-format
+msgid "%s: No filter to convert from %s/%s to %s/%s."
+msgstr ""
+
+#: systemv/cupsaccept.c:198
+#, c-format
+msgid "%s: Operation failed: %s"
+msgstr ""
+
+#: berkeley/lpq.c:97 berkeley/lpr.c:70 berkeley/lprm.c:67 systemv/cancel.c:81
+#: systemv/cupsaccept.c:88 systemv/cupsaddsmb.c:86 systemv/lp.c:102
+#: systemv/lpadmin.c:239 systemv/lpinfo.c:88 systemv/lpmove.c:73
+#: systemv/lpstat.c:102 test/ipptool.c:304 test/ipptool.c:321
+#, c-format
+msgid "%s: Sorry, no encryption support."
+msgstr ""
+
+#: berkeley/lpq.c:295 scheduler/cupsfilter.c:1221 systemv/cancel.c:237
+#: systemv/cupsaddsmb.c:144 systemv/cupsaddsmb.c:171
+#, c-format
+msgid "%s: Unable to connect to server."
+msgstr ""
+
+#: systemv/cancel.c:317
+#, c-format
+msgid "%s: Unable to contact server."
+msgstr ""
+
+#: scheduler/cupsfilter.c:424
+#, c-format
+msgid "%s: Unable to determine MIME type of \"%s\"."
+msgstr ""
+
+#: ppdc/ppdmerge.cxx:96
+#, c-format
+msgid "%s: Unable to open %s: %s"
+msgstr ""
+
+#: scheduler/cupsfilter.c:662 ppdc/ppdmerge.cxx:112
+#, c-format
+msgid "%s: Unable to open PPD file: %s on line %d."
+msgstr ""
+
+#: scheduler/cupsfilter.c:392
+#, c-format
+msgid "%s: Unable to read MIME database from \"%s\" or \"%s\"."
+msgstr ""
+
+#: berkeley/lpq.c:153 systemv/lpstat.c:558
+#, c-format
+msgid "%s: Unknown destination \"%s\"."
+msgstr ""
+
+#: scheduler/cupsfilter.c:435
+#, c-format
+msgid "%s: Unknown destination MIME type %s/%s."
+msgstr ""
+
+#: scheduler/cupsfilter.c:1426
+#, c-format
+msgid "%s: Unknown option \"%c\"."
+msgstr ""
+
+#: scheduler/cupsfilter.c:416
+#, c-format
+msgid "%s: Unknown source MIME type %s/%s."
+msgstr ""
+
+#: berkeley/lpr.c:139
+#, c-format
+msgid "%s: Warning - \"%c\" format modifier not supported - output may not be correct."
+msgstr ""
+
+#: systemv/lp.c:468
+#, c-format
+msgid "%s: Warning - character set option ignored."
+msgstr ""
+
+#: systemv/lp.c:487
+#, c-format
+msgid "%s: Warning - content type option ignored."
+msgstr ""
+
+#: systemv/lp.c:175
+#, c-format
+msgid "%s: Warning - form option ignored."
+msgstr ""
+
+#: systemv/lp.c:378
+#, c-format
+msgid "%s: Warning - mode option ignored."
+msgstr ""
+
+#: ppdc/sample.c:310
+msgid "-1"
+msgstr "-1"
+
+#: ppdc/sample.c:301
+msgid "-10"
+msgstr "-10"
+
+#: ppdc/sample.c:393
+msgid "-100"
+msgstr "-100"
+
+#: ppdc/sample.c:392
+msgid "-105"
+msgstr "-105"
+
+#: ppdc/sample.c:300
+msgid "-11"
+msgstr "-11"
+
+#: ppdc/sample.c:391
+msgid "-110"
+msgstr "-110"
+
+#: ppdc/sample.c:390
+msgid "-115"
+msgstr "-115"
+
+#: ppdc/sample.c:299
+msgid "-12"
+msgstr "-12"
+
+#: ppdc/sample.c:389
+msgid "-120"
+msgstr "-120"
+
+#: ppdc/sample.c:298
+msgid "-13"
+msgstr "-13"
+
+#: ppdc/sample.c:297
+msgid "-14"
+msgstr "-14"
+
+#: ppdc/sample.c:296
+msgid "-15"
+msgstr "-15"
+
+#: ppdc/sample.c:309
+msgid "-2"
+msgstr "-2"
+
+#: ppdc/sample.c:409
+msgid "-20"
+msgstr "-20"
+
+#: ppdc/sample.c:408
+msgid "-25"
+msgstr "-25"
+
+#: ppdc/sample.c:308
+msgid "-3"
+msgstr "-3"
+
+#: ppdc/sample.c:407
+msgid "-30"
+msgstr "-30"
+
+#: ppdc/sample.c:406
+msgid "-35"
+msgstr "-35"
+
+#: ppdc/sample.c:307
+msgid "-4"
+msgstr "-4"
+
+#: ppdc/sample.c:405
+msgid "-40"
+msgstr "-40"
+
+#: ppdc/sample.c:404
+msgid "-45"
+msgstr "-45"
+
+#: ppdc/sample.c:306
+msgid "-5"
+msgstr "-5"
+
+#: ppdc/sample.c:403
+msgid "-50"
+msgstr "-50"
+
+#: ppdc/sample.c:402
+msgid "-55"
+msgstr "-55"
+
+#: ppdc/sample.c:305
+msgid "-6"
+msgstr "-6"
+
+#: ppdc/sample.c:401
+msgid "-60"
+msgstr "-60"
+
+#: ppdc/sample.c:400
+msgid "-65"
+msgstr "-65"
+
+#: ppdc/sample.c:304
+msgid "-7"
+msgstr "-7"
+
+#: ppdc/sample.c:399
+msgid "-70"
+msgstr "-70"
+
+#: ppdc/sample.c:398
+msgid "-75"
+msgstr "-75"
+
+#: ppdc/sample.c:303
+msgid "-8"
+msgstr "-8"
+
+#: ppdc/sample.c:397
+msgid "-80"
+msgstr "-80"
+
+#: ppdc/sample.c:396
+msgid "-85"
+msgstr "-85"
+
+#: ppdc/sample.c:302
+msgid "-9"
+msgstr "-9"
+
+#: ppdc/sample.c:395
+msgid "-90"
+msgstr "-90"
+
+#: ppdc/sample.c:394
+msgid "-95"
+msgstr "-95"
+
+#: ppdc/sample.c:311
+msgid "0"
+msgstr "0"
+
+#: ppdc/sample.c:312
+msgid "1"
+msgstr "1"
+
+#: ppdc/sample.c:384
+msgid "1 inch/sec."
+msgstr "1 palec/sek."
+
+#: ppdc/sample.c:172
+msgid "1.25x0.25\""
+msgstr "1.25x0.25\""
+
+#: ppdc/sample.c:173
+msgid "1.25x2.25\""
+msgstr "1.25x2.25\""
+
+#: ppdc/sample.c:432
+msgid "1.5 inch/sec."
+msgstr "1.5 palce/sek."
+
+#: ppdc/sample.c:174
+msgid "1.50x0.25\""
+msgstr "1.50x0.25\""
+
+#: ppdc/sample.c:175
+msgid "1.50x0.50\""
+msgstr "1.50x0.50\""
+
+#: ppdc/sample.c:176
+msgid "1.50x1.00\""
+msgstr "1.50x1.00\""
+
+#: ppdc/sample.c:177
+msgid "1.50x2.00\""
+msgstr "1.50x2.00\""
+
+#: ppdc/sample.c:321
+msgid "10"
+msgstr "10"
+
+#: ppdc/sample.c:443
+msgid "10 inches/sec."
+msgstr "10 palců/sek."
+
+#: ppdc/sample.c:6
+msgid "10 x 11"
+msgstr ""
+
+#: ppdc/sample.c:7
+msgid "10 x 13"
+msgstr ""
+
+#: ppdc/sample.c:8
+msgid "10 x 14"
+msgstr ""
+
+#: ppdc/sample.c:423
+msgid "100"
+msgstr "100"
+
+#: ppdc/sample.c:334
+msgid "100 mm/sec."
+msgstr "100 mm/sek."
+
+#: ppdc/sample.c:424
+msgid "105"
+msgstr "105"
+
+#: ppdc/sample.c:322
+msgid "11"
+msgstr "11"
+
+#: ppdc/sample.c:444
+msgid "11 inches/sec."
+msgstr "11 palců/sek."
+
+#: ppdc/sample.c:425
+msgid "110"
+msgstr "110"
+
+#: ppdc/sample.c:426
+msgid "115"
+msgstr "115"
+
+#: ppdc/sample.c:323
+msgid "12"
+msgstr "12"
+
+#: ppdc/sample.c:445
+msgid "12 inches/sec."
+msgstr "12 palců/sek."
+
+#: ppdc/sample.c:9
+msgid "12 x 11"
+msgstr ""
+
+#: ppdc/sample.c:427
+msgid "120"
+msgstr "120"
+
+#: ppdc/sample.c:335
+msgid "120 mm/sec."
+msgstr "120 mm/sek."
+
+#: ppdc/sample.c:243
+msgid "120x60dpi"
+msgstr "120x60 dpi"
+
+#: ppdc/sample.c:249
+msgid "120x72dpi"
+msgstr "120x72 dpi"
+
+#: ppdc/sample.c:324
+msgid "13"
+msgstr "13"
+
+#: ppdc/sample.c:232
+msgid "136dpi"
+msgstr "136 dpi"
+
+#: ppdc/sample.c:325
+msgid "14"
+msgstr "14"
+
+#: ppdc/sample.c:326
+msgid "15"
+msgstr "15"
+
+#: ppdc/sample.c:328
+msgid "15 mm/sec."
+msgstr "15 mm/sek."
+
+#: ppdc/sample.c:10
+msgid "15 x 11"
+msgstr ""
+
+#: ppdc/sample.c:336
+msgid "150 mm/sec."
+msgstr "150 mm/sek."
+
+#: ppdc/sample.c:283
+msgid "150dpi"
+msgstr "150 dpi"
+
+#: ppdc/sample.c:368
+msgid "16"
+msgstr "16"
+
+#: ppdc/sample.c:369
+msgid "17"
+msgstr "17"
+
+#: ppdc/sample.c:370
+msgid "18"
+msgstr "18"
+
+#: ppdc/sample.c:244
+msgid "180dpi"
+msgstr "180 dpi"
+
+#: ppdc/sample.c:371
+msgid "19"
+msgstr "19"
+
+#: ppdc/sample.c:313
+msgid "2"
+msgstr "2"
+
+#: ppdc/sample.c:385
+msgid "2 inches/sec."
+msgstr "2 palce/sek."
+
+#: ppdc/sample.c:270
+msgid "2-Sided Printing"
+msgstr "oboustranný tisk"
+
+#: ppdc/sample.c:178
+msgid "2.00x0.37\""
+msgstr "2.00x0.37\""
+
+#: ppdc/sample.c:179
+msgid "2.00x0.50\""
+msgstr "2.00x0.50\""
+
+#: ppdc/sample.c:180
+msgid "2.00x1.00\""
+msgstr "2.00x1.00\""
+
+#: ppdc/sample.c:181
+msgid "2.00x1.25\""
+msgstr "2.00x1.25\""
+
+#: ppdc/sample.c:182
+msgid "2.00x2.00\""
+msgstr "2.00x2.00\""
+
+#: ppdc/sample.c:183
+msgid "2.00x3.00\""
+msgstr "2.00x3.00\""
+
+#: ppdc/sample.c:184
+msgid "2.00x4.00\""
+msgstr "2.00x4.00\""
+
+#: ppdc/sample.c:185
+msgid "2.00x5.50\""
+msgstr "2.00x5.50\""
+
+#: ppdc/sample.c:186
+msgid "2.25x0.50\""
+msgstr "2.25x0.50\""
+
+#: ppdc/sample.c:187
+msgid "2.25x1.25\""
+msgstr "2.25x1.25\""
+
+#: ppdc/sample.c:188
+msgid "2.25x4.00\""
+msgstr "2.25x4.00\""
+
+#: ppdc/sample.c:189
+msgid "2.25x5.50\""
+msgstr "2.25x5.50\""
+
+#: ppdc/sample.c:190
+msgid "2.38x5.50\""
+msgstr "2.38x5.50\""
+
+#: ppdc/sample.c:433
+msgid "2.5 inches/sec."
+msgstr "2.5 palce/sek."
+
+#: ppdc/sample.c:191
+msgid "2.50x1.00\""
+msgstr "2.50x1.00\""
+
+#: ppdc/sample.c:192
+msgid "2.50x2.00\""
+msgstr "2.50x2.00\""
+
+#: ppdc/sample.c:193
+msgid "2.75x1.25\""
+msgstr "2.75x1.25\""
+
+#: ppdc/sample.c:194
+msgid "2.9 x 1\""
+msgstr "2.9 x 1\""
+
+#: ppdc/sample.c:372
+msgid "20"
+msgstr "20"
+
+#: ppdc/sample.c:329
+msgid "20 mm/sec."
+msgstr "20 mm/sek."
+
+#: ppdc/sample.c:337
+msgid "200 mm/sec."
+msgstr "200 mm/sek."
+
+#: ppdc/sample.c:233
+msgid "203dpi"
+msgstr "203 dpi"
+
+#: ppdc/sample.c:373
+msgid "21"
+msgstr "21"
+
+#: ppdc/sample.c:374
+msgid "22"
+msgstr "22"
+
+#: ppdc/sample.c:375
+msgid "23"
+msgstr "23"
+
+#: ppdc/sample.c:376
+msgid "24"
+msgstr "24"
+
+#: ppdc/sample.c:241
+msgid "24-Pin Series"
+msgstr "24 jehličková"
+
+#: ppdc/sample.c:250
+msgid "240x72dpi"
+msgstr "240x72 dpi"
+
+#: ppdc/sample.c:377
+msgid "25"
+msgstr "25"
+
+#: ppdc/sample.c:338
+msgid "250 mm/sec."
+msgstr "250 mm/sek."
+
+#: ppdc/sample.c:378
+msgid "26"
+msgstr "26"
+
+#: ppdc/sample.c:379
+msgid "27"
+msgstr "27"
+
+#: ppdc/sample.c:380
+msgid "28"
+msgstr "28"
+
+#: ppdc/sample.c:381
+msgid "29"
+msgstr "29"
+
+#: ppdc/sample.c:314
+msgid "3"
+msgstr "3"
+
+#: ppdc/sample.c:386
+msgid "3 inches/sec."
+msgstr "3 palce/sek."
+
+#: ppdc/sample.c:3
+msgid "3 x 5"
+msgstr ""
+
+#: ppdc/sample.c:195
+msgid "3.00x1.00\""
+msgstr "3.00x1.00\""
+
+#: ppdc/sample.c:196
+msgid "3.00x1.25\""
+msgstr "3.00x1.25\""
+
+#: ppdc/sample.c:197
+msgid "3.00x2.00\""
+msgstr "3.00x2.00\""
+
+#: ppdc/sample.c:198
+msgid "3.00x3.00\""
+msgstr "3.00x3.00\""
+
+#: ppdc/sample.c:199
+msgid "3.00x5.00\""
+msgstr "3.00x5.00\""
+
+#: ppdc/sample.c:200
+msgid "3.25x2.00\""
+msgstr "3.25x2.00\""
+
+#: ppdc/sample.c:201
+msgid "3.25x5.00\""
+msgstr "3.25x5.00\""
+
+#: ppdc/sample.c:202
+msgid "3.25x5.50\""
+msgstr "3.25x5.50\""
+
+#: ppdc/sample.c:203
+msgid "3.25x5.83\""
+msgstr "3.25x5.83\""
+
+#: ppdc/sample.c:204
+msgid "3.25x7.83\""
+msgstr "3.25x7.83\""
+
+#: ppdc/sample.c:4
+msgid "3.5 x 5"
+msgstr ""
+
+#: ppdc/sample.c:171
+msgid "3.5\" Disk"
+msgstr "3.5\" Disk"
+
+#: ppdc/sample.c:205
+msgid "3.50x1.00\""
+msgstr "3.50x1.00\""
+
+#: ppdc/sample.c:382
+msgid "30"
+msgstr "30"
+
+#: ppdc/sample.c:330
+msgid "30 mm/sec."
+msgstr "30 mm/sek."
+
+#: ppdc/sample.c:339
+msgid "300 mm/sec."
+msgstr "300 mm/sek."
+
+#: ppdc/sample.c:234
+msgid "300dpi"
+msgstr "300 dpi"
+
+#: ppdc/sample.c:410
+msgid "35"
+msgstr "35"
+
+#: ppdc/sample.c:246
+msgid "360dpi"
+msgstr "360 dpi"
+
+#: ppdc/sample.c:245
+msgid "360x180dpi"
+msgstr "360x180 dpi"
+
+#: ppdc/sample.c:315
+msgid "4"
+msgstr "4"
+
+#: ppdc/sample.c:387
+msgid "4 inches/sec."
+msgstr "4 palce/sek."
+
+#: ppdc/sample.c:206
+msgid "4.00x1.00\""
+msgstr "4.00x1.00\""
+
+#: ppdc/sample.c:214
+msgid "4.00x13.00\""
+msgstr "4.00x13.00\""
+
+#: ppdc/sample.c:207
+msgid "4.00x2.00\""
+msgstr "4.00x2.00\""
+
+#: ppdc/sample.c:208
+msgid "4.00x2.50\""
+msgstr "4.00x2.50\""
+
+#: ppdc/sample.c:209
+msgid "4.00x3.00\""
+msgstr "4.00x3.00\""
+
+#: ppdc/sample.c:210
+msgid "4.00x4.00\""
+msgstr "4.00x4.00\""
+
+#: ppdc/sample.c:211
+msgid "4.00x5.00\""
+msgstr "4.00x5.00\""
+
+#: ppdc/sample.c:212
+msgid "4.00x6.00\""
+msgstr "4.00x6.00\""
+
+#: ppdc/sample.c:213
+msgid "4.00x6.50\""
+msgstr "4.00x6.50\""
+
+#: ppdc/sample.c:411
+msgid "40"
+msgstr "40"
+
+#: ppdc/sample.c:331
+msgid "40 mm/sec."
+msgstr "40 mm/sek."
+
+#: ppdc/sample.c:412
+msgid "45"
+msgstr "45"
+
+#: ppdc/sample.c:316
+msgid "5"
+msgstr "5"
+
+#: ppdc/sample.c:437
+msgid "5 inches/sec."
+msgstr "5 palců/sek."
+
+#: ppdc/sample.c:5
+msgid "5 x 7"
+msgstr ""
+
+#: ppdc/sample.c:413
+msgid "50"
+msgstr "50"
+
+#: ppdc/sample.c:414
+msgid "55"
+msgstr "55"
+
+#: ppdc/sample.c:317
+msgid "6"
+msgstr "6"
+
+#: ppdc/sample.c:438
+msgid "6 inches/sec."
+msgstr "6 palců/sek."
+
+#: ppdc/sample.c:215
+msgid "6.00x1.00\""
+msgstr "6.00x1.00\""
+
+#: ppdc/sample.c:216
+msgid "6.00x2.00\""
+msgstr "6.00x2.00\""
+
+#: ppdc/sample.c:217
+msgid "6.00x3.00\""
+msgstr "6.00x3.00\""
+
+#: ppdc/sample.c:218
+msgid "6.00x4.00\""
+msgstr "6.00x4.00\""
+
+#: ppdc/sample.c:219
+msgid "6.00x5.00\""
+msgstr "6.00x5.00\""
+
+#: ppdc/sample.c:220
+msgid "6.00x6.00\""
+msgstr "6.00x6.00\""
+
+#: ppdc/sample.c:221
+msgid "6.00x6.50\""
+msgstr "6.00x6.50\""
+
+#: ppdc/sample.c:415
+msgid "60"
+msgstr "60"
+
+#: ppdc/sample.c:332
+msgid "60 mm/sec."
+msgstr "60 mm/sek."
+
+#: ppdc/sample.c:261
+msgid "600dpi"
+msgstr "600 dpi"
+
+#: ppdc/sample.c:242
+msgid "60dpi"
+msgstr "60 dpi"
+
+#: ppdc/sample.c:248
+msgid "60x72dpi"
+msgstr ""
+
+#: ppdc/sample.c:416
+msgid "65"
+msgstr "65"
+
+#: ppdc/sample.c:318
+msgid "7"
+msgstr "7"
+
+#: ppdc/sample.c:440
+msgid "7 inches/sec."
+msgstr "7 palců/sek."
+
+#: ppdc/sample.c:11
+msgid "7 x 9"
+msgstr ""
+
+#: ppdc/sample.c:417
+msgid "70"
+msgstr "70"
+
+#: ppdc/sample.c:252
+msgid "720dpi"
+msgstr "720 dpi"
+
+#: ppdc/sample.c:418
+msgid "75"
+msgstr "75"
+
+#: ppdc/sample.c:319
+msgid "8"
+msgstr "8"
+
+#: ppdc/sample.c:441
+msgid "8 inches/sec."
+msgstr "8 palců/sek."
+
+#: ppdc/sample.c:12
+msgid "8 x 10"
+msgstr ""
+
+#: ppdc/sample.c:222
+msgid "8.00x1.00\""
+msgstr "8.00x1.00\""
+
+#: ppdc/sample.c:223
+msgid "8.00x2.00\""
+msgstr "8.00x2.00\""
+
+#: ppdc/sample.c:224
+msgid "8.00x3.00\""
+msgstr "8.00x3.00\""
+
+#: ppdc/sample.c:225
+msgid "8.00x4.00\""
+msgstr "8.00x4.00\""
+
+#: ppdc/sample.c:226
+msgid "8.00x5.00\""
+msgstr "8.00x5.00\""
+
+#: ppdc/sample.c:227
+msgid "8.00x6.00\""
+msgstr "8.00x6.00\""
+
+#: ppdc/sample.c:228
+msgid "8.00x6.50\""
+msgstr "8.00x6.50\""
+
+#: ppdc/sample.c:419
+msgid "80"
+msgstr "80"
+
+#: ppdc/sample.c:333
+msgid "80 mm/sec."
+msgstr "80 mm/sek."
+
+#: ppdc/sample.c:420
+msgid "85"
+msgstr "85"
+
+#: ppdc/sample.c:320
+msgid "9"
+msgstr "9"
+
+#: ppdc/sample.c:442
+msgid "9 inches/sec."
+msgstr "9 palců/sek."
+
+#: ppdc/sample.c:13
+msgid "9 x 11"
+msgstr ""
+
+#: ppdc/sample.c:14
+msgid "9 x 12"
+msgstr ""
+
+#: ppdc/sample.c:247
+msgid "9-Pin Series"
+msgstr "9 jehličková"
+
+#: ppdc/sample.c:421
+msgid "90"
+msgstr "90"
+
+#: ppdc/sample.c:422
+msgid "95"
+msgstr "95"
+
+#: berkeley/lpc.c:213
+msgid "?Invalid help command unknown."
+msgstr ""
+
+#: cgi-bin/admin.c:2368
+msgid "A Samba password is required to export printer drivers"
+msgstr ""
+
+#: cgi-bin/admin.c:2364
+msgid "A Samba username is required to export printer drivers"
+msgstr ""
+
+#: scheduler/ipp.c:2283
+#, c-format
+msgid "A class named \"%s\" already exists."
+msgstr ""
+
+#: scheduler/ipp.c:1004
+#, c-format
+msgid "A printer named \"%s\" already exists."
+msgstr ""
+
+#: ppdc/sample.c:15
+msgid "A0"
+msgstr "A0"
+
+#: ppdc/sample.c:16
+msgid "A0 Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:17
+msgid "A1"
+msgstr "A1"
+
+#: ppdc/sample.c:18
+msgid "A1 Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:37
+msgid "A10"
+msgstr "A10"
+
+#: ppdc/sample.c:19
+msgid "A2"
+msgstr "A2"
+
+#: ppdc/sample.c:20
+msgid "A2 Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:21
+msgid "A3"
+msgstr "A3"
+
+#: ppdc/sample.c:22
+msgid "A3 Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:23
+msgid "A3 Oversize"
+msgstr ""
+
+#: ppdc/sample.c:24
+msgid "A3 Oversize Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:25
+msgid "A4"
+msgstr "A4"
+
+#: ppdc/sample.c:27
+msgid "A4 Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:26
+msgid "A4 Oversize"
+msgstr ""
+
+#: ppdc/sample.c:28
+msgid "A4 Small"
+msgstr ""
+
+#: ppdc/sample.c:29
+msgid "A5"
+msgstr "A5"
+
+#: ppdc/sample.c:31
+msgid "A5 Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:30
+msgid "A5 Oversize"
+msgstr ""
+
+#: ppdc/sample.c:32
+msgid "A6"
+msgstr "A6"
+
+#: ppdc/sample.c:33
+msgid "A6 Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:34
+msgid "A7"
+msgstr "A7"
+
+#: ppdc/sample.c:35
+msgid "A8"
+msgstr "A8"
+
+#: ppdc/sample.c:36
+msgid "A9"
+msgstr "A9"
+
+#: ppdc/sample.c:38
+msgid "ANSI A"
+msgstr "ANSI A"
+
+#: ppdc/sample.c:39
+msgid "ANSI B"
+msgstr "ANSI B"
+
+#: ppdc/sample.c:40
+msgid "ANSI C"
+msgstr "ANSI C"
+
+#: ppdc/sample.c:41
+msgid "ANSI D"
+msgstr "ANSI D"
+
+#: ppdc/sample.c:42
+msgid "ANSI E"
+msgstr "ANSI E"
+
+#: ppdc/sample.c:47
+msgid "ARCH C"
+msgstr "ARCH C"
+
+#: ppdc/sample.c:48
+msgid "ARCH C Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:49
+msgid "ARCH D"
+msgstr "ARCH D"
+
+#: ppdc/sample.c:50
+msgid "ARCH D Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:51
+msgid "ARCH E"
+msgstr "ARCH E"
+
+#: ppdc/sample.c:52
+msgid "ARCH E Long Edge"
+msgstr ""
+
+#: cgi-bin/classes.c:169 cgi-bin/printers.c:172
+msgid "Accept Jobs"
+msgstr "Příjem úloh"
+
+#: cups/http-support.c:1284
+msgid "Accepted"
+msgstr "Přijatý"
+
+#: cgi-bin/admin.c:570
+msgid "Add Class"
+msgstr "Přidat třídu"
+
+#: cgi-bin/admin.c:882
+msgid "Add Printer"
+msgstr "Přidat tiskárnu"
+
+#: cgi-bin/admin.c:444 cgi-bin/admin.c:477 cgi-bin/admin.c:525
+#: cgi-bin/admin.c:535
+msgid "Add RSS Subscription"
+msgstr "Přidat RSS předplatné"
+
+#: ppdc/sample.c:163
+msgid "Address"
+msgstr "Adresa"
+
+#: cgi-bin/admin.c:210 cgi-bin/admin.c:284 cgi-bin/admin.c:2745
+msgid "Administration"
+msgstr "Administrace"
+
+#: ppdc/sample.c:429
+msgid "Always"
+msgstr "Vždy"
+
+#: backend/socket.c:129
+msgid "AppSocket/HP JetDirect"
+msgstr "AppSocket/HP JetDirect"
+
+#: ppdc/sample.c:450
+msgid "Applicator"
+msgstr "Aplikátor"
+
+#: scheduler/ipp.c:1079
+#, c-format
+msgid "Attempt to set %s printer-state to bad value %d."
+msgstr ""
+
+#: scheduler/ipp.c:325
+#, c-format
+msgid "Attribute groups are out of order (%x < %x)."
+msgstr ""
+
+#: ppdc/sample.c:126
+msgid "B0"
+msgstr "B0"
+
+#: ppdc/sample.c:127
+msgid "B1"
+msgstr "B1"
+
+#: ppdc/sample.c:137
+msgid "B10"
+msgstr "B10"
+
+#: ppdc/sample.c:128
+msgid "B2"
+msgstr "B2"
+
+#: ppdc/sample.c:129
+msgid "B3"
+msgstr "B3"
+
+#: ppdc/sample.c:130
+msgid "B4"
+msgstr "B4"
+
+#: ppdc/sample.c:131
+msgid "B5"
+msgstr "B5"
+
+#: ppdc/sample.c:132
+msgid "B5 Oversize"
+msgstr ""
+
+#: ppdc/sample.c:133
+msgid "B6"
+msgstr "B6"
+
+#: ppdc/sample.c:134
+msgid "B7"
+msgstr "B7"
+
+#: ppdc/sample.c:135
+msgid "B8"
+msgstr "B8"
+
+#: ppdc/sample.c:136
+msgid "B9"
+msgstr "B9"
+
+#: cups/dest.c:1680
+msgid "Bad NULL dests pointer"
+msgstr "Neplatný ukazatel NULL"
+
+#: cups/ppd.c:345
+msgid "Bad OpenGroup"
+msgstr "Chybný OpenGroup"
+
+#: cups/ppd.c:347
+msgid "Bad OpenUI/JCLOpenUI"
+msgstr "Chybný OpenUI/JCLOpenUI"
+
+#: cups/ppd.c:349
+msgid "Bad OrderDependency"
+msgstr "Chybný OrderDependency"
+
+#: cups/ppd-cache.c:148 cups/ppd-cache.c:195 cups/ppd-cache.c:233
+#: cups/ppd-cache.c:239 cups/ppd-cache.c:255 cups/ppd-cache.c:271
+#: cups/ppd-cache.c:280 cups/ppd-cache.c:288 cups/ppd-cache.c:305
+#: cups/ppd-cache.c:313 cups/ppd-cache.c:328 cups/ppd-cache.c:336
+#: cups/ppd-cache.c:354 cups/ppd-cache.c:366 cups/ppd-cache.c:381
+#: cups/ppd-cache.c:393 cups/ppd-cache.c:415 cups/ppd-cache.c:423
+#: cups/ppd-cache.c:441 cups/ppd-cache.c:449 cups/ppd-cache.c:464
+#: cups/ppd-cache.c:472 cups/ppd-cache.c:490 cups/ppd-cache.c:498
+#: cups/ppd-cache.c:525 cups/ppd-cache.c:571 cups/ppd-cache.c:579
+#: cups/ppd-cache.c:587
+msgid "Bad PPD cache file."
+msgstr ""
+
+#: cups/http-support.c:1299
+msgid "Bad Request"
+msgstr "Chybný požadavek"
+
+#: cups/snmp.c:1002
+msgid "Bad SNMP version number"
+msgstr "Chybná verze SNMP"
+
+#: cups/ppd.c:350
+msgid "Bad UIConstraints"
+msgstr "Chybný UIConstraints"
+
+#: scheduler/ipp.c:1380
+#, c-format
+msgid "Bad copies value %d."
+msgstr "Chybný počet kopií %d."
+
+#: cups/ppd.c:358
+msgid "Bad custom parameter"
+msgstr "Chybný uživatelský parametr"
+
+#: cups/http-support.c:1451 scheduler/ipp.c:2350
+#, c-format
+msgid "Bad device-uri \"%s\"."
+msgstr ""
+
+#: scheduler/ipp.c:2391
+#, c-format
+msgid "Bad device-uri scheme \"%s\"."
+msgstr ""
+
+#: scheduler/ipp.c:8224 scheduler/ipp.c:8240 scheduler/ipp.c:9454
+#: scheduler/ipp.c:10968
+#, c-format
+msgid "Bad document-format \"%s\"."
+msgstr ""
+
+#: scheduler/ipp.c:9470
+#, c-format
+msgid "Bad document-format-default \"%s\"."
+msgstr ""
+
+#: cups/util.c:929
+msgid "Bad filename buffer"
+msgstr ""
+
+#: scheduler/ipp.c:10060
+msgid "Bad job-priority value."
+msgstr ""
+
+#: scheduler/ipp.c:1410
+#, c-format
+msgid "Bad job-sheets value \"%s\"."
+msgstr ""
+
+#: scheduler/ipp.c:1394
+msgid "Bad job-sheets value type."
+msgstr ""
+
+#: scheduler/ipp.c:10090
+msgid "Bad job-state value."
+msgstr ""
+
+#: scheduler/ipp.c:2974 scheduler/ipp.c:3426 scheduler/ipp.c:6078
+#: scheduler/ipp.c:6225 scheduler/ipp.c:7658 scheduler/ipp.c:7927
+#: scheduler/ipp.c:8775 scheduler/ipp.c:9001 scheduler/ipp.c:9350
+#: scheduler/ipp.c:9953
+#, c-format
+msgid "Bad job-uri \"%s\"."
+msgstr ""
+
+#: scheduler/ipp.c:2049 scheduler/ipp.c:5622
+#, c-format
+msgid "Bad notify-pull-method \"%s\"."
+msgstr ""
+
+#: scheduler/ipp.c:2013 scheduler/ipp.c:5586
+#, c-format
+msgid "Bad notify-recipient-uri \"%s\"."
+msgstr ""
+
+#: scheduler/ipp.c:1426
+#, c-format
+msgid "Bad number-up value %d."
+msgstr "Chybná hodnota %d."
+
+#: cups/adminutil.c:292
+#, c-format
+msgid "Bad option + choice on line %d."
+msgstr ""
+
+#: scheduler/ipp.c:1443
+#, c-format
+msgid "Bad page-ranges values %d-%d."
+msgstr "Chybný rozsah stránek %d-%d."
+
+#: scheduler/ipp.c:2434
+#, c-format
+msgid "Bad port-monitor \"%s\"."
+msgstr ""
+
+#: cups/dest.c:676 cups/dest.c:1333
+msgid "Bad printer URI."
+msgstr ""
+
+#: scheduler/ipp.c:2495
+#, c-format
+msgid "Bad printer-state value %d."
+msgstr ""
+
+#: scheduler/ipp.c:293
+#, c-format
+msgid "Bad request ID %d."
+msgstr ""
+
+#: scheduler/ipp.c:278
+#, c-format
+msgid "Bad request version number %d.%d."
+msgstr ""
+
+#: cgi-bin/admin.c:1484
+msgid "Bad subscription ID"
+msgstr ""
+
+#: cups/ppd.c:360
+msgid "Bad value string"
+msgstr ""
+
+#: cgi-bin/admin.c:3290 cgi-bin/admin.c:3536
+msgid "Banners"
+msgstr "Banery"
+
+#: ppdc/sample.c:287
+msgid "Bond Paper"
+msgstr "Kancelářský papír"
+
+#: backend/usb-darwin.c:1846
+#, c-format
+msgid "Boolean expected for waiteof option \"%s\"."
+msgstr ""
+
+#: filter/pstops.c:2057
+msgid "Buffer overflow detected, aborting."
+msgstr ""
+
+#: ppdc/sample.c:254
+msgid "CMYK"
+msgstr "CMYK"
+
+#: ppdc/sample.c:363
+msgid "CPCL Label Printer"
+msgstr "Tiskárna štítků CPCL"
+
+#: cgi-bin/admin.c:1485 cgi-bin/admin.c:1524 cgi-bin/admin.c:1534
+msgid "Cancel RSS Subscription"
+msgstr "Zrušit RSS předplatné"
+
+#: backend/ipp.c:1921
+msgid "Canceling print job."
+msgstr ""
+
+#: scheduler/ipp.c:2475
+msgid "Cannot share a remote Kerberized printer."
+msgstr ""
+
+#: ppdc/sample.c:279
+msgid "Cassette"
+msgstr ""
+
+#: cgi-bin/admin.c:1655 cgi-bin/admin.c:1797 cgi-bin/admin.c:1810
+#: cgi-bin/admin.c:1821
+msgid "Change Settings"
+msgstr "Změna nastavení"
+
+#: scheduler/ipp.c:2061 scheduler/ipp.c:5634
+#, c-format
+msgid "Character set \"%s\" not supported."
+msgstr ""
+
+#: cgi-bin/classes.c:195 cgi-bin/classes.c:322
+msgid "Classes"
+msgstr "Třídy"
+
+#: cgi-bin/printers.c:182
+msgid "Clean Print Heads"
+msgstr "Vyčištění tiskových hlav"
+
+#: scheduler/ipp.c:3878
+msgid "Close-Job doesn't support the job-uri attribute."
+msgstr ""
+
+#: ppdc/sample.c:282
+msgid "Color"
+msgstr "Barva"
+
+#: ppdc/sample.c:253
+msgid "Color Mode"
+msgstr "Barevný režim"
+
+#: berkeley/lpc.c:204
+msgid ""
+"Commands may be abbreviated.  Commands are:\n"
+"\n"
+"exit    help    quit    status  ?"
+msgstr ""
+
+#: cups/snmp.c:1006
+msgid "Community name uses indefinite length"
+msgstr "\"Community-Name\" má neomezenou délku"
+
+#: backend/ipp.c:786 backend/lpd.c:871 backend/socket.c:395
+msgid "Connected to printer."
+msgstr ""
+
+#: backend/ipp.c:691 backend/lpd.c:694 backend/socket.c:314
+msgid "Connecting to printer."
+msgstr ""
+
+#: cups/http-support.c:1272
+msgid "Continue"
+msgstr "Pokračovat"
+
+#: ppdc/sample.c:365
+msgid "Continuous"
+msgstr "Souvislý"
+
+#: backend/lpd.c:1020 backend/lpd.c:1152
+msgid "Control file sent successfully."
+msgstr ""
+
+#: backend/ipp.c:1233 backend/lpd.c:464
+msgid "Copying print data."
+msgstr ""
+
+#: cups/http-support.c:1281
+msgid "Created"
+msgstr "Vytvořeno"
+
+#: cups/ppd.c:1113 cups/ppd.c:1153 cups/ppd.c:1398 cups/ppd.c:1501
+msgid "Custom"
+msgstr "Uživatelský"
+
+#: ppdc/sample.c:359
+msgid "CustominCutInterval"
+msgstr "CustominCutInterval"
+
+#: ppdc/sample.c:357
+msgid "CustominTearInterval"
+msgstr "CustominTearInterval"
+
+#: ppdc/sample.c:343
+msgid "Cut"
+msgstr "Snížit"
+
+#: ppdc/sample.c:451
+msgid "Cutter"
+msgstr "Výstřižek"
+
+#: ppdc/sample.c:239
+msgid "Dark"
+msgstr "Tmavý"
+
+#: ppdc/sample.c:235
+msgid "Darkness"
+msgstr "Tma"
+
+#: backend/lpd.c:1105
+msgid "Data file sent successfully."
+msgstr ""
+
+#: cgi-bin/admin.c:2094 cgi-bin/admin.c:2105 cgi-bin/admin.c:2150
+msgid "Delete Class"
+msgstr "Výmaz třídy"
+
+#: cgi-bin/admin.c:2179 cgi-bin/admin.c:2190 cgi-bin/admin.c:2235
+msgid "Delete Printer"
+msgstr "Výmaz tiskárny"
+
+#: ppdc/sample.c:281
+msgid "DeskJet Series"
+msgstr "Řada DeskJet"
+
+#: scheduler/ipp.c:1346
+#, c-format
+msgid "Destination \"%s\" is not accepting jobs."
+msgstr "Zařízení \"%s\" nepřijímá úlohy."
+
+#: systemv/lpinfo.c:300
+#, c-format
+msgid ""
+"Device: uri = %s\n"
+"        class = %s\n"
+"        info = %s\n"
+"        make-and-model = %s\n"
+"        device-id = %s\n"
+"        location = %s"
+msgstr ""
+
+#: ppdc/sample.c:436
+msgid "Direct Thermal Media"
+msgstr "Termální médium"
+
+#: cups/file.c:296
+#, c-format
+msgid "Directory \"%s\" contains a relative path."
+msgstr ""
+
+#: cups/file.c:268
+#, c-format
+msgid "Directory \"%s\" has insecure permissions (0%o/uid=%d/gid=%d)."
+msgstr ""
+
+#: cups/file.c:285
+#, c-format
+msgid "Directory \"%s\" is a file."
+msgstr ""
+
+#: cups/file.c:256
+#, c-format
+msgid "Directory \"%s\" not available: %s"
+msgstr ""
+
+#: cups/file.c:241
+#, c-format
+msgid "Directory \"%s\" permissions OK (0%o/uid=%d/gid=%d)."
+msgstr ""
+
+#: ppdc/sample.c:345
+msgid "Disabled"
+msgstr "Zakázaný"
+
+#: scheduler/ipp.c:6127
+#, c-format
+msgid "Document #%d does not exist in job #%d."
+msgstr ""
+
+#: ppdc/sample.c:275
+msgid "Duplexer"
+msgstr "Duplexní jednotka"
+
+#: ppdc/sample.c:229
+msgid "Dymo"
+msgstr "Dymo"
+
+#: ppdc/sample.c:431
+msgid "EPL1 Label Printer"
+msgstr "Tiskárna štítků EPL1"
+
+#: ppdc/sample.c:434
+msgid "EPL2 Label Printer"
+msgstr "Tiskárna štítků EPL2"
+
+#: cgi-bin/admin.c:1849 cgi-bin/admin.c:1861 cgi-bin/admin.c:1915
+#: cgi-bin/admin.c:1922 cgi-bin/admin.c:1957 cgi-bin/admin.c:1970
+#: cgi-bin/admin.c:1994 cgi-bin/admin.c:2067
+msgid "Edit Configuration File"
+msgstr "Úprava konfiguračního souboru"
+
+#: cups/adminutil.c:337
+msgid "Empty PPD file."
+msgstr ""
+
+#. TRANSLATORS: Banner/cover sheet after the print job.
+#: cgi-bin/admin.c:3561
+msgid "Ending Banner"
+msgstr "Ukončení baneru"
+
+#: ppdc/sample.c:2
+msgid "English"
+msgstr "Čeština"
+
+#: systemv/lppasswd.c:193
+msgid "Enter old password:"
+msgstr "Zadejte původní heslo:"
+
+#: systemv/lppasswd.c:224
+msgid "Enter password again:"
+msgstr "Opakujte heslo:"
+
+#: systemv/lppasswd.c:212
+msgid "Enter password:"
+msgstr "Zadejte heslo:"
+
+#: scheduler/client.c:2427
+msgid "Enter your username and password or the root username and password to access this page. If you are using Kerberos authentication, make sure you have a valid Kerberos ticket."
+msgstr "Zadejte své uživatelské jméno a heslo, nebo uživatelské jméno a heslo administrátora pro přístup na tuto stránku. Pokud používáte ověřování Kerberos, ujistěte se, že máte platný ticket Kerberosu."
+
+#: ppdc/sample.c:73
+msgid "Envelope #10 "
+msgstr ""
+
+#: ppdc/sample.c:74
+msgid "Envelope #11"
+msgstr ""
+
+#: ppdc/sample.c:75
+msgid "Envelope #12"
+msgstr ""
+
+#: ppdc/sample.c:76
+msgid "Envelope #14"
+msgstr ""
+
+#: ppdc/sample.c:77
+msgid "Envelope #9"
+msgstr ""
+
+#: ppdc/sample.c:89
+msgid "Envelope B4"
+msgstr ""
+
+#: ppdc/sample.c:90
+msgid "Envelope B5"
+msgstr ""
+
+#: ppdc/sample.c:91
+msgid "Envelope B6"
+msgstr ""
+
+#: ppdc/sample.c:78
+msgid "Envelope C0"
+msgstr ""
+
+#: ppdc/sample.c:79
+msgid "Envelope C1"
+msgstr ""
+
+#: ppdc/sample.c:80
+msgid "Envelope C2"
+msgstr ""
+
+#: ppdc/sample.c:81
+msgid "Envelope C3"
+msgstr ""
+
+#: ppdc/sample.c:67
+msgid "Envelope C4"
+msgstr ""
+
+#: ppdc/sample.c:68
+msgid "Envelope C5"
+msgstr ""
+
+#: ppdc/sample.c:69
+msgid "Envelope C6"
+msgstr ""
+
+#: ppdc/sample.c:82
+msgid "Envelope C65"
+msgstr ""
+
+#: ppdc/sample.c:83
+msgid "Envelope C7"
+msgstr ""
+
+#: ppdc/sample.c:84
+msgid "Envelope Choukei 3"
+msgstr ""
+
+#: ppdc/sample.c:85
+msgid "Envelope Choukei 3 Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:86
+msgid "Envelope Choukei 4"
+msgstr ""
+
+#: ppdc/sample.c:87
+msgid "Envelope Choukei 4 Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:70
+msgid "Envelope DL"
+msgstr ""
+
+#: ppdc/sample.c:269
+msgid "Envelope Feed"
+msgstr "Podavač obálek"
+
+#: ppdc/sample.c:88
+msgid "Envelope Invite"
+msgstr ""
+
+#: ppdc/sample.c:92
+msgid "Envelope Italian"
+msgstr ""
+
+#: ppdc/sample.c:93
+msgid "Envelope Kaku2"
+msgstr ""
+
+#: ppdc/sample.c:94
+msgid "Envelope Kaku2 Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:95
+msgid "Envelope Kaku3"
+msgstr ""
+
+#: ppdc/sample.c:96
+msgid "Envelope Kaku3 Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:97
+msgid "Envelope Monarch"
+msgstr ""
+
+#: ppdc/sample.c:99
+msgid "Envelope PRC1 "
+msgstr ""
+
+#: ppdc/sample.c:100
+msgid "Envelope PRC1 Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:117
+msgid "Envelope PRC10"
+msgstr ""
+
+#: ppdc/sample.c:118
+msgid "Envelope PRC10 Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:101
+msgid "Envelope PRC2"
+msgstr ""
+
+#: ppdc/sample.c:102
+msgid "Envelope PRC2 Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:103
+msgid "Envelope PRC3"
+msgstr ""
+
+#: ppdc/sample.c:104
+msgid "Envelope PRC3 Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:105
+msgid "Envelope PRC4"
+msgstr ""
+
+#: ppdc/sample.c:106
+msgid "Envelope PRC4 Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:108
+msgid "Envelope PRC5 Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:107
+msgid "Envelope PRC5PRC5"
+msgstr ""
+
+#: ppdc/sample.c:109
+msgid "Envelope PRC6"
+msgstr ""
+
+#: ppdc/sample.c:110
+msgid "Envelope PRC6 Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:111
+msgid "Envelope PRC7"
+msgstr ""
+
+#: ppdc/sample.c:112
+msgid "Envelope PRC7 Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:113
+msgid "Envelope PRC8"
+msgstr ""
+
+#: ppdc/sample.c:114
+msgid "Envelope PRC8 Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:115
+msgid "Envelope PRC9"
+msgstr ""
+
+#: ppdc/sample.c:116
+msgid "Envelope PRC9 Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:98
+msgid "Envelope Personal"
+msgstr ""
+
+#: ppdc/sample.c:119
+msgid "Envelope You4"
+msgstr ""
+
+#: ppdc/sample.c:120
+msgid "Envelope You4 Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:240
+msgid "Epson"
+msgstr "Epson"
+
+#: cgi-bin/admin.c:3604
+msgid "Error Policy"
+msgstr "Chování při chybě"
+
+#: filter/rastertopwg.c:403 filter/rastertopwg.c:418 filter/rastertopwg.c:429
+#: filter/rastertopwg.c:440
+msgid "Error sending raster data."
+msgstr ""
+
+#: systemv/lpinfo.c:103 systemv/lpmove.c:88
+msgid "Error: need hostname after \"-h\" option."
+msgstr ""
+
+#: ppdc/sample.c:355
+msgid "Every 10 Labels"
+msgstr "Každých 10 štítků"
+
+#: ppdc/sample.c:347
+msgid "Every 2 Labels"
+msgstr "Každé 2 štítky"
+
+#: ppdc/sample.c:348
+msgid "Every 3 Labels"
+msgstr "Každé 3 štítky"
+
+#: ppdc/sample.c:349
+msgid "Every 4 Labels"
+msgstr "Každé 4 štítky"
+
+#: ppdc/sample.c:350
+msgid "Every 5 Labels"
+msgstr "Každých 5 štítků"
+
+#: ppdc/sample.c:351
+msgid "Every 6 Labels"
+msgstr "Každých 6 štítků"
+
+#: ppdc/sample.c:352
+msgid "Every 7 Labels"
+msgstr "Každých 7 štítků"
+
+#: ppdc/sample.c:353
+msgid "Every 8 Labels"
+msgstr "Každých 8 štítků"
+
+#: ppdc/sample.c:354
+msgid "Every 9 Labels"
+msgstr "Každých 9 štítků"
+
+#: ppdc/sample.c:346
+msgid "Every Label"
+msgstr "Každý štítek"
+
+#: ppdc/sample.c:121
+msgid "Executive"
+msgstr ""
+
+#: cups/http-support.c:1327
+msgid "Expectation Failed"
+msgstr "Očekávané údaje jsou neplatné"
+
+#: cgi-bin/admin.c:2356 cgi-bin/admin.c:2375
+msgid "Export Printers to Samba"
+msgstr "Export tiskáren do Samby"
+
+#: systemv/cupstestdsc.c:172 systemv/cupstestdsc.c:189
+#: systemv/cupstestdsc.c:214 systemv/cupstestdsc.c:231
+#: systemv/cupstestdsc.c:255 systemv/cupstestdsc.c:273
+#: systemv/cupstestdsc.c:302 systemv/cupstestdsc.c:339
+#: systemv/cupstestdsc.c:349 systemv/cupstestdsc.c:359
+#: systemv/cupstestdsc.c:369 systemv/cupstestdsc.c:379
+#: systemv/cupstestdsc.c:387
+msgid "FAIL"
+msgstr ""
+
+#: ppdc/sample.c:122
+msgid "FanFold German"
+msgstr ""
+
+#: ppdc/sample.c:123
+msgid "FanFold Legal German"
+msgstr ""
+
+#: ppdc/sample.c:124
+msgid "Fanfold US"
+msgstr ""
+
+#: cups/file.c:300
+#, c-format
+msgid "File \"%s\" contains a relative path."
+msgstr ""
+
+#: cups/file.c:275
+#, c-format
+msgid "File \"%s\" has insecure permissions (0%o/uid=%d/gid=%d)."
+msgstr ""
+
+#: cups/file.c:289
+#, c-format
+msgid "File \"%s\" is a directory."
+msgstr ""
+
+#: cups/file.c:261
+#, c-format
+msgid "File \"%s\" not available: %s"
+msgstr ""
+
+#: cups/file.c:247
+#, c-format
+msgid "File \"%s\" permissions OK (0%o/uid=%d/gid=%d)."
+msgstr ""
+
+#: ppdc/sample.c:169
+msgid "File Folder "
+msgstr "Složka souborů "
+
+#: scheduler/ipp.c:2370
+#, c-format
+msgid "File device URIs have been disabled. To enable, see the FileDevice directive in \"%s/cupsd.conf\"."
+msgstr ""
+
+#: filter/rastertoepson.c:1117 filter/rastertohp.c:845
+#: filter/rastertolabel.c:1273
+#, c-format
+msgid "Finished page %d."
+msgstr ""
+
+#: ppdc/sample.c:125
+msgid "Folio"
+msgstr "Fólie"
+
+#: cups/http-support.c:1306
+msgid "Forbidden"
+msgstr "Zakázaný"
+
+#: cups/ppd.c:742 cups/ppd.c:1302
+msgid "General"
+msgstr "Obecný"
+
+#: ppdc/sample.c:259
+msgid "Generic"
+msgstr "Obecný"
+
+#: cups/snmp.c:1016
+msgid "Get-Response-PDU uses indefinite length"
+msgstr "\"Get-Response-PDU\" má neomezenou délku"
+
+#: ppdc/sample.c:290
+msgid "Glossy Paper"
+msgstr "Lesklý papír"
+
+#: scheduler/ipp.c:2952 scheduler/ipp.c:3352 scheduler/ipp.c:3890
+#: scheduler/ipp.c:6056 scheduler/ipp.c:6203 scheduler/ipp.c:7635
+#: scheduler/ipp.c:8753 scheduler/ipp.c:8979 scheduler/ipp.c:9328
+#: scheduler/ipp.c:9931
+msgid "Got a printer-uri attribute but no job-id."
+msgstr ""
+
+#: ppdc/sample.c:255
+msgid "Grayscale"
+msgstr "Stupně šedi"
+
+#: ppdc/sample.c:280
+msgid "HP"
+msgstr "HP"
+
+#: ppdc/sample.c:170
+msgid "Hanging Folder"
+msgstr "Závěsná složka"
+
+#: cgi-bin/help.c:143
+msgid "Help file not in index."
+msgstr ""
+
+#: cups/ipp.c:2687 cups/ipp.c:2714 cups/ipp.c:2737
+msgid "IPP 1setOf attribute with incompatible value tags."
+msgstr ""
+
+#: cups/ipp.c:2650
+msgid "IPP attribute has no name."
+msgstr ""
+
+#: cups/ipp.c:5487
+msgid "IPP attribute is not a member of the message."
+msgstr ""
+
+#: cups/ipp.c:3083
+msgid "IPP begCollection value not 0 bytes."
+msgstr ""
+
+#: cups/ipp.c:2873
+msgid "IPP boolean value not 1 byte."
+msgstr ""
+
+#: cups/ipp.c:2934
+msgid "IPP date value not 11 bytes."
+msgstr ""
+
+#: cups/ipp.c:3104
+msgid "IPP endCollection value not 0 bytes."
+msgstr ""
+
+#: cups/ipp.c:2848
+msgid "IPP enum value not 4 bytes."
+msgstr ""
+
+#: cups/ipp.c:2579
+msgid "IPP extension tag larger than 0x7FFFFFFF."
+msgstr ""
+
+#: cups/ipp.c:2845
+msgid "IPP integer value not 4 bytes."
+msgstr ""
+
+#: cups/ipp.c:3045
+msgid "IPP language length overflows value."
+msgstr ""
+
+#: cups/ipp.c:2764
+msgid "IPP member name is not empty."
+msgstr ""
+
+#: cups/ipp.c:3122
+msgid "IPP memberName value is empty."
+msgstr ""
+
+#: cups/ipp.c:2633
+msgid "IPP name larger than 32767 bytes."
+msgstr ""
+
+#: cups/ipp.c:3011
+msgid "IPP nameWithLanguage value less than minimum 4 bytes."
+msgstr ""
+
+#: cups/ipp.c:2979
+msgid "IPP rangeOfInteger value not 8 bytes."
+msgstr ""
+
+#: cups/ipp.c:2952
+msgid "IPP resolution value not 9 bytes."
+msgstr ""
+
+#: cups/ipp.c:3063
+msgid "IPP string length overflows value."
+msgstr ""
+
+#: cups/ipp.c:3007
+msgid "IPP textWithLanguage value less than minimum 4 bytes."
+msgstr ""
+
+#: cups/ipp.c:2831
+msgid "IPP value larger than 32767 bytes."
+msgstr ""
+
+#: ppdc/sample.c:1
+msgid "ISOLatin1"
+msgstr "ISOLatin1"
+
+#: cups/ppd.c:353
+msgid "Illegal control character"
+msgstr "Neplatný řídící znak"
+
+#: cups/ppd.c:354
+msgid "Illegal main keyword string"
+msgstr "Neplatné hlavní klíčové slovo řetězce"
+
+#: cups/ppd.c:355
+msgid "Illegal option keyword string"
+msgstr "Neplatná volba klíčového slova řetězce"
+
+#: cups/ppd.c:356
+msgid "Illegal translation string"
+msgstr "Neplatný překlad řetězce"
+
+#: cups/ppd.c:357
+msgid "Illegal whitespace character"
+msgstr "Nedovolený prázdný znak"
+
+#: ppdc/sample.c:274
+msgid "Installable Options"
+msgstr "Možnosti instalace"
+
+#: ppdc/sample.c:277
+msgid "Installed"
+msgstr "Instalovaný"
+
+#: ppdc/sample.c:293
+msgid "IntelliBar Label Printer"
+msgstr "Tiskárna štítků \"IntelliBar\""
+
+#: ppdc/sample.c:292
+msgid "Intellitech"
+msgstr "Intellitech"
+
+#: cups/http-support.c:1333
+msgid "Internal Server Error"
+msgstr ""
+
+#: cups/ppd.c:344
+msgid "Internal error"
+msgstr "Vniřní chyba"
+
+#: ppdc/sample.c:167
+msgid "Internet Postage 2-Part"
+msgstr "Internet Postage 2-Part"
+
+#: ppdc/sample.c:168
+msgid "Internet Postage 3-Part"
+msgstr "Internet Postage 3-Part"
+
+#: backend/ipp.c:307
+msgid "Internet Printing Protocol"
+msgstr "Internetový tiskový protokol"
+
+#: cups/dest-options.c:839
+msgid "Invalid media size."
+msgstr ""
+
+#: filter/commandtops.c:125
+#, c-format
+msgid "Invalid printer command \"%s\"."
+msgstr ""
+
+#: cups/ppd.c:1420
+msgid "JCL"
+msgstr "JCL"
+
+#: ppdc/sample.c:53
+msgid "JIS B0"
+msgstr ""
+
+#: ppdc/sample.c:55
+msgid "JIS B1"
+msgstr ""
+
+#: ppdc/sample.c:54
+msgid "JIS B10"
+msgstr ""
+
+#: ppdc/sample.c:56
+msgid "JIS B2"
+msgstr ""
+
+#: ppdc/sample.c:57
+msgid "JIS B3"
+msgstr ""
+
+#: ppdc/sample.c:58
+msgid "JIS B4"
+msgstr ""
+
+#: ppdc/sample.c:59
+msgid "JIS B4 Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:60
+msgid "JIS B5"
+msgstr ""
+
+#: ppdc/sample.c:61
+msgid "JIS B5 Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:62
+msgid "JIS B6"
+msgstr ""
+
+#: ppdc/sample.c:63
+msgid "JIS B6 Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:64
+msgid "JIS B7"
+msgstr ""
+
+#: ppdc/sample.c:65
+msgid "JIS B8"
+msgstr ""
+
+#: ppdc/sample.c:66
+msgid "JIS B9"
+msgstr ""
+
+#: scheduler/ipp.c:9051
+#, c-format
+msgid "Job #%d cannot be restarted - no files."
+msgstr ""
+
+#: scheduler/ipp.c:2992 scheduler/ipp.c:3222 scheduler/ipp.c:3277
+#: scheduler/ipp.c:3454 scheduler/ipp.c:3900 scheduler/ipp.c:5720
+#: scheduler/ipp.c:6096 scheduler/ipp.c:6243 scheduler/ipp.c:6543
+#: scheduler/ipp.c:7482 scheduler/ipp.c:7504 scheduler/ipp.c:7676
+#: scheduler/ipp.c:7901 scheduler/ipp.c:7944 scheduler/ipp.c:8793
+#: scheduler/ipp.c:9019 scheduler/ipp.c:9368 scheduler/ipp.c:9971
+#, c-format
+msgid "Job #%d does not exist."
+msgstr ""
+
+#: scheduler/ipp.c:3486
+#, c-format
+msgid "Job #%d is already aborted - can't cancel."
+msgstr "Úloha #%d je již zrušena - nelze zrušit."
+
+#: scheduler/ipp.c:3480
+#, c-format
+msgid "Job #%d is already canceled - can't cancel."
+msgstr "Úloha #%d je již zrušena - nelze zrušit."
+
+#: scheduler/ipp.c:3492
+#, c-format
+msgid "Job #%d is already completed - can't cancel."
+msgstr "Úloha #%d je již dokončena - nelze zrušit."
+
+#: scheduler/ipp.c:7702 scheduler/ipp.c:7986 scheduler/ipp.c:9986
+#, c-format
+msgid "Job #%d is finished and cannot be altered."
+msgstr ""
+
+#: scheduler/ipp.c:9033
+#, c-format
+msgid "Job #%d is not complete."
+msgstr ""
+
+#: scheduler/ipp.c:3007
+#, c-format
+msgid "Job #%d is not held for authentication."
+msgstr ""
+
+#: scheduler/ipp.c:8807
+#, c-format
+msgid "Job #%d is not held."
+msgstr ""
+
+#: cgi-bin/ipp-var.c:1055
+msgid "Job Completed"
+msgstr "Úloha dokončena"
+
+#: cgi-bin/ipp-var.c:1053
+msgid "Job Created"
+msgstr "Úloha vytvořena"
+
+#: cgi-bin/ipp-var.c:1059
+msgid "Job Options Changed"
+msgstr "Změna parametrů úlohy"
+
+#: cgi-bin/ipp-var.c:1057
+msgid "Job Stopped"
+msgstr "Úloha zastavena"
+
+#: scheduler/ipp.c:10068
+msgid "Job is completed and cannot be changed."
+msgstr "Úloha je dokončena a nelze ji změnit."
+
+#: cgi-bin/jobs.c:198
+msgid "Job operation failed"
+msgstr "Úloha se nezdařila"
+
+#: scheduler/ipp.c:10104 scheduler/ipp.c:10123 scheduler/ipp.c:10134
+msgid "Job state cannot be changed."
+msgstr "Stav úlohy nelze změnit."
+
+#: scheduler/ipp.c:8899
+msgid "Job subscriptions cannot be renewed."
+msgstr ""
+
+#: cgi-bin/jobs.c:103 cgi-bin/jobs.c:114 cgi-bin/jobs.c:195
+msgid "Jobs"
+msgstr "Úlohy"
+
+#: backend/lpd.c:185
+msgid "LPD/LPR Host or Printer"
+msgstr "LPD/LPR hostitel nebo tiskárna"
+
+#: ppdc/sample.c:230
+msgid "Label Printer"
+msgstr "Tiskárna štítků"
+
+#: ppdc/sample.c:446
+msgid "Label Top"
+msgstr "Horní štítek"
+
+#: scheduler/ipp.c:2070 scheduler/ipp.c:5643
+#, c-format
+msgid "Language \"%s\" not supported."
+msgstr ""
+
+#: ppdc/sample.c:164
+msgid "Large Address"
+msgstr "Plná adresa"
+
+#: ppdc/sample.c:291
+msgid "LaserJet Series PCL 4/5"
+msgstr "LaserJet Serie PCL 4/5"
+
+#: ppdc/sample.c:43
+msgid "Letter Oversize"
+msgstr ""
+
+#: ppdc/sample.c:44
+msgid "Letter Oversize Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:236
+msgid "Light"
+msgstr "Světlý"
+
+#: cups/ppd.c:352
+msgid "Line longer than the maximum allowed (255 characters)"
+msgstr "Řádek je delší než maximální povolená velikost (255 znaků)"
+
+#: cgi-bin/admin.c:2393
+msgid "List Available Printers"
+msgstr "Seznam dostupných tiskáren"
+
+#: ppdc/sample.c:272
+msgid "Long-Edge (Portrait)"
+msgstr "Delší okraj (na výšku)"
+
+#: cups/http-support.c:1558
+msgid "Looking for printer."
+msgstr ""
+
+#: ppdc/sample.c:268
+msgid "Manual Feed"
+msgstr "Ruční podávání"
+
+#: cups/ppd.c:789 cups/ppd.c:1357
+msgid "Media Size"
+msgstr "Velikost média"
+
+#: cups/ppd.c:793 cups/ppd.c:1361 ppdc/sample.c:262
+msgid "Media Source"
+msgstr "Zdroj média"
+
+#: ppdc/sample.c:364
+msgid "Media Tracking"
+msgstr "Sledování média"
+
+#: cups/ppd.c:791 cups/ppd.c:1359 ppdc/sample.c:285
+msgid "Media Type"
+msgstr "Typ média"
+
+#: ppdc/sample.c:237
+msgid "Medium"
+msgstr "Střední"
+
+#: cups/ppd.c:341
+msgid "Memory allocation error"
+msgstr "Chyba přidělení paměti"
+
+#: cups/ppd.c:361
+msgid "Missing CloseGroup"
+msgstr ""
+
+#: cups/ppd.c:342
+msgid "Missing PPD-Adobe-4.x header"
+msgstr "Chybějící záhlaví PPD-Adobe-4.x"
+
+#: cups/ppd.c:351
+msgid "Missing asterisk in column 1"
+msgstr "Chybí hvězdička ve sloupci 1"
+
+#: scheduler/ipp.c:6119
+msgid "Missing document-number attribute."
+msgstr ""
+
+#: cups/adminutil.c:273
+#, c-format
+msgid "Missing double quote on line %d."
+msgstr ""
+
+#: cgi-bin/admin.c:736 cgi-bin/admin.c:2106 cgi-bin/admin.c:2191
+#: cgi-bin/admin.c:2785 cgi-bin/admin.c:3039 cgi-bin/admin.c:3150
+#: cgi-bin/admin.c:3860
+msgid "Missing form variable"
+msgstr ""
+
+#: scheduler/ipp.c:9422
+msgid "Missing last-document attribute in request."
+msgstr ""
+
+#: cups/pwg-media.c:535
+msgid "Missing media or media-col."
+msgstr ""
+
+#: cups/pwg-media.c:454
+msgid "Missing media-size in media-col."
+msgstr ""
+
+#: scheduler/ipp.c:6673
+msgid "Missing notify-subscription-ids attribute."
+msgstr ""
+
+#: cups/ppd.c:359
+msgid "Missing option keyword"
+msgstr ""
+
+#: scheduler/ipp.c:3133 scheduler/ipp.c:3158
+msgid "Missing requesting-user-name attribute."
+msgstr ""
+
+#: scheduler/ipp.c:461
+msgid "Missing required attributes."
+msgstr ""
+
+#: cups/adminutil.c:254
+#, c-format
+msgid "Missing value on line %d."
+msgstr ""
+
+#: cups/ppd.c:343
+msgid "Missing value string"
+msgstr "Chybí hodnota řetězce"
+
+#: cups/pwg-media.c:442
+msgid "Missing x-dimension in media-size."
+msgstr ""
+
+#: cups/pwg-media.c:448
+msgid "Missing y-dimension in media-size."
+msgstr ""
+
+#: systemv/lpinfo.c:470
+#, c-format
+msgid ""
+"Model:  name = %s\n"
+"        natural_language = %s\n"
+"        make-and-model = %s\n"
+"        device-id = %s"
+msgstr ""
+
+#: cgi-bin/admin.c:570
+msgid "Modify Class"
+msgstr "Úprava třídy"
+
+#: cgi-bin/admin.c:882
+msgid "Modify Printer"
+msgstr "Úprava tiskárny"
+
+#: cgi-bin/ipp-var.c:425 cgi-bin/ipp-var.c:516
+msgid "Move All Jobs"
+msgstr "Přesun všech úloh"
+
+#: cgi-bin/ipp-var.c:364 cgi-bin/ipp-var.c:423 cgi-bin/ipp-var.c:514
+msgid "Move Job"
+msgstr "Přesun úlohy"
+
+#: cups/http-support.c:1290
+msgid "Moved Permanently"
+msgstr "Trvale přesunuto"
+
+#: cups/ppd.c:340
+msgid "NULL PPD file pointer"
+msgstr "Prázdný ukazatel PPD souboru"
+
+#: cups/snmp.c:1053
+msgid "Name OID uses indefinite length"
+msgstr "Název \"OID\" má neomezenou délku"
+
+#: scheduler/ipp.c:1142
+msgid "Nested classes are not allowed."
+msgstr ""
+
+#: ppdc/sample.c:430
+msgid "Never"
+msgstr "Nikdy"
+
+#: ppdc/sample.c:256
+msgid "New Stylus Color Series"
+msgstr "New Stylus Color Series"
+
+#: ppdc/sample.c:258
+msgid "New Stylus Photo Series"
+msgstr "New Stylus Photo Series"
+
+#: cups/ppd.c:1949
+msgid "No"
+msgstr "Ne"
+
+#: cups/http-support.c:1287
+msgid "No Content"
+msgstr "Žádný obsah"
+
+#: cups/util.c:1298
+msgid "No PPD name"
+msgstr ""
+
+#: cups/snmp.c:1047
+msgid "No VarBind SEQUENCE"
+msgstr "Žádná VarBind SEQUENCE"
+
+#: cups/adminutil.c:788
+msgid "No Windows printer drivers are installed."
+msgstr ""
+
+#: cups/request.c:566 cups/request.c:908
+msgid "No active connection"
+msgstr "Není aktivní spojení"
+
+#: scheduler/ipp.c:3403
+#, c-format
+msgid "No active jobs on %s."
+msgstr ""
+
+#: scheduler/ipp.c:302
+msgid "No attributes in request."
+msgstr ""
+
+#: scheduler/ipp.c:3034
+msgid "No authentication information provided."
+msgstr ""
+
+#: cups/snmp.c:1004
+msgid "No community name"
+msgstr "Žádný název komunity"
+
+#: scheduler/ipp.c:5919
+msgid "No default printer."
+msgstr ""
+
+#: cgi-bin/ipp-var.c:436 scheduler/ipp.c:7248
+msgid "No destinations added."
+msgstr "Zařízení nepřidáno."
+
+#: backend/usb.c:200
+msgid "No device URI found in argv[0] or in DEVICE_URI environment variable."
+msgstr ""
+
+#: cups/snmp.c:1034
+msgid "No error-index"
+msgstr "Žádný \"error-index\""
+
+#: cups/snmp.c:1026
+msgid "No error-status"
+msgstr "Žádný \"error-status\""
+
+#: scheduler/ipp.c:8190 scheduler/ipp.c:9436
+msgid "No file in print request."
+msgstr ""
+
+#: cups/util.c:923
+msgid "No modification time"
+msgstr ""
+
+#: cups/snmp.c:1051
+msgid "No name OID"
+msgstr "Žádný název OID"
+
+#: filter/rastertoepson.c:1147 filter/rastertohp.c:876
+#: filter/rastertolabel.c:1302
+msgid "No pages were found."
+msgstr ""
+
+#: cups/util.c:917
+msgid "No printer name"
+msgstr ""
+
+#: cups/util.c:1801
+msgid "No printer-uri found"
+msgstr ""
+
+#: cups/util.c:1786
+msgid "No printer-uri found for class"
+msgstr ""
+
+#: scheduler/ipp.c:6322
+msgid "No printer-uri in request."
+msgstr ""
+
+#: cups/snmp.c:1018
+msgid "No request-id"
+msgstr "Žádný ID požadavek"
+
+#: scheduler/ipp.c:5528
+msgid "No subscription attributes in request."
+msgstr ""
+
+#: scheduler/ipp.c:7575
+msgid "No subscriptions found."
+msgstr "Nenalezeno předplatné."
+
+#: cups/snmp.c:1042
+msgid "No variable-bindings SEQUENCE"
+msgstr "Žádná \"variable-bindings\" SEQUENCE"
+
+#: cups/snmp.c:997
+msgid "No version number"
+msgstr "Není číslo verze"
+
+#: ppdc/sample.c:367
+msgid "Non-continuous (Mark sensing)"
+msgstr "Není souvislý (Mark Sensing)"
+
+#: ppdc/sample.c:366
+msgid "Non-continuous (Web sensing)"
+msgstr "Není souvislý (Web Sensing)"
+
+#: ppdc/sample.c:238
+msgid "Normal"
+msgstr "Normální"
+
+#: cups/http-support.c:1309
+msgid "Not Found"
+msgstr "Nebyl nalezen"
+
+#: cups/http-support.c:1321
+msgid "Not Implemented"
+msgstr "Nerealizováno"
+
+#: ppdc/sample.c:276
+msgid "Not Installed"
+msgstr "Nenainstalováno"
+
+#: cups/http-support.c:1296
+msgid "Not Modified"
+msgstr "Nezměněno"
+
+#: cups/http-support.c:1324
+msgid "Not Supported"
+msgstr "Nepodporováno"
+
+#: scheduler/ipp.c:1518 scheduler/ipp.c:10666
+msgid "Not allowed to print."
+msgstr "Není povoleno tisknout."
+
+#: ppdc/sample.c:146
+msgid "Note"
+msgstr "Poznámka"
+
+#: systemv/cupstestdsc.c:433
+msgid "Note: this program only validates the DSC comments, not the PostScript itself."
+msgstr ""
+
+#: cups/http-support.c:1278 cups/ppd.c:338
+msgid "OK"
+msgstr "OK"
+
+#: ppdc/sample.c:271
+msgid "Off (1-Sided)"
+msgstr "Vypnuto (jednostranný)"
+
+#: ppdc/sample.c:361
+msgid "Oki"
+msgstr "Oki"
+
+#: cgi-bin/help.c:91 cgi-bin/help.c:132 cgi-bin/help.c:142 cgi-bin/help.c:172
+msgid "Online Help"
+msgstr "Nápověda"
+
+#: cups/adminutil.c:955
+#, c-format
+msgid "Open of %s failed: %s"
+msgstr "Otevření %s selhalo: %s"
+
+#: cups/ppd.c:346
+msgid "OpenGroup without a CloseGroup first"
+msgstr "Opengroup nepředcházelo CloseGroup"
+
+#: cups/ppd.c:348
+msgid "OpenUI/JCLOpenUI without a CloseUI/JCLCloseUI first"
+msgstr "OpenUI/JCLOpenUI nepředcházelo CloseUI/JCLCloseUI"
+
+#: cgi-bin/admin.c:3631
+msgid "Operation Policy"
+msgstr "Způsob ověření"
+
+#: filter/pstops.c:2205
+#, c-format
+msgid "Option \"%s\" cannot be included via %%%%IncludeFeature."
+msgstr ""
+
+#: cgi-bin/admin.c:3281 cgi-bin/admin.c:3365
+msgid "Options Installed"
+msgstr "Instalované možnosti"
+
+#: scheduler/cupsfilter.c:1430 scheduler/main.c:2018 systemv/cupsaddsmb.c:284
+#: systemv/cupsctl.c:203 systemv/cupstestdsc.c:429 systemv/cupstestppd.c:3797
+#: test/ipptool.c:4403 ppdc/ppdc.cxx:437 ppdc/ppdhtml.cxx:174
+#: ppdc/ppdi.cxx:130 ppdc/ppdmerge.cxx:369 ppdc/ppdpo.cxx:254
+msgid "Options:"
+msgstr ""
+
+#: cups/ppd-cache.c:156
+msgid "Out of date PPD cache file."
+msgstr ""
+
+#: cups/ppd-cache.c:1381
+msgid "Out of memory."
+msgstr ""
+
+#: cups/ppd.c:795 cups/ppd.c:1363
+msgid "Output Mode"
+msgstr "Výstupní režim"
+
+#: systemv/lpstat.c:1191 systemv/lpstat.c:1195
+#, c-format
+msgid "Output for printer %s is sent to %s"
+msgstr ""
+
+#: systemv/lpstat.c:1185
+#, c-format
+msgid "Output for printer %s is sent to remote printer %s on %s"
+msgstr ""
+
+#: systemv/lpstat.c:1209 systemv/lpstat.c:1213
+#, c-format
+msgid "Output for printer %s/%s is sent to %s"
+msgstr ""
+
+#: systemv/lpstat.c:1203
+#, c-format
+msgid "Output for printer %s/%s is sent to remote printer %s on %s"
+msgstr ""
+
+#: systemv/cupstestdsc.c:399
+msgid "PASS"
+msgstr ""
+
+#: ppdc/sample.c:260
+msgid "PCL Laser Printer"
+msgstr "PCL laserová tiskárna"
+
+#: ppdc/sample.c:149
+msgid "PRC16K"
+msgstr "PRC16K"
+
+#: ppdc/sample.c:150
+msgid "PRC16K Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:151
+msgid "PRC32K"
+msgstr "PRC32K"
+
+#: ppdc/sample.c:154
+msgid "PRC32K Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:152
+msgid "PRC32K Oversize"
+msgstr ""
+
+#: ppdc/sample.c:153
+msgid "PRC32K Oversize Long Edge"
+msgstr ""
+
+#: cups/snmp.c:1014
+msgid "Packet does not contain a Get-Response-PDU"
+msgstr "Packet neobsahuje \"Get-Response-PDU\""
+
+#: cups/snmp.c:993
+msgid "Packet does not start with SEQUENCE"
+msgstr "Paket nezačíná SEQUENCÍ"
+
+#: ppdc/sample.c:360
+msgid "ParamCustominCutInterval"
+msgstr "ParamCustominCutInterval"
+
+#: ppdc/sample.c:358
+msgid "ParamCustominTearInterval"
+msgstr "ParamCustominTearInterval"
+
+#: cups/auth.c:199 cups/auth.c:367
+#, c-format
+msgid "Password for %s on %s? "
+msgstr "Heslo pro %s na %s? "
+
+#: systemv/cupsaddsmb.c:252
+#, c-format
+msgid "Password for %s required to access %s via SAMBA: "
+msgstr "Heslo pro %s je vyžadováno pro přístup k %s přes Sambu: "
+
+#: cgi-bin/classes.c:167
+msgid "Pause Class"
+msgstr "Pozastavení třídy"
+
+#: cgi-bin/printers.c:170
+msgid "Pause Printer"
+msgstr "Pozastavení tiskárny"
+
+#: ppdc/sample.c:448
+msgid "Peel-Off"
+msgstr "Peel-Off"
+
+#: ppdc/sample.c:160
+msgid "Photo"
+msgstr "Fotografie"
+
+#: ppdc/sample.c:161
+msgid "Photo Labels"
+msgstr "Foto-samolepky"
+
+#: ppdc/sample.c:286
+msgid "Plain Paper"
+msgstr "Obyčejný papír"
+
+#: cgi-bin/admin.c:3299 cgi-bin/admin.c:3580
+msgid "Policies"
+msgstr "Pravidla"
+
+#: cgi-bin/admin.c:3306 cgi-bin/admin.c:3649 cgi-bin/admin.c:3662
+msgid "Port Monitor"
+msgstr "Monitorování portu"
+
+#: ppdc/sample.c:278
+msgid "PostScript Printer"
+msgstr "PostScriptová tiskárna"
+
+#: ppdc/sample.c:147
+msgid "Postcard"
+msgstr "Pohlednice"
+
+#: ppdc/sample.c:71
+msgid "Postcard Double "
+msgstr ""
+
+#: ppdc/sample.c:72
+msgid "Postcard Double Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:148
+msgid "Postcard Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:295
+msgid "Print Density"
+msgstr "Hustota tisku"
+
+#: cups/notify.c:82
+msgid "Print Job:"
+msgstr "Tisk úlohy:"
+
+#: ppdc/sample.c:340
+msgid "Print Mode"
+msgstr "Režim tisku"
+
+#: ppdc/sample.c:383
+msgid "Print Rate"
+msgstr "Kvalita tisku"
+
+#: cgi-bin/printers.c:179
+msgid "Print Self-Test Page"
+msgstr "Tisk \"self-test\" stránky"
+
+#: ppdc/sample.c:327
+msgid "Print Speed"
+msgstr "Rychlost tisku"
+
+#: cgi-bin/ipp-var.c:792
+msgid "Print Test Page"
+msgstr "Tisk zkušební stránky"
+
+#: ppdc/sample.c:356
+msgid "Print and Cut"
+msgstr "Tisk a vyjmout"
+
+#: ppdc/sample.c:344
+msgid "Print and Tear"
+msgstr "Tisk a odtrhnout"
+
+#: backend/ipp.c:1537
+#, c-format
+msgid "Print file accepted - job ID %d."
+msgstr ""
+
+#: backend/ipp.c:1527
+msgid "Print file accepted - job ID unknown."
+msgstr ""
+
+#: backend/socket.c:424 backend/usb-unix.c:191
+msgid "Print file sent."
+msgstr ""
+
+#: backend/ipp.c:1488
+msgid "Print file was not accepted."
+msgstr ""
+
+#: backend/ipp.c:1895
+msgid "Print job canceled at printer."
+msgstr ""
+
+#: backend/ipp.c:1890
+msgid "Print job too large."
+msgstr ""
+
+#: cgi-bin/ipp-var.c:1047
+msgid "Printer Added"
+msgstr "Tiskárna přidána"
+
+#: ppdc/sample.c:263
+msgid "Printer Default"
+msgstr "Výchozí tiskárna"
+
+#: cgi-bin/ipp-var.c:1051
+msgid "Printer Deleted"
+msgstr "Tiskárna vymazána"
+
+#: cgi-bin/ipp-var.c:1049
+msgid "Printer Modified"
+msgstr "Tiskárna upravena"
+
+#: cgi-bin/ipp-var.c:1045
+msgid "Printer Paused"
+msgstr "Tiskárna zastavena"
+
+#: ppdc/sample.c:294
+msgid "Printer Settings"
+msgstr "Nastavení tiskárny"
+
+#: backend/ipp.c:1893
+msgid "Printer cannot print supplied content."
+msgstr ""
+
+#: cups/notify.c:126
+msgid "Printer:"
+msgstr "Tiskárna:"
+
+#: cgi-bin/printers.c:204 cgi-bin/printers.c:332
+msgid "Printers"
+msgstr "Tiskárny"
+
+#: filter/rastertoepson.c:1093 filter/rastertohp.c:817
+#: filter/rastertolabel.c:1249
+#, c-format
+msgid "Printing page %d, %d%% complete."
+msgstr ""
+
+#: cgi-bin/classes.c:173 cgi-bin/printers.c:176
+msgid "Purge Jobs"
+msgstr "Výmaz úloh"
+
+#: ppdc/sample.c:155
+msgid "Quarto"
+msgstr "Quarto"
+
+#: scheduler/ipp.c:1513 scheduler/ipp.c:10661
+msgid "Quota limit reached."
+msgstr "Kvóta byla překročena."
+
+#: berkeley/lpq.c:515
+msgid "Rank    Owner   Job     File(s)                         Total Size"
+msgstr ""
+
+#. TRANSLATORS: Pri is job priority.
+#: berkeley/lpq.c:511
+msgid "Rank   Owner      Pri  Job        Files                       Total Size"
+msgstr ""
+
+#: cgi-bin/classes.c:171 cgi-bin/printers.c:174
+msgid "Reject Jobs"
+msgstr "Odmítnutí úloh"
+
+#: backend/lpd.c:1016 backend/lpd.c:1148
+#, c-format
+msgid "Remote host did not accept control file (%d)."
+msgstr ""
+
+#: backend/lpd.c:1101
+#, c-format
+msgid "Remote host did not accept data file (%d)."
+msgstr ""
+
+#: ppdc/sample.c:428
+msgid "Reprint After Error"
+msgstr "Opakovat tisk po chybě"
+
+#: cups/http-support.c:1312
+msgid "Request Entity Too Large"
+msgstr "Dotaz Entity je příliš dlouhý"
+
+#: cups/ppd.c:797 cups/ppd.c:1365 ppdc/sample.c:231
+msgid "Resolution"
+msgstr "Rozlišení"
+
+#: cgi-bin/classes.c:165
+msgid "Resume Class"
+msgstr "Obnovení třídy"
+
+#: cgi-bin/printers.c:167
+msgid "Resume Printer"
+msgstr "Obnovení tiskárny"
+
+#: ppdc/sample.c:165
+msgid "Return Address"
+msgstr "Návrat adresy"
+
+#: ppdc/sample.c:449
+msgid "Rewind"
+msgstr "Přetočit"
+
+#: cups/adminutil.c:2052
+#, c-format
+msgid "Running command: %s %s -N -A %s -c '%s'"
+msgstr ""
+
+#: cups/snmp.c:995
+msgid "SEQUENCE uses indefinite length"
+msgstr "\"SEQUENCE\" má neomezenou délku"
+
+#: cups/http-support.c:1336
+msgid "SSL/TLS Negotiation Error"
+msgstr ""
+
+#: cups/http-support.c:1293
+msgid "See Other"
+msgstr "Viz další"
+
+#: backend/usb-darwin.c:543 backend/usb-libusb.c:273
+msgid "Sending data to printer."
+msgstr ""
+
+#: cgi-bin/ipp-var.c:1061
+msgid "Server Restarted"
+msgstr "Restart serveru"
+
+#: cgi-bin/ipp-var.c:1067
+msgid "Server Security Auditing"
+msgstr "Audit bezpečnosti serveru"
+
+#: cgi-bin/ipp-var.c:1063
+msgid "Server Started"
+msgstr "Start serveru"
+
+#: cgi-bin/ipp-var.c:1065
+msgid "Server Stopped"
+msgstr "Zastavení serveru"
+
+#: cups/http-support.c:1330
+msgid "Service Unavailable"
+msgstr "Služba je nedostupná"
+
+#: cgi-bin/admin.c:2786 cgi-bin/admin.c:2832 cgi-bin/admin.c:2989
+#: cgi-bin/admin.c:3008
+msgid "Set Allowed Users"
+msgstr "Nastavení přístupu uživatelů"
+
+#: cgi-bin/admin.c:3035
+msgid "Set As Server Default"
+msgstr "Nastavení jako výchozí na serveru"
+
+#: cgi-bin/admin.c:3135
+msgid "Set Class Options"
+msgstr "Nastavení parametrů třídy"
+
+#: cgi-bin/admin.c:3135 cgi-bin/admin.c:3309 cgi-bin/admin.c:3691
+msgid "Set Printer Options"
+msgstr "Nastavení parametrů tiskárny"
+
+#: cgi-bin/admin.c:3861 cgi-bin/admin.c:3905 cgi-bin/admin.c:3923
+msgid "Set Publishing"
+msgstr "Nastavení vydávání"
+
+#: ppdc/sample.c:166
+msgid "Shipping Address"
+msgstr "Doručovací adresa"
+
+#: ppdc/sample.c:273
+msgid "Short-Edge (Landscape)"
+msgstr "Kratší okraj (na šířku)"
+
+#: ppdc/sample.c:288
+msgid "Special Paper"
+msgstr "Speciální papír"
+
+#: backend/lpd.c:1057
+#, c-format
+msgid "Spooling job, %.0f%% complete."
+msgstr ""
+
+#: ppdc/sample.c:341
+msgid "Standard"
+msgstr "Standardní"
+
+#. TRANSLATORS: Banner/cover sheet before the print job.
+#: cgi-bin/admin.c:3552
+msgid "Starting Banner"
+msgstr "Spuštění baneru"
+
+#: filter/rastertoepson.c:1069 filter/rastertohp.c:793
+#: filter/rastertolabel.c:1225
+#, c-format
+msgid "Starting page %d."
+msgstr ""
+
+#: ppdc/sample.c:156
+msgid "Statement"
+msgstr "Prohlášení"
+
+#: ppdc/sample.c:251
+msgid "Stylus Color Series"
+msgstr "Stylus Color Series"
+
+#: ppdc/sample.c:257
+msgid "Stylus Photo Series"
+msgstr "Stylus Photo Series"
+
+#: scheduler/ipp.c:3549 scheduler/ipp.c:6689 scheduler/ipp.c:7388
+#: scheduler/ipp.c:8887
+#, c-format
+msgid "Subscription #%d does not exist."
+msgstr ""
+
+#: ppdc/sample.c:157
+msgid "Super A"
+msgstr "Super A"
+
+#: ppdc/sample.c:158
+msgid "Super B"
+msgstr "Super B"
+
+#: ppdc/sample.c:162
+msgid "Super B/A3"
+msgstr "Super B/A3"
+
+#: cups/http-support.c:1275
+msgid "Switching Protocols"
+msgstr "Protokol výměny"
+
+#: ppdc/sample.c:159
+msgid "Tabloid"
+msgstr "Tabloid"
+
+#: ppdc/sample.c:45
+msgid "Tabloid Oversize"
+msgstr ""
+
+#: ppdc/sample.c:46
+msgid "Tabloid Oversize Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:342
+msgid "Tear"
+msgstr "Odtrhnout"
+
+#: ppdc/sample.c:447
+msgid "Tear-Off"
+msgstr "Odtrhnout"
+
+#: ppdc/sample.c:388
+msgid "Tear-Off Adjust Position"
+msgstr "Nastavení pozice odtržení"
+
+#: scheduler/ipp.c:6393 scheduler/ipp.c:6471 scheduler/ipp.c:6487
+#: scheduler/ipp.c:6505
+#, c-format
+msgid "The %s attribute cannot be provided with job-ids."
+msgstr ""
+
+#: scheduler/ipp.c:5118
+#, c-format
+msgid "The '%s' operation attribute cannot be supplied in a Create-Job request."
+msgstr ""
+
+#: scheduler/ipp.c:6919
+#, c-format
+msgid "The PPD file \"%s\" could not be found."
+msgstr "Soubor PPD \"%s\" nelze nalézt."
+
+#: scheduler/ipp.c:6906
+#, c-format
+msgid "The PPD file \"%s\" could not be opened: %s"
+msgstr "Soubor PPD \"%s\" nelze otevřít: %s"
+
+#: filter/rastertoepson.c:1038 filter/rastertohp.c:764
+#: filter/rastertolabel.c:1189
+msgid "The PPD file could not be opened."
+msgstr ""
+
+#: cgi-bin/admin.c:749
+msgid "The class name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#)."
+msgstr "Název třídy může obsahovat až 127 tisknutelných znaků a nesmí obsahovat mezery, lomítka (/), nebo křížek (#)."
+
+#: cups/localize.c:353
+msgid "The developer unit needs to be replaced."
+msgstr ""
+
+#: cups/localize.c:351
+msgid "The developer unit will need to be replaced soon."
+msgstr ""
+
+#: cups/localize.c:343
+msgid "The fuser's temperature is high."
+msgstr ""
+
+#: cups/localize.c:345
+msgid "The fuser's temperature is low."
+msgstr ""
+
+#: scheduler/ipp.c:2097
+msgid "The notify-lease-duration attribute cannot be used with job subscriptions."
+msgstr "Atribut \"notify-lease-duration\" nelze použít s přihlášenou úlohou."
+
+#: scheduler/ipp.c:2080 scheduler/ipp.c:5653
+#, c-format
+msgid "The notify-user-data value is too large (%d > 63 octets)."
+msgstr ""
+
+#: cups/localize.c:349
+msgid "The optical photoconductor needs to be replaced."
+msgstr ""
+
+#: cups/localize.c:347
+msgid "The optical photoconductor will need to be replaced soon."
+msgstr ""
+
+#: cups/localize.c:331
+msgid "The output bin is almost full."
+msgstr ""
+
+#: cups/localize.c:333
+msgid "The output bin is full."
+msgstr ""
+
+#: cups/localize.c:329
+msgid "The output bin is missing."
+msgstr ""
+
+#: cups/localize.c:325
+msgid "The paper tray is almost empty."
+msgstr ""
+
+#: cups/localize.c:327
+msgid "The paper tray is empty."
+msgstr ""
+
+#: cups/localize.c:323
+msgid "The paper tray is missing."
+msgstr ""
+
+#: cups/localize.c:306
+msgid "The paper tray needs to be filled."
+msgstr ""
+
+#: backend/ipp.c:909
+msgid "The printer URI is incorrect or no longer exists."
+msgstr ""
+
+#: backend/lpd.c:619 backend/lpd.c:1009 backend/lpd.c:1091 backend/lpd.c:1141
+msgid "The printer did not respond."
+msgstr ""
+
+#: backend/ipp.c:892 backend/ipp.c:899
+#, c-format
+msgid "The printer does not support IPP/%d.%d, trying IPP/%s."
+msgstr ""
+
+#: backend/ipp.c:757 backend/ipp.c:874 backend/ipp.c:980 backend/ipp.c:1313
+#: backend/ipp.c:1464 backend/lpd.c:828 backend/socket.c:374
+#: backend/usb-unix.c:131 backend/usb-unix.c:424 backend/usb-unix.c:507
+msgid "The printer is in use."
+msgstr ""
+
+#: backend/runloop.c:254 backend/runloop.c:374 cups/localize.c:311
+msgid "The printer is not connected."
+msgstr ""
+
+#: backend/ipp.c:735 backend/ipp.c:768 backend/ipp.c:870 backend/lpd.c:807
+#: backend/lpd.c:848 backend/socket.c:353 backend/socket.c:386
+msgid "The printer is not responding."
+msgstr ""
+
+#: backend/runloop.c:396
+msgid "The printer is now connected."
+msgstr ""
+
+#: backend/usb-darwin.c:1286
+msgid "The printer is now online."
+msgstr ""
+
+#: backend/usb-darwin.c:1307
+msgid "The printer is offline."
+msgstr ""
+
+#: cups/localize.c:335
+msgid "The printer is running low on ink."
+msgstr ""
+
+#: cups/localize.c:313
+msgid "The printer is running low on toner."
+msgstr ""
+
+#: backend/ipp.c:750 backend/lpd.c:821 backend/socket.c:367
+msgid "The printer is unreachable at this time."
+msgstr ""
+
+#: cups/localize.c:337
+msgid "The printer may be out of ink."
+msgstr ""
+
+#: cups/localize.c:315
+msgid "The printer may be out of toner."
+msgstr ""
+
+#: backend/ipp.c:744 backend/lpd.c:815 backend/socket.c:361
+msgid "The printer may not exist or is unavailable at this time."
+msgstr ""
+
+#: cgi-bin/admin.c:931
+msgid "The printer name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#)."
+msgstr "Název tiskárny může obsahovat až 127 tisknutelných znaků a nesmí obsahovat mezery, lomítka (/), nebo křížek (#)."
+
+#: scheduler/ipp.c:876 scheduler/ipp.c:1136 scheduler/ipp.c:3198
+#: scheduler/ipp.c:3369 scheduler/ipp.c:5101 scheduler/ipp.c:5487
+#: scheduler/ipp.c:5801 scheduler/ipp.c:6359 scheduler/ipp.c:7124
+#: scheduler/ipp.c:7180 scheduler/ipp.c:7494 scheduler/ipp.c:7760
+#: scheduler/ipp.c:7849 scheduler/ipp.c:7882 scheduler/ipp.c:8205
+#: scheduler/ipp.c:8598 scheduler/ipp.c:8679 scheduler/ipp.c:9840
+#: scheduler/ipp.c:10294 scheduler/ipp.c:10624 scheduler/ipp.c:10706
+#: scheduler/ipp.c:10998
+msgid "The printer or class does not exist."
+msgstr ""
+
+#: scheduler/ipp.c:1304
+msgid "The printer or class is not shared."
+msgstr ""
+
+#: cups/localize.c:317
+msgid "The printer's cover is open."
+msgstr ""
+
+#: cups/localize.c:321
+msgid "The printer's door is open."
+msgstr ""
+
+#: cups/localize.c:319
+msgid "The printer's interlock is open."
+msgstr ""
+
+#: cups/localize.c:339
+msgid "The printer's waste bin is almost full."
+msgstr ""
+
+#: cups/localize.c:341
+msgid "The printer's waste bin is full."
+msgstr ""
+
+#: scheduler/ipp.c:982 scheduler/ipp.c:2261
+#, c-format
+msgid "The printer-uri \"%s\" contains invalid characters."
+msgstr "Tiskárna-URI \"%s\" obsahuje neplatné znaky."
+
+#: scheduler/ipp.c:3175
+msgid "The printer-uri attribute is required."
+msgstr ""
+
+#: scheduler/ipp.c:966
+msgid "The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"."
+msgstr "Tiskárna-URI musí být ve tvaru \"ipp://HOSTNAME/classes/CLASSNAME\"."
+
+#: scheduler/ipp.c:2245
+msgid "The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"."
+msgstr "Tiskárna-URI musí být ve tvaru \"ipp://HOSTNAME/printers/PRINTERNAME\"."
+
+#: cgi-bin/admin.c:474
+msgid "The subscription name may not contain spaces, slashes (/), question marks (?), or the pound sign (#)."
+msgstr "Název předplatného nesmí obsahovat mezery, lomítka (/), otazník (?), nebo křížek (#)."
+
+#: scheduler/client.c:2450
+msgid "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to enable it."
+msgstr ""
+
+#: scheduler/ipp.c:6454
+#, c-format
+msgid "The which-jobs value \"%s\" is not supported."
+msgstr ""
+
+#: scheduler/ipp.c:5731
+msgid "There are too many subscriptions."
+msgstr "Existuje příliš mnoho předplatných."
+
+#: cups/localize.c:308
+msgid "There is a paper jam."
+msgstr ""
+
+#: backend/usb-darwin.c:379 backend/usb-darwin.c:438 backend/usb-darwin.c:505
+#: backend/usb-darwin.c:526 backend/usb-libusb.c:235 backend/usb-libusb.c:256
+msgid "There was an unrecoverable USB error."
+msgstr ""
+
+#: ppdc/sample.c:435
+msgid "Thermal Transfer Media"
+msgstr "Termální tisková média"
+
+#: scheduler/ipp.c:1507
+msgid "Too many active jobs."
+msgstr "Příliš mnoho aktivních úloh."
+
+#: scheduler/ipp.c:1401
+#, c-format
+msgid "Too many job-sheets values (%d > 2)."
+msgstr ""
+
+#: scheduler/ipp.c:2529
+#, c-format
+msgid "Too many printer-state-reasons values (%d > %d)."
+msgstr ""
+
+#: ppdc/sample.c:289
+msgid "Transparency"
+msgstr "Průhlednost"
+
+#: ppdc/sample.c:284
+msgid "Tray"
+msgstr "Podavač"
+
+#: ppdc/sample.c:264
+msgid "Tray 1"
+msgstr "Podavač 1"
+
+#: ppdc/sample.c:265
+msgid "Tray 2"
+msgstr "Podavač 2"
+
+#: ppdc/sample.c:266
+msgid "Tray 3"
+msgstr "Podavač 3"
+
+#: ppdc/sample.c:267
+msgid "Tray 4"
+msgstr "Podavač 4"
+
+#: cups/http-support.c:1315
+msgid "URI Too Long"
+msgstr "URI je příliš dlouhá"
+
+#: ppdc/sample.c:138
+msgid "US Ledger"
+msgstr "US Ledger"
+
+#: ppdc/sample.c:139
+msgid "US Legal"
+msgstr "US Legal"
+
+#: ppdc/sample.c:140
+msgid "US Legal Oversize"
+msgstr ""
+
+#: ppdc/sample.c:141
+msgid "US Letter"
+msgstr "US Letter"
+
+#: ppdc/sample.c:142
+msgid "US Letter Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:143
+msgid "US Letter Oversize"
+msgstr ""
+
+#: ppdc/sample.c:144
+msgid "US Letter Oversize Long Edge"
+msgstr ""
+
+#: ppdc/sample.c:145
+msgid "US Letter Small"
+msgstr ""
+
+#: cgi-bin/admin.c:1959 cgi-bin/admin.c:1972 cgi-bin/admin.c:1996
+msgid "Unable to access cupsd.conf file"
+msgstr "Nelze získat přístup k souboru \"cupsd.conf\""
+
+#: cgi-bin/help.c:133
+msgid "Unable to access help file."
+msgstr ""
+
+#: cgi-bin/admin.c:526
+msgid "Unable to add RSS subscription"
+msgstr "Nelze přidat RSS předplatné"
+
+#: cgi-bin/admin.c:814
+msgid "Unable to add class"
+msgstr "Nelze přidat třídu"
+
+#: backend/ipp.c:1635
+msgid "Unable to add document to print job."
+msgstr ""
+
+#: scheduler/ipp.c:1548
+#, c-format
+msgid "Unable to add job for destination \"%s\"."
+msgstr ""
+
+#: cgi-bin/admin.c:1059 cgi-bin/admin.c:1419
+msgid "Unable to add printer"
+msgstr "Nelze přidat tiskárnu"
+
+#: scheduler/ipp.c:1246
+msgid "Unable to allocate memory for file types."
+msgstr ""
+
+#: filter/pstops.c:451
+msgid "Unable to allocate memory for page info"
+msgstr ""
+
+#: filter/pstops.c:445
+msgid "Unable to allocate memory for pages array"
+msgstr ""
+
+#: cgi-bin/admin.c:1525
+msgid "Unable to cancel RSS subscription"
+msgstr "Nelze zrušit RSS předplatné"
+
+#: backend/ipp.c:1942
+msgid "Unable to cancel print job."
+msgstr ""
+
+#: cgi-bin/admin.c:2990
+msgid "Unable to change printer"
+msgstr "Nelze změnit tiskárnu"
+
+#: cgi-bin/admin.c:3906
+msgid "Unable to change printer-is-shared attribute"
+msgstr "Nelze změnit atribut \"sdílení tiskárny\""
+
+#: cgi-bin/admin.c:1657 cgi-bin/admin.c:1799
+msgid "Unable to change server settings"
+msgstr "Nelze změnit nastavení serveru"
+
+#: filter/commandtops.c:420
+msgid "Unable to configure printer options."
+msgstr ""
+
+#: cups/adminutil.c:911 cups/request.c:1016
+msgid "Unable to connect to host."
+msgstr "Nelze se připojit k hostiteli."
+
+#: backend/ipp.c:713 backend/ipp.c:1138 backend/lpd.c:787 backend/socket.c:333
+#: backend/usb-unix.c:117
+msgid "Unable to contact printer, queuing on next printer in class."
+msgstr ""
+
+#: cups/adminutil.c:726
+#, c-format
+msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
+msgstr ""
+
+#: cups/adminutil.c:691
+#, c-format
+msgid "Unable to copy 64-bit Windows printer driver files (%d)."
+msgstr ""
+
+#: cups/adminutil.c:522
+#, c-format
+msgid "Unable to copy CUPS printer driver files (%d)."
+msgstr ""
+
+#: scheduler/ipp.c:2649
+#, c-format
+msgid "Unable to copy PPD file - %s"
+msgstr ""
+
+#: scheduler/ipp.c:2704
+msgid "Unable to copy PPD file."
+msgstr ""
+
+#: cups/adminutil.c:487
+#, c-format
+msgid "Unable to copy Windows 2000 printer driver files (%d)."
+msgstr ""
+
+#: cups/adminutil.c:610
+#, c-format
+msgid "Unable to copy Windows 9x printer driver files (%d)."
+msgstr ""
+
+#: scheduler/ipp.c:2626
+#, c-format
+msgid "Unable to copy interface script - %s"
+msgstr ""
+
+#: backend/ipp.c:2034
+msgid "Unable to create compressed print file"
+msgstr ""
+
+#: cups/util.c:602 cups/util.c:1656
+msgid "Unable to create printer-uri"
+msgstr ""
+
+#: cgi-bin/admin.c:1850 cgi-bin/admin.c:1862 scheduler/cupsfilter.c:1236
+msgid "Unable to create temporary file"
+msgstr ""
+
+#: cgi-bin/admin.c:2153
+msgid "Unable to delete class"
+msgstr "Nelze vymazat třídu"
+
+#: cgi-bin/admin.c:2238
+msgid "Unable to delete printer"
+msgstr "Nelze vymazat tiskárnu"
+
+#: cgi-bin/classes.c:260 cgi-bin/printers.c:269
+msgid "Unable to do maintenance command"
+msgstr "Nelze provést příkaz údržby"
+
+#: cgi-bin/admin.c:1974
+msgid "Unable to edit cupsd.conf files larger than 1MB"
+msgstr ""
+
+#: cups/http.c:4272
+msgid "Unable to establish a secure connection to host (certificate chain invalid)."
+msgstr ""
+
+#: cups/http.c:4262
+msgid "Unable to establish a secure connection to host (certificate not yet valid)."
+msgstr ""
+
+#: cups/http.c:4257
+msgid "Unable to establish a secure connection to host (expired certificate)."
+msgstr ""
+
+#: cups/http.c:4267
+msgid "Unable to establish a secure connection to host (host name mismatch)."
+msgstr ""
+
+#: cups/http.c:4277
+msgid "Unable to establish a secure connection to host (peer dropped connection before responding)."
+msgstr ""
+
+#: cups/http.c:4252
+msgid "Unable to establish a secure connection to host (self-signed certificate)."
+msgstr ""
+
+#: cups/http.c:4247
+msgid "Unable to establish a secure connection to host (untrusted certificate)."
+msgstr ""
+
+#: cups/http.c:4008 cups/http.c:4304 cups/http.c:4337 cups/http.c:4354
+msgid "Unable to establish a secure connection to host."
+msgstr ""
+
+#: cgi-bin/ipp-var.c:365
+msgid "Unable to find destination for job"
+msgstr ""
+
+#: cups/http-support.c:1748
+msgid "Unable to find printer."
+msgstr ""
+
+#: backend/ipp.c:2056
+msgid "Unable to generate compressed print file"
+msgstr ""
+
+#: backend/ipp.c:3009
+msgid "Unable to get backend exit status."
+msgstr ""
+
+#: cgi-bin/classes.c:450
+msgid "Unable to get class list"
+msgstr "Nelze získat seznam tříd"
+
+#: cgi-bin/classes.c:549
+msgid "Unable to get class status"
+msgstr "Nelze získat stav třídy"
+
+#: cgi-bin/admin.c:1320
+msgid "Unable to get list of printer drivers"
+msgstr "Nelze získat seznam ovladačů tiskárny"
+
+#: cgi-bin/admin.c:2840
+msgid "Unable to get printer attributes"
+msgstr "Nelze získat atributy tiskárny"
+
+#: cgi-bin/printers.c:467
+msgid "Unable to get printer list"
+msgstr "Nelze získat seznam tiskáren"
+
+#: cgi-bin/printers.c:569
+msgid "Unable to get printer status"
+msgstr ""
+
+#: backend/ipp.c:933
+msgid "Unable to get printer status."
+msgstr "Nelze získat stav tiskárny."
+
+#: cups/adminutil.c:565 cups/adminutil.c:769
+#, c-format
+msgid "Unable to install Windows 2000 printer driver files (%d)."
+msgstr ""
+
+#: cups/adminutil.c:639
+#, c-format
+msgid "Unable to install Windows 9x printer driver files (%d)."
+msgstr ""
+
+#: cgi-bin/help.c:92
+msgid "Unable to load help index."
+msgstr ""
+
+#: backend/ipp.c:642 backend/lpd.c:421 backend/socket.c:275
+#, c-format
+msgid "Unable to locate printer \"%s\"."
+msgstr ""
+
+#: backend/dnssd.c:781 backend/ipp.c:324 backend/lpd.c:204
+#: backend/socket.c:171
+msgid "Unable to locate printer."
+msgstr ""
+
+#: cgi-bin/admin.c:813
+msgid "Unable to modify class"
+msgstr "Nelze změnit třídu"
+
+#: cgi-bin/admin.c:1058 cgi-bin/admin.c:1418
+msgid "Unable to modify printer"
+msgstr "Nelze změnit tiskárnu"
+
+#: cgi-bin/ipp-var.c:432 cgi-bin/ipp-var.c:521
+msgid "Unable to move job"
+msgstr "Nelze přesunout úlohu"
+
+#: cgi-bin/ipp-var.c:434 cgi-bin/ipp-var.c:523
+msgid "Unable to move jobs"
+msgstr "Nelze přesunout úlohy"
+
+#: cgi-bin/admin.c:3186 cups/ppd.c:339
+msgid "Unable to open PPD file"
+msgstr "Nelze otevřít PPD soubor"
+
+#: backend/ipp.c:2040
+msgid "Unable to open compressed print file"
+msgstr ""
+
+#: cgi-bin/admin.c:2608
+msgid "Unable to open cupsd.conf file:"
+msgstr "Nelze otevřít soubor \"cupsd.conf\":"
+
+#: backend/usb-unix.c:141
+msgid "Unable to open device file"
+msgstr ""
+
+#: scheduler/ipp.c:6140
+#, c-format
+msgid "Unable to open document #%d in job #%d."
+msgstr ""
+
+#: cgi-bin/help.c:364
+msgid "Unable to open help file."
+msgstr ""
+
+#: backend/ipp.c:365 backend/ipp.c:1398 backend/ipp.c:1594 backend/ipp.c:2046
+#: backend/lpd.c:488 backend/socket.c:158 backend/usb.c:237
+#: filter/gziptoany.c:71 filter/pstops.c:300
+msgid "Unable to open print file"
+msgstr ""
+
+#: filter/rastertoepson.c:998 filter/rastertohp.c:724
+#: filter/rastertolabel.c:1147
+msgid "Unable to open raster file"
+msgstr ""
+
+#: cgi-bin/ipp-var.c:795
+msgid "Unable to print test page"
+msgstr "Nelze vytisknout zkušební stránku"
+
+#: backend/runloop.c:96 backend/runloop.c:325 backend/usb-darwin.c:613
+#: backend/usb-darwin.c:657 backend/usb-libusb.c:343 backend/usb-libusb.c:378
+msgid "Unable to read print data."
+msgstr ""
+
+#: cups/dest.c:3402
+msgid "Unable to resolve printer URI."
+msgstr ""
+
+#: cups/adminutil.c:2088
+#, c-format
+msgid "Unable to run \"%s\": %s"
+msgstr ""
+
+#: filter/pstops.c:563
+msgid "Unable to see in file"
+msgstr ""
+
+#: cgi-bin/ipp-var.c:598 cgi-bin/ipp-var.c:618
+msgid "Unable to send command to printer driver"
+msgstr ""
+
+#: backend/usb-darwin.c:735 backend/usb-libusb.c:454
+msgid "Unable to send data to printer."
+msgstr ""
+
+#: cups/adminutil.c:821
+#, c-format
+msgid "Unable to set Windows printer driver (%d)."
+msgstr ""
+
+#: cgi-bin/admin.c:3807
+msgid "Unable to set options"
+msgstr "Nelze nastavit parametry"
+
+#: cgi-bin/admin.c:3077
+msgid "Unable to set server default"
+msgstr "Nelze nastavit výchozí server"
+
+#: backend/ipp.c:2868 backend/ipp.c:2945 backend/ipp.c:2953
+msgid "Unable to start backend process."
+msgstr ""
+
+#: cgi-bin/admin.c:1912
+msgid "Unable to upload cupsd.conf file"
+msgstr "Nelze nahrát soubor \"cupsd.conf\""
+
+#: backend/usb-darwin.c:1985 backend/usb-darwin.c:2009
+msgid "Unable to use legacy USB class driver."
+msgstr ""
+
+#: backend/runloop.c:125 backend/runloop.c:380
+msgid "Unable to write print data"
+msgstr ""
+
+#: filter/gziptoany.c:90
+#, c-format
+msgid "Unable to write uncompressed print data: %s"
+msgstr ""
+
+#: cups/http-support.c:1303
+msgid "Unauthorized"
+msgstr "Nepovolený"
+
+#: cgi-bin/admin.c:3503
+msgid "Units"
+msgstr "Jednotky"
+
+#: cups/http-support.c:1343 cups/ppd.c:366
+msgid "Unknown"
+msgstr "Neznámý"
+
+#: filter/pstops.c:2213
+#, c-format
+msgid "Unknown choice \"%s\" for option \"%s\"."
+msgstr ""
+
+#: backend/ipp.c:507
+#, c-format
+msgid "Unknown encryption option value: \"%s\"."
+msgstr ""
+
+#: backend/lpd.c:350
+#, c-format
+msgid "Unknown file order: \"%s\"."
+msgstr ""
+
+#: backend/lpd.c:321
+#, c-format
+msgid "Unknown format character: \"%c\"."
+msgstr ""
+
+#: cups/dest-options.c:770
+msgid "Unknown media size name."
+msgstr ""
+
+#: backend/ipp.c:554
+#, c-format
+msgid "Unknown option \"%s\" with value \"%s\"."
+msgstr ""
+
+#: filter/pstops.c:2196
+#, c-format
+msgid "Unknown option \"%s\"."
+msgstr ""
+
+#: backend/lpd.c:336
+#, c-format
+msgid "Unknown print mode: \"%s\"."
+msgstr ""
+
+#: scheduler/ipp.c:10496
+#, c-format
+msgid "Unknown printer-error-policy \"%s\"."
+msgstr "Neznámá printer-error-policy „%s“."
+
+#: scheduler/ipp.c:10479
+#, c-format
+msgid "Unknown printer-op-policy \"%s\"."
+msgstr "Neznámá printer-op-policy „%s“."
+
+#: cups/http-addrlist.c:710
+msgid "Unknown service name."
+msgstr ""
+
+#: backend/ipp.c:526
+#, c-format
+msgid "Unknown version option value: \"%s\"."
+msgstr ""
+
+#: scheduler/ipp.c:402
+#, c-format
+msgid "Unsupported character set \"%s\"."
+msgstr ""
+
+#: scheduler/ipp.c:8171 scheduler/ipp.c:9401 scheduler/ipp.c:10950
+#, c-format
+msgid "Unsupported compression \"%s\"."
+msgstr ""
+
+#: scheduler/ipp.c:8305 scheduler/ipp.c:9551 scheduler/ipp.c:10979
+#, c-format
+msgid "Unsupported document-format \"%s\"."
+msgstr ""
+
+#: scheduler/ipp.c:9534
+#, c-format
+msgid "Unsupported document-format \"%s/%s\"."
+msgstr ""
+
+#: scheduler/ipp.c:1367
+#, c-format
+msgid "Unsupported format \"%s\"."
+msgstr ""
+
+#: scheduler/ipp.c:1465
+msgid "Unsupported margins."
+msgstr ""
+
+#: cups/pwg-media.c:529
+msgid "Unsupported media value."
+msgstr ""
+
+#: filter/pstops.c:2478
+#, c-format
+msgid "Unsupported number-up value %d, using number-up=1."
+msgstr ""
+
+#: filter/pstops.c:2512
+#, c-format
+msgid "Unsupported number-up-layout value %s, using number-up-layout=lrtb."
+msgstr ""
+
+#: filter/pstops.c:2563
+#, c-format
+msgid "Unsupported page-border value %s, using page-border=none."
+msgstr ""
+
+#: filter/rastertopwg.c:147 filter/rastertopwg.c:155 filter/rastertopwg.c:164
+msgid "Unsupported raster data."
+msgstr ""
+
+#: cups/snmp.c:1112
+msgid "Unsupported value type"
+msgstr "Nepodporovaný typ hodnoty"
+
+#: cups/http-support.c:1318
+msgid "Upgrade Required"
+msgstr "Povinné aktualizace"
+
+#: systemv/lpadmin.c:668
+msgid ""
+"Usage:\n"
+"\n"
+"    lpadmin [-h server] -d destination\n"
+"    lpadmin [-h server] -x destination\n"
+"    lpadmin [-h server] -p printer [-c add-class] [-i interface] [-m model]\n"
+"                       [-r remove-class] [-v device] [-D description]\n"
+"                       [-P ppd-file] [-o name=value]\n"
+"                       [-u allow:user,user] [-u deny:user,user]"
+msgstr ""
+
+#: backend/dnssd.c:241 backend/ipp.c:313 backend/lpd.c:191
+#: backend/socket.c:135 backend/usb.c:183 filter/commandtops.c:74
+#: filter/gziptoany.c:50 filter/pstops.c:264 monitor/bcp.c:62
+#: monitor/tbcp.c:61
+#, c-format
+msgid "Usage: %s job-id user title copies options [file]"
+msgstr ""
+
+#: systemv/cupsaddsmb.c:281
+msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
+msgstr ""
+
+#: systemv/cupsctl.c:200
+msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
+msgstr ""
+
+#: scheduler/main.c:2017
+msgid "Usage: cupsd [options]"
+msgstr ""
+
+#: scheduler/cupsfilter.c:1429
+msgid "Usage: cupsfilter [ options ] filename"
+msgstr ""
+
+#: systemv/cupstestdsc.c:425
+msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
+msgstr ""
+
+#: systemv/cupstestppd.c:3793
+msgid "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]"
+msgstr ""
+
+#: test/ipptool.c:4401
+msgid "Usage: ipptool [options] URI filename [ ... filenameN ]"
+msgstr ""
+
+#: systemv/lpmove.c:125
+msgid "Usage: lpmove job/src dest"
+msgstr ""
+
+#: systemv/lpoptions.c:553
+msgid ""
+"Usage: lpoptions [-h server] [-E] -d printer\n"
+"       lpoptions [-h server] [-E] [-p printer] -l\n"
+"       lpoptions [-h server] [-E] -p printer -o option[=value] ...\n"
+"       lpoptions [-h server] [-E] -x printer"
+msgstr ""
+
+#: systemv/lppasswd.c:476
+msgid "Usage: lppasswd [-g groupname]"
+msgstr ""
+
+#: systemv/lppasswd.c:479
+msgid ""
+"Usage: lppasswd [-g groupname] [username]\n"
+"       lppasswd [-g groupname] -a [username]\n"
+"       lppasswd [-g groupname] -x [username]"
+msgstr ""
+
+#: berkeley/lpq.c:670
+msgid "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]"
+msgstr ""
+
+#: ppdc/ppdc.cxx:435
+msgid "Usage: ppdc [options] filename.drv [ ... filenameN.drv ]"
+msgstr ""
+
+#: ppdc/ppdhtml.cxx:172
+msgid "Usage: ppdhtml [options] filename.drv >filename.html"
+msgstr ""
+
+#: ppdc/ppdi.cxx:128
+msgid "Usage: ppdi [options] filename.ppd [ ... filenameN.ppd ]"
+msgstr ""
+
+#: ppdc/ppdmerge.cxx:367
+msgid "Usage: ppdmerge [options] filename.ppd [ ... filenameN.ppd ]"
+msgstr ""
+
+#: ppdc/ppdpo.cxx:252
+msgid "Usage: ppdpo [options] -o filename.po filename.drv [ ... filenameN.drv ]"
+msgstr ""
+
+#: backend/snmp.c:218
+msgid "Usage: snmp [host-or-ip-address]"
+msgstr ""
+
+#: cups/snmp.c:1064
+msgid "Value uses indefinite length"
+msgstr "Hodnota má neomezenou délku"
+
+#: cups/snmp.c:1049
+msgid "VarBind uses indefinite length"
+msgstr "VarBind má neomezenou délku"
+
+#: cups/snmp.c:999
+msgid "Version uses indefinite length"
+msgstr "Version má neomezenou délku"
+
+#: backend/ipp.c:1675
+msgid "Waiting for job to complete."
+msgstr ""
+
+#: backend/usb-darwin.c:457 backend/usb-libusb.c:193
+msgid "Waiting for printer to become available."
+msgstr ""
+
+#: backend/socket.c:444
+msgid "Waiting for printer to finish."
+msgstr ""
+
+#: cups/adminutil.c:793
+msgid "Warning, no Windows 2000 printer drivers are installed."
+msgstr ""
+
+#: cups/http-support.c:1339
+msgid "Web Interface is Disabled"
+msgstr ""
+
+#: cups/ppd.c:1947
+msgid "Yes"
+msgstr "Ano"
+
+#: scheduler/client.c:2437
+#, c-format
+msgid "You must access this page using the URL <A HREF=\"https://%s:%d%s\">https://%s:%d%s</A>."
+msgstr Pro přístup k této stránce, použijte adresu URL <A HREF=\"https://%s:%d%s\">https://%s:%d%s</A>."
+
+#: systemv/lppasswd.c:254
+msgid "Your password must be at least 6 characters long, cannot contain your username, and must contain at least one letter and number."
+msgstr ""
+
+#: ppdc/sample.c:439
+msgid "ZPL Label Printer"
+msgstr "Tiskárna štítků ZPL"
+
+#: ppdc/sample.c:362
+msgid "Zebra"
+msgstr "Zebra"
+
+#: cups/notify.c:102
+msgid "aborted"
+msgstr "zrušeno"
+
+#: cups/notify.c:99
+msgid "canceled"
+msgstr "zrušeno"
+
+#: cups/notify.c:105
+msgid "completed"
+msgstr "dokončeno"
+
+#: scheduler/ipp.c:6012
+msgid "cups-deviced failed to execute."
+msgstr "Nepodařilo se spustit \"cups-deviced\"."
+
+#: scheduler/ipp.c:6842 scheduler/ipp.c:7091
+msgid "cups-driverd failed to execute."
+msgstr "Nepodařilo se spustit \"cups-driverd\"."
+
+#: systemv/cupsaddsmb.c:233
+#, c-format
+msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
+msgstr ""
+
+#: systemv/cupsctl.c:141
+msgid "cupsctl: Cannot set Listen or Port directly."
+msgstr ""
+
+#: systemv/cupsctl.c:152
+#, c-format
+msgid "cupsctl: Unable to connect to server: %s"
+msgstr ""
+
+#: systemv/cupsctl.c:195
+#, c-format
+msgid "cupsctl: Unknown option \"%s\""
+msgstr ""
+
+#: systemv/cupsctl.c:197
+#, c-format
+msgid "cupsctl: Unknown option \"-%c\""
+msgstr ""
+
+#: scheduler/main.c:189
+msgid "cupsd: Expected config filename after \"-c\" option."
+msgstr ""
+
+#: scheduler/main.c:221 scheduler/main.c:228
+msgid "cupsd: Unable to get current directory."
+msgstr ""
+
+#: scheduler/main.c:295
+#, c-format
+msgid "cupsd: Unknown argument \"%s\" - aborting."
+msgstr ""
+
+#: scheduler/main.c:288
+#, c-format
+msgid "cupsd: Unknown option \"%c\" - aborting."
+msgstr ""
+
+#: scheduler/main.c:255
+msgid "cupsd: launchd(8) support not compiled in, running in normal mode."
+msgstr ""
+
+#: scheduler/cupsfilter.c:1209
+#, c-format
+msgid "cupsfilter: Invalid document number %d."
+msgstr ""
+
+#: scheduler/cupsfilter.c:1203
+#, c-format
+msgid "cupsfilter: Invalid job ID %d."
+msgstr ""
+
+#: scheduler/cupsfilter.c:358
+msgid "cupsfilter: Only one filename can be specified."
+msgstr ""
+
+#: scheduler/cupsfilter.c:1251
+#, c-format
+msgid "cupsfilter: Unable to get job file - %s"
+msgstr ""
+
+#: systemv/cupstestppd.c:261
+msgid "cupstestppd: The -q option is incompatible with the -v option."
+msgstr ""
+
+#: systemv/cupstestppd.c:277
+msgid "cupstestppd: The -v option is incompatible with the -q option."
+msgstr ""
+
+#: systemv/lpstat.c:1231 systemv/lpstat.c:1234 systemv/lpstat.c:1237
+#, c-format
+msgid "device for %s/%s: %s"
+msgstr ""
+
+#: systemv/lpstat.c:1218 systemv/lpstat.c:1221 systemv/lpstat.c:1224
+#, c-format
+msgid "device for %s: %s"
+msgstr ""
+
+#: cups/snmp.c:1036
+msgid "error-index uses indefinite length"
+msgstr "\"error-index\" má neomezenou délku"
+
+#: cups/snmp.c:1028
+msgid "error-status uses indefinite length"
+msgstr "\"error-status\" má neomezenou délku"
+
+#: cups/notify.c:90
+msgid "held"
+msgstr "pozastaveno"
+
+#: berkeley/lpc.c:209
+msgid "help\t\tGet help on commands."
+msgstr ""
+
+#: cups/notify.c:131
+msgid "idle"
+msgstr "čeká"
+
+#: test/ipptool.c:373 test/ipptool.c:515 test/ipptool.c:539
+msgid "ipptool: \"-i\" and \"-n\" are incompatible with -X\"."
+msgstr ""
+
+#: test/ipptool.c:597
+#, c-format
+msgid "ipptool: Bad URI - %s."
+msgstr ""
+
+#: test/ipptool.c:362
+#, c-format
+msgid "ipptool: Bad version %s for \"-V\"."
+msgstr ""
+
+#: test/ipptool.c:508
+msgid "ipptool: Invalid seconds for \"-i\"."
+msgstr ""
+
+#: test/ipptool.c:578
+msgid "ipptool: May only specify a single URI."
+msgstr ""
+
+#: test/ipptool.c:531
+msgid "ipptool: Missing count for \"-n\"."
+msgstr ""
+
+#: test/ipptool.c:408
+msgid "ipptool: Missing filename for \"-f\"."
+msgstr ""
+
+#: test/ipptool.c:389
+msgid "ipptool: Missing name=value for \"-d\"."
+msgstr ""
+
+#: test/ipptool.c:498
+msgid "ipptool: Missing seconds for \"-i\"."
+msgstr ""
+
+#: test/ipptool.c:332
+msgid "ipptool: Missing timeout for \"-T\"."
+msgstr ""
+
+#: test/ipptool.c:345
+msgid "ipptool: Missing version for \"-V\"."
+msgstr ""
+
+#: test/ipptool.c:624
+msgid "ipptool: URI required before test file."
+msgstr ""
+
+#: test/ipptool.c:558
+#, c-format
+msgid "ipptool: Unknown option \"-%c\"."
+msgstr ""
+
+#: scheduler/ipp.c:7838
+msgid "job-printer-uri attribute missing."
+msgstr ""
+
+#: systemv/lpadmin.c:131 systemv/lpadmin.c:375
+msgid "lpadmin: Class name can only contain printable characters."
+msgstr ""
+
+#: systemv/lpadmin.c:614
+msgid "lpadmin: Expected PPD after \"-P\" option."
+msgstr ""
+
+#: systemv/lpadmin.c:457
+msgid "lpadmin: Expected allow/deny:userlist after \"-u\" option."
+msgstr ""
+
+#: systemv/lpadmin.c:364
+msgid "lpadmin: Expected class after \"-r\" option."
+msgstr ""
+
+#: systemv/lpadmin.c:120
+msgid "lpadmin: Expected class name after \"-c\" option."
+msgstr ""
+
+#: systemv/lpadmin.c:558
+msgid "lpadmin: Expected description after \"-D\" option."
+msgstr ""
+
+#: systemv/lpadmin.c:491
+msgid "lpadmin: Expected device URI after \"-v\" option."
+msgstr ""
+
+#: systemv/lpadmin.c:574
+msgid "lpadmin: Expected file type(s) after \"-I\" option."
+msgstr ""
+
+#: systemv/lpadmin.c:202
+msgid "lpadmin: Expected hostname after \"-h\" option."
+msgstr ""
+
+#: systemv/lpadmin.c:221
+msgid "lpadmin: Expected interface after \"-i\" option."
+msgstr ""
+
+#: systemv/lpadmin.c:594
+msgid "lpadmin: Expected location after \"-L\" option."
+msgstr ""
+
+#: systemv/lpadmin.c:274
+msgid "lpadmin: Expected model after \"-m\" option."
+msgstr ""
+
+#: systemv/lpadmin.c:417
+msgid "lpadmin: Expected name after \"-R\" option."
+msgstr ""
+
+#: systemv/lpadmin.c:294
+msgid "lpadmin: Expected name=value after \"-o\" option."
+msgstr ""
+
+#: systemv/lpadmin.c:313
+msgid "lpadmin: Expected printer after \"-p\" option."
+msgstr ""
+
+#: systemv/lpadmin.c:164
+msgid "lpadmin: Expected printer name after \"-d\" option."
+msgstr ""
+
+#: systemv/lpadmin.c:525
+msgid "lpadmin: Expected printer or class after \"-x\" option."
+msgstr ""
+
+#: systemv/lpadmin.c:975
+msgid "lpadmin: No member names were seen."
+msgstr ""
+
+#: systemv/lpadmin.c:762
+#, c-format
+msgid "lpadmin: Printer %s is already a member of class %s."
+msgstr ""
+
+#: systemv/lpadmin.c:989
+#, c-format
+msgid "lpadmin: Printer %s is not a member of class %s."
+msgstr ""
+
+#: systemv/lpadmin.c:175 systemv/lpadmin.c:324 systemv/lpadmin.c:536
+msgid "lpadmin: Printer name can only contain printable characters."
+msgstr ""
+
+#: systemv/lpadmin.c:105
+msgid ""
+"lpadmin: Unable to add a printer to the class:\n"
+"         You must specify a printer name first."
+msgstr ""
+
+#: systemv/lpadmin.c:96 systemv/lpadmin.c:149 systemv/lpadmin.c:253
+#: systemv/lpadmin.c:339 systemv/lpadmin.c:393 systemv/lpadmin.c:510
+#: systemv/lpadmin.c:647
+#, c-format
+msgid "lpadmin: Unable to connect to server: %s"
+msgstr ""
+
+#: systemv/lpadmin.c:1329
+msgid "lpadmin: Unable to create temporary file"
+msgstr ""
+
+#: systemv/lpadmin.c:402
+msgid ""
+"lpadmin: Unable to delete option:\n"
+"         You must specify a printer name first."
+msgstr ""
+
+#: systemv/lpadmin.c:1339
+#, c-format
+msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
+msgstr ""
+
+#: systemv/lpadmin.c:348
+msgid ""
+"lpadmin: Unable to remove a printer from the class:\n"
+"         You must specify a printer name first."
+msgstr ""
+
+#: systemv/lpadmin.c:656
+msgid ""
+"lpadmin: Unable to set the printer options:\n"
+"         You must specify a printer name first."
+msgstr ""
+
+#: systemv/lpadmin.c:474
+#, c-format
+msgid "lpadmin: Unknown allow/deny option \"%s\"."
+msgstr ""
+
+#: systemv/lpadmin.c:629
+#, c-format
+msgid "lpadmin: Unknown argument \"%s\"."
+msgstr ""
+
+#: systemv/lpadmin.c:624
+#, c-format
+msgid "lpadmin: Unknown option \"%c\"."
+msgstr ""
+
+#: systemv/lpadmin.c:580
+msgid "lpadmin: Warning - content type list ignored."
+msgstr ""
+
+#: berkeley/lpc.c:76 berkeley/lpc.c:104 berkeley/lpc.c:140
+msgid "lpc> "
+msgstr "lpc> "
+
+#: systemv/lpinfo.c:137
+msgid "lpinfo: Expected 1284 device ID string after \"--device-id\"."
+msgstr ""
+
+#: systemv/lpinfo.c:190
+msgid "lpinfo: Expected language after \"--language\"."
+msgstr ""
+
+#: systemv/lpinfo.c:207
+msgid "lpinfo: Expected make and model after \"--make-and-model\"."
+msgstr ""
+
+#: systemv/lpinfo.c:224
+msgid "lpinfo: Expected product string after \"--product\"."
+msgstr ""
+
+#: systemv/lpinfo.c:155
+msgid "lpinfo: Expected scheme list after \"--exclude-schemes\"."
+msgstr ""
+
+#: systemv/lpinfo.c:173
+msgid "lpinfo: Expected scheme list after \"--include-schemes\"."
+msgstr ""
+
+#: systemv/lpinfo.c:241
+msgid "lpinfo: Expected timeout after \"--timeout\"."
+msgstr ""
+
+#: systemv/lpinfo.c:265
+#, c-format
+msgid "lpinfo: Unknown argument \"%s\"."
+msgstr ""
+
+#: systemv/lpinfo.c:259
+#, c-format
+msgid "lpinfo: Unknown option \"%c\"."
+msgstr ""
+
+#: systemv/lpinfo.c:252
+#, c-format
+msgid "lpinfo: Unknown option \"%s\"."
+msgstr ""
+
+#: systemv/lpmove.c:133
+#, c-format
+msgid "lpmove: Unable to connect to server: %s"
+msgstr ""
+
+#: systemv/lpmove.c:119
+#, c-format
+msgid "lpmove: Unknown argument \"%s\"."
+msgstr ""
+
+#: systemv/lpmove.c:97
+#, c-format
+msgid "lpmove: Unknown option \"%c\"."
+msgstr ""
+
+#: systemv/lpoptions.c:150 systemv/lpoptions.c:168 systemv/lpoptions.c:244
+msgid "lpoptions: No printers."
+msgstr ""
+
+#: systemv/lpoptions.c:219
+#, c-format
+msgid "lpoptions: Unable to add printer or instance: %s"
+msgstr ""
+
+#: systemv/lpoptions.c:521
+#, c-format
+msgid "lpoptions: Unable to get PPD file for %s: %s"
+msgstr ""
+
+#: systemv/lpoptions.c:529
+#, c-format
+msgid "lpoptions: Unable to open PPD file for %s."
+msgstr ""
+
+#: systemv/lpoptions.c:99
+msgid "lpoptions: Unknown printer or class."
+msgstr ""
+
+#: systemv/lppasswd.c:173
+msgid "lppasswd: Only root can add or delete passwords."
+msgstr ""
+
+#: systemv/lppasswd.c:302
+msgid "lppasswd: Password file busy."
+msgstr ""
+
+#: systemv/lppasswd.c:431
+msgid "lppasswd: Password file not updated."
+msgstr ""
+
+#: systemv/lppasswd.c:398
+msgid "lppasswd: Sorry, password doesn't match."
+msgstr ""
+
+#: systemv/lppasswd.c:253
+msgid "lppasswd: Sorry, password rejected."
+msgstr ""
+
+#: systemv/lppasswd.c:230
+msgid "lppasswd: Sorry, passwords don't match."
+msgstr ""
+
+#: systemv/lppasswd.c:199 systemv/lppasswd.c:218
+#, c-format
+msgid "lppasswd: Unable to copy password string: %s"
+msgstr ""
+
+#: systemv/lppasswd.c:304 systemv/lppasswd.c:312 systemv/lppasswd.c:329
+#, c-format
+msgid "lppasswd: Unable to open password file: %s"
+msgstr ""
+
+#: systemv/lppasswd.c:364 systemv/lppasswd.c:377 systemv/lppasswd.c:408
+#, c-format
+msgid "lppasswd: Unable to write to password file: %s"
+msgstr ""
+
+#: systemv/lppasswd.c:446
+#, c-format
+msgid "lppasswd: failed to backup old password file: %s"
+msgstr ""
+
+#: systemv/lppasswd.c:458
+#, c-format
+msgid "lppasswd: failed to rename password file: %s"
+msgstr ""
+
+#: systemv/lppasswd.c:389
+#, c-format
+msgid "lppasswd: user \"%s\" and group \"%s\" do not exist."
+msgstr ""
+
+#: systemv/lpstat.c:1039
+#, c-format
+msgid "lpstat: error - %s environment variable names non-existent destination \"%s\"."
+msgstr ""
+
+#: systemv/lpstat.c:970
+#, c-format
+msgid "members of class %s:"
+msgstr ""
+
+#: berkeley/lpq.c:582
+msgid "no entries"
+msgstr ""
+
+#: systemv/lpstat.c:1043
+msgid "no system default destination"
+msgstr ""
+
+#: scheduler/ipp.c:5702
+msgid "notify-events not specified."
+msgstr ""
+
+#: scheduler/ipp.c:2034 scheduler/ipp.c:5607
+#, c-format
+msgid "notify-recipient-uri URI \"%s\" is already used."
+msgstr ""
+
+#: scheduler/ipp.c:2024 scheduler/ipp.c:5597
+#, c-format
+msgid "notify-recipient-uri URI \"%s\" uses unknown scheme."
+msgstr ""
+
+#: cups/notify.c:87
+msgid "pending"
+msgstr "nevyřízený"
+
+#: ppdc/ppdc.cxx:113 ppdc/ppdpo.cxx:93
+#, c-format
+msgid "ppdc: Adding include directory \"%s\"."
+msgstr ""
+
+#: ppdc/ppdpo.cxx:134
+#, c-format
+msgid "ppdc: Adding/updating UI text from %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:410
+#, c-format
+msgid "ppdc: Bad boolean value (%s) on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-import.cxx:264
+#, c-format
+msgid "ppdc: Bad font attribute: %s"
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1796
+#, c-format
+msgid "ppdc: Bad resolution name \"%s\" on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1113
+#, c-format
+msgid "ppdc: Bad status keyword %s on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:2033
+#, c-format
+msgid "ppdc: Bad variable substitution ($%c) on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:2719
+#, c-format
+msgid "ppdc: Choice found on line %d of %s with no Option."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1698
+#, c-format
+msgid "ppdc: Duplicate #po for locale %s on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:932
+#, c-format
+msgid "ppdc: Expected a filter definition on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:955
+#, c-format
+msgid "ppdc: Expected a program name on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:394
+#, c-format
+msgid "ppdc: Expected boolean value on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1093
+#, c-format
+msgid "ppdc: Expected charset after Font on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:447
+#, c-format
+msgid "ppdc: Expected choice code on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:435
+#, c-format
+msgid "ppdc: Expected choice name/text on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:503
+#, c-format
+msgid "ppdc: Expected color order for ColorModel on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:492
+#, c-format
+msgid "ppdc: Expected colorspace for ColorModel on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:514
+#, c-format
+msgid "ppdc: Expected compression for ColorModel on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:695
+#, c-format
+msgid "ppdc: Expected constraints string for UIConstraints on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:2905
+#, c-format
+msgid "ppdc: Expected driver type keyword following DriverType on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:826
+#, c-format
+msgid "ppdc: Expected duplex type after Duplex on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1077
+#, c-format
+msgid "ppdc: Expected encoding after Font on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1689
+#, c-format
+msgid "ppdc: Expected filename after #po %s on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1205
+#, c-format
+msgid "ppdc: Expected group name/text on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:2619
+#, c-format
+msgid "ppdc: Expected include filename on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1502
+#, c-format
+msgid "ppdc: Expected integer on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1681
+#, c-format
+msgid "ppdc: Expected locale after #po on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:353
+#, c-format
+msgid "ppdc: Expected name after %s on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:3277
+#, c-format
+msgid "ppdc: Expected name after FileName on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1058
+#, c-format
+msgid "ppdc: Expected name after Font on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:3108
+#, c-format
+msgid "ppdc: Expected name after Manufacturer on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:3141
+#, c-format
+msgid "ppdc: Expected name after MediaSize on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:3231
+#, c-format
+msgid "ppdc: Expected name after ModelName on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:3294
+#, c-format
+msgid "ppdc: Expected name after PCFileName on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1156
+#, c-format
+msgid "ppdc: Expected name/text after %s on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1245
+#, c-format
+msgid "ppdc: Expected name/text after Installable on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1782
+#, c-format
+msgid "ppdc: Expected name/text after Resolution on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:479
+#, c-format
+msgid "ppdc: Expected name/text combination for ColorModel on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1574
+#, c-format
+msgid "ppdc: Expected option name/text on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1608
+#, c-format
+msgid "ppdc: Expected option section on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1586
+#, c-format
+msgid "ppdc: Expected option type on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1765
+#, c-format
+msgid "ppdc: Expected override field after Resolution on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-catalog.cxx:341 ppdc/ppdc-catalog.cxx:353
+#, c-format
+msgid "ppdc: Expected quoted string on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1004
+#, c-format
+msgid "ppdc: Expected real number on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:572
+#, c-format
+msgid "ppdc: Expected resolution/mediatype following ColorProfile on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1863
+#, c-format
+msgid "ppdc: Expected resolution/mediatype following SimpleColorProfile on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:361
+#, c-format
+msgid "ppdc: Expected selector after %s on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1101
+#, c-format
+msgid "ppdc: Expected status after Font on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:2794
+#, c-format
+msgid "ppdc: Expected string after Copyright on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:3397
+#, c-format
+msgid "ppdc: Expected string after Version on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:728
+#, c-format
+msgid "ppdc: Expected two option names on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:372
+#, c-format
+msgid "ppdc: Expected value after %s on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1085
+#, c-format
+msgid "ppdc: Expected version after Font on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:227
+#, c-format
+msgid "ppdc: Invalid #include/#po filename \"%s\"."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:972
+#, c-format
+msgid "ppdc: Invalid cost for filter on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:964
+#, c-format
+msgid "ppdc: Invalid empty MIME type for filter on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:980
+#, c-format
+msgid "ppdc: Invalid empty program name for filter on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1628
+#, c-format
+msgid "ppdc: Invalid option section \"%s\" on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1600
+#, c-format
+msgid "ppdc: Invalid option type \"%s\" on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc.cxx:251 ppdc/ppdpo.cxx:123
+#, c-format
+msgid "ppdc: Loading driver information file \"%s\"."
+msgstr ""
+
+#: ppdc/ppdc.cxx:187
+#, c-format
+msgid "ppdc: Loading messages for locale \"%s\"."
+msgstr ""
+
+#: ppdc/ppdc.cxx:126
+#, c-format
+msgid "ppdc: Loading messages from \"%s\"."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:2412 ppdc/ppdc-source.cxx:2644
+#, c-format
+msgid "ppdc: Missing #endif at end of \"%s\"."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:2513 ppdc/ppdc-source.cxx:2548
+#: ppdc/ppdc-source.cxx:2578
+#, c-format
+msgid "ppdc: Missing #if on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-catalog.cxx:418
+#, c-format
+msgid "ppdc: Need a msgid line before any translation strings on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-driver.cxx:730
+#, c-format
+msgid "ppdc: No message catalog provided for locale %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1651 ppdc/ppdc-source.cxx:2882
+#: ppdc/ppdc-source.cxx:2968 ppdc/ppdc-source.cxx:3061
+#: ppdc/ppdc-source.cxx:3194 ppdc/ppdc-source.cxx:3327
+#, c-format
+msgid "ppdc: Option %s defined in two different groups on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1644
+#, c-format
+msgid "ppdc: Option %s redefined with a different type on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:705
+#, c-format
+msgid "ppdc: Option constraint must *name on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:2495
+#, c-format
+msgid "ppdc: Too many nested #if's on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc.cxx:374
+#, c-format
+msgid "ppdc: Unable to create PPD file \"%s\" - %s."
+msgstr ""
+
+#: ppdc/ppdc.cxx:266
+#, c-format
+msgid "ppdc: Unable to create output directory %s: %s"
+msgstr ""
+
+#: ppdc/ppdc.cxx:287
+#, c-format
+msgid "ppdc: Unable to create output pipes: %s"
+msgstr ""
+
+#: ppdc/ppdc.cxx:303 ppdc/ppdc.cxx:309
+#, c-format
+msgid "ppdc: Unable to execute cupstestppd: %s"
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1730
+#, c-format
+msgid "ppdc: Unable to find #po file %s on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:2651
+#, c-format
+msgid "ppdc: Unable to find include file \"%s\" on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc.cxx:198
+#, c-format
+msgid "ppdc: Unable to find localization for \"%s\" - %s"
+msgstr ""
+
+#: ppdc/ppdc.cxx:135
+#, c-format
+msgid "ppdc: Unable to load localization file \"%s\" - %s"
+msgstr ""
+
+#: ppdc/ppdc-file.cxx:50
+#, c-format
+msgid "ppdc: Unable to open %s: %s"
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:2054
+#, c-format
+msgid "ppdc: Undefined variable (%s) on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-catalog.cxx:435
+#, c-format
+msgid "ppdc: Unexpected text on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:2924
+#, c-format
+msgid "ppdc: Unknown driver type %s on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:906
+#, c-format
+msgid "ppdc: Unknown duplex type \"%s\" on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:3154
+#, c-format
+msgid "ppdc: Unknown media size \"%s\" on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-catalog.cxx:463
+#, c-format
+msgid "ppdc: Unknown message catalog format for \"%s\"."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:3408
+#, c-format
+msgid "ppdc: Unknown token \"%s\" seen on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:1014
+#, c-format
+msgid "ppdc: Unknown trailing characters in real number \"%s\" on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc-source.cxx:2164
+#, c-format
+msgid "ppdc: Unterminated string starting with %c on line %d of %s."
+msgstr ""
+
+#: ppdc/ppdc.cxx:365
+#, c-format
+msgid "ppdc: Warning - overlapping filename \"%s\"."
+msgstr ""
+
+#: ppdc/ppdc.cxx:380
+#, c-format
+msgid "ppdc: Writing %s."
+msgstr ""
+
+#: ppdc/ppdc.cxx:148
+#, c-format
+msgid "ppdc: Writing PPD files to directory \"%s\"."
+msgstr ""
+
+#: ppdc/ppdmerge.cxx:136
+#, c-format
+msgid "ppdmerge: Bad LanguageVersion \"%s\" in %s."
+msgstr ""
+
+#: ppdc/ppdmerge.cxx:176
+#, c-format
+msgid "ppdmerge: Ignoring PPD file %s."
+msgstr ""
+
+#: ppdc/ppdmerge.cxx:160
+#, c-format
+msgid "ppdmerge: Unable to backup %s to %s - %s"
+msgstr ""
+
+#: systemv/lpstat.c:1784
+#, c-format
+msgid "printer %s disabled since %s -"
+msgstr ""
+
+#: systemv/lpstat.c:1773
+#, c-format
+msgid "printer %s is idle.  enabled since %s"
+msgstr ""
+
+#: systemv/lpstat.c:1778
+#, c-format
+msgid "printer %s now printing %s-%d.  enabled since %s"
+msgstr ""
+
+#: systemv/lpstat.c:1909
+#, c-format
+msgid "printer %s/%s disabled since %s -"
+msgstr ""
+
+#: systemv/lpstat.c:1895
+#, c-format
+msgid "printer %s/%s is idle.  enabled since %s"
+msgstr ""
+
+#: systemv/lpstat.c:1902
+#, c-format
+msgid "printer %s/%s now printing %s-%d.  enabled since %s"
+msgstr ""
+
+#: cups/notify.c:93 cups/notify.c:134
+msgid "processing"
+msgstr "zpracování"
+
+#: systemv/lp.c:644
+#, c-format
+msgid "request id is %s-%d (%d file(s))"
+msgstr ""
+
+#: cups/snmp.c:1020
+msgid "request-id uses indefinite length"
+msgstr "ID požadavku má neomezenou délku"
+
+#: systemv/lpstat.c:2048
+msgid "scheduler is not running"
+msgstr ""
+
+#: systemv/lpstat.c:2044
+msgid "scheduler is running"
+msgstr ""
+
+#: cups/adminutil.c:2159
+#, c-format
+msgid "stat of %s failed: %s"
+msgstr "stav %s selhalo: %s"
+
+#: berkeley/lpc.c:211
+msgid "status\t\tShow status of daemon and queue."
+msgstr ""
+
+#: cups/notify.c:96 cups/notify.c:137
+msgid "stopped"
+msgstr "zastaveno"
+
+#: systemv/lpstat.c:1017
+#, c-format
+msgid "system default destination: %s"
+msgstr ""
+
+#: systemv/lpstat.c:1014
+#, c-format
+msgid "system default destination: %s/%s"
+msgstr ""
+
+#: cups/notify.c:108 cups/notify.c:140
+msgid "unknown"
+msgstr "neznámý"
+
+#: cups/notify.c:117
+msgid "untitled"
+msgstr "nepojmenovaný"
+
+#: cups/snmp.c:1045
+msgid "variable-bindings uses indefinite length"
+msgstr "\"variable-bindings\" má neomezenou délku"
+
+
+#
+# End of "$Id$".
+#
diff --git a/locale/cups_es.po b/locale/cups_es.po
index 1fe5bb9f..7167fa5a 100644
--- a/locale/cups_es.po
+++ b/locale/cups_es.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2012-05-23 16:24-0700\n"
+"POT-Creation-Date: 2013-03-08 13:25-0500\n"
 "PO-Revision-Date: 2012-07-01 20:21+0100\n"
 "Last-Translator: Juan Pablo González Riopedre <riopedre13@yahoo.es>\n"
 "Language-Team: Spanish\n"
@@ -25,189 +25,122 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: systemv/lpstat.c:1876
-#: systemv/lpstat.c:2001
 msgid "\t\t(all)"
 msgstr "\t\t(todos)"
 
-#: systemv/lpstat.c:1879
-#: systemv/lpstat.c:1882
-#: systemv/lpstat.c:2004
-#: systemv/lpstat.c:2007
 msgid "\t\t(none)"
 msgstr "\t\t(ninguno)"
 
-#: berkeley/lpc.c:434
 #, c-format
 msgid "\t%d entries"
 msgstr "\t%d entradas"
 
-#: systemv/lpstat.c:756
-#: systemv/lpstat.c:772
 #, c-format
 msgid "\t%s"
 msgstr "\t%s"
 
-#: systemv/lpstat.c:1857
-#: systemv/lpstat.c:1982
 msgid "\tAfter fault: continue"
 msgstr "\tTras fallo: continuar"
 
-#: systemv/lpstat.c:1481
-#: systemv/lpstat.c:1826
-#: systemv/lpstat.c:1952
 #, c-format
 msgid "\tAlerts: %s"
 msgstr "\tAlertas: %s"
 
-#: systemv/lpstat.c:1880
-#: systemv/lpstat.c:2005
 msgid "\tBanner required"
 msgstr "\tSe necesita un rótulo"
 
-#: systemv/lpstat.c:1881
-#: systemv/lpstat.c:2006
 msgid "\tCharset sets:"
 msgstr "\tAjustes del juego de caracteres:"
 
-#: systemv/lpstat.c:1845
-#: systemv/lpstat.c:1970
 msgid "\tConnection: direct"
 msgstr "\tConexión: directa"
 
-#: systemv/lpstat.c:1836
-#: systemv/lpstat.c:1962
 msgid "\tConnection: remote"
 msgstr "\tConexión: remota"
 
-#: systemv/lpstat.c:1800
-#: systemv/lpstat.c:1926
 msgid "\tContent types: any"
 msgstr "\tTipos de contenido: cualesquiera"
 
-#: systemv/lpstat.c:1884
-#: systemv/lpstat.c:2009
 msgid "\tDefault page size:"
 msgstr "\tTamaño de página predeterminado:"
 
-#: systemv/lpstat.c:1883
-#: systemv/lpstat.c:2008
 msgid "\tDefault pitch:"
 msgstr "\tPaso predeterminado:"
 
-#: systemv/lpstat.c:1885
-#: systemv/lpstat.c:2010
 msgid "\tDefault port settings:"
 msgstr "\tAjustes del puerto predeterminados:"
 
-#: systemv/lpstat.c:1806
-#: systemv/lpstat.c:1932
 #, c-format
 msgid "\tDescription: %s"
 msgstr "\tDescripción: %s"
 
-#: systemv/lpstat.c:1799
-#: systemv/lpstat.c:1925
 msgid "\tForm mounted:"
 msgstr "\tFormulario montado:"
 
-#: systemv/lpstat.c:1878
-#: systemv/lpstat.c:2003
 msgid "\tForms allowed:"
 msgstr "\tFormularios permitidos:"
 
-#: systemv/lpstat.c:1840
-#: systemv/lpstat.c:1966
 #, c-format
 msgid "\tInterface: %s.ppd"
 msgstr "\tInterfaz: %s.ppd"
 
-#: systemv/lpstat.c:1849
-#: systemv/lpstat.c:1974
 #, c-format
 msgid "\tInterface: %s/interfaces/%s"
 msgstr "\tInterfaz: %s/interfaces/%s"
 
-#: systemv/lpstat.c:1853
-#: systemv/lpstat.c:1978
 #, c-format
 msgid "\tInterface: %s/ppd/%s.ppd"
 msgstr "\tInterfaz: %s/ppd/%s.ppd"
 
-#: systemv/lpstat.c:1831
-#: systemv/lpstat.c:1957
 #, c-format
 msgid "\tLocation: %s"
 msgstr "\tUbicación: %s"
 
-#: systemv/lpstat.c:1856
-#: systemv/lpstat.c:1981
 msgid "\tOn fault: no alert"
 msgstr "\tEn fallo: no alertar"
 
-#: systemv/lpstat.c:1801
-#: systemv/lpstat.c:1927
 msgid "\tPrinter types: unknown"
 msgstr "\tTipos de impresora: desconocidos"
 
-#: systemv/lpstat.c:1462
 #, c-format
 msgid "\tStatus: %s"
 msgstr "\tEstado: %s"
 
-#: systemv/lpstat.c:1861
-#: systemv/lpstat.c:1875
-#: systemv/lpstat.c:1986
-#: systemv/lpstat.c:2000
 msgid "\tUsers allowed:"
 msgstr "\tUsuarios permitidos:"
 
-#: systemv/lpstat.c:1868
-#: systemv/lpstat.c:1993
 msgid "\tUsers denied:"
 msgstr "\tUsuarios denegados:"
 
-#: berkeley/lpc.c:436
 msgid "\tdaemon present"
 msgstr "\tdemonio presente"
 
-#: berkeley/lpc.c:432
 msgid "\tno entries"
 msgstr "\tno hay entradas"
 
-#: berkeley/lpc.c:404
-#: berkeley/lpc.c:416
 #, c-format
 msgid "\tprinter is on device '%s' speed -1"
 msgstr "\tla impresora está conectada a '%s' velocidad -1"
 
-#: berkeley/lpc.c:429
 msgid "\tprinting is disabled"
 msgstr "\tla impresión está desactivada"
 
-#: berkeley/lpc.c:427
 msgid "\tprinting is enabled"
 msgstr "\tla impresión está activada"
 
-#: systemv/lpstat.c:1484
 #, c-format
 msgid "\tqueued for %s"
 msgstr "\ten cola para %s"
 
-#: berkeley/lpc.c:424
 msgid "\tqueuing is disabled"
 msgstr "\tla cola está desactivada"
 
-#: berkeley/lpc.c:422
 msgid "\tqueuing is enabled"
 msgstr "\tla cola está activada"
 
-#: systemv/lpstat.c:1792
-#: systemv/lpstat.c:1918
 msgid "\treason unknown"
 msgstr "\trazón desconocida"
 
-#: systemv/cupstestppd.c:454
 msgid ""
 "\n"
 "    DETAILED CONFORMANCE TEST RESULTS"
@@ -215,135 +148,103 @@ msgstr ""
 "\n"
 "    RESULTADOS DETALLADOS DE LA PRUEBA DE CONFORMIDAD"
 
-#: systemv/cupstestppd.c:3800
 msgid "                          Ignore specific warnings."
 msgstr "                          Ignorar advertencias (warnings) específicas."
 
-#: systemv/cupstestppd.c:3804
 msgid "                          Issue warnings instead of errors."
-msgstr "                          Emitor advertencias (warnings) en vez de errores."
+msgstr ""
+"                          Emitor advertencias (warnings) en vez de errores."
 
-#: systemv/cupstestppd.c:410
-#: systemv/cupstestppd.c:415
 msgid "                REF: Page 15, section 3.1."
 msgstr "                REF: Página 15, sección 3.1."
 
-#: systemv/cupstestppd.c:405
 msgid "                REF: Page 15, section 3.2."
 msgstr "                REF: Página 15, sección 3.2."
 
-#: systemv/cupstestppd.c:425
 msgid "                REF: Page 19, section 3.3."
 msgstr "                REF: Página 19, sección 3.3."
 
-#: systemv/cupstestppd.c:378
 msgid "                REF: Page 20, section 3.4."
 msgstr "                REF: Página 20, sección 3.4."
 
-#: systemv/cupstestppd.c:430
 msgid "                REF: Page 27, section 3.5."
 msgstr "                REF: Página 27, sección 3.5."
 
-#: systemv/cupstestppd.c:373
 msgid "                REF: Page 42, section 5.2."
 msgstr "                REF: Página 42, sección 5.2."
 
-#: systemv/cupstestppd.c:420
 msgid "                REF: Pages 16-17, section 3.2."
 msgstr "                REF: Páginas 16-17, sección 3.2."
 
-#: systemv/cupstestppd.c:390
 msgid "                REF: Pages 42-45, section 5.2."
 msgstr "                REF: Páginas 42-45, sección 5.2."
 
-#: systemv/cupstestppd.c:384
 msgid "                REF: Pages 45-46, section 5.2."
 msgstr "                REF: Páginas 45-46, sección 5.2."
 
-#: systemv/cupstestppd.c:395
 msgid "                REF: Pages 48-49, section 5.2."
 msgstr "                REF: Páginas 48-49, sección 5.2."
 
-#: systemv/cupstestppd.c:400
 msgid "                REF: Pages 52-54, section 5.2."
 msgstr "                REF: Páginas 52-54, sección 5.2."
 
-#: berkeley/lpq.c:554
 #, c-format
 msgid "        %-39.39s %.0f bytes"
 msgstr "        %-39.39s %.0f bytes"
 
-#: systemv/cupstestppd.c:589
 #, c-format
 msgid "        PASS    Default%s"
 msgstr "        PASA    Default%s"
 
-#: systemv/cupstestppd.c:524
 msgid "        PASS    DefaultImageableArea"
 msgstr "        PASA    DefaultImageableArea"
 
-#: systemv/cupstestppd.c:558
 msgid "        PASS    DefaultPaperDimension"
 msgstr "        PASA    DefaultPaperDimension"
 
-#: systemv/cupstestppd.c:631
 msgid "        PASS    FileVersion"
 msgstr "        PASA    FileVersion"
 
-#: systemv/cupstestppd.c:675
 msgid "        PASS    FormatVersion"
 msgstr "        PASA    FormatVersion"
 
-#: systemv/cupstestppd.c:695
 msgid "        PASS    LanguageEncoding"
 msgstr "        PASA    LanguageEncoding"
 
-#: systemv/cupstestppd.c:715
 msgid "        PASS    LanguageVersion"
 msgstr "        PASA    LanguageVersion"
 
-#: systemv/cupstestppd.c:769
 msgid "        PASS    Manufacturer"
 msgstr "        PASA    Manufacturer"
 
-#: systemv/cupstestppd.c:809
 msgid "        PASS    ModelName"
 msgstr "        PASA    ModelName"
 
-#: systemv/cupstestppd.c:829
 msgid "        PASS    NickName"
 msgstr "        PASA    NickName"
 
-#: systemv/cupstestppd.c:889
 msgid "        PASS    PCFileName"
 msgstr "        PASA    PCFileName"
 
-#: systemv/cupstestppd.c:964
 msgid "        PASS    PSVersion"
 msgstr "        PASA    PSVersion"
 
-#: systemv/cupstestppd.c:869
 msgid "        PASS    PageRegion"
 msgstr "        PASA    PageRegion"
 
-#: systemv/cupstestppd.c:849
 msgid "        PASS    PageSize"
 msgstr "        PASA    PageSize"
 
-#: systemv/cupstestppd.c:924
 msgid "        PASS    Product"
 msgstr "        PASA    Product"
 
-#: systemv/cupstestppd.c:999
 msgid "        PASS    ShortNickName"
 msgstr "        PASA    ShortNickName"
 
-#: systemv/cupstestppd.c:1374
 #, c-format
 msgid "        WARN    %s has no corresponding options."
 msgstr "        ADVERTENCIA    %s tiene opciones que no corresponden."
 
-#: systemv/cupstestppd.c:1486
 #, c-format
 msgid ""
 "        WARN    %s shares a common prefix with %s\n"
@@ -352,45 +253,48 @@ msgstr ""
 "        ADVERTENCIA    %s comparte un prefijo común con %s\n"
 "                REF: Página 15, sección 3.2."
 
-#: systemv/cupstestppd.c:1345
 #, c-format
 msgid ""
-"        WARN    Duplex option keyword %s may not work as expected and should be named Duplex.\n"
+"        WARN    Duplex option keyword %s may not work as expected and should "
+"be named Duplex.\n"
 "                REF: Page 122, section 5.17"
 msgstr ""
-"        ADVERTENCIA    La clave de opción Duplex %s puede que no funcione como se espera y debería llamarse Duplex.\n"
+"        ADVERTENCIA    La clave de opción Duplex %s puede que no funcione "
+"como se espera y debería llamarse Duplex.\n"
 "                REF: Página 122, sección 5.17"
 
-#: systemv/cupstestppd.c:1744
 msgid "        WARN    File contains a mix of CR, LF, and CR LF line endings."
-msgstr "        ADVERTENCIA    El archivo contiene una mezcla de líneas acabadas en CR, LF y CR LF."
+msgstr ""
+"        ADVERTENCIA    El archivo contiene una mezcla de líneas acabadas en "
+"CR, LF y CR LF."
 
-#: systemv/cupstestppd.c:1390
 msgid ""
 "        WARN    LanguageEncoding required by PPD 4.3 spec.\n"
 "                REF: Pages 56-57, section 5.3."
 msgstr ""
-"        ADVERTENCIA    Se necesita LanguageEncoding por especificación de PPD 4.3.\n"
+"        ADVERTENCIA    Se necesita LanguageEncoding por especificación de "
+"PPD 4.3.\n"
 "                REF: Páginas 56-57, sección 5.3."
 
-#: systemv/cupstestppd.c:1726
 #, c-format
 msgid "        WARN    Line %d only contains whitespace."
 msgstr "        ADVERTENCIA    La línea %d solo contiene espacios en blanco."
 
-#: systemv/cupstestppd.c:1398
 msgid ""
 "        WARN    Manufacturer required by PPD 4.3 spec.\n"
 "                REF: Pages 58-59, section 5.3."
 msgstr ""
-"        ADVERTENCIA    Se necesita Manufacturer por especificación de PPD 4.3.\n"
+"        ADVERTENCIA    Se necesita Manufacturer por especificación de PPD "
+"4.3.\n"
 "                REF: Páginas 58-59, sección 5.3."
 
-#: systemv/cupstestppd.c:1749
-msgid "        WARN    Non-Windows PPD files should use lines ending with only LF, not CR LF."
-msgstr "        ADVERTENCIA    Los archivos PPD que no sean de Windows deben tener líneas que acaben sólo en LF, no en CR LF."
+msgid ""
+"        WARN    Non-Windows PPD files should use lines ending with only LF, "
+"not CR LF."
+msgstr ""
+"        ADVERTENCIA    Los archivos PPD que no sean de Windows deben tener "
+"líneas que acaben sólo en LF, no en CR LF."
 
-#: systemv/cupstestppd.c:1382
 #, c-format
 msgid ""
 "        WARN    Obsolete PPD version %.1f.\n"
@@ -399,15 +303,14 @@ msgstr ""
 "        ADVERTENCIA    Versión de PPD %.1f anticuada.\n"
 "                REF: Página 42, sección 5.2."
 
-#: systemv/cupstestppd.c:1413
 msgid ""
 "        WARN    PCFileName longer than 8.3 in violation of PPD spec.\n"
 "                REF: Pages 61-62, section 5.3."
 msgstr ""
-"        ADVERTENCIA    PCFileName es mas largo que 8.3 violando la especificación PPD.\n"
+"        ADVERTENCIA    PCFileName es mas largo que 8.3 violando la "
+"especificación PPD.\n"
 "                REF: Páginas 61-62, sección 5.3."
 
-#: systemv/cupstestppd.c:1421
 msgid ""
 "        WARN    PCFileName should contain a unique filename.\n"
 "                REF: Pages 61-62, section 5.3."
@@ -415,43 +318,39 @@ msgstr ""
 "        ADVERTENCIA    PCFileName debe contener un único nombre de archivo.\n"
 "                REF: Páginas 61-62, sección 5.3."
 
-#: systemv/cupstestppd.c:1456
 msgid ""
 "        WARN    Protocols contains PJL but JCL attributes are not set.\n"
 "                REF: Pages 78-79, section 5.7."
 msgstr ""
-"        ADVERTENCIA    Los protocolos contienen PJL pero no se especifican los atributos JCL.\n"
+"        ADVERTENCIA    Los protocolos contienen PJL pero no se especifican "
+"los atributos JCL.\n"
 "                REF: Páginas 78-79, sección 5.7."
 
-#: systemv/cupstestppd.c:1447
 msgid ""
 "        WARN    Protocols contains both PJL and BCP; expected TBCP.\n"
 "                REF: Pages 78-79, section 5.7."
 msgstr ""
-"        ADVERTENCIA    Los protocolos contienen a ambos, PJL y BCP; se esperaba TBCP.\n"
+"        ADVERTENCIA    Los protocolos contienen a ambos, PJL y BCP; se "
+"esperaba TBCP.\n"
 "                REF: Páginas 78-79, sección 5.7."
 
-#: systemv/cupstestppd.c:1430
 msgid ""
 "        WARN    ShortNickName required by PPD 4.3 spec.\n"
 "                REF: Pages 64-65, section 5.3."
 msgstr ""
-"        ADVERTENCIA    Se necesita ShortNickName por especificación de PPD 4.3.\n"
+"        ADVERTENCIA    Se necesita ShortNickName por especificación de PPD "
+"4.3.\n"
 "                REF: Páginas 64-65, sección 5.3."
 
-#: systemv/cupsaddsmb.c:282
 msgid "       cupsaddsmb [options] -a"
 msgstr "       cupsaddsmb [opciones] -a"
 
-#: systemv/cupstestdsc.c:427
 msgid "       cupstestdsc [options] -"
 msgstr "       cupstestdsc [opciones] -"
 
-#: systemv/cupstestppd.c:3795
 msgid "       program | cupstestppd [options] -"
 msgstr "       programa | cupstestppd [opciones] -"
 
-#: systemv/cupstestppd.c:3727
 #, c-format
 msgid ""
 "      %s  \"%s %s\" conflicts with \"%s %s\"\n"
@@ -460,17 +359,14 @@ msgstr ""
 "      %s  \"%s %s\" está en conflictocon \"%s %s\"\n"
 "                (restricción=\"%s %s %s %s\")."
 
-#: systemv/cupstestppd.c:2248
 #, c-format
 msgid "      %s  %s %s does not exist."
 msgstr "      %s  %s %s no existe."
 
-#: systemv/cupstestppd.c:3884
 #, c-format
 msgid "      %s  %s file \"%s\" has the wrong capitalization."
 msgstr "      %s  archivo %s \"%s\" tiene las mayúsculas equivocadas"
 
-#: systemv/cupstestppd.c:2318
 #, c-format
 msgid ""
 "      %s  Bad %s choice %s.\n"
@@ -479,113 +375,73 @@ msgstr ""
 "      %s  Preferencia %s incorrecta %s.\n"
 "                REF: Página 122, sección 5.17"
 
-#: systemv/cupstestppd.c:3487
-#: systemv/cupstestppd.c:3536
-#: systemv/cupstestppd.c:3575
 #, c-format
 msgid "      %s  Bad UTF-8 \"%s\" translation string for option %s, choice %s."
-msgstr "      %s  Cadena de traducción UTF-8 \"%s\" incorrecta para opción %s, preferencia %s."
+msgstr ""
+"      %s  Cadena de traducción UTF-8 \"%s\" incorrecta para opción %s, "
+"preferencia %s."
 
-#: systemv/cupstestppd.c:3441
 #, c-format
 msgid "      %s  Bad UTF-8 \"%s\" translation string for option %s."
 msgstr "      %s  Cadena de traducción UTF-8 \"%s\" incorrecta para opción %s."
 
-#: systemv/cupstestppd.c:2389
 #, c-format
 msgid "      %s  Bad cupsFilter value \"%s\"."
 msgstr "      %s  Valor cupsFilter \"%s\" incorrecto."
 
-#: systemv/cupstestppd.c:2475
 #, c-format
 msgid "      %s  Bad cupsFilter2 value \"%s\"."
 msgstr "      %s  Valor cupsFilter2 incorrecto \"%s\"."
 
-#: systemv/cupstestppd.c:2964
 #, c-format
 msgid "      %s  Bad cupsICCProfile %s."
 msgstr "      %s  cupsICCProfile %s incorrecto."
 
-#: systemv/cupstestppd.c:2571
 #, c-format
 msgid "      %s  Bad cupsPreFilter value \"%s\"."
 msgstr "      %s  Valor cupsPreFilter \"%s\" incorrecto."
 
-#: systemv/cupstestppd.c:1822
 #, c-format
 msgid "      %s  Bad cupsUIConstraints %s: \"%s\""
 msgstr "      %s  cupsUIConstraints %s: \"%s\" incorrecto"
 
-#: systemv/cupstestppd.c:3391
 #, c-format
 msgid "      %s  Bad language \"%s\"."
 msgstr "      %s  Idioma incorrecto \"%s\"."
 
-#: systemv/cupstestppd.c:2433
-#: systemv/cupstestppd.c:2529
-#: systemv/cupstestppd.c:2615
-#: systemv/cupstestppd.c:2673
-#: systemv/cupstestppd.c:2728
-#: systemv/cupstestppd.c:2783
-#: systemv/cupstestppd.c:2838
-#: systemv/cupstestppd.c:2891
-#: systemv/cupstestppd.c:3013
 #, c-format
 msgid "      %s  Bad permissions on %s file \"%s\"."
 msgstr "      %s  Permisos incorrectos en el archivo %s \"%s\"."
 
-#: systemv/cupstestppd.c:2373
-#: systemv/cupstestppd.c:2459
-#: systemv/cupstestppd.c:2555
-#: systemv/cupstestppd.c:2642
-#: systemv/cupstestppd.c:2697
-#: systemv/cupstestppd.c:2752
-#: systemv/cupstestppd.c:2807
-#: systemv/cupstestppd.c:2862
 #, c-format
 msgid "      %s  Bad spelling of %s - should be %s."
 msgstr "      %s  %s mal escrito - debería ser %s."
 
-#: systemv/cupstestppd.c:2907
 #, c-format
 msgid "      %s  Cannot provide both APScanAppPath and APScanAppBundleID."
 msgstr "      %s  No puede proporcionar APScanAppPath y APScanAppBundleID."
 
-#: systemv/cupstestppd.c:2205
 #, c-format
 msgid "      %s  Default choices conflicting."
 msgstr "      %s  Las preferencias predeterminadas están en conflicto."
 
-#: systemv/cupstestppd.c:1803
 #, c-format
 msgid "      %s  Empty cupsUIConstraints %s"
 msgstr "      %s  cupsUIConstraints %s vacío."
 
-#: systemv/cupstestppd.c:3519
-#: systemv/cupstestppd.c:3559
 #, c-format
 msgid "      %s  Missing \"%s\" translation string for option %s, choice %s."
-msgstr "      %s  Falta cadena de traducción \"%s\" para opción %s, preferencia %s."
+msgstr ""
+"      %s  Falta cadena de traducción \"%s\" para opción %s, preferencia %s."
 
-#: systemv/cupstestppd.c:3427
 #, c-format
 msgid "      %s  Missing \"%s\" translation string for option %s."
 msgstr "      %s  Falta cadena de traducción \"%s\" para opción %s."
 
-#: systemv/cupstestppd.c:2418
-#: systemv/cupstestppd.c:2514
-#: systemv/cupstestppd.c:2600
-#: systemv/cupstestppd.c:2658
-#: systemv/cupstestppd.c:2713
-#: systemv/cupstestppd.c:2768
-#: systemv/cupstestppd.c:2823
-#: systemv/cupstestppd.c:2875
-#: systemv/cupstestppd.c:2998
 #, c-format
 msgid "      %s  Missing %s file \"%s\"."
 msgstr "      %s  Falta archivo %s \"%s\"."
 
-#: systemv/cupstestppd.c:3121
 #, c-format
 msgid ""
 "      %s  Missing REQUIRED PageRegion option.\n"
@@ -594,7 +450,6 @@ msgstr ""
 "      %s  Falta la opción NECESARIA PageRegion.\n"
 "                REF: Página 100, sección 5.14."
 
-#: systemv/cupstestppd.c:3106
 #, c-format
 msgid ""
 "      %s  Missing REQUIRED PageSize option.\n"
@@ -603,39 +458,31 @@ msgstr ""
 "      %s  Falta la opción NECESARIA PageSize.\n"
 "                REF: Página 99, sección 5.14."
 
-#: systemv/cupstestppd.c:2013
-#: systemv/cupstestppd.c:2054
 #, c-format
 msgid "      %s  Missing choice *%s %s in UIConstraints \"*%s %s *%s %s\"."
-msgstr "      %s  Falta la preferencia *%s %s en UIConstraint \"*%s %s *%s %s\"."
+msgstr ""
+"      %s  Falta la preferencia *%s %s en UIConstraint \"*%s %s *%s %s\"."
 
-#: systemv/cupstestppd.c:1908
 #, c-format
 msgid "      %s  Missing choice *%s %s in cupsUIConstraints %s: \"%s\""
 msgstr "      %s  Falta la preferencia *%s %s en cupsUIConstraints %s: \"%s\""
 
-#: systemv/cupstestppd.c:1840
 #, c-format
 msgid "      %s  Missing cupsUIResolver %s"
 msgstr "      %s  Falta cupsUIResolver %s"
 
-#: systemv/cupstestppd.c:1999
-#: systemv/cupstestppd.c:2040
 #, c-format
 msgid "      %s  Missing option %s in UIConstraints \"*%s %s *%s %s\"."
 msgstr "      %s  Falta la opción %s en UIConstraints \"*%s %s *%s %s\"."
 
-#: systemv/cupstestppd.c:1892
 #, c-format
 msgid "      %s  Missing option %s in cupsUIConstraints %s: \"%s\""
 msgstr "      %s  Falta la opción %s en cupsUIConstraints %s: \"%s\""
 
-#: systemv/cupstestppd.c:3613
 #, c-format
 msgid "      %s  No base translation \"%s\" is included in file."
 msgstr "      %s  No hay traducción base \"%s\" incluida en el archivo."
 
-#: systemv/cupstestppd.c:2294
 #, c-format
 msgid ""
 "      %s  REQUIRED %s does not define choice None.\n"
@@ -644,43 +491,36 @@ msgstr ""
 "      %s  NECESARIA %s no define la opción None.\n"
 "                REF: Página 122, sección 5.17"
 
-#: systemv/cupstestppd.c:3180
-#: systemv/cupstestppd.c:3194
 #, c-format
 msgid "      %s  Size \"%s\" defined for %s but not for %s."
 msgstr "      %s  Tamaño \"%s\" definido para %s pero no para %s."
 
-#: systemv/cupstestppd.c:3160
 #, c-format
 msgid "      %s  Size \"%s\" has unexpected dimensions (%gx%g)."
 msgstr "      %s  El tamaño \"%s\" tiene dimensiones inesperadas (%gx%g)."
 
-#: systemv/cupstestppd.c:3332
 #, c-format
 msgid "      %s  Size \"%s\" should be \"%s\"."
 msgstr "      %s  Tamaño \"%s\" debería ser \"%s\"."
 
-#: systemv/cupstestppd.c:3292
 #, c-format
 msgid "      %s  Size \"%s\" should be the Adobe standard name \"%s\"."
-msgstr "      %s  Tamaño \"%s\" debería ser el nombre estandar de Adobe \"%s\"."
+msgstr ""
+"      %s  Tamaño \"%s\" debería ser el nombre estandar de Adobe \"%s\"."
 
-#: systemv/cupstestppd.c:3041
 #, c-format
 msgid "      %s  cupsICCProfile %s hash value collides with %s."
 msgstr "      %s  valor hash de cupsICCProfile %s colisiona con %s."
 
-#: systemv/cupstestppd.c:1963
 #, c-format
 msgid "      %s  cupsUIResolver %s causes a loop."
 msgstr "      %s  cupsUIResolver %s genera un bucle."
 
-#: systemv/cupstestppd.c:1945
 #, c-format
-msgid "      %s  cupsUIResolver %s does not list at least two different options."
+msgid ""
+"      %s  cupsUIResolver %s does not list at least two different options."
 msgstr "      %s  cupsUIResolver %s no lista al menos dos opciones diferentes."
 
-#: systemv/cupstestppd.c:1168
 #, c-format
 msgid ""
 "      **FAIL**  %s must be 1284DeviceID\n"
@@ -689,7 +529,6 @@ msgstr ""
 "      **FALLO**  %s debe ser 1284DeviceID\n"
 "                REF: Página 72, sección 5.5"
 
-#: systemv/cupstestppd.c:580
 #, c-format
 msgid ""
 "      **FAIL**  Bad Default%s %s\n"
@@ -698,7 +537,6 @@ msgstr ""
 "      **FALLO**  Default%s %s incorrecto\n"
 "                REF: Página 40, sección 4.5."
 
-#: systemv/cupstestppd.c:514
 #, c-format
 msgid ""
 "      **FAIL**  Bad DefaultImageableArea %s\n"
@@ -707,7 +545,6 @@ msgstr ""
 "      **FALLO**  DefaultImageableArea %s incorrecto\n"
 "                REF: Página 102, sección 5.15."
 
-#: systemv/cupstestppd.c:550
 #, c-format
 msgid ""
 "      **FAIL**  Bad DefaultPaperDimension %s\n"
@@ -716,7 +553,6 @@ msgstr ""
 "      **FALLO**  DefaultPaperDimension %s incorrecto\n"
 "                REF: Página 103, sección 5.15."
 
-#: systemv/cupstestppd.c:623
 #, c-format
 msgid ""
 "      **FAIL**  Bad FileVersion \"%s\"\n"
@@ -725,7 +561,6 @@ msgstr ""
 "      **FALLO**  FileVersion \"%s\" incorrecto\n"
 "                REF: Página 56, sección 5.3."
 
-#: systemv/cupstestppd.c:667
 #, c-format
 msgid ""
 "      **FAIL**  Bad FormatVersion \"%s\"\n"
@@ -734,7 +569,6 @@ msgstr ""
 "      **FALLO**  FormatVersion \"%s\" incorrecto\n"
 "                REF: Página 56, sección 5.3."
 
-#: systemv/cupstestppd.c:1025
 msgid ""
 "      **FAIL**  Bad JobPatchFile attribute in file\n"
 "                REF: Page 24, section 3.4."
@@ -742,18 +576,16 @@ msgstr ""
 "      **FALLO**  Atributo JobPatchFile en archivo, incorrecto\n"
 "                REF: Página 24, sección 3.4."
 
-#: systemv/cupstestppd.c:1213
 #, c-format
 msgid "      **FAIL**  Bad LanguageEncoding %s - must be ISOLatin1."
-msgstr "      **FALLO**  LanguageEncoding %s incorrecto: debería ser ISOLatin1."
+msgstr ""
+"      **FALLO**  LanguageEncoding %s incorrecto: debería ser ISOLatin1."
 
-#: systemv/cupstestppd.c:1227
 #, c-format
 msgid "      **FAIL**  Bad LanguageVersion %s - must be English."
-msgstr "      **FALLO**  LanguageVersion %s incorrecto: debería ser English (Inglés)."
+msgstr ""
+"      **FALLO**  LanguageVersion %s incorrecto: debería ser English (Inglés)."
 
-#: systemv/cupstestppd.c:743
-#: systemv/cupstestppd.c:760
 #, c-format
 msgid ""
 "      **FAIL**  Bad Manufacturer (should be \"%s\")\n"
@@ -762,7 +594,6 @@ msgstr ""
 "      **FALLO**  Fabricante incorrecto (debería ser \"%s\")\n"
 "                REF: Página 211, tabla D.1."
 
-#: systemv/cupstestppd.c:800
 #, c-format
 msgid ""
 "      **FAIL**  Bad ModelName - \"%c\" not allowed in string.\n"
@@ -771,7 +602,6 @@ msgstr ""
 "      **FALLO**  ModelName incorrecto - \"%c\" no permitido en la cadena.\n"
 "                REF: Páginas 59-60, sección 5.3."
 
-#: systemv/cupstestppd.c:956
 msgid ""
 "      **FAIL**  Bad PSVersion - not \"(string) int\".\n"
 "                REF: Pages 62-64, section 5.3."
@@ -779,7 +609,6 @@ msgstr ""
 "      **FALLO**  PSVersion incorrecto - no es \"(string) int\".\n"
 "                REF: Páginas 62-64, sección 5.3."
 
-#: systemv/cupstestppd.c:917
 msgid ""
 "      **FAIL**  Bad Product - not \"(string)\".\n"
 "                REF: Page 62, section 5.3."
@@ -787,7 +616,6 @@ msgstr ""
 "      **FALLO**  Product incorrecto - no es \"(string)\".\n"
 "                REF: Página 62, sección 5.3."
 
-#: systemv/cupstestppd.c:991
 msgid ""
 "      **FAIL**  Bad ShortNickName - longer than 31 chars.\n"
 "                REF: Pages 64-65, section 5.3."
@@ -795,7 +623,6 @@ msgstr ""
 "      **FALLO**  ShortNickName incorrecto - mayor de 31 caracteres.\n"
 "                REF: Páginas 64-65, sección 5.3."
 
-#: systemv/cupstestppd.c:1149
 #, c-format
 msgid ""
 "      **FAIL**  Bad option %s choice %s\n"
@@ -804,43 +631,51 @@ msgstr ""
 "      **FALLO**  Opción %s, preferencia %s incorrecta\n"
 "                REF: Página 84, sección 5.9"
 
-#: systemv/cupstestppd.c:3754
-#: systemv/cupstestppd.c:3776
 #, c-format
 msgid "      **FAIL**  Default option code cannot be interpreted: %s"
-msgstr "      **FALLO**  El código de opción predeterminado no puede ser interpretado: %s"
+msgstr ""
+"      **FALLO**  El código de opción predeterminado no puede ser "
+"interpretado: %s"
 
-#: systemv/cupstestppd.c:1286
 #, c-format
-msgid "      **FAIL**  Default translation string for option %s choice %s contains 8-bit characters."
-msgstr "      **FALLO**  Cadena de traducción predeterminada para opción %s preferencia %s contiene caracteres de 8-bits."
+msgid ""
+"      **FAIL**  Default translation string for option %s choice %s contains "
+"8-bit characters."
+msgstr ""
+"      **FALLO**  Cadena de traducción predeterminada para opción %s "
+"preferencia %s contiene caracteres de 8-bits."
 
-#: systemv/cupstestppd.c:1259
 #, c-format
-msgid "      **FAIL**  Default translation string for option %s contains 8-bit characters."
-msgstr "      **FALLO**  Cadena de traducción predeterminada para opción %s contiene caracteres de 8-bits."
+msgid ""
+"      **FAIL**  Default translation string for option %s contains 8-bit "
+"characters."
+msgstr ""
+"      **FALLO**  Cadena de traducción predeterminada para opción %s contiene "
+"caracteres de 8-bits."
 
-#: systemv/cupstestppd.c:2101
 #, c-format
 msgid "      **FAIL**  Group names %s and %s differ only by case."
-msgstr "      **FALLO**  Nombres de grupo %s y %s se diferencian sólo en la capitalización."
+msgstr ""
+"      **FALLO**  Nombres de grupo %s y %s se diferencian sólo en la "
+"capitalización."
 
-#: systemv/cupstestppd.c:2146
 #, c-format
 msgid "      **FAIL**  Multiple occurrences of option %s choice name %s."
-msgstr "      **FALLO**  Múltiples apariciones de opción %s nombre de preferencia %s."
+msgstr ""
+"      **FALLO**  Múltiples apariciones de opción %s nombre de preferencia %s."
 
-#: systemv/cupstestppd.c:2163
 #, c-format
 msgid "      **FAIL**  Option %s choice names %s and %s differ only by case."
-msgstr "      **FALLO**  Opción %s nombres de preferencia %s y %s se diferencian sólo en la capitalización."
+msgstr ""
+"      **FALLO**  Opción %s nombres de preferencia %s y %s se diferencian "
+"sólo en la capitalización."
 
-#: systemv/cupstestppd.c:2123
 #, c-format
 msgid "      **FAIL**  Option names %s and %s differ only by case."
-msgstr "      **FALLO**  Nombres de opción %s y %s se diferencian sólo en la capitalización."
+msgstr ""
+"      **FALLO**  Nombres de opción %s y %s se diferencian sólo en la "
+"capitalización."
 
-#: systemv/cupstestppd.c:600
 #, c-format
 msgid ""
 "      **FAIL**  REQUIRED Default%s\n"
@@ -849,7 +684,6 @@ msgstr ""
 "      **FALLO**  SE NECESITA Default%s\n"
 "                REF: Página 40, sección 4.5."
 
-#: systemv/cupstestppd.c:499
 msgid ""
 "      **FAIL**  REQUIRED DefaultImageableArea\n"
 "                REF: Page 102, section 5.15."
@@ -857,7 +691,6 @@ msgstr ""
 "      **FALLO**  SE NECESITA DefaultImageableArea\n"
 "                REF: Página 102, sección 5.15."
 
-#: systemv/cupstestppd.c:535
 msgid ""
 "      **FAIL**  REQUIRED DefaultPaperDimension\n"
 "                REF: Page 103, section 5.15."
@@ -865,7 +698,6 @@ msgstr ""
 "      **FALLO**  SE NECESITA DefaultPaperDimension\n"
 "                REF: Página 103, sección 5.15."
 
-#: systemv/cupstestppd.c:641
 msgid ""
 "      **FAIL**  REQUIRED FileVersion\n"
 "                REF: Page 56, section 5.3."
@@ -873,7 +705,6 @@ msgstr ""
 "      **FALLO**  SE NECESITA FileVersion\n"
 "                REF: Página 56, sección 5.3."
 
-#: systemv/cupstestppd.c:685
 msgid ""
 "      **FAIL**  REQUIRED FormatVersion\n"
 "                REF: Page 56, section 5.3."
@@ -881,7 +712,6 @@ msgstr ""
 "      **FALLO**  SE NECESITA FormatVersion\n"
 "                REF: Página 56, sección 5.3."
 
-#: systemv/cupstestppd.c:1076
 #, c-format
 msgid ""
 "      **FAIL**  REQUIRED ImageableArea for PageSize %s\n"
@@ -892,7 +722,6 @@ msgstr ""
 "                REF: Página 41, sección 5.\n"
 "                REF: Página 102, sección 5.15."
 
-#: systemv/cupstestppd.c:705
 msgid ""
 "      **FAIL**  REQUIRED LanguageEncoding\n"
 "                REF: Pages 56-57, section 5.3."
@@ -900,7 +729,6 @@ msgstr ""
 "      **FALLO**  SE NECESITA LanguageEncoding\n"
 "                REF: Páginas 56-57, sección 5.3."
 
-#: systemv/cupstestppd.c:725
 msgid ""
 "      **FAIL**  REQUIRED LanguageVersion\n"
 "                REF: Pages 57-58, section 5.3."
@@ -908,7 +736,6 @@ msgstr ""
 "      **FALLO**  SE NECESITA LanguageVersion\n"
 "                REF: Páginas 57-58, sección 5.3."
 
-#: systemv/cupstestppd.c:779
 msgid ""
 "      **FAIL**  REQUIRED Manufacturer\n"
 "                REF: Pages 58-59, section 5.3."
@@ -916,7 +743,6 @@ msgstr ""
 "      **FALLO**  SE NECESITA Manufacturer\n"
 "                REF: Páginas 58-59, sección 5.3."
 
-#: systemv/cupstestppd.c:819
 msgid ""
 "      **FAIL**  REQUIRED ModelName\n"
 "                REF: Pages 59-60, section 5.3."
@@ -924,7 +750,6 @@ msgstr ""
 "      **FALLO**  SE NECESITA ModelName\n"
 "                REF: Páginas 59-60, sección 5.3."
 
-#: systemv/cupstestppd.c:839
 msgid ""
 "      **FAIL**  REQUIRED NickName\n"
 "                REF: Page 60, section 5.3."
@@ -932,7 +757,6 @@ msgstr ""
 "      **FALLO**  SE NECESITA NickName\n"
 "                REF: Página 60, sección 5.3."
 
-#: systemv/cupstestppd.c:899
 msgid ""
 "      **FAIL**  REQUIRED PCFileName\n"
 "                REF: Pages 61-62, section 5.3."
@@ -940,7 +764,6 @@ msgstr ""
 "      **FALLO**  SE NECESITA PCFileName\n"
 "                REF: Páginas 61-62, sección 5.3."
 
-#: systemv/cupstestppd.c:974
 msgid ""
 "      **FAIL**  REQUIRED PSVersion\n"
 "                REF: Pages 62-64, section 5.3."
@@ -948,7 +771,6 @@ msgstr ""
 "      **FALLO**  SE NECESITA PSVersion\n"
 "                REF: Páginas 62-64, sección 5.3."
 
-#: systemv/cupstestppd.c:879
 msgid ""
 "      **FAIL**  REQUIRED PageRegion\n"
 "                REF: Page 100, section 5.14."
@@ -956,7 +778,6 @@ msgstr ""
 "      **FALLO**  SE NECESITA PageRegion\n"
 "                REF: Página 100, sección 5.14."
 
-#: systemv/cupstestppd.c:1045
 msgid ""
 "      **FAIL**  REQUIRED PageSize\n"
 "                REF: Page 41, section 5.\n"
@@ -966,7 +787,6 @@ msgstr ""
 "                REF: Página 41, sección 5.\n"
 "                REF: Página 99, sección 5.14."
 
-#: systemv/cupstestppd.c:859
 msgid ""
 "      **FAIL**  REQUIRED PageSize\n"
 "                REF: Pages 99-100, section 5.14."
@@ -974,7 +794,6 @@ msgstr ""
 "      **FALLO**  SE NECESITA PageSize\n"
 "                REF: Páginas 99-100, sección 5.14."
 
-#: systemv/cupstestppd.c:1098
 #, c-format
 msgid ""
 "      **FAIL**  REQUIRED PaperDimension for PageSize %s\n"
@@ -985,7 +804,6 @@ msgstr ""
 "                REF: Página 41, sección 5.\n"
 "                REF: Página 103, sección 5.15."
 
-#: systemv/cupstestppd.c:934
 msgid ""
 "      **FAIL**  REQUIRED Product\n"
 "                REF: Page 62, section 5.3."
@@ -993,7 +811,6 @@ msgstr ""
 "      **FALLO**  SE NECESITA Product\n"
 "                REF: Página 62, sección 5.3."
 
-#: systemv/cupstestppd.c:1009
 msgid ""
 "      **FAIL**  REQUIRED ShortNickName\n"
 "                REF: Page 64-65, section 5.3."
@@ -1001,24 +818,18 @@ msgstr ""
 "      **FALLO**  SE NECESITA ShortNickName\n"
 "                REF: Página 64-65, sección 5.3."
 
-#: systemv/cupstestppd.c:334
-#: systemv/cupstestppd.c:353
-#: systemv/cupstestppd.c:365
 #, c-format
 msgid "      **FAIL**  Unable to open PPD file - %s on line %d."
-msgstr "      **FALLO**  No se ha podido abrir el archivo PPD - %s en la línea %d."
+msgstr ""
+"      **FALLO**  No se ha podido abrir el archivo PPD - %s en la línea %d."
 
-#: systemv/cupstestppd.c:1498
 #, c-format
 msgid "    %d ERRORS FOUND"
 msgstr "    %d ERRORES ENCONTRADOS"
 
-#: systemv/cupstestdsc.c:431
 msgid "    -h       Show program usage"
 msgstr "    -h       Mostrar el uso del programa"
 
-#: systemv/cupstestdsc.c:234
-#: systemv/cupstestdsc.c:276
 #, c-format
 msgid ""
 "    Bad %%%%BoundingBox: on line %d.\n"
@@ -1027,7 +838,6 @@ msgstr ""
 "    %%%%BoundingBox: incorrecto en línea %d.\n"
 "        REF: Página 39, %%%%BoundingBox:"
 
-#: systemv/cupstestdsc.c:305
 #, c-format
 msgid ""
 "    Bad %%%%Page: on line %d.\n"
@@ -1036,8 +846,6 @@ msgstr ""
 "    %%%%Page: incorrecto en línea %d.\n"
 "        REF: Página 53, %%%%Page:"
 
-#: systemv/cupstestdsc.c:218
-#: systemv/cupstestdsc.c:258
 #, c-format
 msgid ""
 "    Bad %%%%Pages: on line %d.\n"
@@ -1046,7 +854,6 @@ msgstr ""
 "    %%%%Pages: incorrecto en línea %d.\n"
 "        REF: Página 43, %%%%Pages:"
 
-#: systemv/cupstestdsc.c:176
 #, c-format
 msgid ""
 "    Line %d is longer than 255 characters (%d).\n"
@@ -1055,7 +862,6 @@ msgstr ""
 "    La línea %d es más larga de 255 caracteres (%d).\n"
 "        REF: Página 25, Longitud de Línea"
 
-#: systemv/cupstestdsc.c:192
 msgid ""
 "    Missing %!PS-Adobe-3.0 on first line.\n"
 "        REF: Page 17, 3.1 Conforming Documents"
@@ -1063,12 +869,11 @@ msgstr ""
 "    Falta %!PS-Adobe-3.0 en la primera línea.\n"
 "        REF: Página 17, 3.1 Conformidad de documentos"
 
-#: systemv/cupstestdsc.c:362
 #, c-format
 msgid "    Missing %%EndComments comment.        REF: Page 41, %%EndComments"
-msgstr "    Falta comentario %%EndComments.        REF: Página 41, %%EndComments"
+msgstr ""
+"    Falta comentario %%EndComments.        REF: Página 41, %%EndComments"
 
-#: systemv/cupstestdsc.c:342
 #, c-format
 msgid ""
 "    Missing or bad %%BoundingBox: comment.\n"
@@ -1077,7 +882,6 @@ msgstr ""
 "    Falta comentario %%BoundingBox: o incorrecto.\n"
 "        REF: Página 39, %%BoundingBox:"
 
-#: systemv/cupstestdsc.c:372
 #, c-format
 msgid ""
 "    Missing or bad %%Page: comments.\n"
@@ -1086,7 +890,6 @@ msgstr ""
 "    Falta comentario %%Page: o incorrecto.\n"
 "        REF: Página 53, %%Page:"
 
-#: systemv/cupstestdsc.c:352
 #, c-format
 msgid ""
 "    Missing or bad %%Pages: comment.\n"
@@ -1095,2177 +898,1553 @@ msgstr ""
 "    Falta comentario %%Pages: o incorrecto.\n"
 "        REF: Página 43, %%Pages:"
 
-#: systemv/cupstestppd.c:1500
 msgid "    NO ERRORS FOUND"
 msgstr "    NO SE HAN ENCONTRADO ERRORES"
 
-#: systemv/cupstestdsc.c:395
 #, c-format
 msgid "    Saw %d lines that exceeded 255 characters."
 msgstr "    Se han visto %d líneas que exceden de 255 caracteres."
 
-#: systemv/cupstestdsc.c:390
 #, c-format
 msgid "    Too many %%BeginDocument comments."
 msgstr "    Demasiados comentarios %%BeginDocument."
 
-#: systemv/cupstestdsc.c:382
 #, c-format
 msgid "    Too many %%EndDocument comments."
 msgstr "    Demasiados comentarios %%EndDocument."
 
-#: systemv/cupstestdsc.c:402
 msgid "    Warning: file contains binary data."
 msgstr "    Advertencia: el archivo contiene datos binarios."
 
-#: systemv/cupstestdsc.c:410
 #, c-format
 msgid "    Warning: no %%EndComments comment in file."
 msgstr "    Advertencia: no hay comentario %%EndComments en el archivo."
 
-#: systemv/cupstestdsc.c:406
 #, c-format
 msgid "    Warning: obsolete DSC version %.1f in file."
 msgstr "    Advertencia: versión DSC %.1f obsoleta en el archivo."
 
-#: systemv/cupsctl.c:210
 msgid "  --[no-]debug-logging    Turn debug logging on/off."
 msgstr "  --[no-]debug-logging    Activar/desactivar registro de depuración."
 
-#: systemv/cupsctl.c:212
 msgid "  --[no-]remote-admin     Turn remote administration on/off."
 msgstr "  --[no-]remote-admin     Activar/desactivar administración remota."
 
-#: systemv/cupsctl.c:214
 msgid "  --[no-]remote-any       Allow/prevent access from the Internet."
 msgstr "  --[no-]remote-any       Permitir/evitar acceso desde Internet."
 
-#: systemv/cupsctl.c:216
 msgid "  --[no-]share-printers   Turn printer sharing on/off."
-msgstr "  --[no-]share-printers   Activar/desactivar compartición de impresoras."
+msgstr ""
+"  --[no-]share-printers   Activar/desactivar compartición de impresoras."
 
-#: systemv/cupsctl.c:218
 msgid "  --[no-]user-cancel-any  Allow/prevent users to cancel any job."
-msgstr "  --[no-]user-cancel-any  Permitir/evitar a usuarios que cancelen cualquier trabajo."
+msgstr ""
+"  --[no-]user-cancel-any  Permitir/evitar a usuarios que cancelen cualquier "
+"trabajo."
 
-#: ppdc/ppdc.cxx:455
 msgid "  --cr                    End lines with CR (Mac OS 9)."
 msgstr "  --cr                    Finalizar líneas con CR (Mac OS 9)."
 
-#: ppdc/ppdc.cxx:457
 msgid "  --crlf                  End lines with CR + LF (Windows)."
 msgstr "  --crlf                  Finalizar líneas con CR + LF (Windows)."
 
-#: ppdc/ppdc.cxx:459
 msgid "  --lf                    End lines with LF (UNIX/Linux/OS X)."
 msgstr "  --lf                    Finalizar líneas con LF (UNIX/Linux/OS X)."
 
-#: test/ipptool.c:4404
 msgid "  -4                      Connect using IPv4."
 msgstr "  -4                      Conectar usando IPv4."
 
-#: test/ipptool.c:4405
 msgid "  -6                      Connect using IPv6."
 msgstr "  -6                      Conectar usando IPv6."
 
-#: test/ipptool.c:4406
 msgid "  -C                      Send requests using chunking (default)."
-msgstr "  -C                      Enviar peticiones usando fragmentación (predeterminado)."
+msgstr ""
+"  -C                      Enviar peticiones usando fragmentación "
+"(predeterminado)."
 
-#: scheduler/cupsfilter.c:1431
 msgid "  -D                      Remove the input file when finished."
 msgstr "  -D                      Eliminar el archivo de entrada al terminar."
 
-#: ppdc/ppdc.cxx:438
-#: ppdc/ppdhtml.cxx:175
-#: ppdc/ppdpo.cxx:255
 msgid "  -D name=value           Set named variable to value."
 msgstr "  -D nombre=valor           Establece la variable nombre al valor."
 
-#: systemv/cupsaddsmb.c:285
-#: systemv/cupsctl.c:205
 msgid "  -E                      Encrypt the connection."
 msgstr "  -E                      Cifra la conexión."
 
-#: test/ipptool.c:4408
 msgid "  -E                      Test with HTTP Upgrade to TLS."
 msgstr "  -E                      Prueba con actualización HTTP a TLS."
 
-#: scheduler/main.c:2021
-msgid "  -F                      Run in the foreground but detach from console."
-msgstr "  -F                      Ejecuta en primer plano pero separado de la consola."
+msgid ""
+"  -F                      Run in the foreground but detach from console."
+msgstr ""
+"  -F                      Ejecuta en primer plano pero separado de la "
+"consola."
 
-#: systemv/cupsaddsmb.c:286
 msgid "  -H samba-server         Use the named SAMBA server."
 msgstr "  -H servidor-samba         Usa el servidor SAMBA nombrado."
 
-#: test/ipptool.c:4410
 msgid "  -I                      Ignore errors."
 msgstr "  -I                      Ignora errores."
 
-#: ppdc/ppdc.cxx:440
-#: ppdc/ppdhtml.cxx:177
-#: ppdc/ppdi.cxx:131
-#: ppdc/ppdpo.cxx:257
 msgid "  -I include-dir          Add include directory to search path."
-msgstr "  -I include-dir          Añade directorio include a la ruta de búsqueda."
+msgstr ""
+"  -I include-dir          Añade directorio include a la ruta de búsqueda."
 
-#: systemv/cupstestppd.c:3799
 msgid "  -I {filename,filters,none,profiles}"
 msgstr "  -I {filename,filters,none,profiles}"
 
-#: test/ipptool.c:4411
 msgid "  -L                      Send requests using content-length."
 msgstr "  -L                      Envía peticiones usando content-length."
 
-#: scheduler/cupsfilter.c:1433
 msgid "  -P filename.ppd         Set PPD file."
 msgstr "  -P nombre_archivo.ppd         Establece archivo PPD."
 
-#: systemv/cupstestppd.c:3801
 msgid "  -R root-directory       Set alternate root."
 msgstr "  -R directorio-raíz       Establece directorio raíz alternativo."
 
-#: test/ipptool.c:4413
 msgid "  -S                      Test with SSL encryption."
 msgstr "  -S                      Prueba con cifrado SSL."
 
-#: test/ipptool.c:4415
 msgid "  -T seconds              Set the receive/send timeout in seconds."
-msgstr "  -T segundos             Establece el tiempo de espera de recepción/envío en segundos."
+msgstr ""
+"  -T segundos             Establece el tiempo de espera de recepción/envío "
+"en segundos."
 
-#: scheduler/cupsfilter.c:1434
-#: systemv/cupsaddsmb.c:288
-#: systemv/cupsctl.c:206
 msgid "  -U username             Specify username."
 msgstr "  -U nombre_usuario             Especifica el nombre de usuario."
 
-#: test/ipptool.c:4417
 msgid "  -V version              Set default IPP version."
 msgstr "  -V versión              Establece la versión IPP predeterminada."
 
-#: systemv/cupstestppd.c:3802
-msgid "  -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,translations}"
-msgstr "  -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,translations}"
+msgid ""
+"  -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,"
+"translations}"
+msgstr ""
+"  -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,"
+"translations}"
 
-#: test/ipptool.c:4419
 msgid "  -X                      Produce XML plist instead of plain text."
-msgstr "  -X                      Produce XML plist en vez de texto sin formato."
+msgstr ""
+"  -X                      Produce XML plist en vez de texto sin formato."
 
-#: systemv/cupsaddsmb.c:289
 msgid "  -a                      Export all printers."
 msgstr "  -a                      Exporta todas las impresoras."
 
-#: ppdc/ppdc.cxx:442
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr "  -c catálogo.po           Carga el catálogo de mensajes especificado."
 
-#: scheduler/cupsfilter.c:1435
-#: scheduler/main.c:2019
 msgid "  -c cupsd.conf           Set cupsd.conf file to use."
 msgstr "  -c cupsd.conf           Establece el archivo cupsd.conf a usar."
 
-#: test/ipptool.c:4421
 msgid "  -d name=value           Set named variable to value."
 msgstr "  -d nombre=valor           Establece la variable al valor."
 
-#: ppdc/ppdc.cxx:444
 msgid "  -d output-dir           Specify the output directory."
 msgstr "  -d dir-salida           Especifica el directorio de salida."
 
-#: scheduler/cupsfilter.c:1437
 msgid "  -d printer              Use the named printer."
 msgstr "  -d impresora              Usa la impresora especificada."
 
-#: scheduler/cupsfilter.c:1439
 msgid "  -e                      Use every filter from the PPD file."
 msgstr "  -e                      Usa cada filtro desde el archivo PPD."
 
-#: scheduler/main.c:2020
 msgid "  -f                      Run in the foreground."
 msgstr "  -f                      Ejecuta en primer plano."
 
-#: test/ipptool.c:4423
 msgid "  -f filename             Set default request filename."
-msgstr "  -f nombre_archivo             Establece nombre de archivo predeterminado."
+msgstr ""
+"  -f nombre_archivo             Establece nombre de archivo predeterminado."
 
-#: scheduler/main.c:2023
 msgid "  -h                      Show this usage message."
 msgstr "  -h                      Muestra este mensaje de uso."
 
-#: systemv/cupsaddsmb.c:290
-#: systemv/cupsctl.c:207
 msgid "  -h server[:port]        Specify server address."
 msgstr "  -h servidor[:puerto]        Especifica la dirección del servidor."
 
-#: scheduler/cupsfilter.c:1441
 msgid "  -i mime/type            Set input MIME type (otherwise auto-typed)."
-msgstr "  -i tipo/mime            Establece el tipo MIME de entrada (si no, auto-typed)."
+msgstr ""
+"  -i tipo/mime            Establece el tipo MIME de entrada (si no, auto-"
+"typed)."
 
-#: test/ipptool.c:4425
-msgid "  -i seconds              Repeat the last file with the given time interval."
-msgstr "  -i segundos              Repite el último archivo con el intervalo de tiempo dado."
+msgid ""
+"  -i seconds              Repeat the last file with the given time interval."
+msgstr ""
+"  -i segundos              Repite el último archivo con el intervalo de "
+"tiempo dado."
 
-#: scheduler/cupsfilter.c:1443
-msgid "  -j job-id[,N]           Filter file N from the specified job (default is file 1)."
-msgstr "  -j id-trabajo[,N]           Filtra el archivo N desde el trabajo especificado (predeterminado archivo 1)."
+msgid ""
+"  -j job-id[,N]           Filter file N from the specified job (default is "
+"file 1)."
+msgstr ""
+"  -j id-trabajo[,N]           Filtra el archivo N desde el trabajo "
+"especificado (predeterminado archivo 1)."
 
-#: scheduler/main.c:2024
 msgid "  -l                      Run cupsd from launchd(8)."
 msgstr "  -l                      Ejecuta cupsd desde launchd(8)."
 
-#: ppdc/ppdc.cxx:446
 msgid "  -l lang[,lang,...]      Specify the output language(s) (locale)."
-msgstr "  -l idioma[,idioma,...]      Especifica los idiomas de salida (código regional)."
+msgstr ""
+"  -l idioma[,idioma,...]      Especifica los idiomas de salida (código "
+"regional)."
 
-#: ppdc/ppdc.cxx:448
 msgid "  -m                      Use the ModelName value as the filename."
-msgstr "  -m                      Usa el valor ModelName como nombre de archivo."
+msgstr ""
+"  -m                      Usa el valor ModelName como nombre de archivo."
 
-#: scheduler/cupsfilter.c:1445
-msgid "  -m mime/type            Set output MIME type (otherwise application/pdf)."
-msgstr "  -m tipo/mime            Establece el tipo MIME de salida (si no, application/pdf)."
+msgid ""
+"  -m mime/type            Set output MIME type (otherwise application/pdf)."
+msgstr ""
+"  -m tipo/mime            Establece el tipo MIME de salida (si no, "
+"application/pdf)."
 
-#: scheduler/cupsfilter.c:1447
 msgid "  -n copies               Set number of copies."
 msgstr "  -n copias               Establece el número de copias."
 
-#: test/ipptool.c:4427
-msgid "  -n count                Repeat the last file the given number of times."
-msgstr "  -n contador                Repite el último archivo el número de veces especificado."
+msgid ""
+"  -n count                Repeat the last file the given number of times."
+msgstr ""
+"  -n contador                Repite el último archivo el número de veces "
+"especificado."
 
-#: ppdc/ppdi.cxx:133
-msgid "  -o filename.drv         Set driver information file (otherwise ppdi.drv)."
-msgstr "  -o nombre_archivo.drv         Establece el archivo de información del controlador (si no, ppdi.drv)."
+msgid ""
+"  -o filename.drv         Set driver information file (otherwise ppdi.drv)."
+msgstr ""
+"  -o nombre_archivo.drv         Establece el archivo de información del "
+"controlador (si no, ppdi.drv)."
 
-#: ppdc/ppdmerge.cxx:370
 msgid "  -o filename.ppd[.gz]    Set output file (otherwise stdout)."
-msgstr "  -o nombre_archivo.ppd[.gz]    Establece el archivo de salida (si no, stdout)."
+msgstr ""
+"  -o nombre_archivo.ppd[.gz]    Establece el archivo de salida (si no, "
+"stdout)."
 
-#: scheduler/cupsfilter.c:1448
 msgid "  -o name=value           Set option(s)."
 msgstr "  -o nombre=valor           Establece opciones."
 
-#: scheduler/cupsfilter.c:1449
 msgid "  -p filename.ppd         Set PPD file."
 msgstr "  -p nombre_archivo.ppd         Establece archivo PPD."
 
-#: systemv/cupstestppd.c:3806
-#: test/ipptool.c:4429
 msgid "  -q                      Run silently."
 msgstr "  -q                      Ejecución silenciosa."
 
-#: systemv/cupstestppd.c:3807
 msgid "  -r                      Use 'relaxed' open mode."
 msgstr "  -r                      Usa modo abierto 'relajado'."
 
-#: test/ipptool.c:4430
 msgid "  -t                      Produce a test report."
 msgstr "  -t                      Produce un informe de la prueba."
 
-#: ppdc/ppdc.cxx:450
 msgid "  -t                      Test PPDs instead of generating them."
 msgstr "  -t                      Prueba los PPDs en vez de generarlos."
 
-#: scheduler/main.c:2025
 msgid "  -t                      Test the configuration file."
 msgstr "  -t                      Prueba el archivo de configuración."
 
-#: scheduler/cupsfilter.c:1450
 msgid "  -t title                Set title."
 msgstr "  -t título                Establece título."
 
-#: scheduler/cupsfilter.c:1451
 msgid "  -u                      Remove the PPD file when finished."
 msgstr "  -u                      Borra el archivo PPD tras terminar."
 
-#: systemv/cupsaddsmb.c:291
-#: systemv/cupstestppd.c:3808
-#: test/ipptool.c:4431
-#: ppdc/ppdc.cxx:452
-#: ppdc/ppdpo.cxx:259
 msgid "  -v                      Be verbose."
 msgstr "  -v                     Ser detallado."
 
-#: systemv/cupstestppd.c:3809
 msgid "  -vv                     Be very verbose."
 msgstr "  -vv                     Ser muy detallado."
 
-#: ppdc/ppdc.cxx:453
 msgid "  -z                      Compress PPD files using GNU zip."
 msgstr "  -z                      Comprimir archivos PPD usando GNU zip."
 
-#: systemv/cupstestppd.c:332
-#: systemv/cupstestppd.c:351
-#: systemv/cupstestppd.c:363
-#: systemv/cupstestppd.c:496
-#: systemv/cupstestppd.c:511
-#: systemv/cupstestppd.c:532
-#: systemv/cupstestppd.c:547
-#: systemv/cupstestppd.c:577
-#: systemv/cupstestppd.c:597
-#: systemv/cupstestppd.c:620
-#: systemv/cupstestppd.c:638
-#: systemv/cupstestppd.c:664
-#: systemv/cupstestppd.c:682
-#: systemv/cupstestppd.c:702
-#: systemv/cupstestppd.c:722
-#: systemv/cupstestppd.c:740
-#: systemv/cupstestppd.c:757
-#: systemv/cupstestppd.c:776
-#: systemv/cupstestppd.c:797
-#: systemv/cupstestppd.c:816
-#: systemv/cupstestppd.c:836
-#: systemv/cupstestppd.c:856
-#: systemv/cupstestppd.c:876
-#: systemv/cupstestppd.c:896
-#: systemv/cupstestppd.c:914
-#: systemv/cupstestppd.c:931
-#: systemv/cupstestppd.c:953
-#: systemv/cupstestppd.c:971
-#: systemv/cupstestppd.c:988
-#: systemv/cupstestppd.c:1006
-#: systemv/cupstestppd.c:1022
-#: systemv/cupstestppd.c:1042
-#: systemv/cupstestppd.c:1073
-#: systemv/cupstestppd.c:1095
-#: systemv/cupstestppd.c:1146
-#: systemv/cupstestppd.c:1165
-#: systemv/cupstestppd.c:1209
-#: systemv/cupstestppd.c:1223
-#: systemv/cupstestppd.c:1255
-#: systemv/cupstestppd.c:1282
-#: systemv/cupstestppd.c:1800
-#: systemv/cupstestppd.c:1819
-#: systemv/cupstestppd.c:1837
-#: systemv/cupstestppd.c:1889
-#: systemv/cupstestppd.c:1905
-#: systemv/cupstestppd.c:1942
-#: systemv/cupstestppd.c:1960
-#: systemv/cupstestppd.c:1996
-#: systemv/cupstestppd.c:2010
-#: systemv/cupstestppd.c:2037
-#: systemv/cupstestppd.c:2051
-#: systemv/cupstestppd.c:2097
-#: systemv/cupstestppd.c:2119
-#: systemv/cupstestppd.c:2142
-#: systemv/cupstestppd.c:2159
-#: systemv/cupstestppd.c:2201
-#: systemv/cupstestppd.c:2244
-#: systemv/cupstestppd.c:2291
-#: systemv/cupstestppd.c:2315
-#: systemv/cupstestppd.c:2369
-#: systemv/cupstestppd.c:2385
-#: systemv/cupstestppd.c:2415
-#: systemv/cupstestppd.c:2429
-#: systemv/cupstestppd.c:2455
-#: systemv/cupstestppd.c:2471
-#: systemv/cupstestppd.c:2511
-#: systemv/cupstestppd.c:2525
-#: systemv/cupstestppd.c:2551
-#: systemv/cupstestppd.c:2567
-#: systemv/cupstestppd.c:2597
-#: systemv/cupstestppd.c:2611
-#: systemv/cupstestppd.c:2638
-#: systemv/cupstestppd.c:2655
-#: systemv/cupstestppd.c:2669
-#: systemv/cupstestppd.c:2693
-#: systemv/cupstestppd.c:2710
-#: systemv/cupstestppd.c:2724
-#: systemv/cupstestppd.c:2748
-#: systemv/cupstestppd.c:2765
-#: systemv/cupstestppd.c:2779
-#: systemv/cupstestppd.c:2803
-#: systemv/cupstestppd.c:2820
-#: systemv/cupstestppd.c:2834
-#: systemv/cupstestppd.c:2858
-#: systemv/cupstestppd.c:2872
-#: systemv/cupstestppd.c:2887
-#: systemv/cupstestppd.c:2904
-#: systemv/cupstestppd.c:2960
-#: systemv/cupstestppd.c:2995
-#: systemv/cupstestppd.c:3009
-#: systemv/cupstestppd.c:3037
-#: systemv/cupstestppd.c:3102
-#: systemv/cupstestppd.c:3117
-#: systemv/cupstestppd.c:3156
-#: systemv/cupstestppd.c:3176
-#: systemv/cupstestppd.c:3190
-#: systemv/cupstestppd.c:3387
-#: systemv/cupstestppd.c:3423
-#: systemv/cupstestppd.c:3437
-#: systemv/cupstestppd.c:3483
-#: systemv/cupstestppd.c:3515
-#: systemv/cupstestppd.c:3532
-#: systemv/cupstestppd.c:3555
-#: systemv/cupstestppd.c:3571
-#: systemv/cupstestppd.c:3609
-#: systemv/cupstestppd.c:3750
-#: systemv/cupstestppd.c:3772
-#: systemv/cupstestppd.c:3880
 msgid " FAIL"
 msgstr " FALLO"
 
-#: systemv/cupstestppd.c:1306
 msgid " PASS"
 msgstr " PASA"
 
-#: berkeley/lpq.c:560
 #, c-format
 msgid "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes"
 msgstr "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes"
 
-#: berkeley/lpq.c:565
 #, c-format
 msgid "%-7s %-7.7s %-7d %-31.31s %.0f bytes"
 msgstr "%-7s %-7.7s %-7d %-31.31s %.0f bytes"
 
-#: systemv/lpstat.c:750
 #, c-format
 msgid "%s accepting requests since %s"
 msgstr "%s aceptando peticiones desde %s"
 
-#: scheduler/ipp.c:10045
 #, c-format
 msgid "%s cannot be changed."
 msgstr "%s no puede ser cambiado."
 
-#: berkeley/lpc.c:189
 #, c-format
 msgid "%s is not implemented by the CUPS version of lpc."
 msgstr "%s no está implementado en la versión de CUPS de lpc."
 
-#: berkeley/lpq.c:651
 #, c-format
 msgid "%s is not ready"
 msgstr "%s no está preparada"
 
-#: berkeley/lpq.c:644
 #, c-format
 msgid "%s is ready"
 msgstr "%s está preparada"
 
-#: berkeley/lpq.c:647
 #, c-format
 msgid "%s is ready and printing"
 msgstr "%s está preparada e imprimiendo"
 
-#: filter/rastertoepson.c:985
-#: filter/rastertohp.c:711
-#: filter/rastertolabel.c:1134
 #, c-format
 msgid "%s job-id user title copies options [file]"
 msgstr "%s job-id usuario título copias opciones [archivo]"
 
-#: systemv/lpstat.c:754
 #, c-format
 msgid "%s not accepting requests since %s -"
 msgstr "%s no acepta peticiones desde %s -"
 
-#: scheduler/ipp.c:691
 #, c-format
 msgid "%s not supported."
 msgstr "No se admite el uso de %s."
 
-#: systemv/lpstat.c:765
 #, c-format
 msgid "%s/%s accepting requests since %s"
 msgstr "%s/%s aceptando peticiones desde %s"
 
-#: systemv/lpstat.c:770
 #, c-format
 msgid "%s/%s not accepting requests since %s -"
 msgstr "%s/%s no acepta peticiones desde %s -"
 
-#: berkeley/lpq.c:552
 #, c-format
 msgid "%s: %-33.33s [job %d localhost]"
 msgstr "%s: %-33.33s [trabajo %d localhost]"
 
 #. TRANSLATORS: Message is "subject: error"
-#: cups/langprintf.c:86
-#: scheduler/cupsfilter.c:714
-#: systemv/lpadmin.c:805
-#: systemv/lpadmin.c:856
-#: systemv/lpadmin.c:906
-#: systemv/lpadmin.c:962
-#: systemv/lpadmin.c:1060
-#: systemv/lpadmin.c:1112
-#: systemv/lpadmin.c:1168
-#: systemv/lpadmin.c:1478
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: systemv/cancel.c:294
-#: systemv/cancel.c:357
 #, c-format
 msgid "%s: %s failed: %s"
 msgstr "%s: %s ha fallado: %s"
 
-#: systemv/cupsaccept.c:68
 #, c-format
 msgid "%s: Don't know what to do."
 msgstr "%s: No sé que hay que hacer."
 
-#: berkeley/lpq.c:236
-#: berkeley/lpr.c:344
-#: systemv/lp.c:584
 #, c-format
-msgid "%s: Error - %s environment variable names non-existent destination \"%s\"."
-msgstr "%s: Error - %s nombres de variables de entorno no existen en destino \"%s\"."
+msgid ""
+"%s: Error - %s environment variable names non-existent destination \"%s\"."
+msgstr ""
+"%s: Error - %s nombres de variables de entorno no existen en destino \"%s\"."
 
-#: systemv/lp.c:231
 #, c-format
 msgid "%s: Error - bad job ID."
 msgstr "%s: Error - ID de trabajo incorrecta."
 
-#: systemv/lp.c:219
 #, c-format
 msgid "%s: Error - cannot print files and alter jobs simultaneously."
-msgstr "%s: Error - no se pueden imprimir archivos y alterar trabajos al mismo tiempo."
+msgstr ""
+"%s: Error - no se pueden imprimir archivos y alterar trabajos al mismo "
+"tiempo."
 
-#: systemv/lp.c:505
 #, c-format
 msgid "%s: Error - cannot print from stdin if files or a job ID are provided."
-msgstr "%s: Error - no se puede imprimir desde stdin si se proporcionan archivos o una ID de trabajo."
+msgstr ""
+"%s: Error - no se puede imprimir desde stdin si se proporcionan archivos o "
+"una ID de trabajo."
 
-#: systemv/lp.c:461
 #, c-format
 msgid "%s: Error - expected character set after \"-S\" option."
 msgstr "%s: Error - se esperaba un juego de caracteres tras la opción \"-S\"."
 
-#: systemv/lp.c:480
 #, c-format
 msgid "%s: Error - expected content type after \"-T\" option."
 msgstr "%s: Error - se esperaba un tipo de contenido tras la opción \"-T\"."
 
-#: berkeley/lpr.c:240
 #, c-format
 msgid "%s: Error - expected copies after \"-#\" option."
 msgstr "%s: Error -  se esperaba número de copias tras la opción \"-#\"."
 
-#: systemv/lp.c:264
 #, c-format
 msgid "%s: Error - expected copies after \"-n\" option."
 msgstr "%s: Error -  se esperaba número de copias tras la opción \"-n\"."
 
-#: berkeley/lpr.c:209
 #, c-format
 msgid "%s: Error - expected destination after \"-P\" option."
 msgstr "%s: Error - se esperaba un destino tras la opción \"-P\"."
 
-#: systemv/lpstat.c:231
 #, c-format
 msgid "%s: Error - expected destination after \"-b\" option."
 msgstr "%s: Error - se esperaba un destino tras la opción \"-b\"."
 
-#: systemv/lp.c:138
 #, c-format
 msgid "%s: Error - expected destination after \"-d\" option."
 msgstr "%s: Error -  se esperaba un destino tras la opción \"-d\"."
 
-#: systemv/lp.c:168
 #, c-format
 msgid "%s: Error - expected form after \"-f\" option."
 msgstr "%s: Error - se esperaba un formulario tras la opción \"-f\"."
 
-#: systemv/lp.c:391
 #, c-format
 msgid "%s: Error - expected hold name after \"-H\" option."
 msgstr "%s: Error - se esperaba un nombre de retención tras la opción \"-H\"."
 
-#: berkeley/lpr.c:103
 #, c-format
 msgid "%s: Error - expected hostname after \"-H\" option."
 msgstr "%s: Error - se esperaba un nombre de ordenador tras la opción \"-H\"."
 
-#: berkeley/lpq.c:180
-#: berkeley/lprm.c:123
-#: systemv/cancel.c:124
-#: systemv/cupsaccept.c:123
-#: systemv/lp.c:189
-#: systemv/lpstat.c:291
 #, c-format
 msgid "%s: Error - expected hostname after \"-h\" option."
 msgstr "%s: Error - se esperaba un nombre de ordenador tras la opción \"-h\"."
 
-#: systemv/lp.c:371
 #, c-format
 msgid "%s: Error - expected mode list after \"-y\" option."
 msgstr "%s: Error - se esperaba una lista de modos tras la opción \"-y\"."
 
-#: berkeley/lpr.c:263
 #, c-format
 msgid "%s: Error - expected name after \"-%c\" option."
 msgstr "%s: Error - se esperaba un nombre tras la opción \"%c\"."
 
-#: berkeley/lpr.c:153
-#: systemv/lp.c:288
 #, c-format
 msgid "%s: Error - expected option=value after \"-o\" option."
 msgstr "%s: Error - se esperaba opción=valor tras la opción \"-o\"."
 
-#: systemv/lp.c:441
 #, c-format
 msgid "%s: Error - expected page list after \"-P\" option."
 msgstr "%s: Error - se esperaba una lista de páginas tras la opción \"-P\"."
 
-#: systemv/lp.c:308
 #, c-format
 msgid "%s: Error - expected priority after \"-%c\" option."
 msgstr "%s: Error - se esperaba un valor de prioridad tras la opción \"-%c\"."
 
-#: systemv/cupsaccept.c:141
 #, c-format
 msgid "%s: Error - expected reason text after \"-r\" option."
 msgstr "%s: Error - se esperaba un texto con una razón tras la opción \"-r\"."
 
-#: systemv/lp.c:354
 #, c-format
 msgid "%s: Error - expected title after \"-t\" option."
 msgstr "%s: Error - se esperaba un título tras la opción \"-t\"."
 
-#: berkeley/lpq.c:111
-#: berkeley/lpr.c:84
-#: berkeley/lprm.c:104
-#: systemv/cancel.c:94
-#: systemv/cupsaccept.c:101
-#: systemv/lp.c:116
-#: systemv/lpadmin.c:438
-#: systemv/lpstat.c:137
 #, c-format
 msgid "%s: Error - expected username after \"-U\" option."
 msgstr "%s: Error - se esperaba un nombre de usuario tras la opción \"-U\"."
 
-#: systemv/cancel.c:145
 #, c-format
 msgid "%s: Error - expected username after \"-u\" option."
 msgstr "%s: Error - se esperaba un nombre de usuario tras la opción \"-u\"."
 
-#: berkeley/lpr.c:125
 #, c-format
 msgid "%s: Error - expected value after \"-%c\" option."
 msgstr "%s: Error - se esperaba un valor tras la opción \"%c\"."
 
-#: systemv/lpstat.c:157
-#: systemv/lpstat.c:171
 #, c-format
-msgid "%s: Error - need \"completed\", \"not-completed\", or \"all\" after \"-W\" option."
-msgstr "%s: Error - se necesita \"completed\", \"not completed\", o \"all\" tras la opción \"-W\"."
+msgid ""
+"%s: Error - need \"completed\", \"not-completed\", or \"all\" after \"-W\" "
+"option."
+msgstr ""
+"%s: Error - se necesita \"completed\", \"not completed\", o \"all\" tras la "
+"opción \"-W\"."
 
-#: berkeley/lpq.c:241
-#: berkeley/lpr.c:349
-#: systemv/lp.c:589
 #, c-format
 msgid "%s: Error - no default destination available."
 msgstr "%s: Error - destino predeterminado no disponible."
 
-#: systemv/lp.c:330
 #, c-format
 msgid "%s: Error - priority must be between 1 and 100."
 msgstr "%s: Error - la prioridad debe estar entre 1 y 100."
 
-#: berkeley/lpr.c:352
-#: systemv/lp.c:592
 #, c-format
 msgid "%s: Error - scheduler not responding."
 msgstr "%s: Error - el programa planificador de tareas no responde."
 
-#: berkeley/lpr.c:305
-#: systemv/lp.c:537
 #, c-format
 msgid "%s: Error - too many files - \"%s\"."
 msgstr "%s: Error - demasiados archivos - \"%s\"."
 
-#: berkeley/lpr.c:287
-#: systemv/lp.c:520
 #, c-format
 msgid "%s: Error - unable to access \"%s\" - %s"
 msgstr "%s: Error - no se ha podido acceder a \"%s\" - %s"
 
-#: berkeley/lpr.c:395
-#: systemv/lp.c:623
 #, c-format
 msgid "%s: Error - unable to queue from stdin - %s."
 msgstr "%s: Error - no se ha podido poner en cola desde stdin - %s."
 
-#: berkeley/lprm.c:87
-#: berkeley/lprm.c:172
-#: systemv/cancel.c:214
 #, c-format
 msgid "%s: Error - unknown destination \"%s\"."
 msgstr "%s: Error - destino \"%s\" desconocido."
 
-#: berkeley/lpq.c:150
 #, c-format
 msgid "%s: Error - unknown destination \"%s/%s\"."
 msgstr "%s: Error - destino \"%s/%s\" desconocido."
 
-#: berkeley/lpr.c:274
-#: berkeley/lprm.c:139
-#: systemv/cancel.c:156
-#: systemv/cupsaccept.c:164
-#: systemv/lp.c:496
-#: systemv/lpstat.c:452
 #, c-format
 msgid "%s: Error - unknown option \"%c\"."
 msgstr "%s: Error - opción \"%c\" desconocida."
 
-#: systemv/cupsaccept.c:157
 #, c-format
 msgid "%s: Error - unknown option \"%s\"."
 msgstr "%s: Error: opción \"%s\" desconocida."
 
-#: systemv/lp.c:208
 #, c-format
 msgid "%s: Expected job ID after \"-i\" option."
 msgstr "%s : Se esperaba una ID de trabajo tras la opción \"-i\"."
 
-#: systemv/lpstat.c:504
-#: systemv/lpstat.c:543
 #, c-format
 msgid "%s: Invalid destination name in list \"%s\"."
 msgstr "%s: Nombre de destino no válido en la lista \"%s\"."
 
-#: scheduler/cupsfilter.c:567
 #, c-format
 msgid "%s: Invalid filter string \"%s\"."
 msgstr "%s: Cadena de filtro \"%s\" no válida."
 
-#: systemv/lp.c:418
 #, c-format
 msgid "%s: Need job ID (\"-i jobid\") before \"-H restart\"."
-msgstr "%s: Se necesita un ID de trabajo (\"-i id_trabajo\") antes de \"-H restart\"."
+msgstr ""
+"%s: Se necesita un ID de trabajo (\"-i id_trabajo\") antes de \"-H restart\"."
 
-#: scheduler/cupsfilter.c:458
 #, c-format
 msgid "%s: No filter to convert from %s/%s to %s/%s."
 msgstr "%s: No hay ningún filtro para convertir de %s/%s a %s/%s."
 
-#: systemv/cupsaccept.c:198
 #, c-format
 msgid "%s: Operation failed: %s"
 msgstr "%s: La operación ha fallado: %s"
 
-#: berkeley/lpq.c:97
-#: berkeley/lpr.c:70
-#: berkeley/lprm.c:67
-#: systemv/cancel.c:81
-#: systemv/cupsaccept.c:88
-#: systemv/cupsaddsmb.c:86
-#: systemv/lp.c:102
-#: systemv/lpadmin.c:239
-#: systemv/lpinfo.c:88
-#: systemv/lpmove.c:73
-#: systemv/lpstat.c:102
-#: test/ipptool.c:304
-#: test/ipptool.c:321
 #, c-format
 msgid "%s: Sorry, no encryption support."
 msgstr "%s: Lo siento, no está compilado con la opción de cifrado."
 
-#: berkeley/lpq.c:295
-#: scheduler/cupsfilter.c:1221
-#: systemv/cancel.c:237
-#: systemv/cupsaddsmb.c:144
-#: systemv/cupsaddsmb.c:171
 #, c-format
 msgid "%s: Unable to connect to server."
 msgstr "%s: No se ha podido conectar al servidor."
 
-#: systemv/cancel.c:317
 #, c-format
 msgid "%s: Unable to contact server."
 msgstr "%s: No se ha podido contactar con el servidor."
 
-#: scheduler/cupsfilter.c:424
 #, c-format
 msgid "%s: Unable to determine MIME type of \"%s\"."
 msgstr "%s: No se ha podido determinar el tipo MIME de \"%s\"."
 
-#: ppdc/ppdmerge.cxx:96
 #, c-format
 msgid "%s: Unable to open %s: %s"
 msgstr "%s: No se pudo abrir %s: %s"
 
-#: scheduler/cupsfilter.c:662
-#: ppdc/ppdmerge.cxx:112
 #, c-format
 msgid "%s: Unable to open PPD file: %s on line %d."
 msgstr "%s: No se ha podido abrir el archivo PPD: %s en la línea %d."
 
-#: scheduler/cupsfilter.c:392
 #, c-format
 msgid "%s: Unable to read MIME database from \"%s\" or \"%s\"."
 msgstr "%s: No se pudo leer base de datos MIME desde \"%s\" o \"%s\"."
 
-#: berkeley/lpq.c:153
-#: systemv/lpstat.c:558
 #, c-format
 msgid "%s: Unknown destination \"%s\"."
 msgstr "%s: Destino \"%s\" desconocido."
 
-#: scheduler/cupsfilter.c:435
 #, c-format
 msgid "%s: Unknown destination MIME type %s/%s."
 msgstr "%s: Tipo MIME de destino %s/%s desconocido."
 
-#: scheduler/cupsfilter.c:1426
 #, c-format
 msgid "%s: Unknown option \"%c\"."
 msgstr "%s: Opción \"%c\" desconocida."
 
-#: scheduler/cupsfilter.c:416
 #, c-format
 msgid "%s: Unknown source MIME type %s/%s."
 msgstr "%s: Tipo MIME de origen %s/%s desconocido."
 
-#: berkeley/lpr.c:139
 #, c-format
-msgid "%s: Warning - \"%c\" format modifier not supported - output may not be correct."
-msgstr "%s: Advertencia - no se admite el uso del modificador de formato \"%c\" - la salida puede no ser correcta."
+msgid ""
+"%s: Warning - \"%c\" format modifier not supported - output may not be "
+"correct."
+msgstr ""
+"%s: Advertencia - no se admite el uso del modificador de formato \"%c\" - la "
+"salida puede no ser correcta."
 
-#: systemv/lp.c:468
 #, c-format
 msgid "%s: Warning - character set option ignored."
 msgstr "%s: Advertencia - opción de juego de caracteres no tenida en cuenta."
 
-#: systemv/lp.c:487
 #, c-format
 msgid "%s: Warning - content type option ignored."
 msgstr "%s: Advertencia - opción de tipo de contenido no tenida en cuenta."
 
-#: systemv/lp.c:175
 #, c-format
 msgid "%s: Warning - form option ignored."
 msgstr "%s: Advertencia - opción de formulario no tenida en cuenta."
 
-#: systemv/lp.c:378
 #, c-format
 msgid "%s: Warning - mode option ignored."
 msgstr "%s: Advertencia - opción de modo no tenida en cuenta."
 
-#: ppdc/sample.c:310
 msgid "-1"
 msgstr "-1"
 
-#: ppdc/sample.c:301
 msgid "-10"
 msgstr "-10"
 
-#: ppdc/sample.c:393
 msgid "-100"
 msgstr "-100"
 
-#: ppdc/sample.c:392
 msgid "-105"
 msgstr "-105"
 
-#: ppdc/sample.c:300
 msgid "-11"
 msgstr "-11"
 
-#: ppdc/sample.c:391
 msgid "-110"
 msgstr "-110"
 
-#: ppdc/sample.c:390
 msgid "-115"
 msgstr "-115"
 
-#: ppdc/sample.c:299
 msgid "-12"
 msgstr "-12"
 
-#: ppdc/sample.c:389
 msgid "-120"
 msgstr "-120"
 
-#: ppdc/sample.c:298
 msgid "-13"
 msgstr "-13"
 
-#: ppdc/sample.c:297
 msgid "-14"
 msgstr "-14"
 
-#: ppdc/sample.c:296
 msgid "-15"
 msgstr "-15"
 
-#: ppdc/sample.c:309
 msgid "-2"
 msgstr "-2"
 
-#: ppdc/sample.c:409
 msgid "-20"
 msgstr "-20"
 
-#: ppdc/sample.c:408
 msgid "-25"
 msgstr "-25"
 
-#: ppdc/sample.c:308
 msgid "-3"
 msgstr "-3"
 
-#: ppdc/sample.c:407
 msgid "-30"
 msgstr "-30"
 
-#: ppdc/sample.c:406
 msgid "-35"
 msgstr "-35"
 
-#: ppdc/sample.c:307
 msgid "-4"
 msgstr "-4"
 
-#: ppdc/sample.c:405
 msgid "-40"
 msgstr "-40"
 
-#: ppdc/sample.c:404
 msgid "-45"
 msgstr "-45"
 
-#: ppdc/sample.c:306
 msgid "-5"
 msgstr "-5"
 
-#: ppdc/sample.c:403
 msgid "-50"
 msgstr "-50"
 
-#: ppdc/sample.c:402
 msgid "-55"
 msgstr "-55"
 
-#: ppdc/sample.c:305
 msgid "-6"
 msgstr "-6"
 
-#: ppdc/sample.c:401
 msgid "-60"
 msgstr "-60"
 
-#: ppdc/sample.c:400
 msgid "-65"
 msgstr "-65"
 
-#: ppdc/sample.c:304
 msgid "-7"
 msgstr "-7"
 
-#: ppdc/sample.c:399
 msgid "-70"
 msgstr "-70"
 
-#: ppdc/sample.c:398
 msgid "-75"
 msgstr "-75"
 
-#: ppdc/sample.c:303
 msgid "-8"
 msgstr "-8"
 
-#: ppdc/sample.c:397
 msgid "-80"
 msgstr "-80"
 
-#: ppdc/sample.c:396
 msgid "-85"
 msgstr "-85"
 
-#: ppdc/sample.c:302
 msgid "-9"
 msgstr "-9"
 
-#: ppdc/sample.c:395
 msgid "-90"
 msgstr "-90"
 
-#: ppdc/sample.c:394
 msgid "-95"
 msgstr "-95"
 
-#: ppdc/sample.c:311
 msgid "0"
 msgstr "0"
 
-#: ppdc/sample.c:312
 msgid "1"
 msgstr "1"
 
-#: ppdc/sample.c:384
 msgid "1 inch/sec."
 msgstr "1 pulg./seg"
 
-#: ppdc/sample.c:172
 msgid "1.25x0.25\""
 msgstr "1.25x0.25 pulg."
 
-#: ppdc/sample.c:173
 msgid "1.25x2.25\""
 msgstr "1.25x2.25 pulg."
 
-#: ppdc/sample.c:432
 msgid "1.5 inch/sec."
 msgstr "1.5 pulg./seg"
 
-#: ppdc/sample.c:174
 msgid "1.50x0.25\""
 msgstr "1.50x0.25 pulg."
 
-#: ppdc/sample.c:175
 msgid "1.50x0.50\""
 msgstr "1.50x0.50 pulg."
 
-#: ppdc/sample.c:176
 msgid "1.50x1.00\""
 msgstr "1.50x1.00 pulg."
 
-#: ppdc/sample.c:177
 msgid "1.50x2.00\""
 msgstr "1.50x2.00 pulg."
 
-#: ppdc/sample.c:321
 msgid "10"
 msgstr "10"
 
-#: ppdc/sample.c:443
 msgid "10 inches/sec."
 msgstr "10 pulg./seg"
 
-#: ppdc/sample.c:6
 msgid "10 x 11"
 msgstr "10 x 11"
 
-#: ppdc/sample.c:7
 msgid "10 x 13"
 msgstr "10 x 13"
 
-#: ppdc/sample.c:8
 msgid "10 x 14"
 msgstr "10 x 14"
 
-#: ppdc/sample.c:423
 msgid "100"
 msgstr "100"
 
-#: ppdc/sample.c:334
 msgid "100 mm/sec."
 msgstr "100 mm/seg"
 
-#: ppdc/sample.c:424
 msgid "105"
 msgstr "105"
 
-#: ppdc/sample.c:322
 msgid "11"
 msgstr "11"
 
-#: ppdc/sample.c:444
 msgid "11 inches/sec."
 msgstr "11 pulg./seg"
 
-#: ppdc/sample.c:425
 msgid "110"
 msgstr "110"
 
-#: ppdc/sample.c:426
 msgid "115"
 msgstr "115"
 
-#: ppdc/sample.c:323
 msgid "12"
 msgstr "12"
 
-#: ppdc/sample.c:445
 msgid "12 inches/sec."
 msgstr "12 pulg./seg"
 
-#: ppdc/sample.c:9
 msgid "12 x 11"
 msgstr "12 x 11"
 
-#: ppdc/sample.c:427
 msgid "120"
 msgstr "120"
 
-#: ppdc/sample.c:335
 msgid "120 mm/sec."
 msgstr "120 mm/seg"
 
-#: ppdc/sample.c:243
 msgid "120x60dpi"
 msgstr "120x60ppp"
 
-#: ppdc/sample.c:249
 msgid "120x72dpi"
 msgstr "120x72ppp"
 
-#: ppdc/sample.c:324
 msgid "13"
 msgstr "13"
 
-#: ppdc/sample.c:232
 msgid "136dpi"
 msgstr "136ppp"
 
-#: ppdc/sample.c:325
 msgid "14"
 msgstr "14"
 
-#: ppdc/sample.c:326
 msgid "15"
 msgstr "15"
 
-#: ppdc/sample.c:328
 msgid "15 mm/sec."
 msgstr "15 mm/seg"
 
-#: ppdc/sample.c:10
 msgid "15 x 11"
 msgstr "15 x 11"
 
-#: ppdc/sample.c:336
 msgid "150 mm/sec."
 msgstr "150 mm/seg"
 
-#: ppdc/sample.c:283
 msgid "150dpi"
 msgstr "150ppp"
 
-#: ppdc/sample.c:368
 msgid "16"
 msgstr "16"
 
-#: ppdc/sample.c:369
 msgid "17"
 msgstr "17"
 
-#: ppdc/sample.c:370
 msgid "18"
 msgstr "18"
 
-#: ppdc/sample.c:244
 msgid "180dpi"
 msgstr "180ppp"
 
-#: ppdc/sample.c:371
 msgid "19"
 msgstr "19"
 
-#: ppdc/sample.c:313
 msgid "2"
 msgstr "2"
 
-#: ppdc/sample.c:385
 msgid "2 inches/sec."
 msgstr "2 pulg./seg"
 
-#: ppdc/sample.c:270
 msgid "2-Sided Printing"
 msgstr "Dúplex"
 
-#: ppdc/sample.c:178
 msgid "2.00x0.37\""
 msgstr "2.00x0.37 pulg."
 
-#: ppdc/sample.c:179
 msgid "2.00x0.50\""
 msgstr "2.00x0.50 pulg."
 
-#: ppdc/sample.c:180
 msgid "2.00x1.00\""
 msgstr "2.00x1.00 pulg."
 
-#: ppdc/sample.c:181
 msgid "2.00x1.25\""
 msgstr "2.00x1.25 pulg."
 
-#: ppdc/sample.c:182
 msgid "2.00x2.00\""
 msgstr "2.00x2.00 pulg."
 
-#: ppdc/sample.c:183
 msgid "2.00x3.00\""
 msgstr "2.00x3.00 pulg."
 
-#: ppdc/sample.c:184
 msgid "2.00x4.00\""
 msgstr "2.00x4.00 pulg."
 
-#: ppdc/sample.c:185
 msgid "2.00x5.50\""
 msgstr "2.00x5.50 pulg."
 
-#: ppdc/sample.c:186
 msgid "2.25x0.50\""
 msgstr "2.25x0.50 pulg."
 
-#: ppdc/sample.c:187
 msgid "2.25x1.25\""
 msgstr "2.25x1.25 pulg."
 
-#: ppdc/sample.c:188
 msgid "2.25x4.00\""
 msgstr "2.25x4.00 pulg."
 
-#: ppdc/sample.c:189
 msgid "2.25x5.50\""
 msgstr "2.25x5.50 pulg."
 
-#: ppdc/sample.c:190
 msgid "2.38x5.50\""
 msgstr "2.38x5.50 pulg."
 
-#: ppdc/sample.c:433
 msgid "2.5 inches/sec."
 msgstr "2.5 pulg./seg"
 
-#: ppdc/sample.c:191
 msgid "2.50x1.00\""
 msgstr "2.50x1.00 pulg."
 
-#: ppdc/sample.c:192
 msgid "2.50x2.00\""
 msgstr "2.50x2.00 pulg."
 
-#: ppdc/sample.c:193
 msgid "2.75x1.25\""
 msgstr "2.75x1.25 pulg."
 
-#: ppdc/sample.c:194
 msgid "2.9 x 1\""
 msgstr "2.9 x 1 pulg."
 
-#: ppdc/sample.c:372
 msgid "20"
 msgstr "20"
 
-#: ppdc/sample.c:329
 msgid "20 mm/sec."
 msgstr "20 mm/seg"
 
-#: ppdc/sample.c:337
 msgid "200 mm/sec."
 msgstr "200 mm/seg"
 
-#: ppdc/sample.c:233
 msgid "203dpi"
 msgstr "203ppp"
 
-#: ppdc/sample.c:373
 msgid "21"
 msgstr "21"
 
-#: ppdc/sample.c:374
 msgid "22"
 msgstr "22"
 
-#: ppdc/sample.c:375
 msgid "23"
 msgstr "23"
 
-#: ppdc/sample.c:376
 msgid "24"
 msgstr "24"
 
-#: ppdc/sample.c:241
 msgid "24-Pin Series"
 msgstr "24-Pin Series"
 
-#: ppdc/sample.c:250
 msgid "240x72dpi"
 msgstr "240x72ppp"
 
-#: ppdc/sample.c:377
 msgid "25"
 msgstr "25"
 
-#: ppdc/sample.c:338
 msgid "250 mm/sec."
 msgstr "250 mm/seg"
 
-#: ppdc/sample.c:378
 msgid "26"
 msgstr "26"
 
-#: ppdc/sample.c:379
 msgid "27"
 msgstr "27"
 
-#: ppdc/sample.c:380
 msgid "28"
 msgstr "28"
 
-#: ppdc/sample.c:381
 msgid "29"
 msgstr "29"
 
-#: ppdc/sample.c:314
 msgid "3"
 msgstr "3"
 
-#: ppdc/sample.c:386
 msgid "3 inches/sec."
 msgstr "3 pulg./seg"
 
-#: ppdc/sample.c:3
 msgid "3 x 5"
 msgstr "3 x 5"
 
-#: ppdc/sample.c:195
 msgid "3.00x1.00\""
 msgstr "3.00x1.00 pulg."
 
-#: ppdc/sample.c:196
 msgid "3.00x1.25\""
 msgstr "3.00x1.25 pulg."
 
-#: ppdc/sample.c:197
 msgid "3.00x2.00\""
 msgstr "3.00x2.00 pulg."
 
-#: ppdc/sample.c:198
 msgid "3.00x3.00\""
 msgstr "3.00x3.00 pulg."
 
-#: ppdc/sample.c:199
 msgid "3.00x5.00\""
 msgstr "3.00x5.00 pulg."
 
-#: ppdc/sample.c:200
 msgid "3.25x2.00\""
 msgstr "3.25x2.00 pulg."
 
-#: ppdc/sample.c:201
 msgid "3.25x5.00\""
 msgstr "3.25x5.00 pulg."
 
-#: ppdc/sample.c:202
 msgid "3.25x5.50\""
 msgstr "3.25x5.50 pulg."
 
-#: ppdc/sample.c:203
 msgid "3.25x5.83\""
 msgstr "3.25x5.83 pulg."
 
-#: ppdc/sample.c:204
 msgid "3.25x7.83\""
 msgstr "3.25x7.83 pulg."
 
-#: ppdc/sample.c:4
 msgid "3.5 x 5"
 msgstr "3.5 x 5"
 
-#: ppdc/sample.c:171
 msgid "3.5\" Disk"
 msgstr "Disco de 3.5 pulg."
 
-#: ppdc/sample.c:205
 msgid "3.50x1.00\""
 msgstr "3.50x1.00 pulg."
 
-#: ppdc/sample.c:382
 msgid "30"
 msgstr "30"
 
-#: ppdc/sample.c:330
 msgid "30 mm/sec."
 msgstr "30 mm/seg"
 
-#: ppdc/sample.c:339
 msgid "300 mm/sec."
 msgstr "300 mm/seg"
 
-#: ppdc/sample.c:234
 msgid "300dpi"
 msgstr "300ppp"
 
-#: ppdc/sample.c:410
 msgid "35"
 msgstr "35"
 
-#: ppdc/sample.c:246
 msgid "360dpi"
 msgstr "360ppp"
 
-#: ppdc/sample.c:245
 msgid "360x180dpi"
 msgstr "360x180ppp"
 
-#: ppdc/sample.c:315
 msgid "4"
 msgstr "4"
 
-#: ppdc/sample.c:387
 msgid "4 inches/sec."
 msgstr "4 pulg./seg"
 
-#: ppdc/sample.c:206
 msgid "4.00x1.00\""
 msgstr "4.00x1.00 pulg."
 
-#: ppdc/sample.c:214
 msgid "4.00x13.00\""
 msgstr "4.00x13.00 pulg."
 
-#: ppdc/sample.c:207
 msgid "4.00x2.00\""
 msgstr "4.00x2.00 pulg."
 
-#: ppdc/sample.c:208
 msgid "4.00x2.50\""
 msgstr "4.00x2.50 pulg."
 
-#: ppdc/sample.c:209
 msgid "4.00x3.00\""
 msgstr "4.00x3.00 pulg."
 
-#: ppdc/sample.c:210
 msgid "4.00x4.00\""
 msgstr "4.00x4.00 pulg."
 
-#: ppdc/sample.c:211
 msgid "4.00x5.00\""
 msgstr "4.00x5.00 pulg."
 
-#: ppdc/sample.c:212
 msgid "4.00x6.00\""
 msgstr "4.00x6.00 pulg."
 
-#: ppdc/sample.c:213
 msgid "4.00x6.50\""
 msgstr "4.00x6.50 pulg."
 
-#: ppdc/sample.c:411
 msgid "40"
 msgstr "40"
 
-#: ppdc/sample.c:331
 msgid "40 mm/sec."
 msgstr "40 mm/seg"
 
-#: ppdc/sample.c:412
 msgid "45"
 msgstr "45"
 
-#: ppdc/sample.c:316
 msgid "5"
 msgstr "5"
 
-#: ppdc/sample.c:437
 msgid "5 inches/sec."
 msgstr "5 pulg./seg"
 
-#: ppdc/sample.c:5
 msgid "5 x 7"
 msgstr "5 x 7"
 
-#: ppdc/sample.c:413
 msgid "50"
 msgstr "50"
 
-#: ppdc/sample.c:414
 msgid "55"
 msgstr "55"
 
-#: ppdc/sample.c:317
 msgid "6"
 msgstr "6"
 
-#: ppdc/sample.c:438
 msgid "6 inches/sec."
 msgstr "6 pulg./seg"
 
-#: ppdc/sample.c:215
 msgid "6.00x1.00\""
 msgstr "6.00x1.00 pulg."
 
-#: ppdc/sample.c:216
 msgid "6.00x2.00\""
 msgstr "6.00x2.00 pulg."
 
-#: ppdc/sample.c:217
 msgid "6.00x3.00\""
 msgstr "6.00x3.00 pulg."
 
-#: ppdc/sample.c:218
 msgid "6.00x4.00\""
 msgstr "6.00x4.00 pulg."
 
-#: ppdc/sample.c:219
 msgid "6.00x5.00\""
 msgstr "6.00x5.00 pulg."
 
-#: ppdc/sample.c:220
 msgid "6.00x6.00\""
 msgstr "6.00x6.00 pulg."
 
-#: ppdc/sample.c:221
 msgid "6.00x6.50\""
 msgstr "6.00x6.50 pulg."
 
-#: ppdc/sample.c:415
 msgid "60"
 msgstr "60"
 
-#: ppdc/sample.c:332
 msgid "60 mm/sec."
 msgstr "60 mm/seg"
 
-#: ppdc/sample.c:261
 msgid "600dpi"
 msgstr "600ppp"
 
-#: ppdc/sample.c:242
 msgid "60dpi"
 msgstr "60ppp"
 
-#: ppdc/sample.c:248
 msgid "60x72dpi"
 msgstr "60x72ppp"
 
-#: ppdc/sample.c:416
 msgid "65"
 msgstr "65"
 
-#: ppdc/sample.c:318
 msgid "7"
 msgstr "7"
 
-#: ppdc/sample.c:440
 msgid "7 inches/sec."
 msgstr "7 pulg./seg"
 
-#: ppdc/sample.c:11
 msgid "7 x 9"
 msgstr "7 x 9"
 
-#: ppdc/sample.c:417
 msgid "70"
 msgstr "70"
 
-#: ppdc/sample.c:252
 msgid "720dpi"
 msgstr "720ppp"
 
-#: ppdc/sample.c:418
 msgid "75"
 msgstr "75"
 
-#: ppdc/sample.c:319
 msgid "8"
 msgstr "8"
 
-#: ppdc/sample.c:441
 msgid "8 inches/sec."
 msgstr "8 pulg./seg"
 
-#: ppdc/sample.c:12
 msgid "8 x 10"
 msgstr "8 x 10"
 
-#: ppdc/sample.c:222
 msgid "8.00x1.00\""
 msgstr "8.00x1.00 pulg."
 
-#: ppdc/sample.c:223
 msgid "8.00x2.00\""
 msgstr "8.00x2.00 pulg."
 
-#: ppdc/sample.c:224
 msgid "8.00x3.00\""
 msgstr "8.00x3.00 pulg."
 
-#: ppdc/sample.c:225
 msgid "8.00x4.00\""
 msgstr "8.00x4.00 pulg."
 
-#: ppdc/sample.c:226
 msgid "8.00x5.00\""
 msgstr "8.00x5.00 pulg."
 
-#: ppdc/sample.c:227
 msgid "8.00x6.00\""
 msgstr "8.00x6.00 pulg."
 
-#: ppdc/sample.c:228
 msgid "8.00x6.50\""
 msgstr "8.00x6.50 pulg."
 
-#: ppdc/sample.c:419
 msgid "80"
 msgstr "80"
 
-#: ppdc/sample.c:333
 msgid "80 mm/sec."
 msgstr "80 mm/seg"
 
-#: ppdc/sample.c:420
 msgid "85"
 msgstr "85"
 
-#: ppdc/sample.c:320
 msgid "9"
 msgstr "9"
 
-#: ppdc/sample.c:442
 msgid "9 inches/sec."
 msgstr "9 pulg./seg"
 
-#: ppdc/sample.c:13
 msgid "9 x 11"
 msgstr "9 x 11"
 
-#: ppdc/sample.c:14
 msgid "9 x 12"
 msgstr "9 x 12"
 
-#: ppdc/sample.c:247
 msgid "9-Pin Series"
 msgstr "9-Pin Series"
 
-#: ppdc/sample.c:421
 msgid "90"
 msgstr "90"
 
-#: ppdc/sample.c:422
 msgid "95"
 msgstr "95"
 
-#: berkeley/lpc.c:213
 msgid "?Invalid help command unknown."
 msgstr "?Comando de ayuda no válido desconocido."
 
-#: cgi-bin/admin.c:2368
 msgid "A Samba password is required to export printer drivers"
-msgstr "Se requiere una contraseña Samba para exportar los controladores de impresora"
+msgstr ""
+"Se requiere una contraseña Samba para exportar los controladores de impresora"
 
-#: cgi-bin/admin.c:2364
 msgid "A Samba username is required to export printer drivers"
-msgstr "Se requiere un nombre de usuario Samba para exportar los controladores de impresora"
+msgstr ""
+"Se requiere un nombre de usuario Samba para exportar los controladores de "
+"impresora"
 
-#: scheduler/ipp.c:2283
 #, c-format
 msgid "A class named \"%s\" already exists."
 msgstr "Ya existe una clase llamada \"%s\"."
 
-#: scheduler/ipp.c:1004
 #, c-format
 msgid "A printer named \"%s\" already exists."
 msgstr "Ya existe una impresora llamada \"%s\"."
 
-#: ppdc/sample.c:15
 msgid "A0"
 msgstr "A0"
 
-#: ppdc/sample.c:16
 msgid "A0 Long Edge"
 msgstr "A0 lado largo"
 
-#: ppdc/sample.c:17
 msgid "A1"
 msgstr "A1"
 
-#: ppdc/sample.c:18
 msgid "A1 Long Edge"
 msgstr "A1 lado largo"
 
-#: ppdc/sample.c:37
 msgid "A10"
 msgstr "A10"
 
-#: ppdc/sample.c:19
 msgid "A2"
 msgstr "A2"
 
-#: ppdc/sample.c:20
 msgid "A2 Long Edge"
 msgstr "A2 lado largo"
 
-#: ppdc/sample.c:21
 msgid "A3"
 msgstr "A3"
 
-#: ppdc/sample.c:22
 msgid "A3 Long Edge"
 msgstr "A3 lado largo"
 
-#: ppdc/sample.c:23
 msgid "A3 Oversize"
 msgstr "A3 Extragrande"
 
-#: ppdc/sample.c:24
 msgid "A3 Oversize Long Edge"
 msgstr "A3 Extragrande lado largo"
 
-#: ppdc/sample.c:25
 msgid "A4"
 msgstr "A4"
 
-#: ppdc/sample.c:27
 msgid "A4 Long Edge"
 msgstr "A4 lado largo"
 
-#: ppdc/sample.c:26
 msgid "A4 Oversize"
 msgstr "A4 Extragrande"
 
-#: ppdc/sample.c:28
 msgid "A4 Small"
 msgstr "A4 Pequeño"
 
-#: ppdc/sample.c:29
 msgid "A5"
 msgstr "A5"
 
-#: ppdc/sample.c:31
 msgid "A5 Long Edge"
 msgstr "A5 lado largo"
 
-#: ppdc/sample.c:30
 msgid "A5 Oversize"
 msgstr "A5 Extragrande"
 
-#: ppdc/sample.c:32
 msgid "A6"
 msgstr "A6"
 
-#: ppdc/sample.c:33
 msgid "A6 Long Edge"
 msgstr "A6 lado largo"
 
-#: ppdc/sample.c:34
 msgid "A7"
 msgstr "A7"
 
-#: ppdc/sample.c:35
 msgid "A8"
 msgstr "A8"
 
-#: ppdc/sample.c:36
 msgid "A9"
 msgstr "A9"
 
-#: ppdc/sample.c:38
 msgid "ANSI A"
 msgstr "ANSI A"
 
-#: ppdc/sample.c:39
 msgid "ANSI B"
 msgstr "ANSI B"
 
-#: ppdc/sample.c:40
 msgid "ANSI C"
 msgstr "ANSI C"
 
-#: ppdc/sample.c:41
 msgid "ANSI D"
 msgstr "ANSI D"
 
-#: ppdc/sample.c:42
 msgid "ANSI E"
 msgstr "ANSI E"
 
-#: ppdc/sample.c:47
 msgid "ARCH C"
 msgstr "ARCH C"
 
-#: ppdc/sample.c:48
 msgid "ARCH C Long Edge"
 msgstr "ARCH C lado largo"
 
-#: ppdc/sample.c:49
 msgid "ARCH D"
 msgstr "ARCH D"
 
-#: ppdc/sample.c:50
 msgid "ARCH D Long Edge"
 msgstr "ARCH D lado largo"
 
-#: ppdc/sample.c:51
 msgid "ARCH E"
 msgstr "ARCH E"
 
-#: ppdc/sample.c:52
 msgid "ARCH E Long Edge"
 msgstr "ARCH E lado largo"
 
-#: cgi-bin/classes.c:169
-#: cgi-bin/printers.c:172
 msgid "Accept Jobs"
 msgstr "Aceptar trabajos"
 
-#: cups/http-support.c:1284
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: cgi-bin/admin.c:570
 msgid "Add Class"
 msgstr "Añadir clase"
 
-#: cgi-bin/admin.c:882
 msgid "Add Printer"
 msgstr "Añadir impresora"
 
-#: cgi-bin/admin.c:444
-#: cgi-bin/admin.c:477
-#: cgi-bin/admin.c:525
-#: cgi-bin/admin.c:535
 msgid "Add RSS Subscription"
 msgstr "Añadir subscripción RSS"
 
-#: ppdc/sample.c:163
 msgid "Address"
 msgstr "Dirección"
 
-#: cgi-bin/admin.c:210
-#: cgi-bin/admin.c:284
-#: cgi-bin/admin.c:2745
 msgid "Administration"
 msgstr "Administración"
 
-#: ppdc/sample.c:429
 msgid "Always"
 msgstr "Siempre"
 
-#: backend/socket.c:129
 msgid "AppSocket/HP JetDirect"
 msgstr "AppSocket/HP JetDirect"
 
-#: ppdc/sample.c:450
 msgid "Applicator"
 msgstr "Aplicador"
 
-#: scheduler/ipp.c:1079
 #, c-format
 msgid "Attempt to set %s printer-state to bad value %d."
-msgstr "Se ha intentado cambiar el valor printer-state de %s a un valor incorrecto %d."
+msgstr ""
+"Se ha intentado cambiar el valor printer-state de %s a un valor incorrecto "
+"%d."
 
-#: scheduler/ipp.c:325
 #, c-format
 msgid "Attribute groups are out of order (%x < %x)."
 msgstr "Los grupos de atributos están desordenados (%x < %x)."
 
-#: ppdc/sample.c:126
 msgid "B0"
 msgstr "B0"
 
-#: ppdc/sample.c:127
 msgid "B1"
 msgstr "B1"
 
-#: ppdc/sample.c:137
 msgid "B10"
 msgstr "B10"
 
-#: ppdc/sample.c:128
 msgid "B2"
 msgstr "B2"
 
-#: ppdc/sample.c:129
 msgid "B3"
 msgstr "B3"
 
-#: ppdc/sample.c:130
 msgid "B4"
 msgstr "B4"
 
-#: ppdc/sample.c:131
 msgid "B5"
 msgstr "B5"
 
-#: ppdc/sample.c:132
 msgid "B5 Oversize"
 msgstr "A5 Extragrande"
 
-#: ppdc/sample.c:133
 msgid "B6"
 msgstr "B6"
 
-#: ppdc/sample.c:134
 msgid "B7"
 msgstr "B7"
 
-#: ppdc/sample.c:135
 msgid "B8"
 msgstr "B8"
 
-#: ppdc/sample.c:136
 msgid "B9"
 msgstr "B9"
 
-#: cups/dest.c:1680
+#, c-format
+msgid "Bad 'document-format' value \"%s\"."
+msgstr ""
+
 msgid "Bad NULL dests pointer"
 msgstr "Puntero destino NULLincorrecto"
 
-#: cups/ppd.c:345
 msgid "Bad OpenGroup"
 msgstr "OpenGroup incorrecto"
 
-#: cups/ppd.c:347
 msgid "Bad OpenUI/JCLOpenUI"
 msgstr "OpenUI/JCLOpenUI incorrecto"
 
-#: cups/ppd.c:349
 msgid "Bad OrderDependency"
 msgstr "OrderDependency incorrecto"
 
-#: cups/ppd-cache.c:148
-#: cups/ppd-cache.c:195
-#: cups/ppd-cache.c:233
-#: cups/ppd-cache.c:239
-#: cups/ppd-cache.c:255
-#: cups/ppd-cache.c:271
-#: cups/ppd-cache.c:280
-#: cups/ppd-cache.c:288
-#: cups/ppd-cache.c:305
-#: cups/ppd-cache.c:313
-#: cups/ppd-cache.c:328
-#: cups/ppd-cache.c:336
-#: cups/ppd-cache.c:354
-#: cups/ppd-cache.c:366
-#: cups/ppd-cache.c:381
-#: cups/ppd-cache.c:393
-#: cups/ppd-cache.c:415
-#: cups/ppd-cache.c:423
-#: cups/ppd-cache.c:441
-#: cups/ppd-cache.c:449
-#: cups/ppd-cache.c:464
-#: cups/ppd-cache.c:472
-#: cups/ppd-cache.c:490
-#: cups/ppd-cache.c:498
-#: cups/ppd-cache.c:525
-#: cups/ppd-cache.c:571
-#: cups/ppd-cache.c:579
-#: cups/ppd-cache.c:587
 msgid "Bad PPD cache file."
 msgstr "Archivo de caché PPD incorrecto."
 
-#: cups/http-support.c:1299
 msgid "Bad Request"
 msgstr "Petición incorrecta"
 
-#: cups/snmp.c:1002
 msgid "Bad SNMP version number"
 msgstr "Número de versión SNMP incorrecto"
 
-#: cups/ppd.c:350
 msgid "Bad UIConstraints"
 msgstr "UIConstraints incorrecto"
 
-#: scheduler/ipp.c:1380
 #, c-format
 msgid "Bad copies value %d."
 msgstr "Valor de copias %d incorrecto."
 
-#: cups/ppd.c:358
 msgid "Bad custom parameter"
 msgstr "Parámetro a medida incorrecto"
 
-#: cups/http-support.c:1451
-#: scheduler/ipp.c:2350
 #, c-format
 msgid "Bad device-uri \"%s\"."
 msgstr "device-uri \"%s\" incorrecto."
 
-#: scheduler/ipp.c:2391
 #, c-format
 msgid "Bad device-uri scheme \"%s\"."
 msgstr "Esquema device-uri \"%s\" incorrecto."
 
-#: scheduler/ipp.c:8224
-#: scheduler/ipp.c:8240
-#: scheduler/ipp.c:9454
-#: scheduler/ipp.c:10968
 #, c-format
 msgid "Bad document-format \"%s\"."
 msgstr "document-format \"%s\" incorrecto."
 
-#: scheduler/ipp.c:9470
 #, c-format
 msgid "Bad document-format-default \"%s\"."
 msgstr "document-format-default \"%s\" incorrecto."
 
-#: cups/util.c:929
 msgid "Bad filename buffer"
 msgstr "Nombre de archivo del búfer incorrecto"
 
-#: scheduler/ipp.c:10060
+msgid "Bad job-name value: Bad UTF-8 sequence."
+msgstr ""
+
+msgid "Bad job-name value: Name too long."
+msgstr ""
+
+msgid "Bad job-name value: Wrong type or count."
+msgstr ""
+
 msgid "Bad job-priority value."
 msgstr "Valor job-priority incorrecto."
 
-#: scheduler/ipp.c:1410
 #, c-format
 msgid "Bad job-sheets value \"%s\"."
 msgstr "Valor de job-sheets \"%s\" incorrecto."
 
-#: scheduler/ipp.c:1394
 msgid "Bad job-sheets value type."
 msgstr "Tipo de valor de job-sheets incorrecto."
 
-#: scheduler/ipp.c:10090
 msgid "Bad job-state value."
 msgstr "Valor job-state incorrecto."
 
-#: scheduler/ipp.c:2974
-#: scheduler/ipp.c:3426
-#: scheduler/ipp.c:6078
-#: scheduler/ipp.c:6225
-#: scheduler/ipp.c:7658
-#: scheduler/ipp.c:7927
-#: scheduler/ipp.c:8775
-#: scheduler/ipp.c:9001
-#: scheduler/ipp.c:9350
-#: scheduler/ipp.c:9953
 #, c-format
 msgid "Bad job-uri \"%s\"."
 msgstr "job-uri \"%s\" incorrecto."
 
-#: scheduler/ipp.c:2049
-#: scheduler/ipp.c:5622
 #, c-format
 msgid "Bad notify-pull-method \"%s\"."
 msgstr "notify-pull-method \"%s\" incorrecto."
 
-#: scheduler/ipp.c:2013
-#: scheduler/ipp.c:5586
 #, c-format
 msgid "Bad notify-recipient-uri \"%s\"."
 msgstr "notify-recipient-uri \"%s\" incorrecto."
 
-#: scheduler/ipp.c:1426
 #, c-format
 msgid "Bad number-up value %d."
 msgstr "Valor number-up (páginas por hoja) %d incorrecto."
 
-#: cups/adminutil.c:292
 #, c-format
 msgid "Bad option + choice on line %d."
 msgstr "Opción + preferencia incorrectas en línea %d."
 
-#: scheduler/ipp.c:1443
 #, c-format
 msgid "Bad page-ranges values %d-%d."
 msgstr "Valores de page-ranges %d-%d incorrectos."
 
-#: scheduler/ipp.c:2434
 #, c-format
 msgid "Bad port-monitor \"%s\"."
 msgstr "port-monitor \"%s\" incorrecto."
 
-#: cups/dest.c:676
-#: cups/dest.c:1333
 msgid "Bad printer URI."
 msgstr "URI de impresora incorrecto."
 
-#: scheduler/ipp.c:2495
 #, c-format
 msgid "Bad printer-state value %d."
 msgstr "Valor printer-state %d incorrecto."
 
-#: scheduler/ipp.c:293
 #, c-format
 msgid "Bad request ID %d."
 msgstr "Petición incorrecta de ID %d."
 
-#: scheduler/ipp.c:278
 #, c-format
 msgid "Bad request version number %d.%d."
 msgstr "Petición incorrecta de número de versión %d.%d."
 
-#: cgi-bin/admin.c:1484
 msgid "Bad subscription ID"
 msgstr "ID de subscripción incorrecto"
 
-#: cups/ppd.c:360
 msgid "Bad value string"
 msgstr "Cadena de valores incorrecta"
 
-#: cgi-bin/admin.c:3290
-#: cgi-bin/admin.c:3536
 msgid "Banners"
 msgstr "Rótulos"
 
-#: ppdc/sample.c:287
 msgid "Bond Paper"
 msgstr "Papel de cartas"
 
-#: backend/usb-darwin.c:1846
 #, c-format
 msgid "Boolean expected for waiteof option \"%s\"."
 msgstr "Se esperaba un valor lógico para la opción waiteof \"%s\"."
 
-#: filter/pstops.c:2057
 msgid "Buffer overflow detected, aborting."
 msgstr "Se ha detectado un desbordamiento de buffer, cancelando."
 
-#: ppdc/sample.c:254
 msgid "CMYK"
 msgstr "CMYK"
 
-#: ppdc/sample.c:363
 msgid "CPCL Label Printer"
 msgstr "Impresora de etiquetas CPCL"
 
-#: cgi-bin/admin.c:1485
-#: cgi-bin/admin.c:1524
-#: cgi-bin/admin.c:1534
 msgid "Cancel RSS Subscription"
 msgstr "Cancelar subscripción RSS"
 
-#: backend/ipp.c:1921
 msgid "Canceling print job."
 msgstr "Cancelando trabajo de impresión."
 
-#: scheduler/ipp.c:2475
 msgid "Cannot share a remote Kerberized printer."
 msgstr "No se puede compartir una impresora remota Kerberizada."
 
-#: ppdc/sample.c:279
 msgid "Cassette"
 msgstr "Casete"
 
-#: cgi-bin/admin.c:1655
-#: cgi-bin/admin.c:1797
-#: cgi-bin/admin.c:1810
-#: cgi-bin/admin.c:1821
 msgid "Change Settings"
 msgstr "Cambiar configuración"
 
-#: scheduler/ipp.c:2061
-#: scheduler/ipp.c:5634
 #, c-format
 msgid "Character set \"%s\" not supported."
 msgstr "No se admite el juego de caracteres \"%s\"."
 
-#: cgi-bin/classes.c:195
-#: cgi-bin/classes.c:322
 msgid "Classes"
 msgstr "Clases"
 
-#: cgi-bin/printers.c:182
 msgid "Clean Print Heads"
 msgstr "Limpiar cabezales de impresión"
 
-#: scheduler/ipp.c:3878
 msgid "Close-Job doesn't support the job-uri attribute."
 msgstr "Close-Job no admite el atributo job-uri."
 
-#: ppdc/sample.c:282
 msgid "Color"
 msgstr "Color"
 
-#: ppdc/sample.c:253
 msgid "Color Mode"
 msgstr "Modo de color"
 
-#: berkeley/lpc.c:204
 msgid ""
 "Commands may be abbreviated.  Commands are:\n"
 "\n"
@@ -3275,101 +2454,67 @@ msgstr ""
 "\n"
 "exit    help    quit    status  ?"
 
-#: cups/snmp.c:1006
 msgid "Community name uses indefinite length"
 msgstr "Nombre de comunidad usa una longitud indefinida"
 
-#: backend/ipp.c:786
-#: backend/lpd.c:871
-#: backend/socket.c:395
 msgid "Connected to printer."
 msgstr "Conectado a la impresora."
 
-#: backend/ipp.c:691
-#: backend/lpd.c:694
-#: backend/socket.c:314
 msgid "Connecting to printer."
 msgstr "Conectando a la impresora."
 
-#: cups/http-support.c:1272
 msgid "Continue"
 msgstr "Continuar"
 
-#: ppdc/sample.c:365
 msgid "Continuous"
 msgstr "Continuo"
 
-#: backend/lpd.c:1020
-#: backend/lpd.c:1152
 msgid "Control file sent successfully."
 msgstr "Archivo de control enviado correctamente."
 
-#: backend/ipp.c:1233
-#: backend/lpd.c:464
 msgid "Copying print data."
 msgstr "Copiando datos de impresión."
 
-#: cups/http-support.c:1281
 msgid "Created"
 msgstr "Creado"
 
-#: cups/ppd.c:1113
-#: cups/ppd.c:1153
-#: cups/ppd.c:1398
-#: cups/ppd.c:1501
 msgid "Custom"
 msgstr "A medida"
 
-#: ppdc/sample.c:359
 msgid "CustominCutInterval"
 msgstr "CustominCutInterval"
 
-#: ppdc/sample.c:357
 msgid "CustominTearInterval"
 msgstr "CustominTearInterval"
 
-#: ppdc/sample.c:343
 msgid "Cut"
 msgstr "Cortar"
 
-#: ppdc/sample.c:451
 msgid "Cutter"
 msgstr "Cortadora"
 
-#: ppdc/sample.c:239
 msgid "Dark"
 msgstr "Oscuro"
 
-#: ppdc/sample.c:235
 msgid "Darkness"
 msgstr "Oscuridad"
 
-#: backend/lpd.c:1105
 msgid "Data file sent successfully."
 msgstr "Archivo de datos enviado correctamente."
 
-#: cgi-bin/admin.c:2094
-#: cgi-bin/admin.c:2105
-#: cgi-bin/admin.c:2150
 msgid "Delete Class"
 msgstr "Borrar clase"
 
-#: cgi-bin/admin.c:2179
-#: cgi-bin/admin.c:2190
-#: cgi-bin/admin.c:2235
 msgid "Delete Printer"
 msgstr "Borrar impresora"
 
-#: ppdc/sample.c:281
 msgid "DeskJet Series"
 msgstr "DeskJet Series"
 
-#: scheduler/ipp.c:1346
 #, c-format
 msgid "Destination \"%s\" is not accepting jobs."
 msgstr "El destino %s no acepta trabajos."
 
-#: systemv/lpinfo.c:300
 #, c-format
 msgid ""
 "Device: uri = %s\n"
@@ -3386,988 +2531,706 @@ msgstr ""
 "        id dispositivo= %s\n"
 "        ubicación = %s"
 
-#: ppdc/sample.c:436
 msgid "Direct Thermal Media"
 msgstr "Soporte térmico directo"
 
-#: cups/file.c:296
 #, c-format
 msgid "Directory \"%s\" contains a relative path."
 msgstr "El directorio \"%s\" contiene una ruta relativa."
 
-#: cups/file.c:268
 #, c-format
 msgid "Directory \"%s\" has insecure permissions (0%o/uid=%d/gid=%d)."
 msgstr "El directorio \"%s\" tiene permisos no seguros (0%o/uid=%d/gid=%d)."
 
-#: cups/file.c:285
 #, c-format
 msgid "Directory \"%s\" is a file."
 msgstr "El directorio \"%s\" es un archivo."
 
-#: cups/file.c:256
 #, c-format
 msgid "Directory \"%s\" not available: %s"
 msgstr "Directorio \"%s\" no disponible: %s"
 
-#: cups/file.c:241
 #, c-format
 msgid "Directory \"%s\" permissions OK (0%o/uid=%d/gid=%d)."
 msgstr "Permisos del directorio \"%s\" OK (0%o/uid=%d/gid=%d)."
 
-#: ppdc/sample.c:345
 msgid "Disabled"
 msgstr "Deshabilitado"
 
-#: scheduler/ipp.c:6127
 #, c-format
 msgid "Document #%d does not exist in job #%d."
 msgstr "El documento #%d no existe en el trabajo #%d."
 
-#: ppdc/sample.c:275
 msgid "Duplexer"
 msgstr "Unidad de impresión dúplex"
 
-#: ppdc/sample.c:229
 msgid "Dymo"
 msgstr "Dymo"
 
-#: ppdc/sample.c:431
 msgid "EPL1 Label Printer"
 msgstr "Impresora de etiquetas EPL1"
 
-#: ppdc/sample.c:434
 msgid "EPL2 Label Printer"
 msgstr "Impresora de etiquetas EPL2"
 
-#: cgi-bin/admin.c:1849
-#: cgi-bin/admin.c:1861
-#: cgi-bin/admin.c:1915
-#: cgi-bin/admin.c:1922
-#: cgi-bin/admin.c:1957
-#: cgi-bin/admin.c:1970
-#: cgi-bin/admin.c:1994
-#: cgi-bin/admin.c:2067
 msgid "Edit Configuration File"
 msgstr "Editar archivo de configuración"
 
-#: cups/adminutil.c:337
 msgid "Empty PPD file."
 msgstr "Archivo PPD vacío."
 
 #. TRANSLATORS: Banner/cover sheet after the print job.
-#: cgi-bin/admin.c:3561
 msgid "Ending Banner"
 msgstr "Rótulo final"
 
-#: ppdc/sample.c:2
 msgid "English"
 msgstr "Spanish"
 
-#: systemv/lppasswd.c:193
 msgid "Enter old password:"
 msgstr "Introduzca la contraseña antigua:"
 
-#: systemv/lppasswd.c:224
 msgid "Enter password again:"
 msgstr "Introduzca nuevamente la contraseña:"
 
-#: systemv/lppasswd.c:212
 msgid "Enter password:"
 msgstr "Introduzca la contraseña:"
 
-#: scheduler/client.c:2427
-msgid "Enter your username and password or the root username and password to access this page. If you are using Kerberos authentication, make sure you have a valid Kerberos ticket."
-msgstr "Introduzca su nombre de usuario y contraseña o el nombre de usuario y contraseña de root para poder acceder a esta página. Si está usando autentificación Kerberos, asegúrese de que tiene un ticket Kerberos válido."
+msgid ""
+"Enter your username and password or the root username and password to access "
+"this page. If you are using Kerberos authentication, make sure you have a "
+"valid Kerberos ticket."
+msgstr ""
+"Introduzca su nombre de usuario y contraseña o el nombre de usuario y "
+"contraseña de root para poder acceder a esta página. Si está usando "
+"autentificación Kerberos, asegúrese de que tiene un ticket Kerberos válido."
 
-#: ppdc/sample.c:73
 msgid "Envelope #10 "
 msgstr "Sobre #10"
 
-#: ppdc/sample.c:74
 msgid "Envelope #11"
 msgstr "Sobre #11"
 
-#: ppdc/sample.c:75
 msgid "Envelope #12"
 msgstr "Sobre #12"
 
-#: ppdc/sample.c:76
 msgid "Envelope #14"
 msgstr "Sobre #14"
 
-#: ppdc/sample.c:77
 msgid "Envelope #9"
 msgstr "Sobre #9"
 
-#: ppdc/sample.c:89
 msgid "Envelope B4"
 msgstr "Sobre B4"
 
-#: ppdc/sample.c:90
 msgid "Envelope B5"
 msgstr "Sobre B5"
 
-#: ppdc/sample.c:91
 msgid "Envelope B6"
 msgstr "Sobre B6"
 
-#: ppdc/sample.c:78
 msgid "Envelope C0"
 msgstr "Sobre C0"
 
-#: ppdc/sample.c:79
 msgid "Envelope C1"
 msgstr "Sobre C1"
 
-#: ppdc/sample.c:80
 msgid "Envelope C2"
 msgstr "Sobre C2"
 
-#: ppdc/sample.c:81
 msgid "Envelope C3"
 msgstr "Sobre C3"
 
-#: ppdc/sample.c:67
 msgid "Envelope C4"
 msgstr "Sobre C4"
 
-#: ppdc/sample.c:68
 msgid "Envelope C5"
 msgstr "Sobre C5"
 
-#: ppdc/sample.c:69
 msgid "Envelope C6"
 msgstr "Sobre C6"
 
-#: ppdc/sample.c:82
 msgid "Envelope C65"
 msgstr "Sobre C65"
 
-#: ppdc/sample.c:83
 msgid "Envelope C7"
 msgstr "Sobre C7"
 
-#: ppdc/sample.c:84
 msgid "Envelope Choukei 3"
 msgstr "Sobre Choukei 3"
 
-#: ppdc/sample.c:85
 msgid "Envelope Choukei 3 Long Edge"
 msgstr "Sobre Choukei 3 lado largo"
 
-#: ppdc/sample.c:86
 msgid "Envelope Choukei 4"
 msgstr "Sobre Choukei 4"
 
-#: ppdc/sample.c:87
 msgid "Envelope Choukei 4 Long Edge"
 msgstr "Sobre Choukei 4 lado largo"
 
-#: ppdc/sample.c:70
 msgid "Envelope DL"
 msgstr "Sobre DL"
 
-#: ppdc/sample.c:269
 msgid "Envelope Feed"
 msgstr "Alimentador de sobre"
 
-#: ppdc/sample.c:88
 msgid "Envelope Invite"
 msgstr "Sobre Invitación"
 
-#: ppdc/sample.c:92
 msgid "Envelope Italian"
 msgstr "Sobre Italiano"
 
-#: ppdc/sample.c:93
 msgid "Envelope Kaku2"
 msgstr "Sobre Kaku2"
 
-#: ppdc/sample.c:94
 msgid "Envelope Kaku2 Long Edge"
 msgstr "Sobre Kaku2 lado largo"
 
-#: ppdc/sample.c:95
 msgid "Envelope Kaku3"
 msgstr "Sobre Kaku3"
 
-#: ppdc/sample.c:96
 msgid "Envelope Kaku3 Long Edge"
 msgstr "Sobre Kaku3 lado largo"
 
-#: ppdc/sample.c:97
 msgid "Envelope Monarch"
 msgstr "Sobre Monarch"
 
-#: ppdc/sample.c:99
 msgid "Envelope PRC1 "
 msgstr "Sobre PRC1"
 
-#: ppdc/sample.c:100
 msgid "Envelope PRC1 Long Edge"
 msgstr "Sobre PRC1 lado largo"
 
-#: ppdc/sample.c:117
 msgid "Envelope PRC10"
 msgstr "Sobre PRC10"
 
-#: ppdc/sample.c:118
 msgid "Envelope PRC10 Long Edge"
 msgstr "Sobre PRC10 lado largo"
 
-#: ppdc/sample.c:101
 msgid "Envelope PRC2"
 msgstr "Sobre PRC2"
 
-#: ppdc/sample.c:102
 msgid "Envelope PRC2 Long Edge"
 msgstr "Sobre PRC2 lado largo"
 
-#: ppdc/sample.c:103
 msgid "Envelope PRC3"
 msgstr "Sobre PRC3"
 
-#: ppdc/sample.c:104
 msgid "Envelope PRC3 Long Edge"
 msgstr "Sobre PRC3 lado largo"
 
-#: ppdc/sample.c:105
 msgid "Envelope PRC4"
 msgstr "Sobre PRC4"
 
-#: ppdc/sample.c:106
 msgid "Envelope PRC4 Long Edge"
 msgstr "Sobre PRC4 lado largo"
 
-#: ppdc/sample.c:108
 msgid "Envelope PRC5 Long Edge"
 msgstr "Sobre PRC5 lado largo"
 
-#: ppdc/sample.c:107
 msgid "Envelope PRC5PRC5"
 msgstr "Sobre PRC5PRC5"
 
-#: ppdc/sample.c:109
 msgid "Envelope PRC6"
 msgstr "Sobre PRC6"
 
-#: ppdc/sample.c:110
 msgid "Envelope PRC6 Long Edge"
 msgstr "Sobre PRC6 lado largo"
 
-#: ppdc/sample.c:111
 msgid "Envelope PRC7"
 msgstr "Sobre PRC7"
 
-#: ppdc/sample.c:112
 msgid "Envelope PRC7 Long Edge"
 msgstr "Sobre PRC7 lado largo"
 
-#: ppdc/sample.c:113
 msgid "Envelope PRC8"
 msgstr "Sobre PRC8"
 
-#: ppdc/sample.c:114
 msgid "Envelope PRC8 Long Edge"
 msgstr "Sobre PRC8 lado largo"
 
-#: ppdc/sample.c:115
 msgid "Envelope PRC9"
 msgstr "Sobre PRC9"
 
-#: ppdc/sample.c:116
 msgid "Envelope PRC9 Long Edge"
 msgstr "Sobre PRC9 lado largo"
 
-#: ppdc/sample.c:98
 msgid "Envelope Personal"
 msgstr "Sobre Personal"
 
-#: ppdc/sample.c:119
 msgid "Envelope You4"
 msgstr "Sobre You4"
 
-#: ppdc/sample.c:120
 msgid "Envelope You4 Long Edge"
 msgstr "Sobre You4 lado largo"
 
-#: ppdc/sample.c:240
 msgid "Epson"
 msgstr "Epson"
 
-#: cgi-bin/admin.c:3604
 msgid "Error Policy"
 msgstr "Directiva de error"
 
-#: filter/rastertopwg.c:403
-#: filter/rastertopwg.c:418
-#: filter/rastertopwg.c:429
-#: filter/rastertopwg.c:440
 msgid "Error sending raster data."
 msgstr "Error enviando trama de datos (raster)."
 
-#: systemv/lpinfo.c:103
-#: systemv/lpmove.c:88
 msgid "Error: need hostname after \"-h\" option."
 msgstr "Error: se necesita un nombre de ordenador tras la opción \"-h\"."
 
-#: ppdc/sample.c:355
 msgid "Every 10 Labels"
 msgstr "Cada 10 etiquetas"
 
-#: ppdc/sample.c:347
 msgid "Every 2 Labels"
 msgstr "Cada 2 etiquetas"
 
-#: ppdc/sample.c:348
 msgid "Every 3 Labels"
 msgstr "Cada 3 etiquetas"
 
-#: ppdc/sample.c:349
 msgid "Every 4 Labels"
 msgstr "Cada 4 etiquetas"
 
-#: ppdc/sample.c:350
 msgid "Every 5 Labels"
 msgstr "Cada 5 etiquetas"
 
-#: ppdc/sample.c:351
 msgid "Every 6 Labels"
 msgstr "Cada 6 etiquetas"
 
-#: ppdc/sample.c:352
 msgid "Every 7 Labels"
 msgstr "Cada 7 etiquetas"
 
-#: ppdc/sample.c:353
 msgid "Every 8 Labels"
 msgstr "Cada 8 etiquetas"
 
-#: ppdc/sample.c:354
 msgid "Every 9 Labels"
 msgstr "Cada 9 etiquetas"
 
-#: ppdc/sample.c:346
 msgid "Every Label"
 msgstr "Cada etiqueta"
 
-#: ppdc/sample.c:121
 msgid "Executive"
 msgstr "Ejecutivo"
 
-#: cups/http-support.c:1327
 msgid "Expectation Failed"
 msgstr "Lo que se esperaba, falló."
 
-#: cgi-bin/admin.c:2356
-#: cgi-bin/admin.c:2375
 msgid "Export Printers to Samba"
 msgstr "Exportar impresoras a Samba"
 
-#: systemv/cupstestdsc.c:172
-#: systemv/cupstestdsc.c:189
-#: systemv/cupstestdsc.c:214
-#: systemv/cupstestdsc.c:231
-#: systemv/cupstestdsc.c:255
-#: systemv/cupstestdsc.c:273
-#: systemv/cupstestdsc.c:302
-#: systemv/cupstestdsc.c:339
-#: systemv/cupstestdsc.c:349
-#: systemv/cupstestdsc.c:359
-#: systemv/cupstestdsc.c:369
-#: systemv/cupstestdsc.c:379
-#: systemv/cupstestdsc.c:387
 msgid "FAIL"
 msgstr "FALLO"
 
-#: ppdc/sample.c:122
 msgid "FanFold German"
 msgstr "FanFold alemán"
 
-#: ppdc/sample.c:123
 msgid "FanFold Legal German"
 msgstr "FanFold Legal alemán"
 
-#: ppdc/sample.c:124
 msgid "Fanfold US"
 msgstr "FanFold de EE.UU"
 
-#: cups/file.c:300
 #, c-format
 msgid "File \"%s\" contains a relative path."
 msgstr "El archivo \"%s\" contiene una ruta relativa."
 
-#: cups/file.c:275
 #, c-format
 msgid "File \"%s\" has insecure permissions (0%o/uid=%d/gid=%d)."
 msgstr "El archivo \"%s\" tiene permisos no seguros (0%o/uid=%d/gid=%d)."
 
-#: cups/file.c:289
 #, c-format
 msgid "File \"%s\" is a directory."
 msgstr "El archivo \"%s\" es un directorio."
 
-#: cups/file.c:261
 #, c-format
 msgid "File \"%s\" not available: %s"
 msgstr "Archivo \"%s\" no disponible: %s"
 
-#: cups/file.c:247
 #, c-format
 msgid "File \"%s\" permissions OK (0%o/uid=%d/gid=%d)."
 msgstr "Permisos del archivo \"%s\" OK (0%o/uid=%d/gid=%d)."
 
-#: ppdc/sample.c:169
 msgid "File Folder "
 msgstr "Carpeta de archivo"
 
-#: scheduler/ipp.c:2370
 #, c-format
-msgid "File device URIs have been disabled. To enable, see the FileDevice directive in \"%s/cupsd.conf\"."
-msgstr "Los URIs del dispositivo de archivo han sido deshabilitados. Para habilitarlos, vea la directiva FileDevice en \"%s/cupsd.conf\"."
+msgid ""
+"File device URIs have been disabled. To enable, see the FileDevice directive "
+"in \"%s/cups-files.conf\"."
+msgstr ""
+"Los URIs del dispositivo de archivo han sido deshabilitados. Para "
+"habilitarlos, vea la directiva FileDevice en \"%s/cups-files.conf\"."
 
-#: filter/rastertoepson.c:1117
-#: filter/rastertohp.c:845
-#: filter/rastertolabel.c:1273
 #, c-format
 msgid "Finished page %d."
 msgstr "Acabada la página %d."
 
-#: ppdc/sample.c:125
 msgid "Folio"
 msgstr "Folio"
 
-#: cups/http-support.c:1306
 msgid "Forbidden"
 msgstr "Prohibido"
 
-#: cups/ppd.c:742
-#: cups/ppd.c:1302
 msgid "General"
 msgstr "General"
 
-#: ppdc/sample.c:259
 msgid "Generic"
 msgstr "Genérico"
 
-#: cups/snmp.c:1016
 msgid "Get-Response-PDU uses indefinite length"
 msgstr "Get-Response-PDU usa una longitud indefinida"
 
-#: ppdc/sample.c:290
 msgid "Glossy Paper"
 msgstr "Papel satinado"
 
-#: scheduler/ipp.c:2952
-#: scheduler/ipp.c:3352
-#: scheduler/ipp.c:3890
-#: scheduler/ipp.c:6056
-#: scheduler/ipp.c:6203
-#: scheduler/ipp.c:7635
-#: scheduler/ipp.c:8753
-#: scheduler/ipp.c:8979
-#: scheduler/ipp.c:9328
-#: scheduler/ipp.c:9931
 msgid "Got a printer-uri attribute but no job-id."
 msgstr "Se ha obtenido el atributo printer-uri pero no el job-id."
 
-#: ppdc/sample.c:255
 msgid "Grayscale"
 msgstr "Escale de grises"
 
-#: ppdc/sample.c:280
 msgid "HP"
 msgstr "HP"
 
-#: ppdc/sample.c:170
 msgid "Hanging Folder"
 msgstr "Carpeta colgante"
 
-#: cgi-bin/help.c:143
 msgid "Help file not in index."
 msgstr "El archivo de ayuda no está en el índice"
 
-#: cups/ipp.c:2687
-#: cups/ipp.c:2714
-#: cups/ipp.c:2737
 msgid "IPP 1setOf attribute with incompatible value tags."
 msgstr "IPP atributo 1setOf con etiquetas de valor incompatibles"
 
-#: cups/ipp.c:2650
 msgid "IPP attribute has no name."
 msgstr "IPP atributo sin nombre"
 
-#: cups/ipp.c:5487
 msgid "IPP attribute is not a member of the message."
 msgstr "El atributo IPP no es un miembro del mensaje."
 
-#: cups/ipp.c:3083
 msgid "IPP begCollection value not 0 bytes."
 msgstr "IPP el valor begCollection no es de 0 bytes."
 
-#: cups/ipp.c:2873
 msgid "IPP boolean value not 1 byte."
 msgstr "IPP el valor lógico no es de 1 byte."
 
-#: cups/ipp.c:2934
 msgid "IPP date value not 11 bytes."
 msgstr "IPP el valor de fecha no es de 11 bytes."
 
-#: cups/ipp.c:3104
 msgid "IPP endCollection value not 0 bytes."
 msgstr "IPP el valor endCollection no es de 0 bytes."
 
-#: cups/ipp.c:2848
 msgid "IPP enum value not 4 bytes."
 msgstr "IPP el valor enum no es de 4 bytes."
 
-#: cups/ipp.c:2579
 msgid "IPP extension tag larger than 0x7FFFFFFF."
 msgstr "IPP etiqueta de extensión mayor de 0x7FFFFFFF."
 
-#: cups/ipp.c:2845
 msgid "IPP integer value not 4 bytes."
 msgstr "IPP el valor entero no es de 4 bytes."
 
-#: cups/ipp.c:3045
 msgid "IPP language length overflows value."
 msgstr "IPP la longitud del idioma sobrepasa el valor."
 
-#: cups/ipp.c:2764
 msgid "IPP member name is not empty."
 msgstr "IPP el nombre del miembro no está vacío."
 
-#: cups/ipp.c:3122
 msgid "IPP memberName value is empty."
 msgstr "IPP el valor memberName está vacío."
 
-#: cups/ipp.c:2633
+msgid "IPP memberName with no attribute."
+msgstr ""
+
 msgid "IPP name larger than 32767 bytes."
 msgstr "IPP nombre mayor de 32767 bytes."
 
-#: cups/ipp.c:3011
 msgid "IPP nameWithLanguage value less than minimum 4 bytes."
 msgstr "IPP el valor nameWithLanguage menor del mínimo de 4 bytes."
 
-#: cups/ipp.c:2979
 msgid "IPP rangeOfInteger value not 8 bytes."
 msgstr "IPP el valor rangeOfInteger no es de 8 bytes."
 
-#: cups/ipp.c:2952
 msgid "IPP resolution value not 9 bytes."
 msgstr "IPP el valor de la resolución no es de 9 bytes."
 
-#: cups/ipp.c:3063
 msgid "IPP string length overflows value."
 msgstr "IPP la longitud de la cadena sobrepasa el valor."
 
-#: cups/ipp.c:3007
 msgid "IPP textWithLanguage value less than minimum 4 bytes."
 msgstr "IPP el valor textWithLanguage menor del mínimo de 4 bytes."
 
-#: cups/ipp.c:2831
 msgid "IPP value larger than 32767 bytes."
 msgstr "IPP valor mayor de 32767 bytes."
 
-#: ppdc/sample.c:1
 msgid "ISOLatin1"
 msgstr "UTF-8"
 
-#: cups/ppd.c:353
 msgid "Illegal control character"
 msgstr "Carácter de control ilegal"
 
-#: cups/ppd.c:354
 msgid "Illegal main keyword string"
 msgstr "Cadena de clave principal ilegal"
 
-#: cups/ppd.c:355
 msgid "Illegal option keyword string"
 msgstr "Cadena de clave de opción ilegal"
 
-#: cups/ppd.c:356
 msgid "Illegal translation string"
 msgstr "Cadena de traducción ilegal"
 
-#: cups/ppd.c:357
 msgid "Illegal whitespace character"
 msgstr "Carácter de espacio en blanco ilegal"
 
-#: ppdc/sample.c:274
 msgid "Installable Options"
 msgstr "Opciones instalables"
 
-#: ppdc/sample.c:277
 msgid "Installed"
 msgstr "Instalada"
 
-#: ppdc/sample.c:293
 msgid "IntelliBar Label Printer"
 msgstr "Impresora de etiquetas IntelliBar"
 
-#: ppdc/sample.c:292
 msgid "Intellitech"
 msgstr "Intellitech"
 
-#: cups/http-support.c:1333
 msgid "Internal Server Error"
 msgstr "Error interno del servidor"
 
-#: cups/ppd.c:344
 msgid "Internal error"
 msgstr "Error interno"
 
-#: ppdc/sample.c:167
 msgid "Internet Postage 2-Part"
 msgstr "Correo por Internet Parte-2"
 
-#: ppdc/sample.c:168
 msgid "Internet Postage 3-Part"
 msgstr "Correo por Internet Parte-3"
 
-#: backend/ipp.c:307
 msgid "Internet Printing Protocol"
 msgstr "Protocolo de Impresión de Internet IPP"
 
-#: cups/dest-options.c:839
 msgid "Invalid media size."
 msgstr "Tamaño del papel no válido"
 
-#: filter/commandtops.c:125
 #, c-format
 msgid "Invalid printer command \"%s\"."
 msgstr "Comando de impresora \"%s\" no válido."
 
-#: cups/ppd.c:1420
 msgid "JCL"
 msgstr "JCL"
 
-#: ppdc/sample.c:53
 msgid "JIS B0"
 msgstr "JIS B0"
 
-#: ppdc/sample.c:55
 msgid "JIS B1"
 msgstr "JIS B1"
 
-#: ppdc/sample.c:54
 msgid "JIS B10"
 msgstr "JIS B10"
 
-#: ppdc/sample.c:56
 msgid "JIS B2"
 msgstr "JIS B2"
 
-#: ppdc/sample.c:57
 msgid "JIS B3"
 msgstr "JIS B3"
 
-#: ppdc/sample.c:58
 msgid "JIS B4"
 msgstr "JIS B4"
 
-#: ppdc/sample.c:59
 msgid "JIS B4 Long Edge"
 msgstr "JIS B4 lado largo"
 
-#: ppdc/sample.c:60
 msgid "JIS B5"
 msgstr "JIS B5"
 
-#: ppdc/sample.c:61
 msgid "JIS B5 Long Edge"
 msgstr "JIS B5 lado largo"
 
-#: ppdc/sample.c:62
 msgid "JIS B6"
 msgstr "JIS B6"
 
-#: ppdc/sample.c:63
 msgid "JIS B6 Long Edge"
 msgstr "JIS B6 lado largo"
 
-#: ppdc/sample.c:64
 msgid "JIS B7"
 msgstr "JIS B7"
 
-#: ppdc/sample.c:65
 msgid "JIS B8"
 msgstr "JIS B8"
 
-#: ppdc/sample.c:66
 msgid "JIS B9"
 msgstr "JIS B9"
 
-#: scheduler/ipp.c:9051
 #, c-format
 msgid "Job #%d cannot be restarted - no files."
 msgstr "El trabajo #%d no puede ser reiniciado - no hay archivos."
 
-#: scheduler/ipp.c:2992
-#: scheduler/ipp.c:3222
-#: scheduler/ipp.c:3277
-#: scheduler/ipp.c:3454
-#: scheduler/ipp.c:3900
-#: scheduler/ipp.c:5720
-#: scheduler/ipp.c:6096
-#: scheduler/ipp.c:6243
-#: scheduler/ipp.c:6543
-#: scheduler/ipp.c:7482
-#: scheduler/ipp.c:7504
-#: scheduler/ipp.c:7676
-#: scheduler/ipp.c:7901
-#: scheduler/ipp.c:7944
-#: scheduler/ipp.c:8793
-#: scheduler/ipp.c:9019
-#: scheduler/ipp.c:9368
-#: scheduler/ipp.c:9971
 #, c-format
 msgid "Job #%d does not exist."
 msgstr "El trabajo #%d no existe."
 
-#: scheduler/ipp.c:3486
 #, c-format
 msgid "Job #%d is already aborted - can't cancel."
 msgstr "El trabajo #%d ya está anulado - no se puede cancelar."
 
-#: scheduler/ipp.c:3480
 #, c-format
 msgid "Job #%d is already canceled - can't cancel."
 msgstr "El trabajo #%d ya está cancelado - no se puede cancelar."
 
-#: scheduler/ipp.c:3492
 #, c-format
 msgid "Job #%d is already completed - can't cancel."
 msgstr "El trabajo #%d ya ha sido completado - no se puede cancelar."
 
-#: scheduler/ipp.c:7702
-#: scheduler/ipp.c:7986
-#: scheduler/ipp.c:9986
 #, c-format
 msgid "Job #%d is finished and cannot be altered."
 msgstr "El trabajo #%d ha terminado y no puede ser modificado."
 
-#: scheduler/ipp.c:9033
 #, c-format
 msgid "Job #%d is not complete."
 msgstr "El trabajo #%d no ha sido completado."
 
-#: scheduler/ipp.c:3007
 #, c-format
 msgid "Job #%d is not held for authentication."
 msgstr "El trabajo #%d no está retenido para autentificación."
 
-#: scheduler/ipp.c:8807
 #, c-format
 msgid "Job #%d is not held."
 msgstr "El trabajo #%d no está retenido."
 
-#: cgi-bin/ipp-var.c:1055
 msgid "Job Completed"
 msgstr "Trabajo completado"
 
-#: cgi-bin/ipp-var.c:1053
 msgid "Job Created"
 msgstr "Trabajo creado"
 
-#: cgi-bin/ipp-var.c:1059
 msgid "Job Options Changed"
 msgstr "Opciones de trabajo cambiadas"
 
-#: cgi-bin/ipp-var.c:1057
 msgid "Job Stopped"
 msgstr "Trabajo detenido"
 
-#: scheduler/ipp.c:10068
 msgid "Job is completed and cannot be changed."
 msgstr "El trabajo está terminado y no puede ser cambiado."
 
-#: cgi-bin/jobs.c:198
 msgid "Job operation failed"
 msgstr "La operación del trabajo ha fallado"
 
-#: scheduler/ipp.c:10104
-#: scheduler/ipp.c:10123
-#: scheduler/ipp.c:10134
 msgid "Job state cannot be changed."
 msgstr "No se puede cambiar el estado del trabajo."
 
-#: scheduler/ipp.c:8899
 msgid "Job subscriptions cannot be renewed."
 msgstr "Las suscripciones de trabajos no han podido ser renovadas."
 
-#: cgi-bin/jobs.c:103
-#: cgi-bin/jobs.c:114
-#: cgi-bin/jobs.c:195
 msgid "Jobs"
 msgstr "Trabajos"
 
-#: backend/lpd.c:185
 msgid "LPD/LPR Host or Printer"
 msgstr "Equipo o impresora LPD/LPR"
 
-#: ppdc/sample.c:230
 msgid "Label Printer"
 msgstr "Impresora de etiquetas"
 
-#: ppdc/sample.c:446
 msgid "Label Top"
 msgstr "Parte superior de la etiqueta"
 
-#: scheduler/ipp.c:2070
-#: scheduler/ipp.c:5643
 #, c-format
 msgid "Language \"%s\" not supported."
 msgstr "No se admite el uso del idioma \"%s\"."
 
-#: ppdc/sample.c:164
 msgid "Large Address"
 msgstr "Dirección grande"
 
-#: ppdc/sample.c:291
 msgid "LaserJet Series PCL 4/5"
 msgstr "LaserJet Series PCL 4/5"
 
-#: ppdc/sample.c:43
 msgid "Letter Oversize"
 msgstr "Carta Extragrande"
 
-#: ppdc/sample.c:44
 msgid "Letter Oversize Long Edge"
 msgstr "Carta Extragrande lado largo"
 
-#: ppdc/sample.c:236
 msgid "Light"
 msgstr "Ligero"
 
-#: cups/ppd.c:352
 msgid "Line longer than the maximum allowed (255 characters)"
 msgstr "Línea más larga que el máximo permitido (255 caracteres)"
 
-#: cgi-bin/admin.c:2393
 msgid "List Available Printers"
 msgstr "Listar impresoras disponibles"
 
-#: ppdc/sample.c:272
 msgid "Long-Edge (Portrait)"
 msgstr "Lado largo (retrato)"
 
-#: cups/http-support.c:1558
 msgid "Looking for printer."
 msgstr "Buscando impresora."
 
-#: ppdc/sample.c:268
 msgid "Manual Feed"
 msgstr "Alimentación manual"
 
-#: cups/ppd.c:789
-#: cups/ppd.c:1357
 msgid "Media Size"
 msgstr "Tamaño de papel"
 
-#: cups/ppd.c:793
-#: cups/ppd.c:1361
-#: ppdc/sample.c:262
 msgid "Media Source"
 msgstr "Fuente del papel"
 
-#: ppdc/sample.c:364
 msgid "Media Tracking"
 msgstr "Seguimiento del medio"
 
-#: cups/ppd.c:791
-#: cups/ppd.c:1359
-#: ppdc/sample.c:285
 msgid "Media Type"
 msgstr "Tipo de papel"
 
-#: ppdc/sample.c:237
 msgid "Medium"
 msgstr "Media"
 
-#: cups/ppd.c:341
 msgid "Memory allocation error"
 msgstr "Error de reserva de memoria"
 
-#: cups/ppd.c:361
 msgid "Missing CloseGroup"
 msgstr "Falta CloseGroup"
 
-#: cups/ppd.c:342
 msgid "Missing PPD-Adobe-4.x header"
 msgstr "Falta cabecera PPD-Adobe-4.x"
 
-#: cups/ppd.c:351
 msgid "Missing asterisk in column 1"
 msgstr "Falta un asterisco en la columna 1"
 
-#: scheduler/ipp.c:6119
 msgid "Missing document-number attribute."
 msgstr "Falta el atributo document-number."
 
-#: cups/adminutil.c:273
 #, c-format
 msgid "Missing double quote on line %d."
 msgstr "Faltan dobles comillas en línea %d."
 
-#: cgi-bin/admin.c:736
-#: cgi-bin/admin.c:2106
-#: cgi-bin/admin.c:2191
-#: cgi-bin/admin.c:2785
-#: cgi-bin/admin.c:3039
-#: cgi-bin/admin.c:3150
-#: cgi-bin/admin.c:3860
 msgid "Missing form variable"
 msgstr "Falta una variable de formulario"
 
-#: scheduler/ipp.c:9422
 msgid "Missing last-document attribute in request."
 msgstr "Falta el atributo last-document en la petición."
 
-#: cups/pwg-media.c:535
 msgid "Missing media or media-col."
 msgstr "Falta media o media-col."
 
-#: cups/pwg-media.c:454
 msgid "Missing media-size in media-col."
 msgstr "Falta media-size en media-col."
 
-#: scheduler/ipp.c:6673
 msgid "Missing notify-subscription-ids attribute."
 msgstr "Falta el atributo notify-subscription-ids."
 
-#: cups/ppd.c:359
 msgid "Missing option keyword"
 msgstr "Falta cadena de clave de opción"
 
-#: scheduler/ipp.c:3133
-#: scheduler/ipp.c:3158
 msgid "Missing requesting-user-name attribute."
 msgstr "Falta el atributo requesting-user-name."
 
-#: scheduler/ipp.c:461
 msgid "Missing required attributes."
 msgstr "Faltan atributos necesarios."
 
-#: cups/adminutil.c:254
 #, c-format
 msgid "Missing value on line %d."
 msgstr "Falta un valor en la línea %d."
 
-#: cups/ppd.c:343
 msgid "Missing value string"
 msgstr "Falta cadena de valores"
 
-#: cups/pwg-media.c:442
 msgid "Missing x-dimension in media-size."
 msgstr "Falta x-dimension en media-size."
 
-#: cups/pwg-media.c:448
 msgid "Missing y-dimension in media-size."
 msgstr "Falta y-dimension en media-size."
 
-#: systemv/lpinfo.c:470
 #, c-format
 msgid ""
 "Model:  name = %s\n"
@@ -4380,1660 +3243,1233 @@ msgstr ""
 "        make-and-model = %s\n"
 "        device-id = %s"
 
-#: cgi-bin/admin.c:570
 msgid "Modify Class"
 msgstr "Modificar clase"
 
-#: cgi-bin/admin.c:882
 msgid "Modify Printer"
 msgstr "Modificar impresora"
 
-#: cgi-bin/ipp-var.c:425
-#: cgi-bin/ipp-var.c:516
 msgid "Move All Jobs"
 msgstr "Mover todos los trabajos"
 
-#: cgi-bin/ipp-var.c:364
-#: cgi-bin/ipp-var.c:423
-#: cgi-bin/ipp-var.c:514
 msgid "Move Job"
 msgstr "Mover trabajo"
 
-#: cups/http-support.c:1290
 msgid "Moved Permanently"
 msgstr "Movido permanentemente"
 
-#: cups/ppd.c:340
 msgid "NULL PPD file pointer"
 msgstr "Puntero de archivo PPD NULO"
 
-#: cups/snmp.c:1053
 msgid "Name OID uses indefinite length"
 msgstr "Nombre OID usa una longitud indefinida"
 
-#: scheduler/ipp.c:1142
 msgid "Nested classes are not allowed."
 msgstr "No se permiten clases anidadas."
 
-#: ppdc/sample.c:430
 msgid "Never"
 msgstr "Nunca"
 
-#: ppdc/sample.c:256
 msgid "New Stylus Color Series"
 msgstr "Nueva Stylus Color Series"
 
-#: ppdc/sample.c:258
 msgid "New Stylus Photo Series"
 msgstr "Nueva Stylus Photo Series"
 
-#: cups/ppd.c:1949
 msgid "No"
 msgstr "No"
 
-#: cups/http-support.c:1287
 msgid "No Content"
 msgstr "No hay contenido"
 
-#: cups/util.c:1298
 msgid "No PPD name"
 msgstr "No hay nombre de PPD"
 
-#: cups/snmp.c:1047
 msgid "No VarBind SEQUENCE"
 msgstr "No hay Varbind SEQUENCE"
 
-#: cups/adminutil.c:788
 msgid "No Windows printer drivers are installed."
 msgstr "No está instalado ningún controlador de impresora de Windows."
 
-#: cups/request.c:566
-#: cups/request.c:908
 msgid "No active connection"
 msgstr "No hay conexión activa"
 
-#: scheduler/ipp.c:3403
 #, c-format
 msgid "No active jobs on %s."
 msgstr "No hay trabajos activos en %s."
 
-#: scheduler/ipp.c:302
 msgid "No attributes in request."
 msgstr "No hay atributos en la solicitud."
 
-#: scheduler/ipp.c:3034
 msgid "No authentication information provided."
 msgstr "No se ha proporcionado información de autentificación."
 
-#: cups/snmp.c:1004
 msgid "No community name"
 msgstr "No hay nombre de comunidad"
 
-#: scheduler/ipp.c:5919
 msgid "No default printer."
 msgstr "No hay impresora predeterminada."
 
-#: cgi-bin/ipp-var.c:436
-#: scheduler/ipp.c:7248
 msgid "No destinations added."
 msgstr "No se han añadido destinos."
 
-#: backend/usb.c:200
 msgid "No device URI found in argv[0] or in DEVICE_URI environment variable."
-msgstr "No se ha encontrado el URI del dispositivo en argv[0] o en la variable de entorno DEVICE_URI."
+msgstr ""
+"No se ha encontrado el URI del dispositivo en argv[0] o en la variable de "
+"entorno DEVICE_URI."
 
-#: cups/snmp.c:1034
 msgid "No error-index"
 msgstr "No hay error-index"
 
-#: cups/snmp.c:1026
 msgid "No error-status"
 msgstr "No hay error-status"
 
-#: scheduler/ipp.c:8190
-#: scheduler/ipp.c:9436
 msgid "No file in print request."
 msgstr "No hay ningún archivo en la petición de impresión."
 
-#: cups/util.c:923
 msgid "No modification time"
 msgstr "No hay tiempo de modificación"
 
-#: cups/snmp.c:1051
 msgid "No name OID"
 msgstr "No hay nombre OID"
 
-#: filter/rastertoepson.c:1147
-#: filter/rastertohp.c:876
-#: filter/rastertolabel.c:1302
 msgid "No pages were found."
 msgstr "No se han encontrado páginas."
 
-#: cups/util.c:917
 msgid "No printer name"
 msgstr "No hay nombre de impresora"
 
-#: cups/util.c:1801
 msgid "No printer-uri found"
 msgstr "No se encontró printer-uri"
 
-#: cups/util.c:1786
 msgid "No printer-uri found for class"
 msgstr "No se encontró printer-uri para la clase"
 
-#: scheduler/ipp.c:6322
 msgid "No printer-uri in request."
 msgstr "No hay printer-uri en la petición."
 
-#: cups/snmp.c:1018
 msgid "No request-id"
 msgstr "No hay request-id"
 
-#: scheduler/ipp.c:5528
 msgid "No subscription attributes in request."
 msgstr "No hay atributos de subscripción en la solicitud."
 
-#: scheduler/ipp.c:7575
 msgid "No subscriptions found."
 msgstr "No se han encontrado subscripciones."
 
-#: cups/snmp.c:1042
 msgid "No variable-bindings SEQUENCE"
 msgstr "No hay variable-bindings SEQUENCE"
 
-#: cups/snmp.c:997
 msgid "No version number"
 msgstr "No hay número de versión"
 
-#: ppdc/sample.c:367
 msgid "Non-continuous (Mark sensing)"
 msgstr "No continuo (sensible a señal)"
 
-#: ppdc/sample.c:366
 msgid "Non-continuous (Web sensing)"
 msgstr "No continuo (sensible a web)"
 
-#: ppdc/sample.c:238
 msgid "Normal"
 msgstr "Normal"
 
-#: cups/http-support.c:1309
 msgid "Not Found"
 msgstr "No encontrado"
 
-#: cups/http-support.c:1321
 msgid "Not Implemented"
 msgstr "No implementado"
 
-#: ppdc/sample.c:276
 msgid "Not Installed"
 msgstr "No instalado"
 
-#: cups/http-support.c:1296
 msgid "Not Modified"
 msgstr "No modificado"
 
-#: cups/http-support.c:1324
 msgid "Not Supported"
 msgstr "No permitido"
 
-#: scheduler/ipp.c:1518
-#: scheduler/ipp.c:10666
 msgid "Not allowed to print."
 msgstr "No se permite imprimir."
 
-#: ppdc/sample.c:146
 msgid "Note"
 msgstr "Nota"
 
-#: systemv/cupstestdsc.c:433
-msgid "Note: this program only validates the DSC comments, not the PostScript itself."
-msgstr "Nota: este programa sólo valida los comentarios DSC, no los PostScript."
+msgid ""
+"Note: this program only validates the DSC comments, not the PostScript "
+"itself."
+msgstr ""
+"Nota: este programa sólo valida los comentarios DSC, no los PostScript."
 
-#: cups/http-support.c:1278
-#: cups/ppd.c:338
 msgid "OK"
 msgstr "OK"
 
-#: ppdc/sample.c:271
 msgid "Off (1-Sided)"
 msgstr "Desactivado (1 cara)"
 
-#: ppdc/sample.c:361
 msgid "Oki"
 msgstr "Oki"
 
-#: cgi-bin/help.c:91
-#: cgi-bin/help.c:132
-#: cgi-bin/help.c:142
-#: cgi-bin/help.c:172
 msgid "Online Help"
 msgstr "Ayuda en línea"
 
-#: cups/adminutil.c:955
 #, c-format
 msgid "Open of %s failed: %s"
 msgstr "La apertura de %s ha fallado: %s"
 
-#: cups/ppd.c:346
 msgid "OpenGroup without a CloseGroup first"
 msgstr "OpenGroup sin un CloseGroup previo"
 
-#: cups/ppd.c:348
 msgid "OpenUI/JCLOpenUI without a CloseUI/JCLCloseUI first"
 msgstr "OpenUI/JCLOpenUI sin un CloseUI/JCLCloseUI previo"
 
-#: cgi-bin/admin.c:3631
 msgid "Operation Policy"
 msgstr "Directiva de operación"
 
-#: filter/pstops.c:2205
 #, c-format
 msgid "Option \"%s\" cannot be included via %%%%IncludeFeature."
 msgstr "La opción \"%s\" no puede incluirse via %%%%IncludeFeature."
 
-#: cgi-bin/admin.c:3281
-#: cgi-bin/admin.c:3365
 msgid "Options Installed"
 msgstr "Opciones instaladas"
 
-#: scheduler/cupsfilter.c:1430
-#: scheduler/main.c:2018
-#: systemv/cupsaddsmb.c:284
-#: systemv/cupsctl.c:203
-#: systemv/cupstestdsc.c:429
-#: systemv/cupstestppd.c:3797
-#: test/ipptool.c:4403
-#: ppdc/ppdc.cxx:437
-#: ppdc/ppdhtml.cxx:174
-#: ppdc/ppdi.cxx:130
-#: ppdc/ppdmerge.cxx:369
-#: ppdc/ppdpo.cxx:254
 msgid "Options:"
 msgstr "Opciones: "
 
-#: cups/ppd-cache.c:156
 msgid "Out of date PPD cache file."
 msgstr "Archivo de caché PPD obsoleto."
 
-#: cups/ppd-cache.c:1381
 msgid "Out of memory."
 msgstr "Sin memoria."
 
-#: cups/ppd.c:795
-#: cups/ppd.c:1363
 msgid "Output Mode"
 msgstr "Modo de salida"
 
-#: systemv/lpstat.c:1191
-#: systemv/lpstat.c:1195
 #, c-format
 msgid "Output for printer %s is sent to %s"
 msgstr "La salida de la impresora %s se ha enviado a %s"
 
-#: systemv/lpstat.c:1185
 #, c-format
 msgid "Output for printer %s is sent to remote printer %s on %s"
-msgstr "La salida de la impresora %s se ha enviado a la impresora remota %s en %s"
+msgstr ""
+"La salida de la impresora %s se ha enviado a la impresora remota %s en %s"
 
-#: systemv/lpstat.c:1209
-#: systemv/lpstat.c:1213
 #, c-format
 msgid "Output for printer %s/%s is sent to %s"
 msgstr "La salida de la impresora %s/%s se ha enviado a %s"
 
-#: systemv/lpstat.c:1203
 #, c-format
 msgid "Output for printer %s/%s is sent to remote printer %s on %s"
-msgstr "La salida de la impresora %s/%s se ha enviado a la impresora remota %s en %s"
+msgstr ""
+"La salida de la impresora %s/%s se ha enviado a la impresora remota %s en %s"
 
-#: systemv/cupstestdsc.c:399
 msgid "PASS"
 msgstr "PASA"
 
-#: ppdc/sample.c:260
 msgid "PCL Laser Printer"
 msgstr "Impresora Laser PCL"
 
-#: ppdc/sample.c:149
 msgid "PRC16K"
 msgstr "PRC16K"
 
-#: ppdc/sample.c:150
 msgid "PRC16K Long Edge"
 msgstr "PRC16K lado largo"
 
-#: ppdc/sample.c:151
 msgid "PRC32K"
 msgstr "PRC32K"
 
-#: ppdc/sample.c:154
 msgid "PRC32K Long Edge"
 msgstr "PRC32K lado largo"
 
-#: ppdc/sample.c:152
 msgid "PRC32K Oversize"
 msgstr "PRC32K Extragrande"
 
-#: ppdc/sample.c:153
 msgid "PRC32K Oversize Long Edge"
 msgstr "PRC32K Extragrande lado largo"
 
-#: cups/snmp.c:1014
 msgid "Packet does not contain a Get-Response-PDU"
 msgstr "El paquete no contiene un Get-Response-PDU"
 
-#: cups/snmp.c:993
 msgid "Packet does not start with SEQUENCE"
 msgstr "El paquete no empieza por SEQUENCE"
 
-#: ppdc/sample.c:360
 msgid "ParamCustominCutInterval"
 msgstr "ParamCustominCutInterval"
 
-#: ppdc/sample.c:358
 msgid "ParamCustominTearInterval"
 msgstr "ParamCustominTearInterval"
 
-#: cups/auth.c:199
-#: cups/auth.c:367
 #, c-format
 msgid "Password for %s on %s? "
 msgstr "¿Contraseña de %s en %s? "
 
-#: systemv/cupsaddsmb.c:252
 #, c-format
 msgid "Password for %s required to access %s via SAMBA: "
 msgstr "Se requiere la contraseña de %s para acceder a %s vía SAMBA: "
 
-#: cgi-bin/classes.c:167
 msgid "Pause Class"
 msgstr "Pausar clase"
 
-#: cgi-bin/printers.c:170
 msgid "Pause Printer"
 msgstr "Pausar impresora"
 
-#: ppdc/sample.c:448
 msgid "Peel-Off"
 msgstr "Despegar"
 
-#: ppdc/sample.c:160
 msgid "Photo"
 msgstr "Foto"
 
-#: ppdc/sample.c:161
 msgid "Photo Labels"
 msgstr "Foto pequeña"
 
-#: ppdc/sample.c:286
 msgid "Plain Paper"
 msgstr "Papel normal"
 
-#: cgi-bin/admin.c:3299
-#: cgi-bin/admin.c:3580
 msgid "Policies"
 msgstr "Reglas"
 
-#: cgi-bin/admin.c:3306
-#: cgi-bin/admin.c:3649
-#: cgi-bin/admin.c:3662
 msgid "Port Monitor"
 msgstr "Monitor de puerto"
 
-#: ppdc/sample.c:278
 msgid "PostScript Printer"
 msgstr "Impresora PostScript"
 
-#: ppdc/sample.c:147
 msgid "Postcard"
 msgstr "Postal"
 
-#: ppdc/sample.c:71
 msgid "Postcard Double "
 msgstr "Postal doble"
 
-#: ppdc/sample.c:72
 msgid "Postcard Double Long Edge"
 msgstr "Postal doble lado largo"
 
-#: ppdc/sample.c:148
 msgid "Postcard Long Edge"
 msgstr "Postal lado largo"
 
-#: ppdc/sample.c:295
 msgid "Print Density"
 msgstr "Densidad de impresión"
 
-#: cups/notify.c:82
 msgid "Print Job:"
 msgstr "Imprimir trabajo:"
 
-#: ppdc/sample.c:340
 msgid "Print Mode"
 msgstr "Modo de impresión"
 
-#: ppdc/sample.c:383
 msgid "Print Rate"
 msgstr "Tasa de impresión"
 
-#: cgi-bin/printers.c:179
 msgid "Print Self-Test Page"
 msgstr "Imprimir página de auto-prueba"
 
-#: ppdc/sample.c:327
 msgid "Print Speed"
 msgstr "Velocidad de impresión"
 
-#: cgi-bin/ipp-var.c:792
 msgid "Print Test Page"
 msgstr "Imprimir página de prueba"
 
-#: ppdc/sample.c:356
 msgid "Print and Cut"
 msgstr "Imprimir y cortar"
 
-#: ppdc/sample.c:344
 msgid "Print and Tear"
 msgstr "Imprimir y romper"
 
-#: backend/ipp.c:1537
 #, c-format
 msgid "Print file accepted - job ID %d."
 msgstr "Archivo de impresión aceptado: ID de trabajo %d."
 
-#: backend/ipp.c:1527
 msgid "Print file accepted - job ID unknown."
 msgstr "Archivo de impresión aceptado: ID de trabajo desconocido."
 
-#: backend/socket.c:424
-#: backend/usb-unix.c:191
 msgid "Print file sent."
 msgstr "Archivo de impresión enviado."
 
-#: backend/ipp.c:1488
 msgid "Print file was not accepted."
 msgstr "No se ha aceptado el archivo de impresión."
 
-#: backend/ipp.c:1895
 msgid "Print job canceled at printer."
 msgstr "Trabajo de impresión cancelado en la impresora."
 
-#: backend/ipp.c:1890
 msgid "Print job too large."
 msgstr "Trabajo de impresión demasiado grande."
 
-#: cgi-bin/ipp-var.c:1047
 msgid "Printer Added"
 msgstr "Impresora añadida"
 
-#: ppdc/sample.c:263
 msgid "Printer Default"
 msgstr "Predeterminado de la impresora"
 
-#: cgi-bin/ipp-var.c:1051
 msgid "Printer Deleted"
 msgstr "Impresora borrada"
 
-#: cgi-bin/ipp-var.c:1049
 msgid "Printer Modified"
 msgstr "Impresora modificada"
 
-#: cgi-bin/ipp-var.c:1045
 msgid "Printer Paused"
 msgstr "Impresora en pausa"
 
-#: ppdc/sample.c:294
 msgid "Printer Settings"
 msgstr "Configuración de la impresora"
 
-#: backend/ipp.c:1893
 msgid "Printer cannot print supplied content."
 msgstr "La impresora no puede imprimir el contenido suministrado."
 
-#: cups/notify.c:126
 msgid "Printer:"
 msgstr "Impresora:"
 
-#: cgi-bin/printers.c:204
-#: cgi-bin/printers.c:332
 msgid "Printers"
 msgstr "Impresoras"
 
-#: filter/rastertoepson.c:1093
-#: filter/rastertohp.c:817
-#: filter/rastertolabel.c:1249
 #, c-format
 msgid "Printing page %d, %d%% complete."
 msgstr "Imprimiendo página %d, %d%% completado."
 
-#: cgi-bin/classes.c:173
-#: cgi-bin/printers.c:176
 msgid "Purge Jobs"
 msgstr "Purgar trabajos"
 
-#: ppdc/sample.c:155
 msgid "Quarto"
 msgstr "Quarto"
 
-#: scheduler/ipp.c:1513
-#: scheduler/ipp.c:10661
 msgid "Quota limit reached."
 msgstr "Se ha alcanzado el límite de cuota."
 
-#: berkeley/lpq.c:515
 msgid "Rank    Owner   Job     File(s)                         Total Size"
 msgstr "Rango  Propiet. Trabajo Archivo(s)                      Tamaño total"
 
 #. TRANSLATORS: Pri is job priority.
-#: berkeley/lpq.c:511
-msgid "Rank   Owner      Pri  Job        Files                       Total Size"
-msgstr "Rango  Propiet.   Pri  Trabajo    Archivos                    Tamaño total"
+msgid ""
+"Rank   Owner      Pri  Job        Files                       Total Size"
+msgstr ""
+"Rango  Propiet.   Pri  Trabajo    Archivos                    Tamaño total"
 
-#: cgi-bin/classes.c:171
-#: cgi-bin/printers.c:174
 msgid "Reject Jobs"
 msgstr "Rechazar trabajos"
 
-#: backend/lpd.c:1016
-#: backend/lpd.c:1148
 #, c-format
 msgid "Remote host did not accept control file (%d)."
 msgstr "El ordenador remoto no ha aceptado el archivo de control (%d)."
 
-#: backend/lpd.c:1101
 #, c-format
 msgid "Remote host did not accept data file (%d)."
 msgstr "El ordenador remoto no ha aceptado el archivo de datos (%d)."
 
-#: ppdc/sample.c:428
 msgid "Reprint After Error"
 msgstr "Volver a imprimir tras un error"
 
-#: cups/http-support.c:1312
 msgid "Request Entity Too Large"
 msgstr "La entidad requerida es demasiado larga"
 
-#: cups/ppd.c:797
-#: cups/ppd.c:1365
-#: ppdc/sample.c:231
 msgid "Resolution"
 msgstr "Resolución"
 
-#: cgi-bin/classes.c:165
 msgid "Resume Class"
 msgstr "Reanudar clase"
 
-#: cgi-bin/printers.c:167
 msgid "Resume Printer"
 msgstr "Reanudar impresora"
 
-#: ppdc/sample.c:165
 msgid "Return Address"
 msgstr "Remite"
 
-#: ppdc/sample.c:449
 msgid "Rewind"
 msgstr "Rebobinar"
 
-#: cups/adminutil.c:2052
 #, c-format
 msgid "Running command: %s %s -N -A %s -c '%s'"
 msgstr "Ejecutando comando: %s %s -N -A %s -c '%s'"
 
-#: cups/snmp.c:995
 msgid "SEQUENCE uses indefinite length"
 msgstr "SEQUENCE usa una longitud indefinida"
 
-#: cups/http-support.c:1336
 msgid "SSL/TLS Negotiation Error"
 msgstr "Error en negociación SSL/TLS"
 
-#: cups/http-support.c:1293
 msgid "See Other"
 msgstr "Ver otros"
 
-#: backend/usb-darwin.c:543
-#: backend/usb-libusb.c:273
 msgid "Sending data to printer."
 msgstr "Enviando datos a la impresora."
 
-#: cgi-bin/ipp-var.c:1061
 msgid "Server Restarted"
 msgstr "Servidor reiniciado"
 
-#: cgi-bin/ipp-var.c:1067
 msgid "Server Security Auditing"
 msgstr "Auditoría de seguridad del servidor"
 
-#: cgi-bin/ipp-var.c:1063
 msgid "Server Started"
 msgstr "Servidor iniciado"
 
-#: cgi-bin/ipp-var.c:1065
 msgid "Server Stopped"
 msgstr "Servidor parado"
 
-#: cups/http-support.c:1330
 msgid "Service Unavailable"
 msgstr "Servicio no disponible"
 
-#: cgi-bin/admin.c:2786
-#: cgi-bin/admin.c:2832
-#: cgi-bin/admin.c:2989
-#: cgi-bin/admin.c:3008
 msgid "Set Allowed Users"
 msgstr "Establecer usuarios permitidos"
 
-#: cgi-bin/admin.c:3035
 msgid "Set As Server Default"
 msgstr "Establecer como predeterminada del servidor"
 
-#: cgi-bin/admin.c:3135
 msgid "Set Class Options"
 msgstr "Cambiar opciones clase"
 
-#: cgi-bin/admin.c:3135
-#: cgi-bin/admin.c:3309
-#: cgi-bin/admin.c:3691
 msgid "Set Printer Options"
 msgstr "Cambiar opciones impresora"
 
-#: cgi-bin/admin.c:3861
-#: cgi-bin/admin.c:3905
-#: cgi-bin/admin.c:3923
 msgid "Set Publishing"
 msgstr "Hacer pública"
 
-#: ppdc/sample.c:166
 msgid "Shipping Address"
 msgstr "Dirección de envío"
 
-#: ppdc/sample.c:273
 msgid "Short-Edge (Landscape)"
 msgstr "Lado corto (apaisado)"
 
-#: ppdc/sample.c:288
 msgid "Special Paper"
 msgstr "Papel especial"
 
-#: backend/lpd.c:1057
 #, c-format
 msgid "Spooling job, %.0f%% complete."
 msgstr "Guardando trabajo en cola, %.0f%% completado."
 
-#: ppdc/sample.c:341
 msgid "Standard"
 msgstr "Estándar"
 
 #. TRANSLATORS: Banner/cover sheet before the print job.
-#: cgi-bin/admin.c:3552
 msgid "Starting Banner"
 msgstr "Rótulo inicial"
 
-#: filter/rastertoepson.c:1069
-#: filter/rastertohp.c:793
-#: filter/rastertolabel.c:1225
 #, c-format
 msgid "Starting page %d."
 msgstr "Iniciando página %d."
 
-#: ppdc/sample.c:156
 msgid "Statement"
 msgstr "Declaración"
 
-#: ppdc/sample.c:251
 msgid "Stylus Color Series"
 msgstr "Stylus Color Series"
 
-#: ppdc/sample.c:257
 msgid "Stylus Photo Series"
 msgstr "Stylus Photo Series"
 
-#: scheduler/ipp.c:3549
-#: scheduler/ipp.c:6689
-#: scheduler/ipp.c:7388
-#: scheduler/ipp.c:8887
 #, c-format
 msgid "Subscription #%d does not exist."
 msgstr "Subscripción #%d no existe."
 
-#: ppdc/sample.c:157
 msgid "Super A"
 msgstr "Super A"
 
-#: ppdc/sample.c:158
 msgid "Super B"
 msgstr "Super B (13 x 19  pulg.)"
 
-#: ppdc/sample.c:162
 msgid "Super B/A3"
 msgstr "Super B/A3"
 
-#: cups/http-support.c:1275
 msgid "Switching Protocols"
 msgstr "Protocolos de conexión"
 
-#: ppdc/sample.c:159
 msgid "Tabloid"
 msgstr "Tabloide"
 
-#: ppdc/sample.c:45
 msgid "Tabloid Oversize"
 msgstr "Tabloide Extragrande"
 
-#: ppdc/sample.c:46
 msgid "Tabloid Oversize Long Edge"
 msgstr "Tabloide Extragrande lado largo"
 
-#: ppdc/sample.c:342
 msgid "Tear"
 msgstr "Pestaña"
 
-#: ppdc/sample.c:447
 msgid "Tear-Off"
 msgstr "Pestaña desprendible"
 
-#: ppdc/sample.c:388
 msgid "Tear-Off Adjust Position"
 msgstr "Ajuste de posición de la pestaña desprendible"
 
-#: scheduler/ipp.c:6393
-#: scheduler/ipp.c:6471
-#: scheduler/ipp.c:6487
-#: scheduler/ipp.c:6505
 #, c-format
 msgid "The %s attribute cannot be provided with job-ids."
 msgstr "El atributo %s no puede ser usado con jobs-ids."
 
-#: scheduler/ipp.c:5118
 #, c-format
-msgid "The '%s' operation attribute cannot be supplied in a Create-Job request."
-msgstr "El atributo de operación '%s' no puede ser suministrado en una petición Create-Job."
+msgid ""
+"The '%s' Job Description attribute cannot be supplied in a job creation "
+"request."
+msgstr ""
+
+#, c-format
+msgid ""
+"The '%s' operation attribute cannot be supplied in a Create-Job request."
+msgstr ""
+"El atributo de operación '%s' no puede ser suministrado en una petición "
+"Create-Job."
 
-#: scheduler/ipp.c:6919
 #, c-format
 msgid "The PPD file \"%s\" could not be found."
 msgstr "No se ha podido encontrar el archivo PPD \"%s\"."
 
-#: scheduler/ipp.c:6906
 #, c-format
 msgid "The PPD file \"%s\" could not be opened: %s"
 msgstr "No se ha podido abrir el archivo PPD \"%s\": %s"
 
-#: filter/rastertoepson.c:1038
-#: filter/rastertohp.c:764
-#: filter/rastertolabel.c:1189
 msgid "The PPD file could not be opened."
 msgstr "No se ha podido abrir el archivo PPD."
 
-#: cgi-bin/admin.c:749
-msgid "The class name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#)."
-msgstr "El nombre de la clase sólo puede contener hasta 127 caracteres imprimibles y no puede contener espacios, barras (/), o la almohadilla (#)."
+msgid ""
+"The class name may only contain up to 127 printable characters and may not "
+"contain spaces, slashes (/), or the pound sign (#)."
+msgstr ""
+"El nombre de la clase sólo puede contener hasta 127 caracteres imprimibles y "
+"no puede contener espacios, barras (/), o la almohadilla (#)."
 
-#: cups/localize.c:353
 msgid "The developer unit needs to be replaced."
 msgstr "La unidad de revelado debe ser reemplazada"
 
-#: cups/localize.c:351
 msgid "The developer unit will need to be replaced soon."
 msgstr "La unidad de revelado necesitará ser cambiada pronto."
 
-#: cups/localize.c:343
 msgid "The fuser's temperature is high."
 msgstr "Temperatura del fusor alta"
 
-#: cups/localize.c:345
 msgid "The fuser's temperature is low."
 msgstr "Temperatura del fusor baja"
 
-#: scheduler/ipp.c:2097
-msgid "The notify-lease-duration attribute cannot be used with job subscriptions."
-msgstr "El atributo notify-lease-duration no puede ser usado con subscripciones de trabajos."
+msgid ""
+"The notify-lease-duration attribute cannot be used with job subscriptions."
+msgstr ""
+"El atributo notify-lease-duration no puede ser usado con subscripciones de "
+"trabajos."
 
-#: scheduler/ipp.c:2080
-#: scheduler/ipp.c:5653
 #, c-format
 msgid "The notify-user-data value is too large (%d > 63 octets)."
 msgstr "El valor notify-user-data es demasiado grande (%d > 63 octetos)."
 
-#: cups/localize.c:349
 msgid "The optical photoconductor needs to be replaced."
 msgstr "El fotoconductor óptico necesita ser cambiado."
 
-#: cups/localize.c:347
 msgid "The optical photoconductor will need to be replaced soon."
 msgstr "El fotoconductor óptico necesitará ser cambiado pronto."
 
-#: cups/localize.c:331
 msgid "The output bin is almost full."
 msgstr "Recipiente de salida casi lleno"
 
-#: cups/localize.c:333
 msgid "The output bin is full."
 msgstr "Bandeja de salida llena."
 
-#: cups/localize.c:329
 msgid "The output bin is missing."
 msgstr "Falta la bandeja de salida."
 
-#: cups/localize.c:325
 msgid "The paper tray is almost empty."
 msgstr "Bandeja de papel casi vacía."
 
-#: cups/localize.c:327
 msgid "The paper tray is empty."
 msgstr "Bandeja de papel vacía."
 
-#: cups/localize.c:323
 msgid "The paper tray is missing."
 msgstr "Falta la bandeja de papel."
 
-#: cups/localize.c:306
 msgid "The paper tray needs to be filled."
 msgstr "Hay que poner papel en la bandeja."
 
-#: backend/ipp.c:909
 msgid "The printer URI is incorrect or no longer exists."
 msgstr "El URI de la impresora es incorrecto o ya no existe."
 
-#: backend/lpd.c:619
-#: backend/lpd.c:1009
-#: backend/lpd.c:1091
-#: backend/lpd.c:1141
 msgid "The printer did not respond."
 msgstr "La impresora no respondió."
 
-#: backend/ipp.c:892
-#: backend/ipp.c:899
 #, c-format
 msgid "The printer does not support IPP/%d.%d, trying IPP/%s."
 msgstr "La impresora no es compatible con IPP/%d.%d, probando IPP/%s."
 
-#: backend/ipp.c:757
-#: backend/ipp.c:874
-#: backend/ipp.c:980
-#: backend/ipp.c:1313
-#: backend/ipp.c:1464
-#: backend/lpd.c:828
-#: backend/socket.c:374
-#: backend/usb-unix.c:131
-#: backend/usb-unix.c:424
-#: backend/usb-unix.c:507
 msgid "The printer is in use."
 msgstr "La impresora está en uso."
 
-#: backend/runloop.c:254
-#: backend/runloop.c:374
-#: cups/localize.c:311
 msgid "The printer is not connected."
 msgstr "La impresora no está conectada."
 
-#: backend/ipp.c:735
-#: backend/ipp.c:768
-#: backend/ipp.c:870
-#: backend/lpd.c:807
-#: backend/lpd.c:848
-#: backend/socket.c:353
-#: backend/socket.c:386
 msgid "The printer is not responding."
 msgstr "La impresora no responde."
 
-#: backend/runloop.c:396
 msgid "The printer is now connected."
 msgstr "La impresora está ahora conectada."
 
-#: backend/usb-darwin.c:1286
 msgid "The printer is now online."
 msgstr "La impresora está ahora en línea."
 
-#: backend/usb-darwin.c:1307
 msgid "The printer is offline."
 msgstr "La impresora está fuera de línea."
 
-#: cups/localize.c:335
 msgid "The printer is running low on ink."
 msgstr "La impresora está funcionando con poca tinta."
 
-#: cups/localize.c:313
 msgid "The printer is running low on toner."
 msgstr "La impresora está funcionando con poco toner."
 
-#: backend/ipp.c:750
-#: backend/lpd.c:821
-#: backend/socket.c:367
 msgid "The printer is unreachable at this time."
 msgstr "La impresora es inalcanzable en este momento."
 
-#: cups/localize.c:337
 msgid "The printer may be out of ink."
 msgstr "La impresora puede que no tenga tinta."
 
-#: cups/localize.c:315
 msgid "The printer may be out of toner."
 msgstr "La impresora puede que esté sin toner."
 
-#: backend/ipp.c:744
-#: backend/lpd.c:815
-#: backend/socket.c:361
 msgid "The printer may not exist or is unavailable at this time."
 msgstr "La impresora puede no existir o no estar disponible en este momento."
 
-#: cgi-bin/admin.c:931
-msgid "The printer name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#)."
-msgstr "El nombre de la impresora sólo puede contener hasta 127 caracteres imprimibles y no puede contener espacios, barras (/), o la almohadilla (#)."
-
-#: scheduler/ipp.c:876
-#: scheduler/ipp.c:1136
-#: scheduler/ipp.c:3198
-#: scheduler/ipp.c:3369
-#: scheduler/ipp.c:5101
-#: scheduler/ipp.c:5487
-#: scheduler/ipp.c:5801
-#: scheduler/ipp.c:6359
-#: scheduler/ipp.c:7124
-#: scheduler/ipp.c:7180
-#: scheduler/ipp.c:7494
-#: scheduler/ipp.c:7760
-#: scheduler/ipp.c:7849
-#: scheduler/ipp.c:7882
-#: scheduler/ipp.c:8205
-#: scheduler/ipp.c:8598
-#: scheduler/ipp.c:8679
-#: scheduler/ipp.c:9840
-#: scheduler/ipp.c:10294
-#: scheduler/ipp.c:10624
-#: scheduler/ipp.c:10706
-#: scheduler/ipp.c:10998
+msgid ""
+"The printer name may only contain up to 127 printable characters and may not "
+"contain spaces, slashes (/), or the pound sign (#)."
+msgstr ""
+"El nombre de la impresora sólo puede contener hasta 127 caracteres "
+"imprimibles y no puede contener espacios, barras (/), o la almohadilla (#)."
+
 msgid "The printer or class does not exist."
 msgstr "La impresora o clase no existe."
 
-#: scheduler/ipp.c:1304
 msgid "The printer or class is not shared."
 msgstr "La impresora o clase no está compartida."
 
-#: cups/localize.c:317
 msgid "The printer's cover is open."
 msgstr "La tapa de la impresora está abierta."
 
-#: cups/localize.c:321
 msgid "The printer's door is open."
 msgstr "La puerta de la impresora está abierta."
 
-#: cups/localize.c:319
 msgid "The printer's interlock is open."
 msgstr "El dispositivo de seguridad de la impresora está abierto."
 
-#: cups/localize.c:339
 msgid "The printer's waste bin is almost full."
 msgstr "Recipiente de residuos de la impresora está casi lleno."
 
-#: cups/localize.c:341
 msgid "The printer's waste bin is full."
 msgstr "Recipiente de residuos de la impresora está lleno."
 
-#: scheduler/ipp.c:982
-#: scheduler/ipp.c:2261
 #, c-format
 msgid "The printer-uri \"%s\" contains invalid characters."
 msgstr "El printer-uri \"%s\" contiene caracteres no válidos."
 
-#: scheduler/ipp.c:3175
 msgid "The printer-uri attribute is required."
 msgstr "Se necesita el atributo printer-uri."
 
-#: scheduler/ipp.c:966
-msgid "The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"."
-msgstr "El printer-uri debe ser de la forma \"ipp://NOMBRE_ORDENADOR/classes/NOMBRE_CLASE\"."
+msgid ""
+"The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"."
+msgstr ""
+"El printer-uri debe ser de la forma \"ipp://NOMBRE_ORDENADOR/classes/"
+"NOMBRE_CLASE\"."
 
-#: scheduler/ipp.c:2245
-msgid "The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"."
-msgstr "El printer-uri debe ser de la forma \"ipp://NOMBRE_ORDENADOR/printers/NOMBRE_IMPRESORA\"."
+msgid ""
+"The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"."
+msgstr ""
+"El printer-uri debe ser de la forma \"ipp://NOMBRE_ORDENADOR/printers/"
+"NOMBRE_IMPRESORA\"."
 
-#: cgi-bin/admin.c:474
-msgid "The subscription name may not contain spaces, slashes (/), question marks (?), or the pound sign (#)."
-msgstr "El nombre de la subscripción no puede contener espacios, barras (/), signos de interrogación (?), o la almohadilla (#)."
+msgid ""
+"The subscription name may not contain spaces, slashes (/), question marks "
+"(?), or the pound sign (#)."
+msgstr ""
+"El nombre de la subscripción no puede contener espacios, barras (/), signos "
+"de interrogación (?), o la almohadilla (#)."
 
-#: scheduler/client.c:2450
-msgid "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to enable it."
-msgstr "La interfaz web está desactivada en este momento. Ejecute \"cupsctl WebInterface=yes\" para activarla."
+msgid ""
+"The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to "
+"enable it."
+msgstr ""
+"La interfaz web está desactivada en este momento. Ejecute \"cupsctl "
+"WebInterface=yes\" para activarla."
 
-#: scheduler/ipp.c:6454
 #, c-format
 msgid "The which-jobs value \"%s\" is not supported."
 msgstr "No se admite el uso del valor which-jobs \"%s\"."
 
-#: scheduler/ipp.c:5731
 msgid "There are too many subscriptions."
 msgstr "Hay demasiadas subscripciones."
 
-#: cups/localize.c:308
 msgid "There is a paper jam."
 msgstr "Hay un atasco de papel."
 
-#: backend/usb-darwin.c:379
-#: backend/usb-darwin.c:438
-#: backend/usb-darwin.c:505
-#: backend/usb-darwin.c:526
-#: backend/usb-libusb.c:235
-#: backend/usb-libusb.c:256
 msgid "There was an unrecoverable USB error."
 msgstr "Ha habido un error USB irrecuperable."
 
-#: ppdc/sample.c:435
 msgid "Thermal Transfer Media"
 msgstr "Soporte de transferencia térmica"
 
-#: scheduler/ipp.c:1507
 msgid "Too many active jobs."
 msgstr "Demasiados trabajos activos."
 
-#: scheduler/ipp.c:1401
 #, c-format
 msgid "Too many job-sheets values (%d > 2)."
 msgstr "Demasiados valores de job-sheets (%d > 2)."
 
-#: scheduler/ipp.c:2529
 #, c-format
 msgid "Too many printer-state-reasons values (%d > %d)."
 msgstr "Demasiados valores printer-state-reasons (%d > %d)."
 
-#: ppdc/sample.c:289
 msgid "Transparency"
 msgstr "Transparencia"
 
-#: ppdc/sample.c:284
 msgid "Tray"
 msgstr "Bandeja"
 
-#: ppdc/sample.c:264
 msgid "Tray 1"
 msgstr "Bandeja 1"
 
-#: ppdc/sample.c:265
 msgid "Tray 2"
 msgstr "Bandeja 2"
 
-#: ppdc/sample.c:266
 msgid "Tray 3"
 msgstr "Bandeja 3"
 
-#: ppdc/sample.c:267
 msgid "Tray 4"
 msgstr "Bandeja 4"
 
-#: cups/http-support.c:1315
 msgid "URI Too Long"
 msgstr "URI demasiado largo"
 
-#: ppdc/sample.c:138
 msgid "US Ledger"
 msgstr "Libro Mayor, 17 x 11 pulg."
 
-#: ppdc/sample.c:139
 msgid "US Legal"
 msgstr "Legal EE.UU."
 
-#: ppdc/sample.c:140
 msgid "US Legal Oversize"
 msgstr "Legal EE.UU. Extragrande"
 
-#: ppdc/sample.c:141
 msgid "US Letter"
 msgstr "Carta EE.UU."
 
-#: ppdc/sample.c:142
 msgid "US Letter Long Edge"
 msgstr "Carta EE.UU. lado largo"
 
-#: ppdc/sample.c:143
 msgid "US Letter Oversize"
 msgstr "Carta EE.UU. Extragrande"
 
-#: ppdc/sample.c:144
 msgid "US Letter Oversize Long Edge"
 msgstr "Carta EE.UU. Extragrande lado largo"
 
-#: ppdc/sample.c:145
 msgid "US Letter Small"
 msgstr "Carta EE.UU. Pequeña"
 
-#: cgi-bin/admin.c:1959
-#: cgi-bin/admin.c:1972
-#: cgi-bin/admin.c:1996
 msgid "Unable to access cupsd.conf file"
 msgstr "No se ha podido acceder al archivo cupsd.conf"
 
-#: cgi-bin/help.c:133
 msgid "Unable to access help file."
 msgstr "No se ha podido acceder al archivo de ayuda."
 
-#: cgi-bin/admin.c:526
 msgid "Unable to add RSS subscription"
 msgstr "No se ha podido añadir la subscripción RSS"
 
-#: cgi-bin/admin.c:814
 msgid "Unable to add class"
 msgstr "No se ha podido añadir la clase"
 
-#: backend/ipp.c:1635
 msgid "Unable to add document to print job."
 msgstr "No se ha podido añadir el documento al trabajo de impresión."
 
-#: scheduler/ipp.c:1548
 #, c-format
 msgid "Unable to add job for destination \"%s\"."
 msgstr "No se ha podido añadir el trabajo para el destino \"%s\"."
 
-#: cgi-bin/admin.c:1059
-#: cgi-bin/admin.c:1419
 msgid "Unable to add printer"
 msgstr "No se ha podido añadir la impresora"
 
-#: scheduler/ipp.c:1246
 msgid "Unable to allocate memory for file types."
 msgstr "No se ha podido reservar memoria para tipos de archivo."
 
-#: filter/pstops.c:451
 msgid "Unable to allocate memory for page info"
 msgstr "No se ha podido reservar memoria para la información de página."
 
-#: filter/pstops.c:445
 msgid "Unable to allocate memory for pages array"
 msgstr "No se ha podido reservar memoria para la secuencia de páginas"
 
-#: cgi-bin/admin.c:1525
 msgid "Unable to cancel RSS subscription"
 msgstr "No se ha podido cancelar la subscripción RSS"
 
-#: backend/ipp.c:1942
 msgid "Unable to cancel print job."
 msgstr "No se ha podido cancelar el trabajo de impresión."
 
-#: cgi-bin/admin.c:2990
 msgid "Unable to change printer"
 msgstr "No se ha podido cambiar la impresora"
 
-#: cgi-bin/admin.c:3906
 msgid "Unable to change printer-is-shared attribute"
 msgstr "No se ha podido cambiar el atributo printer-is-shared"
 
-#: cgi-bin/admin.c:1657
-#: cgi-bin/admin.c:1799
 msgid "Unable to change server settings"
 msgstr "No se ha podido cambiar la configuración del servidor"
 
-#: filter/commandtops.c:420
 msgid "Unable to configure printer options."
 msgstr "No se han podido configurar las opciones de impresión."
 
-#: cups/adminutil.c:911
-#: cups/request.c:1016
 msgid "Unable to connect to host."
 msgstr "No se ha podido conectar al servidor."
 
-#: backend/ipp.c:713
-#: backend/ipp.c:1138
-#: backend/lpd.c:787
-#: backend/socket.c:333
-#: backend/usb-unix.c:117
 msgid "Unable to contact printer, queuing on next printer in class."
-msgstr "No se ha podido contactar con la impresora; poniendo en cola en la siguiente impresora de la clase."
+msgstr ""
+"No se ha podido contactar con la impresora; poniendo en cola en la siguiente "
+"impresora de la clase."
 
-#: cups/adminutil.c:726
 #, c-format
 msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
-msgstr "No se han podido copiar los archivos del controlador de impresora de 64-bit de CUPS (%d)."
+msgstr ""
+"No se han podido copiar los archivos del controlador de impresora de 64-bit "
+"de CUPS (%d)."
 
-#: cups/adminutil.c:691
 #, c-format
 msgid "Unable to copy 64-bit Windows printer driver files (%d)."
-msgstr "No se han podido copiar los archivos del controlador de impresora de 64-bit de Windows (%d)."
+msgstr ""
+"No se han podido copiar los archivos del controlador de impresora de 64-bit "
+"de Windows (%d)."
 
-#: cups/adminutil.c:522
 #, c-format
 msgid "Unable to copy CUPS printer driver files (%d)."
-msgstr "No se han podido copiar los archivos del controlador de impresora de CUPS (%d)."
+msgstr ""
+"No se han podido copiar los archivos del controlador de impresora de CUPS "
+"(%d)."
 
-#: scheduler/ipp.c:2649
 #, c-format
 msgid "Unable to copy PPD file - %s"
 msgstr "No se ha podido copiar el archivo PPD - %s"
 
-#: scheduler/ipp.c:2704
 msgid "Unable to copy PPD file."
 msgstr "No se ha podido copiar el archivo PPD."
 
-#: cups/adminutil.c:487
 #, c-format
 msgid "Unable to copy Windows 2000 printer driver files (%d)."
-msgstr "No se han podido copiar los archivos del controlador de impresora de Windows 2000 (%d)."
+msgstr ""
+"No se han podido copiar los archivos del controlador de impresora de Windows "
+"2000 (%d)."
 
-#: cups/adminutil.c:610
 #, c-format
 msgid "Unable to copy Windows 9x printer driver files (%d)."
-msgstr "No se han podido copiar los archivos del controlador de impresora de Windows 9x (%d)."
+msgstr ""
+"No se han podido copiar los archivos del controlador de impresora de Windows "
+"9x (%d)."
 
-#: scheduler/ipp.c:2626
 #, c-format
 msgid "Unable to copy interface script - %s"
 msgstr "No se ha podido copiar el script de interfaz - %s"
 
-#: backend/ipp.c:2034
 msgid "Unable to create compressed print file"
 msgstr "No se ha podido crear el archivo de impresión comprimido"
 
-#: cups/util.c:602
-#: cups/util.c:1656
 msgid "Unable to create printer-uri"
 msgstr "No se ha podido crear printer-uri"
 
-#: cgi-bin/admin.c:1850
-#: cgi-bin/admin.c:1862
-#: scheduler/cupsfilter.c:1236
 msgid "Unable to create temporary file"
 msgstr "No se ha podido crear el archivo temporal"
 
-#: cgi-bin/admin.c:2153
 msgid "Unable to delete class"
 msgstr "No se ha podido borrar la clase"
 
-#: cgi-bin/admin.c:2238
 msgid "Unable to delete printer"
 msgstr "No se ha podido borrar la impresora"
 
-#: cgi-bin/classes.c:260
-#: cgi-bin/printers.c:269
 msgid "Unable to do maintenance command"
 msgstr "No se ha podido realizar el comando de mantenimiento"
 
-#: cgi-bin/admin.c:1974
 msgid "Unable to edit cupsd.conf files larger than 1MB"
 msgstr "No se pueden editar archivos cupsd.conf mayores de 1MB"
 
-#: cups/http.c:4272
-msgid "Unable to establish a secure connection to host (certificate chain invalid)."
-msgstr "No se ha podido establecer una conexión segura con el servidor (cadena certificado incorrecta)."
+msgid ""
+"Unable to establish a secure connection to host (certificate chain invalid)."
+msgstr ""
+"No se ha podido establecer una conexión segura con el servidor (cadena "
+"certificado incorrecta)."
 
-#: cups/http.c:4262
-msgid "Unable to establish a secure connection to host (certificate not yet valid)."
-msgstr "No se ha podido establecer una conexión segura con el servidor (el certificado aún no es válido)."
+msgid ""
+"Unable to establish a secure connection to host (certificate not yet valid)."
+msgstr ""
+"No se ha podido establecer una conexión segura con el servidor (el "
+"certificado aún no es válido)."
 
-#: cups/http.c:4257
 msgid "Unable to establish a secure connection to host (expired certificate)."
-msgstr "No se ha podido establecer una conexión segura con el servidor (certificado caducado)."
+msgstr ""
+"No se ha podido establecer una conexión segura con el servidor (certificado "
+"caducado)."
 
-#: cups/http.c:4267
 msgid "Unable to establish a secure connection to host (host name mismatch)."
-msgstr "No se ha podido establecer una conexión segura con el servidor (el nombre de ordenador no coincide)."
+msgstr ""
+"No se ha podido establecer una conexión segura con el servidor (el nombre de "
+"ordenador no coincide)."
 
-#: cups/http.c:4277
-msgid "Unable to establish a secure connection to host (peer dropped connection before responding)."
-msgstr "No se ha podido establecer una conexión segura con el servidor (el par cortó la conexión antes de responder)."
+msgid ""
+"Unable to establish a secure connection to host (peer dropped connection "
+"before responding)."
+msgstr ""
+"No se ha podido establecer una conexión segura con el servidor (el par cortó "
+"la conexión antes de responder)."
 
-#: cups/http.c:4252
-msgid "Unable to establish a secure connection to host (self-signed certificate)."
-msgstr "No se ha podido establecer una conexión segura con el servidor (certificado auto-firmado)."
+msgid ""
+"Unable to establish a secure connection to host (self-signed certificate)."
+msgstr ""
+"No se ha podido establecer una conexión segura con el servidor (certificado "
+"auto-firmado)."
 
-#: cups/http.c:4247
-msgid "Unable to establish a secure connection to host (untrusted certificate)."
-msgstr "No se ha podido establecer una conexión segura con el servidor (certificado no seguro)."
+msgid ""
+"Unable to establish a secure connection to host (untrusted certificate)."
+msgstr ""
+"No se ha podido establecer una conexión segura con el servidor (certificado "
+"no seguro)."
 
-#: cups/http.c:4008
-#: cups/http.c:4304
-#: cups/http.c:4337
-#: cups/http.c:4354
 msgid "Unable to establish a secure connection to host."
 msgstr "No se ha podido establecer una conexión segura al servidor."
 
-#: cgi-bin/ipp-var.c:365
 msgid "Unable to find destination for job"
 msgstr "No se ha podido encontrar destino para el trabajo"
 
-#: cups/http-support.c:1748
 msgid "Unable to find printer."
 msgstr "No se ha podido encontrar la impresora."
 
-#: backend/ipp.c:2056
 msgid "Unable to generate compressed print file"
 msgstr "No se ha podido crear el archivo de impresión comprimido"
 
-#: backend/ipp.c:3009
 msgid "Unable to get backend exit status."
 msgstr "No se ha podido obtener el estado de salida del programa backend"
 
-#: cgi-bin/classes.c:450
 msgid "Unable to get class list"
 msgstr "No se ha podido obtener la lista de clases"
 
-#: cgi-bin/classes.c:549
 msgid "Unable to get class status"
 msgstr "No se ha podido obtener el estado de la clase"
 
-#: cgi-bin/admin.c:1320
 msgid "Unable to get list of printer drivers"
 msgstr "No se ha podido obtener la lista de controladores de impresora"
 
-#: cgi-bin/admin.c:2840
 msgid "Unable to get printer attributes"
 msgstr "No se han podido obtener los atributos de la impresora"
 
-#: cgi-bin/printers.c:467
 msgid "Unable to get printer list"
 msgstr "No se ha podido obtener la lista de impresoras"
 
-#: cgi-bin/printers.c:569
 msgid "Unable to get printer status"
 msgstr "No se ha podido obtener el estado de la impresora"
 
-#: backend/ipp.c:933
 msgid "Unable to get printer status."
 msgstr "No se ha podido obtener el estado de la impresora."
 
-#: cups/adminutil.c:565
-#: cups/adminutil.c:769
 #, c-format
 msgid "Unable to install Windows 2000 printer driver files (%d)."
-msgstr "No se han podido instalar los archivos del controlador de impresora de Windows 2000 (%d)."
+msgstr ""
+"No se han podido instalar los archivos del controlador de impresora de "
+"Windows 2000 (%d)."
 
-#: cups/adminutil.c:639
 #, c-format
 msgid "Unable to install Windows 9x printer driver files (%d)."
-msgstr "No se han podido instalar los archivos del controlador de impresora de Windows 9x (%d)."
+msgstr ""
+"No se han podido instalar los archivos del controlador de impresora de "
+"Windows 9x (%d)."
 
-#: cgi-bin/help.c:92
 msgid "Unable to load help index."
 msgstr "No se ha podido cargar el índice de ayuda."
 
-#: backend/ipp.c:642
-#: backend/lpd.c:421
-#: backend/socket.c:275
 #, c-format
 msgid "Unable to locate printer \"%s\"."
 msgstr "No se ha podido localizar la impresora \"%s\"."
 
-#: backend/dnssd.c:781
-#: backend/ipp.c:324
-#: backend/lpd.c:204
-#: backend/socket.c:171
 msgid "Unable to locate printer."
 msgstr "No se ha podido localizar la impresora."
 
-#: cgi-bin/admin.c:813
 msgid "Unable to modify class"
 msgstr "No se ha podido modificar la clase"
 
-#: cgi-bin/admin.c:1058
-#: cgi-bin/admin.c:1418
 msgid "Unable to modify printer"
 msgstr "No se ha podido modificar la impresora"
 
-#: cgi-bin/ipp-var.c:432
-#: cgi-bin/ipp-var.c:521
 msgid "Unable to move job"
 msgstr "No se ha podido mover el trabajo"
 
-#: cgi-bin/ipp-var.c:434
-#: cgi-bin/ipp-var.c:523
 msgid "Unable to move jobs"
 msgstr "No se han podido mover los trabajos"
 
-#: cgi-bin/admin.c:3186
-#: cups/ppd.c:339
 msgid "Unable to open PPD file"
 msgstr "No se ha podido abrir el archivo PPD"
 
-#: backend/ipp.c:2040
 msgid "Unable to open compressed print file"
 msgstr "No se ha podido abrir el archivo de impresión comprimido"
 
-#: cgi-bin/admin.c:2608
 msgid "Unable to open cupsd.conf file:"
 msgstr "No se ha podido abrir el archivo cupsd.conf:"
 
-#: backend/usb-unix.c:141
 msgid "Unable to open device file"
 msgstr "No se ha podido abrir el archivo de dispositivo"
 
-#: scheduler/ipp.c:6140
 #, c-format
 msgid "Unable to open document #%d in job #%d."
 msgstr "No se ha podido abrir el documento #%d del trabajo #%d."
 
-#: cgi-bin/help.c:364
 msgid "Unable to open help file."
 msgstr "No se ha podido abrir el archivo de ayuda."
 
-#: backend/ipp.c:365
-#: backend/ipp.c:1398
-#: backend/ipp.c:1594
-#: backend/ipp.c:2046
-#: backend/lpd.c:488
-#: backend/socket.c:158
-#: backend/usb.c:237
-#: filter/gziptoany.c:71
-#: filter/pstops.c:300
 msgid "Unable to open print file"
 msgstr "No se ha podido abrir el archivo de impresión"
 
-#: filter/rastertoepson.c:998
-#: filter/rastertohp.c:724
-#: filter/rastertolabel.c:1147
 msgid "Unable to open raster file"
 msgstr "No se ha podido abrir el archivo de trama de datos (raster)"
 
-#: cgi-bin/ipp-var.c:795
 msgid "Unable to print test page"
 msgstr "No se ha podido imprimir la página de prueba"
 
-#: backend/runloop.c:96
-#: backend/runloop.c:325
-#: backend/usb-darwin.c:613
-#: backend/usb-darwin.c:657
-#: backend/usb-libusb.c:343
-#: backend/usb-libusb.c:378
 msgid "Unable to read print data."
 msgstr "No se han podido leer los datos de impresión."
 
-#: cups/dest.c:3402
 msgid "Unable to resolve printer URI."
 msgstr "No se ha podido resolver el URI de la impresora."
 
-#: cups/adminutil.c:2088
 #, c-format
 msgid "Unable to run \"%s\": %s"
 msgstr "No se ha podido ejecutar \"%s\": %s"
 
-#: filter/pstops.c:563
 msgid "Unable to see in file"
 msgstr "No se ha podido mirar en el archivo"
 
-#: cgi-bin/ipp-var.c:598
-#: cgi-bin/ipp-var.c:618
 msgid "Unable to send command to printer driver"
 msgstr "No se ha podido enviar un comando al controlador de la impresora"
 
-#: backend/usb-darwin.c:735
-#: backend/usb-libusb.c:454
 msgid "Unable to send data to printer."
 msgstr "No se han podido enviar datos a la impresora."
 
-#: cups/adminutil.c:821
 #, c-format
 msgid "Unable to set Windows printer driver (%d)."
-msgstr "No se ha podido configurar el controlador de impresora de Windows (%d)."
+msgstr ""
+"No se ha podido configurar el controlador de impresora de Windows (%d)."
 
-#: cgi-bin/admin.c:3807
 msgid "Unable to set options"
 msgstr "No se han podido cambiar las opciones"
 
-#: cgi-bin/admin.c:3077
 msgid "Unable to set server default"
 msgstr "No se ha podido establecer el servidor predeterminado"
 
-#: backend/ipp.c:2868
-#: backend/ipp.c:2945
-#: backend/ipp.c:2953
 msgid "Unable to start backend process."
 msgstr "No se ha podido iniciar el proceso backend."
 
-#: cgi-bin/admin.c:1912
 msgid "Unable to upload cupsd.conf file"
 msgstr "No se ha podido enviar el archivo cupsd.conf"
 
-#: backend/usb-darwin.c:1985
-#: backend/usb-darwin.c:2009
 msgid "Unable to use legacy USB class driver."
-msgstr "No se ha podido usar el controlador de dispositivo de clase USB obsoleto."
+msgstr ""
+"No se ha podido usar el controlador de dispositivo de clase USB obsoleto."
 
-#: backend/runloop.c:125
-#: backend/runloop.c:380
 msgid "Unable to write print data"
 msgstr "No se han podido escribir los datos de impresión"
 
-#: filter/gziptoany.c:90
 #, c-format
 msgid "Unable to write uncompressed print data: %s"
 msgstr "No se han podido escribir los datos de impresión sin comprimir: %s"
 
-#: cups/http-support.c:1303
 msgid "Unauthorized"
 msgstr "No autorizado"
 
-#: cgi-bin/admin.c:3503
 msgid "Units"
 msgstr "Unidades"
 
-#: cups/http-support.c:1343
-#: cups/ppd.c:366
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: filter/pstops.c:2213
 #, c-format
 msgid "Unknown choice \"%s\" for option \"%s\"."
 msgstr "Preferencia \"%s\" desconocida para la opción \"%s\"."
 
-#: backend/ipp.c:507
 #, c-format
 msgid "Unknown encryption option value: \"%s\"."
 msgstr "Valor de opción de cifrado \"%s\" desconocida."
 
-#: backend/lpd.c:350
 #, c-format
 msgid "Unknown file order: \"%s\"."
 msgstr "Orden de archivos \"%s\" desconocido."
 
-#: backend/lpd.c:321
 #, c-format
 msgid "Unknown format character: \"%c\"."
 msgstr "Carácter de formato \"%c\" desconocido."
 
-#: cups/dest-options.c:770
 msgid "Unknown media size name."
 msgstr "Nombre de tamaño de papel desconocido."
 
-#: backend/ipp.c:554
 #, c-format
 msgid "Unknown option \"%s\" with value \"%s\"."
 msgstr "Opción \"%s\" con valor \"%s\" desconocida."
 
-#: filter/pstops.c:2196
 #, c-format
 msgid "Unknown option \"%s\"."
 msgstr "Opción \"%s\" desconocida"
 
-#: backend/lpd.c:336
 #, c-format
 msgid "Unknown print mode: \"%s\"."
 msgstr "Modo de impresión \"%s\" desconocido."
 
-#: scheduler/ipp.c:10496
 #, c-format
 msgid "Unknown printer-error-policy \"%s\"."
 msgstr "printer-error-policy \"%s\" incorrecto."
 
-#: scheduler/ipp.c:10479
 #, c-format
 msgid "Unknown printer-op-policy \"%s\"."
 msgstr "printer-op-policy \"%s\" incorrecto."
 
-#: cups/http-addrlist.c:710
 msgid "Unknown service name."
 msgstr "Nombre de servicio desconocido."
 
-#: backend/ipp.c:526
 #, c-format
 msgid "Unknown version option value: \"%s\"."
 msgstr "Valor de opción de versión \"%s\" desconocida."
 
-#: scheduler/ipp.c:402
+#, c-format
+msgid "Unsupported 'compression' value \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unsupported 'document-format' value \"%s\"."
+msgstr ""
+
+msgid "Unsupported 'job-name' value."
+msgstr ""
+
 #, c-format
 msgid "Unsupported character set \"%s\"."
 msgstr "Juego de caracteres \"%s\" no permitido."
 
-#: scheduler/ipp.c:8171
-#: scheduler/ipp.c:9401
-#: scheduler/ipp.c:10950
 #, c-format
 msgid "Unsupported compression \"%s\"."
 msgstr "Compresión \"%s\" no permitida."
 
-#: scheduler/ipp.c:8305
-#: scheduler/ipp.c:9551
-#: scheduler/ipp.c:10979
 #, c-format
 msgid "Unsupported document-format \"%s\"."
 msgstr "document-format \"%s\" no permitido."
 
-#: scheduler/ipp.c:9534
 #, c-format
 msgid "Unsupported document-format \"%s/%s\"."
 msgstr "document-format \"%s/%s\" no permitido."
 
-#: scheduler/ipp.c:1367
 #, c-format
 msgid "Unsupported format \"%s\"."
 msgstr "Formato \"%s\" no permitido."
 
-#: scheduler/ipp.c:1465
 msgid "Unsupported margins."
 msgstr "Márgenes no permitidos."
 
-#: cups/pwg-media.c:529
 msgid "Unsupported media value."
 msgstr "Valor del medio no permitido."
 
-#: filter/pstops.c:2478
 #, c-format
 msgid "Unsupported number-up value %d, using number-up=1."
-msgstr "Valor de number-up (páginas por hoja) %d no permitido; usando number-up=1."
+msgstr ""
+"Valor de number-up (páginas por hoja) %d no permitido; usando number-up=1."
 
-#: filter/pstops.c:2512
 #, c-format
 msgid "Unsupported number-up-layout value %s, using number-up-layout=lrtb."
-msgstr "Valor de number-up-layout (disposición de páginas por hoja) %s no permitido; usando number-up-layout=lrtb."
+msgstr ""
+"Valor de number-up-layout (disposición de páginas por hoja) %s no permitido; "
+"usando number-up-layout=lrtb."
 
-#: filter/pstops.c:2563
 #, c-format
 msgid "Unsupported page-border value %s, using page-border=none."
-msgstr "Valor de page-border (borde de página) %s no permitido; usando page-border=none (ninguno)."
+msgstr ""
+"Valor de page-border (borde de página) %s no permitido; usando page-"
+"border=none (ninguno)."
 
-#: filter/rastertopwg.c:147
-#: filter/rastertopwg.c:155
-#: filter/rastertopwg.c:164
 msgid "Unsupported raster data."
 msgstr "Trama de datos no permitidos."
 
-#: cups/snmp.c:1112
 msgid "Unsupported value type"
 msgstr "Tipo de valor no permitido"
 
-#: cups/http-support.c:1318
 msgid "Upgrade Required"
 msgstr "Se requiere actualización"
 
-#: systemv/lpadmin.c:668
 msgid ""
 "Usage:\n"
 "\n"
@@ -6053,53 +4489,37 @@ msgstr ""
 "                         [-P archivo_ppd] [-o nombre=valor]\n"
 "                         [-u allow:usuario,usuario] [-u deny:usuario,usuario]"
 
-#: backend/dnssd.c:241
-#: backend/ipp.c:313
-#: backend/lpd.c:191
-#: backend/socket.c:135
-#: backend/usb.c:183
-#: filter/commandtops.c:74
-#: filter/gziptoany.c:50
-#: filter/pstops.c:264
-#: monitor/bcp.c:62
-#: monitor/tbcp.c:61
 #, c-format
 msgid "Usage: %s job-id user title copies options [file]"
 msgstr "Uso: %s job-id usuario título copias opciones [archivo]"
 
-#: systemv/cupsaddsmb.c:281
 msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
 msgstr "Uso: cupsaddsmb [opciones] impresora1 ... impresoraN"
 
-#: systemv/cupsctl.c:200
 msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
 msgstr "Uso: cupsctl [opciones] [param=valor ... paramN=valorN]"
 
-#: scheduler/main.c:2017
 msgid "Usage: cupsd [options]"
 msgstr "Uso: cupsd [opciones)"
 
-#: scheduler/cupsfilter.c:1429
 msgid "Usage: cupsfilter [ options ] filename"
 msgstr "Uso: cupsfilter ( opciones ) archivo"
 
-#: systemv/cupstestdsc.c:425
 msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
 msgstr "Uso: cupstestdsc [opciones] nombre_archivo.ps [... nombre_archivo.ps]"
 
-#: systemv/cupstestppd.c:3793
-msgid "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]"
-msgstr "Uso: cupstestppd [opciones] nombre_archivo1.ppd[.gz] [... nombre_archivoN.ppd[.gz]]"
+msgid ""
+"Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]"
+msgstr ""
+"Uso: cupstestppd [opciones] nombre_archivo1.ppd[.gz] [... nombre_archivoN.ppd"
+"[.gz]]"
 
-#: test/ipptool.c:4401
 msgid "Usage: ipptool [options] URI filename [ ... filenameN ]"
 msgstr "Uso: ipptool [opciones] URI nombre_archivo [ ... nombre_archivoN ]"
 
-#: systemv/lpmove.c:125
 msgid "Usage: lpmove job/src dest"
 msgstr "Uso: lpmove trabajo/fuente destino"
 
-#: systemv/lpoptions.c:553
 msgid ""
 "Usage: lpoptions [-h server] [-E] -d printer\n"
 "       lpoptions [-h server] [-E] [-p printer] -l\n"
@@ -6111,11 +4531,9 @@ msgstr ""
 "     lpoptions [-h servidor] [-E] -p impresora -o opción[=valor] ...\n"
 "     lpoptions [-h servidor] [-E] -x impresora"
 
-#: systemv/lppasswd.c:476
 msgid "Usage: lppasswd [-g groupname]"
 msgstr "Uso: lppasswd [-g nombre_grupo]"
 
-#: systemv/lppasswd.c:479
 msgid ""
 "Usage: lppasswd [-g groupname] [username]\n"
 "       lppasswd [-g groupname] -a [username]\n"
@@ -6125,368 +4543,305 @@ msgstr ""
 "     lppasswd [-g nombre_grupo] -a [nombre_usuario]\n"
 "     lppasswd [-g nombre_grupo] -x [nombre_usuario]"
 
-#: berkeley/lpq.c:670
-msgid "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]"
-msgstr "Uso: lpq (-P dest) (-U nombre_usuario) (-h nombre_ordenador(:puerto)) (-l) (+intervalo)"
+msgid ""
+"Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]"
+msgstr ""
+"Uso: lpq (-P dest) (-U nombre_usuario) (-h nombre_ordenador(:puerto)) (-l) "
+"(+intervalo)"
 
-#: ppdc/ppdc.cxx:435
 msgid "Usage: ppdc [options] filename.drv [ ... filenameN.drv ]"
 msgstr "Uso: ppdc [opciones] nombre_archivo.drv [ ... nombre_archivoN.drv ]"
 
-#: ppdc/ppdhtml.cxx:172
 msgid "Usage: ppdhtml [options] filename.drv >filename.html"
 msgstr "Uso: ppdhtml [opciones] nombre_archivo.drv >nombre_archivo.html"
 
-#: ppdc/ppdi.cxx:128
 msgid "Usage: ppdi [options] filename.ppd [ ... filenameN.ppd ]"
 msgstr "Uso: ppdi [opciones] nombre_archivo.ppd [ ... nombre_archivoN.ppd ]"
 
-#: ppdc/ppdmerge.cxx:367
 msgid "Usage: ppdmerge [options] filename.ppd [ ... filenameN.ppd ]"
-msgstr "Uso: ppdmerge [opciones] nombre_archivo.ppd [ ... nombre_archivoN.ppd ]"
+msgstr ""
+"Uso: ppdmerge [opciones] nombre_archivo.ppd [ ... nombre_archivoN.ppd ]"
 
-#: ppdc/ppdpo.cxx:252
-msgid "Usage: ppdpo [options] -o filename.po filename.drv [ ... filenameN.drv ]"
-msgstr "Uso: ppdpo [opciones] -o nombre_archivo.po nombre_archivo.drv [ ... nombre_archivoN.drv ]"
+msgid ""
+"Usage: ppdpo [options] -o filename.po filename.drv [ ... filenameN.drv ]"
+msgstr ""
+"Uso: ppdpo [opciones] -o nombre_archivo.po nombre_archivo.drv [ ... "
+"nombre_archivoN.drv ]"
 
-#: backend/snmp.c:218
 msgid "Usage: snmp [host-or-ip-address]"
 msgstr "Uso: snmp [ordenador-o-dirección-ip]"
 
-#: cups/snmp.c:1064
 msgid "Value uses indefinite length"
 msgstr "Valor usa una longitud indefinida"
 
-#: cups/snmp.c:1049
 msgid "VarBind uses indefinite length"
 msgstr "VarBind usa una longitud indefinida"
 
-#: cups/snmp.c:999
 msgid "Version uses indefinite length"
 msgstr "Versión usa una longitud indefinida"
 
-#: backend/ipp.c:1675
 msgid "Waiting for job to complete."
 msgstr "Esperando a que finalice el trabajo."
 
-#: backend/usb-darwin.c:457
-#: backend/usb-libusb.c:193
 msgid "Waiting for printer to become available."
 msgstr "Esperando a que la impresora esté disponible."
 
-#: backend/socket.c:444
 msgid "Waiting for printer to finish."
 msgstr "Esperando a que finalice la impresora."
 
-#: cups/adminutil.c:793
 msgid "Warning, no Windows 2000 printer drivers are installed."
-msgstr "Advertencia, no está instalado ningún controlador de impresora de Windows 2000."
+msgstr ""
+"Advertencia, no está instalado ningún controlador de impresora de Windows "
+"2000."
 
-#: cups/http-support.c:1339
 msgid "Web Interface is Disabled"
 msgstr "La interfaz web está desactivada."
 
-#: cups/ppd.c:1947
 msgid "Yes"
 msgstr "Si"
 
-#: scheduler/client.c:2437
 #, c-format
-msgid "You must access this page using the URL <A HREF=\"https://%s:%d%s\">https://%s:%d%s</A>."
-msgstr "Debe acceder a esta página usando el URL <A HREF=\"https://%s:%d%s\">https://%s:%d%s</A>."
+msgid ""
+"You must access this page using the URL <A HREF=\"https://%s:%d%s\">https://"
+"%s:%d%s</A>."
+msgstr ""
+"Debe acceder a esta página usando el URL <A HREF=\"https://%s:%d%s\">https://"
+"%s:%d%s</A>."
 
-#: systemv/lppasswd.c:254
-msgid "Your password must be at least 6 characters long, cannot contain your username, and must contain at least one letter and number."
-msgstr "Su contraseña debe tener al menos 6 caracteres, no puede contener su nombre de usuario, y debe tener al menos una letra y un número."
+msgid ""
+"Your password must be at least 6 characters long, cannot contain your "
+"username, and must contain at least one letter and number."
+msgstr ""
+"Su contraseña debe tener al menos 6 caracteres, no puede contener su nombre "
+"de usuario, y debe tener al menos una letra y un número."
 
-#: ppdc/sample.c:439
 msgid "ZPL Label Printer"
 msgstr "Impresora de etiquetas ZPL"
 
-#: ppdc/sample.c:362
 msgid "Zebra"
 msgstr "Zebra"
 
-#: cups/notify.c:102
 msgid "aborted"
 msgstr "cancelado"
 
-#: cups/notify.c:99
 msgid "canceled"
 msgstr "cancelado"
 
-#: cups/notify.c:105
 msgid "completed"
 msgstr "completado"
 
-#: scheduler/ipp.c:6012
 msgid "cups-deviced failed to execute."
 msgstr "Ha fallado al ejecutarse cups-deviced."
 
-#: scheduler/ipp.c:6842
-#: scheduler/ipp.c:7091
 msgid "cups-driverd failed to execute."
 msgstr "Ha fallado al ejecutarse cups-driverd."
 
-#: systemv/cupsaddsmb.c:233
 #, c-format
 msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
 msgstr "cupsaddsmb: No hay archivo PPD para la impresora \"%s\" - %s"
 
-#: systemv/cupsctl.c:141
 msgid "cupsctl: Cannot set Listen or Port directly."
 msgstr "cupsctl: No se puede establecer Listen o Port directamente."
 
-#: systemv/cupsctl.c:152
 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
 msgstr "cupsctl: No se ha podido conectar al servidor: %s"
 
-#: systemv/cupsctl.c:195
 #, c-format
 msgid "cupsctl: Unknown option \"%s\""
 msgstr "cupsctl: Opción \"%s\" desconocida"
 
-#: systemv/cupsctl.c:197
 #, c-format
 msgid "cupsctl: Unknown option \"-%c\""
 msgstr "cupsctl: Opción \"-%c\" desconocida"
 
-#: scheduler/main.c:189
 msgid "cupsd: Expected config filename after \"-c\" option."
-msgstr "cupsd: Se esperaba un nombre de archivo de configuración tras la opción \"-c\"."
+msgstr ""
+"cupsd: Se esperaba un nombre de archivo de configuración tras la opción \"-c"
+"\"."
+
+msgid "cupsd: Expected cups-files.conf filename after \"-s\" option."
+msgstr ""
+
+msgid "cupsd: Relative cups-files.conf filename not allowed."
+msgstr ""
 
-#: scheduler/main.c:221
-#: scheduler/main.c:228
 msgid "cupsd: Unable to get current directory."
 msgstr "cupsd: No se ha podido obtener el directorio actual."
 
-#: scheduler/main.c:295
+msgid "cupsd: Unable to get path to cups-files.conf file."
+msgstr ""
+
 #, c-format
 msgid "cupsd: Unknown argument \"%s\" - aborting."
 msgstr "cupsd: Argumento \"%s\" desconocido - cancelando."
 
-#: scheduler/main.c:288
 #, c-format
 msgid "cupsd: Unknown option \"%c\" - aborting."
 msgstr "cupsd: Opción \"%c\" desconocida - cancelando."
 
-#: scheduler/main.c:255
 msgid "cupsd: launchd(8) support not compiled in, running in normal mode."
-msgstr "cupsd: el uso de launchd(8) no ha sido compilado, ejecutándose en modo normal."
+msgstr ""
+"cupsd: el uso de launchd(8) no ha sido compilado, ejecutándose en modo "
+"normal."
 
-#: scheduler/cupsfilter.c:1209
 #, c-format
 msgid "cupsfilter: Invalid document number %d."
 msgstr "cupsfilter: Número de documento %d no válido."
 
-#: scheduler/cupsfilter.c:1203
 #, c-format
 msgid "cupsfilter: Invalid job ID %d."
 msgstr "cupsfilter: ID de trabajo %d no válida."
 
-#: scheduler/cupsfilter.c:358
 msgid "cupsfilter: Only one filename can be specified."
 msgstr "cupsfilter: Solo se puede especificar un nombre de archivo."
 
-#: scheduler/cupsfilter.c:1251
 #, c-format
 msgid "cupsfilter: Unable to get job file - %s"
 msgstr "cupsfilter: No se ha podido obtener el archivo del trabajo - %s"
 
-#: systemv/cupstestppd.c:261
 msgid "cupstestppd: The -q option is incompatible with the -v option."
 msgstr "cupstestppd: La opción -q es incompatible con la opción -v."
 
-#: systemv/cupstestppd.c:277
 msgid "cupstestppd: The -v option is incompatible with the -q option."
 msgstr "cupstestppd: La opción -v es incompatible con la opción -q."
 
-#: systemv/lpstat.c:1231
-#: systemv/lpstat.c:1234
-#: systemv/lpstat.c:1237
 #, c-format
 msgid "device for %s/%s: %s"
 msgstr "dispositivo para %s/%s: %s"
 
-#: systemv/lpstat.c:1218
-#: systemv/lpstat.c:1221
-#: systemv/lpstat.c:1224
 #, c-format
 msgid "device for %s: %s"
 msgstr "dispositivo para %s: %s"
 
-#: cups/snmp.c:1036
 msgid "error-index uses indefinite length"
 msgstr "error-index usa una longitud indefinida"
 
-#: cups/snmp.c:1028
 msgid "error-status uses indefinite length"
 msgstr "error-status usa una longitud indefinida"
 
-#: cups/notify.c:90
 msgid "held"
 msgstr "retenido"
 
-#: berkeley/lpc.c:209
 msgid "help\t\tGet help on commands."
 msgstr "help\t\tProporciona ayuda sobre los comandos."
 
-#: cups/notify.c:131
 msgid "idle"
 msgstr "inactiva"
 
-#: test/ipptool.c:373
-#: test/ipptool.c:515
-#: test/ipptool.c:539
 msgid "ipptool: \"-i\" and \"-n\" are incompatible with -X\"."
 msgstr "ipptool: \"-i\" y \"-n\" son incompatibles with -X\"."
 
-#: test/ipptool.c:597
 #, c-format
 msgid "ipptool: Bad URI - %s."
 msgstr "ipptool: URI - %s incorrecto."
 
-#: test/ipptool.c:362
 #, c-format
 msgid "ipptool: Bad version %s for \"-V\"."
 msgstr "ipptool: Versión %s para \"-V\" incorrecta."
 
-#: test/ipptool.c:508
 msgid "ipptool: Invalid seconds for \"-i\"."
 msgstr "ipptool: Número de segundos no válido para \"-i\"."
 
-#: test/ipptool.c:578
 msgid "ipptool: May only specify a single URI."
 msgstr "ipptool: Sólo se puede especificar un URI."
 
-#: test/ipptool.c:531
 msgid "ipptool: Missing count for \"-n\"."
 msgstr "ipptool: Falta el contador para \"-n\"."
 
-#: test/ipptool.c:408
 msgid "ipptool: Missing filename for \"-f\"."
 msgstr "ipptool: Falta el nombre del archivo para \"-f\"."
 
-#: test/ipptool.c:389
 msgid "ipptool: Missing name=value for \"-d\"."
 msgstr "ipptool: Falta un nombre=valor para \"-d\"."
 
-#: test/ipptool.c:498
 msgid "ipptool: Missing seconds for \"-i\"."
 msgstr "ipptool: Falta el número de segundos para \"-i\"."
 
-#: test/ipptool.c:332
 msgid "ipptool: Missing timeout for \"-T\"."
 msgstr "ipptool: Falta un tiempo de espera para \"-T\"."
 
-#: test/ipptool.c:345
 msgid "ipptool: Missing version for \"-V\"."
 msgstr "ipptool: Falta la versión para \"-V\"."
 
-#: test/ipptool.c:624
 msgid "ipptool: URI required before test file."
 msgstr "ipptool: Se requiere un URI antes del archivo de prueba."
 
-#: test/ipptool.c:558
 #, c-format
 msgid "ipptool: Unknown option \"-%c\"."
 msgstr "ipptool: Opción \"-%c\" desconocida."
 
-#: scheduler/ipp.c:7838
 msgid "job-printer-uri attribute missing."
 msgstr "Falta el atributo job-printer-uri."
 
-#: systemv/lpadmin.c:131
-#: systemv/lpadmin.c:375
 msgid "lpadmin: Class name can only contain printable characters."
-msgstr "lpadmin: El nombre de la clase sólo puede contener caracteres imprimibles."
+msgstr ""
+"lpadmin: El nombre de la clase sólo puede contener caracteres imprimibles."
 
-#: systemv/lpadmin.c:614
 msgid "lpadmin: Expected PPD after \"-P\" option."
 msgstr "lpadmin: Se esperaba un PPD tras la opción \"-P\"."
 
-#: systemv/lpadmin.c:457
 msgid "lpadmin: Expected allow/deny:userlist after \"-u\" option."
 msgstr "lpadmin: Se esperaba allow/deny:lista_usuarios tras la opción \"-u\"."
 
-#: systemv/lpadmin.c:364
 msgid "lpadmin: Expected class after \"-r\" option."
 msgstr "lpadmin: Se esperaba una clase tras la opción \"-r\"."
 
-#: systemv/lpadmin.c:120
 msgid "lpadmin: Expected class name after \"-c\" option."
 msgstr "lpadmin: Se esperaba un nombre de clase tras la opción \"-c\"."
 
-#: systemv/lpadmin.c:558
 msgid "lpadmin: Expected description after \"-D\" option."
 msgstr "lpadmin: Se esperaba una descripción tras la opción \"-D\"."
 
-#: systemv/lpadmin.c:491
 msgid "lpadmin: Expected device URI after \"-v\" option."
 msgstr "lpadmin: Se esperaba un URI de dispositivo tras la opción \"-v\"."
 
-#: systemv/lpadmin.c:574
 msgid "lpadmin: Expected file type(s) after \"-I\" option."
 msgstr "lpadmin: Se esperaba(n) tipo(s) de archivo(s) tras la opción \"-l\"."
 
-#: systemv/lpadmin.c:202
 msgid "lpadmin: Expected hostname after \"-h\" option."
 msgstr "lpadmin: Se esperaba un nombre de ordenador tras la opción \"-h\"."
 
-#: systemv/lpadmin.c:221
 msgid "lpadmin: Expected interface after \"-i\" option."
 msgstr "lpadmin: Se esperaba una interfaz tras la opción \"-i\"."
 
-#: systemv/lpadmin.c:594
 msgid "lpadmin: Expected location after \"-L\" option."
 msgstr "lpadmin: Se esperaba una ubicación tras la opción \"-L\"."
 
-#: systemv/lpadmin.c:274
 msgid "lpadmin: Expected model after \"-m\" option."
 msgstr "lpadmin: Se esperaba un modelo tras la opción \"-m\"."
 
-#: systemv/lpadmin.c:417
 msgid "lpadmin: Expected name after \"-R\" option."
 msgstr "lpadmin: Se esperaba un nombre tras la opción \"-R\"."
 
-#: systemv/lpadmin.c:294
 msgid "lpadmin: Expected name=value after \"-o\" option."
 msgstr "lpadmin: Se esperaba un nombre=valor tras la opción \"-o\"."
 
-#: systemv/lpadmin.c:313
 msgid "lpadmin: Expected printer after \"-p\" option."
 msgstr "lpadmin: Se esperaba una impresora tras la opción \"-p\"."
 
-#: systemv/lpadmin.c:164
 msgid "lpadmin: Expected printer name after \"-d\" option."
 msgstr "lpadmin: Se esperaba un nombre de impresora tras la opción \"-d\"."
 
-#: systemv/lpadmin.c:525
 msgid "lpadmin: Expected printer or class after \"-x\" option."
 msgstr "lpadmin: Se esperaba una impresora o clase tras la opción \"-x\"."
 
-#: systemv/lpadmin.c:975
 msgid "lpadmin: No member names were seen."
 msgstr "lpadmin: No se han visto nombres de miembros"
 
-#: systemv/lpadmin.c:762
 #, c-format
 msgid "lpadmin: Printer %s is already a member of class %s."
 msgstr "lpadmin: La impresora %s ya es miembro de la clase %s."
 
-#: systemv/lpadmin.c:989
 #, c-format
 msgid "lpadmin: Printer %s is not a member of class %s."
 msgstr "lpadmin: La impresora %s no es miembro de la clase %s."
 
-#: systemv/lpadmin.c:175
-#: systemv/lpadmin.c:324
-#: systemv/lpadmin.c:536
 msgid "lpadmin: Printer name can only contain printable characters."
-msgstr "lpadmin: El nombre de la impresora sólo puede contener caracteres imprimibles."
+msgstr ""
+"lpadmin: El nombre de la impresora sólo puede contener caracteres "
+"imprimibles."
 
-#: systemv/lpadmin.c:105
 msgid ""
 "lpadmin: Unable to add a printer to the class:\n"
 "         You must specify a printer name first."
@@ -6494,22 +4849,13 @@ msgstr ""
 "lpadmin: No se ha podido añadir una impresora a la clase:\n"
 "         Debe especificar un nombre de impresora primero."
 
-#: systemv/lpadmin.c:96
-#: systemv/lpadmin.c:149
-#: systemv/lpadmin.c:253
-#: systemv/lpadmin.c:339
-#: systemv/lpadmin.c:393
-#: systemv/lpadmin.c:510
-#: systemv/lpadmin.c:647
 #, c-format
 msgid "lpadmin: Unable to connect to server: %s"
 msgstr "lpadmin: No se ha podido conectar al servidor: %s"
 
-#: systemv/lpadmin.c:1329
 msgid "lpadmin: Unable to create temporary file"
 msgstr "lpadmin: No se ha podido crear el archivo temporal"
 
-#: systemv/lpadmin.c:402
 msgid ""
 "lpadmin: Unable to delete option:\n"
 "         You must specify a printer name first."
@@ -6517,12 +4863,10 @@ msgstr ""
 "lpadmin: No se ha podido borrar la opción:\n"
 "         Primero debe especificar un nombre de impresora."
 
-#: systemv/lpadmin.c:1339
 #, c-format
 msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 msgstr "lpadmin: No se ha podido abrir el archivo PPD \"%s\" - %s"
 
-#: systemv/lpadmin.c:348
 msgid ""
 "lpadmin: Unable to remove a printer from the class:\n"
 "         You must specify a printer name first."
@@ -6530,7 +4874,6 @@ msgstr ""
 "lpadmin: No se ha podido quitar una impresora de la clase:\n"
 "         Primero debe especificar un nombre de impresora."
 
-#: systemv/lpadmin.c:656
 msgid ""
 "lpadmin: Unable to set the printer options:\n"
 "         You must specify a printer name first."
@@ -6538,779 +4881,635 @@ msgstr ""
 "lpadmin: No se han podido establecer las opciones de impresora:\n"
 "         Primero debe especificar un nombre de impresora."
 
-#: systemv/lpadmin.c:474
 #, c-format
 msgid "lpadmin: Unknown allow/deny option \"%s\"."
 msgstr "lpadmin: Opción allow/deny desconocida \"%s\"."
 
-#: systemv/lpadmin.c:629
 #, c-format
 msgid "lpadmin: Unknown argument \"%s\"."
 msgstr "lpadmin: Argumento \"%s\" desconocido."
 
-#: systemv/lpadmin.c:624
 #, c-format
 msgid "lpadmin: Unknown option \"%c\"."
 msgstr "lpadmin: Opción \"%c\" desconocida."
 
-#: systemv/lpadmin.c:580
 msgid "lpadmin: Warning - content type list ignored."
 msgstr "lpadmin: Advertencia - lista de tipo de contenido no tenida en cuenta."
 
-#: berkeley/lpc.c:76
-#: berkeley/lpc.c:104
-#: berkeley/lpc.c:140
 msgid "lpc> "
 msgstr "lpc> "
 
-#: systemv/lpinfo.c:137
 msgid "lpinfo: Expected 1284 device ID string after \"--device-id\"."
-msgstr "lpinfo: Se esperaba una cadena ID de dispositivo 1284 tras \"--device-id\"."
+msgstr ""
+"lpinfo: Se esperaba una cadena ID de dispositivo 1284 tras \"--device-id\"."
 
-#: systemv/lpinfo.c:190
 msgid "lpinfo: Expected language after \"--language\"."
 msgstr "lpinfo: Se esperaba un idioma tras \"--language\"."
 
-#: systemv/lpinfo.c:207
 msgid "lpinfo: Expected make and model after \"--make-and-model\"."
 msgstr "lpinfo: Se esperaba marca y modelo tras \"--make-and-model\"."
 
-#: systemv/lpinfo.c:224
 msgid "lpinfo: Expected product string after \"--product\"."
 msgstr "lpinfo: Se esperaba una cadena de producto tras \"--product\"."
 
-#: systemv/lpinfo.c:155
 msgid "lpinfo: Expected scheme list after \"--exclude-schemes\"."
 msgstr "lpinfo: Se esperaba una lista de esquemas tras \"--exclude-schemes\"."
 
-#: systemv/lpinfo.c:173
 msgid "lpinfo: Expected scheme list after \"--include-schemes\"."
 msgstr "lpinfo: Se esperaba una lista de esquemas tras \"--include-schemes\"."
 
-#: systemv/lpinfo.c:241
 msgid "lpinfo: Expected timeout after \"--timeout\"."
 msgstr "lpinfo: Se esperaba un tiempo de espera tras \"--timeout\"."
 
-#: systemv/lpinfo.c:265
 #, c-format
 msgid "lpinfo: Unknown argument \"%s\"."
 msgstr "lpinfo: Argumento \"%s\" desconocido."
 
-#: systemv/lpinfo.c:259
 #, c-format
 msgid "lpinfo: Unknown option \"%c\"."
 msgstr "lpinfo: Opción \"%c\" desconocida."
 
-#: systemv/lpinfo.c:252
 #, c-format
 msgid "lpinfo: Unknown option \"%s\"."
 msgstr "lpinfo: Opción \"%s\" desconocida."
 
-#: systemv/lpmove.c:133
 #, c-format
 msgid "lpmove: Unable to connect to server: %s"
 msgstr "lpmove: No se ha podido conectar al servidor: %s"
 
-#: systemv/lpmove.c:119
 #, c-format
 msgid "lpmove: Unknown argument \"%s\"."
 msgstr "lpmove: Argumento \"%s\" desconocido."
 
-#: systemv/lpmove.c:97
 #, c-format
 msgid "lpmove: Unknown option \"%c\"."
 msgstr "lpmove: Opción \"%c\" desconocida."
 
-#: systemv/lpoptions.c:150
-#: systemv/lpoptions.c:168
-#: systemv/lpoptions.c:244
 msgid "lpoptions: No printers."
 msgstr "lpoptions: No hay impresoras."
 
-#: systemv/lpoptions.c:219
 #, c-format
 msgid "lpoptions: Unable to add printer or instance: %s"
 msgstr "lpoptions: No se ha podido añadir la impresora o la instancia: %s"
 
-#: systemv/lpoptions.c:521
 #, c-format
 msgid "lpoptions: Unable to get PPD file for %s: %s"
 msgstr "lpoptions: No se ha podido obtener el archivo PPD para %s: %s"
 
-#: systemv/lpoptions.c:529
 #, c-format
 msgid "lpoptions: Unable to open PPD file for %s."
 msgstr "lpoptions: No se ha podido abrir el archivo PPD para %s."
 
-#: systemv/lpoptions.c:99
 msgid "lpoptions: Unknown printer or class."
 msgstr "lpoptions: Impresora o clase desconocida."
 
-#: systemv/lppasswd.c:173
 msgid "lppasswd: Only root can add or delete passwords."
 msgstr "lppasswd: Solo el usuario root puede añadir o borrar contraseñas."
 
-#: systemv/lppasswd.c:302
 msgid "lppasswd: Password file busy."
 msgstr "lppasswd: Archivo de contraseñas ocupado."
 
-#: systemv/lppasswd.c:431
 msgid "lppasswd: Password file not updated."
 msgstr "lppasswd: Archivo de contraseñas no actualizado."
 
-#: systemv/lppasswd.c:398
 msgid "lppasswd: Sorry, password doesn't match."
 msgstr "lppasswd: Lo siento, la contraseña no coincide."
 
-#: systemv/lppasswd.c:253
 msgid "lppasswd: Sorry, password rejected."
 msgstr "lppasswd: Lo siento, la contraseña ha sido rechazada."
 
-#: systemv/lppasswd.c:230
 msgid "lppasswd: Sorry, passwords don't match."
 msgstr "lppasswd: Lo siento, las contraseñas no coinciden."
 
-#: systemv/lppasswd.c:199
-#: systemv/lppasswd.c:218
 #, c-format
 msgid "lppasswd: Unable to copy password string: %s"
 msgstr "lppasswd: No se ha podido copiar la cadena de contraseña: %s"
 
-#: systemv/lppasswd.c:304
-#: systemv/lppasswd.c:312
-#: systemv/lppasswd.c:329
 #, c-format
 msgid "lppasswd: Unable to open password file: %s"
 msgstr "lppasswd: No se ha podido abrir el archivo de contraseñas: %s"
 
-#: systemv/lppasswd.c:364
-#: systemv/lppasswd.c:377
-#: systemv/lppasswd.c:408
 #, c-format
 msgid "lppasswd: Unable to write to password file: %s"
 msgstr "lppasswd: No se ha podido escribir en el archivo de contraseñas: %s"
 
-#: systemv/lppasswd.c:446
 #, c-format
 msgid "lppasswd: failed to backup old password file: %s"
-msgstr "lppasswd: falló al hacer una copia de seguridad del antiguo archivo de contraseñas: %s"
+msgstr ""
+"lppasswd: falló al hacer una copia de seguridad del antiguo archivo de "
+"contraseñas: %s"
 
-#: systemv/lppasswd.c:458
 #, c-format
 msgid "lppasswd: failed to rename password file: %s"
 msgstr "lppasswd: falló al cambiar de nombre al archivo de contraseñas: %s"
 
-#: systemv/lppasswd.c:389
 #, c-format
 msgid "lppasswd: user \"%s\" and group \"%s\" do not exist."
 msgstr "lppasswd: el usuario \"%s\" y el grupo \"%s\" no existen."
 
-#: systemv/lpstat.c:1039
 #, c-format
-msgid "lpstat: error - %s environment variable names non-existent destination \"%s\"."
-msgstr "lpstat: error - Los nombre de variable de entorno %s no existen en el destino \"%s\"."
+msgid ""
+"lpstat: error - %s environment variable names non-existent destination \"%s"
+"\"."
+msgstr ""
+"lpstat: error - Los nombre de variable de entorno %s no existen en el "
+"destino \"%s\"."
 
-#: systemv/lpstat.c:970
 #, c-format
 msgid "members of class %s:"
 msgstr "miembros de la clase %s:"
 
-#: berkeley/lpq.c:582
 msgid "no entries"
 msgstr "no hay entradas"
 
-#: systemv/lpstat.c:1043
 msgid "no system default destination"
 msgstr "no hay un destino predeterminado del sistema"
 
-#: scheduler/ipp.c:5702
 msgid "notify-events not specified."
 msgstr "notify-events no especificado."
 
-#: scheduler/ipp.c:2034
-#: scheduler/ipp.c:5607
 #, c-format
 msgid "notify-recipient-uri URI \"%s\" is already used."
 msgstr "El URI notify-recipient-uri \"%s\" ya está usado."
 
-#: scheduler/ipp.c:2024
-#: scheduler/ipp.c:5597
 #, c-format
 msgid "notify-recipient-uri URI \"%s\" uses unknown scheme."
 msgstr "El URI notify-recipient-uri \"%s\" usa un esquema desconocido."
 
-#: cups/notify.c:87
 msgid "pending"
 msgstr "pendiente"
 
-#: ppdc/ppdc.cxx:113
-#: ppdc/ppdpo.cxx:93
 #, c-format
 msgid "ppdc: Adding include directory \"%s\"."
 msgstr "ppdc: Añadiendo directorio include \"%s\"."
 
-#: ppdc/ppdpo.cxx:134
 #, c-format
 msgid "ppdc: Adding/updating UI text from %s."
 msgstr "ppdc: Añadiendo/actualizando texto UI desde %s."
 
-#: ppdc/ppdc-source.cxx:410
 #, c-format
 msgid "ppdc: Bad boolean value (%s) on line %d of %s."
 msgstr "ppdc: Valor lógico (%s) incorrecto en línea %d de %s."
 
-#: ppdc/ppdc-import.cxx:264
 #, c-format
 msgid "ppdc: Bad font attribute: %s"
 msgstr "ppdc: Atributo de fuente: %s incorrecto"
 
-#: ppdc/ppdc-source.cxx:1796
 #, c-format
 msgid "ppdc: Bad resolution name \"%s\" on line %d of %s."
 msgstr "ppdc: Resolución de nombre \"%s\" incorrecta en línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:1113
 #, c-format
 msgid "ppdc: Bad status keyword %s on line %d of %s."
 msgstr "ppdc: Clave de estado %s incorrecta en línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:2033
 #, c-format
 msgid "ppdc: Bad variable substitution ($%c) on line %d of %s."
 msgstr "ppdc: Sustitución de variable ($%c) errónea en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:2719
 #, c-format
 msgid "ppdc: Choice found on line %d of %s with no Option."
 msgstr "ppdc: Selección encontrada en línea %d de %s sin opciones."
 
-#: ppdc/ppdc-source.cxx:1698
 #, c-format
 msgid "ppdc: Duplicate #po for locale %s on line %d of %s."
 msgstr "ppdc: #po duplicado para código regional %s en línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:932
 #, c-format
 msgid "ppdc: Expected a filter definition on line %d of %s."
 msgstr "ppdc: Se esperaba una definición de filtro en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:955
 #, c-format
 msgid "ppdc: Expected a program name on line %d of %s."
 msgstr "ppdc: Se esperaba un nombre de programa en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:394
 #, c-format
 msgid "ppdc: Expected boolean value on line %d of %s."
 msgstr "ppdc: Se esperaba un valor lógico en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:1093
 #, c-format
 msgid "ppdc: Expected charset after Font on line %d of %s."
-msgstr "ppdc: Se esperaba un juego de caracteres tras Font en la línea %d de %s."
+msgstr ""
+"ppdc: Se esperaba un juego de caracteres tras Font en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:447
 #, c-format
 msgid "ppdc: Expected choice code on line %d of %s."
 msgstr "ppdc: Se esperaba un código apropiado en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:435
 #, c-format
 msgid "ppdc: Expected choice name/text on line %d of %s."
 msgstr "ppdc: Se esperaba un nombre/texto apropiado en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:503
 #, c-format
 msgid "ppdc: Expected color order for ColorModel on line %d of %s."
-msgstr "ppdc: Se esperaba un orden de color para ColorModel en la línea %d de %s."
+msgstr ""
+"ppdc: Se esperaba un orden de color para ColorModel en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:492
 #, c-format
 msgid "ppdc: Expected colorspace for ColorModel on line %d of %s."
 msgstr "ppdc: Se esperaba colorspace para ColorModel en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:514
 #, c-format
 msgid "ppdc: Expected compression for ColorModel on line %d of %s."
 msgstr "ppdc: Se esperaba compresión para ColorModel en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:695
 #, c-format
 msgid "ppdc: Expected constraints string for UIConstraints on line %d of %s."
-msgstr "ppdc: Se esperaba una cadena de restricciones para UIConstraints en la línea %d de %s."
+msgstr ""
+"ppdc: Se esperaba una cadena de restricciones para UIConstraints en la línea "
+"%d de %s."
 
-#: ppdc/ppdc-source.cxx:2905
 #, c-format
-msgid "ppdc: Expected driver type keyword following DriverType on line %d of %s."
-msgstr "ppdc: Se esperaba una clave de tipo de controlador tras DriverType en la línea %d de %s."
+msgid ""
+"ppdc: Expected driver type keyword following DriverType on line %d of %s."
+msgstr ""
+"ppdc: Se esperaba una clave de tipo de controlador tras DriverType en la "
+"línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:826
 #, c-format
 msgid "ppdc: Expected duplex type after Duplex on line %d of %s."
 msgstr "ppdc: Se esperaba un tipo dúplex tras Duplex en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:1077
 #, c-format
 msgid "ppdc: Expected encoding after Font on line %d of %s."
 msgstr "ppdc: Se esperaba una codificación tras Font en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:1689
 #, c-format
 msgid "ppdc: Expected filename after #po %s on line %d of %s."
-msgstr "ppdc: Se esperaba un nombre de archivo tras #po %s en la línea %d de %s."
+msgstr ""
+"ppdc: Se esperaba un nombre de archivo tras #po %s en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:1205
 #, c-format
 msgid "ppdc: Expected group name/text on line %d of %s."
 msgstr "ppdc: Se esperaba un nombre/texto de grupo en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:2619
 #, c-format
 msgid "ppdc: Expected include filename on line %d of %s."
 msgstr "ppdc: Se esperaba un nombre de archivo include en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:1502
 #, c-format
 msgid "ppdc: Expected integer on line %d of %s."
 msgstr "ppdc: Se esperaba un número entero en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:1681
 #, c-format
 msgid "ppdc: Expected locale after #po on line %d of %s."
 msgstr "ppdc: Se esperaba un código regional tras #po en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:353
 #, c-format
 msgid "ppdc: Expected name after %s on line %d of %s."
 msgstr "ppdc: Se esperaba un nombre tras %s en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:3277
 #, c-format
 msgid "ppdc: Expected name after FileName on line %d of %s."
 msgstr "ppdc: Se esperaba un nombre tras FileName en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:1058
 #, c-format
 msgid "ppdc: Expected name after Font on line %d of %s."
 msgstr "ppdc: Se esperaba un nombre tras Font en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:3108
 #, c-format
 msgid "ppdc: Expected name after Manufacturer on line %d of %s."
 msgstr "ppdc: Se esperaba un nombre tras Manufacturer en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:3141
 #, c-format
 msgid "ppdc: Expected name after MediaSize on line %d of %s."
 msgstr "ppdc: Se esperaba un nombre tras MediaSize en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:3231
 #, c-format
 msgid "ppdc: Expected name after ModelName on line %d of %s."
 msgstr "ppdc: Se esperaba un nombre tras ModelName en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:3294
 #, c-format
 msgid "ppdc: Expected name after PCFileName on line %d of %s."
 msgstr "ppdc: Se esperaba un nombre tras PCFileName en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:1156
 #, c-format
 msgid "ppdc: Expected name/text after %s on line %d of %s."
 msgstr "ppdc: Se esperaba un nombre/texto tras %s en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:1245
 #, c-format
 msgid "ppdc: Expected name/text after Installable on line %d of %s."
-msgstr "ppdc: Se esperaba un nombre/texto tras Installable en la línea %d de %s."
+msgstr ""
+"ppdc: Se esperaba un nombre/texto tras Installable en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:1782
 #, c-format
 msgid "ppdc: Expected name/text after Resolution on line %d of %s."
-msgstr "ppdc: Se esperaba un nombre/texto tras Resolution en la línea %d de %s."
+msgstr ""
+"ppdc: Se esperaba un nombre/texto tras Resolution en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:479
 #, c-format
 msgid "ppdc: Expected name/text combination for ColorModel on line %d of %s."
-msgstr "ppdc: Se esperaba una combinación nombre/texto para ColorModel en la línea %d de %s."
+msgstr ""
+"ppdc: Se esperaba una combinación nombre/texto para ColorModel en la línea "
+"%d de %s."
 
-#: ppdc/ppdc-source.cxx:1574
 #, c-format
 msgid "ppdc: Expected option name/text on line %d of %s."
 msgstr "ppdc: Se esperaba una opción de nombre/texto en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:1608
 #, c-format
 msgid "ppdc: Expected option section on line %d of %s."
 msgstr "ppdc: Se esperaba una sección de opciones en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:1586
 #, c-format
 msgid "ppdc: Expected option type on line %d of %s."
 msgstr "ppdc: Se esperaba un tipo de opción en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:1765
 #, c-format
 msgid "ppdc: Expected override field after Resolution on line %d of %s."
-msgstr "ppdc: Se esperaba un campo de anulación tras Resolution en la línea %d de %s."
+msgstr ""
+"ppdc: Se esperaba un campo de anulación tras Resolution en la línea %d de %s."
 
-#: ppdc/ppdc-catalog.cxx:341
-#: ppdc/ppdc-catalog.cxx:353
 #, c-format
 msgid "ppdc: Expected quoted string on line %d of %s."
 msgstr "ppdc: Se esperaba una cadena entrecomillada en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:1004
 #, c-format
 msgid "ppdc: Expected real number on line %d of %s."
 msgstr "ppdc: Se esperaba un número real en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:572
 #, c-format
-msgid "ppdc: Expected resolution/mediatype following ColorProfile on line %d of %s."
-msgstr "ppdc: Se esperaba resolución/tipo de soporte tras ColorProfile en la línea %d de %s."
+msgid ""
+"ppdc: Expected resolution/mediatype following ColorProfile on line %d of %s."
+msgstr ""
+"ppdc: Se esperaba resolución/tipo de soporte tras ColorProfile en la línea "
+"%d de %s."
 
-#: ppdc/ppdc-source.cxx:1863
 #, c-format
-msgid "ppdc: Expected resolution/mediatype following SimpleColorProfile on line %d of %s."
-msgstr "ppdc: Se esperaba resolución/tipo de soporte tras SimpleColorProfile en la línea %d de %s."
+msgid ""
+"ppdc: Expected resolution/mediatype following SimpleColorProfile on line %d "
+"of %s."
+msgstr ""
+"ppdc: Se esperaba resolución/tipo de soporte tras SimpleColorProfile en la "
+"línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:361
 #, c-format
 msgid "ppdc: Expected selector after %s on line %d of %s."
 msgstr "ppdc: Se esperaba un selector tras %s en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:1101
 #, c-format
 msgid "ppdc: Expected status after Font on line %d of %s."
 msgstr "ppdc: Se esperaba un estado tras Font en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:2794
 #, c-format
 msgid "ppdc: Expected string after Copyright on line %d of %s."
 msgstr "ppdc: Se esperaba una cadena tras Copyright en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:3397
 #, c-format
 msgid "ppdc: Expected string after Version on line %d of %s."
 msgstr "ppdc: Se esperaba una cadena tras Version en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:728
 #, c-format
 msgid "ppdc: Expected two option names on line %d of %s."
 msgstr "ppdc: Se esperaban dos nombres de opciones en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:372
 #, c-format
 msgid "ppdc: Expected value after %s on line %d of %s."
 msgstr "ppdc: Se esperaba un valor tras %s en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:1085
 #, c-format
 msgid "ppdc: Expected version after Font on line %d of %s."
 msgstr "ppdc: Se esperaba una versión tras Font en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:227
 #, c-format
 msgid "ppdc: Invalid #include/#po filename \"%s\"."
 msgstr "ppdc: Nombre de archivo #include/#po incorrecto \"%s\"."
 
-#: ppdc/ppdc-source.cxx:972
 #, c-format
 msgid "ppdc: Invalid cost for filter on line %d of %s."
 msgstr "ppdc: Coste incorrecto para el filtro en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:964
 #, c-format
 msgid "ppdc: Invalid empty MIME type for filter on line %d of %s."
 msgstr "ppdc: Tipo MIME vacío incorrecto para el filtro en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:980
 #, c-format
 msgid "ppdc: Invalid empty program name for filter on line %d of %s."
-msgstr "ppdc: Nombre de programa vacío incorrecto para el filtro en la línea %d de %s."
+msgstr ""
+"ppdc: Nombre de programa vacío incorrecto para el filtro en la línea %d de "
+"%s."
 
-#: ppdc/ppdc-source.cxx:1628
 #, c-format
 msgid "ppdc: Invalid option section \"%s\" on line %d of %s."
 msgstr "ppdc: Sección de opción incorrecta \"%s\" en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:1600
 #, c-format
 msgid "ppdc: Invalid option type \"%s\" on line %d of %s."
 msgstr "ppdc: Tipo de opción incorrecta \"%s\" en la línea %d de %s."
 
-#: ppdc/ppdc.cxx:251
-#: ppdc/ppdpo.cxx:123
 #, c-format
 msgid "ppdc: Loading driver information file \"%s\"."
 msgstr "ppdc: Cargando archivo de información de controlador \"%s\"."
 
-#: ppdc/ppdc.cxx:187
 #, c-format
 msgid "ppdc: Loading messages for locale \"%s\"."
 msgstr "ppdc: Cargando mensajes del idioma \"%s\"."
 
-#: ppdc/ppdc.cxx:126
 #, c-format
 msgid "ppdc: Loading messages from \"%s\"."
 msgstr "ppdc: Cargando mensajes desde \"%s\"."
 
-#: ppdc/ppdc-source.cxx:2412
-#: ppdc/ppdc-source.cxx:2644
 #, c-format
 msgid "ppdc: Missing #endif at end of \"%s\"."
 msgstr "ppdc: Falta un #endif al final de \"%s\"."
 
-#: ppdc/ppdc-source.cxx:2513
-#: ppdc/ppdc-source.cxx:2548
-#: ppdc/ppdc-source.cxx:2578
 #, c-format
 msgid "ppdc: Missing #if on line %d of %s."
 msgstr "ppdc: Falta un #if en la línea %d de %s."
 
-#: ppdc/ppdc-catalog.cxx:418
 #, c-format
-msgid "ppdc: Need a msgid line before any translation strings on line %d of %s."
-msgstr "ppdc: Se necesita una línea msgid antes de cualquier cadena de traducción en línea %d de %s."
+msgid ""
+"ppdc: Need a msgid line before any translation strings on line %d of %s."
+msgstr ""
+"ppdc: Se necesita una línea msgid antes de cualquier cadena de traducción en "
+"línea %d de %s."
 
-#: ppdc/ppdc-driver.cxx:730
 #, c-format
 msgid "ppdc: No message catalog provided for locale %s."
 msgstr "ppdc: No se ha proporcionado catálogo de mensajes para el idioma %s."
 
-#: ppdc/ppdc-source.cxx:1651
-#: ppdc/ppdc-source.cxx:2882
-#: ppdc/ppdc-source.cxx:2968
-#: ppdc/ppdc-source.cxx:3061
-#: ppdc/ppdc-source.cxx:3194
-#: ppdc/ppdc-source.cxx:3327
 #, c-format
 msgid "ppdc: Option %s defined in two different groups on line %d of %s."
-msgstr "ppdc: Opción %s definida en dos diferentes grupos en la línea %d de %s."
+msgstr ""
+"ppdc: Opción %s definida en dos diferentes grupos en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:1644
 #, c-format
 msgid "ppdc: Option %s redefined with a different type on line %d of %s."
 msgstr "ppdc: Opción %s redefinida con un tipo diferente en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:705
 #, c-format
 msgid "ppdc: Option constraint must *name on line %d of %s."
 msgstr "ppdc: Opción de restricción debe *name en línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:2495
 #, c-format
 msgid "ppdc: Too many nested #if's on line %d of %s."
 msgstr "ppdc: Demasiados #if anidados en la línea %d de %s."
 
-#: ppdc/ppdc.cxx:374
 #, c-format
 msgid "ppdc: Unable to create PPD file \"%s\" - %s."
 msgstr "ppdc: No se ha podido crear el archivo PPD \"%s\" - %s."
 
-#: ppdc/ppdc.cxx:266
 #, c-format
 msgid "ppdc: Unable to create output directory %s: %s"
 msgstr "ppdc: No se ha podido crear el directorio de salida %s: %s"
 
-#: ppdc/ppdc.cxx:287
 #, c-format
 msgid "ppdc: Unable to create output pipes: %s"
 msgstr "ppdc: No se han podido crear canales (pipes) de salida: %s"
 
-#: ppdc/ppdc.cxx:303
-#: ppdc/ppdc.cxx:309
 #, c-format
 msgid "ppdc: Unable to execute cupstestppd: %s"
 msgstr "ppdc: No se ha podido ejecutar cupstestppd: %s"
 
-#: ppdc/ppdc-source.cxx:1730
 #, c-format
 msgid "ppdc: Unable to find #po file %s on line %d of %s."
-msgstr "ppdc: No se ha podido encontrar el archivo #po %s en la línea %d de %s."
+msgstr ""
+"ppdc: No se ha podido encontrar el archivo #po %s en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:2651
 #, c-format
 msgid "ppdc: Unable to find include file \"%s\" on line %d of %s."
-msgstr "ppdc: No se ha podido encontrar el archivo include \"%s\" en la línea %d de %s."
+msgstr ""
+"ppdc: No se ha podido encontrar el archivo include \"%s\" en la línea %d de "
+"%s."
 
-#: ppdc/ppdc.cxx:198
 #, c-format
 msgid "ppdc: Unable to find localization for \"%s\" - %s"
 msgstr "ppdc: No se ha podido encontrar localización para \"%s\" - %s"
 
-#: ppdc/ppdc.cxx:135
 #, c-format
 msgid "ppdc: Unable to load localization file \"%s\" - %s"
 msgstr "ppdc: No se ha podido cargar el archivo de localización \"%s\" - %s"
 
-#: ppdc/ppdc-file.cxx:50
 #, c-format
 msgid "ppdc: Unable to open %s: %s"
 msgstr "ppdc: No se pudo abrir %s: %s"
 
-#: ppdc/ppdc-source.cxx:2054
 #, c-format
 msgid "ppdc: Undefined variable (%s) on line %d of %s."
 msgstr "ppdc: Variable no definida (%s) en la línea %d de %s."
 
-#: ppdc/ppdc-catalog.cxx:435
 #, c-format
 msgid "ppdc: Unexpected text on line %d of %s."
 msgstr "ppdc: Texto inesperado en la línea %d del %s."
 
-#: ppdc/ppdc-source.cxx:2924
 #, c-format
 msgid "ppdc: Unknown driver type %s on line %d of %s."
 msgstr "ppdc: Tipo de controlador desconocido %s en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:906
 #, c-format
 msgid "ppdc: Unknown duplex type \"%s\" on line %d of %s."
 msgstr "ppdc: Tipo dúplex desconocido \"%s\" en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:3154
 #, c-format
 msgid "ppdc: Unknown media size \"%s\" on line %d of %s."
 msgstr "ppdc: Tamaño de papel desconocido \"%s\" en la línea %d de %s."
 
-#: ppdc/ppdc-catalog.cxx:463
 #, c-format
 msgid "ppdc: Unknown message catalog format for \"%s\"."
 msgstr "ppdc: Formato del catálogo de mensajes para \"%s\" desconocido."
 
-#: ppdc/ppdc-source.cxx:3408
 #, c-format
 msgid "ppdc: Unknown token \"%s\" seen on line %d of %s."
 msgstr "ppdc: Elemento desconocido \"%s\" visto en la línea %d de %s."
 
-#: ppdc/ppdc-source.cxx:1014
 #, c-format
-msgid "ppdc: Unknown trailing characters in real number \"%s\" on line %d of %s."
-msgstr "ppdc: Caracteres finales desconocidos en el número real \"%s\" en la línea %d de %s."
+msgid ""
+"ppdc: Unknown trailing characters in real number \"%s\" on line %d of %s."
+msgstr ""
+"ppdc: Caracteres finales desconocidos en el número real \"%s\" en la línea "
+"%d de %s."
 
-#: ppdc/ppdc-source.cxx:2164
 #, c-format
 msgid "ppdc: Unterminated string starting with %c on line %d of %s."
 msgstr "ppdc: Cadena que comienza por %c sin terminar en la línea %d de %s."
 
-#: ppdc/ppdc.cxx:365
 #, c-format
 msgid "ppdc: Warning - overlapping filename \"%s\"."
 msgstr "ppdc: Advertencia - nombre de archivo superpuesto \"%s\"."
 
-#: ppdc/ppdc.cxx:380
 #, c-format
 msgid "ppdc: Writing %s."
 msgstr "ppdc: Escribiendo %s."
 
-#: ppdc/ppdc.cxx:148
 #, c-format
 msgid "ppdc: Writing PPD files to directory \"%s\"."
 msgstr "ppdc: Escribiendo archivos PPD al directorio \"%s\"."
 
-#: ppdc/ppdmerge.cxx:136
 #, c-format
 msgid "ppdmerge: Bad LanguageVersion \"%s\" in %s."
 msgstr "ppdmerge: LanguageVersion \"%s\" incorrecto en %s."
 
-#: ppdc/ppdmerge.cxx:176
 #, c-format
 msgid "ppdmerge: Ignoring PPD file %s."
 msgstr "ppdmerge: Ignorando archivo PPD %s."
 
-#: ppdc/ppdmerge.cxx:160
 #, c-format
 msgid "ppdmerge: Unable to backup %s to %s - %s"
 msgstr "ppdmerge: No se ha podido hacer copia de seguridad de %s a %s- %s"
 
-#: systemv/lpstat.c:1784
 #, c-format
 msgid "printer %s disabled since %s -"
 msgstr "la impresora %s está deshabilitada desde %s -"
 
-#: systemv/lpstat.c:1773
 #, c-format
 msgid "printer %s is idle.  enabled since %s"
 msgstr "la impresora %s está inactiva.  activada desde %s"
 
-#: systemv/lpstat.c:1778
 #, c-format
 msgid "printer %s now printing %s-%d.  enabled since %s"
 msgstr "la impresora %s está imprimiendo %s-%d.  activada desde %s"
 
-#: systemv/lpstat.c:1909
 #, c-format
 msgid "printer %s/%s disabled since %s -"
 msgstr "la impresora %s/%s está desactivada desde %s -"
 
-#: systemv/lpstat.c:1895
 #, c-format
 msgid "printer %s/%s is idle.  enabled since %s"
 msgstr "la impresora %s/%s está inactiva.  activada desde %s"
 
-#: systemv/lpstat.c:1902
 #, c-format
 msgid "printer %s/%s now printing %s-%d.  enabled since %s"
 msgstr "la impresora %s/%s está imprimiendo %s-%d.  activada desde %s"
 
-#: cups/notify.c:93
-#: cups/notify.c:134
 msgid "processing"
 msgstr "en proceso"
 
-#: systemv/lp.c:644
 #, c-format
 msgid "request id is %s-%d (%d file(s))"
 msgstr "la id solicitada es %s-%d (%d archivo(s))"
 
-#: cups/snmp.c:1020
 msgid "request-id uses indefinite length"
 msgstr "request-id usa una longitud indefinida"
 
-#: systemv/lpstat.c:2048
 msgid "scheduler is not running"
 msgstr "el planificador de tareas no se está ejecutando"
 
-#: systemv/lpstat.c:2044
 msgid "scheduler is running"
 msgstr "el planificador de tareas se está ejecutando"
 
-#: cups/adminutil.c:2159
 #, c-format
 msgid "stat of %s failed: %s"
 msgstr "estado de %s ha fallado: %s"
 
-#: berkeley/lpc.c:211
 msgid "status\t\tShow status of daemon and queue."
 msgstr "status\t\tMuestra el estado del demonio (daemon) y la cola."
 
-#: cups/notify.c:96
-#: cups/notify.c:137
 msgid "stopped"
 msgstr "parada"
 
-#: systemv/lpstat.c:1017
 #, c-format
 msgid "system default destination: %s"
 msgstr "destino predeterminado del sistema: %s"
 
-#: systemv/lpstat.c:1014
 #, c-format
 msgid "system default destination: %s/%s"
 msgstr "destino predeterminado del sistema: %s/%s"
 
-#: cups/notify.c:108
-#: cups/notify.c:140
 msgid "unknown"
 msgstr "desconocido"
 
-#: cups/notify.c:117
 msgid "untitled"
 msgstr "sin título"
 
-#: cups/snmp.c:1045
 msgid "variable-bindings uses indefinite length"
 msgstr "variable-bindings usa una longitud indefinida"
-
diff --git a/locale/cups_fr.po b/locale/cups_fr.po
new file mode 100644
index 00000000..ba461bf4
--- /dev/null
+++ b/locale/cups_fr.po
@@ -0,0 +1,5196 @@
+#
+# "$Id$"
+#
+#   Message catalog template for CUPS.
+#
+#   Copyright 2007-2012 by Apple Inc.
+#   Copyright 2005-2007 by Easy Software Products.
+#
+#   These coded instructions, statements, and computer programs are the
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   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/".
+#
+#
+# Notes for Translators:
+#
+# The "checkpo" program located in the "locale" source directory can be used
+# to verify that your translations do not introduce formatting errors or other
+# problems.  Run with:
+#
+#    cd locale
+#    ./checkpo cups_LL.po
+#
+# where "LL" is your locale.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: CUPS 1.6\n"
+"Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
+"POT-Creation-Date: 2013-03-08 13:25-0500\n"
+"PO-Revision-Date: 2012-12-12 11:12+0100\n"
+"Last-Translator: denis meramdjougoma <dcmeram@libertysurf.fr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: French\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "\t\t(all)"
+msgstr ""
+
+msgid "\t\t(none)"
+msgstr ""
+
+#, c-format
+msgid "\t%d entries"
+msgstr ""
+
+#, c-format
+msgid "\t%s"
+msgstr ""
+
+msgid "\tAfter fault: continue"
+msgstr ""
+
+#, c-format
+msgid "\tAlerts: %s"
+msgstr ""
+
+msgid "\tBanner required"
+msgstr ""
+
+msgid "\tCharset sets:"
+msgstr ""
+
+msgid "\tConnection: direct"
+msgstr ""
+
+msgid "\tConnection: remote"
+msgstr ""
+
+msgid "\tContent types: any"
+msgstr ""
+
+msgid "\tDefault page size:"
+msgstr ""
+
+msgid "\tDefault pitch:"
+msgstr ""
+
+msgid "\tDefault port settings:"
+msgstr ""
+
+#, c-format
+msgid "\tDescription: %s"
+msgstr ""
+
+msgid "\tForm mounted:"
+msgstr ""
+
+msgid "\tForms allowed:"
+msgstr ""
+
+#, c-format
+msgid "\tInterface: %s.ppd"
+msgstr ""
+
+#, c-format
+msgid "\tInterface: %s/interfaces/%s"
+msgstr ""
+
+#, c-format
+msgid "\tInterface: %s/ppd/%s.ppd"
+msgstr ""
+
+#, c-format
+msgid "\tLocation: %s"
+msgstr ""
+
+msgid "\tOn fault: no alert"
+msgstr ""
+
+msgid "\tPrinter types: unknown"
+msgstr ""
+
+#, c-format
+msgid "\tStatus: %s"
+msgstr ""
+
+msgid "\tUsers allowed:"
+msgstr ""
+
+msgid "\tUsers denied:"
+msgstr ""
+
+msgid "\tdaemon present"
+msgstr ""
+
+msgid "\tno entries"
+msgstr ""
+
+#, c-format
+msgid "\tprinter is on device '%s' speed -1"
+msgstr ""
+
+msgid "\tprinting is disabled"
+msgstr ""
+
+msgid "\tprinting is enabled"
+msgstr ""
+
+#, c-format
+msgid "\tqueued for %s"
+msgstr ""
+
+msgid "\tqueuing is disabled"
+msgstr ""
+
+msgid "\tqueuing is enabled"
+msgstr ""
+
+msgid "\treason unknown"
+msgstr ""
+
+msgid ""
+"\n"
+"    DETAILED CONFORMANCE TEST RESULTS"
+msgstr ""
+
+msgid "                          Ignore specific warnings."
+msgstr ""
+
+msgid "                          Issue warnings instead of errors."
+msgstr ""
+
+msgid "                REF: Page 15, section 3.1."
+msgstr ""
+
+msgid "                REF: Page 15, section 3.2."
+msgstr ""
+
+msgid "                REF: Page 19, section 3.3."
+msgstr ""
+
+msgid "                REF: Page 20, section 3.4."
+msgstr ""
+
+msgid "                REF: Page 27, section 3.5."
+msgstr ""
+
+msgid "                REF: Page 42, section 5.2."
+msgstr ""
+
+msgid "                REF: Pages 16-17, section 3.2."
+msgstr ""
+
+msgid "                REF: Pages 42-45, section 5.2."
+msgstr ""
+
+msgid "                REF: Pages 45-46, section 5.2."
+msgstr ""
+
+msgid "                REF: Pages 48-49, section 5.2."
+msgstr ""
+
+msgid "                REF: Pages 52-54, section 5.2."
+msgstr ""
+
+#, c-format
+msgid "        %-39.39s %.0f bytes"
+msgstr ""
+
+#, c-format
+msgid "        PASS    Default%s"
+msgstr ""
+
+msgid "        PASS    DefaultImageableArea"
+msgstr ""
+
+msgid "        PASS    DefaultPaperDimension"
+msgstr ""
+
+msgid "        PASS    FileVersion"
+msgstr ""
+
+msgid "        PASS    FormatVersion"
+msgstr ""
+
+msgid "        PASS    LanguageEncoding"
+msgstr ""
+
+msgid "        PASS    LanguageVersion"
+msgstr ""
+
+msgid "        PASS    Manufacturer"
+msgstr ""
+
+msgid "        PASS    ModelName"
+msgstr ""
+
+msgid "        PASS    NickName"
+msgstr ""
+
+msgid "        PASS    PCFileName"
+msgstr ""
+
+msgid "        PASS    PSVersion"
+msgstr ""
+
+msgid "        PASS    PageRegion"
+msgstr ""
+
+msgid "        PASS    PageSize"
+msgstr ""
+
+msgid "        PASS    Product"
+msgstr ""
+
+msgid "        PASS    ShortNickName"
+msgstr ""
+
+#, c-format
+msgid "        WARN    %s has no corresponding options."
+msgstr ""
+
+#, c-format
+msgid ""
+"        WARN    %s shares a common prefix with %s\n"
+"                REF: Page 15, section 3.2."
+msgstr ""
+
+#, c-format
+msgid ""
+"        WARN    Duplex option keyword %s may not work as expected and should "
+"be named Duplex.\n"
+"                REF: Page 122, section 5.17"
+msgstr ""
+
+msgid "        WARN    File contains a mix of CR, LF, and CR LF line endings."
+msgstr ""
+
+msgid ""
+"        WARN    LanguageEncoding required by PPD 4.3 spec.\n"
+"                REF: Pages 56-57, section 5.3."
+msgstr ""
+
+#, c-format
+msgid "        WARN    Line %d only contains whitespace."
+msgstr ""
+
+msgid ""
+"        WARN    Manufacturer required by PPD 4.3 spec.\n"
+"                REF: Pages 58-59, section 5.3."
+msgstr ""
+
+msgid ""
+"        WARN    Non-Windows PPD files should use lines ending with only LF, "
+"not CR LF."
+msgstr ""
+
+#, c-format
+msgid ""
+"        WARN    Obsolete PPD version %.1f.\n"
+"                REF: Page 42, section 5.2."
+msgstr ""
+
+msgid ""
+"        WARN    PCFileName longer than 8.3 in violation of PPD spec.\n"
+"                REF: Pages 61-62, section 5.3."
+msgstr ""
+
+msgid ""
+"        WARN    PCFileName should contain a unique filename.\n"
+"                REF: Pages 61-62, section 5.3."
+msgstr ""
+
+msgid ""
+"        WARN    Protocols contains PJL but JCL attributes are not set.\n"
+"                REF: Pages 78-79, section 5.7."
+msgstr ""
+
+msgid ""
+"        WARN    Protocols contains both PJL and BCP; expected TBCP.\n"
+"                REF: Pages 78-79, section 5.7."
+msgstr ""
+
+msgid ""
+"        WARN    ShortNickName required by PPD 4.3 spec.\n"
+"                REF: Pages 64-65, section 5.3."
+msgstr ""
+
+msgid "       cupsaddsmb [options] -a"
+msgstr ""
+
+msgid "       cupstestdsc [options] -"
+msgstr ""
+
+msgid "       program | cupstestppd [options] -"
+msgstr ""
+
+#, c-format
+msgid ""
+"      %s  \"%s %s\" conflicts with \"%s %s\"\n"
+"                (constraint=\"%s %s %s %s\")."
+msgstr ""
+
+#, c-format
+msgid "      %s  %s %s does not exist."
+msgstr ""
+
+#, c-format
+msgid "      %s  %s file \"%s\" has the wrong capitalization."
+msgstr ""
+
+#, c-format
+msgid ""
+"      %s  Bad %s choice %s.\n"
+"                REF: Page 122, section 5.17"
+msgstr ""
+
+#, c-format
+msgid "      %s  Bad UTF-8 \"%s\" translation string for option %s, choice %s."
+msgstr ""
+
+#, c-format
+msgid "      %s  Bad UTF-8 \"%s\" translation string for option %s."
+msgstr ""
+
+#, c-format
+msgid "      %s  Bad cupsFilter value \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "      %s  Bad cupsFilter2 value \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "      %s  Bad cupsICCProfile %s."
+msgstr ""
+
+#, c-format
+msgid "      %s  Bad cupsPreFilter value \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "      %s  Bad cupsUIConstraints %s: \"%s\""
+msgstr ""
+
+#, c-format
+msgid "      %s  Bad language \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "      %s  Bad permissions on %s file \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "      %s  Bad spelling of %s - should be %s."
+msgstr ""
+
+#, c-format
+msgid "      %s  Cannot provide both APScanAppPath and APScanAppBundleID."
+msgstr ""
+
+#, c-format
+msgid "      %s  Default choices conflicting."
+msgstr ""
+
+#, c-format
+msgid "      %s  Empty cupsUIConstraints %s"
+msgstr ""
+
+#, c-format
+msgid "      %s  Missing \"%s\" translation string for option %s, choice %s."
+msgstr ""
+
+#, c-format
+msgid "      %s  Missing \"%s\" translation string for option %s."
+msgstr ""
+
+#, c-format
+msgid "      %s  Missing %s file \"%s\"."
+msgstr ""
+
+#, c-format
+msgid ""
+"      %s  Missing REQUIRED PageRegion option.\n"
+"                REF: Page 100, section 5.14."
+msgstr ""
+
+#, c-format
+msgid ""
+"      %s  Missing REQUIRED PageSize option.\n"
+"                REF: Page 99, section 5.14."
+msgstr ""
+
+#, c-format
+msgid "      %s  Missing choice *%s %s in UIConstraints \"*%s %s *%s %s\"."
+msgstr ""
+
+#, c-format
+msgid "      %s  Missing choice *%s %s in cupsUIConstraints %s: \"%s\""
+msgstr ""
+
+#, c-format
+msgid "      %s  Missing cupsUIResolver %s"
+msgstr ""
+
+#, c-format
+msgid "      %s  Missing option %s in UIConstraints \"*%s %s *%s %s\"."
+msgstr ""
+
+#, c-format
+msgid "      %s  Missing option %s in cupsUIConstraints %s: \"%s\""
+msgstr ""
+
+#, c-format
+msgid "      %s  No base translation \"%s\" is included in file."
+msgstr ""
+
+#, c-format
+msgid ""
+"      %s  REQUIRED %s does not define choice None.\n"
+"                REF: Page 122, section 5.17"
+msgstr ""
+
+#, c-format
+msgid "      %s  Size \"%s\" defined for %s but not for %s."
+msgstr ""
+
+#, c-format
+msgid "      %s  Size \"%s\" has unexpected dimensions (%gx%g)."
+msgstr ""
+
+#, c-format
+msgid "      %s  Size \"%s\" should be \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "      %s  Size \"%s\" should be the Adobe standard name \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "      %s  cupsICCProfile %s hash value collides with %s."
+msgstr ""
+
+#, c-format
+msgid "      %s  cupsUIResolver %s causes a loop."
+msgstr ""
+
+#, c-format
+msgid ""
+"      %s  cupsUIResolver %s does not list at least two different options."
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  %s must be 1284DeviceID\n"
+"                REF: Page 72, section 5.5"
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  Bad Default%s %s\n"
+"                REF: Page 40, section 4.5."
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  Bad DefaultImageableArea %s\n"
+"                REF: Page 102, section 5.15."
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  Bad DefaultPaperDimension %s\n"
+"                REF: Page 103, section 5.15."
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  Bad FileVersion \"%s\"\n"
+"                REF: Page 56, section 5.3."
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  Bad FormatVersion \"%s\"\n"
+"                REF: Page 56, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  Bad JobPatchFile attribute in file\n"
+"                REF: Page 24, section 3.4."
+msgstr ""
+
+#, c-format
+msgid "      **FAIL**  Bad LanguageEncoding %s - must be ISOLatin1."
+msgstr ""
+
+#, c-format
+msgid "      **FAIL**  Bad LanguageVersion %s - must be English."
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  Bad Manufacturer (should be \"%s\")\n"
+"                REF: Page 211, table D.1."
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  Bad ModelName - \"%c\" not allowed in string.\n"
+"                REF: Pages 59-60, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  Bad PSVersion - not \"(string) int\".\n"
+"                REF: Pages 62-64, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  Bad Product - not \"(string)\".\n"
+"                REF: Page 62, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  Bad ShortNickName - longer than 31 chars.\n"
+"                REF: Pages 64-65, section 5.3."
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  Bad option %s choice %s\n"
+"                REF: Page 84, section 5.9"
+msgstr ""
+
+#, c-format
+msgid "      **FAIL**  Default option code cannot be interpreted: %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  Default translation string for option %s choice %s contains "
+"8-bit characters."
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  Default translation string for option %s contains 8-bit "
+"characters."
+msgstr ""
+
+#, c-format
+msgid "      **FAIL**  Group names %s and %s differ only by case."
+msgstr ""
+
+#, c-format
+msgid "      **FAIL**  Multiple occurrences of option %s choice name %s."
+msgstr ""
+
+#, c-format
+msgid "      **FAIL**  Option %s choice names %s and %s differ only by case."
+msgstr ""
+
+#, c-format
+msgid "      **FAIL**  Option names %s and %s differ only by case."
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  REQUIRED Default%s\n"
+"                REF: Page 40, section 4.5."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED DefaultImageableArea\n"
+"                REF: Page 102, section 5.15."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED DefaultPaperDimension\n"
+"                REF: Page 103, section 5.15."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED FileVersion\n"
+"                REF: Page 56, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED FormatVersion\n"
+"                REF: Page 56, section 5.3."
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  REQUIRED ImageableArea for PageSize %s\n"
+"                REF: Page 41, section 5.\n"
+"                REF: Page 102, section 5.15."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED LanguageEncoding\n"
+"                REF: Pages 56-57, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED LanguageVersion\n"
+"                REF: Pages 57-58, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED Manufacturer\n"
+"                REF: Pages 58-59, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED ModelName\n"
+"                REF: Pages 59-60, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED NickName\n"
+"                REF: Page 60, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED PCFileName\n"
+"                REF: Pages 61-62, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED PSVersion\n"
+"                REF: Pages 62-64, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED PageRegion\n"
+"                REF: Page 100, section 5.14."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED PageSize\n"
+"                REF: Page 41, section 5.\n"
+"                REF: Page 99, section 5.14."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED PageSize\n"
+"                REF: Pages 99-100, section 5.14."
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  REQUIRED PaperDimension for PageSize %s\n"
+"                REF: Page 41, section 5.\n"
+"                REF: Page 103, section 5.15."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED Product\n"
+"                REF: Page 62, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED ShortNickName\n"
+"                REF: Page 64-65, section 5.3."
+msgstr ""
+
+#, c-format
+msgid "      **FAIL**  Unable to open PPD file - %s on line %d."
+msgstr ""
+
+#, c-format
+msgid "    %d ERRORS FOUND"
+msgstr ""
+
+msgid "    -h       Show program usage"
+msgstr ""
+
+#, c-format
+msgid ""
+"    Bad %%%%BoundingBox: on line %d.\n"
+"        REF: Page 39, %%%%BoundingBox:"
+msgstr ""
+
+#, c-format
+msgid ""
+"    Bad %%%%Page: on line %d.\n"
+"        REF: Page 53, %%%%Page:"
+msgstr ""
+
+#, c-format
+msgid ""
+"    Bad %%%%Pages: on line %d.\n"
+"        REF: Page 43, %%%%Pages:"
+msgstr ""
+
+#, c-format
+msgid ""
+"    Line %d is longer than 255 characters (%d).\n"
+"        REF: Page 25, Line Length"
+msgstr ""
+
+msgid ""
+"    Missing %!PS-Adobe-3.0 on first line.\n"
+"        REF: Page 17, 3.1 Conforming Documents"
+msgstr ""
+
+#, c-format
+msgid "    Missing %%EndComments comment.        REF: Page 41, %%EndComments"
+msgstr ""
+
+#, c-format
+msgid ""
+"    Missing or bad %%BoundingBox: comment.\n"
+"        REF: Page 39, %%BoundingBox:"
+msgstr ""
+
+#, c-format
+msgid ""
+"    Missing or bad %%Page: comments.\n"
+"        REF: Page 53, %%Page:"
+msgstr ""
+
+#, c-format
+msgid ""
+"    Missing or bad %%Pages: comment.\n"
+"        REF: Page 43, %%Pages:"
+msgstr ""
+
+msgid "    NO ERRORS FOUND"
+msgstr ""
+
+#, c-format
+msgid "    Saw %d lines that exceeded 255 characters."
+msgstr ""
+
+#, c-format
+msgid "    Too many %%BeginDocument comments."
+msgstr ""
+
+#, c-format
+msgid "    Too many %%EndDocument comments."
+msgstr ""
+
+msgid "    Warning: file contains binary data."
+msgstr ""
+
+#, c-format
+msgid "    Warning: no %%EndComments comment in file."
+msgstr ""
+
+#, c-format
+msgid "    Warning: obsolete DSC version %.1f in file."
+msgstr ""
+
+msgid "  --[no-]debug-logging    Turn debug logging on/off."
+msgstr ""
+
+msgid "  --[no-]remote-admin     Turn remote administration on/off."
+msgstr ""
+
+msgid "  --[no-]remote-any       Allow/prevent access from the Internet."
+msgstr ""
+
+msgid "  --[no-]share-printers   Turn printer sharing on/off."
+msgstr ""
+
+msgid "  --[no-]user-cancel-any  Allow/prevent users to cancel any job."
+msgstr ""
+
+msgid "  --cr                    End lines with CR (Mac OS 9)."
+msgstr ""
+
+msgid "  --crlf                  End lines with CR + LF (Windows)."
+msgstr ""
+
+msgid "  --lf                    End lines with LF (UNIX/Linux/OS X)."
+msgstr ""
+
+msgid "  -4                      Connect using IPv4."
+msgstr ""
+
+msgid "  -6                      Connect using IPv6."
+msgstr ""
+
+msgid "  -C                      Send requests using chunking (default)."
+msgstr ""
+
+msgid "  -D                      Remove the input file when finished."
+msgstr ""
+
+msgid "  -D name=value           Set named variable to value."
+msgstr ""
+
+msgid "  -E                      Encrypt the connection."
+msgstr ""
+
+msgid "  -E                      Test with HTTP Upgrade to TLS."
+msgstr ""
+
+msgid ""
+"  -F                      Run in the foreground but detach from console."
+msgstr ""
+
+msgid "  -H samba-server         Use the named SAMBA server."
+msgstr ""
+
+msgid "  -I                      Ignore errors."
+msgstr ""
+
+msgid "  -I include-dir          Add include directory to search path."
+msgstr ""
+
+msgid "  -I {filename,filters,none,profiles}"
+msgstr ""
+
+msgid "  -L                      Send requests using content-length."
+msgstr ""
+
+msgid "  -P filename.ppd         Set PPD file."
+msgstr ""
+
+msgid "  -R root-directory       Set alternate root."
+msgstr ""
+
+msgid "  -S                      Test with SSL encryption."
+msgstr ""
+
+msgid "  -T seconds              Set the receive/send timeout in seconds."
+msgstr ""
+
+msgid "  -U username             Specify username."
+msgstr ""
+
+msgid "  -V version              Set default IPP version."
+msgstr ""
+
+msgid ""
+"  -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,"
+"translations}"
+msgstr ""
+
+msgid "  -X                      Produce XML plist instead of plain text."
+msgstr ""
+
+msgid "  -a                      Export all printers."
+msgstr ""
+
+msgid "  -c catalog.po           Load the specified message catalog."
+msgstr ""
+
+msgid "  -c cupsd.conf           Set cupsd.conf file to use."
+msgstr ""
+
+msgid "  -d name=value           Set named variable to value."
+msgstr ""
+
+msgid "  -d output-dir           Specify the output directory."
+msgstr ""
+
+msgid "  -d printer              Use the named printer."
+msgstr ""
+
+msgid "  -e                      Use every filter from the PPD file."
+msgstr ""
+
+msgid "  -f                      Run in the foreground."
+msgstr ""
+
+msgid "  -f filename             Set default request filename."
+msgstr ""
+
+msgid "  -h                      Show this usage message."
+msgstr ""
+
+msgid "  -h server[:port]        Specify server address."
+msgstr ""
+
+msgid "  -i mime/type            Set input MIME type (otherwise auto-typed)."
+msgstr ""
+
+msgid ""
+"  -i seconds              Repeat the last file with the given time interval."
+msgstr ""
+
+msgid ""
+"  -j job-id[,N]           Filter file N from the specified job (default is "
+"file 1)."
+msgstr ""
+
+msgid "  -l                      Run cupsd from launchd(8)."
+msgstr ""
+
+msgid "  -l lang[,lang,...]      Specify the output language(s) (locale)."
+msgstr ""
+
+msgid "  -m                      Use the ModelName value as the filename."
+msgstr ""
+
+msgid ""
+"  -m mime/type            Set output MIME type (otherwise application/pdf)."
+msgstr ""
+
+msgid "  -n copies               Set number of copies."
+msgstr ""
+
+msgid ""
+"  -n count                Repeat the last file the given number of times."
+msgstr ""
+
+msgid ""
+"  -o filename.drv         Set driver information file (otherwise ppdi.drv)."
+msgstr ""
+
+msgid "  -o filename.ppd[.gz]    Set output file (otherwise stdout)."
+msgstr ""
+
+msgid "  -o name=value           Set option(s)."
+msgstr ""
+
+msgid "  -p filename.ppd         Set PPD file."
+msgstr ""
+
+msgid "  -q                      Run silently."
+msgstr ""
+
+msgid "  -r                      Use 'relaxed' open mode."
+msgstr ""
+
+msgid "  -t                      Produce a test report."
+msgstr ""
+
+msgid "  -t                      Test PPDs instead of generating them."
+msgstr ""
+
+msgid "  -t                      Test the configuration file."
+msgstr ""
+
+msgid "  -t title                Set title."
+msgstr ""
+
+msgid "  -u                      Remove the PPD file when finished."
+msgstr ""
+
+msgid "  -v                      Be verbose."
+msgstr ""
+
+msgid "  -vv                     Be very verbose."
+msgstr ""
+
+msgid "  -z                      Compress PPD files using GNU zip."
+msgstr ""
+
+msgid " FAIL"
+msgstr ""
+
+msgid " PASS"
+msgstr ""
+
+#, c-format
+msgid "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes"
+msgstr ""
+
+#, c-format
+msgid "%-7s %-7.7s %-7d %-31.31s %.0f bytes"
+msgstr ""
+
+#, c-format
+msgid "%s accepting requests since %s"
+msgstr ""
+
+#, c-format
+msgid "%s cannot be changed."
+msgstr "Impossible de modifier « %s »"
+
+#, c-format
+msgid "%s is not implemented by the CUPS version of lpc."
+msgstr ""
+
+#, c-format
+msgid "%s is not ready"
+msgstr ""
+
+#, c-format
+msgid "%s is ready"
+msgstr ""
+
+#, c-format
+msgid "%s is ready and printing"
+msgstr ""
+
+#, c-format
+msgid "%s job-id user title copies options [file]"
+msgstr ""
+
+#, c-format
+msgid "%s not accepting requests since %s -"
+msgstr ""
+
+#, c-format
+msgid "%s not supported."
+msgstr ""
+
+#, c-format
+msgid "%s/%s accepting requests since %s"
+msgstr ""
+
+#, c-format
+msgid "%s/%s not accepting requests since %s -"
+msgstr ""
+
+#, c-format
+msgid "%s: %-33.33s [job %d localhost]"
+msgstr ""
+
+#. TRANSLATORS: Message is "subject: error"
+#, c-format
+msgid "%s: %s"
+msgstr ""
+
+#, c-format
+msgid "%s: %s failed: %s"
+msgstr ""
+
+#, c-format
+msgid "%s: Don't know what to do."
+msgstr ""
+
+#, c-format
+msgid ""
+"%s: Error - %s environment variable names non-existent destination \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - bad job ID."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - cannot print files and alter jobs simultaneously."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - cannot print from stdin if files or a job ID are provided."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected character set after \"-S\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected content type after \"-T\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected copies after \"-#\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected copies after \"-n\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected destination after \"-P\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected destination after \"-b\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected destination after \"-d\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected form after \"-f\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected hold name after \"-H\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected hostname after \"-H\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected hostname after \"-h\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected mode list after \"-y\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected name after \"-%c\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected option=value after \"-o\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected page list after \"-P\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected priority after \"-%c\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected reason text after \"-r\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected title after \"-t\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected username after \"-U\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected username after \"-u\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected value after \"-%c\" option."
+msgstr ""
+
+#, c-format
+msgid ""
+"%s: Error - need \"completed\", \"not-completed\", or \"all\" after \"-W\" "
+"option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - no default destination available."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - priority must be between 1 and 100."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - scheduler not responding."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - too many files - \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - unable to access \"%s\" - %s"
+msgstr ""
+
+#, c-format
+msgid "%s: Error - unable to queue from stdin - %s."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - unknown destination \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - unknown destination \"%s/%s\"."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - unknown option \"%c\"."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - unknown option \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "%s: Expected job ID after \"-i\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Invalid destination name in list \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "%s: Invalid filter string \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "%s: Need job ID (\"-i jobid\") before \"-H restart\"."
+msgstr ""
+
+#, c-format
+msgid "%s: No filter to convert from %s/%s to %s/%s."
+msgstr ""
+
+#, c-format
+msgid "%s: Operation failed: %s"
+msgstr ""
+
+#, c-format
+msgid "%s: Sorry, no encryption support."
+msgstr ""
+
+#, c-format
+msgid "%s: Unable to connect to server."
+msgstr ""
+
+#, c-format
+msgid "%s: Unable to contact server."
+msgstr ""
+
+#, c-format
+msgid "%s: Unable to determine MIME type of \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "%s: Unable to open %s: %s"
+msgstr ""
+
+#, c-format
+msgid "%s: Unable to open PPD file: %s on line %d."
+msgstr ""
+
+#, c-format
+msgid "%s: Unable to read MIME database from \"%s\" or \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "%s: Unknown destination \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "%s: Unknown destination MIME type %s/%s."
+msgstr ""
+
+#, c-format
+msgid "%s: Unknown option \"%c\"."
+msgstr ""
+
+#, c-format
+msgid "%s: Unknown source MIME type %s/%s."
+msgstr ""
+
+#, c-format
+msgid ""
+"%s: Warning - \"%c\" format modifier not supported - output may not be "
+"correct."
+msgstr ""
+
+#, c-format
+msgid "%s: Warning - character set option ignored."
+msgstr ""
+
+#, c-format
+msgid "%s: Warning - content type option ignored."
+msgstr ""
+
+#, c-format
+msgid "%s: Warning - form option ignored."
+msgstr ""
+
+#, c-format
+msgid "%s: Warning - mode option ignored."
+msgstr ""
+
+msgid "-1"
+msgstr "-1"
+
+msgid "-10"
+msgstr "-10"
+
+msgid "-100"
+msgstr "-100"
+
+msgid "-105"
+msgstr "-105"
+
+msgid "-11"
+msgstr "-11"
+
+msgid "-110"
+msgstr "-110"
+
+msgid "-115"
+msgstr "-115"
+
+msgid "-12"
+msgstr "-12"
+
+msgid "-120"
+msgstr "-120"
+
+msgid "-13"
+msgstr "-13"
+
+msgid "-14"
+msgstr "-14"
+
+msgid "-15"
+msgstr "-15"
+
+msgid "-2"
+msgstr "-2"
+
+msgid "-20"
+msgstr "-20"
+
+msgid "-25"
+msgstr "-25"
+
+msgid "-3"
+msgstr "-3"
+
+msgid "-30"
+msgstr "-30"
+
+msgid "-35"
+msgstr "-35"
+
+msgid "-4"
+msgstr "-4"
+
+msgid "-40"
+msgstr "-40"
+
+msgid "-45"
+msgstr "-45"
+
+msgid "-5"
+msgstr "-5"
+
+msgid "-50"
+msgstr "-50"
+
+msgid "-55"
+msgstr "-55"
+
+msgid "-6"
+msgstr "-6"
+
+msgid "-60"
+msgstr "-60"
+
+msgid "-65"
+msgstr "-65"
+
+msgid "-7"
+msgstr "-7"
+
+msgid "-70"
+msgstr "-70"
+
+msgid "-75"
+msgstr "-75"
+
+msgid "-8"
+msgstr "-8"
+
+msgid "-80"
+msgstr "-80"
+
+msgid "-85"
+msgstr "-85"
+
+msgid "-9"
+msgstr "-9"
+
+msgid "-90"
+msgstr "-90"
+
+msgid "-95"
+msgstr "-95"
+
+msgid "0"
+msgstr "0"
+
+msgid "1"
+msgstr "1"
+
+msgid "1 inch/sec."
+msgstr "1 po/s"
+
+msgid "1.25x0.25\""
+msgstr "1,25 x 0,25\""
+
+msgid "1.25x2.25\""
+msgstr "1,25 x 2,25\""
+
+msgid "1.5 inch/sec."
+msgstr "1,5 po/s"
+
+msgid "1.50x0.25\""
+msgstr "1,50 x 0,25\""
+
+msgid "1.50x0.50\""
+msgstr "1,50 x 0,50\""
+
+msgid "1.50x1.00\""
+msgstr "1,50 x 1,00\""
+
+msgid "1.50x2.00\""
+msgstr "1,50 x 2,00\""
+
+msgid "10"
+msgstr "10"
+
+msgid "10 inches/sec."
+msgstr "10 po/s"
+
+msgid "10 x 11"
+msgstr ""
+
+msgid "10 x 13"
+msgstr ""
+
+msgid "10 x 14"
+msgstr ""
+
+msgid "100"
+msgstr "100"
+
+msgid "100 mm/sec."
+msgstr "100 mm/s"
+
+msgid "105"
+msgstr "105"
+
+msgid "11"
+msgstr "11"
+
+msgid "11 inches/sec."
+msgstr "11 po/s"
+
+msgid "110"
+msgstr "110"
+
+msgid "115"
+msgstr "115"
+
+msgid "12"
+msgstr "12"
+
+msgid "12 inches/sec."
+msgstr "12 po/s"
+
+msgid "12 x 11"
+msgstr ""
+
+msgid "120"
+msgstr "120"
+
+msgid "120 mm/sec."
+msgstr "120 mm/s"
+
+msgid "120x60dpi"
+msgstr "120 x 60 ppp"
+
+msgid "120x72dpi"
+msgstr "120 x 72 ppp"
+
+msgid "13"
+msgstr "13"
+
+msgid "136dpi"
+msgstr "136 ppp"
+
+msgid "14"
+msgstr "14"
+
+msgid "15"
+msgstr "15"
+
+msgid "15 mm/sec."
+msgstr "15 mm/s"
+
+msgid "15 x 11"
+msgstr ""
+
+msgid "150 mm/sec."
+msgstr "150 mm/s"
+
+msgid "150dpi"
+msgstr "150 ppp"
+
+msgid "16"
+msgstr "16"
+
+msgid "17"
+msgstr "17"
+
+msgid "18"
+msgstr "18"
+
+msgid "180dpi"
+msgstr "180 ppp"
+
+msgid "19"
+msgstr "19"
+
+msgid "2"
+msgstr "2"
+
+msgid "2 inches/sec."
+msgstr "2 po/s"
+
+msgid "2-Sided Printing"
+msgstr "Impression recto-verso"
+
+msgid "2.00x0.37\""
+msgstr "2,00 x 0,37\""
+
+msgid "2.00x0.50\""
+msgstr "2,00 x 0,50\""
+
+msgid "2.00x1.00\""
+msgstr "2,00 x 1,00\""
+
+msgid "2.00x1.25\""
+msgstr "2,00 x 1,25\""
+
+msgid "2.00x2.00\""
+msgstr "2,00 x 2,00\""
+
+msgid "2.00x3.00\""
+msgstr "2,00 x 3,00\""
+
+msgid "2.00x4.00\""
+msgstr "2,00 x 4,00\""
+
+msgid "2.00x5.50\""
+msgstr "2,00 x 5,50\""
+
+msgid "2.25x0.50\""
+msgstr "2,25 x 0,50\""
+
+msgid "2.25x1.25\""
+msgstr "2,25 x 1,25\""
+
+msgid "2.25x4.00\""
+msgstr "2,25 x 4,00\""
+
+msgid "2.25x5.50\""
+msgstr "2,25 x 5,50\""
+
+msgid "2.38x5.50\""
+msgstr "2,38 x 5,50\""
+
+msgid "2.5 inches/sec."
+msgstr "2,5 po/s"
+
+msgid "2.50x1.00\""
+msgstr "2,50 x 1,00\""
+
+msgid "2.50x2.00\""
+msgstr "2,50 x 2,00\""
+
+msgid "2.75x1.25\""
+msgstr "2,75 x 1,25\""
+
+msgid "2.9 x 1\""
+msgstr "2.9 x 1\""
+
+msgid "20"
+msgstr "20"
+
+msgid "20 mm/sec."
+msgstr "20 mm/s"
+
+msgid "200 mm/sec."
+msgstr "200 mm/s"
+
+msgid "203dpi"
+msgstr "203 ppp"
+
+msgid "21"
+msgstr "21"
+
+msgid "22"
+msgstr "22"
+
+msgid "23"
+msgstr "23"
+
+msgid "24"
+msgstr "24"
+
+msgid "24-Pin Series"
+msgstr "Série 24 broches"
+
+msgid "240x72dpi"
+msgstr "240 x 72 ppp"
+
+msgid "25"
+msgstr "25"
+
+msgid "250 mm/sec."
+msgstr "250 mm/s"
+
+msgid "26"
+msgstr "26"
+
+msgid "27"
+msgstr "27"
+
+msgid "28"
+msgstr "28"
+
+msgid "29"
+msgstr "29"
+
+msgid "3"
+msgstr "3"
+
+msgid "3 inches/sec."
+msgstr "3 po/s"
+
+msgid "3 x 5"
+msgstr ""
+
+msgid "3.00x1.00\""
+msgstr "3,00 x 1,00\""
+
+msgid "3.00x1.25\""
+msgstr "3,00 x 1,25\""
+
+msgid "3.00x2.00\""
+msgstr "3,00 x 2,00\""
+
+msgid "3.00x3.00\""
+msgstr "3,00 x 3,00\""
+
+msgid "3.00x5.00\""
+msgstr "3,00 x 5,00\""
+
+msgid "3.25x2.00\""
+msgstr "3,25 x 2,00\""
+
+msgid "3.25x5.00\""
+msgstr "3,25 x 5,00\""
+
+msgid "3.25x5.50\""
+msgstr "3,25 x 5,50\""
+
+msgid "3.25x5.83\""
+msgstr "3,25 x 5,83\""
+
+msgid "3.25x7.83\""
+msgstr "3,25 x 7,83\""
+
+msgid "3.5 x 5"
+msgstr ""
+
+msgid "3.5\" Disk"
+msgstr "Disque 3,5\""
+
+msgid "3.50x1.00\""
+msgstr "3,50 x 1,00\""
+
+msgid "30"
+msgstr "30"
+
+msgid "30 mm/sec."
+msgstr "30 mm/s"
+
+msgid "300 mm/sec."
+msgstr "300 mm/s"
+
+msgid "300dpi"
+msgstr "300 ppp"
+
+msgid "35"
+msgstr "35"
+
+msgid "360dpi"
+msgstr "360 ppp"
+
+msgid "360x180dpi"
+msgstr "360 x 180 ppp"
+
+msgid "4"
+msgstr "4"
+
+msgid "4 inches/sec."
+msgstr "4 po/s"
+
+msgid "4.00x1.00\""
+msgstr "4,00 x 1,00\""
+
+msgid "4.00x13.00\""
+msgstr "4,00 x 13,00\""
+
+msgid "4.00x2.00\""
+msgstr "4,00 x 2,00\""
+
+msgid "4.00x2.50\""
+msgstr "4,00 x 2,50\""
+
+msgid "4.00x3.00\""
+msgstr "4,00 x 3,00\""
+
+msgid "4.00x4.00\""
+msgstr "4,00 x 4,00\""
+
+msgid "4.00x5.00\""
+msgstr "4,00 x 5,00\""
+
+msgid "4.00x6.00\""
+msgstr "4,00 x 6,00\""
+
+msgid "4.00x6.50\""
+msgstr "4,00 x 6,50\""
+
+msgid "40"
+msgstr "40"
+
+msgid "40 mm/sec."
+msgstr "40 mm/s"
+
+msgid "45"
+msgstr "45"
+
+msgid "5"
+msgstr "5"
+
+msgid "5 inches/sec."
+msgstr "5 po/s"
+
+msgid "5 x 7"
+msgstr ""
+
+msgid "50"
+msgstr "50"
+
+msgid "55"
+msgstr "55"
+
+msgid "6"
+msgstr "6"
+
+msgid "6 inches/sec."
+msgstr "6 po/s"
+
+msgid "6.00x1.00\""
+msgstr "6,00 x 1,00\""
+
+msgid "6.00x2.00\""
+msgstr "6,00 x 2,00\""
+
+msgid "6.00x3.00\""
+msgstr "6,00 x 3,00\""
+
+msgid "6.00x4.00\""
+msgstr "6,00 x 4,00\""
+
+msgid "6.00x5.00\""
+msgstr "6,00 x 5,00\""
+
+msgid "6.00x6.00\""
+msgstr "6,00 x 6,00\""
+
+msgid "6.00x6.50\""
+msgstr "6,00 x 6,50\""
+
+msgid "60"
+msgstr "60"
+
+msgid "60 mm/sec."
+msgstr "60 mm/s"
+
+msgid "600dpi"
+msgstr "600 ppp"
+
+msgid "60dpi"
+msgstr "60 ppp"
+
+msgid "60x72dpi"
+msgstr ""
+
+msgid "65"
+msgstr "65"
+
+msgid "7"
+msgstr "7"
+
+msgid "7 inches/sec."
+msgstr "7 po/s"
+
+msgid "7 x 9"
+msgstr ""
+
+msgid "70"
+msgstr "70"
+
+msgid "720dpi"
+msgstr "720 ppp"
+
+msgid "75"
+msgstr "75"
+
+msgid "8"
+msgstr "8"
+
+msgid "8 inches/sec."
+msgstr "8 po/s"
+
+msgid "8 x 10"
+msgstr ""
+
+msgid "8.00x1.00\""
+msgstr "8,00 x 1,00\""
+
+msgid "8.00x2.00\""
+msgstr "8,00 x 2,00\""
+
+msgid "8.00x3.00\""
+msgstr "8,00 x 3,00\""
+
+msgid "8.00x4.00\""
+msgstr "8,00 x 4,00\""
+
+msgid "8.00x5.00\""
+msgstr "8,00 x 5,00\""
+
+msgid "8.00x6.00\""
+msgstr "8,00 x 6,00\""
+
+msgid "8.00x6.50\""
+msgstr "8,00 x 6,50\""
+
+msgid "80"
+msgstr "80"
+
+msgid "80 mm/sec."
+msgstr "80 mm/s"
+
+msgid "85"
+msgstr "85"
+
+msgid "9"
+msgstr "9"
+
+msgid "9 inches/sec."
+msgstr "9 po/s"
+
+msgid "9 x 11"
+msgstr ""
+
+msgid "9 x 12"
+msgstr ""
+
+msgid "9-Pin Series"
+msgstr "Série 9 broches"
+
+msgid "90"
+msgstr "90"
+
+msgid "95"
+msgstr "95"
+
+msgid "?Invalid help command unknown."
+msgstr ""
+
+msgid "A Samba password is required to export printer drivers"
+msgstr ""
+
+msgid "A Samba username is required to export printer drivers"
+msgstr ""
+
+#, c-format
+msgid "A class named \"%s\" already exists."
+msgstr ""
+
+#, c-format
+msgid "A printer named \"%s\" already exists."
+msgstr ""
+
+msgid "A0"
+msgstr "A0"
+
+msgid "A0 Long Edge"
+msgstr ""
+
+msgid "A1"
+msgstr "A1"
+
+msgid "A1 Long Edge"
+msgstr ""
+
+msgid "A10"
+msgstr "A10"
+
+msgid "A2"
+msgstr "A2"
+
+msgid "A2 Long Edge"
+msgstr ""
+
+msgid "A3"
+msgstr "A3"
+
+msgid "A3 Long Edge"
+msgstr ""
+
+msgid "A3 Oversize"
+msgstr ""
+
+msgid "A3 Oversize Long Edge"
+msgstr ""
+
+msgid "A4"
+msgstr "A4"
+
+msgid "A4 Long Edge"
+msgstr ""
+
+msgid "A4 Oversize"
+msgstr ""
+
+msgid "A4 Small"
+msgstr ""
+
+msgid "A5"
+msgstr "A5"
+
+msgid "A5 Long Edge"
+msgstr ""
+
+msgid "A5 Oversize"
+msgstr ""
+
+msgid "A6"
+msgstr "A6"
+
+msgid "A6 Long Edge"
+msgstr ""
+
+msgid "A7"
+msgstr "A7"
+
+msgid "A8"
+msgstr "A8"
+
+msgid "A9"
+msgstr "A9"
+
+msgid "ANSI A"
+msgstr "ANSI A"
+
+msgid "ANSI B"
+msgstr "ANSI B"
+
+msgid "ANSI C"
+msgstr "ANSI C"
+
+msgid "ANSI D"
+msgstr "ANSI D"
+
+msgid "ANSI E"
+msgstr "ANSI E"
+
+msgid "ARCH C"
+msgstr "ARCH C"
+
+msgid "ARCH C Long Edge"
+msgstr ""
+
+msgid "ARCH D"
+msgstr "ARCH D"
+
+msgid "ARCH D Long Edge"
+msgstr ""
+
+msgid "ARCH E"
+msgstr "ARCH E"
+
+msgid "ARCH E Long Edge"
+msgstr ""
+
+msgid "Accept Jobs"
+msgstr "Accepter les tâches"
+
+msgid "Accepted"
+msgstr "Accepté"
+
+msgid "Add Class"
+msgstr "Ajouter une classe"
+
+msgid "Add Printer"
+msgstr "Ajouter une imprimante"
+
+msgid "Add RSS Subscription"
+msgstr "Ajouter abonnement RSS"
+
+msgid "Address"
+msgstr "Adresse"
+
+msgid "Administration"
+msgstr "Administration"
+
+msgid "Always"
+msgstr "Toujours"
+
+msgid "AppSocket/HP JetDirect"
+msgstr "AppSocket/HP JetDirect"
+
+msgid "Applicator"
+msgstr "Applicator"
+
+#, c-format
+msgid "Attempt to set %s printer-state to bad value %d."
+msgstr ""
+
+#, c-format
+msgid "Attribute groups are out of order (%x < %x)."
+msgstr ""
+
+msgid "B0"
+msgstr "B0"
+
+msgid "B1"
+msgstr "B1"
+
+msgid "B10"
+msgstr "B10"
+
+msgid "B2"
+msgstr "B2"
+
+msgid "B3"
+msgstr "B3"
+
+msgid "B4"
+msgstr "B4"
+
+msgid "B5"
+msgstr "B5"
+
+msgid "B5 Oversize"
+msgstr ""
+
+msgid "B6"
+msgstr "B6"
+
+msgid "B7"
+msgstr "B7"
+
+msgid "B8"
+msgstr "B8"
+
+msgid "B9"
+msgstr "B9"
+
+#, c-format
+msgid "Bad 'document-format' value \"%s\"."
+msgstr ""
+
+msgid "Bad NULL dests pointer"
+msgstr "Pointeur de dests NULL incorrect"
+
+msgid "Bad OpenGroup"
+msgstr "OpenGroup erroné"
+
+msgid "Bad OpenUI/JCLOpenUI"
+msgstr "OpenUI/JCLOpenUI erroné"
+
+msgid "Bad OrderDependency"
+msgstr "OrderDependency erroné"
+
+msgid "Bad PPD cache file."
+msgstr ""
+
+msgid "Bad Request"
+msgstr ""
+
+msgid "Bad SNMP version number"
+msgstr ""
+
+msgid "Bad UIConstraints"
+msgstr ""
+
+#, c-format
+msgid "Bad copies value %d."
+msgstr ""
+
+msgid "Bad custom parameter"
+msgstr "Paramètre personnalisé incorrect"
+
+#, c-format
+msgid "Bad device-uri \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Bad device-uri scheme \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Bad document-format \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Bad document-format-default \"%s\"."
+msgstr ""
+
+msgid "Bad filename buffer"
+msgstr ""
+
+msgid "Bad job-name value: Bad UTF-8 sequence."
+msgstr ""
+
+msgid "Bad job-name value: Name too long."
+msgstr ""
+
+msgid "Bad job-name value: Wrong type or count."
+msgstr ""
+
+msgid "Bad job-priority value."
+msgstr ""
+
+#, c-format
+msgid "Bad job-sheets value \"%s\"."
+msgstr ""
+
+msgid "Bad job-sheets value type."
+msgstr ""
+
+msgid "Bad job-state value."
+msgstr ""
+
+#, c-format
+msgid "Bad job-uri \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Bad notify-pull-method \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Bad notify-recipient-uri \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Bad number-up value %d."
+msgstr "Valeur de number-up %d incorrecte."
+
+#, c-format
+msgid "Bad option + choice on line %d."
+msgstr ""
+
+#, c-format
+msgid "Bad page-ranges values %d-%d."
+msgstr "Intervalle de pages erroné : %d-%d."
+
+#, c-format
+msgid "Bad port-monitor \"%s\"."
+msgstr ""
+
+msgid "Bad printer URI."
+msgstr ""
+
+#, c-format
+msgid "Bad printer-state value %d."
+msgstr ""
+
+#, c-format
+msgid "Bad request ID %d."
+msgstr ""
+
+#, c-format
+msgid "Bad request version number %d.%d."
+msgstr ""
+
+msgid "Bad subscription ID"
+msgstr ""
+
+msgid "Bad value string"
+msgstr ""
+
+msgid "Banners"
+msgstr "Bannières"
+
+msgid "Bond Paper"
+msgstr "Papier pour titres"
+
+#, c-format
+msgid "Boolean expected for waiteof option \"%s\"."
+msgstr ""
+
+msgid "Buffer overflow detected, aborting."
+msgstr ""
+
+msgid "CMYK"
+msgstr "CMJN"
+
+msgid "CPCL Label Printer"
+msgstr "Imprimante pour étiquettes CPCL"
+
+msgid "Cancel RSS Subscription"
+msgstr "Annuler abonnement RSS"
+
+msgid "Canceling print job."
+msgstr ""
+
+msgid "Cannot share a remote Kerberized printer."
+msgstr ""
+
+msgid "Cassette"
+msgstr ""
+
+msgid "Change Settings"
+msgstr "Modifier les paramètres"
+
+#, c-format
+msgid "Character set \"%s\" not supported."
+msgstr ""
+
+msgid "Classes"
+msgstr "Classes"
+
+msgid "Clean Print Heads"
+msgstr "Nettoyer les têtes d’impression"
+
+msgid "Close-Job doesn't support the job-uri attribute."
+msgstr ""
+
+msgid "Color"
+msgstr "Couleur"
+
+msgid "Color Mode"
+msgstr "Mode de couleur"
+
+msgid ""
+"Commands may be abbreviated.  Commands are:\n"
+"\n"
+"exit    help    quit    status  ?"
+msgstr ""
+
+msgid "Community name uses indefinite length"
+msgstr "Le nom de la communauté s’avère être de longueur indéfinie"
+
+msgid "Connected to printer."
+msgstr ""
+
+msgid "Connecting to printer."
+msgstr ""
+
+msgid "Continue"
+msgstr "Continuer"
+
+msgid "Continuous"
+msgstr "Continu"
+
+msgid "Control file sent successfully."
+msgstr ""
+
+msgid "Copying print data."
+msgstr ""
+
+msgid "Created"
+msgstr "Créé"
+
+msgid "Custom"
+msgstr "Personnalisation"
+
+msgid "CustominCutInterval"
+msgstr "CustominCutInterval"
+
+msgid "CustominTearInterval"
+msgstr "CustominTearInterval"
+
+msgid "Cut"
+msgstr "Couper"
+
+msgid "Cutter"
+msgstr "Cutter"
+
+msgid "Dark"
+msgstr "Foncé"
+
+msgid "Darkness"
+msgstr "Tons foncés"
+
+msgid "Data file sent successfully."
+msgstr ""
+
+msgid "Delete Class"
+msgstr "Supprimer la classe"
+
+msgid "Delete Printer"
+msgstr "Supprimer l’imprimante"
+
+msgid "DeskJet Series"
+msgstr "Série DeskJet"
+
+#, c-format
+msgid "Destination \"%s\" is not accepting jobs."
+msgstr "La destination « %s » n’accepte pas de tâche."
+
+#, c-format
+msgid ""
+"Device: uri = %s\n"
+"        class = %s\n"
+"        info = %s\n"
+"        make-and-model = %s\n"
+"        device-id = %s\n"
+"        location = %s"
+msgstr ""
+
+msgid "Direct Thermal Media"
+msgstr "Papier pour impression thermique directe"
+
+#, c-format
+msgid "Directory \"%s\" contains a relative path."
+msgstr ""
+
+#, c-format
+msgid "Directory \"%s\" has insecure permissions (0%o/uid=%d/gid=%d)."
+msgstr ""
+
+#, c-format
+msgid "Directory \"%s\" is a file."
+msgstr ""
+
+#, c-format
+msgid "Directory \"%s\" not available: %s"
+msgstr ""
+
+#, c-format
+msgid "Directory \"%s\" permissions OK (0%o/uid=%d/gid=%d)."
+msgstr ""
+
+msgid "Disabled"
+msgstr "Désactivé"
+
+#, c-format
+msgid "Document #%d does not exist in job #%d."
+msgstr ""
+
+msgid "Duplexer"
+msgstr "Duplexeur"
+
+msgid "Dymo"
+msgstr "Dymo"
+
+msgid "EPL1 Label Printer"
+msgstr "Imprimante pour étiquettes EPL1"
+
+msgid "EPL2 Label Printer"
+msgstr "Imprimante pour étiquettes EPL2"
+
+msgid "Edit Configuration File"
+msgstr "Modifier le fichier de configuration"
+
+msgid "Empty PPD file."
+msgstr ""
+
+#. TRANSLATORS: Banner/cover sheet after the print job.
+msgid "Ending Banner"
+msgstr "Fin de la bannière"
+
+msgid "English"
+msgstr "French"
+
+msgid "Enter old password:"
+msgstr "Ancien mot de passe :"
+
+msgid "Enter password again:"
+msgstr "Confirmez le nouveau mot de passe :"
+
+msgid "Enter password:"
+msgstr "Entrez le nouveau mot de passe :"
+
+msgid ""
+"Enter your username and password or the root username and password to access "
+"this page. If you are using Kerberos authentication, make sure you have a "
+"valid Kerberos ticket."
+msgstr ""
+
+msgid "Envelope #10 "
+msgstr ""
+
+msgid "Envelope #11"
+msgstr ""
+
+msgid "Envelope #12"
+msgstr ""
+
+msgid "Envelope #14"
+msgstr ""
+
+msgid "Envelope #9"
+msgstr ""
+
+msgid "Envelope B4"
+msgstr ""
+
+msgid "Envelope B5"
+msgstr ""
+
+msgid "Envelope B6"
+msgstr ""
+
+msgid "Envelope C0"
+msgstr ""
+
+msgid "Envelope C1"
+msgstr ""
+
+msgid "Envelope C2"
+msgstr ""
+
+msgid "Envelope C3"
+msgstr ""
+
+msgid "Envelope C4"
+msgstr ""
+
+msgid "Envelope C5"
+msgstr ""
+
+msgid "Envelope C6"
+msgstr ""
+
+msgid "Envelope C65"
+msgstr ""
+
+msgid "Envelope C7"
+msgstr ""
+
+msgid "Envelope Choukei 3"
+msgstr ""
+
+msgid "Envelope Choukei 3 Long Edge"
+msgstr ""
+
+msgid "Envelope Choukei 4"
+msgstr ""
+
+msgid "Envelope Choukei 4 Long Edge"
+msgstr ""
+
+msgid "Envelope DL"
+msgstr ""
+
+msgid "Envelope Feed"
+msgstr "Alimentation au format enveloppe"
+
+msgid "Envelope Invite"
+msgstr ""
+
+msgid "Envelope Italian"
+msgstr ""
+
+msgid "Envelope Kaku2"
+msgstr ""
+
+msgid "Envelope Kaku2 Long Edge"
+msgstr ""
+
+msgid "Envelope Kaku3"
+msgstr ""
+
+msgid "Envelope Kaku3 Long Edge"
+msgstr ""
+
+msgid "Envelope Monarch"
+msgstr ""
+
+msgid "Envelope PRC1 "
+msgstr ""
+
+msgid "Envelope PRC1 Long Edge"
+msgstr ""
+
+msgid "Envelope PRC10"
+msgstr ""
+
+msgid "Envelope PRC10 Long Edge"
+msgstr ""
+
+msgid "Envelope PRC2"
+msgstr ""
+
+msgid "Envelope PRC2 Long Edge"
+msgstr ""
+
+msgid "Envelope PRC3"
+msgstr ""
+
+msgid "Envelope PRC3 Long Edge"
+msgstr ""
+
+msgid "Envelope PRC4"
+msgstr ""
+
+msgid "Envelope PRC4 Long Edge"
+msgstr ""
+
+msgid "Envelope PRC5 Long Edge"
+msgstr ""
+
+msgid "Envelope PRC5PRC5"
+msgstr ""
+
+msgid "Envelope PRC6"
+msgstr ""
+
+msgid "Envelope PRC6 Long Edge"
+msgstr ""
+
+msgid "Envelope PRC7"
+msgstr ""
+
+msgid "Envelope PRC7 Long Edge"
+msgstr ""
+
+msgid "Envelope PRC8"
+msgstr ""
+
+msgid "Envelope PRC8 Long Edge"
+msgstr ""
+
+msgid "Envelope PRC9"
+msgstr ""
+
+msgid "Envelope PRC9 Long Edge"
+msgstr ""
+
+msgid "Envelope Personal"
+msgstr ""
+
+msgid "Envelope You4"
+msgstr ""
+
+msgid "Envelope You4 Long Edge"
+msgstr ""
+
+msgid "Epson"
+msgstr "Epson"
+
+msgid "Error Policy"
+msgstr "Règles d’erreur"
+
+msgid "Error sending raster data."
+msgstr ""
+
+msgid "Error: need hostname after \"-h\" option."
+msgstr ""
+
+msgid "Every 10 Labels"
+msgstr "Toutes les 10 étiquettes"
+
+msgid "Every 2 Labels"
+msgstr "Toutes les 2 étiquettes"
+
+msgid "Every 3 Labels"
+msgstr "Toutes les 3 étiquettes"
+
+msgid "Every 4 Labels"
+msgstr "Toutes les 4 étiquettes"
+
+msgid "Every 5 Labels"
+msgstr "Toutes les 5 étiquettes"
+
+msgid "Every 6 Labels"
+msgstr "Toutes les 6 étiquettes"
+
+msgid "Every 7 Labels"
+msgstr "Toutes les 7 étiquettes"
+
+msgid "Every 8 Labels"
+msgstr "Toutes les 8 étiquettes"
+
+msgid "Every 9 Labels"
+msgstr "Toutes les 9 étiquettes"
+
+msgid "Every Label"
+msgstr "Chaque étiquette"
+
+msgid "Executive"
+msgstr ""
+
+msgid "Expectation Failed"
+msgstr "Échec de la condition de valeur attendue"
+
+msgid "Export Printers to Samba"
+msgstr "Exporter les imprimantes vers SAMBA"
+
+msgid "FAIL"
+msgstr ""
+
+msgid "FanFold German"
+msgstr ""
+
+msgid "FanFold Legal German"
+msgstr ""
+
+msgid "Fanfold US"
+msgstr ""
+
+#, c-format
+msgid "File \"%s\" contains a relative path."
+msgstr ""
+
+#, c-format
+msgid "File \"%s\" has insecure permissions (0%o/uid=%d/gid=%d)."
+msgstr ""
+
+#, c-format
+msgid "File \"%s\" is a directory."
+msgstr ""
+
+#, c-format
+msgid "File \"%s\" not available: %s"
+msgstr ""
+
+#, c-format
+msgid "File \"%s\" permissions OK (0%o/uid=%d/gid=%d)."
+msgstr ""
+
+msgid "File Folder "
+msgstr ""
+
+#, c-format
+msgid ""
+"File device URIs have been disabled. To enable, see the FileDevice directive "
+"in \"%s/cups-files.conf\"."
+msgstr ""
+
+#, c-format
+msgid "Finished page %d."
+msgstr ""
+
+msgid "Folio"
+msgstr "Folio"
+
+msgid "Forbidden"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Generic"
+msgstr "Générique"
+
+msgid "Get-Response-PDU uses indefinite length"
+msgstr "Get-Response-PDU s’avère être de longueur indéfinie"
+
+msgid "Glossy Paper"
+msgstr "Papier brillant"
+
+msgid "Got a printer-uri attribute but no job-id."
+msgstr ""
+
+msgid "Grayscale"
+msgstr "Niveaux de gris"
+
+msgid "HP"
+msgstr "HP"
+
+msgid "Hanging Folder"
+msgstr "Dossier suspendu"
+
+msgid "Help file not in index."
+msgstr ""
+
+msgid "IPP 1setOf attribute with incompatible value tags."
+msgstr ""
+
+msgid "IPP attribute has no name."
+msgstr ""
+
+msgid "IPP attribute is not a member of the message."
+msgstr ""
+
+msgid "IPP begCollection value not 0 bytes."
+msgstr ""
+
+msgid "IPP boolean value not 1 byte."
+msgstr ""
+
+msgid "IPP date value not 11 bytes."
+msgstr ""
+
+msgid "IPP endCollection value not 0 bytes."
+msgstr ""
+
+msgid "IPP enum value not 4 bytes."
+msgstr ""
+
+msgid "IPP extension tag larger than 0x7FFFFFFF."
+msgstr ""
+
+msgid "IPP integer value not 4 bytes."
+msgstr ""
+
+msgid "IPP language length overflows value."
+msgstr ""
+
+msgid "IPP member name is not empty."
+msgstr ""
+
+msgid "IPP memberName value is empty."
+msgstr ""
+
+msgid "IPP memberName with no attribute."
+msgstr ""
+
+msgid "IPP name larger than 32767 bytes."
+msgstr ""
+
+msgid "IPP nameWithLanguage value less than minimum 4 bytes."
+msgstr ""
+
+msgid "IPP rangeOfInteger value not 8 bytes."
+msgstr ""
+
+msgid "IPP resolution value not 9 bytes."
+msgstr ""
+
+msgid "IPP string length overflows value."
+msgstr ""
+
+msgid "IPP textWithLanguage value less than minimum 4 bytes."
+msgstr ""
+
+msgid "IPP value larger than 32767 bytes."
+msgstr ""
+
+msgid "ISOLatin1"
+msgstr "utf-8"
+
+msgid "Illegal control character"
+msgstr "Caractère de contrôle interdit"
+
+msgid "Illegal main keyword string"
+msgstr "Mot-clé essentiel interdit"
+
+msgid "Illegal option keyword string"
+msgstr "Mot-clé d’option interdit"
+
+msgid "Illegal translation string"
+msgstr "Traduction interdite"
+
+msgid "Illegal whitespace character"
+msgstr "Caractère « espace blanc » interdit"
+
+msgid "Installable Options"
+msgstr "Options installables"
+
+msgid "Installed"
+msgstr "Installée"
+
+msgid "IntelliBar Label Printer"
+msgstr "Imprimante pour étiquettes IntelliBar"
+
+msgid "Intellitech"
+msgstr "Intellitech"
+
+msgid "Internal Server Error"
+msgstr ""
+
+msgid "Internal error"
+msgstr "Erreur interne"
+
+msgid "Internet Postage 2-Part"
+msgstr "Affranchissement Internet en 2 parties"
+
+msgid "Internet Postage 3-Part"
+msgstr "Affranchissement Internet en 3 parties"
+
+msgid "Internet Printing Protocol"
+msgstr "Internet Printing Protocol"
+
+msgid "Invalid media size."
+msgstr ""
+
+#, c-format
+msgid "Invalid printer command \"%s\"."
+msgstr ""
+
+msgid "JCL"
+msgstr "JCL ( Langage de contrôle de tâche )"
+
+msgid "JIS B0"
+msgstr ""
+
+msgid "JIS B1"
+msgstr ""
+
+msgid "JIS B10"
+msgstr ""
+
+msgid "JIS B2"
+msgstr ""
+
+msgid "JIS B3"
+msgstr ""
+
+msgid "JIS B4"
+msgstr ""
+
+msgid "JIS B4 Long Edge"
+msgstr ""
+
+msgid "JIS B5"
+msgstr ""
+
+msgid "JIS B5 Long Edge"
+msgstr ""
+
+msgid "JIS B6"
+msgstr ""
+
+msgid "JIS B6 Long Edge"
+msgstr ""
+
+msgid "JIS B7"
+msgstr ""
+
+msgid "JIS B8"
+msgstr ""
+
+msgid "JIS B9"
+msgstr ""
+
+#, c-format
+msgid "Job #%d cannot be restarted - no files."
+msgstr ""
+
+#, c-format
+msgid "Job #%d does not exist."
+msgstr ""
+
+#, c-format
+msgid "Job #%d is already aborted - can't cancel."
+msgstr "La tâche n°%d est déjà abandonnée - impossible de l’annuler."
+
+#, c-format
+msgid "Job #%d is already canceled - can't cancel."
+msgstr "La tâche n°%d est déjà annulée - impossible de l’annuler."
+
+#, c-format
+msgid "Job #%d is already completed - can't cancel."
+msgstr "La tâche n°%d est déjà terminée - impossible de l’annuler."
+
+#, c-format
+msgid "Job #%d is finished and cannot be altered."
+msgstr ""
+
+#, c-format
+msgid "Job #%d is not complete."
+msgstr ""
+
+#, c-format
+msgid "Job #%d is not held for authentication."
+msgstr ""
+
+#, c-format
+msgid "Job #%d is not held."
+msgstr ""
+
+msgid "Job Completed"
+msgstr "terminée"
+
+msgid "Job Created"
+msgstr "Tâche créée"
+
+msgid "Job Options Changed"
+msgstr "Options de la tâche modifiées"
+
+msgid "Job Stopped"
+msgstr "arrêtée"
+
+msgid "Job is completed and cannot be changed."
+msgstr "La tâche est terminée et ne peut être modifiée."
+
+msgid "Job operation failed"
+msgstr "L’opération sur la tâche a échoué :"
+
+msgid "Job state cannot be changed."
+msgstr "L’état de la tâche ne peut être modifié."
+
+msgid "Job subscriptions cannot be renewed."
+msgstr ""
+
+msgid "Jobs"
+msgstr "Tâches"
+
+msgid "LPD/LPR Host or Printer"
+msgstr "Hôte ou imprimante LPD/LPR"
+
+msgid "Label Printer"
+msgstr "Imprimante pour étiquettes"
+
+msgid "Label Top"
+msgstr "Étiquette supérieure"
+
+#, c-format
+msgid "Language \"%s\" not supported."
+msgstr ""
+
+msgid "Large Address"
+msgstr "Adresse étendue"
+
+msgid "LaserJet Series PCL 4/5"
+msgstr "LaserJet série PCL 4/5"
+
+msgid "Letter Oversize"
+msgstr ""
+
+msgid "Letter Oversize Long Edge"
+msgstr ""
+
+msgid "Light"
+msgstr "Clair"
+
+msgid "Line longer than the maximum allowed (255 characters)"
+msgstr "Ligne dépassant la longueur maximale autorisée (255 caractères)"
+
+msgid "List Available Printers"
+msgstr ""
+
+msgid "Long-Edge (Portrait)"
+msgstr "Bord le plus long (Portrait)"
+
+msgid "Looking for printer."
+msgstr ""
+
+msgid "Manual Feed"
+msgstr ""
+
+msgid "Media Size"
+msgstr "Taille du papier"
+
+msgid "Media Source"
+msgstr "Source du papier"
+
+msgid "Media Tracking"
+msgstr "Crénage du papier"
+
+msgid "Media Type"
+msgstr "Type de papier"
+
+msgid "Medium"
+msgstr "Moyen"
+
+msgid "Memory allocation error"
+msgstr "Erreur d’allocation de mémoire"
+
+msgid "Missing CloseGroup"
+msgstr ""
+
+msgid "Missing PPD-Adobe-4.x header"
+msgstr "Entête PPD-Adobe-4.x manquant"
+
+msgid "Missing asterisk in column 1"
+msgstr "Astérisque manquant à la colonne 1"
+
+msgid "Missing document-number attribute."
+msgstr ""
+
+#, c-format
+msgid "Missing double quote on line %d."
+msgstr ""
+
+msgid "Missing form variable"
+msgstr ""
+
+msgid "Missing last-document attribute in request."
+msgstr ""
+
+msgid "Missing media or media-col."
+msgstr ""
+
+msgid "Missing media-size in media-col."
+msgstr ""
+
+msgid "Missing notify-subscription-ids attribute."
+msgstr ""
+
+msgid "Missing option keyword"
+msgstr ""
+
+msgid "Missing requesting-user-name attribute."
+msgstr ""
+
+msgid "Missing required attributes."
+msgstr ""
+
+#, c-format
+msgid "Missing value on line %d."
+msgstr ""
+
+msgid "Missing value string"
+msgstr "Chaîne de valeur manquante"
+
+msgid "Missing x-dimension in media-size."
+msgstr ""
+
+msgid "Missing y-dimension in media-size."
+msgstr ""
+
+#, c-format
+msgid ""
+"Model:  name = %s\n"
+"        natural_language = %s\n"
+"        make-and-model = %s\n"
+"        device-id = %s"
+msgstr ""
+
+msgid "Modify Class"
+msgstr "Modifier la classe"
+
+msgid "Modify Printer"
+msgstr "Modifier l’imprimante"
+
+msgid "Move All Jobs"
+msgstr "Transférer toutes les tâches"
+
+msgid "Move Job"
+msgstr "Transférer la tâche"
+
+msgid "Moved Permanently"
+msgstr "Transférées de façon permanente"
+
+msgid "NULL PPD file pointer"
+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"
+
+msgid "New Stylus Color Series"
+msgstr "Nouvelles série Stylus Color"
+
+msgid "New Stylus Photo Series"
+msgstr "Nouvelles série Stylus Photo"
+
+msgid "No"
+msgstr "Non"
+
+msgid "No Content"
+msgstr "Aucun contenu"
+
+msgid "No PPD name"
+msgstr ""
+
+msgid "No VarBind SEQUENCE"
+msgstr "Aucune SEQUENCE VarBind"
+
+msgid "No Windows printer drivers are installed."
+msgstr ""
+
+msgid "No active connection"
+msgstr "Aucune connexion active"
+
+#, c-format
+msgid "No active jobs on %s."
+msgstr ""
+
+msgid "No attributes in request."
+msgstr ""
+
+msgid "No authentication information provided."
+msgstr ""
+
+msgid "No community name"
+msgstr "Aucun nom de communauté"
+
+msgid "No default printer."
+msgstr ""
+
+msgid "No destinations added."
+msgstr "Aucune destination ajoutée."
+
+msgid "No device URI found in argv[0] or in DEVICE_URI environment variable."
+msgstr ""
+
+msgid "No error-index"
+msgstr "Paramètre error-index absent"
+
+msgid "No error-status"
+msgstr ""
+
+msgid "No file in print request."
+msgstr ""
+
+msgid "No modification time"
+msgstr ""
+
+msgid "No name OID"
+msgstr "Aucun OID de nom"
+
+msgid "No pages were found."
+msgstr ""
+
+msgid "No printer name"
+msgstr ""
+
+msgid "No printer-uri found"
+msgstr ""
+
+msgid "No printer-uri found for class"
+msgstr ""
+
+msgid "No printer-uri in request."
+msgstr ""
+
+msgid "No request-id"
+msgstr "Paramètre request-id absent"
+
+msgid "No subscription attributes in request."
+msgstr ""
+
+msgid "No subscriptions found."
+msgstr "Aucun abonnement trouvé."
+
+msgid "No variable-bindings SEQUENCE"
+msgstr "Aucune SEQUENCE variable-bindings"
+
+msgid "No version number"
+msgstr "Aucun numéro de version"
+
+msgid "Non-continuous (Mark sensing)"
+msgstr "Non continu (détection de marque)"
+
+msgid "Non-continuous (Web sensing)"
+msgstr "Non continu (détection Web)"
+
+msgid "Normal"
+msgstr "Normal"
+
+msgid "Not Found"
+msgstr "Introuvable"
+
+msgid "Not Implemented"
+msgstr "Non implémentée"
+
+msgid "Not Installed"
+msgstr "Non installée"
+
+msgid "Not Modified"
+msgstr "Non modifiée"
+
+msgid "Not Supported"
+msgstr "Non prise en charge"
+
+msgid "Not allowed to print."
+msgstr "Impression interdite"
+
+msgid "Note"
+msgstr "Remarque"
+
+msgid ""
+"Note: this program only validates the DSC comments, not the PostScript "
+"itself."
+msgstr ""
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Off (1-Sided)"
+msgstr "Désactivé (recto)"
+
+msgid "Oki"
+msgstr "Oki"
+
+msgid "Online Help"
+msgstr "Aide en ligne"
+
+#, c-format
+msgid "Open of %s failed: %s"
+msgstr "L’ouverture de %s a échoué : %s"
+
+msgid "OpenGroup without a CloseGroup first"
+msgstr "OpenGroup sans CloseGroup préalable"
+
+msgid "OpenUI/JCLOpenUI without a CloseUI/JCLCloseUI first"
+msgstr "OpenUI/JCLOpenUI sans CloseUI/JCLCloseUI préalable"
+
+msgid "Operation Policy"
+msgstr "Règles de fonctionnement"
+
+#, c-format
+msgid "Option \"%s\" cannot be included via %%%%IncludeFeature."
+msgstr ""
+
+msgid "Options Installed"
+msgstr "Options installées"
+
+msgid "Options:"
+msgstr "Options"
+
+msgid "Out of date PPD cache file."
+msgstr ""
+
+msgid "Out of memory."
+msgstr ""
+
+msgid "Output Mode"
+msgstr "Mode de sortie"
+
+#, c-format
+msgid "Output for printer %s is sent to %s"
+msgstr ""
+
+#, c-format
+msgid "Output for printer %s is sent to remote printer %s on %s"
+msgstr ""
+
+#, c-format
+msgid "Output for printer %s/%s is sent to %s"
+msgstr ""
+
+#, c-format
+msgid "Output for printer %s/%s is sent to remote printer %s on %s"
+msgstr ""
+
+msgid "PASS"
+msgstr ""
+
+msgid "PCL Laser Printer"
+msgstr "Imprimante laser PCL"
+
+msgid "PRC16K"
+msgstr "PRC16K"
+
+msgid "PRC16K Long Edge"
+msgstr ""
+
+msgid "PRC32K"
+msgstr "PRC32K"
+
+msgid "PRC32K Long Edge"
+msgstr ""
+
+msgid "PRC32K Oversize"
+msgstr ""
+
+msgid "PRC32K Oversize Long Edge"
+msgstr ""
+
+msgid "Packet does not contain a Get-Response-PDU"
+msgstr "Le paquet ne contient aucun paramètre Get-Response-PDU"
+
+msgid "Packet does not start with SEQUENCE"
+msgstr "Le paquet ne commence pas par SEQUENCE"
+
+msgid "ParamCustominCutInterval"
+msgstr "ParamCustominCutInterval"
+
+msgid "ParamCustominTearInterval"
+msgstr "ParamCustominTearInterval"
+
+#, c-format
+msgid "Password for %s on %s? "
+msgstr "Mot de passe pour %s sur %s ? "
+
+#, c-format
+msgid "Password for %s required to access %s via SAMBA: "
+msgstr "Un mot de passe pour %s est nécessaire pour accéder à %s via SAMBA : "
+
+msgid "Pause Class"
+msgstr "Suspendre la classe"
+
+msgid "Pause Printer"
+msgstr "Suspendre l’imprimante"
+
+msgid "Peel-Off"
+msgstr "Décoller"
+
+msgid "Photo"
+msgstr "Photo"
+
+msgid "Photo Labels"
+msgstr "Étiquettes photo"
+
+msgid "Plain Paper"
+msgstr ""
+
+msgid "Policies"
+msgstr "Règles"
+
+msgid "Port Monitor"
+msgstr "Moniteur de port"
+
+msgid "PostScript Printer"
+msgstr "Imprimante PostScript"
+
+msgid "Postcard"
+msgstr "Carte postale"
+
+msgid "Postcard Double "
+msgstr ""
+
+msgid "Postcard Double Long Edge"
+msgstr ""
+
+msgid "Postcard Long Edge"
+msgstr ""
+
+msgid "Print Density"
+msgstr "Densité d’impression"
+
+msgid "Print Job:"
+msgstr "Tâche d’impression :"
+
+msgid "Print Mode"
+msgstr "Mode d’impression"
+
+msgid "Print Rate"
+msgstr "aux d’impression"
+
+msgid "Print Self-Test Page"
+msgstr "Imprimer une page d’autotest"
+
+msgid "Print Speed"
+msgstr "Vitesse d’impression"
+
+msgid "Print Test Page"
+msgstr "Imprimer la page de test"
+
+msgid "Print and Cut"
+msgstr "Impression à découper"
+
+msgid "Print and Tear"
+msgstr "Impression à détacher"
+
+#, c-format
+msgid "Print file accepted - job ID %d."
+msgstr ""
+
+msgid "Print file accepted - job ID unknown."
+msgstr ""
+
+msgid "Print file sent."
+msgstr ""
+
+msgid "Print file was not accepted."
+msgstr ""
+
+msgid "Print job canceled at printer."
+msgstr ""
+
+msgid "Print job too large."
+msgstr ""
+
+msgid "Printer Added"
+msgstr "ajoutée"
+
+msgid "Printer Default"
+msgstr "par défaut"
+
+msgid "Printer Deleted"
+msgstr "supprimée"
+
+msgid "Printer Modified"
+msgstr "modifiée"
+
+msgid "Printer Paused"
+msgstr "en pause"
+
+msgid "Printer Settings"
+msgstr "Réglages de l’imprimante"
+
+msgid "Printer cannot print supplied content."
+msgstr ""
+
+msgid "Printer:"
+msgstr "Imprimante :"
+
+msgid "Printers"
+msgstr ""
+
+#, c-format
+msgid "Printing page %d, %d%% complete."
+msgstr ""
+
+msgid "Purge Jobs"
+msgstr "Purger les tâches"
+
+msgid "Quarto"
+msgstr "Quarto"
+
+msgid "Quota limit reached."
+msgstr ""
+
+msgid "Rank    Owner   Job     File(s)                         Total Size"
+msgstr ""
+
+#. TRANSLATORS: Pri is job priority.
+msgid ""
+"Rank   Owner      Pri  Job        Files                       Total Size"
+msgstr ""
+
+msgid "Reject Jobs"
+msgstr "Refuser les tâches"
+
+#, c-format
+msgid "Remote host did not accept control file (%d)."
+msgstr ""
+
+#, c-format
+msgid "Remote host did not accept data file (%d)."
+msgstr ""
+
+msgid "Reprint After Error"
+msgstr "Réimprimer après erreur"
+
+msgid "Request Entity Too Large"
+msgstr "Entité de requête trop volumineuse"
+
+msgid "Resolution"
+msgstr "Résolution"
+
+msgid "Resume Class"
+msgstr "Relancer la classe"
+
+msgid "Resume Printer"
+msgstr "Relancer l’imprimante"
+
+msgid "Return Address"
+msgstr "Renvoyer l’adresse"
+
+msgid "Rewind"
+msgstr "Rembobiner"
+
+#, c-format
+msgid "Running command: %s %s -N -A %s -c '%s'"
+msgstr ""
+
+msgid "SEQUENCE uses indefinite length"
+msgstr "SEQUENCE s’avère être de longueur indéfinie"
+
+msgid "SSL/TLS Negotiation Error"
+msgstr ""
+
+msgid "See Other"
+msgstr "Autres"
+
+msgid "Sending data to printer."
+msgstr ""
+
+msgid "Server Restarted"
+msgstr "Le serveur a redémarré"
+
+msgid "Server Security Auditing"
+msgstr "Vérification de la sécurité du serveur"
+
+msgid "Server Started"
+msgstr "Le serveur a démarré"
+
+msgid "Server Stopped"
+msgstr "Le serveur s’est arrêté"
+
+msgid "Service Unavailable"
+msgstr "Service indisponible"
+
+msgid "Set Allowed Users"
+msgstr "Définir les autorisations"
+
+msgid "Set As Server Default"
+msgstr "Définir comme valeur par défaut pour le serveur"
+
+msgid "Set Class Options"
+msgstr "Définir les options de classe"
+
+msgid "Set Printer Options"
+msgstr "Définir les options de l’imprimante"
+
+msgid "Set Publishing"
+msgstr "Définir la publication"
+
+msgid "Shipping Address"
+msgstr "Adresse de livraison"
+
+msgid "Short-Edge (Landscape)"
+msgstr "Bord le plus court (paysage)"
+
+msgid "Special Paper"
+msgstr "Papier spécial"
+
+#, c-format
+msgid "Spooling job, %.0f%% complete."
+msgstr ""
+
+msgid "Standard"
+msgstr "Standard"
+
+#. TRANSLATORS: Banner/cover sheet before the print job.
+msgid "Starting Banner"
+msgstr "Début de la bannière"
+
+#, c-format
+msgid "Starting page %d."
+msgstr ""
+
+msgid "Statement"
+msgstr "Déclaration"
+
+msgid "Stylus Color Series"
+msgstr "Série Stylus Color"
+
+msgid "Stylus Photo Series"
+msgstr "Série Stylus Photo"
+
+#, c-format
+msgid "Subscription #%d does not exist."
+msgstr ""
+
+msgid "Super A"
+msgstr ""
+
+msgid "Super B"
+msgstr "Super B"
+
+msgid "Super B/A3"
+msgstr "Super B/A3"
+
+msgid "Switching Protocols"
+msgstr "Permuter les protocoles"
+
+msgid "Tabloid"
+msgstr "Tabloïd"
+
+msgid "Tabloid Oversize"
+msgstr ""
+
+msgid "Tabloid Oversize Long Edge"
+msgstr ""
+
+msgid "Tear"
+msgstr "Détacher"
+
+msgid "Tear-Off"
+msgstr "Détacher"
+
+msgid "Tear-Off Adjust Position"
+msgstr "Position d’ajustement du détachement"
+
+#, c-format
+msgid "The %s attribute cannot be provided with job-ids."
+msgstr ""
+
+#, c-format
+msgid ""
+"The '%s' Job Description attribute cannot be supplied in a job creation "
+"request."
+msgstr ""
+
+#, c-format
+msgid ""
+"The '%s' operation attribute cannot be supplied in a Create-Job request."
+msgstr ""
+
+#, c-format
+msgid "The PPD file \"%s\" could not be found."
+msgstr "Le fichier PPD « %s » n’a pu être trouvé."
+
+#, c-format
+msgid "The PPD file \"%s\" could not be opened: %s"
+msgstr "Le fichier PPD « %s » n’a pu être ouvert : %s"
+
+msgid "The PPD file could not be opened."
+msgstr ""
+
+msgid ""
+"The class name may only contain up to 127 printable characters and may not "
+"contain spaces, slashes (/), or the pound sign (#)."
+msgstr ""
+"Le nom de classe doit comporter au plus 127 caractères, tous imprimables, "
+"sans espace, « / » et « # »."
+
+msgid "The developer unit needs to be replaced."
+msgstr ""
+
+msgid "The developer unit will need to be replaced soon."
+msgstr ""
+
+msgid "The fuser's temperature is high."
+msgstr ""
+
+msgid "The fuser's temperature is low."
+msgstr ""
+
+msgid ""
+"The notify-lease-duration attribute cannot be used with job subscriptions."
+msgstr ""
+"L’attribut « notify-lease-duration » ne peut pas être utilisé dans un "
+"abonnement de tâche."
+
+#, c-format
+msgid "The notify-user-data value is too large (%d > 63 octets)."
+msgstr ""
+
+msgid "The optical photoconductor needs to be replaced."
+msgstr ""
+
+msgid "The optical photoconductor will need to be replaced soon."
+msgstr ""
+
+msgid "The output bin is almost full."
+msgstr ""
+
+msgid "The output bin is full."
+msgstr ""
+
+msgid "The output bin is missing."
+msgstr ""
+
+msgid "The paper tray is almost empty."
+msgstr ""
+
+msgid "The paper tray is empty."
+msgstr ""
+
+msgid "The paper tray is missing."
+msgstr ""
+
+msgid "The paper tray needs to be filled."
+msgstr ""
+
+msgid "The printer URI is incorrect or no longer exists."
+msgstr ""
+
+msgid "The printer did not respond."
+msgstr ""
+
+#, c-format
+msgid "The printer does not support IPP/%d.%d, trying IPP/%s."
+msgstr ""
+
+msgid "The printer is in use."
+msgstr ""
+
+msgid "The printer is not connected."
+msgstr ""
+
+msgid "The printer is not responding."
+msgstr ""
+
+msgid "The printer is now connected."
+msgstr ""
+
+msgid "The printer is now online."
+msgstr ""
+
+msgid "The printer is offline."
+msgstr ""
+
+msgid "The printer is running low on ink."
+msgstr ""
+
+msgid "The printer is running low on toner."
+msgstr ""
+
+msgid "The printer is unreachable at this time."
+msgstr ""
+
+msgid "The printer may be out of ink."
+msgstr ""
+
+msgid "The printer may be out of toner."
+msgstr ""
+
+msgid "The printer may not exist or is unavailable at this time."
+msgstr ""
+
+msgid ""
+"The printer name may only contain up to 127 printable characters and may not "
+"contain spaces, slashes (/), or the pound sign (#)."
+msgstr ""
+"Le nom d’imprimante doit comporter au plus 127 caractères, tous imprimables, "
+"sans espace, « / » et « # »."
+
+msgid "The printer or class does not exist."
+msgstr ""
+
+msgid "The printer or class is not shared."
+msgstr ""
+
+msgid "The printer's cover is open."
+msgstr ""
+
+msgid "The printer's door is open."
+msgstr ""
+
+msgid "The printer's interlock is open."
+msgstr ""
+
+msgid "The printer's waste bin is almost full."
+msgstr ""
+
+msgid "The printer's waste bin is full."
+msgstr ""
+
+#, c-format
+msgid "The printer-uri \"%s\" contains invalid characters."
+msgstr "Le paramètre printer-uri « %s » contient des caractères non valides."
+
+msgid "The printer-uri attribute is required."
+msgstr ""
+
+msgid ""
+"The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"."
+msgstr ""
+"L’attribut « printer-uri » doit se présenter sous la forme « ipp://HOSTNAME/"
+"classes/CLASSNAME »."
+
+msgid ""
+"The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"."
+msgstr ""
+"L’attribut « printer-uri » doit se présenter sous la forme « ipp://HOSTNAME/"
+"printers/PRINTERNAME »."
+
+msgid ""
+"The subscription name may not contain spaces, slashes (/), question marks "
+"(?), or the pound sign (#)."
+msgstr ""
+"Le nom de l’abonnement ne doit pas contenir d’espace ni aucun des symboles "
+"« / », « ? » et « # »."
+
+msgid ""
+"The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to "
+"enable it."
+msgstr ""
+
+#, c-format
+msgid "The which-jobs value \"%s\" is not supported."
+msgstr ""
+
+msgid "There are too many subscriptions."
+msgstr "Les abonnements sont trop nombreux."
+
+msgid "There is a paper jam."
+msgstr ""
+
+msgid "There was an unrecoverable USB error."
+msgstr ""
+
+msgid "Thermal Transfer Media"
+msgstr "Papier pour transfert thermique"
+
+msgid "Too many active jobs."
+msgstr "Trop de tâches en cours."
+
+#, c-format
+msgid "Too many job-sheets values (%d > 2)."
+msgstr ""
+
+#, c-format
+msgid "Too many printer-state-reasons values (%d > %d)."
+msgstr ""
+
+msgid "Transparency"
+msgstr "Transparence"
+
+msgid "Tray"
+msgstr "Bac"
+
+msgid "Tray 1"
+msgstr "Bac 1"
+
+msgid "Tray 2"
+msgstr "Bac 2"
+
+msgid "Tray 3"
+msgstr "Bac 3"
+
+msgid "Tray 4"
+msgstr "Bac 4"
+
+msgid "URI Too Long"
+msgstr "URI trop long"
+
+msgid "US Ledger"
+msgstr "US Ledger"
+
+msgid "US Legal"
+msgstr "US Légal"
+
+msgid "US Legal Oversize"
+msgstr ""
+
+msgid "US Letter"
+msgstr "US Lettre"
+
+msgid "US Letter Long Edge"
+msgstr ""
+
+msgid "US Letter Oversize"
+msgstr ""
+
+msgid "US Letter Oversize Long Edge"
+msgstr ""
+
+msgid "US Letter Small"
+msgstr ""
+
+msgid "Unable to access cupsd.conf file"
+msgstr "Impossible d’accéder au fichier cupsd.conf :"
+
+msgid "Unable to access help file."
+msgstr "Impossible d’accéder au fichier d’aide :"
+
+msgid "Unable to add RSS subscription"
+msgstr "Impossible d’ajouter d’abonnement RSS :"
+
+msgid "Unable to add class"
+msgstr "Impossible d’ajouter la classe :"
+
+msgid "Unable to add document to print job."
+msgstr ""
+
+#, c-format
+msgid "Unable to add job for destination \"%s\"."
+msgstr ""
+
+msgid "Unable to add printer"
+msgstr "Impossible d’ajouter l’imprimante :"
+
+msgid "Unable to allocate memory for file types."
+msgstr ""
+
+msgid "Unable to allocate memory for page info"
+msgstr ""
+
+msgid "Unable to allocate memory for pages array"
+msgstr ""
+
+msgid "Unable to cancel RSS subscription"
+msgstr "Impossible d’annuler l’abonnement RSS :"
+
+msgid "Unable to cancel print job."
+msgstr ""
+
+msgid "Unable to change printer"
+msgstr ""
+
+msgid "Unable to change printer-is-shared attribute"
+msgstr "Impossible de modifier l’attribut « printer-is-shared » :"
+
+msgid "Unable to change server settings"
+msgstr "Impossible de modifier les réglages du serveur :"
+
+msgid "Unable to configure printer options."
+msgstr ""
+
+msgid "Unable to connect to host."
+msgstr "Connexion à l’hôte impossible."
+
+msgid "Unable to contact printer, queuing on next printer in class."
+msgstr ""
+
+#, c-format
+msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
+msgstr ""
+
+#, c-format
+msgid "Unable to copy 64-bit Windows printer driver files (%d)."
+msgstr ""
+
+#, c-format
+msgid "Unable to copy CUPS printer driver files (%d)."
+msgstr ""
+
+#, c-format
+msgid "Unable to copy PPD file - %s"
+msgstr ""
+
+msgid "Unable to copy PPD file."
+msgstr ""
+
+#, c-format
+msgid "Unable to copy Windows 2000 printer driver files (%d)."
+msgstr ""
+
+#, c-format
+msgid "Unable to copy Windows 9x printer driver files (%d)."
+msgstr ""
+
+#, c-format
+msgid "Unable to copy interface script - %s"
+msgstr ""
+
+msgid "Unable to create compressed print file"
+msgstr ""
+
+msgid "Unable to create printer-uri"
+msgstr ""
+
+msgid "Unable to create temporary file"
+msgstr "Impossible de créer le fichier temporaire :"
+
+msgid "Unable to delete class"
+msgstr "Impossible de supprimer la classe :"
+
+msgid "Unable to delete printer"
+msgstr "Impossible de supprimer l’imprimante :"
+
+msgid "Unable to do maintenance command"
+msgstr "Impossible de lancer la commande de maintenance :"
+
+msgid "Unable to edit cupsd.conf files larger than 1MB"
+msgstr ""
+
+msgid ""
+"Unable to establish a secure connection to host (certificate chain invalid)."
+msgstr ""
+
+msgid ""
+"Unable to establish a secure connection to host (certificate not yet valid)."
+msgstr ""
+
+msgid "Unable to establish a secure connection to host (expired certificate)."
+msgstr ""
+
+msgid "Unable to establish a secure connection to host (host name mismatch)."
+msgstr ""
+
+msgid ""
+"Unable to establish a secure connection to host (peer dropped connection "
+"before responding)."
+msgstr ""
+
+msgid ""
+"Unable to establish a secure connection to host (self-signed certificate)."
+msgstr ""
+
+msgid ""
+"Unable to establish a secure connection to host (untrusted certificate)."
+msgstr ""
+
+msgid "Unable to establish a secure connection to host."
+msgstr ""
+
+msgid "Unable to find destination for job"
+msgstr ""
+
+msgid "Unable to find printer."
+msgstr ""
+
+msgid "Unable to generate compressed print file"
+msgstr ""
+
+msgid "Unable to get backend exit status."
+msgstr ""
+
+msgid "Unable to get class list"
+msgstr "Impossible d’obtenir la liste des classes :"
+
+msgid "Unable to get class status"
+msgstr "Impossible d’obtenir l’état de la classe :"
+
+msgid "Unable to get list of printer drivers"
+msgstr "Impossible d’obtenir la liste des pilotes d’impression :"
+
+msgid "Unable to get printer attributes"
+msgstr "Impossible de récupérer les attributs de l’imprimante :"
+
+msgid "Unable to get printer list"
+msgstr "Impossible d’obtenir la liste des imprimantes :"
+
+msgid "Unable to get printer status"
+msgstr ""
+
+msgid "Unable to get printer status."
+msgstr "Impossible d’obtenir l’état de l’imprimante :"
+
+#, c-format
+msgid "Unable to install Windows 2000 printer driver files (%d)."
+msgstr ""
+
+#, c-format
+msgid "Unable to install Windows 9x printer driver files (%d)."
+msgstr ""
+
+msgid "Unable to load help index."
+msgstr ""
+
+#, c-format
+msgid "Unable to locate printer \"%s\"."
+msgstr ""
+
+msgid "Unable to locate printer."
+msgstr ""
+
+msgid "Unable to modify class"
+msgstr "Impossible de modifier la classe :"
+
+msgid "Unable to modify printer"
+msgstr "Impossible de modifier l’imprimante :"
+
+msgid "Unable to move job"
+msgstr "Impossible de transférer la tâche."
+
+msgid "Unable to move jobs"
+msgstr "Impossible de transférer les tâches."
+
+msgid "Unable to open PPD file"
+msgstr ""
+
+msgid "Unable to open compressed print file"
+msgstr ""
+
+msgid "Unable to open cupsd.conf file:"
+msgstr "Impossible d’ouvrir le fichier cupsd.conf :"
+
+msgid "Unable to open device file"
+msgstr ""
+
+#, c-format
+msgid "Unable to open document #%d in job #%d."
+msgstr ""
+
+msgid "Unable to open help file."
+msgstr ""
+
+msgid "Unable to open print file"
+msgstr ""
+
+msgid "Unable to open raster file"
+msgstr ""
+
+msgid "Unable to print test page"
+msgstr "Impossible d’imprimer la page de test :"
+
+msgid "Unable to read print data."
+msgstr ""
+
+msgid "Unable to resolve printer URI."
+msgstr ""
+
+#, c-format
+msgid "Unable to run \"%s\": %s"
+msgstr ""
+
+msgid "Unable to see in file"
+msgstr ""
+
+msgid "Unable to send command to printer driver"
+msgstr ""
+
+msgid "Unable to send data to printer."
+msgstr ""
+
+#, c-format
+msgid "Unable to set Windows printer driver (%d)."
+msgstr ""
+
+msgid "Unable to set options"
+msgstr "Impossible de définir les options :"
+
+msgid "Unable to set server default"
+msgstr "Impossible de définir la valeur par défaut pour le serveur :"
+
+msgid "Unable to start backend process."
+msgstr ""
+
+msgid "Unable to upload cupsd.conf file"
+msgstr "Impossible de transmettre le fichier cupsd.conf :"
+
+msgid "Unable to use legacy USB class driver."
+msgstr ""
+
+msgid "Unable to write print data"
+msgstr ""
+
+#, c-format
+msgid "Unable to write uncompressed print data: %s"
+msgstr ""
+
+msgid "Unauthorized"
+msgstr "Non autorisé"
+
+msgid "Units"
+msgstr "Unités"
+
+msgid "Unknown"
+msgstr "Inconnu"
+
+#, c-format
+msgid "Unknown choice \"%s\" for option \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unknown encryption option value: \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unknown file order: \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unknown format character: \"%c\"."
+msgstr ""
+
+msgid "Unknown media size name."
+msgstr ""
+
+#, c-format
+msgid "Unknown option \"%s\" with value \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unknown option \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unknown print mode: \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unknown printer-error-policy \"%s\"."
+msgstr "Paramètre printer-error-policy « %s » inconnu."
+
+#, c-format
+msgid "Unknown printer-op-policy \"%s\"."
+msgstr "Paramètre printer-op-policy « %s » inconnu."
+
+msgid "Unknown service name."
+msgstr ""
+
+#, c-format
+msgid "Unknown version option value: \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unsupported 'compression' value \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unsupported 'document-format' value \"%s\"."
+msgstr ""
+
+msgid "Unsupported 'job-name' value."
+msgstr ""
+
+#, c-format
+msgid "Unsupported character set \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unsupported compression \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unsupported document-format \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unsupported document-format \"%s/%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unsupported format \"%s\"."
+msgstr ""
+
+msgid "Unsupported margins."
+msgstr ""
+
+msgid "Unsupported media value."
+msgstr ""
+
+#, c-format
+msgid "Unsupported number-up value %d, using number-up=1."
+msgstr ""
+
+#, c-format
+msgid "Unsupported number-up-layout value %s, using number-up-layout=lrtb."
+msgstr ""
+
+#, c-format
+msgid "Unsupported page-border value %s, using page-border=none."
+msgstr ""
+
+msgid "Unsupported raster data."
+msgstr ""
+
+msgid "Unsupported value type"
+msgstr "Type de valeur non pris en charge"
+
+msgid "Upgrade Required"
+msgstr "Mise à niveau obligatoire"
+
+msgid ""
+"Usage:\n"
+"\n"
+"    lpadmin [-h server] -d destination\n"
+"    lpadmin [-h server] -x destination\n"
+"    lpadmin [-h server] -p printer [-c add-class] [-i interface] [-m model]\n"
+"                       [-r remove-class] [-v device] [-D description]\n"
+"                       [-P ppd-file] [-o name=value]\n"
+"                       [-u allow:user,user] [-u deny:user,user]"
+msgstr ""
+
+#, c-format
+msgid "Usage: %s job-id user title copies options [file]"
+msgstr ""
+
+msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
+msgstr ""
+
+msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
+msgstr ""
+
+msgid "Usage: cupsd [options]"
+msgstr ""
+
+msgid "Usage: cupsfilter [ options ] filename"
+msgstr ""
+
+msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
+msgstr ""
+
+msgid ""
+"Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]"
+msgstr ""
+
+msgid "Usage: ipptool [options] URI filename [ ... filenameN ]"
+msgstr ""
+
+msgid "Usage: lpmove job/src dest"
+msgstr ""
+
+msgid ""
+"Usage: lpoptions [-h server] [-E] -d printer\n"
+"       lpoptions [-h server] [-E] [-p printer] -l\n"
+"       lpoptions [-h server] [-E] -p printer -o option[=value] ...\n"
+"       lpoptions [-h server] [-E] -x printer"
+msgstr ""
+
+msgid "Usage: lppasswd [-g groupname]"
+msgstr ""
+
+msgid ""
+"Usage: lppasswd [-g groupname] [username]\n"
+"       lppasswd [-g groupname] -a [username]\n"
+"       lppasswd [-g groupname] -x [username]"
+msgstr ""
+
+msgid ""
+"Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]"
+msgstr ""
+
+msgid "Usage: ppdc [options] filename.drv [ ... filenameN.drv ]"
+msgstr ""
+
+msgid "Usage: ppdhtml [options] filename.drv >filename.html"
+msgstr ""
+
+msgid "Usage: ppdi [options] filename.ppd [ ... filenameN.ppd ]"
+msgstr ""
+
+msgid "Usage: ppdmerge [options] filename.ppd [ ... filenameN.ppd ]"
+msgstr ""
+
+msgid ""
+"Usage: ppdpo [options] -o filename.po filename.drv [ ... filenameN.drv ]"
+msgstr ""
+
+msgid "Usage: snmp [host-or-ip-address]"
+msgstr ""
+
+msgid "Value uses indefinite length"
+msgstr "La valeur s’avère être de longueur indéfinie"
+
+msgid "VarBind uses indefinite length"
+msgstr "VarBind s’avère être de longueur indéfinie"
+
+msgid "Version uses indefinite length"
+msgstr "La version s’avère être de longueur indéfinie"
+
+msgid "Waiting for job to complete."
+msgstr ""
+
+msgid "Waiting for printer to become available."
+msgstr ""
+
+msgid "Waiting for printer to finish."
+msgstr ""
+
+msgid "Warning, no Windows 2000 printer drivers are installed."
+msgstr ""
+
+msgid "Web Interface is Disabled"
+msgstr ""
+
+msgid "Yes"
+msgstr "Oui"
+
+#, c-format
+msgid ""
+"You must access this page using the URL <A HREF=\"https://%s:%d%s\">https://"
+"%s:%d%s</A>."
+msgstr ""
+"Vous devez accéder à cette page par l’URL <A HREF=\"https://%s:%d%s"
+"\">https://%s:%d%s</A>."
+
+msgid ""
+"Your password must be at least 6 characters long, cannot contain your "
+"username, and must contain at least one letter and number."
+msgstr ""
+
+msgid "ZPL Label Printer"
+msgstr "Imprimante pour étiquettes ZPL"
+
+msgid "Zebra"
+msgstr "Zebra"
+
+msgid "aborted"
+msgstr "abandonnée"
+
+msgid "canceled"
+msgstr "annulée"
+
+msgid "completed"
+msgstr "terminée"
+
+msgid "cups-deviced failed to execute."
+msgstr "L’exécution de « cups-deviced » a échoué."
+
+msgid "cups-driverd failed to execute."
+msgstr "L’exécution de « cups-driverd » a échoué."
+
+#, c-format
+msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
+msgstr ""
+
+msgid "cupsctl: Cannot set Listen or Port directly."
+msgstr ""
+
+#, c-format
+msgid "cupsctl: Unable to connect to server: %s"
+msgstr ""
+
+#, c-format
+msgid "cupsctl: Unknown option \"%s\""
+msgstr ""
+
+#, c-format
+msgid "cupsctl: Unknown option \"-%c\""
+msgstr ""
+
+msgid "cupsd: Expected config filename after \"-c\" option."
+msgstr ""
+
+msgid "cupsd: Expected cups-files.conf filename after \"-s\" option."
+msgstr ""
+
+msgid "cupsd: Relative cups-files.conf filename not allowed."
+msgstr ""
+
+msgid "cupsd: Unable to get current directory."
+msgstr ""
+
+msgid "cupsd: Unable to get path to cups-files.conf file."
+msgstr ""
+
+#, c-format
+msgid "cupsd: Unknown argument \"%s\" - aborting."
+msgstr ""
+
+#, c-format
+msgid "cupsd: Unknown option \"%c\" - aborting."
+msgstr ""
+
+msgid "cupsd: launchd(8) support not compiled in, running in normal mode."
+msgstr ""
+
+#, c-format
+msgid "cupsfilter: Invalid document number %d."
+msgstr ""
+
+#, c-format
+msgid "cupsfilter: Invalid job ID %d."
+msgstr ""
+
+msgid "cupsfilter: Only one filename can be specified."
+msgstr ""
+
+#, c-format
+msgid "cupsfilter: Unable to get job file - %s"
+msgstr ""
+
+msgid "cupstestppd: The -q option is incompatible with the -v option."
+msgstr ""
+
+msgid "cupstestppd: The -v option is incompatible with the -q option."
+msgstr ""
+
+#, c-format
+msgid "device for %s/%s: %s"
+msgstr ""
+
+#, c-format
+msgid "device for %s: %s"
+msgstr ""
+
+msgid "error-index uses indefinite length"
+msgstr "Le paramètre error-index s’avère être de longueur indéfinie"
+
+msgid "error-status uses indefinite length"
+msgstr "Le paramètre error-status s’avère être de longueur indéfinie"
+
+msgid "held"
+msgstr "retenue"
+
+msgid "help\t\tGet help on commands."
+msgstr ""
+
+msgid "idle"
+msgstr "inactive"
+
+msgid "ipptool: \"-i\" and \"-n\" are incompatible with -X\"."
+msgstr ""
+
+#, c-format
+msgid "ipptool: Bad URI - %s."
+msgstr ""
+
+#, c-format
+msgid "ipptool: Bad version %s for \"-V\"."
+msgstr ""
+
+msgid "ipptool: Invalid seconds for \"-i\"."
+msgstr ""
+
+msgid "ipptool: May only specify a single URI."
+msgstr ""
+
+msgid "ipptool: Missing count for \"-n\"."
+msgstr ""
+
+msgid "ipptool: Missing filename for \"-f\"."
+msgstr ""
+
+msgid "ipptool: Missing name=value for \"-d\"."
+msgstr ""
+
+msgid "ipptool: Missing seconds for \"-i\"."
+msgstr ""
+
+msgid "ipptool: Missing timeout for \"-T\"."
+msgstr ""
+
+msgid "ipptool: Missing version for \"-V\"."
+msgstr ""
+
+msgid "ipptool: URI required before test file."
+msgstr ""
+
+#, c-format
+msgid "ipptool: Unknown option \"-%c\"."
+msgstr ""
+
+msgid "job-printer-uri attribute missing."
+msgstr ""
+
+msgid "lpadmin: Class name can only contain printable characters."
+msgstr ""
+
+msgid "lpadmin: Expected PPD after \"-P\" option."
+msgstr ""
+
+msgid "lpadmin: Expected allow/deny:userlist after \"-u\" option."
+msgstr ""
+
+msgid "lpadmin: Expected class after \"-r\" option."
+msgstr ""
+
+msgid "lpadmin: Expected class name after \"-c\" option."
+msgstr ""
+
+msgid "lpadmin: Expected description after \"-D\" option."
+msgstr ""
+
+msgid "lpadmin: Expected device URI after \"-v\" option."
+msgstr ""
+
+msgid "lpadmin: Expected file type(s) after \"-I\" option."
+msgstr ""
+
+msgid "lpadmin: Expected hostname after \"-h\" option."
+msgstr ""
+
+msgid "lpadmin: Expected interface after \"-i\" option."
+msgstr ""
+
+msgid "lpadmin: Expected location after \"-L\" option."
+msgstr ""
+
+msgid "lpadmin: Expected model after \"-m\" option."
+msgstr ""
+
+msgid "lpadmin: Expected name after \"-R\" option."
+msgstr ""
+
+msgid "lpadmin: Expected name=value after \"-o\" option."
+msgstr ""
+
+msgid "lpadmin: Expected printer after \"-p\" option."
+msgstr ""
+
+msgid "lpadmin: Expected printer name after \"-d\" option."
+msgstr ""
+
+msgid "lpadmin: Expected printer or class after \"-x\" option."
+msgstr ""
+
+msgid "lpadmin: No member names were seen."
+msgstr ""
+
+#, c-format
+msgid "lpadmin: Printer %s is already a member of class %s."
+msgstr ""
+
+#, c-format
+msgid "lpadmin: Printer %s is not a member of class %s."
+msgstr ""
+
+msgid "lpadmin: Printer name can only contain printable characters."
+msgstr ""
+
+msgid ""
+"lpadmin: Unable to add a printer to the class:\n"
+"         You must specify a printer name first."
+msgstr ""
+
+#, c-format
+msgid "lpadmin: Unable to connect to server: %s"
+msgstr ""
+
+msgid "lpadmin: Unable to create temporary file"
+msgstr ""
+
+msgid ""
+"lpadmin: Unable to delete option:\n"
+"         You must specify a printer name first."
+msgstr ""
+
+#, c-format
+msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
+msgstr ""
+
+msgid ""
+"lpadmin: Unable to remove a printer from the class:\n"
+"         You must specify a printer name first."
+msgstr ""
+
+msgid ""
+"lpadmin: Unable to set the printer options:\n"
+"         You must specify a printer name first."
+msgstr ""
+
+#, c-format
+msgid "lpadmin: Unknown allow/deny option \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "lpadmin: Unknown argument \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "lpadmin: Unknown option \"%c\"."
+msgstr ""
+
+msgid "lpadmin: Warning - content type list ignored."
+msgstr ""
+
+msgid "lpc> "
+msgstr "lpc> "
+
+msgid "lpinfo: Expected 1284 device ID string after \"--device-id\"."
+msgstr ""
+
+msgid "lpinfo: Expected language after \"--language\"."
+msgstr ""
+
+msgid "lpinfo: Expected make and model after \"--make-and-model\"."
+msgstr ""
+
+msgid "lpinfo: Expected product string after \"--product\"."
+msgstr ""
+
+msgid "lpinfo: Expected scheme list after \"--exclude-schemes\"."
+msgstr ""
+
+msgid "lpinfo: Expected scheme list after \"--include-schemes\"."
+msgstr ""
+
+msgid "lpinfo: Expected timeout after \"--timeout\"."
+msgstr ""
+
+#, c-format
+msgid "lpinfo: Unknown argument \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "lpinfo: Unknown option \"%c\"."
+msgstr ""
+
+#, c-format
+msgid "lpinfo: Unknown option \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "lpmove: Unable to connect to server: %s"
+msgstr ""
+
+#, c-format
+msgid "lpmove: Unknown argument \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "lpmove: Unknown option \"%c\"."
+msgstr ""
+
+msgid "lpoptions: No printers."
+msgstr ""
+
+#, c-format
+msgid "lpoptions: Unable to add printer or instance: %s"
+msgstr ""
+
+#, c-format
+msgid "lpoptions: Unable to get PPD file for %s: %s"
+msgstr ""
+
+#, c-format
+msgid "lpoptions: Unable to open PPD file for %s."
+msgstr ""
+
+msgid "lpoptions: Unknown printer or class."
+msgstr ""
+
+msgid "lppasswd: Only root can add or delete passwords."
+msgstr ""
+
+msgid "lppasswd: Password file busy."
+msgstr ""
+
+msgid "lppasswd: Password file not updated."
+msgstr ""
+
+msgid "lppasswd: Sorry, password doesn't match."
+msgstr ""
+
+msgid "lppasswd: Sorry, password rejected."
+msgstr ""
+
+msgid "lppasswd: Sorry, passwords don't match."
+msgstr ""
+
+#, c-format
+msgid "lppasswd: Unable to copy password string: %s"
+msgstr ""
+
+#, c-format
+msgid "lppasswd: Unable to open password file: %s"
+msgstr ""
+
+#, c-format
+msgid "lppasswd: Unable to write to password file: %s"
+msgstr ""
+
+#, c-format
+msgid "lppasswd: failed to backup old password file: %s"
+msgstr ""
+
+#, c-format
+msgid "lppasswd: failed to rename password file: %s"
+msgstr ""
+
+#, c-format
+msgid "lppasswd: user \"%s\" and group \"%s\" do not exist."
+msgstr ""
+
+#, c-format
+msgid ""
+"lpstat: error - %s environment variable names non-existent destination \"%s"
+"\"."
+msgstr ""
+
+#, c-format
+msgid "members of class %s:"
+msgstr ""
+
+msgid "no entries"
+msgstr ""
+
+msgid "no system default destination"
+msgstr ""
+
+msgid "notify-events not specified."
+msgstr ""
+
+#, c-format
+msgid "notify-recipient-uri URI \"%s\" is already used."
+msgstr ""
+
+#, c-format
+msgid "notify-recipient-uri URI \"%s\" uses unknown scheme."
+msgstr ""
+
+msgid "pending"
+msgstr "en attente"
+
+#, c-format
+msgid "ppdc: Adding include directory \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Adding/updating UI text from %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Bad boolean value (%s) on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Bad font attribute: %s"
+msgstr ""
+
+#, c-format
+msgid "ppdc: Bad resolution name \"%s\" on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Bad status keyword %s on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Bad variable substitution ($%c) on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Choice found on line %d of %s with no Option."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Duplicate #po for locale %s on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected a filter definition on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected a program name on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected boolean value on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected charset after Font on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected choice code on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected choice name/text on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected color order for ColorModel on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected colorspace for ColorModel on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected compression for ColorModel on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected constraints string for UIConstraints on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid ""
+"ppdc: Expected driver type keyword following DriverType on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected duplex type after Duplex on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected encoding after Font on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected filename after #po %s on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected group name/text on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected include filename on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected integer on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected locale after #po on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected name after %s on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected name after FileName on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected name after Font on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected name after Manufacturer on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected name after MediaSize on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected name after ModelName on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected name after PCFileName on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected name/text after %s on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected name/text after Installable on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected name/text after Resolution on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected name/text combination for ColorModel on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected option name/text on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected option section on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected option type on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected override field after Resolution on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected quoted string on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected real number on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid ""
+"ppdc: Expected resolution/mediatype following ColorProfile on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid ""
+"ppdc: Expected resolution/mediatype following SimpleColorProfile on line %d "
+"of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected selector after %s on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected status after Font on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected string after Copyright on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected string after Version on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected two option names on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected value after %s on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected version after Font on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Invalid #include/#po filename \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Invalid cost for filter on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Invalid empty MIME type for filter on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Invalid empty program name for filter on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Invalid option section \"%s\" on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Invalid option type \"%s\" on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Loading driver information file \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Loading messages for locale \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Loading messages from \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Missing #endif at end of \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Missing #if on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid ""
+"ppdc: Need a msgid line before any translation strings on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: No message catalog provided for locale %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Option %s defined in two different groups on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Option %s redefined with a different type on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Option constraint must *name on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Too many nested #if's on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unable to create PPD file \"%s\" - %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unable to create output directory %s: %s"
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unable to create output pipes: %s"
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unable to execute cupstestppd: %s"
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unable to find #po file %s on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unable to find include file \"%s\" on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unable to find localization for \"%s\" - %s"
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unable to load localization file \"%s\" - %s"
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unable to open %s: %s"
+msgstr ""
+
+#, c-format
+msgid "ppdc: Undefined variable (%s) on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unexpected text on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unknown driver type %s on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unknown duplex type \"%s\" on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unknown media size \"%s\" on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unknown message catalog format for \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unknown token \"%s\" seen on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid ""
+"ppdc: Unknown trailing characters in real number \"%s\" on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unterminated string starting with %c on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Warning - overlapping filename \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Writing %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Writing PPD files to directory \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "ppdmerge: Bad LanguageVersion \"%s\" in %s."
+msgstr ""
+
+#, c-format
+msgid "ppdmerge: Ignoring PPD file %s."
+msgstr ""
+
+#, c-format
+msgid "ppdmerge: Unable to backup %s to %s - %s"
+msgstr ""
+
+#, c-format
+msgid "printer %s disabled since %s -"
+msgstr ""
+
+#, c-format
+msgid "printer %s is idle.  enabled since %s"
+msgstr ""
+
+#, c-format
+msgid "printer %s now printing %s-%d.  enabled since %s"
+msgstr ""
+
+#, c-format
+msgid "printer %s/%s disabled since %s -"
+msgstr ""
+
+#, c-format
+msgid "printer %s/%s is idle.  enabled since %s"
+msgstr ""
+
+#, c-format
+msgid "printer %s/%s now printing %s-%d.  enabled since %s"
+msgstr ""
+
+msgid "processing"
+msgstr "en cours"
+
+#, c-format
+msgid "request id is %s-%d (%d file(s))"
+msgstr ""
+
+msgid "request-id uses indefinite length"
+msgstr "Le paramètre request-id s’avère être de longueur indéfinie"
+
+msgid "scheduler is not running"
+msgstr ""
+
+msgid "scheduler is running"
+msgstr ""
+
+#, c-format
+msgid "stat of %s failed: %s"
+msgstr "stat sur %s a échoué : %s"
+
+msgid "status\t\tShow status of daemon and queue."
+msgstr ""
+
+msgid "stopped"
+msgstr "arrêtée"
+
+#, c-format
+msgid "system default destination: %s"
+msgstr ""
+
+#, c-format
+msgid "system default destination: %s/%s"
+msgstr ""
+
+msgid "unknown"
+msgstr "inconnu"
+
+msgid "untitled"
+msgstr "sans titre"
+
+msgid "variable-bindings uses indefinite length"
+msgstr ""
diff --git a/locale/cups_ja.po b/locale/cups_ja.po
index 4982be5f..70bbe642 100644
--- a/locale/cups_ja.po
+++ b/locale/cups_ja.po
@@ -12,7 +12,6 @@
 #   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/".
 #
-
 #
 # Notes for Translators:
 #
@@ -29,7 +28,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2012-05-23 16:24-0700\n"
+"POT-Creation-Date: 2013-03-08 13:25-0500\n"
 "PO-Revision-Date: 2012-06-13 01:20+0900\n"
 "Last-Translator: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"
 "Language-Team: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"
@@ -38,293 +37,225 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: systemv/lpstat.c:1876 systemv/lpstat.c:2001
 msgid "\t\t(all)"
 msgstr "\t\t(すべて)"
 
-#: systemv/lpstat.c:1879 systemv/lpstat.c:1882 systemv/lpstat.c:2004
-#: systemv/lpstat.c:2007
 msgid "\t\t(none)"
 msgstr "\t\t(なし)"
 
-#: berkeley/lpc.c:434
 #, c-format
 msgid "\t%d entries"
 msgstr "\t%d エントリー"
 
-#: systemv/lpstat.c:756 systemv/lpstat.c:772
 #, c-format
 msgid "\t%s"
 msgstr "\t%s"
 
-#: systemv/lpstat.c:1857 systemv/lpstat.c:1982
 msgid "\tAfter fault: continue"
 msgstr "\t失敗後: 継続"
 
-#: systemv/lpstat.c:1481 systemv/lpstat.c:1826 systemv/lpstat.c:1952
 #, c-format
 msgid "\tAlerts: %s"
 msgstr "\t警告: %s"
 
-#: systemv/lpstat.c:1880 systemv/lpstat.c:2005
 msgid "\tBanner required"
 msgstr "\tバナーが必要"
 
-#: systemv/lpstat.c:1881 systemv/lpstat.c:2006
 msgid "\tCharset sets:"
 msgstr "\t文字セット:"
 
-#: systemv/lpstat.c:1845 systemv/lpstat.c:1970
 msgid "\tConnection: direct"
 msgstr "\t接続: 直結"
 
-#: systemv/lpstat.c:1836 systemv/lpstat.c:1962
 msgid "\tConnection: remote"
 msgstr "\t接続: リモート"
 
-#: systemv/lpstat.c:1800 systemv/lpstat.c:1926
 msgid "\tContent types: any"
 msgstr "\tコンテンツの種類: すべて"
 
-#: systemv/lpstat.c:1884 systemv/lpstat.c:2009
 msgid "\tDefault page size:"
 msgstr "\tデフォルト用紙サイズ:"
 
-#: systemv/lpstat.c:1883 systemv/lpstat.c:2008
 msgid "\tDefault pitch:"
 msgstr "\tデフォルトピッチ:"
 
-#: systemv/lpstat.c:1885 systemv/lpstat.c:2010
 msgid "\tDefault port settings:"
 msgstr "\tデフォルトポート設定:"
 
-#: systemv/lpstat.c:1806 systemv/lpstat.c:1932
 #, c-format
 msgid "\tDescription: %s"
 msgstr "\t説明: %s"
 
-#: systemv/lpstat.c:1799 systemv/lpstat.c:1925
 msgid "\tForm mounted:"
 msgstr "\t設定されたフォーム:"
 
-#: systemv/lpstat.c:1878 systemv/lpstat.c:2003
 msgid "\tForms allowed:"
 msgstr "\t許可されているフォーム:"
 
-#: systemv/lpstat.c:1840 systemv/lpstat.c:1966
 #, c-format
 msgid "\tInterface: %s.ppd"
 msgstr "\tインターフェイス: %s.ppd"
 
-#: systemv/lpstat.c:1849 systemv/lpstat.c:1974
 #, c-format
 msgid "\tInterface: %s/interfaces/%s"
 msgstr "\tインターフェイス: %s/interfaces/%s"
 
-#: systemv/lpstat.c:1853 systemv/lpstat.c:1978
 #, c-format
 msgid "\tInterface: %s/ppd/%s.ppd"
 msgstr "\tインターフェイス: %s/ppd/%s.ppd"
 
-#: systemv/lpstat.c:1831 systemv/lpstat.c:1957
 #, c-format
 msgid "\tLocation: %s"
 msgstr "\t場所: %s"
 
-#: systemv/lpstat.c:1856 systemv/lpstat.c:1981
 msgid "\tOn fault: no alert"
 msgstr "\t失敗時: 警告なし"
 
-#: systemv/lpstat.c:1801 systemv/lpstat.c:1927
 msgid "\tPrinter types: unknown"
 msgstr "\tプリンターの種類: 不明"
 
-#: systemv/lpstat.c:1462
 #, c-format
 msgid "\tStatus: %s"
 msgstr "\tステータス: %s"
 
-#: systemv/lpstat.c:1861 systemv/lpstat.c:1875 systemv/lpstat.c:1986
-#: systemv/lpstat.c:2000
 msgid "\tUsers allowed:"
 msgstr "\t許可されているユーザー:"
 
-#: systemv/lpstat.c:1868 systemv/lpstat.c:1993
 msgid "\tUsers denied:"
 msgstr "\t禁止されているユーザー:"
 
-#: berkeley/lpc.c:436
 msgid "\tdaemon present"
 msgstr "\tデーモンは提供されています"
 
-#: berkeley/lpc.c:432
 msgid "\tno entries"
 msgstr "\tエントリーがありません"
 
-#: berkeley/lpc.c:404 berkeley/lpc.c:416
 #, c-format
 msgid "\tprinter is on device '%s' speed -1"
 msgstr "\tデバイス '%s' 上のプリンター 速度 -1"
 
-#: berkeley/lpc.c:429
 msgid "\tprinting is disabled"
 msgstr "\t印刷は無効です"
 
-#: berkeley/lpc.c:427
 msgid "\tprinting is enabled"
 msgstr "\t印刷は有効です"
 
-#: systemv/lpstat.c:1484
 #, c-format
 msgid "\tqueued for %s"
 msgstr "\t%s にキューしました"
 
-#: berkeley/lpc.c:424
 msgid "\tqueuing is disabled"
 msgstr "\tキューは無効です"
 
-#: berkeley/lpc.c:422
 msgid "\tqueuing is enabled"
 msgstr "\tキューは有効です"
 
-#: systemv/lpstat.c:1792 systemv/lpstat.c:1918
 msgid "\treason unknown"
 msgstr "\t未知の理由"
 
-#: systemv/cupstestppd.c:454
 msgid ""
 "\n"
 "    DETAILED CONFORMANCE TEST RESULTS"
-msgstr "\n    適合テスト結果詳細"
+msgstr ""
+"\n"
+"    適合テスト結果詳細"
 
-#: systemv/cupstestppd.c:3800
 msgid "                          Ignore specific warnings."
 msgstr "                          指定された警告を無視する。"
 
-#: systemv/cupstestppd.c:3804
 msgid "                          Issue warnings instead of errors."
 msgstr "                          エラーを警告として扱う。"
 
-#: systemv/cupstestppd.c:410 systemv/cupstestppd.c:415
 msgid "                REF: Page 15, section 3.1."
 msgstr "                参照: 15 ページ、セクション 3.1。"
 
-#: systemv/cupstestppd.c:405
 msgid "                REF: Page 15, section 3.2."
 msgstr "                参照: 15 ページ、セクション 3.2。"
 
-#: systemv/cupstestppd.c:425
 msgid "                REF: Page 19, section 3.3."
 msgstr "                参照: 19 ページ、セクション 3.3。"
 
-#: systemv/cupstestppd.c:378
 msgid "                REF: Page 20, section 3.4."
 msgstr "                参照: 20 ページ、セクション 3.4。"
 
-#: systemv/cupstestppd.c:430
 msgid "                REF: Page 27, section 3.5."
 msgstr "                参照: 27 ページ、セクション 3.5。"
 
-#: systemv/cupstestppd.c:373
 msgid "                REF: Page 42, section 5.2."
 msgstr "                参照: 42 ページ、セクション 5.2。"
 
-#: systemv/cupstestppd.c:420
 msgid "                REF: Pages 16-17, section 3.2."
 msgstr "                参照: 16-17 ページ、セクション 3.2。"
 
-#: systemv/cupstestppd.c:390
 msgid "                REF: Pages 42-45, section 5.2."
 msgstr "                参照: 42-45 ページ、セクション 5.2。"
 
-#: systemv/cupstestppd.c:384
 msgid "                REF: Pages 45-46, section 5.2."
 msgstr "                参照: 45-46 ページ、セクション 5.2。"
 
-#: systemv/cupstestppd.c:395
 msgid "                REF: Pages 48-49, section 5.2."
 msgstr "                参照: 48-49 ページ、セクション 5.2。"
 
-#: systemv/cupstestppd.c:400
 msgid "                REF: Pages 52-54, section 5.2."
 msgstr "                参照: 52-54 ページ、セクション 5.2。"
 
-#: berkeley/lpq.c:554
 #, c-format
 msgid "        %-39.39s %.0f bytes"
 msgstr "        %-39.39s %.0f バイト"
 
-#: systemv/cupstestppd.c:589
 #, c-format
 msgid "        PASS    Default%s"
 msgstr "        合格    Default%s"
 
-#: systemv/cupstestppd.c:524
 msgid "        PASS    DefaultImageableArea"
 msgstr "        合格    DefaultImageableArea"
 
-#: systemv/cupstestppd.c:558
 msgid "        PASS    DefaultPaperDimension"
 msgstr "        合格    DefaultPaperDimension"
 
-#: systemv/cupstestppd.c:631
 msgid "        PASS    FileVersion"
 msgstr "        合格    FileVersion"
 
-#: systemv/cupstestppd.c:675
 msgid "        PASS    FormatVersion"
 msgstr "        合格    FormatVersion"
 
-#: systemv/cupstestppd.c:695
 msgid "        PASS    LanguageEncoding"
 msgstr "        合格    LanguageEncoding"
 
-#: systemv/cupstestppd.c:715
 msgid "        PASS    LanguageVersion"
 msgstr "        合格    LanguageVersion"
 
-#: systemv/cupstestppd.c:769
 msgid "        PASS    Manufacturer"
 msgstr "        合格    Manufacturer"
 
-#: systemv/cupstestppd.c:809
 msgid "        PASS    ModelName"
 msgstr "        合格    ModelName"
 
-#: systemv/cupstestppd.c:829
 msgid "        PASS    NickName"
 msgstr "        合格    NickName"
 
-#: systemv/cupstestppd.c:889
 msgid "        PASS    PCFileName"
 msgstr "        合格    PCFileName"
 
-#: systemv/cupstestppd.c:964
 msgid "        PASS    PSVersion"
 msgstr "        合格    PSVersion"
 
-#: systemv/cupstestppd.c:869
 msgid "        PASS    PageRegion"
 msgstr "        合格    PageRegion"
 
-#: systemv/cupstestppd.c:849
 msgid "        PASS    PageSize"
 msgstr "        合格    PageSize"
 
-#: systemv/cupstestppd.c:924
 msgid "        PASS    Product"
 msgstr "        合格    Product"
 
-#: systemv/cupstestppd.c:999
 msgid "        PASS    ShortNickName"
 msgstr "        合格    ShortNickName"
 
-#: systemv/cupstestppd.c:1374
 #, c-format
 msgid "        WARN    %s has no corresponding options."
 msgstr "        警告    %s は相当するオプションがありません。"
 
-#: systemv/cupstestppd.c:1486
 #, c-format
 msgid ""
 "        WARN    %s shares a common prefix with %s\n"
@@ -333,21 +264,20 @@ msgstr ""
 "        警告    %s は %s と一般プレフィックスを共有します。\n"
 "                参照: 15 ページ、セクション 3.2。"
 
-#: systemv/cupstestppd.c:1345
 #, c-format
 msgid ""
 "        WARN    Duplex option keyword %s may not work as expected and should "
 "be named Duplex.\n"
 "                REF: Page 122, section 5.17"
 msgstr ""
-"        警告    Duplex オプションキーワード %s は期待通りに動作しないかもしれません。また、Duplex という名前であるべきです。"
-"                参照: 122 ページ、セクション 5.17"
+"        警告    Duplex オプションキーワード %s は期待通りに動作しないかもしれ"
+"ません。また、Duplex という名前であるべきです。                参照: 122 ペー"
+"ジ、セクション 5.17"
 
-#: systemv/cupstestppd.c:1744
 msgid "        WARN    File contains a mix of CR, LF, and CR LF line endings."
-msgstr "        警告    ファイルが CR、LF、CR LF の行末を混在して含んでいます。"
+msgstr ""
+"        警告    ファイルが CR、LF、CR LF の行末を混在して含んでいます。"
 
-#: systemv/cupstestppd.c:1390
 msgid ""
 "        WARN    LanguageEncoding required by PPD 4.3 spec.\n"
 "                REF: Pages 56-57, section 5.3."
@@ -355,12 +285,10 @@ msgstr ""
 "        警告    LanguageEncoding は PPD 4.3 仕様で必須です。\n"
 "                参照: 56-57 ページ、セクション 5.3。"
 
-#: systemv/cupstestppd.c:1726
 #, c-format
 msgid "        WARN    Line %d only contains whitespace."
 msgstr "        警告    %d 行が空白だけです。"
 
-#: systemv/cupstestppd.c:1398
 msgid ""
 "        WARN    Manufacturer required by PPD 4.3 spec.\n"
 "                REF: Pages 58-59, section 5.3."
@@ -368,13 +296,13 @@ msgstr ""
 "        警告    Manufacturer は PPD 4.3 仕様で必須です。\n"
 "                参照: 58-59 ページ、セクション 5.3。"
 
-#: systemv/cupstestppd.c:1749
 msgid ""
 "        WARN    Non-Windows PPD files should use lines ending with only LF, "
 "not CR LF."
-msgstr "        警告    非 Windows PPD ファイルは、CR LF でなく LF のみを行末に使うべきです。"
+msgstr ""
+"        警告    非 Windows PPD ファイルは、CR LF でなく LF のみを行末に使うべ"
+"きです。"
 
-#: systemv/cupstestppd.c:1382
 #, c-format
 msgid ""
 "        WARN    Obsolete PPD version %.1f.\n"
@@ -383,7 +311,6 @@ msgstr ""
 "        警告    PPD バージョン %.1f は現在使われていません。\n"
 "                参照: 42 ページ、セクション 5.2。"
 
-#: systemv/cupstestppd.c:1413
 msgid ""
 "        WARN    PCFileName longer than 8.3 in violation of PPD spec.\n"
 "                REF: Pages 61-62, section 5.3."
@@ -391,7 +318,6 @@ msgstr ""
 "        警告    8.3 文字より長い PCFileName は PPD 仕様違反です。\n"
 "                参照: 61-62 ページ、セクション 5.3。"
 
-#: systemv/cupstestppd.c:1421
 msgid ""
 "        WARN    PCFileName should contain a unique filename.\n"
 "                REF: Pages 61-62, section 5.3."
@@ -399,23 +325,22 @@ msgstr ""
 "        警告    PCFileName はユニークなファイル名でなければなりません。\n"
 "                参照: 61-62 ページ、セクション 5.3。"
 
-#: systemv/cupstestppd.c:1456
 msgid ""
 "        WARN    Protocols contains PJL but JCL attributes are not set.\n"
 "                REF: Pages 78-79, section 5.7."
 msgstr ""
-"        警告    プロトコルが PJL を含んでいますが JCL 属性が設定されていません。\n"
+"        警告    プロトコルが PJL を含んでいますが JCL 属性が設定されていませ"
+"ん。\n"
 "                参照: 78-79 ページ、セクション 5.7。"
 
-#: systemv/cupstestppd.c:1447
 msgid ""
 "        WARN    Protocols contains both PJL and BCP; expected TBCP.\n"
 "                REF: Pages 78-79, section 5.7."
 msgstr ""
-"        警告    プロトコルが PJL と BCP の両方を含んでいます; TBCP を想定します。\n"
+"        警告    プロトコルが PJL と BCP の両方を含んでいます; TBCP を想定しま"
+"す。\n"
 "                参照: 78-79 ページ、セクション 5.7。"
 
-#: systemv/cupstestppd.c:1430
 msgid ""
 "        WARN    ShortNickName required by PPD 4.3 spec.\n"
 "                REF: Pages 64-65, section 5.3."
@@ -423,19 +348,15 @@ msgstr ""
 "        警告    ShortNickName は PPD 4.3 仕様で必須です。\n"
 "                参照: 64-65 ページ、セクション 5.3。"
 
-#: systemv/cupsaddsmb.c:282
 msgid "       cupsaddsmb [options] -a"
 msgstr "       cupsaddsmb [オプション] -a"
 
-#: systemv/cupstestdsc.c:427
 msgid "       cupstestdsc [options] -"
 msgstr "       cupstestdsc [オプション] -"
 
-#: systemv/cupstestppd.c:3795
 msgid "       program | cupstestppd [options] -"
 msgstr "       program | cupstestppd [オプション] -"
 
-#: systemv/cupstestppd.c:3727
 #, c-format
 msgid ""
 "      %s  \"%s %s\" conflicts with \"%s %s\"\n"
@@ -444,17 +365,15 @@ msgstr ""
 "      %s  \"%s %s\" は \"%s %s\" と競合します\n"
 "                (禁則=\"%s %s %s %s\")。"
 
-#: systemv/cupstestppd.c:2248
 #, c-format
 msgid "      %s  %s %s does not exist."
 msgstr "      %s  %s %s が存在しません。"
 
-#: systemv/cupstestppd.c:3884
 #, c-format
 msgid "      %s  %s file \"%s\" has the wrong capitalization."
-msgstr "      %s  %s ファイル \"%s\" は不正な大文字で始まるワードを含んでいます。"
+msgstr ""
+"      %s  %s ファイル \"%s\" は不正な大文字で始まるワードを含んでいます。"
 
-#: systemv/cupstestppd.c:2318
 #, c-format
 msgid ""
 "      %s  Bad %s choice %s.\n"
@@ -463,99 +382,72 @@ msgstr ""
 "      %s  不正な %s が %s を選んでいます。\n"
 "                参照: 122 ページ、セクション 5.17"
 
-#: systemv/cupstestppd.c:3487 systemv/cupstestppd.c:3536
-#: systemv/cupstestppd.c:3575
 #, c-format
 msgid "      %s  Bad UTF-8 \"%s\" translation string for option %s, choice %s."
-msgstr "      %s  不正な UTF-8 \"%s\" 翻訳文字列 (オプション %s 、選択 %s) です。"
+msgstr ""
+"      %s  不正な UTF-8 \"%s\" 翻訳文字列 (オプション %s 、選択 %s) です。"
 
-#: systemv/cupstestppd.c:3441
 #, c-format
 msgid "      %s  Bad UTF-8 \"%s\" translation string for option %s."
 msgstr "      %s  不正な UTF-8 \"%s\" 翻訳文字列 (オプション %s 用) です。"
 
-#: systemv/cupstestppd.c:2389
 #, c-format
 msgid "      %s  Bad cupsFilter value \"%s\"."
 msgstr "      %s  不正な値が cupsFilter に設定されています。 \"%s\""
 
-#: systemv/cupstestppd.c:2475
 #, c-format
 msgid "      %s  Bad cupsFilter2 value \"%s\"."
 msgstr "      %s  不正な値が cupsFilter2 に設定されています。 \"%s\""
 
-#: systemv/cupstestppd.c:2964
 #, c-format
 msgid "      %s  Bad cupsICCProfile %s."
 msgstr "      %s  不正な cupsICCProfile %sです。"
 
-#: systemv/cupstestppd.c:2571
 #, c-format
 msgid "      %s  Bad cupsPreFilter value \"%s\"."
 msgstr "      %s  不正な値が cupsPreFilter に設定されています。 \"%s\""
 
-#: systemv/cupstestppd.c:1822
 #, c-format
 msgid "      %s  Bad cupsUIConstraints %s: \"%s\""
 msgstr "      %s  不正な cupsUIConstraints %s: \"%s\"です。"
 
-#: systemv/cupstestppd.c:3391
 #, c-format
 msgid "      %s  Bad language \"%s\"."
 msgstr "      %s  無効な言語 \"%s\"です。"
 
-#: systemv/cupstestppd.c:2433 systemv/cupstestppd.c:2529
-#: systemv/cupstestppd.c:2615 systemv/cupstestppd.c:2673
-#: systemv/cupstestppd.c:2728 systemv/cupstestppd.c:2783
-#: systemv/cupstestppd.c:2838 systemv/cupstestppd.c:2891
-#: systemv/cupstestppd.c:3013
 #, c-format
 msgid "      %s  Bad permissions on %s file \"%s\"."
 msgstr "      %s  不正なパーミッション %s です (ファイル \"%s\")。"
 
-#: systemv/cupstestppd.c:2373 systemv/cupstestppd.c:2459
-#: systemv/cupstestppd.c:2555 systemv/cupstestppd.c:2642
-#: systemv/cupstestppd.c:2697 systemv/cupstestppd.c:2752
-#: systemv/cupstestppd.c:2807 systemv/cupstestppd.c:2862
 #, c-format
 msgid "      %s  Bad spelling of %s - should be %s."
 msgstr "      %s  %s の不正な綴りです - %s であるべきです。"
 
-#: systemv/cupstestppd.c:2907
 #, c-format
 msgid "      %s  Cannot provide both APScanAppPath and APScanAppBundleID."
 msgstr "      %s  APScanAppPath と APScanAppBundleID は同時に指定できません。"
 
-#: systemv/cupstestppd.c:2205
 #, c-format
 msgid "      %s  Default choices conflicting."
 msgstr "      %s  デフォルトの選択肢が競合しています。"
 
-#: systemv/cupstestppd.c:1803
 #, c-format
 msgid "      %s  Empty cupsUIConstraints %s"
 msgstr "      %s 空の cupsUIConstraints %sです。"
 
-#: systemv/cupstestppd.c:3519 systemv/cupstestppd.c:3559
 #, c-format
 msgid "      %s  Missing \"%s\" translation string for option %s, choice %s."
-msgstr "      %s  \"%s\" 翻訳文字列 (オプション %s 、選択 %s) が見つかりません。"
+msgstr ""
+"      %s  \"%s\" 翻訳文字列 (オプション %s 、選択 %s) が見つかりません。"
 
-#: systemv/cupstestppd.c:3427
 #, c-format
 msgid "      %s  Missing \"%s\" translation string for option %s."
 msgstr "      %s  \"%s\" 翻訳文字列 (オプション %s 用) が見つかりません。"
 
-#: systemv/cupstestppd.c:2418 systemv/cupstestppd.c:2514
-#: systemv/cupstestppd.c:2600 systemv/cupstestppd.c:2658
-#: systemv/cupstestppd.c:2713 systemv/cupstestppd.c:2768
-#: systemv/cupstestppd.c:2823 systemv/cupstestppd.c:2875
-#: systemv/cupstestppd.c:2998
 #, c-format
 msgid "      %s  Missing %s file \"%s\"."
 msgstr "      %s  %s が見つかりません (ファイル \"%s\")。"
 
-#: systemv/cupstestppd.c:3121
 #, c-format
 msgid ""
 "      %s  Missing REQUIRED PageRegion option.\n"
@@ -564,7 +456,6 @@ msgstr ""
 "      %s  必須の PageRegion オプションが見つかりません。\n"
 "                参照: 100 ページ、セクション 5.14。"
 
-#: systemv/cupstestppd.c:3106
 #, c-format
 msgid ""
 "      %s  Missing REQUIRED PageSize option.\n"
@@ -573,37 +464,35 @@ msgstr ""
 "      %s  必須の PageSize オプションが見つかりません。\n"
 "                参照: 99 ページ、セクション 5.14。"
 
-#: systemv/cupstestppd.c:2013 systemv/cupstestppd.c:2054
 #, c-format
 msgid "      %s  Missing choice *%s %s in UIConstraints \"*%s %s *%s %s\"."
-msgstr "      %s　 選択 *%s %s が UIConstraints \"*%s %s *%s %s\" 内に見つかりません。"
+msgstr ""
+"      %s　 選択 *%s %s が UIConstraints \"*%s %s *%s %s\" 内に見つかりませ"
+"ん。"
 
-#: systemv/cupstestppd.c:1908
 #, c-format
 msgid "      %s  Missing choice *%s %s in cupsUIConstraints %s: \"%s\""
-msgstr "      %s  選択 *%s %s が cupsUIConstraints %s: \"%s\" 内に見つかりません。"
+msgstr ""
+"      %s  選択 *%s %s が cupsUIConstraints %s: \"%s\" 内に見つかりません。"
 
-#: systemv/cupstestppd.c:1840
 #, c-format
 msgid "      %s  Missing cupsUIResolver %s"
 msgstr "      %s  cupsUIResolver ファイル %s が見つかりません。"
 
-#: systemv/cupstestppd.c:1999 systemv/cupstestppd.c:2040
 #, c-format
 msgid "      %s  Missing option %s in UIConstraints \"*%s %s *%s %s\"."
-msgstr "      %s  オプション %s がUIConstraints \"*%s %s *%s %s\" に見つかりません。"
+msgstr ""
+"      %s  オプション %s がUIConstraints \"*%s %s *%s %s\" に見つかりません。"
 
-#: systemv/cupstestppd.c:1892
 #, c-format
 msgid "      %s  Missing option %s in cupsUIConstraints %s: \"%s\""
-msgstr "      %s  オプション %s がcupsUIConstraints %s に見つかりません: \"%s\""
+msgstr ""
+"      %s  オプション %s がcupsUIConstraints %s に見つかりません: \"%s\""
 
-#: systemv/cupstestppd.c:3613
 #, c-format
 msgid "      %s  No base translation \"%s\" is included in file."
 msgstr "      %s  ファイルにベース翻訳文字列 \"%s\" がありません。"
 
-#: systemv/cupstestppd.c:2294
 #, c-format
 msgid ""
 "      %s  REQUIRED %s does not define choice None.\n"
@@ -612,43 +501,38 @@ msgstr ""
 "      %s  必須の %s が選択肢 None を定義していません。\n"
 "                参照: 122 ページ、セクション 5.17。"
 
-#: systemv/cupstestppd.c:3180 systemv/cupstestppd.c:3194
 #, c-format
 msgid "      %s  Size \"%s\" defined for %s but not for %s."
-msgstr "      %s  サイズ \"%s\" は %s 向けに定義されていますが、%s にはありません。"
+msgstr ""
+"      %s  サイズ \"%s\" は %s 向けに定義されていますが、%s にはありません。"
 
-#: systemv/cupstestppd.c:3160
 #, c-format
 msgid "      %s  Size \"%s\" has unexpected dimensions (%gx%g)."
 msgstr "      %s  サイズ \"%s\" は規定外の寸法 (%gx%g) を持っています。"
 
-#: systemv/cupstestppd.c:3332
 #, c-format
 msgid "      %s  Size \"%s\" should be \"%s\"."
 msgstr "      %s  サイズ \"%s\" は \"%s\" であるべきです。"
 
-#: systemv/cupstestppd.c:3292
 #, c-format
 msgid "      %s  Size \"%s\" should be the Adobe standard name \"%s\"."
 msgstr "      %s  サイズ \"%s\" は Adobe 標準名称 \"%s\" であるべきです。"
 
-#: systemv/cupstestppd.c:3041
 #, c-format
 msgid "      %s  cupsICCProfile %s hash value collides with %s."
 msgstr "      %s  cupsICCProfileのハッシュ値 %s が %s と一致しません。"
 
-#: systemv/cupstestppd.c:1963
 #, c-format
 msgid "      %s  cupsUIResolver %s causes a loop."
 msgstr "      %s  cupsUIResolverの %s がループしています。"
 
-#: systemv/cupstestppd.c:1945
 #, c-format
 msgid ""
 "      %s  cupsUIResolver %s does not list at least two different options."
-msgstr "      %s  cupsUIResolver %s は最低でも 2 つの異なったオプションを持っていなければなりません。"
+msgstr ""
+"      %s  cupsUIResolver %s は最低でも 2 つの異なったオプションを持っていなけ"
+"ればなりません。"
 
-#: systemv/cupstestppd.c:1168
 #, c-format
 msgid ""
 "      **FAIL**  %s must be 1284DeviceID\n"
@@ -657,7 +541,6 @@ msgstr ""
 "      **失敗**  %s は 1284DeviceID でなければなりません。\n"
 "                参照: 72 ページ、セクション 5.5"
 
-#: systemv/cupstestppd.c:580
 #, c-format
 msgid ""
 "      **FAIL**  Bad Default%s %s\n"
@@ -666,7 +549,6 @@ msgstr ""
 "      **失敗**  不正な Default%s %s\n"
 "                参照: 40 ページ、セクション 4.5。"
 
-#: systemv/cupstestppd.c:514
 #, c-format
 msgid ""
 "      **FAIL**  Bad DefaultImageableArea %s\n"
@@ -675,7 +557,6 @@ msgstr ""
 "      **失敗**  %s は不正な DefaultImageableArea です。\n"
 "                参照: 102 ページ、セクション 5.15。"
 
-#: systemv/cupstestppd.c:550
 #, c-format
 msgid ""
 "      **FAIL**  Bad DefaultPaperDimension %s\n"
@@ -684,7 +565,6 @@ msgstr ""
 "      **失敗**  %s は不正な DefaultPaperDimension です。\n"
 "                参照: 103 ページ、セクション 5.15。"
 
-#: systemv/cupstestppd.c:623
 #, c-format
 msgid ""
 "      **FAIL**  Bad FileVersion \"%s\"\n"
@@ -693,7 +573,6 @@ msgstr ""
 "      **失敗**  不正なFileVersion \"%s\"\n"
 "                参照: 56 ページ、セクション 5.3。"
 
-#: systemv/cupstestppd.c:667
 #, c-format
 msgid ""
 "      **FAIL**  Bad FormatVersion \"%s\"\n"
@@ -702,7 +581,6 @@ msgstr ""
 "      **失敗**  FormatVersion が違います \"%s\"\n"
 "                参照: 56 ページ、セクション 5.3。"
 
-#: systemv/cupstestppd.c:1025
 msgid ""
 "      **FAIL**  Bad JobPatchFile attribute in file\n"
 "                REF: Page 24, section 3.4."
@@ -710,17 +588,16 @@ msgstr ""
 "      **失敗**  ファイルに不正な JobPatchFile 属性があります\n"
 "                参照: 24 ページ、セクション 3.4。"
 
-#: systemv/cupstestppd.c:1213
 #, c-format
 msgid "      **FAIL**  Bad LanguageEncoding %s - must be ISOLatin1."
-msgstr "      **失敗**  無効な LanguageEncoding %s - ISOLatin1 でなければなりません。"
+msgstr ""
+"      **失敗**  無効な LanguageEncoding %s - ISOLatin1 でなければなりません。"
 
-#: systemv/cupstestppd.c:1227
 #, c-format
 msgid "      **FAIL**  Bad LanguageVersion %s - must be English."
-msgstr "      **失敗**  無効な LanguageVersion %s - English でなければなりません。"
+msgstr ""
+"      **失敗**  無効な LanguageVersion %s - English でなければなりません。"
 
-#: systemv/cupstestppd.c:743 systemv/cupstestppd.c:760
 #, c-format
 msgid ""
 "      **FAIL**  Bad Manufacturer (should be \"%s\")\n"
@@ -729,7 +606,6 @@ msgstr ""
 "      **失敗**  不正な Manufacturer (\"%s\" でなければなりません)\n"
 "                参照: 211 ページ、表 D.1。"
 
-#: systemv/cupstestppd.c:800
 #, c-format
 msgid ""
 "      **FAIL**  Bad ModelName - \"%c\" not allowed in string.\n"
@@ -738,7 +614,6 @@ msgstr ""
 "      **失敗**  不正な ModelName - 文字列に \"%c\" は許可されていません。\n"
 "                参照: 59-60 ページ、セクション 5.3。"
 
-#: systemv/cupstestppd.c:956
 msgid ""
 "      **FAIL**  Bad PSVersion - not \"(string) int\".\n"
 "                REF: Pages 62-64, section 5.3."
@@ -746,7 +621,6 @@ msgstr ""
 "      **失敗**  不正な PSVersion - \"(文字列) 整数\" ではありません。\n"
 "                参照: 62-64 ページ、セクション 5.3。"
 
-#: systemv/cupstestppd.c:917
 msgid ""
 "      **FAIL**  Bad Product - not \"(string)\".\n"
 "                REF: Page 62, section 5.3."
@@ -754,7 +628,6 @@ msgstr ""
 "      **失敗**  不正な Product - \"(文字列)\" ではありません。\n"
 "                参照: 62 ページ、セクション 5.3。"
 
-#: systemv/cupstestppd.c:991
 msgid ""
 "      **FAIL**  Bad ShortNickName - longer than 31 chars.\n"
 "                REF: Pages 64-65, section 5.3."
@@ -762,7 +635,6 @@ msgstr ""
 "      **失敗**  不正な ShortNickName - 31 文字を超えています。\n"
 "                参照: 64-65 ページ、セクション 5.3。"
 
-#: systemv/cupstestppd.c:1149
 #, c-format
 msgid ""
 "      **FAIL**  Bad option %s choice %s\n"
@@ -771,46 +643,43 @@ msgstr ""
 "      **失敗**  不正な %s が %s を選んでいます。\n"
 "                参照: 84 ページ、セクション 5.9"
 
-#: systemv/cupstestppd.c:3754 systemv/cupstestppd.c:3776
 #, c-format
 msgid "      **FAIL**  Default option code cannot be interpreted: %s"
 msgstr "      **失敗**  デフォルトのオプションコードが解釈できません: %s"
 
-#: systemv/cupstestppd.c:1286
 #, c-format
 msgid ""
 "      **FAIL**  Default translation string for option %s choice %s contains "
 "8-bit characters."
-msgstr "      **失敗**  オプション %s、選択肢 %s のデフォルトの翻訳文字列が 8 ビット文字を含んでいます。"
+msgstr ""
+"      **失敗**  オプション %s、選択肢 %s のデフォルトの翻訳文字列が 8 ビット"
+"文字を含んでいます。"
 
-#: systemv/cupstestppd.c:1259
 #, c-format
 msgid ""
 "      **FAIL**  Default translation string for option %s contains 8-bit "
 "characters."
-msgstr "      **失敗**  オプション %s のデフォルトの翻訳文字列が 8 ビット文字を含んでいます。"
+msgstr ""
+"      **失敗**  オプション %s のデフォルトの翻訳文字列が 8 ビット文字を含んで"
+"います。"
 
-#: systemv/cupstestppd.c:2101
 #, c-format
 msgid "      **FAIL**  Group names %s and %s differ only by case."
 msgstr "      **失敗**  グループ名 %s と %s は大文字/小文字が違うだけです。"
 
-#: systemv/cupstestppd.c:2146
 #, c-format
 msgid "      **FAIL**  Multiple occurrences of option %s choice name %s."
 msgstr "      **失敗**  %s で複数のオプション %s が選択されています。"
 
-#: systemv/cupstestppd.c:2163
 #, c-format
 msgid "      **FAIL**  Option %s choice names %s and %s differ only by case."
-msgstr "      **失敗**  %s が選択した %s と %s は大文字/小文字のみが違うだけです。"
+msgstr ""
+"      **失敗**  %s が選択した %s と %s は大文字/小文字のみが違うだけです。"
 
-#: systemv/cupstestppd.c:2123
 #, c-format
 msgid "      **FAIL**  Option names %s and %s differ only by case."
 msgstr "      **失敗**  オプション名 %s と %s は大文字/小文字が違うだけです。"
 
-#: systemv/cupstestppd.c:600
 #, c-format
 msgid ""
 "      **FAIL**  REQUIRED Default%s\n"
@@ -819,7 +688,6 @@ msgstr ""
 "      **失敗**  Default%s は必須\n"
 "                参照: 40 ページ、セクション 4.5。"
 
-#: systemv/cupstestppd.c:499
 msgid ""
 "      **FAIL**  REQUIRED DefaultImageableArea\n"
 "                REF: Page 102, section 5.15."
@@ -827,7 +695,6 @@ msgstr ""
 "      **失敗**  DefaultImageableArea は必須\n"
 "                参照: 102 ページ、セクション 5.15。"
 
-#: systemv/cupstestppd.c:535
 msgid ""
 "      **FAIL**  REQUIRED DefaultPaperDimension\n"
 "                REF: Page 103, section 5.15."
@@ -835,7 +702,6 @@ msgstr ""
 "      **失敗**  DefaultPaperDimension は必須\n"
 "                参照: 103 ページ、セクション 5.15。"
 
-#: systemv/cupstestppd.c:641
 msgid ""
 "      **FAIL**  REQUIRED FileVersion\n"
 "                REF: Page 56, section 5.3."
@@ -843,7 +709,6 @@ msgstr ""
 "      **失敗**  FileVersion は必須\n"
 "                参照: 56 ページ、セクション 5.3。"
 
-#: systemv/cupstestppd.c:685
 msgid ""
 "      **FAIL**  REQUIRED FormatVersion\n"
 "                REF: Page 56, section 5.3."
@@ -851,7 +716,6 @@ msgstr ""
 "      **失敗**  FormatVersion は必須\n"
 "                参照: 56 ページ、セクション 5.3。"
 
-#: systemv/cupstestppd.c:1076
 #, c-format
 msgid ""
 "      **FAIL**  REQUIRED ImageableArea for PageSize %s\n"
@@ -862,7 +726,6 @@ msgstr ""
 "                参照: 41 ページ、セクション 5。\n"
 "                参照: 102 ページ、セクション 5.15。"
 
-#: systemv/cupstestppd.c:705
 msgid ""
 "      **FAIL**  REQUIRED LanguageEncoding\n"
 "                REF: Pages 56-57, section 5.3."
@@ -870,7 +733,6 @@ msgstr ""
 "      **失敗**  LanguageEncoding は必須\n"
 "                参照: 56-57 ページ、セクション 5.3。"
 
-#: systemv/cupstestppd.c:725
 msgid ""
 "      **FAIL**  REQUIRED LanguageVersion\n"
 "                REF: Pages 57-58, section 5.3."
@@ -878,7 +740,6 @@ msgstr ""
 "      **失敗**  LanguageVersion は必須\n"
 "                参照: 57-58 ページ、セクション 5.3。"
 
-#: systemv/cupstestppd.c:779
 msgid ""
 "      **FAIL**  REQUIRED Manufacturer\n"
 "                REF: Pages 58-59, section 5.3."
@@ -886,7 +747,6 @@ msgstr ""
 "      **失敗**  Manufacturer は必須\n"
 "                参照: 58-59 ページ、セクション 5.3。"
 
-#: systemv/cupstestppd.c:819
 msgid ""
 "      **FAIL**  REQUIRED ModelName\n"
 "                REF: Pages 59-60, section 5.3."
@@ -894,7 +754,6 @@ msgstr ""
 "      **失敗**  ModelName は必須\n"
 "                参照: 59-60 ページ、セクション 5.3。"
 
-#: systemv/cupstestppd.c:839
 msgid ""
 "      **FAIL**  REQUIRED NickName\n"
 "                REF: Page 60, section 5.3."
@@ -902,7 +761,6 @@ msgstr ""
 "      **失敗**  NickName は必須\n"
 "                参照: 60 ページ、セクション 5.3。"
 
-#: systemv/cupstestppd.c:899
 msgid ""
 "      **FAIL**  REQUIRED PCFileName\n"
 "                REF: Pages 61-62, section 5.3."
@@ -910,7 +768,6 @@ msgstr ""
 "      **失敗**  PCFileName は必須\n"
 "                参照: 61-62 ページ、セクション 5.3。"
 
-#: systemv/cupstestppd.c:974
 msgid ""
 "      **FAIL**  REQUIRED PSVersion\n"
 "                REF: Pages 62-64, section 5.3."
@@ -918,7 +775,6 @@ msgstr ""
 "      **失敗**  PSVersion は必須\n"
 "                参照: 62-64 ページ、セクション 5.3。"
 
-#: systemv/cupstestppd.c:879
 msgid ""
 "      **FAIL**  REQUIRED PageRegion\n"
 "                REF: Page 100, section 5.14."
@@ -926,7 +782,6 @@ msgstr ""
 "      **失敗**  PageRegion は必須\n"
 "                参照: 100 ページ、セクション 5.14。"
 
-#: systemv/cupstestppd.c:1045
 msgid ""
 "      **FAIL**  REQUIRED PageSize\n"
 "                REF: Page 41, section 5.\n"
@@ -936,7 +791,6 @@ msgstr ""
 "                参照: 41 ページ、セクション 5。\n"
 "                参照: 99 ページ、セクション 5.14。"
 
-#: systemv/cupstestppd.c:859
 msgid ""
 "      **FAIL**  REQUIRED PageSize\n"
 "                REF: Pages 99-100, section 5.14."
@@ -944,7 +798,6 @@ msgstr ""
 "      **失敗**  PageSize は必須\n"
 "                参照: 99-100 ページ、セクション 5.14。"
 
-#: systemv/cupstestppd.c:1098
 #, c-format
 msgid ""
 "      **FAIL**  REQUIRED PaperDimension for PageSize %s\n"
@@ -955,7 +808,6 @@ msgstr ""
 "                参照: 41 ページ、セクション 5。\n"
 "                参照: 103 ページ、セクション 5.15。"
 
-#: systemv/cupstestppd.c:934
 msgid ""
 "      **FAIL**  REQUIRED Product\n"
 "                REF: Page 62, section 5.3."
@@ -963,7 +815,6 @@ msgstr ""
 "      **失敗**  Product は必須\n"
 "                参照: 62 ページ、セクション 5.3。"
 
-#: systemv/cupstestppd.c:1009
 msgid ""
 "      **FAIL**  REQUIRED ShortNickName\n"
 "                REF: Page 64-65, section 5.3."
@@ -971,24 +822,19 @@ msgstr ""
 "      **失敗**  ShortNickName は必須\n"
 "                参照: 64-65 ページ、セクション 5.3。"
 
-#: systemv/cupstestppd.c:334 systemv/cupstestppd.c:353
-#: systemv/cupstestppd.c:365
 #, c-format
 msgid "      **FAIL**  Unable to open PPD file - %s on line %d."
 msgstr ""
 " 失敗\n"
 "      **失敗**  PPD ファイルを開けません - %s (%d 行)。"
 
-#: systemv/cupstestppd.c:1498
 #, c-format
 msgid "    %d ERRORS FOUND"
 msgstr "    %d 個のエラーが見つかりました"
 
-#: systemv/cupstestdsc.c:431
 msgid "    -h       Show program usage"
 msgstr "    -h       このプログラムの利用法を表示する"
 
-#: systemv/cupstestdsc.c:234 systemv/cupstestdsc.c:276
 #, c-format
 msgid ""
 "    Bad %%%%BoundingBox: on line %d.\n"
@@ -997,7 +843,6 @@ msgstr ""
 "    不正な %%%%BoundingBox: (%d 行)。\n"
 "        参照: 39 ページ、%%%%BoundingBox:"
 
-#: systemv/cupstestdsc.c:305
 #, c-format
 msgid ""
 "    Bad %%%%Page: on line %d.\n"
@@ -1006,7 +851,6 @@ msgstr ""
 "    不正な %%%%Page: (%d 行)。\n"
 "        参照: 53 ページ、%%%%Page:"
 
-#: systemv/cupstestdsc.c:218 systemv/cupstestdsc.c:258
 #, c-format
 msgid ""
 "    Bad %%%%Pages: on line %d.\n"
@@ -1015,7 +859,6 @@ msgstr ""
 "    不正な %%%%Pages: (%d 行)。\n"
 "        REF: Page 43, %%%%Pages:"
 
-#: systemv/cupstestdsc.c:176
 #, c-format
 msgid ""
 "    Line %d is longer than 255 characters (%d).\n"
@@ -1024,7 +867,6 @@ msgstr ""
 "    %d 行が 255文字より長くなっています (%d)。\n"
 "        参照: 25 ページ、Line Length"
 
-#: systemv/cupstestdsc.c:192
 msgid ""
 "    Missing %!PS-Adobe-3.0 on first line.\n"
 "        REF: Page 17, 3.1 Conforming Documents"
@@ -1032,14 +874,12 @@ msgstr ""
 "    先頭行に %!PS-Adobe-3.0 がありません。\n"
 "        参照: 17 ページ、3.1 Conforming Documents"
 
-#: systemv/cupstestdsc.c:362
 #, c-format
 msgid "    Missing %%EndComments comment.        REF: Page 41, %%EndComments"
 msgstr ""
 "    %%EndComments コメントが見つかりません。\n"
 "        参照: 41 ページ、%%EndComments"
 
-#: systemv/cupstestdsc.c:342
 #, c-format
 msgid ""
 "    Missing or bad %%BoundingBox: comment.\n"
@@ -1048,7 +888,6 @@ msgstr ""
 "    %%BoundingBox: コメントが見つからないか不正です。\n"
 "        参照: 39 ページ、%%BoundingBox:"
 
-#: systemv/cupstestdsc.c:372
 #, c-format
 msgid ""
 "    Missing or bad %%Page: comments.\n"
@@ -1057,7 +896,6 @@ msgstr ""
 "    %%Page: コメントが見つからないか不正です。\n"
 "        参照: 53 ページ、%%Page:"
 
-#: systemv/cupstestdsc.c:352
 #, c-format
 msgid ""
 "    Missing or bad %%Pages: comment.\n"
@@ -1066,2033 +904,1539 @@ msgstr ""
 "    %%Pages: コメントが見つからないか不正です。\n"
 "        参照: 43 ページ、%%Pages:"
 
-#: systemv/cupstestppd.c:1500
 msgid "    NO ERRORS FOUND"
 msgstr "    エラーは見つかりませんでした"
 
-#: systemv/cupstestdsc.c:395
 #, c-format
 msgid "    Saw %d lines that exceeded 255 characters."
 msgstr "    255文字を超える %d 行が見つかりました。"
 
-#: systemv/cupstestdsc.c:390
 #, c-format
 msgid "    Too many %%BeginDocument comments."
 msgstr "    %%BeginDocument コメントが多すぎます。"
 
-#: systemv/cupstestdsc.c:382
 #, c-format
 msgid "    Too many %%EndDocument comments."
 msgstr "    %%EndDocument コメントが多すぎます。"
 
-#: systemv/cupstestdsc.c:402
 msgid "    Warning: file contains binary data."
 msgstr "    警告: ファイルにバイナリデータが含まれています。"
 
-#: systemv/cupstestdsc.c:410
 #, c-format
 msgid "    Warning: no %%EndComments comment in file."
 msgstr "    警告: ファイルに %%EndComments コメントがありません。"
 
-#: systemv/cupstestdsc.c:406
 #, c-format
 msgid "    Warning: obsolete DSC version %.1f in file."
 msgstr "    警告: ファイルは時代遅れの DSC バージョン %.1f です。"
 
-#: systemv/cupsctl.c:210
 msgid "  --[no-]debug-logging    Turn debug logging on/off."
 msgstr "  --[no-]debug-logging    デバッグログの有効/無効を切り替える。"
 
-#: systemv/cupsctl.c:212
 msgid "  --[no-]remote-admin     Turn remote administration on/off."
 msgstr "  --[no-]remote-admin     リモート管理の有効/無効を切り替える。"
 
-#: systemv/cupsctl.c:214
 msgid "  --[no-]remote-any       Allow/prevent access from the Internet."
-msgstr "  --[no-]remote-any       インターネットからのアクセスを許可/禁止する。"
+msgstr ""
+"  --[no-]remote-any       インターネットからのアクセスを許可/禁止する。"
 
-#: systemv/cupsctl.c:216
 msgid "  --[no-]share-printers   Turn printer sharing on/off."
 msgstr "  --[no-]share-printers   プリンター共有の有効/無効を切り替える。"
 
-#: systemv/cupsctl.c:218
 msgid "  --[no-]user-cancel-any  Allow/prevent users to cancel any job."
-msgstr "  --[no-]user-cancel-any  あらゆるジョブのキャンセルをユーザーに許可/禁止する"
+msgstr ""
+"  --[no-]user-cancel-any  あらゆるジョブのキャンセルをユーザーに許可/禁止する"
 
-#: ppdc/ppdc.cxx:455
 msgid "  --cr                    End lines with CR (Mac OS 9)."
 msgstr "  --cr                    行末を CR とする (Mac OS 9)。"
 
-#: ppdc/ppdc.cxx:457
 msgid "  --crlf                  End lines with CR + LF (Windows)."
 msgstr "  --crlf                  行末を CR + LF とする (Windows)。"
 
-#: ppdc/ppdc.cxx:459
 msgid "  --lf                    End lines with LF (UNIX/Linux/OS X)."
 msgstr "  --lf                    行末を LF とする (UNIX/Linux/OS X)。"
 
-#: test/ipptool.c:4404
 msgid "  -4                      Connect using IPv4."
 msgstr "  -4                      IPv4 で接続する。"
 
-#: test/ipptool.c:4405
 msgid "  -6                      Connect using IPv6."
 msgstr "  -6                      IPv6 で接続する。"
 
-#: test/ipptool.c:4406
 msgid "  -C                      Send requests using chunking (default)."
-msgstr "  -C                      chunking を用いてリクエストを送る (デフォルト)。"
+msgstr ""
+"  -C                      chunking を用いてリクエストを送る (デフォルト)。"
 
-#: scheduler/cupsfilter.c:1431
 msgid "  -D                      Remove the input file when finished."
 msgstr "  -D                      終了したときに入力ファイルを削除する。"
 
-#: ppdc/ppdc.cxx:438 ppdc/ppdhtml.cxx:175 ppdc/ppdpo.cxx:255
 msgid "  -D name=value           Set named variable to value."
-msgstr "  -D name=value           name で指定された変数に値 value をセットする。"
+msgstr ""
+"  -D name=value           name で指定された変数に値 value をセットする。"
 
-#: systemv/cupsaddsmb.c:285 systemv/cupsctl.c:205
 msgid "  -E                      Encrypt the connection."
 msgstr "  -E                      接続を暗号化する。"
 
-#: test/ipptool.c:4408
 msgid "  -E                      Test with HTTP Upgrade to TLS."
-msgstr "  -E                      HTTP から TLS へのアップグレードでテストする。"
+msgstr ""
+"  -E                      HTTP から TLS へのアップグレードでテストする。"
 
-#: scheduler/main.c:2021
 msgid ""
 "  -F                      Run in the foreground but detach from console."
-msgstr "  -F                      フォアグラウンドで実行するがコンソールからはデタッチする。"
+msgstr ""
+"  -F                      フォアグラウンドで実行するがコンソールからはデタッ"
+"チする。"
 
-#: systemv/cupsaddsmb.c:286
 msgid "  -H samba-server         Use the named SAMBA server."
 msgstr "  -H sambaサーバー        指定の SAMBA サーバーを使う。"
 
-#: test/ipptool.c:4410
 msgid "  -I                      Ignore errors."
 msgstr "  -I                      エラーを無視する。"
 
-#: ppdc/ppdc.cxx:440 ppdc/ppdhtml.cxx:177 ppdc/ppdi.cxx:131 ppdc/ppdpo.cxx:257
 msgid "  -I include-dir          Add include directory to search path."
-msgstr "  -I include-dir          インクルードディレクトリーを検索パスに含める。"
+msgstr ""
+"  -I include-dir          インクルードディレクトリーを検索パスに含める。"
 
-#: systemv/cupstestppd.c:3799
 msgid "  -I {filename,filters,none,profiles}"
 msgstr "  -I {filename,filters,none,profiles}"
 
-#: test/ipptool.c:4411
 msgid "  -L                      Send requests using content-length."
 msgstr "  -L                      content-length を用いてリクエストを送る。"
 
-#: scheduler/cupsfilter.c:1433
 msgid "  -P filename.ppd         Set PPD file."
 msgstr "  -P filename.ppd         PPD ファイルを指定する。"
 
-#: systemv/cupstestppd.c:3801
 msgid "  -R root-directory       Set alternate root."
 msgstr "  -R root-directory       別のルートディレクトリーを指定する。"
 
-#: test/ipptool.c:4413
 msgid "  -S                      Test with SSL encryption."
 msgstr "  -S                      SSL 暗号化でテストする。"
 
-#: test/ipptool.c:4415
 msgid "  -T seconds              Set the receive/send timeout in seconds."
 msgstr "  -T seconds              受信／送信タイムアウトを秒で指定する。"
 
-#: scheduler/cupsfilter.c:1434 systemv/cupsaddsmb.c:288 systemv/cupsctl.c:206
 msgid "  -U username             Specify username."
 msgstr "  -U username             ユーザー名を指定する。"
 
-#: test/ipptool.c:4417
 msgid "  -V version              Set default IPP version."
 msgstr "  -V version              デフォルトの IPP バージョンを指定する。"
 
-#: systemv/cupstestppd.c:3802
 msgid ""
 "  -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,"
 "translations}"
-msgstr "  -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,translations}"
+msgstr ""
+"  -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,"
+"translations}"
 
-#: test/ipptool.c:4419
 msgid "  -X                      Produce XML plist instead of plain text."
 msgstr "  -X                      プレーンテキストの代わりに XML を用いる。"
 
-#: systemv/cupsaddsmb.c:289
 msgid "  -a                      Export all printers."
 msgstr "  -a                      すべてのプリンターをエクスポートする。"
 
-#: ppdc/ppdc.cxx:442
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr "  -c catalog.po           指定したメッセージカタログをロードする。"
 
-#: scheduler/cupsfilter.c:1435 scheduler/main.c:2019
 msgid "  -c cupsd.conf           Set cupsd.conf file to use."
 msgstr "  -c cupsd.conf           使用する cupsd.conf ファイルを指定する。"
 
-#: test/ipptool.c:4421
 msgid "  -d name=value           Set named variable to value."
-msgstr "  -d name=value           name で指定された変数に値 value をセットする。"
+msgstr ""
+"  -d name=value           name で指定された変数に値 value をセットする。"
 
-#: ppdc/ppdc.cxx:444
 msgid "  -d output-dir           Specify the output directory."
 msgstr "  -d output-dir           出力先ディレクトリーを指定する。"
 
-#: scheduler/cupsfilter.c:1437
 msgid "  -d printer              Use the named printer."
 msgstr "  -d printer              指定されたプリンターを利用する。"
 
-#: scheduler/cupsfilter.c:1439
 msgid "  -e                      Use every filter from the PPD file."
-msgstr "  -e                      PPD ファイルからすべてのフィルターを使用する。"
+msgstr ""
+"  -e                      PPD ファイルからすべてのフィルターを使用する。"
 
-#: scheduler/main.c:2020
 msgid "  -f                      Run in the foreground."
 msgstr "  -f                      フォアグラウンドで実行する。"
 
-#: test/ipptool.c:4423
 msgid "  -f filename             Set default request filename."
 msgstr "  -f filename             デフォルトのリクエストファイル名を指定する。"
 
-#: scheduler/main.c:2023
 msgid "  -h                      Show this usage message."
 msgstr "  -h                      このヘルプメッセージを表示する。"
 
-#: systemv/cupsaddsmb.c:290 systemv/cupsctl.c:207
 msgid "  -h server[:port]        Specify server address."
 msgstr "  -h server[:port]        サーバーアドレスを指定する。"
 
-#: scheduler/cupsfilter.c:1441
 msgid "  -i mime/type            Set input MIME type (otherwise auto-typed)."
-msgstr "  -i mime/type            入力の MIME タイプを指定する (指定がなければ自動タイプ)。"
+msgstr ""
+"  -i mime/type            入力の MIME タイプを指定する (指定がなければ自動タ"
+"イプ)。"
 
-#: test/ipptool.c:4425
 msgid ""
 "  -i seconds              Repeat the last file with the given time interval."
-msgstr "  -i seconds              最後のファイルを与えられた時間間隔で繰り返す。"
+msgstr ""
+"  -i seconds              最後のファイルを与えられた時間間隔で繰り返す。"
 
-#: scheduler/cupsfilter.c:1443
 msgid ""
 "  -j job-id[,N]           Filter file N from the specified job (default is "
 "file 1)."
-msgstr "  -j job-id[,N]           フィルターファイル N を指定されたジョブから使用する (デフォルトは ファイル 1)。"
+msgstr ""
+"  -j job-id[,N]           フィルターファイル N を指定されたジョブから使用す"
+"る (デフォルトは ファイル 1)。"
 
-#: scheduler/main.c:2024
 msgid "  -l                      Run cupsd from launchd(8)."
 msgstr "  -l                      launchd(8) から cupsd を実行する。"
 
-#: ppdc/ppdc.cxx:446
 msgid "  -l lang[,lang,...]      Specify the output language(s) (locale)."
 msgstr "  -l lang[,lang,...]      出力言語を指定する。(複数可能)"
 
-#: ppdc/ppdc.cxx:448
 msgid "  -m                      Use the ModelName value as the filename."
 msgstr "  -m                      ModelName の値をファイル名として使用する。"
 
-#: scheduler/cupsfilter.c:1445
 msgid ""
 "  -m mime/type            Set output MIME type (otherwise application/pdf)."
-msgstr "  -m mime/type            出力の MIME タイプを指定する (指定がなければ application/pdf)。"
+msgstr ""
+"  -m mime/type            出力の MIME タイプを指定する (指定がなければ "
+"application/pdf)。"
 
-#: scheduler/cupsfilter.c:1447
 msgid "  -n copies               Set number of copies."
 msgstr "  -n copies               部数を指定する。"
 
-#: test/ipptool.c:4427
 msgid ""
 "  -n count                Repeat the last file the given number of times."
 msgstr "  -n count                最後のファイルを与えられた回数だけ繰り返す。"
 
-#: ppdc/ppdi.cxx:133
 msgid ""
 "  -o filename.drv         Set driver information file (otherwise ppdi.drv)."
-msgstr "  -o filename.drv         ドライバー情報ファイルを指定する (指定がなければ ppdi.drv)。"
+msgstr ""
+"  -o filename.drv         ドライバー情報ファイルを指定する (指定がなければ "
+"ppdi.drv)。"
 
-#: ppdc/ppdmerge.cxx:370
 msgid "  -o filename.ppd[.gz]    Set output file (otherwise stdout)."
-msgstr "  -o filename.ppd[.gz]    出力ファイルを指定する (指定がなければ標準出力)。"
+msgstr ""
+"  -o filename.ppd[.gz]    出力ファイルを指定する (指定がなければ標準出力)。"
 
-#: scheduler/cupsfilter.c:1448
 msgid "  -o name=value           Set option(s)."
 msgstr "  -o name=value           オプションを指定する。"
 
-#: scheduler/cupsfilter.c:1449
 msgid "  -p filename.ppd         Set PPD file."
 msgstr "  -p filename.ppd         PPD ファイルを指定する。"
 
-#: systemv/cupstestppd.c:3806 test/ipptool.c:4429
 msgid "  -q                      Run silently."
 msgstr "  -q                      詳細は表示しない。"
 
-#: systemv/cupstestppd.c:3807
 msgid "  -r                      Use 'relaxed' open mode."
 msgstr "  -r                      寛容モードを用いる。"
 
-#: test/ipptool.c:4430
 msgid "  -t                      Produce a test report."
 msgstr "  -t                      テストリポートを出力する。"
 
-#: ppdc/ppdc.cxx:450
 msgid "  -t                      Test PPDs instead of generating them."
 msgstr "  -t                      PPD を出力しないでテストする。"
 
-#: scheduler/main.c:2025
 msgid "  -t                      Test the configuration file."
 msgstr "  -t                      設定ファイルをテストする。"
 
-#: scheduler/cupsfilter.c:1450
 msgid "  -t title                Set title."
 msgstr "  -t title                タイトルを指定する。"
 
-#: scheduler/cupsfilter.c:1451
 msgid "  -u                      Remove the PPD file when finished."
 msgstr "  -u                      終了したときに PPD ファイルを削除する。"
 
-#: systemv/cupsaddsmb.c:291 systemv/cupstestppd.c:3808 test/ipptool.c:4431
-#: ppdc/ppdc.cxx:452 ppdc/ppdpo.cxx:259
 msgid "  -v                      Be verbose."
 msgstr "  -v                      冗長出力を行う。"
 
-#: systemv/cupstestppd.c:3809
 msgid "  -vv                     Be very verbose."
 msgstr "  -vv                     より冗長な出力を行う。"
 
-#: ppdc/ppdc.cxx:453
 msgid "  -z                      Compress PPD files using GNU zip."
 msgstr "  -z                      PPD ファイルを GNU zip を使って圧縮する。"
 
-#: systemv/cupstestppd.c:332 systemv/cupstestppd.c:351
-#: systemv/cupstestppd.c:363 systemv/cupstestppd.c:496
-#: systemv/cupstestppd.c:511 systemv/cupstestppd.c:532
-#: systemv/cupstestppd.c:547 systemv/cupstestppd.c:577
-#: systemv/cupstestppd.c:597 systemv/cupstestppd.c:620
-#: systemv/cupstestppd.c:638 systemv/cupstestppd.c:664
-#: systemv/cupstestppd.c:682 systemv/cupstestppd.c:702
-#: systemv/cupstestppd.c:722 systemv/cupstestppd.c:740
-#: systemv/cupstestppd.c:757 systemv/cupstestppd.c:776
-#: systemv/cupstestppd.c:797 systemv/cupstestppd.c:816
-#: systemv/cupstestppd.c:836 systemv/cupstestppd.c:856
-#: systemv/cupstestppd.c:876 systemv/cupstestppd.c:896
-#: systemv/cupstestppd.c:914 systemv/cupstestppd.c:931
-#: systemv/cupstestppd.c:953 systemv/cupstestppd.c:971
-#: systemv/cupstestppd.c:988 systemv/cupstestppd.c:1006
-#: systemv/cupstestppd.c:1022 systemv/cupstestppd.c:1042
-#: systemv/cupstestppd.c:1073 systemv/cupstestppd.c:1095
-#: systemv/cupstestppd.c:1146 systemv/cupstestppd.c:1165
-#: systemv/cupstestppd.c:1209 systemv/cupstestppd.c:1223
-#: systemv/cupstestppd.c:1255 systemv/cupstestppd.c:1282
-#: systemv/cupstestppd.c:1800 systemv/cupstestppd.c:1819
-#: systemv/cupstestppd.c:1837 systemv/cupstestppd.c:1889
-#: systemv/cupstestppd.c:1905 systemv/cupstestppd.c:1942
-#: systemv/cupstestppd.c:1960 systemv/cupstestppd.c:1996
-#: systemv/cupstestppd.c:2010 systemv/cupstestppd.c:2037
-#: systemv/cupstestppd.c:2051 systemv/cupstestppd.c:2097
-#: systemv/cupstestppd.c:2119 systemv/cupstestppd.c:2142
-#: systemv/cupstestppd.c:2159 systemv/cupstestppd.c:2201
-#: systemv/cupstestppd.c:2244 systemv/cupstestppd.c:2291
-#: systemv/cupstestppd.c:2315 systemv/cupstestppd.c:2369
-#: systemv/cupstestppd.c:2385 systemv/cupstestppd.c:2415
-#: systemv/cupstestppd.c:2429 systemv/cupstestppd.c:2455
-#: systemv/cupstestppd.c:2471 systemv/cupstestppd.c:2511
-#: systemv/cupstestppd.c:2525 systemv/cupstestppd.c:2551
-#: systemv/cupstestppd.c:2567 systemv/cupstestppd.c:2597
-#: systemv/cupstestppd.c:2611 systemv/cupstestppd.c:2638
-#: systemv/cupstestppd.c:2655 systemv/cupstestppd.c:2669
-#: systemv/cupstestppd.c:2693 systemv/cupstestppd.c:2710
-#: systemv/cupstestppd.c:2724 systemv/cupstestppd.c:2748
-#: systemv/cupstestppd.c:2765 systemv/cupstestppd.c:2779
-#: systemv/cupstestppd.c:2803 systemv/cupstestppd.c:2820
-#: systemv/cupstestppd.c:2834 systemv/cupstestppd.c:2858
-#: systemv/cupstestppd.c:2872 systemv/cupstestppd.c:2887
-#: systemv/cupstestppd.c:2904 systemv/cupstestppd.c:2960
-#: systemv/cupstestppd.c:2995 systemv/cupstestppd.c:3009
-#: systemv/cupstestppd.c:3037 systemv/cupstestppd.c:3102
-#: systemv/cupstestppd.c:3117 systemv/cupstestppd.c:3156
-#: systemv/cupstestppd.c:3176 systemv/cupstestppd.c:3190
-#: systemv/cupstestppd.c:3387 systemv/cupstestppd.c:3423
-#: systemv/cupstestppd.c:3437 systemv/cupstestppd.c:3483
-#: systemv/cupstestppd.c:3515 systemv/cupstestppd.c:3532
-#: systemv/cupstestppd.c:3555 systemv/cupstestppd.c:3571
-#: systemv/cupstestppd.c:3609 systemv/cupstestppd.c:3750
-#: systemv/cupstestppd.c:3772 systemv/cupstestppd.c:3880
 msgid " FAIL"
 msgstr " 失敗"
 
-#: systemv/cupstestppd.c:1306
 msgid " PASS"
 msgstr " 合格"
 
-#: berkeley/lpq.c:560
 #, c-format
 msgid "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes"
 msgstr "%-6s %-10.10s %-4d %-10d %-27.27s %.0f バイト"
 
-#: berkeley/lpq.c:565
 #, c-format
 msgid "%-7s %-7.7s %-7d %-31.31s %.0f bytes"
 msgstr "%-7s %-7.7s %-7d %-31.31s %.0f バイト"
 
-#: systemv/lpstat.c:750
 #, c-format
 msgid "%s accepting requests since %s"
 msgstr "%s は %s からリクエストを受け付けています"
 
-#: scheduler/ipp.c:10045
 #, c-format
 msgid "%s cannot be changed."
 msgstr "%s は変更できません。"
 
-#: berkeley/lpc.c:189
 #, c-format
 msgid "%s is not implemented by the CUPS version of lpc."
 msgstr "%s は lpc の CUPS バージョンでは実装されていません。"
 
-#: berkeley/lpq.c:651
 #, c-format
 msgid "%s is not ready"
 msgstr "%s は準備ができていません"
 
-#: berkeley/lpq.c:644
 #, c-format
 msgid "%s is ready"
 msgstr "%s は準備ができています"
 
-#: berkeley/lpq.c:647
 #, c-format
 msgid "%s is ready and printing"
 msgstr "%s は準備ができており印刷しています"
 
-#: filter/rastertoepson.c:985 filter/rastertohp.c:711
-#: filter/rastertolabel.c:1134
 #, c-format
 msgid "%s job-id user title copies options [file]"
 msgstr "%s ジョブID ユーザー タイトル コピー数 オプション [ファイル]"
 
-#: systemv/lpstat.c:754
 #, c-format
 msgid "%s not accepting requests since %s -"
 msgstr "%s は %s からリクエストを受け付けていません -"
 
-#: scheduler/ipp.c:691
 #, c-format
 msgid "%s not supported."
 msgstr "%s はサポートされていません。"
 
-#: systemv/lpstat.c:765
 #, c-format
 msgid "%s/%s accepting requests since %s"
 msgstr "%s/%s は %s からリクエストを受け付けています"
 
-#: systemv/lpstat.c:770
 #, c-format
 msgid "%s/%s not accepting requests since %s -"
 msgstr "%s/%s は %s からリクエストを受け付けていません - "
 
-#: berkeley/lpq.c:552
 #, c-format
 msgid "%s: %-33.33s [job %d localhost]"
 msgstr "%s:%-33.33s [ジョブ %d localhost]"
 
 #. TRANSLATORS: Message is "subject: error"
-#: cups/langprintf.c:86 scheduler/cupsfilter.c:714 systemv/lpadmin.c:805
-#: systemv/lpadmin.c:856 systemv/lpadmin.c:906 systemv/lpadmin.c:962
-#: systemv/lpadmin.c:1060 systemv/lpadmin.c:1112 systemv/lpadmin.c:1168
-#: systemv/lpadmin.c:1478
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: systemv/cancel.c:294 systemv/cancel.c:357
 #, c-format
 msgid "%s: %s failed: %s"
 msgstr "%s: %s に失敗しました: %s"
 
-#: systemv/cupsaccept.c:68
 #, c-format
 msgid "%s: Don't know what to do."
 msgstr "%s: 何が起きているか不明です。"
 
-#: berkeley/lpq.c:236 berkeley/lpr.c:344 systemv/lp.c:584
 #, c-format
 msgid ""
 "%s: Error - %s environment variable names non-existent destination \"%s\"."
 msgstr "%s: エラー - 環境変数 %s が存在しない宛先 \"%s\" を指しています。"
 
-#: systemv/lp.c:231
 #, c-format
 msgid "%s: Error - bad job ID."
 msgstr "%s: エラー - 不正なジョブ ID です。"
 
-#: systemv/lp.c:219
 #, c-format
 msgid "%s: Error - cannot print files and alter jobs simultaneously."
-msgstr "%s: エラー - ファイルを印刷できず、ジョブを同時に変えることができません。"
+msgstr ""
+"%s: エラー - ファイルを印刷できず、ジョブを同時に変えることができません。"
 
-#: systemv/lp.c:505
 #, c-format
 msgid "%s: Error - cannot print from stdin if files or a job ID are provided."
-msgstr "%s: エラー - ファイルまたはジョブ ID が提供されている場合、標準入力から印刷できません。 "
+msgstr ""
+"%s: エラー - ファイルまたはジョブ ID が提供されている場合、標準入力から印刷で"
+"きません。 "
 
-#: systemv/lp.c:461
 #, c-format
 msgid "%s: Error - expected character set after \"-S\" option."
 msgstr "%s: エラー - \"-S\" オプションのあとには文字セットが必要です。"
 
-#: systemv/lp.c:480
 #, c-format
 msgid "%s: Error - expected content type after \"-T\" option."
 msgstr "%s: エラー - \"-T\" オプションのあとにはコンテンツタイプが必要です。"
 
-#: berkeley/lpr.c:240
 #, c-format
 msgid "%s: Error - expected copies after \"-#\" option."
 msgstr "%s: エラー - \"-#\" オプションのあとにはコピー数が必要です。"
 
-#: systemv/lp.c:264
 #, c-format
 msgid "%s: Error - expected copies after \"-n\" option."
 msgstr "%s: エラー - \"-n\" オプションのあとにはコピー数が必要です。"
 
-#: berkeley/lpr.c:209
 #, c-format
 msgid "%s: Error - expected destination after \"-P\" option."
 msgstr "%s: エラー - \"-P\" オプションのあとには宛先が必要です。"
 
-#: systemv/lpstat.c:231
 #, c-format
 msgid "%s: Error - expected destination after \"-b\" option."
 msgstr "%s: エラー - \"-b\" オプションのあとに宛先が必要です。"
 
-#: systemv/lp.c:138
 #, c-format
 msgid "%s: Error - expected destination after \"-d\" option."
 msgstr "%s: エラー - \"-d\" オプションのあとにはプリンター名が必要です。"
 
-#: systemv/lp.c:168
 #, c-format
 msgid "%s: Error - expected form after \"-f\" option."
 msgstr "%s: エラー - \"-f\" オプションのあとには用紙名が必要です。"
 
-#: systemv/lp.c:391
 #, c-format
 msgid "%s: Error - expected hold name after \"-H\" option."
 msgstr "%s: エラー - \"-H\" オプションのあとにはホールド名が必要です。"
 
-#: berkeley/lpr.c:103
 #, c-format
 msgid "%s: Error - expected hostname after \"-H\" option."
 msgstr "%s: エラー - \"-H\" オプションのあとにはホスト名が必要です。"
 
-#: berkeley/lpq.c:180 berkeley/lprm.c:123 systemv/cancel.c:124
-#: systemv/cupsaccept.c:123 systemv/lp.c:189 systemv/lpstat.c:291
 #, c-format
 msgid "%s: Error - expected hostname after \"-h\" option."
 msgstr "%s: エラー -  \"-h\" オプションのあとにはホスト名が必要です。"
 
-#: systemv/lp.c:371
 #, c-format
 msgid "%s: Error - expected mode list after \"-y\" option."
 msgstr "%s: エラー - \"-y\" オプションのあとにはモードリストが必要です。"
 
-#: berkeley/lpr.c:263
 #, c-format
 msgid "%s: Error - expected name after \"-%c\" option."
 msgstr "%s: エラー - \"-%c\" オプションのあとには名前が必要です。"
 
-#: berkeley/lpr.c:153 systemv/lp.c:288
 #, c-format
 msgid "%s: Error - expected option=value after \"-o\" option."
 msgstr "%s: エラー - \"-o\" オプションのあとには オプション=値 が必要です。"
 
-#: systemv/lp.c:441
 #, c-format
 msgid "%s: Error - expected page list after \"-P\" option."
 msgstr "%s: エラー - \"-P\" オプションのあとにはページリストが必要です。"
 
-#: systemv/lp.c:308
 #, c-format
 msgid "%s: Error - expected priority after \"-%c\" option."
 msgstr "%s: エラー - \"-%c\" オプションのあとには優先度が必要です。"
 
-#: systemv/cupsaccept.c:141
 #, c-format
 msgid "%s: Error - expected reason text after \"-r\" option."
 msgstr "%s: エラー - \"-r\" のあとには理由のテキストが必要です。"
 
-#: systemv/lp.c:354
 #, c-format
 msgid "%s: Error - expected title after \"-t\" option."
 msgstr "%s: エラー - \"-t\" オプションのあとにはタイトルが必要です。"
 
-#: berkeley/lpq.c:111 berkeley/lpr.c:84 berkeley/lprm.c:104
-#: systemv/cancel.c:94 systemv/cupsaccept.c:101 systemv/lp.c:116
-#: systemv/lpadmin.c:438 systemv/lpstat.c:137
 #, c-format
 msgid "%s: Error - expected username after \"-U\" option."
 msgstr "%s: エラー - \"-U\" オプションのあとにはユーザー名が必要です。"
 
-#: systemv/cancel.c:145
 #, c-format
 msgid "%s: Error - expected username after \"-u\" option."
 msgstr "%s: エラー - \"-u\" オプションのあとにはユーザー名が必要です。"
 
-#: berkeley/lpr.c:125
 #, c-format
 msgid "%s: Error - expected value after \"-%c\" option."
 msgstr "%s: エラー -  \"-%c\" オプションのあとには値が必要です。"
 
-#: systemv/lpstat.c:157 systemv/lpstat.c:171
 #, c-format
 msgid ""
 "%s: Error - need \"completed\", \"not-completed\", or \"all\" after \"-W\" "
 "option."
-msgstr "%s: エラー - \"-W\" オプションのあとには、\"completed\"、\"not-completed\"、\"all\" のいずれかが必要です。"
+msgstr ""
+"%s: エラー - \"-W\" オプションのあとには、\"completed\"、\"not-completed"
+"\"、\"all\" のいずれかが必要です。"
 
-#: berkeley/lpq.c:241 berkeley/lpr.c:349 systemv/lp.c:589
 #, c-format
 msgid "%s: Error - no default destination available."
 msgstr "%s: エラー - 利用可能なデフォルトの宛先がありません。"
 
-#: systemv/lp.c:330
 #, c-format
 msgid "%s: Error - priority must be between 1 and 100."
 msgstr "%s: エラー - 優先度は 1 から 100 の間である必要があります。"
 
-#: berkeley/lpr.c:352 systemv/lp.c:592
 #, c-format
 msgid "%s: Error - scheduler not responding."
 msgstr "%s: エラー - スケジューラーが応答していません。"
 
-#: berkeley/lpr.c:305 systemv/lp.c:537
 #, c-format
 msgid "%s: Error - too many files - \"%s\"."
 msgstr "%s: エラー - ファイルが多すぎます - \"%s\""
 
-#: berkeley/lpr.c:287 systemv/lp.c:520
 #, c-format
 msgid "%s: Error - unable to access \"%s\" - %s"
 msgstr "%s: エラー - \"%s\" にアクセスできません - %s"
 
-#: berkeley/lpr.c:395 systemv/lp.c:623
 #, c-format
 msgid "%s: Error - unable to queue from stdin - %s."
 msgstr "%s: エラー - 標準入力からキューにデータを入力できません。 - %s"
 
-#: berkeley/lprm.c:87 berkeley/lprm.c:172 systemv/cancel.c:214
 #, c-format
 msgid "%s: Error - unknown destination \"%s\"."
 msgstr "%s: エラー - \"%s\" は未知の宛先です。"
 
-#: berkeley/lpq.c:150
 #, c-format
 msgid "%s: Error - unknown destination \"%s/%s\"."
 msgstr "%s: エラー - \"%s/%s\" は未知の宛先です。"
 
-#: berkeley/lpr.c:274 berkeley/lprm.c:139 systemv/cancel.c:156
-#: systemv/cupsaccept.c:164 systemv/lp.c:496 systemv/lpstat.c:452
 #, c-format
 msgid "%s: Error - unknown option \"%c\"."
 msgstr "%s: エラー - '%c' は未知のオプションです。"
 
-#: systemv/cupsaccept.c:157
 #, c-format
 msgid "%s: Error - unknown option \"%s\"."
 msgstr "%s: エラー - '%s' は未知のオプションです。"
 
-#: systemv/lp.c:208
 #, c-format
 msgid "%s: Expected job ID after \"-i\" option."
 msgstr "%s: '-i' オプションのあとにはジョブ ID が必要です。"
 
-#: systemv/lpstat.c:504 systemv/lpstat.c:543
 #, c-format
 msgid "%s: Invalid destination name in list \"%s\"."
 msgstr "%s: リスト \"%s\" に無効な宛先名があります。"
 
-#: scheduler/cupsfilter.c:567
 #, c-format
 msgid "%s: Invalid filter string \"%s\"."
 msgstr "%s: 無効なフィルター文字列です \"%s\""
 
-#: systemv/lp.c:418
 #, c-format
 msgid "%s: Need job ID (\"-i jobid\") before \"-H restart\"."
 msgstr "%s: '-H restart' の前にはジョブ ID ('-i ジョブID') が必要です。"
 
-#: scheduler/cupsfilter.c:458
 #, c-format
 msgid "%s: No filter to convert from %s/%s to %s/%s."
 msgstr "%s: %s/%s から %s/%s に変換するフィルターがありません。"
 
-#: systemv/cupsaccept.c:198
 #, c-format
 msgid "%s: Operation failed: %s"
 msgstr "%s: 操作に失敗しました: %s"
 
-#: berkeley/lpq.c:97 berkeley/lpr.c:70 berkeley/lprm.c:67 systemv/cancel.c:81
-#: systemv/cupsaccept.c:88 systemv/cupsaddsmb.c:86 systemv/lp.c:102
-#: systemv/lpadmin.c:239 systemv/lpinfo.c:88 systemv/lpmove.c:73
-#: systemv/lpstat.c:102 test/ipptool.c:304 test/ipptool.c:321
 #, c-format
 msgid "%s: Sorry, no encryption support."
 msgstr "%s: 残念ながら、暗号化サポートはコンパイル時に組み込まれていません。"
 
-#: berkeley/lpq.c:295 scheduler/cupsfilter.c:1221 systemv/cancel.c:237
-#: systemv/cupsaddsmb.c:144 systemv/cupsaddsmb.c:171
 #, c-format
 msgid "%s: Unable to connect to server."
 msgstr "%s: サーバーに接続できません"
 
-#: systemv/cancel.c:317
 #, c-format
 msgid "%s: Unable to contact server."
 msgstr "%s: サーバーに連絡できません。"
 
-#: scheduler/cupsfilter.c:424
 #, c-format
 msgid "%s: Unable to determine MIME type of \"%s\"."
 msgstr "%s: \"%s\" の MIME タイプを判別できません。"
 
-#: ppdc/ppdmerge.cxx:96
 #, c-format
 msgid "%s: Unable to open %s: %s"
 msgstr "%s: %s を開けません: %s"
 
-#: scheduler/cupsfilter.c:662 ppdc/ppdmerge.cxx:112
 #, c-format
 msgid "%s: Unable to open PPD file: %s on line %d."
 msgstr "%s: PPD ファイルを開けません: %s の %d 行目"
 
-#: scheduler/cupsfilter.c:392
 #, c-format
 msgid "%s: Unable to read MIME database from \"%s\" or \"%s\"."
-msgstr "%s: \"%s\" または \"%s\" から MIME データベースを読み取ることができません。"
+msgstr ""
+"%s: \"%s\" または \"%s\" から MIME データベースを読み取ることができません。"
 
-#: berkeley/lpq.c:153 systemv/lpstat.c:558
 #, c-format
 msgid "%s: Unknown destination \"%s\"."
 msgstr "%s: \"%s\" は未知の宛先です。"
 
-#: scheduler/cupsfilter.c:435
 #, c-format
 msgid "%s: Unknown destination MIME type %s/%s."
 msgstr "%s: %s/%s は未知の宛先 MIME タイプです。"
 
-#: scheduler/cupsfilter.c:1426
 #, c-format
 msgid "%s: Unknown option \"%c\"."
 msgstr "%s: '%c' は未知のオプションです。"
 
-#: scheduler/cupsfilter.c:416
 #, c-format
 msgid "%s: Unknown source MIME type %s/%s."
 msgstr "%s: %s/%s は未知のソース MIME タイプです。"
 
-#: berkeley/lpr.c:139
 #, c-format
 msgid ""
 "%s: Warning - \"%c\" format modifier not supported - output may not be "
 "correct."
-msgstr "%s: 警告 - '%c' 形式修飾子はサポートされていません - 出力は正しくないものになるかもしれません。"
+msgstr ""
+"%s: 警告 - '%c' 形式修飾子はサポートされていません - 出力は正しくないものにな"
+"るかもしれません。"
 
-#: systemv/lp.c:468
 #, c-format
 msgid "%s: Warning - character set option ignored."
 msgstr "%s: 警告 - 文字セットオプションは無視されます。"
 
-#: systemv/lp.c:487
 #, c-format
 msgid "%s: Warning - content type option ignored."
 msgstr "%s: 警告 - コンテンツタイプオプションは無視されます。"
 
-#: systemv/lp.c:175
 #, c-format
 msgid "%s: Warning - form option ignored."
 msgstr "%s: 警告 - 用紙オプションは無視されます。"
 
-#: systemv/lp.c:378
 #, c-format
 msgid "%s: Warning - mode option ignored."
 msgstr "%s: 警告 - モードオプションは無視されます。"
 
-#: ppdc/sample.c:310
 msgid "-1"
 msgstr "-1"
 
-#: ppdc/sample.c:301
 msgid "-10"
 msgstr "-10"
 
-#: ppdc/sample.c:393
 msgid "-100"
 msgstr "-100"
 
-#: ppdc/sample.c:392
 msgid "-105"
 msgstr "-105"
 
-#: ppdc/sample.c:300
 msgid "-11"
 msgstr "-11"
 
-#: ppdc/sample.c:391
 msgid "-110"
 msgstr "-110"
 
-#: ppdc/sample.c:390
 msgid "-115"
 msgstr "-115"
 
-#: ppdc/sample.c:299
 msgid "-12"
 msgstr "-12"
 
-#: ppdc/sample.c:389
 msgid "-120"
 msgstr "-120"
 
-#: ppdc/sample.c:298
 msgid "-13"
 msgstr "-13"
 
-#: ppdc/sample.c:297
 msgid "-14"
 msgstr "-14"
 
-#: ppdc/sample.c:296
 msgid "-15"
 msgstr "-15"
 
-#: ppdc/sample.c:309
 msgid "-2"
 msgstr "-2"
 
-#: ppdc/sample.c:409
 msgid "-20"
 msgstr "-20"
 
-#: ppdc/sample.c:408
 msgid "-25"
 msgstr "-25"
 
-#: ppdc/sample.c:308
 msgid "-3"
 msgstr "-3"
 
-#: ppdc/sample.c:407
 msgid "-30"
 msgstr "-30"
 
-#: ppdc/sample.c:406
 msgid "-35"
 msgstr "-35"
 
-#: ppdc/sample.c:307
 msgid "-4"
 msgstr "-4"
 
-#: ppdc/sample.c:405
 msgid "-40"
 msgstr "-40"
 
-#: ppdc/sample.c:404
 msgid "-45"
 msgstr "-45"
 
-#: ppdc/sample.c:306
 msgid "-5"
 msgstr "-5"
 
-#: ppdc/sample.c:403
 msgid "-50"
 msgstr "-50"
 
-#: ppdc/sample.c:402
 msgid "-55"
 msgstr "-55"
 
-#: ppdc/sample.c:305
 msgid "-6"
 msgstr "-6"
 
-#: ppdc/sample.c:401
 msgid "-60"
 msgstr "-60"
 
-#: ppdc/sample.c:400
 msgid "-65"
 msgstr "-65"
 
-#: ppdc/sample.c:304
 msgid "-7"
 msgstr "-7"
 
-#: ppdc/sample.c:399
 msgid "-70"
 msgstr "-70"
 
-#: ppdc/sample.c:398
 msgid "-75"
 msgstr "-75"
 
-#: ppdc/sample.c:303
 msgid "-8"
 msgstr "-8"
 
-#: ppdc/sample.c:397
 msgid "-80"
 msgstr "-80"
 
-#: ppdc/sample.c:396
 msgid "-85"
 msgstr "-85"
 
-#: ppdc/sample.c:302
 msgid "-9"
 msgstr "-9"
 
-#: ppdc/sample.c:395
 msgid "-90"
 msgstr "-90"
 
-#: ppdc/sample.c:394
 msgid "-95"
 msgstr "-95"
 
-#: ppdc/sample.c:311
 msgid "0"
 msgstr "0"
 
-#: ppdc/sample.c:312
 msgid "1"
 msgstr "1"
 
-#: ppdc/sample.c:384
 msgid "1 inch/sec."
 msgstr "1 インチ/秒"
 
-#: ppdc/sample.c:172
 msgid "1.25x0.25\""
 msgstr "1.25x0.25 インチ"
 
-#: ppdc/sample.c:173
 msgid "1.25x2.25\""
 msgstr "1.25x2.25 インチ"
 
-#: ppdc/sample.c:432
 msgid "1.5 inch/sec."
 msgstr "1.5 インチ/秒"
 
-#: ppdc/sample.c:174
 msgid "1.50x0.25\""
 msgstr "1.50x0.25 インチ"
 
-#: ppdc/sample.c:175
 msgid "1.50x0.50\""
 msgstr "1.50x0.50 インチ"
 
-#: ppdc/sample.c:176
 msgid "1.50x1.00\""
 msgstr "1.50x1.00 インチ"
 
-#: ppdc/sample.c:177
 msgid "1.50x2.00\""
 msgstr "1.50x2.00 インチ"
 
-#: ppdc/sample.c:321
 msgid "10"
 msgstr "10"
 
-#: ppdc/sample.c:443
 msgid "10 inches/sec."
 msgstr "10 インチ/秒"
 
-#: ppdc/sample.c:6
 msgid "10 x 11"
 msgstr "10 x 11 インチ"
 
-#: ppdc/sample.c:7
 msgid "10 x 13"
 msgstr "10 x 13 インチ"
 
-#: ppdc/sample.c:8
 msgid "10 x 14"
 msgstr "10 x 14 インチ"
 
-#: ppdc/sample.c:423
 msgid "100"
 msgstr "100"
 
-#: ppdc/sample.c:334
 msgid "100 mm/sec."
 msgstr "100 ミリメートル/秒"
 
-#: ppdc/sample.c:424
 msgid "105"
 msgstr "105"
 
-#: ppdc/sample.c:322
 msgid "11"
 msgstr "11"
 
-#: ppdc/sample.c:444
 msgid "11 inches/sec."
 msgstr "11 インチ/秒"
 
-#: ppdc/sample.c:425
 msgid "110"
 msgstr "110"
 
-#: ppdc/sample.c:426
 msgid "115"
 msgstr "115"
 
-#: ppdc/sample.c:323
 msgid "12"
 msgstr "12"
 
-#: ppdc/sample.c:445
 msgid "12 inches/sec."
 msgstr "12 インチ/秒"
 
-#: ppdc/sample.c:9
 msgid "12 x 11"
 msgstr "12 x 11 インチ"
 
-#: ppdc/sample.c:427
 msgid "120"
 msgstr "120"
 
-#: ppdc/sample.c:335
 msgid "120 mm/sec."
 msgstr "120 ミリメートル/秒"
 
-#: ppdc/sample.c:243
 msgid "120x60dpi"
 msgstr "120x60dpi"
 
-#: ppdc/sample.c:249
 msgid "120x72dpi"
 msgstr "120x72dpi"
 
-#: ppdc/sample.c:324
 msgid "13"
 msgstr "13"
 
-#: ppdc/sample.c:232
 msgid "136dpi"
 msgstr "136dpi"
 
-#: ppdc/sample.c:325
 msgid "14"
 msgstr "14"
 
-#: ppdc/sample.c:326
 msgid "15"
 msgstr "15"
 
-#: ppdc/sample.c:328
 msgid "15 mm/sec."
 msgstr "15 ミリメートル/秒"
 
-#: ppdc/sample.c:10
 msgid "15 x 11"
 msgstr "15 x 11 インチ"
 
-#: ppdc/sample.c:336
 msgid "150 mm/sec."
 msgstr "150 ミリメートル/秒"
 
-#: ppdc/sample.c:283
 msgid "150dpi"
 msgstr "150dpi"
 
-#: ppdc/sample.c:368
 msgid "16"
 msgstr "16"
 
-#: ppdc/sample.c:369
 msgid "17"
 msgstr "17"
 
-#: ppdc/sample.c:370
 msgid "18"
 msgstr "18"
 
-#: ppdc/sample.c:244
 msgid "180dpi"
 msgstr "180dpi"
 
-#: ppdc/sample.c:371
 msgid "19"
 msgstr "19"
 
-#: ppdc/sample.c:313
 msgid "2"
 msgstr "2"
 
-#: ppdc/sample.c:385
 msgid "2 inches/sec."
 msgstr "2 インチ/秒"
 
-#: ppdc/sample.c:270
 msgid "2-Sided Printing"
 msgstr "両面印刷"
 
-#: ppdc/sample.c:178
 msgid "2.00x0.37\""
 msgstr "2.00x0.37 インチ"
 
-#: ppdc/sample.c:179
 msgid "2.00x0.50\""
 msgstr "2.00x0.50 インチ"
 
-#: ppdc/sample.c:180
 msgid "2.00x1.00\""
 msgstr "2.00x1.00 インチ"
 
-#: ppdc/sample.c:181
 msgid "2.00x1.25\""
 msgstr "2.00x1.25 インチ"
 
-#: ppdc/sample.c:182
 msgid "2.00x2.00\""
 msgstr "2.00x2.00 インチ"
 
-#: ppdc/sample.c:183
 msgid "2.00x3.00\""
 msgstr "2.00x3.00 インチ"
 
-#: ppdc/sample.c:184
 msgid "2.00x4.00\""
 msgstr "2.00x4.00 インチ"
 
-#: ppdc/sample.c:185
 msgid "2.00x5.50\""
 msgstr "2.00x5.50 インチ"
 
-#: ppdc/sample.c:186
 msgid "2.25x0.50\""
 msgstr "2.25x0.50 インチ"
 
-#: ppdc/sample.c:187
 msgid "2.25x1.25\""
 msgstr "2.25x1.25 インチ"
 
-#: ppdc/sample.c:188
 msgid "2.25x4.00\""
 msgstr "2.25x4.00 インチ"
 
-#: ppdc/sample.c:189
 msgid "2.25x5.50\""
 msgstr "2.25x5.50 インチ"
 
-#: ppdc/sample.c:190
 msgid "2.38x5.50\""
 msgstr "2.38x5.50 インチ"
 
-#: ppdc/sample.c:433
 msgid "2.5 inches/sec."
 msgstr "2.5 インチ/秒"
 
-#: ppdc/sample.c:191
 msgid "2.50x1.00\""
 msgstr "2.50x1.00 インチ"
 
-#: ppdc/sample.c:192
 msgid "2.50x2.00\""
 msgstr "2.50x2.00 インチ"
 
-#: ppdc/sample.c:193
 msgid "2.75x1.25\""
 msgstr "2.75x1.25 インチ"
 
-#: ppdc/sample.c:194
 msgid "2.9 x 1\""
 msgstr "2.9 x 1 インチ"
 
-#: ppdc/sample.c:372
 msgid "20"
 msgstr "20"
 
-#: ppdc/sample.c:329
 msgid "20 mm/sec."
 msgstr "20 ミリメートル/秒"
 
-#: ppdc/sample.c:337
 msgid "200 mm/sec."
 msgstr "200 ミリメートル/秒"
 
-#: ppdc/sample.c:233
 msgid "203dpi"
 msgstr "203dpi"
 
-#: ppdc/sample.c:373
 msgid "21"
 msgstr "21"
 
-#: ppdc/sample.c:374
 msgid "22"
 msgstr "22"
 
-#: ppdc/sample.c:375
 msgid "23"
 msgstr "23"
 
-#: ppdc/sample.c:376
 msgid "24"
 msgstr "24"
 
-#: ppdc/sample.c:241
 msgid "24-Pin Series"
 msgstr "24 ピンシリーズ"
 
-#: ppdc/sample.c:250
 msgid "240x72dpi"
 msgstr "240x72dpi"
 
-#: ppdc/sample.c:377
 msgid "25"
 msgstr "25"
 
-#: ppdc/sample.c:338
 msgid "250 mm/sec."
 msgstr "250 ミリメートル/秒"
 
-#: ppdc/sample.c:378
 msgid "26"
 msgstr "26"
 
-#: ppdc/sample.c:379
 msgid "27"
 msgstr "27"
 
-#: ppdc/sample.c:380
 msgid "28"
 msgstr "28"
 
-#: ppdc/sample.c:381
 msgid "29"
 msgstr "29"
 
-#: ppdc/sample.c:314
 msgid "3"
 msgstr "3"
 
-#: ppdc/sample.c:386
 msgid "3 inches/sec."
 msgstr "3 インチ/秒"
 
-#: ppdc/sample.c:3
 msgid "3 x 5"
 msgstr "3 x 5"
 
-#: ppdc/sample.c:195
 msgid "3.00x1.00\""
 msgstr "3.00x1.00 インチ"
 
-#: ppdc/sample.c:196
 msgid "3.00x1.25\""
 msgstr "3.00x1.25 インチ"
 
-#: ppdc/sample.c:197
 msgid "3.00x2.00\""
 msgstr "3.00x2.00 インチ"
 
-#: ppdc/sample.c:198
 msgid "3.00x3.00\""
 msgstr "3.00x3.00インチ"
 
-#: ppdc/sample.c:199
 msgid "3.00x5.00\""
 msgstr "3.00x5.00 インチ"
 
-#: ppdc/sample.c:200
 msgid "3.25x2.00\""
 msgstr "3.25x2.00 インチ"
 
-#: ppdc/sample.c:201
 msgid "3.25x5.00\""
 msgstr "3.25x5.00 インチ"
 
-#: ppdc/sample.c:202
 msgid "3.25x5.50\""
 msgstr "3.25x5.50 インチ"
 
-#: ppdc/sample.c:203
 msgid "3.25x5.83\""
 msgstr "3.25x5.83 インチ"
 
-#: ppdc/sample.c:204
 msgid "3.25x7.83\""
 msgstr "3.25x7.83 インチ"
 
-#: ppdc/sample.c:4
 msgid "3.5 x 5"
 msgstr "3.5 x 5"
 
-#: ppdc/sample.c:171
 msgid "3.5\" Disk"
 msgstr "3.5 インチディスク"
 
-#: ppdc/sample.c:205
 msgid "3.50x1.00\""
 msgstr "3.50x1.00 インチ"
 
-#: ppdc/sample.c:382
 msgid "30"
 msgstr "30"
 
-#: ppdc/sample.c:330
 msgid "30 mm/sec."
 msgstr "30 ミリメートル/秒"
 
-#: ppdc/sample.c:339
 msgid "300 mm/sec."
 msgstr "300 ミリメートル/秒"
 
-#: ppdc/sample.c:234
 msgid "300dpi"
 msgstr "300dpi"
 
-#: ppdc/sample.c:410
 msgid "35"
 msgstr "35"
 
-#: ppdc/sample.c:246
 msgid "360dpi"
 msgstr "360dpi"
 
-#: ppdc/sample.c:245
 msgid "360x180dpi"
 msgstr "360x180dpi"
 
-#: ppdc/sample.c:315
 msgid "4"
 msgstr "4"
 
-#: ppdc/sample.c:387
 msgid "4 inches/sec."
 msgstr "4 インチ/秒"
 
-#: ppdc/sample.c:206
 msgid "4.00x1.00\""
 msgstr "4.00x1.00 インチ"
 
-#: ppdc/sample.c:214
 msgid "4.00x13.00\""
 msgstr "4.00x13.00 インチ"
 
-#: ppdc/sample.c:207
 msgid "4.00x2.00\""
 msgstr "4.00x2.00 インチ"
 
-#: ppdc/sample.c:208
 msgid "4.00x2.50\""
 msgstr "4.00x2.50 インチ"
 
-#: ppdc/sample.c:209
 msgid "4.00x3.00\""
 msgstr "4.00x3.00 インチ"
 
-#: ppdc/sample.c:210
 msgid "4.00x4.00\""
 msgstr "4.00x4.00 インチ"
 
-#: ppdc/sample.c:211
 msgid "4.00x5.00\""
 msgstr "4.00x5.00 インチ"
 
-#: ppdc/sample.c:212
 msgid "4.00x6.00\""
 msgstr "4.00x6.00 インチ"
 
-#: ppdc/sample.c:213
 msgid "4.00x6.50\""
 msgstr "4.00x6.50 インチ"
 
-#: ppdc/sample.c:411
 msgid "40"
 msgstr "40"
 
-#: ppdc/sample.c:331
 msgid "40 mm/sec."
 msgstr "40 ミリメートル/秒"
 
-#: ppdc/sample.c:412
 msgid "45"
 msgstr "45"
 
-#: ppdc/sample.c:316
 msgid "5"
 msgstr "5"
 
-#: ppdc/sample.c:437
 msgid "5 inches/sec."
 msgstr "5 インチ/秒"
 
-#: ppdc/sample.c:5
 msgid "5 x 7"
 msgstr "5 x 7 インチ"
 
-#: ppdc/sample.c:413
 msgid "50"
 msgstr "50"
 
-#: ppdc/sample.c:414
 msgid "55"
 msgstr "55"
 
-#: ppdc/sample.c:317
 msgid "6"
 msgstr "6"
 
-#: ppdc/sample.c:438
 msgid "6 inches/sec."
 msgstr "6 インチ/秒"
 
-#: ppdc/sample.c:215
 msgid "6.00x1.00\""
 msgstr "6.00x1.00 インチ"
 
-#: ppdc/sample.c:216
 msgid "6.00x2.00\""
 msgstr "6.00x2.00 インチ"
 
-#: ppdc/sample.c:217
 msgid "6.00x3.00\""
 msgstr "6.00x3.00 インチ"
 
-#: ppdc/sample.c:218
 msgid "6.00x4.00\""
 msgstr "6.00x4.00 インチ"
 
-#: ppdc/sample.c:219
 msgid "6.00x5.00\""
 msgstr "6.00x5.00 インチ"
 
-#: ppdc/sample.c:220
 msgid "6.00x6.00\""
 msgstr "6.00x6.00 インチ"
 
-#: ppdc/sample.c:221
 msgid "6.00x6.50\""
 msgstr "6.00x6.50 インチ"
 
-#: ppdc/sample.c:415
 msgid "60"
 msgstr "60"
 
-#: ppdc/sample.c:332
 msgid "60 mm/sec."
 msgstr "60 ミリメートル/秒"
 
-#: ppdc/sample.c:261
 msgid "600dpi"
 msgstr "600dpi"
 
-#: ppdc/sample.c:242
 msgid "60dpi"
 msgstr "60dpi"
 
-#: ppdc/sample.c:248
 msgid "60x72dpi"
 msgstr "60x72dpi"
 
-#: ppdc/sample.c:416
 msgid "65"
 msgstr "65"
 
-#: ppdc/sample.c:318
 msgid "7"
 msgstr "7"
 
-#: ppdc/sample.c:440
 msgid "7 inches/sec."
 msgstr "7 インチ/秒"
 
-#: ppdc/sample.c:11
 msgid "7 x 9"
 msgstr "7 x 9 インチ"
 
-#: ppdc/sample.c:417
 msgid "70"
 msgstr "70"
 
-#: ppdc/sample.c:252
 msgid "720dpi"
 msgstr "720dpi"
 
-#: ppdc/sample.c:418
 msgid "75"
 msgstr "75"
 
-#: ppdc/sample.c:319
 msgid "8"
 msgstr "8"
 
-#: ppdc/sample.c:441
 msgid "8 inches/sec."
 msgstr "8 インチ/秒"
 
-#: ppdc/sample.c:12
 msgid "8 x 10"
 msgstr "8 x 10 インチ"
 
-#: ppdc/sample.c:222
 msgid "8.00x1.00\""
 msgstr "8.00x1.00 インチ"
 
-#: ppdc/sample.c:223
 msgid "8.00x2.00\""
 msgstr "8.00x2.00 インチ"
 
-#: ppdc/sample.c:224
 msgid "8.00x3.00\""
 msgstr "8.00x3.00 インチ"
 
-#: ppdc/sample.c:225
 msgid "8.00x4.00\""
 msgstr "8.00x4.00 インチ"
 
-#: ppdc/sample.c:226
 msgid "8.00x5.00\""
 msgstr "8.00x5.00 インチ"
 
-#: ppdc/sample.c:227
 msgid "8.00x6.00\""
 msgstr "8.00x6.00 インチ"
 
-#: ppdc/sample.c:228
 msgid "8.00x6.50\""
 msgstr "8.00x6.50 インチ"
 
-#: ppdc/sample.c:419
 msgid "80"
 msgstr "80"
 
-#: ppdc/sample.c:333
 msgid "80 mm/sec."
 msgstr "80 ミリメートル/秒"
 
-#: ppdc/sample.c:420
 msgid "85"
 msgstr "85"
 
-#: ppdc/sample.c:320
 msgid "9"
 msgstr "9"
 
-#: ppdc/sample.c:442
 msgid "9 inches/sec."
 msgstr "9 インチ/秒"
 
-#: ppdc/sample.c:13
 msgid "9 x 11"
 msgstr "9 x 11 インチ"
 
-#: ppdc/sample.c:14
 msgid "9 x 12"
 msgstr "9 x 12 インチ"
 
-#: ppdc/sample.c:247
 msgid "9-Pin Series"
 msgstr "9 ピンシリーズ"
 
-#: ppdc/sample.c:421
 msgid "90"
 msgstr "90"
 
-#: ppdc/sample.c:422
 msgid "95"
 msgstr "95"
 
-#: berkeley/lpc.c:213
 msgid "?Invalid help command unknown."
 msgstr "?無効なヘルプコマンドです"
 
-#: cgi-bin/admin.c:2368
 msgid "A Samba password is required to export printer drivers"
-msgstr "プリンタードライバーをエクスポートするには Samba のパスワードが必要です。"
+msgstr ""
+"プリンタードライバーをエクスポートするには Samba のパスワードが必要です。"
 
-#: cgi-bin/admin.c:2364
 msgid "A Samba username is required to export printer drivers"
-msgstr "プリンタードライバーをエクスポートするには、Samba のユーザー名が必要です。"
+msgstr ""
+"プリンタードライバーをエクスポートするには、Samba のユーザー名が必要です。"
 
-#: scheduler/ipp.c:2283
 #, c-format
 msgid "A class named \"%s\" already exists."
 msgstr "\"%s\" という名前のクラスはすでに存在します。"
 
-#: scheduler/ipp.c:1004
 #, c-format
 msgid "A printer named \"%s\" already exists."
 msgstr "\"%s\" という名前のプリンターはすでに存在します。"
 
-#: ppdc/sample.c:15
 msgid "A0"
 msgstr "A0"
 
-#: ppdc/sample.c:16
 msgid "A0 Long Edge"
 msgstr "A0 長辺送り"
 
-#: ppdc/sample.c:17
 msgid "A1"
 msgstr "A1"
 
-#: ppdc/sample.c:18
 msgid "A1 Long Edge"
 msgstr "A1 長辺送り"
 
-#: ppdc/sample.c:37
 msgid "A10"
 msgstr "A10"
 
-#: ppdc/sample.c:19
 msgid "A2"
 msgstr "A2"
 
-#: ppdc/sample.c:20
 msgid "A2 Long Edge"
 msgstr "A2 長辺送り"
 
-#: ppdc/sample.c:21
 msgid "A3"
 msgstr "A3"
 
-#: ppdc/sample.c:22
 msgid "A3 Long Edge"
 msgstr "A3 長辺送り"
 
-#: ppdc/sample.c:23
 msgid "A3 Oversize"
 msgstr "A3 (特大)"
 
-#: ppdc/sample.c:24
 msgid "A3 Oversize Long Edge"
 msgstr "A3 (特大) 長辺送り"
 
-#: ppdc/sample.c:25
 msgid "A4"
 msgstr "A4"
 
-#: ppdc/sample.c:27
 msgid "A4 Long Edge"
 msgstr "A4 長辺送り"
 
-#: ppdc/sample.c:26
 msgid "A4 Oversize"
 msgstr "A4 (特大)"
 
-#: ppdc/sample.c:28
 msgid "A4 Small"
 msgstr "A4 (小)"
 
-#: ppdc/sample.c:29
 msgid "A5"
 msgstr "A5"
 
-#: ppdc/sample.c:31
 msgid "A5 Long Edge"
 msgstr "A5 長辺送り"
 
-#: ppdc/sample.c:30
 msgid "A5 Oversize"
 msgstr "A5 (特大)"
 
-#: ppdc/sample.c:32
 msgid "A6"
 msgstr "A6"
 
-#: ppdc/sample.c:33
 msgid "A6 Long Edge"
 msgstr "A6 長辺送り"
 
-#: ppdc/sample.c:34
 msgid "A7"
 msgstr "A7"
 
-#: ppdc/sample.c:35
 msgid "A8"
 msgstr "A8"
 
-#: ppdc/sample.c:36
 msgid "A9"
 msgstr "A9"
 
-#: ppdc/sample.c:38
 msgid "ANSI A"
 msgstr "ANSI A"
 
-#: ppdc/sample.c:39
 msgid "ANSI B"
 msgstr "ANSI B"
 
-#: ppdc/sample.c:40
 msgid "ANSI C"
 msgstr "ANSI C"
 
-#: ppdc/sample.c:41
 msgid "ANSI D"
 msgstr "ANSI D"
 
-#: ppdc/sample.c:42
 msgid "ANSI E"
 msgstr "ANSI E"
 
-#: ppdc/sample.c:47
 msgid "ARCH C"
 msgstr "ARCH C"
 
-#: ppdc/sample.c:48
 msgid "ARCH C Long Edge"
 msgstr "ARCH C 長辺送り"
 
-#: ppdc/sample.c:49
 msgid "ARCH D"
 msgstr "ARCH D"
 
-#: ppdc/sample.c:50
 msgid "ARCH D Long Edge"
 msgstr "ARCH D 長辺送り"
 
-#: ppdc/sample.c:51
 msgid "ARCH E"
 msgstr "ARCH E"
 
-#: ppdc/sample.c:52
 msgid "ARCH E Long Edge"
 msgstr "ARCH E 長辺送り"
 
-#: cgi-bin/classes.c:169 cgi-bin/printers.c:172
 msgid "Accept Jobs"
 msgstr "ジョブの受け付け"
 
-#: cups/http-support.c:1284
 msgid "Accepted"
 msgstr "受け付けました"
 
-#: cgi-bin/admin.c:570
 msgid "Add Class"
 msgstr "クラスの追加"
 
-#: cgi-bin/admin.c:882
 msgid "Add Printer"
 msgstr "プリンターの追加"
 
-#: cgi-bin/admin.c:444 cgi-bin/admin.c:477 cgi-bin/admin.c:525
-#: cgi-bin/admin.c:535
 msgid "Add RSS Subscription"
 msgstr "RSS 購読を追加"
 
-#: ppdc/sample.c:163
 msgid "Address"
 msgstr "アドレス"
 
-#: cgi-bin/admin.c:210 cgi-bin/admin.c:284 cgi-bin/admin.c:2745
 msgid "Administration"
 msgstr "管理"
 
-#: ppdc/sample.c:429
 msgid "Always"
 msgstr "常に有効"
 
-#: backend/socket.c:129
 msgid "AppSocket/HP JetDirect"
 msgstr "AppSocket/HP JetDirect"
 
-#: ppdc/sample.c:450
 msgid "Applicator"
 msgstr "アプリケーター"
 
-#: scheduler/ipp.c:1079
 #, c-format
 msgid "Attempt to set %s printer-state to bad value %d."
 msgstr "%s printer-state に 不正な値 %d を設定しようとしています。"
 
-#: scheduler/ipp.c:325
 #, c-format
 msgid "Attribute groups are out of order (%x < %x)."
 msgstr "属性グループは範囲外です (%x < %x)。"
 
-#: ppdc/sample.c:126
 msgid "B0"
 msgstr "B0"
 
-#: ppdc/sample.c:127
 msgid "B1"
 msgstr "B1"
 
-#: ppdc/sample.c:137
 msgid "B10"
 msgstr "B10"
 
-#: ppdc/sample.c:128
 msgid "B2"
 msgstr "B2"
 
-#: ppdc/sample.c:129
 msgid "B3"
 msgstr "B3"
 
-#: ppdc/sample.c:130
 msgid "B4"
 msgstr "B4"
 
-#: ppdc/sample.c:131
 msgid "B5"
 msgstr "B5"
 
-#: ppdc/sample.c:132
 msgid "B5 Oversize"
 msgstr "B5 (特大)"
 
-#: ppdc/sample.c:133
 msgid "B6"
 msgstr "B6"
 
-#: ppdc/sample.c:134
 msgid "B7"
 msgstr "B7"
 
-#: ppdc/sample.c:135
 msgid "B8"
 msgstr "B8"
 
-#: ppdc/sample.c:136
 msgid "B9"
 msgstr "B9"
 
-#: cups/dest.c:1680
+#, c-format
+msgid "Bad 'document-format' value \"%s\"."
+msgstr ""
+
 msgid "Bad NULL dests pointer"
 msgstr "不正な NULL 送信先ポインター"
 
-#: cups/ppd.c:345
 msgid "Bad OpenGroup"
 msgstr "不正な OpenGroup"
 
-#: cups/ppd.c:347
 msgid "Bad OpenUI/JCLOpenUI"
 msgstr "不正な OpenUI/JCLOpenUI"
 
-#: cups/ppd.c:349
 msgid "Bad OrderDependency"
 msgstr "不正な OrderDependency"
 
-#: cups/ppd-cache.c:148 cups/ppd-cache.c:195 cups/ppd-cache.c:233
-#: cups/ppd-cache.c:239 cups/ppd-cache.c:255 cups/ppd-cache.c:271
-#: cups/ppd-cache.c:280 cups/ppd-cache.c:288 cups/ppd-cache.c:305
-#: cups/ppd-cache.c:313 cups/ppd-cache.c:328 cups/ppd-cache.c:336
-#: cups/ppd-cache.c:354 cups/ppd-cache.c:366 cups/ppd-cache.c:381
-#: cups/ppd-cache.c:393 cups/ppd-cache.c:415 cups/ppd-cache.c:423
-#: cups/ppd-cache.c:441 cups/ppd-cache.c:449 cups/ppd-cache.c:464
-#: cups/ppd-cache.c:472 cups/ppd-cache.c:490 cups/ppd-cache.c:498
-#: cups/ppd-cache.c:525 cups/ppd-cache.c:571 cups/ppd-cache.c:579
-#: cups/ppd-cache.c:587
 msgid "Bad PPD cache file."
 msgstr "不正な PPD キャッシュファイルです。"
 
-#: cups/http-support.c:1299
 msgid "Bad Request"
 msgstr "不正なリクエスト"
 
-#: cups/snmp.c:1002
 msgid "Bad SNMP version number"
 msgstr "不正な SNMP バージョン番号"
 
-#: cups/ppd.c:350
 msgid "Bad UIConstraints"
 msgstr "不正な UIConstraints"
 
-#: scheduler/ipp.c:1380
 #, c-format
 msgid "Bad copies value %d."
 msgstr "%d は不正なコピー値です。"
 
-#: cups/ppd.c:358
 msgid "Bad custom parameter"
 msgstr "不正なカスタムパラメーター"
 
-#: cups/http-support.c:1451 scheduler/ipp.c:2350
 #, c-format
 msgid "Bad device-uri \"%s\"."
 msgstr "\"%s\" は無効な device-uri です。"
 
-#: scheduler/ipp.c:2391
 #, c-format
 msgid "Bad device-uri scheme \"%s\"."
 msgstr "\"%s\" は無効な device-uri スキーマです。"
 
-#: scheduler/ipp.c:8224 scheduler/ipp.c:8240 scheduler/ipp.c:9454
-#: scheduler/ipp.c:10968
 #, c-format
 msgid "Bad document-format \"%s\"."
 msgstr "\"%s\" は不正な document-format です。"
 
-#: scheduler/ipp.c:9470
 #, c-format
 msgid "Bad document-format-default \"%s\"."
 msgstr "\"%s\" は不正な document-format-default です。"
 
-#: cups/util.c:929
 msgid "Bad filename buffer"
 msgstr "不正なファイル名バッファーです。"
 
-#: scheduler/ipp.c:10060
+msgid "Bad job-name value: Bad UTF-8 sequence."
+msgstr ""
+
+msgid "Bad job-name value: Name too long."
+msgstr ""
+
+msgid "Bad job-name value: Wrong type or count."
+msgstr ""
+
 msgid "Bad job-priority value."
 msgstr "不正な job-priority 値です。"
 
-#: scheduler/ipp.c:1410
 #, c-format
 msgid "Bad job-sheets value \"%s\"."
 msgstr "\"%s\" は不正な job-sheets 値です。"
 
-#: scheduler/ipp.c:1394
 msgid "Bad job-sheets value type."
 msgstr "不正な job-sheets 値タイプ です。"
 
-#: scheduler/ipp.c:10090
 msgid "Bad job-state value."
 msgstr "不正な job-state 値です。"
 
-#: scheduler/ipp.c:2974 scheduler/ipp.c:3426 scheduler/ipp.c:6078
-#: scheduler/ipp.c:6225 scheduler/ipp.c:7658 scheduler/ipp.c:7927
-#: scheduler/ipp.c:8775 scheduler/ipp.c:9001 scheduler/ipp.c:9350
-#: scheduler/ipp.c:9953
 #, c-format
 msgid "Bad job-uri \"%s\"."
 msgstr "\"%s\" は無効な job-uri 属性です。"
 
-#: scheduler/ipp.c:2049 scheduler/ipp.c:5622
 #, c-format
 msgid "Bad notify-pull-method \"%s\"."
 msgstr "\"%s\" は無効な notify-pull-method です。"
 
-#: scheduler/ipp.c:2013 scheduler/ipp.c:5586
 #, c-format
 msgid "Bad notify-recipient-uri \"%s\"."
 msgstr "URI \"%s\" は不正な notify-recipient-uri です。"
 
-#: scheduler/ipp.c:1426
 #, c-format
 msgid "Bad number-up value %d."
 msgstr "%d は不正な number-up 値です。"
 
-#: cups/adminutil.c:292
 #, c-format
 msgid "Bad option + choice on line %d."
 msgstr "%d 行に不正なオプションと選択があります。"
 
-#: scheduler/ipp.c:1443
 #, c-format
 msgid "Bad page-ranges values %d-%d."
 msgstr "%d-%d は不正な page-ranges 値です。"
 
-#: scheduler/ipp.c:2434
 #, c-format
 msgid "Bad port-monitor \"%s\"."
 msgstr "\"%s\" は無効な port-monitor です。"
 
-#: cups/dest.c:676 cups/dest.c:1333
 msgid "Bad printer URI."
 msgstr "不正なプリンター URI です。"
 
-#: scheduler/ipp.c:2495
 #, c-format
 msgid "Bad printer-state value %d."
 msgstr "%d は無効な printer-state 値です。"
 
-#: scheduler/ipp.c:293
 #, c-format
 msgid "Bad request ID %d."
 msgstr "%d は無効なリクエストIDです。"
 
-#: scheduler/ipp.c:278
 #, c-format
 msgid "Bad request version number %d.%d."
 msgstr "バージョン番号 %d.%d は無効なリクエストです。"
 
-#: cgi-bin/admin.c:1484
 msgid "Bad subscription ID"
 msgstr "不正なサブスクリプション ID です。"
 
-#: cups/ppd.c:360
 msgid "Bad value string"
 msgstr "値文字列がありません"
 
-#: cgi-bin/admin.c:3290 cgi-bin/admin.c:3536
 msgid "Banners"
 msgstr "バナー"
 
-#: ppdc/sample.c:287
 msgid "Bond Paper"
 msgstr "ボンド紙"
 
-#: backend/usb-darwin.c:1846
 #, c-format
 msgid "Boolean expected for waiteof option \"%s\"."
 msgstr "論理値は、waiteof オプション \"%s\" であるべきです"
 
-#: filter/pstops.c:2057
 msgid "Buffer overflow detected, aborting."
 msgstr "オーバーフローが検出され、中断しました。"
 
-#: ppdc/sample.c:254
 msgid "CMYK"
 msgstr "CMYK"
 
-#: ppdc/sample.c:363
 msgid "CPCL Label Printer"
 msgstr "CPCL ラベルプリンター"
 
-#: cgi-bin/admin.c:1485 cgi-bin/admin.c:1524 cgi-bin/admin.c:1534
 msgid "Cancel RSS Subscription"
 msgstr "RSS 購読をキャンセル"
 
-#: backend/ipp.c:1921
 msgid "Canceling print job."
 msgstr "プリントジョブをキャンセルしています。"
 
-#: scheduler/ipp.c:2475
 msgid "Cannot share a remote Kerberized printer."
 msgstr "リモートの Kerberos 認証のプリンターを共有できません。"
 
-#: ppdc/sample.c:279
 msgid "Cassette"
 msgstr "カセット"
 
-#: cgi-bin/admin.c:1655 cgi-bin/admin.c:1797 cgi-bin/admin.c:1810
-#: cgi-bin/admin.c:1821
 msgid "Change Settings"
 msgstr "設定の変更"
 
-#: scheduler/ipp.c:2061 scheduler/ipp.c:5634
 #, c-format
 msgid "Character set \"%s\" not supported."
 msgstr "文字セット \"%s\" はサポートされていません。"
 
-#: cgi-bin/classes.c:195 cgi-bin/classes.c:322
 msgid "Classes"
 msgstr "クラス"
 
-#: cgi-bin/printers.c:182
 msgid "Clean Print Heads"
 msgstr "プリントヘッドクリーニング"
 
-#: scheduler/ipp.c:3878
 msgid "Close-Job doesn't support the job-uri attribute."
 msgstr "Close-Job は job-uri 属性をサポートしていません。"
 
-#: ppdc/sample.c:282
 msgid "Color"
 msgstr "カラー"
 
-#: ppdc/sample.c:253
 msgid "Color Mode"
 msgstr "カラーモード"
 
-#: berkeley/lpc.c:204
 msgid ""
 "Commands may be abbreviated.  Commands are:\n"
 "\n"
@@ -3102,88 +2446,67 @@ msgstr ""
 "\n"
 "exit    help    quit    status  ?"
 
-#: cups/snmp.c:1006
 msgid "Community name uses indefinite length"
 msgstr "コミュニティ名の長さが不定"
 
-#: backend/ipp.c:786 backend/lpd.c:871 backend/socket.c:395
 msgid "Connected to printer."
 msgstr "プリンターに接続しました。"
 
-#: backend/ipp.c:691 backend/lpd.c:694 backend/socket.c:314
 msgid "Connecting to printer."
 msgstr "プリンターに接続中。"
 
-#: cups/http-support.c:1272
 msgid "Continue"
 msgstr "継続"
 
-#: ppdc/sample.c:365
 msgid "Continuous"
 msgstr "連続"
 
-#: backend/lpd.c:1020 backend/lpd.c:1152
 msgid "Control file sent successfully."
 msgstr "コントロールファイルが正常に送信されました。"
 
-#: backend/ipp.c:1233 backend/lpd.c:464
 msgid "Copying print data."
 msgstr "印刷データをコピーしています。"
 
-#: cups/http-support.c:1281
 msgid "Created"
 msgstr "ジョブ作成"
 
-#: cups/ppd.c:1113 cups/ppd.c:1153 cups/ppd.c:1398 cups/ppd.c:1501
 msgid "Custom"
 msgstr "カスタム"
 
-#: ppdc/sample.c:359
 msgid "CustominCutInterval"
 msgstr "CustominCutInterval"
 
-#: ppdc/sample.c:357
 msgid "CustominTearInterval"
 msgstr "CustominTearInterval"
 
-#: ppdc/sample.c:343
 msgid "Cut"
 msgstr "カット"
 
-#: ppdc/sample.c:451
 msgid "Cutter"
 msgstr "カッター"
 
-#: ppdc/sample.c:239
 msgid "Dark"
 msgstr "濃い"
 
-#: ppdc/sample.c:235
 msgid "Darkness"
 msgstr "濃さ"
 
-#: backend/lpd.c:1105
 msgid "Data file sent successfully."
 msgstr "データファイルが正常に送信されました"
 
-#: cgi-bin/admin.c:2094 cgi-bin/admin.c:2105 cgi-bin/admin.c:2150
 msgid "Delete Class"
 msgstr "クラスの削除"
 
-#: cgi-bin/admin.c:2179 cgi-bin/admin.c:2190 cgi-bin/admin.c:2235
 msgid "Delete Printer"
 msgstr "プリンターの削除"
 
-#: ppdc/sample.c:281
 msgid "DeskJet Series"
 msgstr "DeskJet シリーズ"
 
-#: scheduler/ipp.c:1346
 #, c-format
 msgid "Destination \"%s\" is not accepting jobs."
 msgstr "宛先 \"%s\" はジョブを受け付けていません。"
 
-#: systemv/lpinfo.c:300
 #, c-format
 msgid ""
 "Device: uri = %s\n"
@@ -3200,92 +2523,73 @@ msgstr ""
 "          device-id = %s\n"
 "          location = %s"
 
-#: ppdc/sample.c:436
 msgid "Direct Thermal Media"
 msgstr "感熱紙"
 
-#: cups/file.c:296
 #, c-format
 msgid "Directory \"%s\" contains a relative path."
 msgstr "ディレクトリー \"%s\" は相対パスを含んでいます。"
 
-#: cups/file.c:268
 #, c-format
 msgid "Directory \"%s\" has insecure permissions (0%o/uid=%d/gid=%d)."
-msgstr "ディレクトリー \"%s\" は安全でないパーミッションが与えられています (0%o/uid=%d/gid=%d)。"
+msgstr ""
+"ディレクトリー \"%s\" は安全でないパーミッションが与えられています (0%o/uid="
+"%d/gid=%d)。"
 
-#: cups/file.c:285
 #, c-format
 msgid "Directory \"%s\" is a file."
 msgstr "ディレクトリー \"%s\" はファイルです。"
 
-#: cups/file.c:256
 #, c-format
 msgid "Directory \"%s\" not available: %s"
 msgstr "ディレクトリー \"%s\" は利用できません: %s"
 
-#: cups/file.c:241
 #, c-format
 msgid "Directory \"%s\" permissions OK (0%o/uid=%d/gid=%d)."
-msgstr "ディレクトリー \"%s\" のパーミッションは問題ありません (0%o/uid=%d/gid=%d)。"
+msgstr ""
+"ディレクトリー \"%s\" のパーミッションは問題ありません (0%o/uid=%d/gid=%d)。"
 
-#: ppdc/sample.c:345
 msgid "Disabled"
 msgstr "無効"
 
-#: scheduler/ipp.c:6127
 #, c-format
 msgid "Document #%d does not exist in job #%d."
 msgstr "ドキュメント #%d がジョブ #%d に見つかりません。"
 
-#: ppdc/sample.c:275
 msgid "Duplexer"
 msgstr "両面オプション"
 
-#: ppdc/sample.c:229
 msgid "Dymo"
 msgstr "Dymo"
 
-#: ppdc/sample.c:431
 msgid "EPL1 Label Printer"
 msgstr "EPL1 ラベルプリンター"
 
-#: ppdc/sample.c:434
 msgid "EPL2 Label Printer"
 msgstr "EPL2 ラベルプリンター"
 
-#: cgi-bin/admin.c:1849 cgi-bin/admin.c:1861 cgi-bin/admin.c:1915
-#: cgi-bin/admin.c:1922 cgi-bin/admin.c:1957 cgi-bin/admin.c:1970
-#: cgi-bin/admin.c:1994 cgi-bin/admin.c:2067
 msgid "Edit Configuration File"
 msgstr "設定ファイルの編集"
 
-#: cups/adminutil.c:337
 msgid "Empty PPD file."
 msgstr "PPD ファイルが空です。"
 
 #. TRANSLATORS: Banner/cover sheet after the print job.
-#: cgi-bin/admin.c:3561
 msgid "Ending Banner"
 msgstr "終了バナー"
 
-#: ppdc/sample.c:2
 msgid "English"
 msgstr "English"
 
-#: systemv/lppasswd.c:193
 msgid "Enter old password:"
 msgstr "古いパスワードを入力:"
 
-#: systemv/lppasswd.c:224
 msgid "Enter password again:"
 msgstr "パスワードを再度入力:"
 
-#: systemv/lppasswd.c:212
 msgid "Enter password:"
 msgstr "パスワードを入力:"
 
-#: scheduler/client.c:2427
 msgid ""
 "Enter your username and password or the root username and password to access "
 "this page. If you are using Kerberos authentication, make sure you have a "
@@ -3295,847 +2599,635 @@ msgstr ""
 "root のユーザー名とパスワードを入力してください。Kerberos 認証を使用している"
 "場合、有効な Kerberos チケットがあることを確認してください。"
 
-#: ppdc/sample.c:73
 msgid "Envelope #10 "
 msgstr "封筒 #10"
 
-#: ppdc/sample.c:74
 msgid "Envelope #11"
 msgstr "封筒 #11"
 
-#: ppdc/sample.c:75
 msgid "Envelope #12"
 msgstr "封筒 #12"
 
-#: ppdc/sample.c:76
 msgid "Envelope #14"
 msgstr "封筒 #14"
 
-#: ppdc/sample.c:77
 msgid "Envelope #9"
 msgstr "封筒 #9"
 
-#: ppdc/sample.c:89
 msgid "Envelope B4"
 msgstr "封筒 B4"
 
-#: ppdc/sample.c:90
 msgid "Envelope B5"
 msgstr "封筒 B5"
 
-#: ppdc/sample.c:91
 msgid "Envelope B6"
 msgstr "封筒 B6"
 
-#: ppdc/sample.c:78
 msgid "Envelope C0"
 msgstr "封筒 C0"
 
-#: ppdc/sample.c:79
 msgid "Envelope C1"
 msgstr "封筒 C1"
 
-#: ppdc/sample.c:80
 msgid "Envelope C2"
 msgstr "封筒 C2"
 
-#: ppdc/sample.c:81
 msgid "Envelope C3"
 msgstr "封筒 C3"
 
-#: ppdc/sample.c:67
 msgid "Envelope C4"
 msgstr "封筒 C4"
 
-#: ppdc/sample.c:68
 msgid "Envelope C5"
 msgstr "封筒 C5"
 
-#: ppdc/sample.c:69
 msgid "Envelope C6"
 msgstr "封筒 C6"
 
-#: ppdc/sample.c:82
 msgid "Envelope C65"
 msgstr "封筒 C65"
 
-#: ppdc/sample.c:83
 msgid "Envelope C7"
 msgstr "封筒 C7"
 
-#: ppdc/sample.c:84
 msgid "Envelope Choukei 3"
 msgstr "封筒 長形3号"
 
-#: ppdc/sample.c:85
 msgid "Envelope Choukei 3 Long Edge"
 msgstr "封筒 長形3号 長辺送り"
 
-#: ppdc/sample.c:86
 msgid "Envelope Choukei 4"
 msgstr "封筒 長形4号"
 
-#: ppdc/sample.c:87
 msgid "Envelope Choukei 4 Long Edge"
 msgstr "封筒 長形4号 長辺送り"
 
-#: ppdc/sample.c:70
 msgid "Envelope DL"
 msgstr "封筒 DL"
 
-#: ppdc/sample.c:269
 msgid "Envelope Feed"
 msgstr "封筒フィード"
 
-#: ppdc/sample.c:88
 msgid "Envelope Invite"
 msgstr "招待状封筒"
 
-#: ppdc/sample.c:92
 msgid "Envelope Italian"
 msgstr "イタリア封筒"
 
-#: ppdc/sample.c:93
 msgid "Envelope Kaku2"
 msgstr "封筒 角2"
 
-#: ppdc/sample.c:94
 msgid "Envelope Kaku2 Long Edge"
 msgstr "封筒 角2 長辺送り"
 
-#: ppdc/sample.c:95
 msgid "Envelope Kaku3"
 msgstr "封筒 角3"
 
-#: ppdc/sample.c:96
 msgid "Envelope Kaku3 Long Edge"
 msgstr "封筒 角3 長辺送り"
 
-#: ppdc/sample.c:97
 msgid "Envelope Monarch"
 msgstr "封筒 Monarch"
 
-#: ppdc/sample.c:99
 msgid "Envelope PRC1 "
 msgstr "封筒 PRC1"
 
-#: ppdc/sample.c:100
 msgid "Envelope PRC1 Long Edge"
 msgstr "封筒 PRC1 長辺送り"
 
-#: ppdc/sample.c:117
 msgid "Envelope PRC10"
 msgstr "封筒 PRC10"
 
-#: ppdc/sample.c:118
 msgid "Envelope PRC10 Long Edge"
 msgstr "封筒 PRC10 長辺送り"
 
-#: ppdc/sample.c:101
 msgid "Envelope PRC2"
 msgstr "封筒 PRC2"
 
-#: ppdc/sample.c:102
 msgid "Envelope PRC2 Long Edge"
 msgstr "封筒 PRC2 長辺送り"
 
-#: ppdc/sample.c:103
 msgid "Envelope PRC3"
 msgstr "封筒 PRC3"
 
-#: ppdc/sample.c:104
 msgid "Envelope PRC3 Long Edge"
 msgstr "封筒 PRC3 長辺送り"
 
-#: ppdc/sample.c:105
 msgid "Envelope PRC4"
 msgstr "封筒 PRC4"
 
-#: ppdc/sample.c:106
 msgid "Envelope PRC4 Long Edge"
 msgstr "封筒 PRC4 長辺送り"
 
-#: ppdc/sample.c:108
 msgid "Envelope PRC5 Long Edge"
 msgstr "封筒 PRC5 長辺送り"
 
-#: ppdc/sample.c:107
 msgid "Envelope PRC5PRC5"
 msgstr "封筒 PRC5"
 
-#: ppdc/sample.c:109
 msgid "Envelope PRC6"
 msgstr "封筒 PRC6"
 
-#: ppdc/sample.c:110
 msgid "Envelope PRC6 Long Edge"
 msgstr "封筒 PRC6 長辺送り"
 
-#: ppdc/sample.c:111
 msgid "Envelope PRC7"
 msgstr "封筒 PRC7"
 
-#: ppdc/sample.c:112
 msgid "Envelope PRC7 Long Edge"
 msgstr "封筒 PRC7 長辺送り"
 
-#: ppdc/sample.c:113
 msgid "Envelope PRC8"
 msgstr "封筒 PRC8"
 
-#: ppdc/sample.c:114
 msgid "Envelope PRC8 Long Edge"
 msgstr "封筒 PRC8 長辺送り"
 
-#: ppdc/sample.c:115
 msgid "Envelope PRC9"
 msgstr "封筒 PRC9"
 
-#: ppdc/sample.c:116
 msgid "Envelope PRC9 Long Edge"
 msgstr "封筒 PRC9 長辺送り"
 
-#: ppdc/sample.c:98
 msgid "Envelope Personal"
 msgstr "パーソナル封筒"
 
-#: ppdc/sample.c:119
 msgid "Envelope You4"
 msgstr "封筒 洋形4号"
 
-#: ppdc/sample.c:120
 msgid "Envelope You4 Long Edge"
 msgstr "封筒 洋形4号 長辺送り"
 
-#: ppdc/sample.c:240
 msgid "Epson"
 msgstr "Epson"
 
-#: cgi-bin/admin.c:3604
 msgid "Error Policy"
 msgstr "エラーポリシー"
 
-#: filter/rastertopwg.c:403 filter/rastertopwg.c:418 filter/rastertopwg.c:429
-#: filter/rastertopwg.c:440
 msgid "Error sending raster data."
 msgstr "ラスターデータの送信でエラーが起きました。"
 
-#: systemv/lpinfo.c:103 systemv/lpmove.c:88
 msgid "Error: need hostname after \"-h\" option."
 msgstr "Error: '-h' オプションのあとにはホスト名が必要です。"
 
-#: ppdc/sample.c:355
 msgid "Every 10 Labels"
 msgstr "10 ラベルごと"
 
-#: ppdc/sample.c:347
 msgid "Every 2 Labels"
 msgstr "2 ラベルごと"
 
-#: ppdc/sample.c:348
 msgid "Every 3 Labels"
 msgstr "3 ラベルごと"
 
-#: ppdc/sample.c:349
 msgid "Every 4 Labels"
 msgstr "4 ラベルごと"
 
-#: ppdc/sample.c:350
 msgid "Every 5 Labels"
 msgstr "5 ラベルごと"
 
-#: ppdc/sample.c:351
 msgid "Every 6 Labels"
 msgstr "6 ラベルごと"
 
-#: ppdc/sample.c:352
 msgid "Every 7 Labels"
 msgstr "7 ラベルごと"
 
-#: ppdc/sample.c:353
 msgid "Every 8 Labels"
 msgstr "8 ラベルごと"
 
-#: ppdc/sample.c:354
 msgid "Every 9 Labels"
 msgstr "9 ラベルごと"
 
-#: ppdc/sample.c:346
 msgid "Every Label"
 msgstr "すべてのラベル"
 
-#: ppdc/sample.c:121
 msgid "Executive"
 msgstr "エグゼクティブ"
 
-#: cups/http-support.c:1327
 msgid "Expectation Failed"
 msgstr "予測に失敗しました"
 
-#: cgi-bin/admin.c:2356 cgi-bin/admin.c:2375
 msgid "Export Printers to Samba"
 msgstr "Samba へプリンターをエクスポート"
 
-#: systemv/cupstestdsc.c:172 systemv/cupstestdsc.c:189
-#: systemv/cupstestdsc.c:214 systemv/cupstestdsc.c:231
-#: systemv/cupstestdsc.c:255 systemv/cupstestdsc.c:273
-#: systemv/cupstestdsc.c:302 systemv/cupstestdsc.c:339
-#: systemv/cupstestdsc.c:349 systemv/cupstestdsc.c:359
-#: systemv/cupstestdsc.c:369 systemv/cupstestdsc.c:379
-#: systemv/cupstestdsc.c:387
 msgid "FAIL"
 msgstr "失敗"
 
-#: ppdc/sample.c:122
 msgid "FanFold German"
 msgstr "FanFold German"
 
-#: ppdc/sample.c:123
 msgid "FanFold Legal German"
 msgstr "FanFold Legal German"
 
-#: ppdc/sample.c:124
 msgid "Fanfold US"
 msgstr "Fanfold US"
 
-#: cups/file.c:300
 #, c-format
 msgid "File \"%s\" contains a relative path."
 msgstr "ファイル \"%s\" は相対パスを含んでいます。"
 
-#: cups/file.c:275
 #, c-format
 msgid "File \"%s\" has insecure permissions (0%o/uid=%d/gid=%d)."
-msgstr "ファイル \"%s\" は安全でないパーミッションが与えられています (0%o/uid=%d/gid=%d)。"
+msgstr ""
+"ファイル \"%s\" は安全でないパーミッションが与えられています (0%o/uid=%d/gid="
+"%d)。"
 
-#: cups/file.c:289
 #, c-format
 msgid "File \"%s\" is a directory."
 msgstr "ファイル \"%s\" はディレクトリーです。"
 
-#: cups/file.c:261
 #, c-format
 msgid "File \"%s\" not available: %s"
 msgstr "ファイル \"%s\" は利用できません: %s"
 
-#: cups/file.c:247
 #, c-format
 msgid "File \"%s\" permissions OK (0%o/uid=%d/gid=%d)."
 msgstr "ファイル \"%s\" のパーミッションは問題ありません (0%o/uid=%d/gid=%d)。"
 
-#: ppdc/sample.c:169
 msgid "File Folder "
 msgstr "ファイルフォルダー"
 
-#: scheduler/ipp.c:2370
 #, c-format
 msgid ""
 "File device URIs have been disabled. To enable, see the FileDevice directive "
-"in \"%s/cupsd.conf\"."
-msgstr "ファイルデバイス URI は無効になっています。有効にするには、\"%s/cupsd.conf\" の FileDevice ディレクティブを参照してください。"
+"in \"%s/cups-files.conf\"."
+msgstr ""
+"ファイルデバイス URI は無効になっています。有効にするには、\"%s/cups-files."
+"conf\" の FileDevice ディレクティブを参照してください。"
 
-#: filter/rastertoepson.c:1117 filter/rastertohp.c:845
-#: filter/rastertolabel.c:1273
 #, c-format
 msgid "Finished page %d."
 msgstr "ページ %d を終了。"
 
-#: ppdc/sample.c:125
 msgid "Folio"
 msgstr "フォリオ"
 
-#: cups/http-support.c:1306
 msgid "Forbidden"
 msgstr "Forbidden"
 
-#: cups/ppd.c:742 cups/ppd.c:1302
 msgid "General"
 msgstr "一般"
 
-#: ppdc/sample.c:259
 msgid "Generic"
 msgstr "汎用"
 
-#: cups/snmp.c:1016
 msgid "Get-Response-PDU uses indefinite length"
 msgstr "Get-Response-PDU は不確定の長さを使用しています"
 
-#: ppdc/sample.c:290
 msgid "Glossy Paper"
 msgstr "光沢紙"
 
-#: scheduler/ipp.c:2952 scheduler/ipp.c:3352 scheduler/ipp.c:3890
-#: scheduler/ipp.c:6056 scheduler/ipp.c:6203 scheduler/ipp.c:7635
-#: scheduler/ipp.c:8753 scheduler/ipp.c:8979 scheduler/ipp.c:9328
-#: scheduler/ipp.c:9931
 msgid "Got a printer-uri attribute but no job-id."
 msgstr "printer-uri 属性を取得しましたが、job-id を取得できませんでした。"
 
-#: ppdc/sample.c:255
 msgid "Grayscale"
 msgstr "グレースケール"
 
-#: ppdc/sample.c:280
 msgid "HP"
 msgstr "HP"
 
-#: ppdc/sample.c:170
 msgid "Hanging Folder"
 msgstr "Hanging Folder"
 
-#: cgi-bin/help.c:143
 msgid "Help file not in index."
 msgstr "ヘルプファイルが索引に含まれていません。"
 
-#: cups/ipp.c:2687 cups/ipp.c:2714 cups/ipp.c:2737
 msgid "IPP 1setOf attribute with incompatible value tags."
 msgstr "IPP の 1setOf 属性が value タグと互換性がありません。"
 
-#: cups/ipp.c:2650
 msgid "IPP attribute has no name."
 msgstr "IPP の属性に名前がありません。"
 
-#: cups/ipp.c:5487
 msgid "IPP attribute is not a member of the message."
 msgstr "IPP の属性がメッセージのメンバーではありません。"
 
-#: cups/ipp.c:3083
 msgid "IPP begCollection value not 0 bytes."
 msgstr "IPP の begCollection は想定された 0 バイトになっていません。"
 
-#: cups/ipp.c:2873
 msgid "IPP boolean value not 1 byte."
 msgstr "IPP の真偽値が想定された 1 バイトになっていません。"
 
-#: cups/ipp.c:2934
 msgid "IPP date value not 11 bytes."
 msgstr "IPP の date 値は想定された 11 バイトになっていません。"
 
-#: cups/ipp.c:3104
 msgid "IPP endCollection value not 0 bytes."
 msgstr "IPP の endCollection は想定された 0 バイトになっていません。"
 
-#: cups/ipp.c:2848
 msgid "IPP enum value not 4 bytes."
 msgstr "IPP の enum 値は想定された 4 バイトになっていません。"
 
-#: cups/ipp.c:2579
 msgid "IPP extension tag larger than 0x7FFFFFFF."
 msgstr "IPP の拡張タグが 0x7FFFFFFF より大きいです。"
 
-#: cups/ipp.c:2845
 msgid "IPP integer value not 4 bytes."
 msgstr "IPP の整数値は想定された 4 バイトになっていません。"
 
-#: cups/ipp.c:3045
 msgid "IPP language length overflows value."
 msgstr "IPP の language length の値がオーバーフローしています。"
 
-#: cups/ipp.c:2764
 msgid "IPP member name is not empty."
 msgstr "IPP のメンバー名が空ではありません。"
 
-#: cups/ipp.c:3122
 msgid "IPP memberName value is empty."
 msgstr "IPP の memberName の値が空です。"
 
-#: cups/ipp.c:2633
+msgid "IPP memberName with no attribute."
+msgstr ""
+
 msgid "IPP name larger than 32767 bytes."
 msgstr "IPP 名が 32767 バイトより大きいです。"
 
-#: cups/ipp.c:3011
 msgid "IPP nameWithLanguage value less than minimum 4 bytes."
 msgstr "IPP の nameWithLanguage が最小値 4 バイト未満です。"
 
-#: cups/ipp.c:2979
 msgid "IPP rangeOfInteger value not 8 bytes."
 msgstr "IPP の rangeOfInteger は想定された 8 バイトになっていません。"
 
-#: cups/ipp.c:2952
 msgid "IPP resolution value not 9 bytes."
 msgstr "IPP の resolution は想定された 9 バイトになっていません。"
 
-#: cups/ipp.c:3063
 msgid "IPP string length overflows value."
 msgstr "IPP の文字列長の値がオーバーフローしています。"
 
-#: cups/ipp.c:3007
 msgid "IPP textWithLanguage value less than minimum 4 bytes."
 msgstr "IPP の textWithLanguage の値が最小値 4 バイト未満です。"
 
-#: cups/ipp.c:2831
 msgid "IPP value larger than 32767 bytes."
 msgstr "IPP の値が 32767 バイト以上です。"
 
-#: ppdc/sample.c:1
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: cups/ppd.c:353
 msgid "Illegal control character"
 msgstr "不正な制御文字"
 
-#: cups/ppd.c:354
 msgid "Illegal main keyword string"
 msgstr "不正なメインキーワード文字列"
 
-#: cups/ppd.c:355
 msgid "Illegal option keyword string"
 msgstr "不正なオプションキーワード文字列"
 
-#: cups/ppd.c:356
 msgid "Illegal translation string"
 msgstr "不正な翻訳文字列"
 
-#: cups/ppd.c:357
 msgid "Illegal whitespace character"
 msgstr "不正な空白文字"
 
-#: ppdc/sample.c:274
 msgid "Installable Options"
 msgstr "インストール可能オプション"
 
-#: ppdc/sample.c:277
 msgid "Installed"
 msgstr "インストールされています"
 
-#: ppdc/sample.c:293
 msgid "IntelliBar Label Printer"
 msgstr "IntelliBar ラベルプリンター"
 
-#: ppdc/sample.c:292
 msgid "Intellitech"
 msgstr "Intellitech"
 
-#: cups/http-support.c:1333
 msgid "Internal Server Error"
 msgstr "サーバー内部エラー"
 
-#: cups/ppd.c:344
 msgid "Internal error"
 msgstr "内部エラー"
 
-#: ppdc/sample.c:167
 msgid "Internet Postage 2-Part"
 msgstr "Internet Postage 2-Part"
 
-#: ppdc/sample.c:168
 msgid "Internet Postage 3-Part"
 msgstr "Internet Postage 3-Part"
 
-#: backend/ipp.c:307
 msgid "Internet Printing Protocol"
 msgstr "インターネット印刷プロトコル"
 
-#: cups/dest-options.c:839
 msgid "Invalid media size."
 msgstr "無効なメディアサイズです。"
 
-#: filter/commandtops.c:125
 #, c-format
 msgid "Invalid printer command \"%s\"."
 msgstr "無効なプリンターコマンドです。 \"%s\""
 
-#: cups/ppd.c:1420
 msgid "JCL"
 msgstr "JCL"
 
-#: ppdc/sample.c:53
 msgid "JIS B0"
 msgstr "JIS B0"
 
-#: ppdc/sample.c:55
 msgid "JIS B1"
 msgstr "JIS B1"
 
-#: ppdc/sample.c:54
 msgid "JIS B10"
 msgstr "JIS B10"
 
-#: ppdc/sample.c:56
 msgid "JIS B2"
 msgstr "JIS B2"
 
-#: ppdc/sample.c:57
 msgid "JIS B3"
 msgstr "JIS B3"
 
-#: ppdc/sample.c:58
 msgid "JIS B4"
 msgstr "JIS B4"
 
-#: ppdc/sample.c:59
 msgid "JIS B4 Long Edge"
 msgstr "JIS B4 長辺送り"
 
-#: ppdc/sample.c:60
 msgid "JIS B5"
 msgstr "JIS B5"
 
-#: ppdc/sample.c:61
 msgid "JIS B5 Long Edge"
 msgstr "JIS B5 長辺送り"
 
-#: ppdc/sample.c:62
 msgid "JIS B6"
 msgstr "JIS B6"
 
-#: ppdc/sample.c:63
 msgid "JIS B6 Long Edge"
 msgstr "JIS B6 長辺送り"
 
-#: ppdc/sample.c:64
 msgid "JIS B7"
 msgstr "JIS B7"
 
-#: ppdc/sample.c:65
 msgid "JIS B8"
 msgstr "JIS B8"
 
-#: ppdc/sample.c:66
 msgid "JIS B9"
 msgstr "JIS B9"
 
-#: scheduler/ipp.c:9051
 #, c-format
 msgid "Job #%d cannot be restarted - no files."
 msgstr "ジョブ番号 %d を再開できません - ファイルが見つかりません。"
 
-#: scheduler/ipp.c:2992 scheduler/ipp.c:3222 scheduler/ipp.c:3277
-#: scheduler/ipp.c:3454 scheduler/ipp.c:3900 scheduler/ipp.c:5720
-#: scheduler/ipp.c:6096 scheduler/ipp.c:6243 scheduler/ipp.c:6543
-#: scheduler/ipp.c:7482 scheduler/ipp.c:7504 scheduler/ipp.c:7676
-#: scheduler/ipp.c:7901 scheduler/ipp.c:7944 scheduler/ipp.c:8793
-#: scheduler/ipp.c:9019 scheduler/ipp.c:9368 scheduler/ipp.c:9971
 #, c-format
 msgid "Job #%d does not exist."
 msgstr "ジョブ番号 %d は存在しません。"
 
-#: scheduler/ipp.c:3486
 #, c-format
 msgid "Job #%d is already aborted - can't cancel."
 msgstr "ジョブ番号 %d はすでに中断されています - キャンセルできません。"
 
-#: scheduler/ipp.c:3480
 #, c-format
 msgid "Job #%d is already canceled - can't cancel."
 msgstr "ジョブ番号 %d はすでにキャンセルされています - キャンセルできません。"
 
-#: scheduler/ipp.c:3492
 #, c-format
 msgid "Job #%d is already completed - can't cancel."
 msgstr "ジョブ番号 %d はすでに完了しています - キャンセルできません。"
 
-#: scheduler/ipp.c:7702 scheduler/ipp.c:7986 scheduler/ipp.c:9986
 #, c-format
 msgid "Job #%d is finished and cannot be altered."
 msgstr "ジョブ番号 %d はすでに終了し、変更できません。"
 
-#: scheduler/ipp.c:9033
 #, c-format
 msgid "Job #%d is not complete."
 msgstr "ジョブ番号 %d は完了していません。"
 
-#: scheduler/ipp.c:3007
 #, c-format
 msgid "Job #%d is not held for authentication."
 msgstr "ジョブ番号 %d は認証のために保留されていません。"
 
-#: scheduler/ipp.c:8807
 #, c-format
 msgid "Job #%d is not held."
 msgstr "ジョブ番号 %d は保留されていません。"
 
-#: cgi-bin/ipp-var.c:1055
 msgid "Job Completed"
 msgstr "ジョブ完了"
 
-#: cgi-bin/ipp-var.c:1053
 msgid "Job Created"
 msgstr "ジョブ作成"
 
-#: cgi-bin/ipp-var.c:1059
 msgid "Job Options Changed"
 msgstr "ジョブオプション変更"
 
-#: cgi-bin/ipp-var.c:1057
 msgid "Job Stopped"
 msgstr "ジョブ中止"
 
-#: scheduler/ipp.c:10068
 msgid "Job is completed and cannot be changed."
 msgstr "ジョブは完了し変更できません。"
 
-#: cgi-bin/jobs.c:198
 msgid "Job operation failed"
 msgstr "ジョブ操作失敗"
 
-#: scheduler/ipp.c:10104 scheduler/ipp.c:10123 scheduler/ipp.c:10134
 msgid "Job state cannot be changed."
 msgstr "ジョブの状態を変更できません。"
 
-#: scheduler/ipp.c:8899
 msgid "Job subscriptions cannot be renewed."
 msgstr "ジョブサブスクリプションを更新できません。"
 
-#: cgi-bin/jobs.c:103 cgi-bin/jobs.c:114 cgi-bin/jobs.c:195
 msgid "Jobs"
 msgstr "ジョブ"
 
-#: backend/lpd.c:185
 msgid "LPD/LPR Host or Printer"
 msgstr "LPD/LPR ホストまたはプリンター"
 
-#: ppdc/sample.c:230
 msgid "Label Printer"
 msgstr "ラベルプリンター"
 
-#: ppdc/sample.c:446
 msgid "Label Top"
 msgstr "ラベルトップ"
 
-#: scheduler/ipp.c:2070 scheduler/ipp.c:5643
 #, c-format
 msgid "Language \"%s\" not supported."
 msgstr "言語 \"%s\" はサポートされていません。"
 
-#: ppdc/sample.c:164
 msgid "Large Address"
 msgstr "ラージアドレス"
 
-#: ppdc/sample.c:291
 msgid "LaserJet Series PCL 4/5"
 msgstr "LaserJet Series PCL 4/5"
 
-#: ppdc/sample.c:43
 msgid "Letter Oversize"
 msgstr "US レター (特大)"
 
-#: ppdc/sample.c:44
 msgid "Letter Oversize Long Edge"
 msgstr "US レター (特大) 長辺送り"
 
-#: ppdc/sample.c:236
 msgid "Light"
 msgstr "薄い"
 
-#: cups/ppd.c:352
 msgid "Line longer than the maximum allowed (255 characters)"
 msgstr "1 行が最大値 (255 文字) を超えています"
 
-#: cgi-bin/admin.c:2393
 msgid "List Available Printers"
 msgstr "使用可能なプリンターをリスト化"
 
-#: ppdc/sample.c:272
 msgid "Long-Edge (Portrait)"
 msgstr "長辺給紙 (縦向き)"
 
-#: cups/http-support.c:1558
 msgid "Looking for printer."
 msgstr "プリンターを探しています。"
 
-#: ppdc/sample.c:268
 msgid "Manual Feed"
 msgstr "手差し"
 
-#: cups/ppd.c:789 cups/ppd.c:1357
 msgid "Media Size"
 msgstr "用紙サイズ"
 
-#: cups/ppd.c:793 cups/ppd.c:1361 ppdc/sample.c:262
 msgid "Media Source"
 msgstr "給紙"
 
-#: ppdc/sample.c:364
 msgid "Media Tracking"
 msgstr "用紙の経路"
 
-#: cups/ppd.c:791 cups/ppd.c:1359 ppdc/sample.c:285
 msgid "Media Type"
 msgstr "用紙種類"
 
-#: ppdc/sample.c:237
 msgid "Medium"
 msgstr "紙質"
 
-#: cups/ppd.c:341
 msgid "Memory allocation error"
 msgstr "メモリー割り当てエラー"
 
-#: cups/ppd.c:361
 msgid "Missing CloseGroup"
 msgstr "CloseGroup がありません"
 
-#: cups/ppd.c:342
 msgid "Missing PPD-Adobe-4.x header"
 msgstr "PPD-Adobe-4.x ヘッダーがありません"
 
-#: cups/ppd.c:351
 msgid "Missing asterisk in column 1"
 msgstr "1 列目にアスタリスクがありません"
 
-#: scheduler/ipp.c:6119
 msgid "Missing document-number attribute."
 msgstr "document-number 属性がありません。"
 
-#: cups/adminutil.c:273
 #, c-format
 msgid "Missing double quote on line %d."
 msgstr "%d 行に二重引用符がありません。"
 
-#: cgi-bin/admin.c:736 cgi-bin/admin.c:2106 cgi-bin/admin.c:2191
-#: cgi-bin/admin.c:2785 cgi-bin/admin.c:3039 cgi-bin/admin.c:3150
-#: cgi-bin/admin.c:3860
 msgid "Missing form variable"
 msgstr "form 変数がありません。"
 
-#: scheduler/ipp.c:9422
 msgid "Missing last-document attribute in request."
 msgstr "リクエストに last-document 属性がありません。"
 
-#: cups/pwg-media.c:535
 msgid "Missing media or media-col."
 msgstr "media または media-col がありません。"
 
-#: cups/pwg-media.c:454
 msgid "Missing media-size in media-col."
 msgstr "media-col に media-size がありません。"
 
-#: scheduler/ipp.c:6673
 msgid "Missing notify-subscription-ids attribute."
 msgstr "notify-subscription-ids 属性がありません。"
 
-#: cups/ppd.c:359
 msgid "Missing option keyword"
 msgstr "オプションキーワードがありません"
 
-#: scheduler/ipp.c:3133 scheduler/ipp.c:3158
 msgid "Missing requesting-user-name attribute."
 msgstr "requesting-user-name 属性が設定されていません。"
 
-#: scheduler/ipp.c:461
 msgid "Missing required attributes."
 msgstr "必須の属性が設定されていません。"
 
-#: cups/adminutil.c:254
 #, c-format
 msgid "Missing value on line %d."
 msgstr "%d 行に値がありません。"
 
-#: cups/ppd.c:343
 msgid "Missing value string"
 msgstr "値文字列がありません"
 
-#: cups/pwg-media.c:442
 msgid "Missing x-dimension in media-size."
 msgstr "media-size に x-dimension がありません。"
 
-#: cups/pwg-media.c:448
 msgid "Missing y-dimension in media-size."
 msgstr "media-size に y-dimension がありません。"
 
-#: systemv/lpinfo.c:470
 #, c-format
 msgid ""
 "Model:  name = %s\n"
@@ -4148,882 +3240,673 @@ msgstr ""
 "        プリンタードライバー = %s\n"
 "        デバイス ID = %s"
 
-#: cgi-bin/admin.c:570
 msgid "Modify Class"
 msgstr "クラスの変更"
 
-#: cgi-bin/admin.c:882
 msgid "Modify Printer"
 msgstr "プリンターの変更"
 
-#: cgi-bin/ipp-var.c:425 cgi-bin/ipp-var.c:516
 msgid "Move All Jobs"
 msgstr "すべてのジョブの移動"
 
-#: cgi-bin/ipp-var.c:364 cgi-bin/ipp-var.c:423 cgi-bin/ipp-var.c:514
 msgid "Move Job"
 msgstr "ジョブの移動"
 
-#: cups/http-support.c:1290
 msgid "Moved Permanently"
 msgstr "別の場所へ移動しました"
 
-#: cups/ppd.c:340
 msgid "NULL PPD file pointer"
 msgstr "PPD ファイルポインターが NULL です"
 
-#: cups/snmp.c:1053
 msgid "Name OID uses indefinite length"
 msgstr "OID 名は限定的な長さを使用します"
 
-#: scheduler/ipp.c:1142
 msgid "Nested classes are not allowed."
 msgstr "入れ子になったクラスは許可されていません。"
 
-#: ppdc/sample.c:430
 msgid "Never"
 msgstr "Never"
 
-#: ppdc/sample.c:256
 msgid "New Stylus Color Series"
 msgstr "New Stylus Color シリーズ"
 
-#: ppdc/sample.c:258
 msgid "New Stylus Photo Series"
 msgstr "New Stylus Photo シリーズ"
 
-#: cups/ppd.c:1949
 msgid "No"
 msgstr "いいえ"
 
-#: cups/http-support.c:1287
 msgid "No Content"
 msgstr "中身がありません"
 
-#: cups/util.c:1298
 msgid "No PPD name"
 msgstr "PPD の名前がありません"
 
-#: cups/snmp.c:1047
 msgid "No VarBind SEQUENCE"
 msgstr "VarBind SEQUENCE がありません"
 
-#: cups/adminutil.c:788
 msgid "No Windows printer drivers are installed."
 msgstr "Windows プリンタードライバーがインストールされていません。"
 
-#: cups/request.c:566 cups/request.c:908
 msgid "No active connection"
 msgstr "アクティブな接続はありません"
 
-#: scheduler/ipp.c:3403
 #, c-format
 msgid "No active jobs on %s."
 msgstr "%s にはアクティブなジョブはありません。"
 
-#: scheduler/ipp.c:302
 msgid "No attributes in request."
 msgstr "リクエストに属性がありません。"
 
-#: scheduler/ipp.c:3034
 msgid "No authentication information provided."
 msgstr "認証情報が提供されていません。"
 
-#: cups/snmp.c:1004
 msgid "No community name"
 msgstr "コミュニティ名がありません"
 
-#: scheduler/ipp.c:5919
 msgid "No default printer."
 msgstr "デフォルトのプリンターはありません"
 
-#: cgi-bin/ipp-var.c:436 scheduler/ipp.c:7248
 msgid "No destinations added."
 msgstr "追加された宛先はありません"
 
-#: backend/usb.c:200
 msgid "No device URI found in argv[0] or in DEVICE_URI environment variable."
-msgstr "ERROR: argv[0] または 環境変数 DEVICE_URI にデバイス URI が見つかりません。"
+msgstr ""
+"ERROR: argv[0] または 環境変数 DEVICE_URI にデバイス URI が見つかりません。"
 
-#: cups/snmp.c:1034
 msgid "No error-index"
 msgstr "エラーインデックスがありません"
 
-#: cups/snmp.c:1026
 msgid "No error-status"
 msgstr "エラーステータスがありません"
 
-#: scheduler/ipp.c:8190 scheduler/ipp.c:9436
 msgid "No file in print request."
 msgstr "印刷リクエストにファイルがありません。"
 
-#: cups/util.c:923
 msgid "No modification time"
 msgstr "変更時刻がありません。"
 
-#: cups/snmp.c:1051
 msgid "No name OID"
 msgstr "OID 名がありません"
 
-#: filter/rastertoepson.c:1147 filter/rastertohp.c:876
-#: filter/rastertolabel.c:1302
 msgid "No pages were found."
 msgstr "ERROR: ページが見つかりません。"
 
-#: cups/util.c:917
 msgid "No printer name"
 msgstr "プリンター名がありません。"
 
-#: cups/util.c:1801
 msgid "No printer-uri found"
 msgstr "プリンター URI が見つかりません。"
 
-#: cups/util.c:1786
 msgid "No printer-uri found for class"
 msgstr "クラスのプリンター URI が見つかりません。"
 
-#: scheduler/ipp.c:6322
 msgid "No printer-uri in request."
 msgstr "プリンター URI のリクエストがありません。"
 
-#: cups/snmp.c:1018
 msgid "No request-id"
 msgstr "リクエストID がありません"
 
-#: scheduler/ipp.c:5528
 msgid "No subscription attributes in request."
 msgstr "リクエストにサブスクリプション属性がありません。"
 
-#: scheduler/ipp.c:7575
 msgid "No subscriptions found."
 msgstr "サブスクリプションが見つかりません。"
 
-#: cups/snmp.c:1042
 msgid "No variable-bindings SEQUENCE"
 msgstr "variable-bindings SEQUENCE がありません"
 
-#: cups/snmp.c:997
 msgid "No version number"
 msgstr "バージョン名がありません"
 
-#: ppdc/sample.c:367
 msgid "Non-continuous (Mark sensing)"
 msgstr "非連続です (Mark sensing)"
 
-#: ppdc/sample.c:366
 msgid "Non-continuous (Web sensing)"
 msgstr "非連続です (Web sensing)"
 
-#: ppdc/sample.c:238
 msgid "Normal"
 msgstr "標準"
 
-#: cups/http-support.c:1309
 msgid "Not Found"
 msgstr "見つかりません"
 
-#: cups/http-support.c:1321
 msgid "Not Implemented"
 msgstr "実装されていません"
 
-#: ppdc/sample.c:276
 msgid "Not Installed"
 msgstr "インストールされていません"
 
-#: cups/http-support.c:1296
 msgid "Not Modified"
 msgstr "変更されていません"
 
-#: cups/http-support.c:1324
 msgid "Not Supported"
 msgstr "サポートされていません"
 
-#: scheduler/ipp.c:1518 scheduler/ipp.c:10666
 msgid "Not allowed to print."
 msgstr "印刷が許可されていません。"
 
-#: ppdc/sample.c:146
 msgid "Note"
 msgstr "注意"
 
-#: systemv/cupstestdsc.c:433
 msgid ""
 "Note: this program only validates the DSC comments, not the PostScript "
 "itself."
-msgstr "注意: このプログラムは DSC コメントを検証するだけで、PostScript 自身を検証するものではありません。"
+msgstr ""
+"注意: このプログラムは DSC コメントを検証するだけで、PostScript 自身を検証す"
+"るものではありません。"
 
-#: cups/http-support.c:1278 cups/ppd.c:338
 msgid "OK"
 msgstr "OK"
 
-#: ppdc/sample.c:271
 msgid "Off (1-Sided)"
 msgstr "Off (片面)"
 
-#: ppdc/sample.c:361
 msgid "Oki"
 msgstr "Oki"
 
-#: cgi-bin/help.c:91 cgi-bin/help.c:132 cgi-bin/help.c:142 cgi-bin/help.c:172
 msgid "Online Help"
 msgstr "オンラインヘルプ"
 
-#: cups/adminutil.c:955
 #, c-format
 msgid "Open of %s failed: %s"
 msgstr "%s のオープンに失敗しました: %s"
 
-#: cups/ppd.c:346
 msgid "OpenGroup without a CloseGroup first"
 msgstr "OpenGroup の前にまず CloseGroup が必要です"
 
-#: cups/ppd.c:348
 msgid "OpenUI/JCLOpenUI without a CloseUI/JCLCloseUI first"
 msgstr "OpenUI/JCLOpenUI の前にまず CloseUI/JCLCloseUI が必要です"
 
-#: cgi-bin/admin.c:3631
 msgid "Operation Policy"
 msgstr "操作ポリシー"
 
-#: filter/pstops.c:2205
 #, c-format
 msgid "Option \"%s\" cannot be included via %%%%IncludeFeature."
 msgstr "オプション \"%s\" は %%%%IncludeFeature 経由で含めることはできません。"
 
-#: cgi-bin/admin.c:3281 cgi-bin/admin.c:3365
 msgid "Options Installed"
 msgstr "インストールされたオプション"
 
-#: scheduler/cupsfilter.c:1430 scheduler/main.c:2018 systemv/cupsaddsmb.c:284
-#: systemv/cupsctl.c:203 systemv/cupstestdsc.c:429 systemv/cupstestppd.c:3797
-#: test/ipptool.c:4403 ppdc/ppdc.cxx:437 ppdc/ppdhtml.cxx:174
-#: ppdc/ppdi.cxx:130 ppdc/ppdmerge.cxx:369 ppdc/ppdpo.cxx:254
 msgid "Options:"
 msgstr "オプション:"
 
-#: cups/ppd-cache.c:156
 msgid "Out of date PPD cache file."
 msgstr "PPD キャッシュファイルが古すぎます。"
 
-#: cups/ppd-cache.c:1381
 msgid "Out of memory."
 msgstr "メモリーが足りません。"
 
-#: cups/ppd.c:795 cups/ppd.c:1363
 msgid "Output Mode"
 msgstr "出力モード"
 
-#: systemv/lpstat.c:1191 systemv/lpstat.c:1195
 #, c-format
 msgid "Output for printer %s is sent to %s"
 msgstr "プリンター %s の出力は %s に送られます"
 
-#: systemv/lpstat.c:1185
 #, c-format
 msgid "Output for printer %s is sent to remote printer %s on %s"
 msgstr "プリンター %s の出力は、リモートプリンター %s (%s 上) に送られます"
 
-#: systemv/lpstat.c:1209 systemv/lpstat.c:1213
 #, c-format
 msgid "Output for printer %s/%s is sent to %s"
 msgstr "プリンター %s/%s の出力は %s に送られます"
 
-#: systemv/lpstat.c:1203
 #, c-format
 msgid "Output for printer %s/%s is sent to remote printer %s on %s"
 msgstr "プリンター %s/%s の出力は、リモートプリンター %s (%s 上) に送られます"
 
-#: systemv/cupstestdsc.c:399
 msgid "PASS"
 msgstr "合格"
 
-#: ppdc/sample.c:260
 msgid "PCL Laser Printer"
 msgstr "PCL レーザープリンター"
 
-#: ppdc/sample.c:149
 msgid "PRC16K"
 msgstr "PRC16K"
 
-#: ppdc/sample.c:150
 msgid "PRC16K Long Edge"
 msgstr "PRC16K 長辺送り"
 
-#: ppdc/sample.c:151
 msgid "PRC32K"
 msgstr "PRC32K"
 
-#: ppdc/sample.c:154
 msgid "PRC32K Long Edge"
 msgstr "PRC32K 長辺送り"
 
-#: ppdc/sample.c:152
 msgid "PRC32K Oversize"
 msgstr "PRC32K (特大)"
 
-#: ppdc/sample.c:153
 msgid "PRC32K Oversize Long Edge"
 msgstr "PRC32K (特大) 長辺送り"
 
-#: cups/snmp.c:1014
 msgid "Packet does not contain a Get-Response-PDU"
 msgstr "パケットが Get-Response-PDU を含んでいません"
 
-#: cups/snmp.c:993
 msgid "Packet does not start with SEQUENCE"
 msgstr "パケットが SEQUENCE から始まりません"
 
-#: ppdc/sample.c:360
 msgid "ParamCustominCutInterval"
 msgstr "ParamCustominCutInterval"
 
-#: ppdc/sample.c:358
 msgid "ParamCustominTearInterval"
 msgstr "ParamCustominTearInterval"
 
-#: cups/auth.c:199 cups/auth.c:367
 #, c-format
 msgid "Password for %s on %s? "
 msgstr "%s のパスワード (%s 上)? "
 
-#: systemv/cupsaddsmb.c:252
 #, c-format
 msgid "Password for %s required to access %s via SAMBA: "
 msgstr "%s のパスワード (SAMBA 経由で %s にアクセスするのに必要):"
 
-#: cgi-bin/classes.c:167
 msgid "Pause Class"
 msgstr "クラスの休止"
 
-#: cgi-bin/printers.c:170
 msgid "Pause Printer"
 msgstr "プリンターの休止"
 
-#: ppdc/sample.c:448
 msgid "Peel-Off"
 msgstr "Peel-Off"
 
-#: ppdc/sample.c:160
 msgid "Photo"
 msgstr "写真"
 
-#: ppdc/sample.c:161
 msgid "Photo Labels"
 msgstr "写真ラベル"
 
-#: ppdc/sample.c:286
 msgid "Plain Paper"
 msgstr "普通紙"
 
-#: cgi-bin/admin.c:3299 cgi-bin/admin.c:3580
 msgid "Policies"
 msgstr "ポリシー"
 
-#: cgi-bin/admin.c:3306 cgi-bin/admin.c:3649 cgi-bin/admin.c:3662
 msgid "Port Monitor"
 msgstr "ポートモニター"
 
-#: ppdc/sample.c:278
 msgid "PostScript Printer"
 msgstr "PostScript プリンター"
 
-#: ppdc/sample.c:147
 msgid "Postcard"
 msgstr "ハガキ"
 
-#: ppdc/sample.c:71
 msgid "Postcard Double "
 msgstr "往復ハガキ"
 
-#: ppdc/sample.c:72
 msgid "Postcard Double Long Edge"
 msgstr "往復ハガキ 長辺送り"
 
-#: ppdc/sample.c:148
 msgid "Postcard Long Edge"
 msgstr "ハガキ 長辺送り"
 
-#: ppdc/sample.c:295
 msgid "Print Density"
 msgstr "印刷密度"
 
-#: cups/notify.c:82
 msgid "Print Job:"
 msgstr "ジョブの印刷:"
 
-#: ppdc/sample.c:340
 msgid "Print Mode"
 msgstr "印刷モード"
 
-#: ppdc/sample.c:383
 msgid "Print Rate"
 msgstr "印刷レート"
 
-#: cgi-bin/printers.c:179
 msgid "Print Self-Test Page"
 msgstr "自己テストページの印刷"
 
-#: ppdc/sample.c:327
 msgid "Print Speed"
 msgstr "印刷速度"
 
-#: cgi-bin/ipp-var.c:792
 msgid "Print Test Page"
 msgstr "テストページの印刷"
 
-#: ppdc/sample.c:356
 msgid "Print and Cut"
 msgstr "プリントしてカット"
 
-#: ppdc/sample.c:344
 msgid "Print and Tear"
 msgstr "プリントして切り取る"
 
-#: backend/ipp.c:1537
 #, c-format
 msgid "Print file accepted - job ID %d."
 msgstr "プリントファイルを受け付けました - ジョブ ID %d。"
 
-#: backend/ipp.c:1527
 msgid "Print file accepted - job ID unknown."
 msgstr "NOTICE: プリントファイルを受け付けました - ジョブ ID 不明。"
 
-#: backend/socket.c:424 backend/usb-unix.c:191
 msgid "Print file sent."
 msgstr "プリントファイルが送られました。"
 
-#: backend/ipp.c:1488
 msgid "Print file was not accepted."
 msgstr "プリントファイルが受け付けられませんでした。"
 
-#: backend/ipp.c:1895
 msgid "Print job canceled at printer."
 msgstr "印刷ジョブはプリンターでキャンセルされました。"
 
-#: backend/ipp.c:1890
 msgid "Print job too large."
 msgstr "印刷ジョブが大きすぎます。"
 
-#: cgi-bin/ipp-var.c:1047
 msgid "Printer Added"
 msgstr "追加されたプリンター"
 
-#: ppdc/sample.c:263
 msgid "Printer Default"
 msgstr "デフォルトのプリンター"
 
-#: cgi-bin/ipp-var.c:1051
 msgid "Printer Deleted"
 msgstr "削除されたプリンター"
 
-#: cgi-bin/ipp-var.c:1049
 msgid "Printer Modified"
 msgstr "変更されたプリンター"
 
-#: cgi-bin/ipp-var.c:1045
 msgid "Printer Paused"
 msgstr "プリンターの休止"
 
-#: ppdc/sample.c:294
 msgid "Printer Settings"
 msgstr "プリンター設定"
 
-#: backend/ipp.c:1893
 msgid "Printer cannot print supplied content."
 msgstr "プリンターは受信した内容を印刷できませんでした。"
 
-#: cups/notify.c:126
 msgid "Printer:"
 msgstr "プリンター:"
 
-#: cgi-bin/printers.c:204 cgi-bin/printers.c:332
 msgid "Printers"
 msgstr "プリンター"
 
-#: filter/rastertoepson.c:1093 filter/rastertohp.c:817
-#: filter/rastertolabel.c:1249
 #, c-format
 msgid "Printing page %d, %d%% complete."
 msgstr "ページ %d を印刷中、%d%% 完了しました。"
 
-#: cgi-bin/classes.c:173 cgi-bin/printers.c:176
 msgid "Purge Jobs"
 msgstr "ジョブの削除"
 
-#: ppdc/sample.c:155
 msgid "Quarto"
 msgstr "Quarto"
 
-#: scheduler/ipp.c:1513 scheduler/ipp.c:10661
 msgid "Quota limit reached."
 msgstr "クォータの制限に達しました。"
 
-#: berkeley/lpq.c:515
 msgid "Rank    Owner   Job     File(s)                         Total Size"
 msgstr "ランク  所有者  ジョブ  ファイル                        合計サイズ"
 
 #. TRANSLATORS: Pri is job priority.
-#: berkeley/lpq.c:511
 msgid ""
 "Rank   Owner      Pri  Job        Files                       Total Size"
-msgstr "ランク 所有者     優先 ジョブ     ファイル                    合計サイズ"
+msgstr ""
+"ランク 所有者     優先 ジョブ     ファイル                    合計サイズ"
 
-#: cgi-bin/classes.c:171 cgi-bin/printers.c:174
 msgid "Reject Jobs"
 msgstr "ジョブの拒否"
 
-#: backend/lpd.c:1016 backend/lpd.c:1148
 #, c-format
 msgid "Remote host did not accept control file (%d)."
 msgstr "リモートホストがコントロールファイルを受け付けませんでした (%d)。"
 
-#: backend/lpd.c:1101
 #, c-format
 msgid "Remote host did not accept data file (%d)."
 msgstr "リモートホストがデータファイルを受け付けませんでした (%d)。"
 
-#: ppdc/sample.c:428
 msgid "Reprint After Error"
 msgstr "エラー後の再印刷"
 
-#: cups/http-support.c:1312
 msgid "Request Entity Too Large"
 msgstr "要求するエンティティが大きすぎます"
 
-#: cups/ppd.c:797 cups/ppd.c:1365 ppdc/sample.c:231
 msgid "Resolution"
 msgstr "解像度"
 
-#: cgi-bin/classes.c:165
 msgid "Resume Class"
 msgstr "クラスを再開する"
 
-#: cgi-bin/printers.c:167
 msgid "Resume Printer"
 msgstr "プリンターを再開する"
 
-#: ppdc/sample.c:165
 msgid "Return Address"
 msgstr "返信用ラベル"
 
-#: ppdc/sample.c:449
 msgid "Rewind"
 msgstr "巻き取り"
 
-#: cups/adminutil.c:2052
 #, c-format
 msgid "Running command: %s %s -N -A %s -c '%s'"
 msgstr "コマンドを実行中: %s %s -N -A %s -c '%s'"
 
-#: cups/snmp.c:995
 msgid "SEQUENCE uses indefinite length"
 msgstr "SEQUENCE は不定長を使用しています"
 
-#: cups/http-support.c:1336
 msgid "SSL/TLS Negotiation Error"
 msgstr "SSL/TLS のネゴシエーションエラー"
 
-#: cups/http-support.c:1293
 msgid "See Other"
 msgstr "残りを見てください"
 
-#: backend/usb-darwin.c:543 backend/usb-libusb.c:273
 msgid "Sending data to printer."
 msgstr "データをプリンターに送信しています。"
 
-#: cgi-bin/ipp-var.c:1061
 msgid "Server Restarted"
 msgstr "再起動されたサーバー"
 
-#: cgi-bin/ipp-var.c:1067
 msgid "Server Security Auditing"
 msgstr "サーバーのセキュリティー監査"
 
-#: cgi-bin/ipp-var.c:1063
 msgid "Server Started"
 msgstr "開始されたサーバー"
 
-#: cgi-bin/ipp-var.c:1065
 msgid "Server Stopped"
 msgstr "停止されたサーバー"
 
-#: cups/http-support.c:1330
 msgid "Service Unavailable"
 msgstr "利用できないサービス"
 
-#: cgi-bin/admin.c:2786 cgi-bin/admin.c:2832 cgi-bin/admin.c:2989
-#: cgi-bin/admin.c:3008
 msgid "Set Allowed Users"
 msgstr "許可するユーザーの設定"
 
-#: cgi-bin/admin.c:3035
 msgid "Set As Server Default"
 msgstr "サーバーのデフォルトに設定"
 
-#: cgi-bin/admin.c:3135
 msgid "Set Class Options"
 msgstr "クラスオプションの設定"
 
-#: cgi-bin/admin.c:3135 cgi-bin/admin.c:3309 cgi-bin/admin.c:3691
 msgid "Set Printer Options"
 msgstr "プリンターオプションの設定"
 
-#: cgi-bin/admin.c:3861 cgi-bin/admin.c:3905 cgi-bin/admin.c:3923
 msgid "Set Publishing"
 msgstr "公開の設定"
 
-#: ppdc/sample.c:166
 msgid "Shipping Address"
 msgstr "発送先ラベル"
 
-#: ppdc/sample.c:273
 msgid "Short-Edge (Landscape)"
 msgstr "短辺 (横原稿)"
 
-#: ppdc/sample.c:288
 msgid "Special Paper"
 msgstr "特殊紙"
 
-#: backend/lpd.c:1057
 #, c-format
 msgid "Spooling job, %.0f%% complete."
 msgstr "ジョブをスプール中、%.0f%% 完了しました。"
 
-#: ppdc/sample.c:341
 msgid "Standard"
 msgstr "標準"
 
 #. TRANSLATORS: Banner/cover sheet before the print job.
-#: cgi-bin/admin.c:3552
 msgid "Starting Banner"
 msgstr "開始バナー"
 
-#: filter/rastertoepson.c:1069 filter/rastertohp.c:793
-#: filter/rastertolabel.c:1225
 #, c-format
 msgid "Starting page %d."
 msgstr "ページ %d を開始しています。"
 
-#: ppdc/sample.c:156
 msgid "Statement"
 msgstr "記述"
 
-#: ppdc/sample.c:251
 msgid "Stylus Color Series"
 msgstr "Stylus Color シリーズ"
 
-#: ppdc/sample.c:257
 msgid "Stylus Photo Series"
 msgstr "Stylus Photo シリーズ"
 
-#: scheduler/ipp.c:3549 scheduler/ipp.c:6689 scheduler/ipp.c:7388
-#: scheduler/ipp.c:8887
 #, c-format
 msgid "Subscription #%d does not exist."
 msgstr "サブスクリプション番号 %d は存在しません。"
 
-#: ppdc/sample.c:157
 msgid "Super A"
 msgstr "スーパー A"
 
-#: ppdc/sample.c:158
 msgid "Super B"
 msgstr "スーパー B"
 
-#: ppdc/sample.c:162
 msgid "Super B/A3"
 msgstr "スーパー B/A3"
 
-#: cups/http-support.c:1275
 msgid "Switching Protocols"
 msgstr "プロトコルの変更"
 
-#: ppdc/sample.c:159
 msgid "Tabloid"
 msgstr "タブロイド"
 
-#: ppdc/sample.c:45
 msgid "Tabloid Oversize"
 msgstr "タブロイド (特大)"
 
-#: ppdc/sample.c:46
 msgid "Tabloid Oversize Long Edge"
 msgstr "タブロイド (特大) 長辺送り"
 
-#: ppdc/sample.c:342
 msgid "Tear"
 msgstr "Tear"
 
-#: ppdc/sample.c:447
 msgid "Tear-Off"
 msgstr "Tear-Off"
 
-#: ppdc/sample.c:388
 msgid "Tear-Off Adjust Position"
 msgstr "Tear-Off 位置調節"
 
-#: scheduler/ipp.c:6393 scheduler/ipp.c:6471 scheduler/ipp.c:6487
-#: scheduler/ipp.c:6505
 #, c-format
 msgid "The %s attribute cannot be provided with job-ids."
 msgstr "%s 属性は、ジョブ ID と一緒に使うことはできません。"
 
-#: scheduler/ipp.c:5118
+#, c-format
+msgid ""
+"The '%s' Job Description attribute cannot be supplied in a job creation "
+"request."
+msgstr ""
+
 #, c-format
 msgid ""
 "The '%s' operation attribute cannot be supplied in a Create-Job request."
 msgstr "%s 操作属性は、Create-Job リクエストの中で使うことはできません。"
 
-#: scheduler/ipp.c:6919
 #, c-format
 msgid "The PPD file \"%s\" could not be found."
 msgstr "PPD ファイル \"%s\" が見つかりません。"
 
-#: scheduler/ipp.c:6906
 #, c-format
 msgid "The PPD file \"%s\" could not be opened: %s"
 msgstr "PPD ファイル \"%s\" を開けませんでした: %s"
 
-#: filter/rastertoepson.c:1038 filter/rastertohp.c:764
-#: filter/rastertolabel.c:1189
 msgid "The PPD file could not be opened."
 msgstr "PPD ファイルを開けませんでした。"
 
-#: cgi-bin/admin.c:749
 msgid ""
 "The class name may only contain up to 127 printable characters and may not "
 "contain spaces, slashes (/), or the pound sign (#)."
-msgstr "クラス名は 127 文字以内の表示可能文字からなり、空白、スラッシュ (/)、シャープ (#) を含んではなりません。"
+msgstr ""
+"クラス名は 127 文字以内の表示可能文字からなり、空白、スラッシュ (/)、シャー"
+"プ (#) を含んではなりません。"
 
-#: cups/localize.c:353
 msgid "The developer unit needs to be replaced."
 msgstr "現像ユニットの交換が必要です。"
 
-#: cups/localize.c:351
 msgid "The developer unit will need to be replaced soon."
 msgstr "もうすぐ現像ユニットの交換時期です。"
 
-#: cups/localize.c:343
 msgid "The fuser's temperature is high."
 msgstr "定着器の温度が高すぎます。"
 
-#: cups/localize.c:345
 msgid "The fuser's temperature is low."
 msgstr "定着器の温度が低すぎます。"
 
-#: scheduler/ipp.c:2097
 msgid ""
 "The notify-lease-duration attribute cannot be used with job subscriptions."
 msgstr ""
 "notify-lease-duration 属性は、ジョブサブスクリプションと一緒に使うことはでき"
 "ません。"
 
-#: scheduler/ipp.c:2080 scheduler/ipp.c:5653
 #, c-format
 msgid "The notify-user-data value is too large (%d > 63 octets)."
 msgstr "notify-user-data 値が大きすぎます (%d > 63 オクテット)。"
 
-#: cups/localize.c:349
 msgid "The optical photoconductor needs to be replaced."
 msgstr "感光体の交換が必要です。"
 
-#: cups/localize.c:347
 msgid "The optical photoconductor will need to be replaced soon."
 msgstr "もうすぐ感光体の交換時期です。"
 
-#: cups/localize.c:331
 msgid "The output bin is almost full."
 msgstr "排紙トレイがほとんど一杯です。"
 
-#: cups/localize.c:333
 msgid "The output bin is full."
 msgstr "排紙トレイが一杯です。"
 
-#: cups/localize.c:329
 msgid "The output bin is missing."
 msgstr "排紙トレイが見つかりません。"
 
-#: cups/localize.c:325
 msgid "The paper tray is almost empty."
 msgstr "用紙トレイが空になりかけています。"
 
-#: cups/localize.c:327
 msgid "The paper tray is empty."
 msgstr "用紙トレイが空です。"
 
-#: cups/localize.c:323
 msgid "The paper tray is missing."
 msgstr "用紙トレイが見つかりません。"
 
-#: cups/localize.c:306
 msgid "The paper tray needs to be filled."
 msgstr "用紙トレイに補充が必要です。"
 
-#: backend/ipp.c:909
 msgid "The printer URI is incorrect or no longer exists."
 msgstr "プリンター URI が誤っているか、もう存在しません。"
 
-#: backend/lpd.c:619 backend/lpd.c:1009 backend/lpd.c:1091 backend/lpd.c:1141
 msgid "The printer did not respond."
 msgstr "プリンターが応答しません。"
 
-#: backend/ipp.c:892 backend/ipp.c:899
 #, c-format
 msgid "The printer does not support IPP/%d.%d, trying IPP/%s."
 msgstr "プリンターが IPP/%d.%d をサポートしていません。IPP/%s を試します。"
 
-#: backend/ipp.c:757 backend/ipp.c:874 backend/ipp.c:980 backend/ipp.c:1313
-#: backend/ipp.c:1464 backend/lpd.c:828 backend/socket.c:374
-#: backend/usb-unix.c:131 backend/usb-unix.c:424 backend/usb-unix.c:507
 msgid "The printer is in use."
 msgstr "プリンターは使用中です。"
 
-#: backend/runloop.c:254 backend/runloop.c:374 cups/localize.c:311
 msgid "The printer is not connected."
 msgstr "プリンターは接続されていません。"
 
-#: backend/ipp.c:735 backend/ipp.c:768 backend/ipp.c:870 backend/lpd.c:807
-#: backend/lpd.c:848 backend/socket.c:353 backend/socket.c:386
 msgid "The printer is not responding."
 msgstr "プリンターが応答していません。"
 
-#: backend/runloop.c:396
 msgid "The printer is now connected."
 msgstr "プリンターが接続されました。"
 
-#: backend/usb-darwin.c:1286
 msgid "The printer is now online."
 msgstr "プリンターは現在オンラインです。"
 
-#: backend/usb-darwin.c:1307
 msgid "The printer is offline."
 msgstr "プリンターはオフラインです。"
 
-#: cups/localize.c:335
 msgid "The printer is running low on ink."
 msgstr "プリンターのインクがもうすぐなくなります。"
 
-#: cups/localize.c:313
 msgid "The printer is running low on toner."
 msgstr "プリンターのトナーがもうすぐなくなります。"
 
-#: backend/ipp.c:750 backend/lpd.c:821 backend/socket.c:367
 msgid "The printer is unreachable at this time."
 msgstr "プリンターには現在到達できません。"
 
-#: cups/localize.c:337
 msgid "The printer may be out of ink."
 msgstr "プリンターのインクがなくなっているようです。"
 
-#: cups/localize.c:315
 msgid "The printer may be out of toner."
 msgstr "プリンターのトナーがなくなっているようです。"
 
-#: backend/ipp.c:744 backend/lpd.c:815 backend/socket.c:361
 msgid "The printer may not exist or is unavailable at this time."
 msgstr "プリンターは現在存在しないか、使用できないようです。"
 
-#: cgi-bin/admin.c:931
 msgid ""
 "The printer name may only contain up to 127 printable characters and may not "
 "contain spaces, slashes (/), or the pound sign (#)."
@@ -5031,65 +3914,46 @@ msgstr ""
 "プリンター名は 127 文字以内の表示可能文字から成り、空白、スラッシュ (/)、ポン"
 "ド記号 (#) を含んではなりません。"
 
-#: scheduler/ipp.c:876 scheduler/ipp.c:1136 scheduler/ipp.c:3198
-#: scheduler/ipp.c:3369 scheduler/ipp.c:5101 scheduler/ipp.c:5487
-#: scheduler/ipp.c:5801 scheduler/ipp.c:6359 scheduler/ipp.c:7124
-#: scheduler/ipp.c:7180 scheduler/ipp.c:7494 scheduler/ipp.c:7760
-#: scheduler/ipp.c:7849 scheduler/ipp.c:7882 scheduler/ipp.c:8205
-#: scheduler/ipp.c:8598 scheduler/ipp.c:8679 scheduler/ipp.c:9840
-#: scheduler/ipp.c:10294 scheduler/ipp.c:10624 scheduler/ipp.c:10706
-#: scheduler/ipp.c:10998
 msgid "The printer or class does not exist."
 msgstr "プリンターまたはクラスは存在しません。"
 
-#: scheduler/ipp.c:1304
 msgid "The printer or class is not shared."
 msgstr "プリンターまたはクラスは共有できません。"
 
-#: cups/localize.c:317
 msgid "The printer's cover is open."
 msgstr "プリンターのカバーが開いています。"
 
-#: cups/localize.c:321
 msgid "The printer's door is open."
 msgstr "プリンターのドアが開いています。"
 
-#: cups/localize.c:319
 msgid "The printer's interlock is open."
 msgstr "プリンターのインターロックが開いています。"
 
-#: cups/localize.c:339
 msgid "The printer's waste bin is almost full."
 msgstr "プリンターの廃インクまたは廃トナー容器がほとんど一杯です。"
 
-#: cups/localize.c:341
 msgid "The printer's waste bin is full."
 msgstr "プリンターの廃インクまたは廃トナー容器が一杯です。"
 
-#: scheduler/ipp.c:982 scheduler/ipp.c:2261
 #, c-format
 msgid "The printer-uri \"%s\" contains invalid characters."
 msgstr "printer-uri \"%s\" には、無効な文字が含まれています。"
 
-#: scheduler/ipp.c:3175
 msgid "The printer-uri attribute is required."
 msgstr "printer-uri 属性は必須です。"
 
-#: scheduler/ipp.c:966
 msgid ""
 "The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"."
 msgstr ""
 "printer-uri は、\"ipp://ホスト名/classes/クラス名\" 形式でなければなりませ"
 "ん。"
 
-#: scheduler/ipp.c:2245
 msgid ""
 "The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"."
 msgstr ""
 "printer-uri は \"ipp://ホスト名/printers/プリンター名\" 形式でなければなりま"
 "せん。"
 
-#: cgi-bin/admin.c:474
 msgid ""
 "The subscription name may not contain spaces, slashes (/), question marks "
 "(?), or the pound sign (#)."
@@ -5097,604 +3961,480 @@ msgstr ""
 "サブスクリプション名には、スペース、スラッシュ (/)、疑問府 (?)、ポンド記号 "
 "(#) を使用しないでください。"
 
-#: scheduler/client.c:2450
 msgid ""
 "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to "
 "enable it."
-msgstr "Web インターフェイスが現在無効になっています。有効にするには \"cupsctl WebInterface=yes\" を実行してください。"
+msgstr ""
+"Web インターフェイスが現在無効になっています。有効にするには \"cupsctl "
+"WebInterface=yes\" を実行してください。"
 
-#: scheduler/ipp.c:6454
 #, c-format
 msgid "The which-jobs value \"%s\" is not supported."
 msgstr "which-jobs の値 \"%s\" はサポートされていません。"
 
-#: scheduler/ipp.c:5731
 msgid "There are too many subscriptions."
 msgstr "サブスクリプションが多すぎます。"
 
-#: cups/localize.c:308
 msgid "There is a paper jam."
 msgstr "用紙づまりが発生しています。"
 
-#: backend/usb-darwin.c:379 backend/usb-darwin.c:438 backend/usb-darwin.c:505
-#: backend/usb-darwin.c:526 backend/usb-libusb.c:235 backend/usb-libusb.c:256
 msgid "There was an unrecoverable USB error."
 msgstr "回復不可能な USB のエラーが発生しています。"
 
-#: ppdc/sample.c:435
 msgid "Thermal Transfer Media"
 msgstr "熱転写メディア"
 
-#: scheduler/ipp.c:1507
 msgid "Too many active jobs."
 msgstr "アクティブなジョブが多すぎます。"
 
-#: scheduler/ipp.c:1401
 #, c-format
 msgid "Too many job-sheets values (%d > 2)."
 msgstr "job-sheets 値が多すぎます (%d > 2)。"
 
-#: scheduler/ipp.c:2529
 #, c-format
 msgid "Too many printer-state-reasons values (%d > %d)."
 msgstr "printer-state-reasons 値が多すぎます (%d > %d)。"
 
-#: ppdc/sample.c:289
 msgid "Transparency"
 msgstr "OHP シート"
 
-#: ppdc/sample.c:284
 msgid "Tray"
 msgstr "トレイ"
 
-#: ppdc/sample.c:264
 msgid "Tray 1"
 msgstr "トレイ 1"
 
-#: ppdc/sample.c:265
 msgid "Tray 2"
 msgstr "トレイ 2"
 
-#: ppdc/sample.c:266
 msgid "Tray 3"
 msgstr "トレイ 3"
 
-#: ppdc/sample.c:267
 msgid "Tray 4"
 msgstr "トレイ 4"
 
-#: cups/http-support.c:1315
 msgid "URI Too Long"
 msgstr "URI が長すぎます"
 
-#: ppdc/sample.c:138
 msgid "US Ledger"
 msgstr "US レジャー"
 
-#: ppdc/sample.c:139
 msgid "US Legal"
 msgstr "US リーガル"
 
-#: ppdc/sample.c:140
 msgid "US Legal Oversize"
 msgstr "US リーガル (特大)"
 
-#: ppdc/sample.c:141
 msgid "US Letter"
 msgstr "US レター"
 
-#: ppdc/sample.c:142
 msgid "US Letter Long Edge"
 msgstr "US レター 長辺送り"
 
-#: ppdc/sample.c:143
 msgid "US Letter Oversize"
 msgstr "US レター (特大)"
 
-#: ppdc/sample.c:144
 msgid "US Letter Oversize Long Edge"
 msgstr "US レター (特大) 長辺送り"
 
-#: ppdc/sample.c:145
 msgid "US Letter Small"
 msgstr "US レター (小)"
 
-#: cgi-bin/admin.c:1959 cgi-bin/admin.c:1972 cgi-bin/admin.c:1996
 msgid "Unable to access cupsd.conf file"
 msgstr "cupsd.conf ファイルにアクセスできません"
 
-#: cgi-bin/help.c:133
 msgid "Unable to access help file."
 msgstr "ヘルプファイルにアクセスできません。"
 
-#: cgi-bin/admin.c:526
 msgid "Unable to add RSS subscription"
 msgstr " RSS 購読を追加できません"
 
-#: cgi-bin/admin.c:814
 msgid "Unable to add class"
 msgstr "クラスを追加できません"
 
-#: backend/ipp.c:1635
 msgid "Unable to add document to print job."
 msgstr "ドキュメントを印刷ジョブに追加できません。"
 
-#: scheduler/ipp.c:1548
 #, c-format
 msgid "Unable to add job for destination \"%s\"."
 msgstr "宛先 \"%s\"にジョブを追加できません。"
 
-#: cgi-bin/admin.c:1059 cgi-bin/admin.c:1419
 msgid "Unable to add printer"
 msgstr "プリンターを追加できません"
 
-#: scheduler/ipp.c:1246
 msgid "Unable to allocate memory for file types."
 msgstr "ファイルタイプ用にメモリーを割り当てられません。"
 
-#: filter/pstops.c:451
 msgid "Unable to allocate memory for page info"
 msgstr "ページ情報のメモリー割り当てができません"
 
-#: filter/pstops.c:445
 msgid "Unable to allocate memory for pages array"
 msgstr "ページアレイのメモリー割り当てができません"
 
-#: cgi-bin/admin.c:1525
 msgid "Unable to cancel RSS subscription"
 msgstr "RSS 購読をキャンセルできません"
 
-#: backend/ipp.c:1942
 msgid "Unable to cancel print job."
 msgstr "プリンターを変更できません。"
 
-#: cgi-bin/admin.c:2990
 msgid "Unable to change printer"
 msgstr "プリンターを変更できません"
 
-#: cgi-bin/admin.c:3906
 msgid "Unable to change printer-is-shared attribute"
 msgstr "printer-is-shared 属性を変更することができません"
 
-#: cgi-bin/admin.c:1657 cgi-bin/admin.c:1799
 msgid "Unable to change server settings"
 msgstr "サーバーの設定を変更できません"
 
-#: filter/commandtops.c:420
 msgid "Unable to configure printer options."
 msgstr "プリンターオプションを設定できません。"
 
-#: cups/adminutil.c:911 cups/request.c:1016
 msgid "Unable to connect to host."
 msgstr "ホストに接続できません。"
 
-#: backend/ipp.c:713 backend/ipp.c:1138 backend/lpd.c:787 backend/socket.c:333
-#: backend/usb-unix.c:117
 msgid "Unable to contact printer, queuing on next printer in class."
 msgstr "プリンターと交信できません。クラス内の次のプリンターにキューします。"
 
-#: cups/adminutil.c:726
 #, c-format
 msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
 msgstr "64-bit 版の CUPS プリンタードライバーファイルをコピーできません (%d)。"
 
-#: cups/adminutil.c:691
 #, c-format
 msgid "Unable to copy 64-bit Windows printer driver files (%d)."
 msgstr "64-bit 版の Windows プリンタードライバーをコピーできません (%d)。"
 
-#: cups/adminutil.c:522
 #, c-format
 msgid "Unable to copy CUPS printer driver files (%d)."
 msgstr "複数の CUPS プリンタードライバーファイルをコピーできません (%d)。"
 
-#: scheduler/ipp.c:2649
 #, c-format
 msgid "Unable to copy PPD file - %s"
 msgstr "PPD ファイルをコピーできません - %s"
 
-#: scheduler/ipp.c:2704
 msgid "Unable to copy PPD file."
 msgstr "PPD ファイルをコピーできません。"
 
-#: cups/adminutil.c:487
 #, c-format
 msgid "Unable to copy Windows 2000 printer driver files (%d)."
 msgstr ""
 "複数の Windows 2000 プリンタードライバーファイルをコピーできません (%d)。"
 
-#: cups/adminutil.c:610
 #, c-format
 msgid "Unable to copy Windows 9x printer driver files (%d)."
-msgstr "複数の Windows 9x プリンタードライバーファイルをコピーできません (%d)。"
+msgstr ""
+"複数の Windows 9x プリンタードライバーファイルをコピーできません (%d)。"
 
-#: scheduler/ipp.c:2626
 #, c-format
 msgid "Unable to copy interface script - %s"
 msgstr "インターフェイススクリプトをコピーできません - %s"
 
-#: backend/ipp.c:2034
 msgid "Unable to create compressed print file"
 msgstr "圧縮プリントファイルを作成できません"
 
-#: cups/util.c:602 cups/util.c:1656
 msgid "Unable to create printer-uri"
 msgstr "printer-uri を作成できません。"
 
-#: cgi-bin/admin.c:1850 cgi-bin/admin.c:1862 scheduler/cupsfilter.c:1236
 msgid "Unable to create temporary file"
 msgstr "テンポラリーファイルを作成できません"
 
-#: cgi-bin/admin.c:2153
 msgid "Unable to delete class"
 msgstr "クラスを削除できません"
 
-#: cgi-bin/admin.c:2238
 msgid "Unable to delete printer"
 msgstr "プリンターを削除できません"
 
-#: cgi-bin/classes.c:260 cgi-bin/printers.c:269
 msgid "Unable to do maintenance command"
 msgstr "メンテナンスコマンドを実行できません"
 
-#: cgi-bin/admin.c:1974
 msgid "Unable to edit cupsd.conf files larger than 1MB"
 msgstr "1MB 以上の cupsd.conf ファイルは編集できません。"
 
-#: cups/http.c:4272
 msgid ""
 "Unable to establish a secure connection to host (certificate chain invalid)."
 msgstr "ホストへの安全な接続が確立できません (認証パスが無効です)。"
 
-#: cups/http.c:4262
 msgid ""
 "Unable to establish a secure connection to host (certificate not yet valid)."
 msgstr "ホストへの安全な接続が確立できません (認証がまだ有効ではありません)。"
 
-#: cups/http.c:4257
 msgid "Unable to establish a secure connection to host (expired certificate)."
 msgstr "ホストへの安全な接続が確立できません (認証が期限切れです)。"
 
-#: cups/http.c:4267
 msgid "Unable to establish a secure connection to host (host name mismatch)."
 msgstr "ホストへの安全な接続が確立できません (ホスト名が一致しません)。"
 
-#: cups/http.c:4277
 msgid ""
 "Unable to establish a secure connection to host (peer dropped connection "
 "before responding)."
-msgstr "ホストへの安全な接続が確立できません (応答がある前に接続が切断されました)。"
+msgstr ""
+"ホストへの安全な接続が確立できません (応答がある前に接続が切断されました)。"
 
-#: cups/http.c:4252
 msgid ""
 "Unable to establish a secure connection to host (self-signed certificate)."
 msgstr "ホストへの安全な接続が確立できません (自己署名証明書です)。"
 
-#: cups/http.c:4247
 msgid ""
 "Unable to establish a secure connection to host (untrusted certificate)."
 msgstr "ホストへの安全な接続が確立できません (信用できない証明書です)。"
 
-#: cups/http.c:4008 cups/http.c:4304 cups/http.c:4337 cups/http.c:4354
 msgid "Unable to establish a secure connection to host."
 msgstr "ホストへの安全な接続を確立できません。"
 
-#: cgi-bin/ipp-var.c:365
 msgid "Unable to find destination for job"
 msgstr "ジョブの宛先が見つかりません"
 
-#: cups/http-support.c:1748
 msgid "Unable to find printer."
 msgstr "プリンターが見つかりません。"
 
-#: backend/ipp.c:2056
 msgid "Unable to generate compressed print file"
 msgstr "圧縮プリントファイルを生成できません"
 
-#: backend/ipp.c:3009
 msgid "Unable to get backend exit status."
 msgstr "バックエンドの終了ステータスを取得できません。"
 
-#: cgi-bin/classes.c:450
 msgid "Unable to get class list"
 msgstr "クラスリストを取得できません"
 
-#: cgi-bin/classes.c:549
 msgid "Unable to get class status"
 msgstr "クラスの状態を取得できません。"
 
-#: cgi-bin/admin.c:1320
 msgid "Unable to get list of printer drivers"
 msgstr "プリンタードライバーのリストを取得できません"
 
-#: cgi-bin/admin.c:2840
 msgid "Unable to get printer attributes"
 msgstr "プリンター属性を取得できません"
 
-#: cgi-bin/printers.c:467
 msgid "Unable to get printer list"
 msgstr "プリンターリストを取得できません"
 
-#: cgi-bin/printers.c:569
 msgid "Unable to get printer status"
 msgstr "プリンターの状態を取得できません"
 
-#: backend/ipp.c:933
 msgid "Unable to get printer status."
 msgstr "プリンターの状態を取得できません。"
 
-#: cups/adminutil.c:565 cups/adminutil.c:769
 #, c-format
 msgid "Unable to install Windows 2000 printer driver files (%d)."
-msgstr "複数の Windows 2000 プリンタードライバーファイルをインストールできません (%d)。"
+msgstr ""
+"複数の Windows 2000 プリンタードライバーファイルをインストールできません "
+"(%d)。"
 
-#: cups/adminutil.c:639
 #, c-format
 msgid "Unable to install Windows 9x printer driver files (%d)."
 msgstr ""
 "複数の Windows 9x プリンタードライバーファイルをインストールできません (%d)。"
 
-#: cgi-bin/help.c:92
 msgid "Unable to load help index."
 msgstr "ヘルプの索引を読み込めません。"
 
-#: backend/ipp.c:642 backend/lpd.c:421 backend/socket.c:275
 #, c-format
 msgid "Unable to locate printer \"%s\"."
 msgstr "プリンター \"%s\" が見つかりません。"
 
-#: backend/dnssd.c:781 backend/ipp.c:324 backend/lpd.c:204
-#: backend/socket.c:171
 msgid "Unable to locate printer."
 msgstr "プリンターが見つかりません。"
 
-#: cgi-bin/admin.c:813
 msgid "Unable to modify class"
 msgstr "クラスを変更できません"
 
-#: cgi-bin/admin.c:1058 cgi-bin/admin.c:1418
 msgid "Unable to modify printer"
 msgstr "プリンターを変更できません"
 
-#: cgi-bin/ipp-var.c:432 cgi-bin/ipp-var.c:521
 msgid "Unable to move job"
 msgstr "ジョブを移動できません"
 
-#: cgi-bin/ipp-var.c:434 cgi-bin/ipp-var.c:523
 msgid "Unable to move jobs"
 msgstr "複数のジョブを移動できません"
 
-#: cgi-bin/admin.c:3186 cups/ppd.c:339
 msgid "Unable to open PPD file"
 msgstr "PPD ファイルを読み込むことができません"
 
-#: backend/ipp.c:2040
 msgid "Unable to open compressed print file"
 msgstr "圧縮プリントファイルを開けません"
 
-#: cgi-bin/admin.c:2608
 msgid "Unable to open cupsd.conf file:"
 msgstr "cupsd.conf ファイルを開けません:"
 
-#: backend/usb-unix.c:141
 msgid "Unable to open device file"
 msgstr "デバイスファイルを開けません"
 
-#: scheduler/ipp.c:6140
 #, c-format
 msgid "Unable to open document #%d in job #%d."
 msgstr "ドキュメント %d (ジョブ %d) を開けません。"
 
-#: cgi-bin/help.c:364
 msgid "Unable to open help file."
 msgstr "ヘルプファイルを読み込むことができません。"
 
-#: backend/ipp.c:365 backend/ipp.c:1398 backend/ipp.c:1594 backend/ipp.c:2046
-#: backend/lpd.c:488 backend/socket.c:158 backend/usb.c:237
-#: filter/gziptoany.c:71 filter/pstops.c:300
 msgid "Unable to open print file"
 msgstr "印刷ファイルを開けません"
 
-#: filter/rastertoepson.c:998 filter/rastertohp.c:724
-#: filter/rastertolabel.c:1147
 msgid "Unable to open raster file"
 msgstr "ラスターファイルを開けません"
 
-#: cgi-bin/ipp-var.c:795
 msgid "Unable to print test page"
 msgstr "テストページを印刷できません"
 
-#: backend/runloop.c:96 backend/runloop.c:325 backend/usb-darwin.c:613
-#: backend/usb-darwin.c:657 backend/usb-libusb.c:343 backend/usb-libusb.c:378
 msgid "Unable to read print data."
 msgstr "プリントデータを読み込めません。"
 
-#: cups/dest.c:3402
 msgid "Unable to resolve printer URI."
 msgstr "プリンター URI を解決できません。"
 
-#: cups/adminutil.c:2088
 #, c-format
 msgid "Unable to run \"%s\": %s"
 msgstr "\"%s\" を実行できません: %s"
 
-#: filter/pstops.c:563
 msgid "Unable to see in file"
 msgstr "ファイルを読み込むことができません"
 
-#: cgi-bin/ipp-var.c:598 cgi-bin/ipp-var.c:618
 msgid "Unable to send command to printer driver"
 msgstr "プリンタードライバーにコマンドを送信できません"
 
-#: backend/usb-darwin.c:735 backend/usb-libusb.c:454
 msgid "Unable to send data to printer."
 msgstr "プリンターにデータを送信することができません。"
 
-#: cups/adminutil.c:821
 #, c-format
 msgid "Unable to set Windows printer driver (%d)."
 msgstr "Windows プリンタードライバーを設定できません (%d)。"
 
-#: cgi-bin/admin.c:3807
 msgid "Unable to set options"
 msgstr "オプションを設定できません"
 
-#: cgi-bin/admin.c:3077
 msgid "Unable to set server default"
 msgstr "サーバーをデフォルトに設定できません"
 
-#: backend/ipp.c:2868 backend/ipp.c:2945 backend/ipp.c:2953
 msgid "Unable to start backend process."
 msgstr "バックエンドのプロセスを起動できません。"
 
-#: cgi-bin/admin.c:1912
 msgid "Unable to upload cupsd.conf file"
 msgstr "cupsd.conf ファイルをアップロードできません"
 
-#: backend/usb-darwin.c:1985 backend/usb-darwin.c:2009
 msgid "Unable to use legacy USB class driver."
 msgstr "古いタイプの USB クラスドライバーは使用できません。"
 
-#: backend/runloop.c:125 backend/runloop.c:380
 msgid "Unable to write print data"
 msgstr "プリントデータを書き込めません"
 
-#: filter/gziptoany.c:90
 #, c-format
 msgid "Unable to write uncompressed print data: %s"
 msgstr "非圧縮のプリントデータを書き込めません: %s"
 
-#: cups/http-support.c:1303
 msgid "Unauthorized"
 msgstr "未許可"
 
-#: cgi-bin/admin.c:3503
 msgid "Units"
 msgstr "ユニット"
 
-#: cups/http-support.c:1343 cups/ppd.c:366
 msgid "Unknown"
 msgstr "未知"
 
-#: filter/pstops.c:2213
 #, c-format
 msgid "Unknown choice \"%s\" for option \"%s\"."
 msgstr "\"%s\" (オプション \"%s\" 用) は未知の設定です。"
 
-#: backend/ipp.c:507
 #, c-format
 msgid "Unknown encryption option value: \"%s\"."
 msgstr "\"%s\" は未知の暗号オプション値です。"
 
-#: backend/lpd.c:350
 #, c-format
 msgid "Unknown file order: \"%s\"."
 msgstr "\"%s\" は未知のファイルオーダーです。"
 
-#: backend/lpd.c:321
 #, c-format
 msgid "Unknown format character: \"%c\"."
 msgstr "\"%c\" は未知の書式文字です。"
 
-#: cups/dest-options.c:770
 msgid "Unknown media size name."
 msgstr "未知のメディアサイズ名称です。"
 
-#: backend/ipp.c:554
 #, c-format
 msgid "Unknown option \"%s\" with value \"%s\"."
 msgstr "\"%s\" (値 \"%s\") は未知のオプションです。"
 
-#: filter/pstops.c:2196
 #, c-format
 msgid "Unknown option \"%s\"."
 msgstr "\"%s\" は未知のオプションです。"
 
-#: backend/lpd.c:336
 #, c-format
 msgid "Unknown print mode: \"%s\"."
 msgstr "\"%s\" は未知のプリントモードです。"
 
-#: scheduler/ipp.c:10496
 #, c-format
 msgid "Unknown printer-error-policy \"%s\"."
 msgstr "\"%s\" は未知の printer-error-policy です。"
 
-#: scheduler/ipp.c:10479
 #, c-format
 msgid "Unknown printer-op-policy \"%s\"."
 msgstr "\"%s\" は未知の printer-op-policy です。"
 
-#: cups/http-addrlist.c:710
 msgid "Unknown service name."
 msgstr "未知のサービス名です。"
 
-#: backend/ipp.c:526
 #, c-format
 msgid "Unknown version option value: \"%s\"."
 msgstr "\"%s\" は未知のバージョンオプション値です。"
 
-#: scheduler/ipp.c:402
+#, c-format
+msgid "Unsupported 'compression' value \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unsupported 'document-format' value \"%s\"."
+msgstr ""
+
+msgid "Unsupported 'job-name' value."
+msgstr ""
+
 #, c-format
 msgid "Unsupported character set \"%s\"."
 msgstr "\"%s\" はサポートされていない文字セットです。"
 
-#: scheduler/ipp.c:8171 scheduler/ipp.c:9401 scheduler/ipp.c:10950
 #, c-format
 msgid "Unsupported compression \"%s\"."
 msgstr "\"%s\" はサポートされていない圧縮形式です。"
 
-#: scheduler/ipp.c:8305 scheduler/ipp.c:9551 scheduler/ipp.c:10979
 #, c-format
 msgid "Unsupported document-format \"%s\"."
 msgstr "\"%s\" はサポートされていない文書形式です。"
 
-#: scheduler/ipp.c:9534
 #, c-format
 msgid "Unsupported document-format \"%s/%s\"."
 msgstr "\"%s/%s\" はサポートされていない文書形式です。"
 
-#: scheduler/ipp.c:1367
 #, c-format
 msgid "Unsupported format \"%s\"."
 msgstr "\"%s\" はサポートされていない形式です。"
 
-#: scheduler/ipp.c:1465
 msgid "Unsupported margins."
 msgstr "サポートされていないマージンです。"
 
-#: cups/pwg-media.c:529
 msgid "Unsupported media value."
 msgstr "サポートされていないメディアの値です。"
 
-#: filter/pstops.c:2478
 #, c-format
 msgid "Unsupported number-up value %d, using number-up=1."
 msgstr "%d はサポートされていない number-up 値です。number-up=1 を使用します。"
 
-#: filter/pstops.c:2512
 #, c-format
 msgid "Unsupported number-up-layout value %s, using number-up-layout=lrtb."
-msgstr "%s はサポートされていない number-up-layout 値です。number-up-layout=lrtb を使用します。"
+msgstr ""
+"%s はサポートされていない number-up-layout 値です。number-up-layout=lrtb を使"
+"用します。"
 
-#: filter/pstops.c:2563
 #, c-format
 msgid "Unsupported page-border value %s, using page-border=none."
-msgstr "%s はサポートされていない page-border 値です。page-border=none を使用します。"
+msgstr ""
+"%s はサポートされていない page-border 値です。page-border=none を使用します。"
 
-#: filter/rastertopwg.c:147 filter/rastertopwg.c:155 filter/rastertopwg.c:164
 msgid "Unsupported raster data."
 msgstr "サポートされていないラスターデータです。"
 
-#: cups/snmp.c:1112
 msgid "Unsupported value type"
 msgstr "サポートされていない型の値です"
 
-#: cups/http-support.c:1318
 msgid "Upgrade Required"
 msgstr "アップグレードが必要です"
 
-#: systemv/lpadmin.c:668
 msgid ""
 "Usage:\n"
 "\n"
@@ -5709,53 +4449,44 @@ msgstr ""
 "\n"
 "    lpadmin [-h サーバー] -d 宛先\n"
 "    lpadmin [-h サーバー] -x 宛先\n"
-"    lpadmin [-h サーバー] -p プリンター [-c 追加クラス] [-i インターフェイス]\n"
+"    lpadmin [-h サーバー] -p プリンター [-c 追加クラス] [-i インターフェイ"
+"ス]\n"
 "                       [-m モデル] [-r 削除クラス] [-v デバイス]\n"
 "                       [-D 宛先] [-P PPD ファイル] [-o 名前=値]\n"
-"                       [-u allow:ユーザー,ユーザー] [-u deny:ユーザー,ユーザー]"
+"                       [-u allow:ユーザー,ユーザー] [-u deny:ユーザー,ユー"
+"ザー]"
 
-#: backend/dnssd.c:241 backend/ipp.c:313 backend/lpd.c:191
-#: backend/socket.c:135 backend/usb.c:183 filter/commandtops.c:74
-#: filter/gziptoany.c:50 filter/pstops.c:264 monitor/bcp.c:62
-#: monitor/tbcp.c:61
 #, c-format
 msgid "Usage: %s job-id user title copies options [file]"
 msgstr "使い方: %s ジョブID ユーザー タイトル コピー数 オプション [ファイル]"
 
-#: systemv/cupsaddsmb.c:281
 msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
 msgstr "Usage: cupsaddsmb [オプション] プリンター1 ... プリンターN"
 
-#: systemv/cupsctl.c:200
 msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
 msgstr "Usage: cupsctl [オプション] [パラメータ=値 ... パラメータN=値N]"
 
-#: scheduler/main.c:2017
 msgid "Usage: cupsd [options]"
 msgstr "使い方: cupsd [オプション]"
 
-#: scheduler/cupsfilter.c:1429
 msgid "Usage: cupsfilter [ options ] filename"
 msgstr "使い方: cupsfilter [オプション] ファイル名"
 
-#: systemv/cupstestdsc.c:425
 msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
 msgstr "使い方: cupstestdsc [オプション] filename.ps [... filename.ps]"
 
-#: systemv/cupstestppd.c:3793
 msgid ""
 "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]"
-msgstr "使い方: cupstestppd [オプション] ファイル名1.ppd[.gz] [... ファイル名N.ppd[.gz]]"
+msgstr ""
+"使い方: cupstestppd [オプション] ファイル名1.ppd[.gz] [... ファイル名N.ppd[."
+"gz]]"
 
-#: test/ipptool.c:4401
 msgid "Usage: ipptool [options] URI filename [ ... filenameN ]"
 msgstr "使い方: ipptool [オプション] URI ファイル名 [ ... ファイル名N ]"
 
-#: systemv/lpmove.c:125
 msgid "Usage: lpmove job/src dest"
 msgstr "使い方: lpmove ジョブ/ソース 宛先"
 
-#: systemv/lpoptions.c:553
 msgid ""
 "Usage: lpoptions [-h server] [-E] -d printer\n"
 "       lpoptions [-h server] [-E] [-p printer] -l\n"
@@ -5767,11 +4498,9 @@ msgstr ""
 "        lpoptions [-h サーバー] [-E] -p プリンター -o オプション[=値] ...\n"
 "        lpoptions [-h サーバー] [-E] -x プリンター"
 
-#: systemv/lppasswd.c:476
 msgid "Usage: lppasswd [-g groupname]"
 msgstr "使い方: lppasswd [-g グループ名]"
 
-#: systemv/lppasswd.c:479
 msgid ""
 "Usage: lppasswd [-g groupname] [username]\n"
 "       lppasswd [-g groupname] -a [username]\n"
@@ -5781,73 +4510,59 @@ msgstr ""
 "        lppasswd [-g グループ名] -a [ユーザー名]\n"
 "        lppasswd [-g グループ名] -x [ユーザー名]"
 
-#: berkeley/lpq.c:670
 msgid ""
 "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]"
-msgstr "使い方: lpq [-P 宛先] [-U ユーザー名] [-h ホスト名[:ポート]] [-l] [+間隔]"
+msgstr ""
+"使い方: lpq [-P 宛先] [-U ユーザー名] [-h ホスト名[:ポート]] [-l] [+間隔]"
 
-#: ppdc/ppdc.cxx:435
 msgid "Usage: ppdc [options] filename.drv [ ... filenameN.drv ]"
 msgstr "使い方: ppdc [オプション] ファイル名.drv [ ... ファイル名N.drv ]"
 
-#: ppdc/ppdhtml.cxx:172
 msgid "Usage: ppdhtml [options] filename.drv >filename.html"
 msgstr "使い方: ppdhtml [オプション] ファイル名.drv >ファイル名.html"
 
-#: ppdc/ppdi.cxx:128
 msgid "Usage: ppdi [options] filename.ppd [ ... filenameN.ppd ]"
 msgstr "使い方: ppdi [オプション] ファイル名.ppd [ ... ファイル名N.ppd ]"
 
-#: ppdc/ppdmerge.cxx:367
 msgid "Usage: ppdmerge [options] filename.ppd [ ... filenameN.ppd ]"
 msgstr "使い方: ppdmerge [オプション] ファイル名.ppd [ ... ファイル名N.ppd ]"
 
-#: ppdc/ppdpo.cxx:252
 msgid ""
 "Usage: ppdpo [options] -o filename.po filename.drv [ ... filenameN.drv ]"
-msgstr "使い方: ppdpo [オプション] -o ファイル名.po ファイル名.drv [ ... ファイル名N.drv ]"
+msgstr ""
+"使い方: ppdpo [オプション] -o ファイル名.po ファイル名.drv [ ... ファイル名N."
+"drv ]"
 
-#: backend/snmp.c:218
 msgid "Usage: snmp [host-or-ip-address]"
 msgstr "使い方: snmp [ホストまたはIPアドレス]"
 
-#: cups/snmp.c:1064
 msgid "Value uses indefinite length"
 msgstr "値は不定長です"
 
-#: cups/snmp.c:1049
 msgid "VarBind uses indefinite length"
 msgstr "VarBind は不定長です"
 
-#: cups/snmp.c:999
 msgid "Version uses indefinite length"
 msgstr "Version は不定長です"
 
-#: backend/ipp.c:1675
 msgid "Waiting for job to complete."
 msgstr "ジョブが完了するのを待っています。"
 
-#: backend/usb-darwin.c:457 backend/usb-libusb.c:193
 msgid "Waiting for printer to become available."
 msgstr "プリンターが使用可能になるのを待っています。"
 
-#: backend/socket.c:444
 msgid "Waiting for printer to finish."
 msgstr "プリンターが終了するのを待っています。"
 
-#: cups/adminutil.c:793
 msgid "Warning, no Windows 2000 printer drivers are installed."
 msgstr "警告、Windows 2000 プリンタードライバーがインストールされていません。"
 
-#: cups/http-support.c:1339
 msgid "Web Interface is Disabled"
 msgstr "Web インターフェイスが無効になっています"
 
-#: cups/ppd.c:1947
 msgid "Yes"
 msgstr "はい"
 
-#: scheduler/client.c:2437
 #, c-format
 msgid ""
 "You must access this page using the URL <A HREF=\"https://%s:%d%s\">https://"
@@ -5856,289 +4571,237 @@ msgstr ""
 "このページには URL <A HREF=\"https://%s:%d%s\">https://%s:%d%s</A> を使ってア"
 "クセスする必要があります。"
 
-#: systemv/lppasswd.c:254
 msgid ""
 "Your password must be at least 6 characters long, cannot contain your "
 "username, and must contain at least one letter and number."
-msgstr "パスワードは少なくとも 6 文字以上で、あなたのユーザー名を含んではならず、少なくとも 1 つの英字および数値を含んでなければなりません。"
+msgstr ""
+"パスワードは少なくとも 6 文字以上で、あなたのユーザー名を含んではならず、少な"
+"くとも 1 つの英字および数値を含んでなければなりません。"
 
-#: ppdc/sample.c:439
 msgid "ZPL Label Printer"
 msgstr "ZPL ラベルプリンター"
 
-#: ppdc/sample.c:362
 msgid "Zebra"
 msgstr "ゼブラ"
 
-#: cups/notify.c:102
 msgid "aborted"
 msgstr "停止"
 
-#: cups/notify.c:99
 msgid "canceled"
 msgstr "キャンセル"
 
-#: cups/notify.c:105
 msgid "completed"
 msgstr "完了"
 
-#: scheduler/ipp.c:6012
 msgid "cups-deviced failed to execute."
 msgstr "cups-deviced の実行に失敗しました。"
 
-#: scheduler/ipp.c:6842 scheduler/ipp.c:7091
 msgid "cups-driverd failed to execute."
 msgstr "cups-driverd の実行に失敗しました。"
 
-#: systemv/cupsaddsmb.c:233
 #, c-format
 msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
 msgstr "cupsaddsmb: プリンター \"%s\" の PPD ファイルがありません - %s"
 
-#: systemv/cupsctl.c:141
 msgid "cupsctl: Cannot set Listen or Port directly."
 msgstr "cupsctl: Listen あるいは Port を直接設定できません。"
 
-#: systemv/cupsctl.c:152
 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
 msgstr "cupsctl: サーバーに接続できません: %s"
 
-#: systemv/cupsctl.c:195
 #, c-format
 msgid "cupsctl: Unknown option \"%s\""
 msgstr "cupsctl: \"%s\" は未知のオプションです。"
 
-#: systemv/cupsctl.c:197
 #, c-format
 msgid "cupsctl: Unknown option \"-%c\""
 msgstr "cupsctl: \"-%c\"は未知のオプションです。"
 
-#: scheduler/main.c:189
 msgid "cupsd: Expected config filename after \"-c\" option."
 msgstr "cupsd: \"-c\" オプションのあとには設定ファイル名が必要です。"
 
-#: scheduler/main.c:221 scheduler/main.c:228
+msgid "cupsd: Expected cups-files.conf filename after \"-s\" option."
+msgstr ""
+
+msgid "cupsd: Relative cups-files.conf filename not allowed."
+msgstr ""
+
 msgid "cupsd: Unable to get current directory."
 msgstr "cupsd: カレントディレクトリーを取得できません。"
 
-#: scheduler/main.c:295
+msgid "cupsd: Unable to get path to cups-files.conf file."
+msgstr ""
+
 #, c-format
 msgid "cupsd: Unknown argument \"%s\" - aborting."
 msgstr "cupsd: \"%s\" は未知の引数です - 停止します。"
 
-#: scheduler/main.c:288
 #, c-format
 msgid "cupsd: Unknown option \"%c\" - aborting."
 msgstr "cupsd: \"%c\" は未知のオプションです - 停止します。"
 
-#: scheduler/main.c:255
 msgid "cupsd: launchd(8) support not compiled in, running in normal mode."
-msgstr "cupsd: launchd(8) サポートがコンパイルされていないので、通常モードで動作します。"
+msgstr ""
+"cupsd: launchd(8) サポートがコンパイルされていないので、通常モードで動作しま"
+"す。"
 
-#: scheduler/cupsfilter.c:1209
 #, c-format
 msgid "cupsfilter: Invalid document number %d."
 msgstr "cupsfilter: 不正な文書番号 %d です。"
 
-#: scheduler/cupsfilter.c:1203
 #, c-format
 msgid "cupsfilter: Invalid job ID %d."
 msgstr "cupsfilter: 不正なジョブID %d です。"
 
-#: scheduler/cupsfilter.c:358
 msgid "cupsfilter: Only one filename can be specified."
 msgstr "cupsfilter: 1 つのファイル名のみを指定できます。"
 
-#: scheduler/cupsfilter.c:1251
 #, c-format
 msgid "cupsfilter: Unable to get job file - %s"
 msgstr "cupsfilter: ジョブ・ファイルを取得できません - %s"
 
-#: systemv/cupstestppd.c:261
 msgid "cupstestppd: The -q option is incompatible with the -v option."
 msgstr "cupstestppd: -q オプションは -v オプションと両立できません。"
 
-#: systemv/cupstestppd.c:277
 msgid "cupstestppd: The -v option is incompatible with the -q option."
 msgstr "cupstestppd: -v オプションは -q オプションと両立できません。"
 
-#: systemv/lpstat.c:1231 systemv/lpstat.c:1234 systemv/lpstat.c:1237
 #, c-format
 msgid "device for %s/%s: %s"
 msgstr "%s/%s のデバイス: %s"
 
-#: systemv/lpstat.c:1218 systemv/lpstat.c:1221 systemv/lpstat.c:1224
 #, c-format
 msgid "device for %s: %s"
 msgstr "%s のデバイス: %s"
 
-#: cups/snmp.c:1036
 msgid "error-index uses indefinite length"
 msgstr "error-index は不定長です"
 
-#: cups/snmp.c:1028
 msgid "error-status uses indefinite length"
 msgstr "error-status は不定長です"
 
-#: cups/notify.c:90
 msgid "held"
 msgstr "保留"
 
-#: berkeley/lpc.c:209
 msgid "help\t\tGet help on commands."
 msgstr "help\t\tコマンドのヘルプを取得。"
 
-#: cups/notify.c:131
 msgid "idle"
 msgstr "待機中"
 
-#: test/ipptool.c:373 test/ipptool.c:515 test/ipptool.c:539
 msgid "ipptool: \"-i\" and \"-n\" are incompatible with -X\"."
 msgstr "ipptool: \"-i\" と \"-n\" は \"-X\" と組み合わせられません。"
 
-#: test/ipptool.c:597
 #, c-format
 msgid "ipptool: Bad URI - %s."
 msgstr "ipptool: 不正な URI です - %s。"
 
-#: test/ipptool.c:362
 #, c-format
 msgid "ipptool: Bad version %s for \"-V\"."
 msgstr "ipptool: \"-V\" オプションに不正なバージョン %s が指定されました。"
 
-#: test/ipptool.c:508
 msgid "ipptool: Invalid seconds for \"-i\"."
 msgstr "ipptool: \"-i\" に不正な秒数が指定されました。"
 
-#: test/ipptool.c:578
 msgid "ipptool: May only specify a single URI."
 msgstr "ipptool: URI は 1 つだけ指定できます。"
 
-#: test/ipptool.c:531
 msgid "ipptool: Missing count for \"-n\"."
 msgstr "ipptool: \"-n\" に回数の指定がありません。"
 
-#: test/ipptool.c:408
 msgid "ipptool: Missing filename for \"-f\"."
 msgstr "ipptool: \"-f\" にファイル名の指定がありません。"
 
-#: test/ipptool.c:389
 msgid "ipptool: Missing name=value for \"-d\"."
 msgstr "ipptool: \"-d\" に 名前=値 の指定がありません。"
 
-#: test/ipptool.c:498
 msgid "ipptool: Missing seconds for \"-i\"."
 msgstr "ipptool: \"-i\" に秒数の指定がありません。"
 
-#: test/ipptool.c:332
 msgid "ipptool: Missing timeout for \"-T\"."
 msgstr "ipptool: \"-T\" にタイムアウトの指定がありません。"
 
-#: test/ipptool.c:345
 msgid "ipptool: Missing version for \"-V\"."
 msgstr "ipptool: \"-V\" にバージョンの指定がありません。"
 
-#: test/ipptool.c:624
 msgid "ipptool: URI required before test file."
 msgstr "ipptool: テストファイルの前に URI の指定が必要です。"
 
-#: test/ipptool.c:558
 #, c-format
 msgid "ipptool: Unknown option \"-%c\"."
 msgstr "ipptool: \"-%c\"は未知のオプションです。"
 
-#: scheduler/ipp.c:7838
 msgid "job-printer-uri attribute missing."
 msgstr "job-printer-uri 属性がありません。"
 
-#: systemv/lpadmin.c:131 systemv/lpadmin.c:375
 msgid "lpadmin: Class name can only contain printable characters."
 msgstr "lpadmin: クラス名は表示可能文字のみで構成されなければなりません。"
 
-#: systemv/lpadmin.c:614
 msgid "lpadmin: Expected PPD after \"-P\" option."
 msgstr "lpadmin: \"-P\" オプションのあとには PPD が必要です。"
 
-#: systemv/lpadmin.c:457
 msgid "lpadmin: Expected allow/deny:userlist after \"-u\" option."
-msgstr "lpadmin: \"-u\" オプションのあとには allow/deny:ユーザーリスト が必要です。"
+msgstr ""
+"lpadmin: \"-u\" オプションのあとには allow/deny:ユーザーリスト が必要です。"
 
-#: systemv/lpadmin.c:364
 msgid "lpadmin: Expected class after \"-r\" option."
 msgstr "lpadmin: \"-r\" オプションのあとにはクラス名が必要です。"
 
-#: systemv/lpadmin.c:120
 msgid "lpadmin: Expected class name after \"-c\" option."
 msgstr "lpadmin: \"-c\" オプションのあとにはクラス名が必要です。"
 
-#: systemv/lpadmin.c:558
 msgid "lpadmin: Expected description after \"-D\" option."
 msgstr "lpadmin: \"-D\" オプションのあとには説明が必要です。"
 
-#: systemv/lpadmin.c:491
 msgid "lpadmin: Expected device URI after \"-v\" option."
 msgstr "lpadmin: \"-v\" オプションのあとにはデバイス URI が必要です。"
 
-#: systemv/lpadmin.c:574
 msgid "lpadmin: Expected file type(s) after \"-I\" option."
 msgstr "lpadmin: \"-I\" オプションのあとにはファイル形式が必要です。"
 
-#: systemv/lpadmin.c:202
 msgid "lpadmin: Expected hostname after \"-h\" option."
 msgstr "lpadmin: \"-h\" オプションのあとにはホスト名が必要です。"
 
-#: systemv/lpadmin.c:221
 msgid "lpadmin: Expected interface after \"-i\" option."
 msgstr "lpadmin: \"-i\" オプションのあとにはインターフェイス名が必要です。"
 
-#: systemv/lpadmin.c:594
 msgid "lpadmin: Expected location after \"-L\" option."
 msgstr "lpadmin: \"-L\" オプションのあとには場所が必要です。"
 
-#: systemv/lpadmin.c:274
 msgid "lpadmin: Expected model after \"-m\" option."
 msgstr "lpadmin: \"-m\" オプションのあとにはモデル名が必要です。"
 
-#: systemv/lpadmin.c:417
 msgid "lpadmin: Expected name after \"-R\" option."
 msgstr "lpadmin: \"-R\" オプションのあとには名前が必要です。"
 
-#: systemv/lpadmin.c:294
 msgid "lpadmin: Expected name=value after \"-o\" option."
 msgstr "lpadmin: \"-o\" オプションのあとには 変数名=値 が必要です。"
 
-#: systemv/lpadmin.c:313
 msgid "lpadmin: Expected printer after \"-p\" option."
 msgstr "lpadmin: \"-p\" オプションのあとにはプリンター名が必要です。"
 
-#: systemv/lpadmin.c:164
 msgid "lpadmin: Expected printer name after \"-d\" option."
 msgstr "lpadmin: \"-d\" オプションのあとにはプリンター名が必要です。"
 
-#: systemv/lpadmin.c:525
 msgid "lpadmin: Expected printer or class after \"-x\" option."
-msgstr "lpadmin: \"-x\" オプションのあとにはプリンター名またはクラス名が必要です。"
+msgstr ""
+"lpadmin: \"-x\" オプションのあとにはプリンター名またはクラス名が必要です。"
 
-#: systemv/lpadmin.c:975
 msgid "lpadmin: No member names were seen."
 msgstr "lpadmin: メンバー名が見当たりません。"
 
-#: systemv/lpadmin.c:762
 #, c-format
 msgid "lpadmin: Printer %s is already a member of class %s."
 msgstr "lpadmin: プリンター %s はすでにクラス %s のメンバーです。"
 
-#: systemv/lpadmin.c:989
 #, c-format
 msgid "lpadmin: Printer %s is not a member of class %s."
 msgstr "lpadmin: プリンター %s はクラス %s のメンバーではありません。"
 
-#: systemv/lpadmin.c:175 systemv/lpadmin.c:324 systemv/lpadmin.c:536
 msgid "lpadmin: Printer name can only contain printable characters."
 msgstr "lpadmin: プリンター名には表示可能文字だけが使用できます。"
 
-#: systemv/lpadmin.c:105
 msgid ""
 "lpadmin: Unable to add a printer to the class:\n"
 "         You must specify a printer name first."
@@ -6146,18 +4809,13 @@ msgstr ""
 "lpadmin: クラスにプリンターを追加できません:\n"
 "         先にプリンター名を指定する必要があります。"
 
-#: systemv/lpadmin.c:96 systemv/lpadmin.c:149 systemv/lpadmin.c:253
-#: systemv/lpadmin.c:339 systemv/lpadmin.c:393 systemv/lpadmin.c:510
-#: systemv/lpadmin.c:647
 #, c-format
 msgid "lpadmin: Unable to connect to server: %s"
 msgstr "lpadmin: サーバーに接続できません: %s"
 
-#: systemv/lpadmin.c:1329
 msgid "lpadmin: Unable to create temporary file"
 msgstr "lpadmin: テンポラリーファイルを作成できません"
 
-#: systemv/lpadmin.c:402
 msgid ""
 "lpadmin: Unable to delete option:\n"
 "         You must specify a printer name first."
@@ -6165,12 +4823,10 @@ msgstr ""
 "lpadmin: プリンター・オプションを削除できません:\n"
 "         先にプリンター名を指定する必要があります。"
 
-#: systemv/lpadmin.c:1339
 #, c-format
 msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 msgstr "lpadmin: PPD ファイル \"%s\" を開けません - %s"
 
-#: systemv/lpadmin.c:348
 msgid ""
 "lpadmin: Unable to remove a printer from the class:\n"
 "         You must specify a printer name first."
@@ -6178,7 +4834,6 @@ msgstr ""
 "lpadmin: クラスからプリンターを削除できません:\n"
 "         先にプリンター名を指定する必要があります。"
 
-#: systemv/lpadmin.c:656
 msgid ""
 "lpadmin: Unable to set the printer options:\n"
 "         You must specify a printer name first."
@@ -6186,437 +4841,377 @@ msgstr ""
 "lpadmin: プリンター・オプションを設定できません:\n"
 "         先にプリンター名を指定する必要があります。"
 
-#: systemv/lpadmin.c:474
 #, c-format
 msgid "lpadmin: Unknown allow/deny option \"%s\"."
 msgstr "lpadmin:\"%s\" は未知の allow/deny オプションです。"
 
-#: systemv/lpadmin.c:629
 #, c-format
 msgid "lpadmin: Unknown argument \"%s\"."
 msgstr "lpadmin: \"%s\" は未知の引数です。"
 
-#: systemv/lpadmin.c:624
 #, c-format
 msgid "lpadmin: Unknown option \"%c\"."
 msgstr "lpadmin: \"%c\" は未知のオプションです。"
 
-#: systemv/lpadmin.c:580
 msgid "lpadmin: Warning - content type list ignored."
 msgstr "lpadmin: 警告 - コンテンツタイプリストは無視されます。"
 
-#: berkeley/lpc.c:76 berkeley/lpc.c:104 berkeley/lpc.c:140
 msgid "lpc> "
 msgstr "lpc> "
 
-#: systemv/lpinfo.c:137
 msgid "lpinfo: Expected 1284 device ID string after \"--device-id\"."
-msgstr "lpinfo: \"--device-id\" のあとには、1284 デバイス ID を指定する必要があります。"
+msgstr ""
+"lpinfo: \"--device-id\" のあとには、1284 デバイス ID を指定する必要がありま"
+"す。"
 
-#: systemv/lpinfo.c:190
 msgid "lpinfo: Expected language after \"--language\"."
 msgstr "lpinfo: \"--language\" のあとには、言語を指定する必要があります。"
 
-#: systemv/lpinfo.c:207
 msgid "lpinfo: Expected make and model after \"--make-and-model\"."
-msgstr "lpinfo: \"--make-and-model\" の後には、メーカーとモデルを指定する必要があります。"
+msgstr ""
+"lpinfo: \"--make-and-model\" の後には、メーカーとモデルを指定する必要がありま"
+"す。"
 
-#: systemv/lpinfo.c:224
 msgid "lpinfo: Expected product string after \"--product\"."
 msgstr "lpinfo: \"--product\" のあとには、製品名を指定する必要があります。"
 
-#: systemv/lpinfo.c:155
 msgid "lpinfo: Expected scheme list after \"--exclude-schemes\"."
-msgstr "lpinfo: \"--exclude-schemes\" のあとには、スキーマ・リストを指定する必要があります。"
+msgstr ""
+"lpinfo: \"--exclude-schemes\" のあとには、スキーマ・リストを指定する必要があ"
+"ります。"
 
-#: systemv/lpinfo.c:173
 msgid "lpinfo: Expected scheme list after \"--include-schemes\"."
-msgstr "lpinfo: \"--include-schemes\" のあとには、スキーマ・リストを指定する必要があります。"
+msgstr ""
+"lpinfo: \"--include-schemes\" のあとには、スキーマ・リストを指定する必要があ"
+"ります。"
 
-#: systemv/lpinfo.c:241
 msgid "lpinfo: Expected timeout after \"--timeout\"."
-msgstr "lpinfo: \"--timeout\" のあとには、タイムアウト値を指定する必要があります。"
+msgstr ""
+"lpinfo: \"--timeout\" のあとには、タイムアウト値を指定する必要があります。"
 
-#: systemv/lpinfo.c:265
 #, c-format
 msgid "lpinfo: Unknown argument \"%s\"."
 msgstr "lpinfo: 未知の引数 \"%s\"。"
 
-#: systemv/lpinfo.c:259
 #, c-format
 msgid "lpinfo: Unknown option \"%c\"."
 msgstr "lpinfo: 未知のオプション \"%c\"。"
 
-#: systemv/lpinfo.c:252
 #, c-format
 msgid "lpinfo: Unknown option \"%s\"."
 msgstr "lpinfo: 未知のオプション \"%s\"。"
 
-#: systemv/lpmove.c:133
 #, c-format
 msgid "lpmove: Unable to connect to server: %s"
 msgstr "lpmove: サーバーに接続できません: %s"
 
-#: systemv/lpmove.c:119
 #, c-format
 msgid "lpmove: Unknown argument \"%s\"."
 msgstr "lpmove: 未知の引数 \"%s\"。"
 
-#: systemv/lpmove.c:97
 #, c-format
 msgid "lpmove: Unknown option \"%c\"."
 msgstr "lpmove: 未知のオプション \"%c\"。"
 
-#: systemv/lpoptions.c:150 systemv/lpoptions.c:168 systemv/lpoptions.c:244
 msgid "lpoptions: No printers."
 msgstr "lpoptions: プリンターがありません。"
 
-#: systemv/lpoptions.c:219
 #, c-format
 msgid "lpoptions: Unable to add printer or instance: %s"
 msgstr "lpoptions: プリンターまたはインスタンスを追加できません: %s。"
 
-#: systemv/lpoptions.c:521
 #, c-format
 msgid "lpoptions: Unable to get PPD file for %s: %s"
 msgstr "lpoptions: %s の PPD ファイルを取得できません: %s"
 
-#: systemv/lpoptions.c:529
 #, c-format
 msgid "lpoptions: Unable to open PPD file for %s."
 msgstr "lpoptions: %s の PPD ファイルを開けません。"
 
-#: systemv/lpoptions.c:99
 msgid "lpoptions: Unknown printer or class."
 msgstr "lpoptions: 未知のプリンターまたはクラスです。"
 
-#: systemv/lppasswd.c:173
 msgid "lppasswd: Only root can add or delete passwords."
 msgstr "lppasswd: root だけがパスワードの追加と削除を行えます。"
 
-#: systemv/lppasswd.c:302
 msgid "lppasswd: Password file busy."
 msgstr "lppasswd: パスワードファイルがビジー状態です。"
 
-#: systemv/lppasswd.c:431
 msgid "lppasswd: Password file not updated."
 msgstr "lppasswd: パスワードファイルは更新されません。"
 
-#: systemv/lppasswd.c:398
 msgid "lppasswd: Sorry, password doesn't match."
 msgstr "lppasswd: 残念ながら、パスワードがマッチしません。"
 
-#: systemv/lppasswd.c:253
 msgid "lppasswd: Sorry, password rejected."
 msgstr "lppasswd: 残念ながら、パスワードは拒否されました。"
 
-#: systemv/lppasswd.c:230
 msgid "lppasswd: Sorry, passwords don't match."
 msgstr "lppasswd: 残念ながら、パスワードがマッチしません。"
 
-#: systemv/lppasswd.c:199 systemv/lppasswd.c:218
 #, c-format
 msgid "lppasswd: Unable to copy password string: %s"
 msgstr "lppasswd: パスワード文字列をコピーできません: %s"
 
-#: systemv/lppasswd.c:304 systemv/lppasswd.c:312 systemv/lppasswd.c:329
 #, c-format
 msgid "lppasswd: Unable to open password file: %s"
 msgstr "lppasswd: パスワードファイルを開けません: %s"
 
-#: systemv/lppasswd.c:364 systemv/lppasswd.c:377 systemv/lppasswd.c:408
 #, c-format
 msgid "lppasswd: Unable to write to password file: %s"
 msgstr "lppasswd: パスワードファイルに書き込めません: %s"
 
-#: systemv/lppasswd.c:446
 #, c-format
 msgid "lppasswd: failed to backup old password file: %s"
 msgstr "lppasswd: 古いパスワードファイルのバックアップに失敗しました: %s"
 
-#: systemv/lppasswd.c:458
 #, c-format
 msgid "lppasswd: failed to rename password file: %s"
 msgstr "lppasswd: パスワードファイルの名前の変更に失敗しました: %s"
 
-#: systemv/lppasswd.c:389
 #, c-format
 msgid "lppasswd: user \"%s\" and group \"%s\" do not exist."
 msgstr "lppasswd: ユーザー \"%s\" およびグループ \"%s\" は存在しません。"
 
-#: systemv/lpstat.c:1039
 #, c-format
 msgid ""
 "lpstat: error - %s environment variable names non-existent destination \"%s"
 "\"."
-msgstr "lpstat: エラー - 環境変数 %s が、存在しない宛先 \"%s\" を指しています。"
+msgstr ""
+"lpstat: エラー - 環境変数 %s が、存在しない宛先 \"%s\" を指しています。"
 
-#: systemv/lpstat.c:970
 #, c-format
 msgid "members of class %s:"
 msgstr "クラス %s のメンバー:"
 
-#: berkeley/lpq.c:582
 msgid "no entries"
 msgstr "エントリーがありません"
 
-#: systemv/lpstat.c:1043
 msgid "no system default destination"
 msgstr "システムのデフォルトの宛先がありません"
 
-#: scheduler/ipp.c:5702
 msgid "notify-events not specified."
 msgstr "notify-events が指定されていません。"
 
-#: scheduler/ipp.c:2034 scheduler/ipp.c:5607
 #, c-format
 msgid "notify-recipient-uri URI \"%s\" is already used."
 msgstr "notify-recipient-uri URI \"%s\" はすでに使われています。"
 
-#: scheduler/ipp.c:2024 scheduler/ipp.c:5597
 #, c-format
 msgid "notify-recipient-uri URI \"%s\" uses unknown scheme."
 msgstr "notify-recipient-uri URI \"%s\" には未知のスキームが使われています。"
 
-#: cups/notify.c:87
 msgid "pending"
 msgstr "保留"
 
-#: ppdc/ppdc.cxx:113 ppdc/ppdpo.cxx:93
 #, c-format
 msgid "ppdc: Adding include directory \"%s\"."
 msgstr "ppdc: ディレクトリー \"%s\" を追加しています。"
 
-#: ppdc/ppdpo.cxx:134
 #, c-format
 msgid "ppdc: Adding/updating UI text from %s."
 msgstr "ppdc: %s から UI テキストを追加または更新しています。"
 
-#: ppdc/ppdc-source.cxx:410
 #, c-format
 msgid "ppdc: Bad boolean value (%s) on line %d of %s."
 msgstr "ppdc:  不正な boolean 値 (%s) があります。%d 行目、ファイル名 %s。"
 
-#: ppdc/ppdc-import.cxx:264
 #, c-format
 msgid "ppdc: Bad font attribute: %s"
 msgstr "不正なフォント属性: %s"
 
-#: ppdc/ppdc-source.cxx:1796
 #, c-format
 msgid "ppdc: Bad resolution name \"%s\" on line %d of %s."
 msgstr ""
 "ppdc: 不正な resolution 名 \"%s\" があります。%d 行目、ファイル名 %s 。"
 
-#: ppdc/ppdc-source.cxx:1113
 #, c-format
 msgid "ppdc: Bad status keyword %s on line %d of %s."
 msgstr ""
 "ppdc: 不正な status キーワード %s があります。%d 行目、ファイル名 %s 。"
 
-#: ppdc/ppdc-source.cxx:2033
 #, c-format
 msgid "ppdc: Bad variable substitution ($%c) on line %d of %s."
 msgstr "ppdc: 不正な数値置換 ($%c) があります。%d 行目、ファイル名 %s。"
 
-#: ppdc/ppdc-source.cxx:2719
 #, c-format
 msgid "ppdc: Choice found on line %d of %s with no Option."
 msgstr ""
 "ppdc: %d 行目、ファイル名 %s で、Option がないのに Choice が見つかりました。"
 
-#: ppdc/ppdc-source.cxx:1698
 #, c-format
 msgid "ppdc: Duplicate #po for locale %s on line %d of %s."
-msgstr "ppdc: locale %s に対して #po が二重に定義されています。%d 行目、ファイル名 %s 。"
+msgstr ""
+"ppdc: locale %s に対して #po が二重に定義されています。%d 行目、ファイル名 "
+"%s 。"
 
-#: ppdc/ppdc-source.cxx:932
 #, c-format
 msgid "ppdc: Expected a filter definition on line %d of %s."
 msgstr "ppdc: %d 行目、ファイル名 %s においてフィルター定義が必要です。"
 
-#: ppdc/ppdc-source.cxx:955
 #, c-format
 msgid "ppdc: Expected a program name on line %d of %s."
 msgstr "ppdc: %d 行目、ファイル名 %s においてプログラム名が必要です。"
 
-#: ppdc/ppdc-source.cxx:394
 #, c-format
 msgid "ppdc: Expected boolean value on line %d of %s."
 msgstr "ppdc: %d 行目、ファイル名 %s において boolean 値が必要です。"
 
-#: ppdc/ppdc-source.cxx:1093
 #, c-format
 msgid "ppdc: Expected charset after Font on line %d of %s."
-msgstr "ppdc: %d 行目、ファイル名 %s において Font のあとに charset が必要です。"
+msgstr ""
+"ppdc: %d 行目、ファイル名 %s において Font のあとに charset が必要です。"
 
-#: ppdc/ppdc-source.cxx:447
 #, c-format
 msgid "ppdc: Expected choice code on line %d of %s."
 msgstr "ppdc: %d 行目、ファイル名 %s において choice code が必要です。"
 
-#: ppdc/ppdc-source.cxx:435
 #, c-format
 msgid "ppdc: Expected choice name/text on line %d of %s."
 msgstr "ppdc: %d 行目、ファイル名 %s において choice name/text が必要です。"
 
-#: ppdc/ppdc-source.cxx:503
 #, c-format
 msgid "ppdc: Expected color order for ColorModel on line %d of %s."
 msgstr ""
 "ppdc: %d 行目、ファイル名 %s において ColorModel に対する color order が必要"
 "です。"
 
-#: ppdc/ppdc-source.cxx:492
 #, c-format
 msgid "ppdc: Expected colorspace for ColorModel on line %d of %s."
 msgstr ""
 "ppdc: %d 行目、ファイル名 %s において ColorModel に対する colorspace が必要で"
 "す。"
 
-#: ppdc/ppdc-source.cxx:514
 #, c-format
 msgid "ppdc: Expected compression for ColorModel on line %d of %s."
 msgstr ""
 "ppdc: %d 行目、ファイル名 %s において ColorModel に対する compression が必要"
 "です。"
 
-#: ppdc/ppdc-source.cxx:695
 #, c-format
 msgid "ppdc: Expected constraints string for UIConstraints on line %d of %s."
 msgstr ""
 "ppdc: %d 行目、ファイル名 %s において UIConstraints に対する constraint が必"
 "要です。"
 
-#: ppdc/ppdc-source.cxx:2905
 #, c-format
 msgid ""
 "ppdc: Expected driver type keyword following DriverType on line %d of %s."
-msgstr "ppdc: %d 行目、ファイル名 %s において DriverType のあとに driver type keyword が必要です。"
+msgstr ""
+"ppdc: %d 行目、ファイル名 %s において DriverType のあとに driver type "
+"keyword が必要です。"
 
-#: ppdc/ppdc-source.cxx:826
 #, c-format
 msgid "ppdc: Expected duplex type after Duplex on line %d of %s."
-msgstr "ppdc: %d 行目、ファイル名 %s において Duplex のあとに type が必要です。"
+msgstr ""
+"ppdc: %d 行目、ファイル名 %s において Duplex のあとに type が必要です。"
 
-#: ppdc/ppdc-source.cxx:1077
 #, c-format
 msgid "ppdc: Expected encoding after Font on line %d of %s."
-msgstr "ppdc: %d 行目、ファイル名 %s において Font のあとに encoding が必要です。"
+msgstr ""
+"ppdc: %d 行目、ファイル名 %s において Font のあとに encoding が必要です。"
 
-#: ppdc/ppdc-source.cxx:1689
 #, c-format
 msgid "ppdc: Expected filename after #po %s on line %d of %s."
 msgstr "ppdc: #po %s のあとにファイル名が必要です (%d 行目, ファイル %s)。"
 
-#: ppdc/ppdc-source.cxx:1205
 #, c-format
 msgid "ppdc: Expected group name/text on line %d of %s."
 msgstr "ppdc: %d 行目、ファイル名 %s において group name/text が必要です。"
 
-#: ppdc/ppdc-source.cxx:2619
 #, c-format
 msgid "ppdc: Expected include filename on line %d of %s."
 msgstr "ppdc: %d 行目、ファイル名 %s において include ファイル名が必要です。"
 
-#: ppdc/ppdc-source.cxx:1502
 #, c-format
 msgid "ppdc: Expected integer on line %d of %s."
 msgstr "ppdc: %d 行目、ファイル名 %s において整数指定が必要です。"
 
-#: ppdc/ppdc-source.cxx:1681
 #, c-format
 msgid "ppdc: Expected locale after #po on line %d of %s."
 msgstr "ppdc: %d 行目、ファイル名 %s において #po のあとに locale が必要です。"
 
-#: ppdc/ppdc-source.cxx:353
 #, c-format
 msgid "ppdc: Expected name after %s on line %d of %s."
 msgstr "ppdc: %s のあとに name が必要です。%d 行目、ファイル名 %s。"
 
-#: ppdc/ppdc-source.cxx:3277
 #, c-format
 msgid "ppdc: Expected name after FileName on line %d of %s."
-msgstr "ppdc: %d 行目、ファイル名 %s において FileName のあとに name が必要です。"
+msgstr ""
+"ppdc: %d 行目、ファイル名 %s において FileName のあとに name が必要です。"
 
-#: ppdc/ppdc-source.cxx:1058
 #, c-format
 msgid "ppdc: Expected name after Font on line %d of %s."
 msgstr "ppdc: %d 行目、ファイル名 %s において Font のあとに name が必要です。"
 
-#: ppdc/ppdc-source.cxx:3108
 #, c-format
 msgid "ppdc: Expected name after Manufacturer on line %d of %s."
-msgstr "ppdc: %d 行目、ファイル名 %s において Manufacturer のあとに name が必要です。"
+msgstr ""
+"ppdc: %d 行目、ファイル名 %s において Manufacturer のあとに name が必要です。"
 
-#: ppdc/ppdc-source.cxx:3141
 #, c-format
 msgid "ppdc: Expected name after MediaSize on line %d of %s."
-msgstr "ppdc: %d 行目、ファイル名 %s において MediaSize のあとに name が必要です。"
+msgstr ""
+"ppdc: %d 行目、ファイル名 %s において MediaSize のあとに name が必要です。"
 
-#: ppdc/ppdc-source.cxx:3231
 #, c-format
 msgid "ppdc: Expected name after ModelName on line %d of %s."
-msgstr "ppdc: %d 行目、ファイル名 %s において ModelName のあとに name が必要です。"
+msgstr ""
+"ppdc: %d 行目、ファイル名 %s において ModelName のあとに name が必要です。"
 
-#: ppdc/ppdc-source.cxx:3294
 #, c-format
 msgid "ppdc: Expected name after PCFileName on line %d of %s."
-msgstr "ppdc: %d 行目、ファイル名 %s において PCFileName のあとに name が必要です。"
+msgstr ""
+"ppdc: %d 行目、ファイル名 %s において PCFileName のあとに name が必要です。"
 
-#: ppdc/ppdc-source.cxx:1156
 #, c-format
 msgid "ppdc: Expected name/text after %s on line %d of %s."
 msgstr "ppdc: %s のあとに name/text が必要です。%d 行目、ファイル名 %s。"
 
-#: ppdc/ppdc-source.cxx:1245
 #, c-format
 msgid "ppdc: Expected name/text after Installable on line %d of %s."
-msgstr "ppdc: %d 行目、ファイル名 %s において Installable のあとに name/text が必要です。"
+msgstr ""
+"ppdc: %d 行目、ファイル名 %s において Installable のあとに name/text が必要で"
+"す。"
 
-#: ppdc/ppdc-source.cxx:1782
 #, c-format
 msgid "ppdc: Expected name/text after Resolution on line %d of %s."
-msgstr "ppdc: %d 行目、ファイル名 %s において Resolution のあとに name/text が必要です。"
+msgstr ""
+"ppdc: %d 行目、ファイル名 %s において Resolution のあとに name/text が必要で"
+"す。"
 
-#: ppdc/ppdc-source.cxx:479
 #, c-format
 msgid "ppdc: Expected name/text combination for ColorModel on line %d of %s."
 msgstr ""
 "ppdc: %d 行目、ファイル名 %s において ColorModel に対する name/text が必要で"
 "す。"
 
-#: ppdc/ppdc-source.cxx:1574
 #, c-format
 msgid "ppdc: Expected option name/text on line %d of %s."
 msgstr "ppdc: %d 行目、ファイル名 %s において option name/text が必要です。"
 
-#: ppdc/ppdc-source.cxx:1608
 #, c-format
 msgid "ppdc: Expected option section on line %d of %s."
 msgstr "ppdc: %d 行目、ファイル名 %s において option section が必要です。"
 
-#: ppdc/ppdc-source.cxx:1586
 #, c-format
 msgid "ppdc: Expected option type on line %d of %s."
 msgstr "ppdc: %d 行目、ファイル名 %s において option type が必要です。"
 
-#: ppdc/ppdc-source.cxx:1765
 #, c-format
 msgid "ppdc: Expected override field after Resolution on line %d of %s."
-msgstr "ppdc: %d 行目、ファイル名 %s において Resolution のあとに override field が必要です。"
+msgstr ""
+"ppdc: %d 行目、ファイル名 %s において Resolution のあとに override field が必"
+"要です。"
 
-#: ppdc/ppdc-catalog.cxx:341 ppdc/ppdc-catalog.cxx:353
 #, c-format
 msgid "ppdc: Expected quoted string on line %d of %s."
 msgstr "%d 行: %s には引用符で囲まれた文字列が必要です。"
 
-#: ppdc/ppdc-source.cxx:1004
 #, c-format
 msgid "ppdc: Expected real number on line %d of %s."
 msgstr "ppdc: %d 行目、ファイル名 %s において実数が必要です。"
 
-#: ppdc/ppdc-source.cxx:572
 #, c-format
 msgid ""
 "ppdc: Expected resolution/mediatype following ColorProfile on line %d of %s."
@@ -6624,7 +5219,6 @@ msgstr ""
 "ppdc: %d 行目、ファイル名 %s において ColorProfile に続いて resolution/"
 "mediatype が必要です。"
 
-#: ppdc/ppdc-source.cxx:1863
 #, c-format
 msgid ""
 "ppdc: Expected resolution/mediatype following SimpleColorProfile on line %d "
@@ -6633,341 +5227,281 @@ msgstr ""
 "ppdc: %d 行目、ファイル名 %s において SimpleColorProfile に続いて resolution/"
 "mediatype が必要です。"
 
-#: ppdc/ppdc-source.cxx:361
 #, c-format
 msgid "ppdc: Expected selector after %s on line %d of %s."
 msgstr "ppdc: %s のあとに selector が必要です。%d 行目、ファイル名 %s。"
 
-#: ppdc/ppdc-source.cxx:1101
 #, c-format
 msgid "ppdc: Expected status after Font on line %d of %s."
-msgstr "ppdc: %d 行目、ファイル名 %s において Font のあとに status が必要です。"
+msgstr ""
+"ppdc: %d 行目、ファイル名 %s において Font のあとに status が必要です。"
 
-#: ppdc/ppdc-source.cxx:2794
 #, c-format
 msgid "ppdc: Expected string after Copyright on line %d of %s."
-msgstr "ppdc: %d 行目、ファイル名 %s において Copyright のあとに文字列が必要です。"
+msgstr ""
+"ppdc: %d 行目、ファイル名 %s において Copyright のあとに文字列が必要です。"
 
-#: ppdc/ppdc-source.cxx:3397
 #, c-format
 msgid "ppdc: Expected string after Version on line %d of %s."
-msgstr "ppdc: %d 行目、ファイル名 %s において Version のあとに文字列が必要です。"
+msgstr ""
+"ppdc: %d 行目、ファイル名 %s において Version のあとに文字列が必要です。"
 
-#: ppdc/ppdc-source.cxx:728
 #, c-format
 msgid "ppdc: Expected two option names on line %d of %s."
 msgstr "ppdc: %d 行目、ファイル名 %s において 2 つのオプション名が必要です。"
 
-#: ppdc/ppdc-source.cxx:372
 #, c-format
 msgid "ppdc: Expected value after %s on line %d of %s."
 msgstr "ppdc: %s のあとに value が必要です。%d 行目、ファイル名 %s。"
 
-#: ppdc/ppdc-source.cxx:1085
 #, c-format
 msgid "ppdc: Expected version after Font on line %d of %s."
-msgstr "ppdc: %d 行目、ファイル名 %s において Font のあとに version が必要です。"
+msgstr ""
+"ppdc: %d 行目、ファイル名 %s において Font のあとに version が必要です。"
 
-#: ppdc/ppdc-source.cxx:227
 #, c-format
 msgid "ppdc: Invalid #include/#po filename \"%s\"."
 msgstr "ppdc: 無効な #include/#po ファイル名です \"%s\"。"
 
-#: ppdc/ppdc-source.cxx:972
 #, c-format
 msgid "ppdc: Invalid cost for filter on line %d of %s."
 msgstr ""
 "ppdc: %d 行目、ファイル名 %s においてフィルターに対する無効な cost がありま"
 "す。"
 
-#: ppdc/ppdc-source.cxx:964
 #, c-format
 msgid "ppdc: Invalid empty MIME type for filter on line %d of %s."
-msgstr "ppdc: %d 行目、ファイル名 %s においてフィルターに対する無効な空の MIME タイプがあります。"
+msgstr ""
+"ppdc: %d 行目、ファイル名 %s においてフィルターに対する無効な空の MIME タイプ"
+"があります。"
 
-#: ppdc/ppdc-source.cxx:980
 #, c-format
 msgid "ppdc: Invalid empty program name for filter on line %d of %s."
-msgstr "ppdc: %d 行目、ファイル名 %s においてフィルターに対するプログラム名が空であり無効です。"
+msgstr ""
+"ppdc: %d 行目、ファイル名 %s においてフィルターに対するプログラム名が空であり"
+"無効です。"
 
-#: ppdc/ppdc-source.cxx:1628
 #, c-format
 msgid "ppdc: Invalid option section \"%s\" on line %d of %s."
 msgstr ""
 "ppdc: 無効な option section があります \"%s\"。%d 行目、ファイル名 %s。"
 
-#: ppdc/ppdc-source.cxx:1600
 #, c-format
 msgid "ppdc: Invalid option type \"%s\" on line %d of %s."
 msgstr "ppdc: 無効な option type があります \"%s\"。%d 行目、ファイル名 %s。"
 
-#: ppdc/ppdc.cxx:251 ppdc/ppdpo.cxx:123
 #, c-format
 msgid "ppdc: Loading driver information file \"%s\"."
 msgstr "ppdc: ドライバー情報ファイル \"%s\" を読み込んでいます。"
 
-#: ppdc/ppdc.cxx:187
 #, c-format
 msgid "ppdc: Loading messages for locale \"%s\"."
 msgstr "ppdc: ロケール \"%s\" のメッセージを読み込んでいます。"
 
-#: ppdc/ppdc.cxx:126
 #, c-format
 msgid "ppdc: Loading messages from \"%s\"."
 msgstr "ppdc: \"%s\" からメッセージを読み込んでいます。"
 
-#: ppdc/ppdc-source.cxx:2412 ppdc/ppdc-source.cxx:2644
 #, c-format
 msgid "ppdc: Missing #endif at end of \"%s\"."
 msgstr "ppdc: \"%s\" の最後に #endif が見つかりません。"
 
-#: ppdc/ppdc-source.cxx:2513 ppdc/ppdc-source.cxx:2548
-#: ppdc/ppdc-source.cxx:2578
 #, c-format
 msgid "ppdc: Missing #if on line %d of %s."
 msgstr "ppdc: %d 行目、ファイル名 %s において #if が見つかりません。"
 
-#: ppdc/ppdc-catalog.cxx:418
 #, c-format
 msgid ""
 "ppdc: Need a msgid line before any translation strings on line %d of %s."
 msgstr "%d 行: %s の翻訳文字列の前に msgid 行が必要です。"
 
-#: ppdc/ppdc-driver.cxx:730
 #, c-format
 msgid "ppdc: No message catalog provided for locale %s."
 msgstr "ppdc: ロケール %s に対するメッセージカタログが見つかりません。"
 
-#: ppdc/ppdc-source.cxx:1651 ppdc/ppdc-source.cxx:2882
-#: ppdc/ppdc-source.cxx:2968 ppdc/ppdc-source.cxx:3061
-#: ppdc/ppdc-source.cxx:3194 ppdc/ppdc-source.cxx:3327
 #, c-format
 msgid "ppdc: Option %s defined in two different groups on line %d of %s."
 msgstr ""
 "ppdc: オプション %s が行 %d、ファイル %s の 2 つの異なるグループで定義されて"
 "います。"
 
-#: ppdc/ppdc-source.cxx:1644
 #, c-format
 msgid "ppdc: Option %s redefined with a different type on line %d of %s."
 msgstr ""
 "ppdc: オプション %s は異なる型で再定義されています。%d 行目、ファイル名 %s。"
 
-#: ppdc/ppdc-source.cxx:705
 #, c-format
 msgid "ppdc: Option constraint must *name on line %d of %s."
-msgstr "ppdc: %d 行目、ファイル名 %s において Option constraint は *name で指定しなければなりません。"
+msgstr ""
+"ppdc: %d 行目、ファイル名 %s において Option constraint は *name で指定しなけ"
+"ればなりません。"
 
-#: ppdc/ppdc-source.cxx:2495
 #, c-format
 msgid "ppdc: Too many nested #if's on line %d of %s."
 msgstr "ppdc: %d 行目、ファイル名 %s において #if のネストが多すぎます。"
 
-#: ppdc/ppdc.cxx:374
 #, c-format
 msgid "ppdc: Unable to create PPD file \"%s\" - %s."
 msgstr "ppdc: PPD ファイル \"%s\" を作成できません - %s。"
 
-#: ppdc/ppdc.cxx:266
 #, c-format
 msgid "ppdc: Unable to create output directory %s: %s"
 msgstr "ppdc: 出力ディレクトリー \"%s\" を作成できません - %s"
 
-#: ppdc/ppdc.cxx:287
 #, c-format
 msgid "ppdc: Unable to create output pipes: %s"
 msgstr "ppdc: 出力パイプを作成できません: %s"
 
-#: ppdc/ppdc.cxx:303 ppdc/ppdc.cxx:309
 #, c-format
 msgid "ppdc: Unable to execute cupstestppd: %s"
 msgstr "ppdc: cupstestppd を実行できません: %s"
 
-#: ppdc/ppdc-source.cxx:1730
 #, c-format
 msgid "ppdc: Unable to find #po file %s on line %d of %s."
 msgstr "ppdc: #po ファイル %s が見つかりません。%d 行目、ファイル名 %s。"
 
-#: ppdc/ppdc-source.cxx:2651
 #, c-format
 msgid "ppdc: Unable to find include file \"%s\" on line %d of %s."
 msgstr ""
 "ppdc: インクルードファイル %s が見つかりません。%d 行目、ファイル名 %s。"
 
-#: ppdc/ppdc.cxx:198
 #, c-format
 msgid "ppdc: Unable to find localization for \"%s\" - %s"
 msgstr "ppdc:  \"%s\" に対する地域化情報が見つかりません - %s"
 
-#: ppdc/ppdc.cxx:135
 #, c-format
 msgid "ppdc: Unable to load localization file \"%s\" - %s"
 msgstr "ppdc:  \"%s\" に対するローカライズファイルを読み込めません - %s"
 
-#: ppdc/ppdc-file.cxx:50
 #, c-format
 msgid "ppdc: Unable to open %s: %s"
 msgstr "ppdc: %s を開けません: %s"
 
-#: ppdc/ppdc-source.cxx:2054
 #, c-format
 msgid "ppdc: Undefined variable (%s) on line %d of %s."
 msgstr "ppdc: 変数 (%s) は未定義です。%d 行目、ファイル名 %s。"
 
-#: ppdc/ppdc-catalog.cxx:435
 #, c-format
 msgid "ppdc: Unexpected text on line %d of %s."
 msgstr "%d 行: %s は予期せぬテキストです。"
 
-#: ppdc/ppdc-source.cxx:2924
 #, c-format
 msgid "ppdc: Unknown driver type %s on line %d of %s."
 msgstr "ppdc: %s は未知のドライバータイプです。%d 行目、ファイル名 %s。"
 
-#: ppdc/ppdc-source.cxx:906
 #, c-format
 msgid "ppdc: Unknown duplex type \"%s\" on line %d of %s."
 msgstr "ppdc: \"%s\" は未知の両面タイプです。%d 行目、ファイル名 %s。"
 
-#: ppdc/ppdc-source.cxx:3154
 #, c-format
 msgid "ppdc: Unknown media size \"%s\" on line %d of %s."
 msgstr "ppdc: \"%s\" は未知の用紙サイズです。%d 行目、ファイル名 %s。"
 
-#: ppdc/ppdc-catalog.cxx:463
 #, c-format
 msgid "ppdc: Unknown message catalog format for \"%s\"."
 msgstr "\"%s\" は未知のメッセージカタログの書式です。"
 
-#: ppdc/ppdc-source.cxx:3408
 #, c-format
 msgid "ppdc: Unknown token \"%s\" seen on line %d of %s."
 msgstr "ppdc: 未知のトークン \"%s\" があります。%d 行目、ファイル名 %s。"
 
-#: ppdc/ppdc-source.cxx:1014
 #, c-format
 msgid ""
 "ppdc: Unknown trailing characters in real number \"%s\" on line %d of %s."
 msgstr "ppdc: 実数 \"%s\" に未知の終了文字があります。%d 行目、ファイル名 %s。"
 
-#: ppdc/ppdc-source.cxx:2164
 #, c-format
 msgid "ppdc: Unterminated string starting with %c on line %d of %s."
 msgstr ""
 "ppdc: %c で始まる文字に対して終端文字がありません。%d 行目、ファイル名 %s。"
 
-#: ppdc/ppdc.cxx:365
 #, c-format
 msgid "ppdc: Warning - overlapping filename \"%s\"."
 msgstr "ppdc: 警告 - ファイル名 \"%s\" が重複しています。"
 
-#: ppdc/ppdc.cxx:380
 #, c-format
 msgid "ppdc: Writing %s."
 msgstr "ppdc: %s を書き込んでいます。"
 
-#: ppdc/ppdc.cxx:148
 #, c-format
 msgid "ppdc: Writing PPD files to directory \"%s\"."
 msgstr "ppdc: ディレクトリー \"%s\" に PPD ファイルを書き込んでいます。"
 
-#: ppdc/ppdmerge.cxx:136
 #, c-format
 msgid "ppdmerge: Bad LanguageVersion \"%s\" in %s."
 msgstr "ppdmerge: 不正な LanguageVersion \"%s\" が %s にあります。"
 
-#: ppdc/ppdmerge.cxx:176
 #, c-format
 msgid "ppdmerge: Ignoring PPD file %s."
 msgstr "ppdmerge: PPD ファイル %s を無視します。"
 
-#: ppdc/ppdmerge.cxx:160
 #, c-format
 msgid "ppdmerge: Unable to backup %s to %s - %s"
 msgstr "ppdmerge: %s を %s にバックアップできません - %s"
 
-#: systemv/lpstat.c:1784
 #, c-format
 msgid "printer %s disabled since %s -"
 msgstr "プリンター %s は %s から無効です -"
 
-#: systemv/lpstat.c:1773
 #, c-format
 msgid "printer %s is idle.  enabled since %s"
 msgstr "プリンター %s は待機中です。%s 以来有効です"
 
-#: systemv/lpstat.c:1778
 #, c-format
 msgid "printer %s now printing %s-%d.  enabled since %s"
 msgstr "プリンター %s は %s-%d を印刷しています。%s 以来有効です"
 
-#: systemv/lpstat.c:1909
 #, c-format
 msgid "printer %s/%s disabled since %s -"
 msgstr "プリンター %s/%s は %s から無効です -"
 
-#: systemv/lpstat.c:1895
 #, c-format
 msgid "printer %s/%s is idle.  enabled since %s"
 msgstr "プリンター %s/%s は待機中です。%s 以来有効です"
 
-#: systemv/lpstat.c:1902
 #, c-format
 msgid "printer %s/%s now printing %s-%d.  enabled since %s"
 msgstr "プリンター %s/%s は現在 %s-%d を印刷中です。%s 以来有効です"
 
-#: cups/notify.c:93 cups/notify.c:134
 msgid "processing"
 msgstr "処理中"
 
-#: systemv/lp.c:644
 #, c-format
 msgid "request id is %s-%d (%d file(s))"
 msgstr "リクエスト ID は %s-%d です (%d 個のファイル)"
 
-#: cups/snmp.c:1020
 msgid "request-id uses indefinite length"
 msgstr "リクエスト ID の長さが不定"
 
-#: systemv/lpstat.c:2048
 msgid "scheduler is not running"
 msgstr "スケジューラーは動作していません"
 
-#: systemv/lpstat.c:2044
 msgid "scheduler is running"
 msgstr "スケジューラーは動作中です"
 
-#: cups/adminutil.c:2159
 #, c-format
 msgid "stat of %s failed: %s"
 msgstr "%s の状態取得に失敗しました: %s"
 
-#: berkeley/lpc.c:211
 msgid "status\t\tShow status of daemon and queue."
 msgstr "status\t\tデーモンとキューの状態を表示"
 
-#: cups/notify.c:96 cups/notify.c:137
 msgid "stopped"
 msgstr "停止"
 
-#: systemv/lpstat.c:1017
 #, c-format
 msgid "system default destination: %s"
 msgstr "システムのデフォルトの宛先: %s"
 
-#: systemv/lpstat.c:1014
 #, c-format
 msgid "system default destination: %s/%s"
 msgstr "システムのデフォルトの宛先: %s/%s"
 
-#: cups/notify.c:108 cups/notify.c:140
 msgid "unknown"
 msgstr "未知"
 
-#: cups/notify.c:117
 msgid "untitled"
 msgstr "タイトルなし"
 
-#: cups/snmp.c:1045
 msgid "variable-bindings uses indefinite length"
 msgstr "variable-bindings の長さが不定"
diff --git a/locale/cups_ru.po b/locale/cups_ru.po
new file mode 100644
index 00000000..24026beb
--- /dev/null
+++ b/locale/cups_ru.po
@@ -0,0 +1,8677 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CUPS 1.4\n"
+"Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
+"POT-Creation-Date: 2013-03-08 13:25-0500\n"
+"PO-Revision-Date: 2009-02-16 12:00-0800\n"
+"Last-Translator: Apple Inc.\n"
+"Language-Team: Apple Inc.\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "\t\t(all)"
+msgstr ""
+
+msgid "\t\t(none)"
+msgstr ""
+
+#, c-format
+msgid "\t%d entries"
+msgstr ""
+
+#, c-format
+msgid "\t%s"
+msgstr ""
+
+msgid "\tAfter fault: continue"
+msgstr ""
+
+#, c-format
+msgid "\tAlerts: %s"
+msgstr ""
+
+msgid "\tBanner required"
+msgstr ""
+
+msgid "\tCharset sets:"
+msgstr ""
+
+msgid "\tConnection: direct"
+msgstr ""
+
+msgid "\tConnection: remote"
+msgstr ""
+
+msgid "\tContent types: any"
+msgstr ""
+
+msgid "\tDefault page size:"
+msgstr ""
+
+msgid "\tDefault pitch:"
+msgstr ""
+
+msgid "\tDefault port settings:"
+msgstr ""
+
+#, c-format
+msgid "\tDescription: %s"
+msgstr ""
+
+msgid "\tForm mounted:"
+msgstr ""
+
+msgid "\tForms allowed:"
+msgstr ""
+
+#, c-format
+msgid "\tInterface: %s.ppd"
+msgstr ""
+
+#, c-format
+msgid "\tInterface: %s/interfaces/%s"
+msgstr ""
+
+#, c-format
+msgid "\tInterface: %s/ppd/%s.ppd"
+msgstr ""
+
+#, c-format
+msgid "\tLocation: %s"
+msgstr ""
+
+msgid "\tOn fault: no alert"
+msgstr ""
+
+msgid "\tPrinter types: unknown"
+msgstr ""
+
+#, c-format
+msgid "\tStatus: %s"
+msgstr ""
+
+msgid "\tUsers allowed:"
+msgstr ""
+
+msgid "\tUsers denied:"
+msgstr ""
+
+msgid "\tdaemon present"
+msgstr ""
+
+msgid "\tno entries"
+msgstr ""
+
+#, c-format
+msgid "\tprinter is on device '%s' speed -1"
+msgstr ""
+
+msgid "\tprinting is disabled"
+msgstr ""
+
+msgid "\tprinting is enabled"
+msgstr ""
+
+#, c-format
+msgid "\tqueued for %s"
+msgstr ""
+
+msgid "\tqueuing is disabled"
+msgstr ""
+
+msgid "\tqueuing is enabled"
+msgstr ""
+
+msgid "\treason unknown"
+msgstr ""
+
+msgid ""
+"\n"
+"    DETAILED CONFORMANCE TEST RESULTS"
+msgstr ""
+
+msgid "                          Ignore specific warnings."
+msgstr ""
+
+msgid "                          Issue warnings instead of errors."
+msgstr ""
+
+msgid "                REF: Page 15, section 3.1."
+msgstr ""
+
+msgid "                REF: Page 15, section 3.2."
+msgstr ""
+
+msgid "                REF: Page 19, section 3.3."
+msgstr ""
+
+msgid "                REF: Page 20, section 3.4."
+msgstr ""
+
+msgid "                REF: Page 27, section 3.5."
+msgstr ""
+
+msgid "                REF: Page 42, section 5.2."
+msgstr ""
+
+msgid "                REF: Pages 16-17, section 3.2."
+msgstr ""
+
+msgid "                REF: Pages 42-45, section 5.2."
+msgstr ""
+
+msgid "                REF: Pages 45-46, section 5.2."
+msgstr ""
+
+msgid "                REF: Pages 48-49, section 5.2."
+msgstr ""
+
+msgid "                REF: Pages 52-54, section 5.2."
+msgstr ""
+
+#, c-format
+msgid "        %-39.39s %.0f bytes"
+msgstr ""
+
+#, c-format
+msgid "        PASS    Default%s"
+msgstr ""
+
+msgid "        PASS    DefaultImageableArea"
+msgstr ""
+
+msgid "        PASS    DefaultPaperDimension"
+msgstr ""
+
+msgid "        PASS    FileVersion"
+msgstr ""
+
+msgid "        PASS    FormatVersion"
+msgstr ""
+
+msgid "        PASS    LanguageEncoding"
+msgstr ""
+
+msgid "        PASS    LanguageVersion"
+msgstr ""
+
+msgid "        PASS    Manufacturer"
+msgstr ""
+
+msgid "        PASS    ModelName"
+msgstr ""
+
+msgid "        PASS    NickName"
+msgstr ""
+
+msgid "        PASS    PCFileName"
+msgstr ""
+
+msgid "        PASS    PSVersion"
+msgstr ""
+
+msgid "        PASS    PageRegion"
+msgstr ""
+
+msgid "        PASS    PageSize"
+msgstr ""
+
+msgid "        PASS    Product"
+msgstr ""
+
+msgid "        PASS    ShortNickName"
+msgstr ""
+
+#, c-format
+msgid "        WARN    %s has no corresponding options."
+msgstr ""
+
+#, c-format
+msgid ""
+"        WARN    %s shares a common prefix with %s\n"
+"                REF: Page 15, section 3.2."
+msgstr ""
+
+#, c-format
+msgid ""
+"        WARN    Duplex option keyword %s may not work as expected and should "
+"be named Duplex.\n"
+"                REF: Page 122, section 5.17"
+msgstr ""
+
+msgid "        WARN    File contains a mix of CR, LF, and CR LF line endings."
+msgstr ""
+
+msgid ""
+"        WARN    LanguageEncoding required by PPD 4.3 spec.\n"
+"                REF: Pages 56-57, section 5.3."
+msgstr ""
+
+#, c-format
+msgid "        WARN    Line %d only contains whitespace."
+msgstr ""
+
+msgid ""
+"        WARN    Manufacturer required by PPD 4.3 spec.\n"
+"                REF: Pages 58-59, section 5.3."
+msgstr ""
+
+msgid ""
+"        WARN    Non-Windows PPD files should use lines ending with only LF, "
+"not CR LF."
+msgstr ""
+
+#, c-format
+msgid ""
+"        WARN    Obsolete PPD version %.1f.\n"
+"                REF: Page 42, section 5.2."
+msgstr ""
+
+msgid ""
+"        WARN    PCFileName longer than 8.3 in violation of PPD spec.\n"
+"                REF: Pages 61-62, section 5.3."
+msgstr ""
+
+msgid ""
+"        WARN    PCFileName should contain a unique filename.\n"
+"                REF: Pages 61-62, section 5.3."
+msgstr ""
+
+msgid ""
+"        WARN    Protocols contains PJL but JCL attributes are not set.\n"
+"                REF: Pages 78-79, section 5.7."
+msgstr ""
+
+msgid ""
+"        WARN    Protocols contains both PJL and BCP; expected TBCP.\n"
+"                REF: Pages 78-79, section 5.7."
+msgstr ""
+
+msgid ""
+"        WARN    ShortNickName required by PPD 4.3 spec.\n"
+"                REF: Pages 64-65, section 5.3."
+msgstr ""
+
+msgid "       cupsaddsmb [options] -a"
+msgstr ""
+
+msgid "       cupstestdsc [options] -"
+msgstr ""
+
+msgid "       program | cupstestppd [options] -"
+msgstr ""
+
+#, c-format
+msgid ""
+"      %s  \"%s %s\" conflicts with \"%s %s\"\n"
+"                (constraint=\"%s %s %s %s\")."
+msgstr ""
+
+#, c-format
+msgid "      %s  %s %s does not exist."
+msgstr ""
+
+#, c-format
+msgid "      %s  %s file \"%s\" has the wrong capitalization."
+msgstr ""
+
+#, c-format
+msgid ""
+"      %s  Bad %s choice %s.\n"
+"                REF: Page 122, section 5.17"
+msgstr ""
+
+#, c-format
+msgid "      %s  Bad UTF-8 \"%s\" translation string for option %s, choice %s."
+msgstr ""
+
+#, c-format
+msgid "      %s  Bad UTF-8 \"%s\" translation string for option %s."
+msgstr ""
+
+#, c-format
+msgid "      %s  Bad cupsFilter value \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "      %s  Bad cupsFilter2 value \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "      %s  Bad cupsICCProfile %s."
+msgstr ""
+
+#, c-format
+msgid "      %s  Bad cupsPreFilter value \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "      %s  Bad cupsUIConstraints %s: \"%s\""
+msgstr ""
+
+#, c-format
+msgid "      %s  Bad language \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "      %s  Bad permissions on %s file \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "      %s  Bad spelling of %s - should be %s."
+msgstr ""
+
+#, c-format
+msgid "      %s  Cannot provide both APScanAppPath and APScanAppBundleID."
+msgstr ""
+
+#, c-format
+msgid "      %s  Default choices conflicting."
+msgstr ""
+
+#, c-format
+msgid "      %s  Empty cupsUIConstraints %s"
+msgstr ""
+
+#, c-format
+msgid "      %s  Missing \"%s\" translation string for option %s, choice %s."
+msgstr ""
+
+#, c-format
+msgid "      %s  Missing \"%s\" translation string for option %s."
+msgstr ""
+
+#, c-format
+msgid "      %s  Missing %s file \"%s\"."
+msgstr ""
+
+#, c-format
+msgid ""
+"      %s  Missing REQUIRED PageRegion option.\n"
+"                REF: Page 100, section 5.14."
+msgstr ""
+
+#, c-format
+msgid ""
+"      %s  Missing REQUIRED PageSize option.\n"
+"                REF: Page 99, section 5.14."
+msgstr ""
+
+#, c-format
+msgid "      %s  Missing choice *%s %s in UIConstraints \"*%s %s *%s %s\"."
+msgstr ""
+
+#, c-format
+msgid "      %s  Missing choice *%s %s in cupsUIConstraints %s: \"%s\""
+msgstr ""
+
+#, c-format
+msgid "      %s  Missing cupsUIResolver %s"
+msgstr ""
+
+#, c-format
+msgid "      %s  Missing option %s in UIConstraints \"*%s %s *%s %s\"."
+msgstr ""
+
+#, c-format
+msgid "      %s  Missing option %s in cupsUIConstraints %s: \"%s\""
+msgstr ""
+
+#, c-format
+msgid "      %s  No base translation \"%s\" is included in file."
+msgstr ""
+
+#, c-format
+msgid ""
+"      %s  REQUIRED %s does not define choice None.\n"
+"                REF: Page 122, section 5.17"
+msgstr ""
+
+#, c-format
+msgid "      %s  Size \"%s\" defined for %s but not for %s."
+msgstr ""
+
+#, c-format
+msgid "      %s  Size \"%s\" has unexpected dimensions (%gx%g)."
+msgstr ""
+
+#, c-format
+msgid "      %s  Size \"%s\" should be \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "      %s  Size \"%s\" should be the Adobe standard name \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "      %s  cupsICCProfile %s hash value collides with %s."
+msgstr ""
+
+#, c-format
+msgid "      %s  cupsUIResolver %s causes a loop."
+msgstr ""
+
+#, c-format
+msgid ""
+"      %s  cupsUIResolver %s does not list at least two different options."
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  %s must be 1284DeviceID\n"
+"                REF: Page 72, section 5.5"
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  Bad Default%s %s\n"
+"                REF: Page 40, section 4.5."
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  Bad DefaultImageableArea %s\n"
+"                REF: Page 102, section 5.15."
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  Bad DefaultPaperDimension %s\n"
+"                REF: Page 103, section 5.15."
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  Bad FileVersion \"%s\"\n"
+"                REF: Page 56, section 5.3."
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  Bad FormatVersion \"%s\"\n"
+"                REF: Page 56, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  Bad JobPatchFile attribute in file\n"
+"                REF: Page 24, section 3.4."
+msgstr ""
+
+#, c-format
+msgid "      **FAIL**  Bad LanguageEncoding %s - must be ISOLatin1."
+msgstr ""
+
+#, c-format
+msgid "      **FAIL**  Bad LanguageVersion %s - must be English."
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  Bad Manufacturer (should be \"%s\")\n"
+"                REF: Page 211, table D.1."
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  Bad ModelName - \"%c\" not allowed in string.\n"
+"                REF: Pages 59-60, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  Bad PSVersion - not \"(string) int\".\n"
+"                REF: Pages 62-64, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  Bad Product - not \"(string)\".\n"
+"                REF: Page 62, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  Bad ShortNickName - longer than 31 chars.\n"
+"                REF: Pages 64-65, section 5.3."
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  Bad option %s choice %s\n"
+"                REF: Page 84, section 5.9"
+msgstr ""
+
+#, c-format
+msgid "      **FAIL**  Default option code cannot be interpreted: %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  Default translation string for option %s choice %s contains "
+"8-bit characters."
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  Default translation string for option %s contains 8-bit "
+"characters."
+msgstr ""
+
+#, c-format
+msgid "      **FAIL**  Group names %s and %s differ only by case."
+msgstr ""
+
+#, c-format
+msgid "      **FAIL**  Multiple occurrences of option %s choice name %s."
+msgstr ""
+
+#, c-format
+msgid "      **FAIL**  Option %s choice names %s and %s differ only by case."
+msgstr ""
+
+#, c-format
+msgid "      **FAIL**  Option names %s and %s differ only by case."
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  REQUIRED Default%s\n"
+"                REF: Page 40, section 4.5."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED DefaultImageableArea\n"
+"                REF: Page 102, section 5.15."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED DefaultPaperDimension\n"
+"                REF: Page 103, section 5.15."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED FileVersion\n"
+"                REF: Page 56, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED FormatVersion\n"
+"                REF: Page 56, section 5.3."
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  REQUIRED ImageableArea for PageSize %s\n"
+"                REF: Page 41, section 5.\n"
+"                REF: Page 102, section 5.15."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED LanguageEncoding\n"
+"                REF: Pages 56-57, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED LanguageVersion\n"
+"                REF: Pages 57-58, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED Manufacturer\n"
+"                REF: Pages 58-59, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED ModelName\n"
+"                REF: Pages 59-60, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED NickName\n"
+"                REF: Page 60, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED PCFileName\n"
+"                REF: Pages 61-62, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED PSVersion\n"
+"                REF: Pages 62-64, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED PageRegion\n"
+"                REF: Page 100, section 5.14."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED PageSize\n"
+"                REF: Page 41, section 5.\n"
+"                REF: Page 99, section 5.14."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED PageSize\n"
+"                REF: Pages 99-100, section 5.14."
+msgstr ""
+
+#, c-format
+msgid ""
+"      **FAIL**  REQUIRED PaperDimension for PageSize %s\n"
+"                REF: Page 41, section 5.\n"
+"                REF: Page 103, section 5.15."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED Product\n"
+"                REF: Page 62, section 5.3."
+msgstr ""
+
+msgid ""
+"      **FAIL**  REQUIRED ShortNickName\n"
+"                REF: Page 64-65, section 5.3."
+msgstr ""
+
+#, c-format
+msgid "      **FAIL**  Unable to open PPD file - %s on line %d."
+msgstr ""
+
+#, c-format
+msgid "    %d ERRORS FOUND"
+msgstr ""
+
+msgid "    -h       Show program usage"
+msgstr ""
+
+#, c-format
+msgid ""
+"    Bad %%%%BoundingBox: on line %d.\n"
+"        REF: Page 39, %%%%BoundingBox:"
+msgstr ""
+
+#, c-format
+msgid ""
+"    Bad %%%%Page: on line %d.\n"
+"        REF: Page 53, %%%%Page:"
+msgstr ""
+
+#, c-format
+msgid ""
+"    Bad %%%%Pages: on line %d.\n"
+"        REF: Page 43, %%%%Pages:"
+msgstr ""
+
+#, c-format
+msgid ""
+"    Line %d is longer than 255 characters (%d).\n"
+"        REF: Page 25, Line Length"
+msgstr ""
+
+msgid ""
+"    Missing %!PS-Adobe-3.0 on first line.\n"
+"        REF: Page 17, 3.1 Conforming Documents"
+msgstr ""
+
+#, c-format
+msgid "    Missing %%EndComments comment.        REF: Page 41, %%EndComments"
+msgstr ""
+
+#, c-format
+msgid ""
+"    Missing or bad %%BoundingBox: comment.\n"
+"        REF: Page 39, %%BoundingBox:"
+msgstr ""
+
+#, c-format
+msgid ""
+"    Missing or bad %%Page: comments.\n"
+"        REF: Page 53, %%Page:"
+msgstr ""
+
+#, c-format
+msgid ""
+"    Missing or bad %%Pages: comment.\n"
+"        REF: Page 43, %%Pages:"
+msgstr ""
+
+msgid "    NO ERRORS FOUND"
+msgstr ""
+
+#, c-format
+msgid "    Saw %d lines that exceeded 255 characters."
+msgstr ""
+
+#, c-format
+msgid "    Too many %%BeginDocument comments."
+msgstr ""
+
+#, c-format
+msgid "    Too many %%EndDocument comments."
+msgstr ""
+
+msgid "    Warning: file contains binary data."
+msgstr ""
+
+#, c-format
+msgid "    Warning: no %%EndComments comment in file."
+msgstr ""
+
+#, c-format
+msgid "    Warning: obsolete DSC version %.1f in file."
+msgstr ""
+
+msgid "  --[no-]debug-logging    Turn debug logging on/off."
+msgstr ""
+
+msgid "  --[no-]remote-admin     Turn remote administration on/off."
+msgstr ""
+
+msgid "  --[no-]remote-any       Allow/prevent access from the Internet."
+msgstr ""
+
+msgid "  --[no-]share-printers   Turn printer sharing on/off."
+msgstr ""
+
+msgid "  --[no-]user-cancel-any  Allow/prevent users to cancel any job."
+msgstr ""
+
+msgid "  --cr                    End lines with CR (Mac OS 9)."
+msgstr ""
+
+msgid "  --crlf                  End lines with CR + LF (Windows)."
+msgstr ""
+
+msgid "  --lf                    End lines with LF (UNIX/Linux/OS X)."
+msgstr ""
+
+msgid "  -4                      Connect using IPv4."
+msgstr ""
+
+msgid "  -6                      Connect using IPv6."
+msgstr ""
+
+msgid "  -C                      Send requests using chunking (default)."
+msgstr ""
+
+msgid "  -D                      Remove the input file when finished."
+msgstr ""
+
+msgid "  -D name=value           Set named variable to value."
+msgstr ""
+
+msgid "  -E                      Encrypt the connection."
+msgstr ""
+
+msgid "  -E                      Test with HTTP Upgrade to TLS."
+msgstr ""
+
+msgid ""
+"  -F                      Run in the foreground but detach from console."
+msgstr ""
+
+msgid "  -H samba-server         Use the named SAMBA server."
+msgstr ""
+
+msgid "  -I                      Ignore errors."
+msgstr ""
+
+msgid "  -I include-dir          Add include directory to search path."
+msgstr ""
+
+msgid "  -I {filename,filters,none,profiles}"
+msgstr ""
+
+msgid "  -L                      Send requests using content-length."
+msgstr ""
+
+msgid "  -P filename.ppd         Set PPD file."
+msgstr ""
+
+msgid "  -R root-directory       Set alternate root."
+msgstr ""
+
+msgid "  -S                      Test with SSL encryption."
+msgstr ""
+
+msgid "  -T seconds              Set the receive/send timeout in seconds."
+msgstr ""
+
+msgid "  -U username             Specify username."
+msgstr ""
+
+msgid "  -V version              Set default IPP version."
+msgstr ""
+
+msgid ""
+"  -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,"
+"translations}"
+msgstr ""
+
+msgid "  -X                      Produce XML plist instead of plain text."
+msgstr ""
+
+msgid "  -a                      Export all printers."
+msgstr ""
+
+msgid "  -c catalog.po           Load the specified message catalog."
+msgstr ""
+
+msgid "  -c cupsd.conf           Set cupsd.conf file to use."
+msgstr ""
+
+msgid "  -d name=value           Set named variable to value."
+msgstr ""
+
+msgid "  -d output-dir           Specify the output directory."
+msgstr ""
+
+msgid "  -d printer              Use the named printer."
+msgstr ""
+
+msgid "  -e                      Use every filter from the PPD file."
+msgstr ""
+
+msgid "  -f                      Run in the foreground."
+msgstr ""
+
+msgid "  -f filename             Set default request filename."
+msgstr ""
+
+msgid "  -h                      Show this usage message."
+msgstr ""
+
+msgid "  -h server[:port]        Specify server address."
+msgstr ""
+
+msgid "  -i mime/type            Set input MIME type (otherwise auto-typed)."
+msgstr ""
+
+msgid ""
+"  -i seconds              Repeat the last file with the given time interval."
+msgstr ""
+
+msgid ""
+"  -j job-id[,N]           Filter file N from the specified job (default is "
+"file 1)."
+msgstr ""
+
+msgid "  -l                      Run cupsd from launchd(8)."
+msgstr ""
+
+msgid "  -l lang[,lang,...]      Specify the output language(s) (locale)."
+msgstr ""
+
+msgid "  -m                      Use the ModelName value as the filename."
+msgstr ""
+
+msgid ""
+"  -m mime/type            Set output MIME type (otherwise application/pdf)."
+msgstr ""
+
+msgid "  -n copies               Set number of copies."
+msgstr ""
+
+msgid ""
+"  -n count                Repeat the last file the given number of times."
+msgstr ""
+
+msgid ""
+"  -o filename.drv         Set driver information file (otherwise ppdi.drv)."
+msgstr ""
+
+msgid "  -o filename.ppd[.gz]    Set output file (otherwise stdout)."
+msgstr ""
+
+msgid "  -o name=value           Set option(s)."
+msgstr ""
+
+msgid "  -p filename.ppd         Set PPD file."
+msgstr ""
+
+msgid "  -q                      Run silently."
+msgstr ""
+
+msgid "  -r                      Use 'relaxed' open mode."
+msgstr ""
+
+msgid "  -t                      Produce a test report."
+msgstr ""
+
+msgid "  -t                      Test PPDs instead of generating them."
+msgstr ""
+
+msgid "  -t                      Test the configuration file."
+msgstr ""
+
+msgid "  -t title                Set title."
+msgstr ""
+
+msgid "  -u                      Remove the PPD file when finished."
+msgstr ""
+
+msgid "  -v                      Be verbose."
+msgstr ""
+
+msgid "  -vv                     Be very verbose."
+msgstr ""
+
+msgid "  -z                      Compress PPD files using GNU zip."
+msgstr ""
+
+msgid " FAIL"
+msgstr ""
+
+msgid " PASS"
+msgstr ""
+
+#, c-format
+msgid "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes"
+msgstr ""
+
+#, c-format
+msgid "%-7s %-7.7s %-7d %-31.31s %.0f bytes"
+msgstr ""
+
+#, c-format
+msgid "%s accepting requests since %s"
+msgstr ""
+
+#, c-format
+msgid "%s cannot be changed."
+msgstr "%s не может быть изменен."
+
+#, c-format
+msgid "%s is not implemented by the CUPS version of lpc."
+msgstr ""
+
+#, c-format
+msgid "%s is not ready"
+msgstr ""
+
+#, c-format
+msgid "%s is ready"
+msgstr ""
+
+#, c-format
+msgid "%s is ready and printing"
+msgstr ""
+
+#, c-format
+msgid "%s job-id user title copies options [file]"
+msgstr ""
+
+#, c-format
+msgid "%s not accepting requests since %s -"
+msgstr ""
+
+#, c-format
+msgid "%s not supported."
+msgstr ""
+
+#, c-format
+msgid "%s/%s accepting requests since %s"
+msgstr ""
+
+#, c-format
+msgid "%s/%s not accepting requests since %s -"
+msgstr ""
+
+#, c-format
+msgid "%s: %-33.33s [job %d localhost]"
+msgstr ""
+
+#. TRANSLATORS: Message is "subject: error"
+#, c-format
+msgid "%s: %s"
+msgstr ""
+
+#, c-format
+msgid "%s: %s failed: %s"
+msgstr ""
+
+#, c-format
+msgid "%s: Don't know what to do."
+msgstr ""
+
+#, c-format
+msgid ""
+"%s: Error - %s environment variable names non-existent destination \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - bad job ID."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - cannot print files and alter jobs simultaneously."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - cannot print from stdin if files or a job ID are provided."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected character set after \"-S\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected content type after \"-T\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected copies after \"-#\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected copies after \"-n\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected destination after \"-P\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected destination after \"-b\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected destination after \"-d\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected form after \"-f\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected hold name after \"-H\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected hostname after \"-H\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected hostname after \"-h\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected mode list after \"-y\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected name after \"-%c\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected option=value after \"-o\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected page list after \"-P\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected priority after \"-%c\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected reason text after \"-r\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected title after \"-t\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected username after \"-U\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected username after \"-u\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - expected value after \"-%c\" option."
+msgstr ""
+
+#, c-format
+msgid ""
+"%s: Error - need \"completed\", \"not-completed\", or \"all\" after \"-W\" "
+"option."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - no default destination available."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - priority must be between 1 and 100."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - scheduler not responding."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - too many files - \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - unable to access \"%s\" - %s"
+msgstr ""
+
+#, c-format
+msgid "%s: Error - unable to queue from stdin - %s."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - unknown destination \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - unknown destination \"%s/%s\"."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - unknown option \"%c\"."
+msgstr ""
+
+#, c-format
+msgid "%s: Error - unknown option \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "%s: Expected job ID after \"-i\" option."
+msgstr ""
+
+#, c-format
+msgid "%s: Invalid destination name in list \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "%s: Invalid filter string \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "%s: Need job ID (\"-i jobid\") before \"-H restart\"."
+msgstr ""
+
+#, c-format
+msgid "%s: No filter to convert from %s/%s to %s/%s."
+msgstr ""
+
+#, c-format
+msgid "%s: Operation failed: %s"
+msgstr ""
+
+#, c-format
+msgid "%s: Sorry, no encryption support."
+msgstr ""
+
+#, c-format
+msgid "%s: Unable to connect to server."
+msgstr ""
+
+#, c-format
+msgid "%s: Unable to contact server."
+msgstr ""
+
+#, c-format
+msgid "%s: Unable to determine MIME type of \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "%s: Unable to open %s: %s"
+msgstr ""
+
+#, c-format
+msgid "%s: Unable to open PPD file: %s on line %d."
+msgstr ""
+
+#, c-format
+msgid "%s: Unable to read MIME database from \"%s\" or \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "%s: Unknown destination \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "%s: Unknown destination MIME type %s/%s."
+msgstr ""
+
+#, c-format
+msgid "%s: Unknown option \"%c\"."
+msgstr ""
+
+#, c-format
+msgid "%s: Unknown source MIME type %s/%s."
+msgstr ""
+
+#, c-format
+msgid ""
+"%s: Warning - \"%c\" format modifier not supported - output may not be "
+"correct."
+msgstr ""
+
+#, c-format
+msgid "%s: Warning - character set option ignored."
+msgstr ""
+
+#, c-format
+msgid "%s: Warning - content type option ignored."
+msgstr ""
+
+#, c-format
+msgid "%s: Warning - form option ignored."
+msgstr ""
+
+#, c-format
+msgid "%s: Warning - mode option ignored."
+msgstr ""
+
+msgid "-1"
+msgstr "-1"
+
+msgid "-10"
+msgstr "-10"
+
+msgid "-100"
+msgstr "-100"
+
+msgid "-105"
+msgstr "-105"
+
+msgid "-11"
+msgstr "-11"
+
+msgid "-110"
+msgstr "-110"
+
+msgid "-115"
+msgstr "-115"
+
+msgid "-12"
+msgstr "-12"
+
+msgid "-120"
+msgstr "-120"
+
+msgid "-13"
+msgstr "-13"
+
+msgid "-14"
+msgstr "-14"
+
+msgid "-15"
+msgstr "-15"
+
+msgid "-2"
+msgstr "-2"
+
+msgid "-20"
+msgstr "-20"
+
+msgid "-25"
+msgstr "-25"
+
+msgid "-3"
+msgstr "-3"
+
+msgid "-30"
+msgstr "-30"
+
+msgid "-35"
+msgstr "-35"
+
+msgid "-4"
+msgstr "-4"
+
+msgid "-40"
+msgstr "-40"
+
+msgid "-45"
+msgstr "-45"
+
+msgid "-5"
+msgstr "-5"
+
+msgid "-50"
+msgstr "-50"
+
+msgid "-55"
+msgstr "-55"
+
+msgid "-6"
+msgstr "-6"
+
+msgid "-60"
+msgstr "-60"
+
+msgid "-65"
+msgstr "-65"
+
+msgid "-7"
+msgstr "-7"
+
+msgid "-70"
+msgstr "-70"
+
+msgid "-75"
+msgstr "-75"
+
+msgid "-8"
+msgstr "-8"
+
+msgid "-80"
+msgstr "-80"
+
+msgid "-85"
+msgstr "-85"
+
+msgid "-9"
+msgstr "-9"
+
+msgid "-90"
+msgstr "-90"
+
+msgid "-95"
+msgstr "-95"
+
+msgid "0"
+msgstr "0"
+
+msgid "1"
+msgstr "1"
+
+msgid "1 inch/sec."
+msgstr "1 дюйм/с"
+
+msgid "1.25x0.25\""
+msgstr "1,25x0,25\""
+
+msgid "1.25x2.25\""
+msgstr "1,25x2,25\""
+
+msgid "1.5 inch/sec."
+msgstr "1,5 дюйма/с"
+
+msgid "1.50x0.25\""
+msgstr "1,50x0,25\""
+
+msgid "1.50x0.50\""
+msgstr "1,50x0,50\""
+
+msgid "1.50x1.00\""
+msgstr "1,50x1,00\""
+
+msgid "1.50x2.00\""
+msgstr "1,50x2,00\""
+
+msgid "10"
+msgstr "10"
+
+msgid "10 inches/sec."
+msgstr "10 дюймов/с"
+
+msgid "10 x 11"
+msgstr ""
+
+msgid "10 x 13"
+msgstr ""
+
+msgid "10 x 14"
+msgstr ""
+
+msgid "100"
+msgstr "100"
+
+msgid "100 mm/sec."
+msgstr "100 мм/с"
+
+msgid "105"
+msgstr "105"
+
+msgid "11"
+msgstr "11"
+
+msgid "11 inches/sec."
+msgstr "11 дюймов/с"
+
+msgid "110"
+msgstr "110"
+
+msgid "115"
+msgstr "115"
+
+msgid "12"
+msgstr "12"
+
+msgid "12 inches/sec."
+msgstr "12 дюймов/с"
+
+msgid "12 x 11"
+msgstr ""
+
+msgid "120"
+msgstr "120"
+
+msgid "120 mm/sec."
+msgstr "120 мм/с"
+
+msgid "120x60dpi"
+msgstr "120x60dpi"
+
+msgid "120x72dpi"
+msgstr "120x72dpi"
+
+msgid "13"
+msgstr "13"
+
+msgid "136dpi"
+msgstr "136dpi"
+
+msgid "14"
+msgstr "14"
+
+msgid "15"
+msgstr "15"
+
+msgid "15 mm/sec."
+msgstr "15 мм/с"
+
+msgid "15 x 11"
+msgstr ""
+
+msgid "150 mm/sec."
+msgstr "150 мм/с"
+
+msgid "150dpi"
+msgstr "150dpi"
+
+msgid "16"
+msgstr "16"
+
+msgid "17"
+msgstr "17"
+
+msgid "18"
+msgstr "18"
+
+msgid "180dpi"
+msgstr "180dpi"
+
+msgid "19"
+msgstr "19"
+
+msgid "2"
+msgstr "2"
+
+msgid "2 inches/sec."
+msgstr "2 дюйма/с"
+
+msgid "2-Sided Printing"
+msgstr "двусторонняя печать"
+
+msgid "2.00x0.37\""
+msgstr "2,00x0,37\""
+
+msgid "2.00x0.50\""
+msgstr "2,00x0,50\""
+
+msgid "2.00x1.00\""
+msgstr "2,00x1,00\""
+
+msgid "2.00x1.25\""
+msgstr "2,00x1,25\""
+
+msgid "2.00x2.00\""
+msgstr "2,00x2,00\""
+
+msgid "2.00x3.00\""
+msgstr "2,00x3,00\""
+
+msgid "2.00x4.00\""
+msgstr "2,00x4,00\""
+
+msgid "2.00x5.50\""
+msgstr "2,00x5,50\""
+
+msgid "2.25x0.50\""
+msgstr "2,25x0,50\""
+
+msgid "2.25x1.25\""
+msgstr "2,25x1,25\""
+
+msgid "2.25x4.00\""
+msgstr "2,25x4,00\""
+
+msgid "2.25x5.50\""
+msgstr "2,25x5,50\""
+
+msgid "2.38x5.50\""
+msgstr "2,38x5,50\""
+
+msgid "2.5 inches/sec."
+msgstr "2,5 дюйма/с"
+
+msgid "2.50x1.00\""
+msgstr "2,50x1,00\""
+
+msgid "2.50x2.00\""
+msgstr "2,50x2,00\""
+
+msgid "2.75x1.25\""
+msgstr "2,75x1,25\""
+
+msgid "2.9 x 1\""
+msgstr "2,9 x 1\""
+
+msgid "20"
+msgstr "20"
+
+msgid "20 mm/sec."
+msgstr "20 мм/с"
+
+msgid "200 mm/sec."
+msgstr "200 мм/с"
+
+msgid "203dpi"
+msgstr "203dpi"
+
+msgid "21"
+msgstr "21"
+
+msgid "22"
+msgstr "22"
+
+msgid "23"
+msgstr "23"
+
+msgid "24"
+msgstr "24"
+
+msgid "24-Pin Series"
+msgstr "Тип 24-Pin"
+
+msgid "240x72dpi"
+msgstr "240x72dpi"
+
+msgid "25"
+msgstr "25"
+
+msgid "250 mm/sec."
+msgstr "250 мм/с"
+
+msgid "26"
+msgstr "26"
+
+msgid "27"
+msgstr "27"
+
+msgid "28"
+msgstr "28"
+
+msgid "29"
+msgstr "29"
+
+msgid "3"
+msgstr "3"
+
+msgid "3 inches/sec."
+msgstr "3 дюйма/с"
+
+msgid "3 x 5"
+msgstr ""
+
+msgid "3.00x1.00\""
+msgstr "3,00x1,00\""
+
+msgid "3.00x1.25\""
+msgstr "3,00x1,25\""
+
+msgid "3.00x2.00\""
+msgstr "3,00x2,00\""
+
+msgid "3.00x3.00\""
+msgstr "3,00x3,00\""
+
+msgid "3.00x5.00\""
+msgstr "3,00x5,00\""
+
+msgid "3.25x2.00\""
+msgstr "3,25x2,00\""
+
+msgid "3.25x5.00\""
+msgstr "3,25x5,00\""
+
+msgid "3.25x5.50\""
+msgstr "3,25x5,50\""
+
+msgid "3.25x5.83\""
+msgstr "3,25x5,83\""
+
+msgid "3.25x7.83\""
+msgstr "3,25x7,83\""
+
+msgid "3.5 x 5"
+msgstr ""
+
+msgid "3.5\" Disk"
+msgstr "Диск 3.5\""
+
+msgid "3.50x1.00\""
+msgstr "3,50x1,00\""
+
+msgid "30"
+msgstr "30"
+
+msgid "30 mm/sec."
+msgstr "30 мм/с"
+
+msgid "300 mm/sec."
+msgstr "300 мм/с"
+
+msgid "300dpi"
+msgstr "300dpi"
+
+msgid "35"
+msgstr "35"
+
+msgid "360dpi"
+msgstr "360dpi"
+
+msgid "360x180dpi"
+msgstr "360x180dpi"
+
+msgid "4"
+msgstr "4"
+
+msgid "4 inches/sec."
+msgstr "4 дюйма/с"
+
+msgid "4.00x1.00\""
+msgstr "4,00x1,00\""
+
+msgid "4.00x13.00\""
+msgstr "4,00x13,00\""
+
+msgid "4.00x2.00\""
+msgstr "4,00x2,00\""
+
+msgid "4.00x2.50\""
+msgstr "4,00x2,50\""
+
+msgid "4.00x3.00\""
+msgstr "4,00x3,00\""
+
+msgid "4.00x4.00\""
+msgstr "4,00x4,00\""
+
+msgid "4.00x5.00\""
+msgstr "4,00x5,00\""
+
+msgid "4.00x6.00\""
+msgstr "4,00x6,00\""
+
+msgid "4.00x6.50\""
+msgstr "4,00x6,50\""
+
+msgid "40"
+msgstr "40"
+
+msgid "40 mm/sec."
+msgstr "40 мм/с"
+
+msgid "45"
+msgstr "45"
+
+msgid "5"
+msgstr "5"
+
+msgid "5 inches/sec."
+msgstr "5 дюймов/с"
+
+msgid "5 x 7"
+msgstr ""
+
+msgid "50"
+msgstr "50"
+
+msgid "55"
+msgstr "55"
+
+msgid "6"
+msgstr "6"
+
+msgid "6 inches/sec."
+msgstr "6 дюймов/с"
+
+msgid "6.00x1.00\""
+msgstr "6,00x1,00\""
+
+msgid "6.00x2.00\""
+msgstr "6,00x2,00\""
+
+msgid "6.00x3.00\""
+msgstr "6,00x3,00\""
+
+msgid "6.00x4.00\""
+msgstr "6,00x4,00\""
+
+msgid "6.00x5.00\""
+msgstr "6,00x5,00\""
+
+msgid "6.00x6.00\""
+msgstr "6,00x6,00\""
+
+msgid "6.00x6.50\""
+msgstr "6,00x6,50\""
+
+msgid "60"
+msgstr "60"
+
+msgid "60 mm/sec."
+msgstr "60 мм/с"
+
+msgid "600dpi"
+msgstr "600dpi"
+
+msgid "60dpi"
+msgstr "60dpi"
+
+msgid "60x72dpi"
+msgstr ""
+
+msgid "65"
+msgstr "65"
+
+msgid "7"
+msgstr "7"
+
+msgid "7 inches/sec."
+msgstr "7 дюймов/с"
+
+msgid "7 x 9"
+msgstr ""
+
+msgid "70"
+msgstr "70"
+
+msgid "720dpi"
+msgstr "720dpi"
+
+msgid "75"
+msgstr "75"
+
+msgid "8"
+msgstr "8"
+
+msgid "8 inches/sec."
+msgstr "8 дюймов/с"
+
+msgid "8 x 10"
+msgstr ""
+
+msgid "8.00x1.00\""
+msgstr "8,00x1,00\""
+
+msgid "8.00x2.00\""
+msgstr "8,00x2,00\""
+
+msgid "8.00x3.00\""
+msgstr "8,00x3,00\""
+
+msgid "8.00x4.00\""
+msgstr "8,00x4,00\""
+
+msgid "8.00x5.00\""
+msgstr "8,00x5,00\""
+
+msgid "8.00x6.00\""
+msgstr "8,00x6,00\""
+
+msgid "8.00x6.50\""
+msgstr "8,00x6,50\""
+
+msgid "80"
+msgstr "80"
+
+msgid "80 mm/sec."
+msgstr "80 мм/с"
+
+msgid "85"
+msgstr "85"
+
+msgid "9"
+msgstr "9"
+
+msgid "9 inches/sec."
+msgstr "9 дюймов/с"
+
+msgid "9 x 11"
+msgstr ""
+
+msgid "9 x 12"
+msgstr ""
+
+msgid "9-Pin Series"
+msgstr "Тип 9-Pin"
+
+msgid "90"
+msgstr "90"
+
+msgid "95"
+msgstr "95"
+
+msgid "?Invalid help command unknown."
+msgstr ""
+
+msgid "A Samba password is required to export printer drivers"
+msgstr "Для экспорта драйверов принтера требуется пароль Samba"
+
+msgid "A Samba username is required to export printer drivers"
+msgstr "Для экспорта драйверов принтера требуется имя пользователя Samba"
+
+#, c-format
+msgid "A class named \"%s\" already exists."
+msgstr ""
+
+#, c-format
+msgid "A printer named \"%s\" already exists."
+msgstr ""
+
+msgid "A0"
+msgstr "A0"
+
+msgid "A0 Long Edge"
+msgstr ""
+
+msgid "A1"
+msgstr "A1"
+
+msgid "A1 Long Edge"
+msgstr ""
+
+msgid "A10"
+msgstr "A10"
+
+msgid "A2"
+msgstr "A2"
+
+msgid "A2 Long Edge"
+msgstr ""
+
+msgid "A3"
+msgstr "A3"
+
+msgid "A3 Long Edge"
+msgstr ""
+
+msgid "A3 Oversize"
+msgstr ""
+
+msgid "A3 Oversize Long Edge"
+msgstr ""
+
+msgid "A4"
+msgstr "A4"
+
+msgid "A4 Long Edge"
+msgstr ""
+
+msgid "A4 Oversize"
+msgstr ""
+
+msgid "A4 Small"
+msgstr ""
+
+msgid "A5"
+msgstr "A5"
+
+msgid "A5 Long Edge"
+msgstr ""
+
+msgid "A5 Oversize"
+msgstr ""
+
+msgid "A6"
+msgstr "A6"
+
+msgid "A6 Long Edge"
+msgstr ""
+
+msgid "A7"
+msgstr "A7"
+
+msgid "A8"
+msgstr "A8"
+
+msgid "A9"
+msgstr "A9"
+
+msgid "ANSI A"
+msgstr "ANSI A"
+
+msgid "ANSI B"
+msgstr "ANSI B"
+
+msgid "ANSI C"
+msgstr "ANSI C"
+
+msgid "ANSI D"
+msgstr "ANSI D"
+
+msgid "ANSI E"
+msgstr "ANSI E"
+
+msgid "ARCH C"
+msgstr "ARCH C"
+
+msgid "ARCH C Long Edge"
+msgstr ""
+
+msgid "ARCH D"
+msgstr "ARCH D"
+
+msgid "ARCH D Long Edge"
+msgstr ""
+
+msgid "ARCH E"
+msgstr "ARCH E"
+
+msgid "ARCH E Long Edge"
+msgstr ""
+
+msgid "Accept Jobs"
+msgstr "Принять задания"
+
+msgid "Accepted"
+msgstr "Принято"
+
+msgid "Add Class"
+msgstr "Добавить класс"
+
+msgid "Add Printer"
+msgstr "Добавить принтер"
+
+msgid "Add RSS Subscription"
+msgstr "Добавить подписку на RSS"
+
+msgid "Address"
+msgstr "Адрес"
+
+msgid "Administration"
+msgstr "Администрация"
+
+msgid "Always"
+msgstr "Всегда"
+
+msgid "AppSocket/HP JetDirect"
+msgstr "AppSocket/HP JetDirect"
+
+msgid "Applicator"
+msgstr "Исполнительное устройство"
+
+#, c-format
+msgid "Attempt to set %s printer-state to bad value %d."
+msgstr ""
+
+#, c-format
+msgid "Attribute groups are out of order (%x < %x)."
+msgstr ""
+
+msgid "B0"
+msgstr "B0"
+
+msgid "B1"
+msgstr "B1"
+
+msgid "B10"
+msgstr "B10"
+
+msgid "B2"
+msgstr "B2"
+
+msgid "B3"
+msgstr "B3"
+
+msgid "B4"
+msgstr "B4"
+
+msgid "B5"
+msgstr "B5"
+
+msgid "B5 Oversize"
+msgstr ""
+
+msgid "B6"
+msgstr "B6"
+
+msgid "B7"
+msgstr "B7"
+
+msgid "B8"
+msgstr "B8"
+
+msgid "B9"
+msgstr "B9"
+
+#, c-format
+msgid "Bad 'document-format' value \"%s\"."
+msgstr ""
+
+msgid "Bad NULL dests pointer"
+msgstr "Неверный указатель NULL dests"
+
+msgid "Bad OpenGroup"
+msgstr "Неверное значение OpenGroup"
+
+msgid "Bad OpenUI/JCLOpenUI"
+msgstr "Неверное значение OpenUI/JCLOpenUI"
+
+msgid "Bad OrderDependency"
+msgstr "Неверное значение OrderDependency"
+
+msgid "Bad PPD cache file."
+msgstr ""
+
+msgid "Bad Request"
+msgstr "Неверный запрос"
+
+msgid "Bad SNMP version number"
+msgstr "Неверный номер версии SNMP"
+
+msgid "Bad UIConstraints"
+msgstr "Неверное значение UIConstraints"
+
+#, c-format
+msgid "Bad copies value %d."
+msgstr "Неверное значение количества копий %d."
+
+msgid "Bad custom parameter"
+msgstr "Неверный индивидуальный параметр"
+
+#, c-format
+msgid "Bad device-uri \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Bad device-uri scheme \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Bad document-format \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Bad document-format-default \"%s\"."
+msgstr ""
+
+msgid "Bad filename buffer"
+msgstr "Ошибка в буфере filename"
+
+msgid "Bad job-name value: Bad UTF-8 sequence."
+msgstr ""
+
+msgid "Bad job-name value: Name too long."
+msgstr ""
+
+msgid "Bad job-name value: Wrong type or count."
+msgstr ""
+
+msgid "Bad job-priority value."
+msgstr ""
+
+#, c-format
+msgid "Bad job-sheets value \"%s\"."
+msgstr ""
+
+msgid "Bad job-sheets value type."
+msgstr ""
+
+msgid "Bad job-state value."
+msgstr ""
+
+#, c-format
+msgid "Bad job-uri \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Bad notify-pull-method \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Bad notify-recipient-uri \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Bad number-up value %d."
+msgstr "Неверное значение number-up %d."
+
+#, c-format
+msgid "Bad option + choice on line %d."
+msgstr ""
+
+#, c-format
+msgid "Bad page-ranges values %d-%d."
+msgstr "Неверные значения page-ranges %d-%d."
+
+#, c-format
+msgid "Bad port-monitor \"%s\"."
+msgstr ""
+
+msgid "Bad printer URI."
+msgstr ""
+
+#, c-format
+msgid "Bad printer-state value %d."
+msgstr ""
+
+#, c-format
+msgid "Bad request ID %d."
+msgstr ""
+
+#, c-format
+msgid "Bad request version number %d.%d."
+msgstr ""
+
+msgid "Bad subscription ID"
+msgstr "Неверный ID подписки"
+
+msgid "Bad value string"
+msgstr "Неверная строка значений"
+
+msgid "Banners"
+msgstr "Баннеры"
+
+msgid "Bond Paper"
+msgstr "Документная бумага"
+
+#, c-format
+msgid "Boolean expected for waiteof option \"%s\"."
+msgstr ""
+
+msgid "Buffer overflow detected, aborting."
+msgstr ""
+
+msgid "CMYK"
+msgstr "CMYK"
+
+msgid "CPCL Label Printer"
+msgstr "Принтер для печати этикеток CPCL"
+
+msgid "Cancel RSS Subscription"
+msgstr "Отменить подписку на RSS"
+
+msgid "Canceling print job."
+msgstr ""
+
+msgid "Cannot share a remote Kerberized printer."
+msgstr ""
+
+msgid "Cassette"
+msgstr ""
+
+msgid "Change Settings"
+msgstr "Изменить настройки"
+
+#, c-format
+msgid "Character set \"%s\" not supported."
+msgstr ""
+
+msgid "Classes"
+msgstr "Классы"
+
+msgid "Clean Print Heads"
+msgstr "Очистить головки принтера"
+
+msgid "Close-Job doesn't support the job-uri attribute."
+msgstr ""
+
+msgid "Color"
+msgstr "Цвет"
+
+msgid "Color Mode"
+msgstr "Цветной режим"
+
+msgid ""
+"Commands may be abbreviated.  Commands are:\n"
+"\n"
+"exit    help    quit    status  ?"
+msgstr ""
+
+msgid "Community name uses indefinite length"
+msgstr "Для имени сообщества длина не установлена"
+
+msgid "Connected to printer."
+msgstr ""
+
+msgid "Connecting to printer."
+msgstr ""
+
+msgid "Continue"
+msgstr "Продолжить"
+
+msgid "Continuous"
+msgstr "Непрерывно"
+
+msgid "Control file sent successfully."
+msgstr ""
+
+msgid "Copying print data."
+msgstr ""
+
+msgid "Created"
+msgstr "Создано"
+
+msgid "Custom"
+msgstr "Индивидуальный"
+
+msgid "CustominCutInterval"
+msgstr "CustominCutInterval"
+
+msgid "CustominTearInterval"
+msgstr "CustominTearInterval"
+
+msgid "Cut"
+msgstr "Обрезать"
+
+msgid "Cutter"
+msgstr "Резак"
+
+msgid "Dark"
+msgstr "Темный"
+
+msgid "Darkness"
+msgstr "Затемненность"
+
+msgid "Data file sent successfully."
+msgstr ""
+
+msgid "Delete Class"
+msgstr "Удалить класс"
+
+msgid "Delete Printer"
+msgstr "Удалить принтер"
+
+msgid "DeskJet Series"
+msgstr "Серия DeskJet"
+
+#, c-format
+msgid "Destination \"%s\" is not accepting jobs."
+msgstr "Назначение «%s» не принимает задания."
+
+#, c-format
+msgid ""
+"Device: uri = %s\n"
+"        class = %s\n"
+"        info = %s\n"
+"        make-and-model = %s\n"
+"        device-id = %s\n"
+"        location = %s"
+msgstr ""
+
+msgid "Direct Thermal Media"
+msgstr "Носитель для прямой термопечати"
+
+#, c-format
+msgid "Directory \"%s\" contains a relative path."
+msgstr ""
+
+#, c-format
+msgid "Directory \"%s\" has insecure permissions (0%o/uid=%d/gid=%d)."
+msgstr ""
+
+#, c-format
+msgid "Directory \"%s\" is a file."
+msgstr ""
+
+#, c-format
+msgid "Directory \"%s\" not available: %s"
+msgstr ""
+
+#, c-format
+msgid "Directory \"%s\" permissions OK (0%o/uid=%d/gid=%d)."
+msgstr ""
+
+msgid "Disabled"
+msgstr "Отключено"
+
+#, c-format
+msgid "Document #%d does not exist in job #%d."
+msgstr ""
+
+msgid "Duplexer"
+msgstr "Дуплексер"
+
+msgid "Dymo"
+msgstr "Dymo"
+
+msgid "EPL1 Label Printer"
+msgstr "Принтер для печати этикеток EPL1"
+
+msgid "EPL2 Label Printer"
+msgstr "Принтер для печати этикеток EPL2"
+
+msgid "Edit Configuration File"
+msgstr "Редактировать файл конфигурации"
+
+msgid "Empty PPD file."
+msgstr ""
+
+#. TRANSLATORS: Banner/cover sheet after the print job.
+msgid "Ending Banner"
+msgstr "Конечный баннер"
+
+msgid "English"
+msgstr "Russian"
+
+msgid "Enter old password:"
+msgstr "Введите старый пароль:"
+
+msgid "Enter password again:"
+msgstr "Введите пароль снова:"
+
+msgid "Enter password:"
+msgstr "Введите пароль:"
+
+msgid ""
+"Enter your username and password or the root username and password to access "
+"this page. If you are using Kerberos authentication, make sure you have a "
+"valid Kerberos ticket."
+msgstr ""
+"Введите свое имя пользователя и пароль или данные учетной записи root, чтобы "
+"получить доступ к этой странице. Если используется проверка подлинности "
+"Kerberos, необходимо также иметь действительный билет Kerberos."
+
+msgid "Envelope #10 "
+msgstr ""
+
+msgid "Envelope #11"
+msgstr ""
+
+msgid "Envelope #12"
+msgstr ""
+
+msgid "Envelope #14"
+msgstr ""
+
+msgid "Envelope #9"
+msgstr ""
+
+msgid "Envelope B4"
+msgstr ""
+
+msgid "Envelope B5"
+msgstr ""
+
+msgid "Envelope B6"
+msgstr ""
+
+msgid "Envelope C0"
+msgstr ""
+
+msgid "Envelope C1"
+msgstr ""
+
+msgid "Envelope C2"
+msgstr ""
+
+msgid "Envelope C3"
+msgstr ""
+
+msgid "Envelope C4"
+msgstr ""
+
+msgid "Envelope C5"
+msgstr ""
+
+msgid "Envelope C6"
+msgstr ""
+
+msgid "Envelope C65"
+msgstr ""
+
+msgid "Envelope C7"
+msgstr ""
+
+msgid "Envelope Choukei 3"
+msgstr ""
+
+msgid "Envelope Choukei 3 Long Edge"
+msgstr ""
+
+msgid "Envelope Choukei 4"
+msgstr ""
+
+msgid "Envelope Choukei 4 Long Edge"
+msgstr ""
+
+msgid "Envelope DL"
+msgstr ""
+
+msgid "Envelope Feed"
+msgstr "Подача конвертов"
+
+msgid "Envelope Invite"
+msgstr ""
+
+msgid "Envelope Italian"
+msgstr ""
+
+msgid "Envelope Kaku2"
+msgstr ""
+
+msgid "Envelope Kaku2 Long Edge"
+msgstr ""
+
+msgid "Envelope Kaku3"
+msgstr ""
+
+msgid "Envelope Kaku3 Long Edge"
+msgstr ""
+
+msgid "Envelope Monarch"
+msgstr ""
+
+msgid "Envelope PRC1 "
+msgstr ""
+
+msgid "Envelope PRC1 Long Edge"
+msgstr ""
+
+msgid "Envelope PRC10"
+msgstr ""
+
+msgid "Envelope PRC10 Long Edge"
+msgstr ""
+
+msgid "Envelope PRC2"
+msgstr ""
+
+msgid "Envelope PRC2 Long Edge"
+msgstr ""
+
+msgid "Envelope PRC3"
+msgstr ""
+
+msgid "Envelope PRC3 Long Edge"
+msgstr ""
+
+msgid "Envelope PRC4"
+msgstr ""
+
+msgid "Envelope PRC4 Long Edge"
+msgstr ""
+
+msgid "Envelope PRC5 Long Edge"
+msgstr ""
+
+msgid "Envelope PRC5PRC5"
+msgstr ""
+
+msgid "Envelope PRC6"
+msgstr ""
+
+msgid "Envelope PRC6 Long Edge"
+msgstr ""
+
+msgid "Envelope PRC7"
+msgstr ""
+
+msgid "Envelope PRC7 Long Edge"
+msgstr ""
+
+msgid "Envelope PRC8"
+msgstr ""
+
+msgid "Envelope PRC8 Long Edge"
+msgstr ""
+
+msgid "Envelope PRC9"
+msgstr ""
+
+msgid "Envelope PRC9 Long Edge"
+msgstr ""
+
+msgid "Envelope Personal"
+msgstr ""
+
+msgid "Envelope You4"
+msgstr ""
+
+msgid "Envelope You4 Long Edge"
+msgstr ""
+
+msgid "Epson"
+msgstr "Epson"
+
+msgid "Error Policy"
+msgstr "Политика ошибок"
+
+msgid "Error sending raster data."
+msgstr ""
+
+msgid "Error: need hostname after \"-h\" option."
+msgstr ""
+
+msgid "Every 10 Labels"
+msgstr "Каждые 10 этикеток"
+
+msgid "Every 2 Labels"
+msgstr "Каждые 2 этикетки"
+
+msgid "Every 3 Labels"
+msgstr "Каждые 3 этикетки"
+
+msgid "Every 4 Labels"
+msgstr "Каждые 4 этикетки"
+
+msgid "Every 5 Labels"
+msgstr "Каждые 5 этикеток"
+
+msgid "Every 6 Labels"
+msgstr "Каждые 6 этикеток"
+
+msgid "Every 7 Labels"
+msgstr "Каждые 7 этикеток"
+
+msgid "Every 8 Labels"
+msgstr "Каждые 8 этикеток"
+
+msgid "Every 9 Labels"
+msgstr "Каждые 9 этикеток"
+
+msgid "Every Label"
+msgstr "Каждая этикетка"
+
+msgid "Executive"
+msgstr ""
+
+msgid "Expectation Failed"
+msgstr "Сбой ожидания"
+
+msgid "Export Printers to Samba"
+msgstr "Экспортировать принтеры в Samba"
+
+msgid "FAIL"
+msgstr ""
+
+msgid "FanFold German"
+msgstr ""
+
+msgid "FanFold Legal German"
+msgstr ""
+
+msgid "Fanfold US"
+msgstr ""
+
+#, c-format
+msgid "File \"%s\" contains a relative path."
+msgstr ""
+
+#, c-format
+msgid "File \"%s\" has insecure permissions (0%o/uid=%d/gid=%d)."
+msgstr ""
+
+#, c-format
+msgid "File \"%s\" is a directory."
+msgstr ""
+
+#, c-format
+msgid "File \"%s\" not available: %s"
+msgstr ""
+
+#, c-format
+msgid "File \"%s\" permissions OK (0%o/uid=%d/gid=%d)."
+msgstr ""
+
+msgid "File Folder "
+msgstr ""
+
+#, c-format
+msgid ""
+"File device URIs have been disabled. To enable, see the FileDevice directive "
+"in \"%s/cups-files.conf\"."
+msgstr ""
+
+#, c-format
+msgid "Finished page %d."
+msgstr ""
+
+msgid "Folio"
+msgstr "Фолио"
+
+msgid "Forbidden"
+msgstr "Запрещено"
+
+msgid "General"
+msgstr "Основные"
+
+msgid "Generic"
+msgstr "Общее"
+
+msgid "Get-Response-PDU uses indefinite length"
+msgstr "Для Get-Response-PDU длина не установлена"
+
+msgid "Glossy Paper"
+msgstr "Глянцевая бумага"
+
+msgid "Got a printer-uri attribute but no job-id."
+msgstr ""
+
+msgid "Grayscale"
+msgstr "Оттенки серого"
+
+msgid "HP"
+msgstr "HP"
+
+msgid "Hanging Folder"
+msgstr "Папка подвесного хранения"
+
+msgid "Help file not in index."
+msgstr ""
+
+msgid "IPP 1setOf attribute with incompatible value tags."
+msgstr ""
+
+msgid "IPP attribute has no name."
+msgstr ""
+
+msgid "IPP attribute is not a member of the message."
+msgstr ""
+
+msgid "IPP begCollection value not 0 bytes."
+msgstr ""
+
+msgid "IPP boolean value not 1 byte."
+msgstr ""
+
+msgid "IPP date value not 11 bytes."
+msgstr ""
+
+msgid "IPP endCollection value not 0 bytes."
+msgstr ""
+
+msgid "IPP enum value not 4 bytes."
+msgstr ""
+
+msgid "IPP extension tag larger than 0x7FFFFFFF."
+msgstr ""
+
+msgid "IPP integer value not 4 bytes."
+msgstr ""
+
+msgid "IPP language length overflows value."
+msgstr ""
+
+msgid "IPP member name is not empty."
+msgstr ""
+
+msgid "IPP memberName value is empty."
+msgstr ""
+
+msgid "IPP memberName with no attribute."
+msgstr ""
+
+msgid "IPP name larger than 32767 bytes."
+msgstr ""
+
+msgid "IPP nameWithLanguage value less than minimum 4 bytes."
+msgstr ""
+
+msgid "IPP rangeOfInteger value not 8 bytes."
+msgstr ""
+
+msgid "IPP resolution value not 9 bytes."
+msgstr ""
+
+msgid "IPP string length overflows value."
+msgstr ""
+
+msgid "IPP textWithLanguage value less than minimum 4 bytes."
+msgstr ""
+
+msgid "IPP value larger than 32767 bytes."
+msgstr ""
+
+msgid "ISOLatin1"
+msgstr "UTF-8"
+
+msgid "Illegal control character"
+msgstr "Недействительный контрольный символ"
+
+msgid "Illegal main keyword string"
+msgstr "Недействительная основная строка ключевых слов"
+
+msgid "Illegal option keyword string"
+msgstr "Недействительная строка ключевых слов параметра"
+
+msgid "Illegal translation string"
+msgstr "Недействительный перевод"
+
+msgid "Illegal whitespace character"
+msgstr "Недействительный символ пробела"
+
+msgid "Installable Options"
+msgstr "Параметры, разрешенные к установке"
+
+msgid "Installed"
+msgstr "Установлено"
+
+msgid "IntelliBar Label Printer"
+msgstr "Принтер для печати этикеток IntelliBar"
+
+msgid "Intellitech"
+msgstr "Intellitech"
+
+msgid "Internal Server Error"
+msgstr "Внутренняя Ошибка сервера"
+
+msgid "Internal error"
+msgstr "Внутренняя ошибка"
+
+msgid "Internet Postage 2-Part"
+msgstr "Наклейки Internet Postage 2-Part"
+
+msgid "Internet Postage 3-Part"
+msgstr "Наклейки Internet Postage 3-Part"
+
+msgid "Internet Printing Protocol"
+msgstr "Протокол интернет-печати"
+
+msgid "Invalid media size."
+msgstr ""
+
+#, c-format
+msgid "Invalid printer command \"%s\"."
+msgstr ""
+
+msgid "JCL"
+msgstr "JCL"
+
+msgid "JIS B0"
+msgstr ""
+
+msgid "JIS B1"
+msgstr ""
+
+msgid "JIS B10"
+msgstr ""
+
+msgid "JIS B2"
+msgstr ""
+
+msgid "JIS B3"
+msgstr ""
+
+msgid "JIS B4"
+msgstr ""
+
+msgid "JIS B4 Long Edge"
+msgstr ""
+
+msgid "JIS B5"
+msgstr ""
+
+msgid "JIS B5 Long Edge"
+msgstr ""
+
+msgid "JIS B6"
+msgstr ""
+
+msgid "JIS B6 Long Edge"
+msgstr ""
+
+msgid "JIS B7"
+msgstr ""
+
+msgid "JIS B8"
+msgstr ""
+
+msgid "JIS B9"
+msgstr ""
+
+#, c-format
+msgid "Job #%d cannot be restarted - no files."
+msgstr ""
+
+#, c-format
+msgid "Job #%d does not exist."
+msgstr ""
+
+#, c-format
+msgid "Job #%d is already aborted - can't cancel."
+msgstr "Задание #%d уже прервано – не удается отменить."
+
+#, c-format
+msgid "Job #%d is already canceled - can't cancel."
+msgstr "Задание #%d уже отменено – не удается отменить."
+
+#, c-format
+msgid "Job #%d is already completed - can't cancel."
+msgstr "Задание #%d уже завершено – не удается отменить."
+
+#, c-format
+msgid "Job #%d is finished and cannot be altered."
+msgstr ""
+
+#, c-format
+msgid "Job #%d is not complete."
+msgstr ""
+
+#, c-format
+msgid "Job #%d is not held for authentication."
+msgstr ""
+
+#, c-format
+msgid "Job #%d is not held."
+msgstr ""
+
+msgid "Job Completed"
+msgstr "Задание завершено"
+
+msgid "Job Created"
+msgstr "Задание создано"
+
+msgid "Job Options Changed"
+msgstr "Параметры задания изменены"
+
+msgid "Job Stopped"
+msgstr "Задание остановлено"
+
+msgid "Job is completed and cannot be changed."
+msgstr "Задание завершено и не может быть изменено."
+
+msgid "Job operation failed"
+msgstr ""
+
+msgid "Job state cannot be changed."
+msgstr "Состояние задания не может быть изменено."
+
+msgid "Job subscriptions cannot be renewed."
+msgstr ""
+
+msgid "Jobs"
+msgstr "Задания"
+
+msgid "LPD/LPR Host or Printer"
+msgstr "Хост или принтер LPD/LPR"
+
+msgid "Label Printer"
+msgstr "Принтер для печати этикеток"
+
+msgid "Label Top"
+msgstr "Верхний край этикетки"
+
+#, c-format
+msgid "Language \"%s\" not supported."
+msgstr ""
+
+msgid "Large Address"
+msgstr "Полный адрес"
+
+msgid "LaserJet Series PCL 4/5"
+msgstr "Серия LaserJet, PCL 4/5"
+
+msgid "Letter Oversize"
+msgstr ""
+
+msgid "Letter Oversize Long Edge"
+msgstr ""
+
+msgid "Light"
+msgstr "Светлый"
+
+msgid "Line longer than the maximum allowed (255 characters)"
+msgstr "Строка длиннее разрешенного предела (255 символов)"
+
+msgid "List Available Printers"
+msgstr "Список доступных принтеров"
+
+msgid "Long-Edge (Portrait)"
+msgstr "По длинной стороне (книжная)"
+
+msgid "Looking for printer."
+msgstr ""
+
+msgid "Manual Feed"
+msgstr "Ручная подача"
+
+msgid "Media Size"
+msgstr "Размер бумаги"
+
+msgid "Media Source"
+msgstr "Источник бумаги"
+
+msgid "Media Tracking"
+msgstr "Контроль подачи бумаги"
+
+msgid "Media Type"
+msgstr "Тип бумаги"
+
+msgid "Medium"
+msgstr "Средний"
+
+msgid "Memory allocation error"
+msgstr "Ошибка распределения памяти"
+
+msgid "Missing CloseGroup"
+msgstr ""
+
+msgid "Missing PPD-Adobe-4.x header"
+msgstr "Отсутствует заголовок PPD-Adobe-4.x"
+
+msgid "Missing asterisk in column 1"
+msgstr "Отсутствует звездочка в колонке 1"
+
+msgid "Missing document-number attribute."
+msgstr ""
+
+#, c-format
+msgid "Missing double quote on line %d."
+msgstr ""
+
+msgid "Missing form variable"
+msgstr "Отсутствует переменная формы"
+
+msgid "Missing last-document attribute in request."
+msgstr ""
+
+msgid "Missing media or media-col."
+msgstr ""
+
+msgid "Missing media-size in media-col."
+msgstr ""
+
+msgid "Missing notify-subscription-ids attribute."
+msgstr ""
+
+msgid "Missing option keyword"
+msgstr "Отсутствует ключевое слово параметра"
+
+msgid "Missing requesting-user-name attribute."
+msgstr ""
+
+msgid "Missing required attributes."
+msgstr ""
+
+#, c-format
+msgid "Missing value on line %d."
+msgstr ""
+
+msgid "Missing value string"
+msgstr "Отсутствует строка значения"
+
+msgid "Missing x-dimension in media-size."
+msgstr ""
+
+msgid "Missing y-dimension in media-size."
+msgstr ""
+
+#, c-format
+msgid ""
+"Model:  name = %s\n"
+"        natural_language = %s\n"
+"        make-and-model = %s\n"
+"        device-id = %s"
+msgstr ""
+
+msgid "Modify Class"
+msgstr "Изменить класс"
+
+msgid "Modify Printer"
+msgstr "Изменить принтер"
+
+msgid "Move All Jobs"
+msgstr "Переместить все задания"
+
+msgid "Move Job"
+msgstr "Переместить задание"
+
+msgid "Moved Permanently"
+msgstr "Перемещено окончательно"
+
+msgid "NULL PPD file pointer"
+msgstr "Указатель PPD-файла установлен на NULL"
+
+msgid "Name OID uses indefinite length"
+msgstr "Для имени OID длина не установлена"
+
+msgid "Nested classes are not allowed."
+msgstr ""
+
+msgid "Never"
+msgstr "Никогда"
+
+msgid "New Stylus Color Series"
+msgstr "Серия Stylus Color нового поколения"
+
+msgid "New Stylus Photo Series"
+msgstr "Серия Stylus Photo нового поколения"
+
+msgid "No"
+msgstr "Нет"
+
+msgid "No Content"
+msgstr "Нет контента"
+
+msgid "No PPD name"
+msgstr "Нет имени PPD"
+
+msgid "No VarBind SEQUENCE"
+msgstr "Нет последовательности VarBind"
+
+msgid "No Windows printer drivers are installed."
+msgstr ""
+
+msgid "No active connection"
+msgstr "Нет рабочего подключения"
+
+#, c-format
+msgid "No active jobs on %s."
+msgstr ""
+
+msgid "No attributes in request."
+msgstr ""
+
+msgid "No authentication information provided."
+msgstr ""
+
+msgid "No community name"
+msgstr "Нет имени сообщества"
+
+msgid "No default printer."
+msgstr ""
+
+msgid "No destinations added."
+msgstr "Нет добавленных назначений."
+
+msgid "No device URI found in argv[0] or in DEVICE_URI environment variable."
+msgstr ""
+
+msgid "No error-index"
+msgstr "Нет значения error-index"
+
+msgid "No error-status"
+msgstr "Нет значения error-status"
+
+msgid "No file in print request."
+msgstr ""
+
+msgid "No modification time"
+msgstr "Не указано время изменения"
+
+msgid "No name OID"
+msgstr "Нет имени OID"
+
+msgid "No pages were found."
+msgstr ""
+
+msgid "No printer name"
+msgstr "Нет имени принтера"
+
+msgid "No printer-uri found"
+msgstr "Не указан адрес printer-uri"
+
+msgid "No printer-uri found for class"
+msgstr "Не указан адрес printer-uri для класса"
+
+msgid "No printer-uri in request."
+msgstr ""
+
+msgid "No request-id"
+msgstr "Нет идентификатора request-id"
+
+msgid "No subscription attributes in request."
+msgstr ""
+
+msgid "No subscriptions found."
+msgstr "Подписки не найдены."
+
+msgid "No variable-bindings SEQUENCE"
+msgstr "Нет последовательности variable-bindings"
+
+msgid "No version number"
+msgstr "Нет номера версии"
+
+msgid "Non-continuous (Mark sensing)"
+msgstr "С прерыванием (опознавание маркеров)"
+
+msgid "Non-continuous (Web sensing)"
+msgstr "С прерыванием (опознавание сети)"
+
+msgid "Normal"
+msgstr "Нормальный"
+
+msgid "Not Found"
+msgstr "Не найдено"
+
+msgid "Not Implemented"
+msgstr "Не реализовано"
+
+msgid "Not Installed"
+msgstr "Не установлено"
+
+msgid "Not Modified"
+msgstr "Не изменено"
+
+msgid "Not Supported"
+msgstr "Не поддерживается"
+
+msgid "Not allowed to print."
+msgstr "Не разрешено печатать."
+
+msgid "Note"
+msgstr "Примечание"
+
+msgid ""
+"Note: this program only validates the DSC comments, not the PostScript "
+"itself."
+msgstr ""
+
+msgid "OK"
+msgstr "ОК"
+
+msgid "Off (1-Sided)"
+msgstr "Выкл. (односторонняя печать)"
+
+msgid "Oki"
+msgstr "Oki"
+
+msgid "Online Help"
+msgstr "Интерактивная справка"
+
+#, c-format
+msgid "Open of %s failed: %s"
+msgstr "Не удалось открыть %s: %s"
+
+msgid "OpenGroup without a CloseGroup first"
+msgstr "OpenGroup без предыдущего CloseGroup"
+
+msgid "OpenUI/JCLOpenUI without a CloseUI/JCLCloseUI first"
+msgstr "OpenUI/JCLOpenUI без предыдущего CloseUI/JCLCloseUI"
+
+msgid "Operation Policy"
+msgstr "Политика операций"
+
+#, c-format
+msgid "Option \"%s\" cannot be included via %%%%IncludeFeature."
+msgstr ""
+
+msgid "Options Installed"
+msgstr "Параметры установлены"
+
+msgid "Options:"
+msgstr ""
+
+msgid "Out of date PPD cache file."
+msgstr ""
+
+msgid "Out of memory."
+msgstr ""
+
+msgid "Output Mode"
+msgstr "Режим вывода"
+
+#, c-format
+msgid "Output for printer %s is sent to %s"
+msgstr ""
+
+#, c-format
+msgid "Output for printer %s is sent to remote printer %s on %s"
+msgstr ""
+
+#, c-format
+msgid "Output for printer %s/%s is sent to %s"
+msgstr ""
+
+#, c-format
+msgid "Output for printer %s/%s is sent to remote printer %s on %s"
+msgstr ""
+
+msgid "PASS"
+msgstr ""
+
+msgid "PCL Laser Printer"
+msgstr "Лазерный принтер PCL"
+
+msgid "PRC16K"
+msgstr "PRC16K"
+
+msgid "PRC16K Long Edge"
+msgstr ""
+
+msgid "PRC32K"
+msgstr "PRC32K"
+
+msgid "PRC32K Long Edge"
+msgstr ""
+
+msgid "PRC32K Oversize"
+msgstr ""
+
+msgid "PRC32K Oversize Long Edge"
+msgstr ""
+
+msgid "Packet does not contain a Get-Response-PDU"
+msgstr "В пакете нет Get-Response-PDU"
+
+msgid "Packet does not start with SEQUENCE"
+msgstr "Нет индикатора SEQUENCE в начале пакета"
+
+msgid "ParamCustominCutInterval"
+msgstr "ParamCustominCutInterval"
+
+msgid "ParamCustominTearInterval"
+msgstr "ParamCustominTearInterval"
+
+#, c-format
+msgid "Password for %s on %s? "
+msgstr "Пароль для %s на %s? "
+
+#, c-format
+msgid "Password for %s required to access %s via SAMBA: "
+msgstr "Для доступа к %s через SAMBA требуется пароль для %s: "
+
+msgid "Pause Class"
+msgstr "Приостановить класс"
+
+msgid "Pause Printer"
+msgstr "Приостановить принтер"
+
+msgid "Peel-Off"
+msgstr "Съемный слой"
+
+msgid "Photo"
+msgstr "Фото"
+
+msgid "Photo Labels"
+msgstr "Фотоэтикетки"
+
+msgid "Plain Paper"
+msgstr "Обычная бумага"
+
+msgid "Policies"
+msgstr "Политики"
+
+msgid "Port Monitor"
+msgstr "Мониторинг порта"
+
+msgid "PostScript Printer"
+msgstr "Принтер PostScript"
+
+msgid "Postcard"
+msgstr "Открытка"
+
+msgid "Postcard Double "
+msgstr ""
+
+msgid "Postcard Double Long Edge"
+msgstr ""
+
+msgid "Postcard Long Edge"
+msgstr ""
+
+msgid "Print Density"
+msgstr "Плотность печати"
+
+msgid "Print Job:"
+msgstr "Задание печати:"
+
+msgid "Print Mode"
+msgstr "Режим печати"
+
+msgid "Print Rate"
+msgstr "Скорость печати"
+
+msgid "Print Self-Test Page"
+msgstr "Напечатать пробную страницу"
+
+msgid "Print Speed"
+msgstr "Скорость печати"
+
+msgid "Print Test Page"
+msgstr "Напечатать пробную страницу"
+
+msgid "Print and Cut"
+msgstr "Напечатать и обрезать"
+
+msgid "Print and Tear"
+msgstr "Напечатать и оборвать"
+
+#, c-format
+msgid "Print file accepted - job ID %d."
+msgstr ""
+
+msgid "Print file accepted - job ID unknown."
+msgstr ""
+
+msgid "Print file sent."
+msgstr ""
+
+msgid "Print file was not accepted."
+msgstr ""
+
+msgid "Print job canceled at printer."
+msgstr ""
+
+msgid "Print job too large."
+msgstr ""
+
+msgid "Printer Added"
+msgstr "Принтер добавлен"
+
+msgid "Printer Default"
+msgstr "Принтер выбран по умолчанию"
+
+msgid "Printer Deleted"
+msgstr "Принтер удален"
+
+msgid "Printer Modified"
+msgstr "Принтер изменен"
+
+msgid "Printer Paused"
+msgstr "Принтер приостановлен"
+
+msgid "Printer Settings"
+msgstr "Параметры принтера"
+
+msgid "Printer cannot print supplied content."
+msgstr ""
+
+msgid "Printer:"
+msgstr "Принтер:"
+
+msgid "Printers"
+msgstr "Принтеры"
+
+#, c-format
+msgid "Printing page %d, %d%% complete."
+msgstr ""
+
+msgid "Purge Jobs"
+msgstr "Удалить задания"
+
+msgid "Quarto"
+msgstr "Кватро"
+
+msgid "Quota limit reached."
+msgstr "Предел квоты достигнут."
+
+msgid "Rank    Owner   Job     File(s)                         Total Size"
+msgstr ""
+
+#. TRANSLATORS: Pri is job priority.
+msgid ""
+"Rank   Owner      Pri  Job        Files                       Total Size"
+msgstr ""
+
+msgid "Reject Jobs"
+msgstr "Отклонить задания"
+
+#, c-format
+msgid "Remote host did not accept control file (%d)."
+msgstr ""
+
+#, c-format
+msgid "Remote host did not accept data file (%d)."
+msgstr ""
+
+msgid "Reprint After Error"
+msgstr "Повторить печать после ошибки"
+
+msgid "Request Entity Too Large"
+msgstr "Слишком большое содержимое запроса"
+
+msgid "Resolution"
+msgstr "Разрешение"
+
+msgid "Resume Class"
+msgstr "Возобновить работу класса"
+
+msgid "Resume Printer"
+msgstr "Возобновить работу принтера"
+
+msgid "Return Address"
+msgstr "Обратный адрес"
+
+msgid "Rewind"
+msgstr "Вернуться в начало"
+
+#, c-format
+msgid "Running command: %s %s -N -A %s -c '%s'"
+msgstr ""
+
+msgid "SEQUENCE uses indefinite length"
+msgstr "Для SEQUENCE длина не установлена"
+
+msgid "SSL/TLS Negotiation Error"
+msgstr ""
+
+msgid "See Other"
+msgstr "Посмотреть другие"
+
+msgid "Sending data to printer."
+msgstr ""
+
+msgid "Server Restarted"
+msgstr "Сервер перезагружен"
+
+msgid "Server Security Auditing"
+msgstr "Проверка безопасности сервера"
+
+msgid "Server Started"
+msgstr "Сервер загружен"
+
+msgid "Server Stopped"
+msgstr "Сервер остановлен"
+
+msgid "Service Unavailable"
+msgstr "Служба недоступна"
+
+msgid "Set Allowed Users"
+msgstr "Указать допущенных пользователей"
+
+msgid "Set As Server Default"
+msgstr "Использовать данный сервер по умолчанию"
+
+msgid "Set Class Options"
+msgstr "Настроить параметры класса"
+
+msgid "Set Printer Options"
+msgstr "Настроить параметры принтера"
+
+msgid "Set Publishing"
+msgstr "Настроить публикацию"
+
+msgid "Shipping Address"
+msgstr "Адрес доставки"
+
+msgid "Short-Edge (Landscape)"
+msgstr "По короткой стороне (альбомная)"
+
+msgid "Special Paper"
+msgstr "Особая бумага"
+
+#, c-format
+msgid "Spooling job, %.0f%% complete."
+msgstr ""
+
+msgid "Standard"
+msgstr "Стандартный"
+
+#. TRANSLATORS: Banner/cover sheet before the print job.
+msgid "Starting Banner"
+msgstr "Запуск баннера"
+
+#, c-format
+msgid "Starting page %d."
+msgstr ""
+
+msgid "Statement"
+msgstr "Оператор"
+
+msgid "Stylus Color Series"
+msgstr "Серия Stylus Color"
+
+msgid "Stylus Photo Series"
+msgstr "Серия Stylus Photo"
+
+#, c-format
+msgid "Subscription #%d does not exist."
+msgstr ""
+
+msgid "Super A"
+msgstr "Super A"
+
+msgid "Super B"
+msgstr "Super B"
+
+msgid "Super B/A3"
+msgstr "Super B/A3"
+
+msgid "Switching Protocols"
+msgstr "Протоколы переключения"
+
+msgid "Tabloid"
+msgstr "Tabloid"
+
+msgid "Tabloid Oversize"
+msgstr ""
+
+msgid "Tabloid Oversize Long Edge"
+msgstr ""
+
+msgid "Tear"
+msgstr "Оборвать"
+
+msgid "Tear-Off"
+msgstr "Место отрыва"
+
+msgid "Tear-Off Adjust Position"
+msgstr "Откорректировать положение места отрыва"
+
+#, c-format
+msgid "The %s attribute cannot be provided with job-ids."
+msgstr ""
+
+#, c-format
+msgid ""
+"The '%s' Job Description attribute cannot be supplied in a job creation "
+"request."
+msgstr ""
+
+#, c-format
+msgid ""
+"The '%s' operation attribute cannot be supplied in a Create-Job request."
+msgstr ""
+
+#, c-format
+msgid "The PPD file \"%s\" could not be found."
+msgstr "Не удается найти PPD-файл «%s»."
+
+#, c-format
+msgid "The PPD file \"%s\" could not be opened: %s"
+msgstr "Не удалось открыть PPD-файл «%s»: %s"
+
+msgid "The PPD file could not be opened."
+msgstr ""
+
+msgid ""
+"The class name may only contain up to 127 printable characters and may not "
+"contain spaces, slashes (/), or the pound sign (#)."
+msgstr ""
+"Имя класса может содержать максимально 127 печатных символов и не может "
+"содержать пробелы, дроби (/) или знак «решетки» (#)."
+
+msgid "The developer unit needs to be replaced."
+msgstr "Блок разработки должен быть перемещен"
+
+msgid "The developer unit will need to be replaced soon."
+msgstr "Необходимо переместить блок разработки"
+
+msgid "The fuser's temperature is high."
+msgstr "Высокая температура термофиксатора!"
+
+msgid "The fuser's temperature is low."
+msgstr "Низкая температура термофиксатора!"
+
+msgid ""
+"The notify-lease-duration attribute cannot be used with job subscriptions."
+msgstr ""
+"Атрибут notify-lease-duration не может использоваться с подписками на "
+"задание."
+
+#, c-format
+msgid "The notify-user-data value is too large (%d > 63 octets)."
+msgstr ""
+
+msgid "The optical photoconductor needs to be replaced."
+msgstr "Оптический фоторегистратор должен быть перемещен."
+
+msgid "The optical photoconductor will need to be replaced soon."
+msgstr "Необходимо переместить оптический фоторегистратор."
+
+msgid "The output bin is almost full."
+msgstr "Лоток вывода почти заполнен."
+
+msgid "The output bin is full."
+msgstr "Лоток вывода заполнен."
+
+msgid "The output bin is missing."
+msgstr "Отсутствует лоток вывода."
+
+msgid "The paper tray is almost empty."
+msgstr "Лоток с бумагой почти пуст."
+
+msgid "The paper tray is empty."
+msgstr "Лоток с бумагой пуст."
+
+msgid "The paper tray is missing."
+msgstr "Лоток с бумагой отсутствует."
+
+msgid "The paper tray needs to be filled."
+msgstr "Необходимо наполнить лоток с бумагой."
+
+msgid "The printer URI is incorrect or no longer exists."
+msgstr ""
+
+msgid "The printer did not respond."
+msgstr ""
+
+#, c-format
+msgid "The printer does not support IPP/%d.%d, trying IPP/%s."
+msgstr ""
+
+msgid "The printer is in use."
+msgstr ""
+
+msgid "The printer is not connected."
+msgstr ""
+
+msgid "The printer is not responding."
+msgstr ""
+
+msgid "The printer is now connected."
+msgstr ""
+
+msgid "The printer is now online."
+msgstr ""
+
+msgid "The printer is offline."
+msgstr "Принтер выключен."
+
+msgid "The printer is running low on ink."
+msgstr ""
+
+msgid "The printer is running low on toner."
+msgstr ""
+
+msgid "The printer is unreachable at this time."
+msgstr ""
+
+msgid "The printer may be out of ink."
+msgstr ""
+
+msgid "The printer may be out of toner."
+msgstr ""
+
+msgid "The printer may not exist or is unavailable at this time."
+msgstr ""
+
+msgid ""
+"The printer name may only contain up to 127 printable characters and may not "
+"contain spaces, slashes (/), or the pound sign (#)."
+msgstr ""
+"Имя принтера может содержать максимально 127 печатных символов и не может "
+"содержать пробелы, дроби (/) или знак «решетки» (#)."
+
+msgid "The printer or class does not exist."
+msgstr ""
+
+msgid "The printer or class is not shared."
+msgstr ""
+
+msgid "The printer's cover is open."
+msgstr "Крышка принтера открыта."
+
+msgid "The printer's door is open."
+msgstr "Дверца принтера открыта."
+
+msgid "The printer's interlock is open."
+msgstr "Открыт замок."
+
+msgid "The printer's waste bin is almost full."
+msgstr "Отсек для мусора почти заполнен."
+
+msgid "The printer's waste bin is full."
+msgstr "Отсек для мусора заполнен."
+
+#, c-format
+msgid "The printer-uri \"%s\" contains invalid characters."
+msgstr "printer-uri «%s» содержит недопустимые символы."
+
+msgid "The printer-uri attribute is required."
+msgstr ""
+
+msgid ""
+"The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"."
+msgstr "printer-uri должен иметь форму «ipp://HOSTNAME/classes/CLASSNAME»."
+
+msgid ""
+"The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"."
+msgstr "printer-uri должен иметь форму «ipp://HOSTNAME/printers/PRINTERNAME»."
+
+msgid ""
+"The subscription name may not contain spaces, slashes (/), question marks "
+"(?), or the pound sign (#)."
+msgstr ""
+"Имя подписки не может содержать пробелы, дроби (/), вопросительные знаки (?) "
+"или знак «решетки» (#)."
+
+msgid ""
+"The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to "
+"enable it."
+msgstr ""
+
+#, c-format
+msgid "The which-jobs value \"%s\" is not supported."
+msgstr ""
+
+msgid "There are too many subscriptions."
+msgstr "Слишком много подписок."
+
+msgid "There is a paper jam."
+msgstr "Зажевало бумагу."
+
+msgid "There was an unrecoverable USB error."
+msgstr ""
+
+msgid "Thermal Transfer Media"
+msgstr "Носитель для печати методом термопереноса"
+
+msgid "Too many active jobs."
+msgstr "Слишком много активных заданий."
+
+#, c-format
+msgid "Too many job-sheets values (%d > 2)."
+msgstr ""
+
+#, c-format
+msgid "Too many printer-state-reasons values (%d > %d)."
+msgstr ""
+
+msgid "Transparency"
+msgstr "Прозрачность"
+
+msgid "Tray"
+msgstr "Лоток"
+
+msgid "Tray 1"
+msgstr "Лоток 1"
+
+msgid "Tray 2"
+msgstr "Лоток 2"
+
+msgid "Tray 3"
+msgstr "Лоток 3"
+
+msgid "Tray 4"
+msgstr "Лоток 4"
+
+msgid "URI Too Long"
+msgstr "Слишком длинный адрес URI"
+
+msgid "US Ledger"
+msgstr "US Ledger"
+
+msgid "US Legal"
+msgstr "US Legal"
+
+msgid "US Legal Oversize"
+msgstr ""
+
+msgid "US Letter"
+msgstr "US Letter"
+
+msgid "US Letter Long Edge"
+msgstr ""
+
+msgid "US Letter Oversize"
+msgstr ""
+
+msgid "US Letter Oversize Long Edge"
+msgstr ""
+
+msgid "US Letter Small"
+msgstr ""
+
+msgid "Unable to access cupsd.conf file"
+msgstr ""
+
+msgid "Unable to access help file."
+msgstr ""
+
+msgid "Unable to add RSS subscription"
+msgstr ""
+
+msgid "Unable to add class"
+msgstr ""
+
+msgid "Unable to add document to print job."
+msgstr ""
+
+#, c-format
+msgid "Unable to add job for destination \"%s\"."
+msgstr ""
+
+msgid "Unable to add printer"
+msgstr ""
+
+msgid "Unable to allocate memory for file types."
+msgstr ""
+
+msgid "Unable to allocate memory for page info"
+msgstr ""
+
+msgid "Unable to allocate memory for pages array"
+msgstr ""
+
+msgid "Unable to cancel RSS subscription"
+msgstr ""
+
+msgid "Unable to cancel print job."
+msgstr ""
+
+msgid "Unable to change printer"
+msgstr ""
+
+msgid "Unable to change printer-is-shared attribute"
+msgstr ""
+
+msgid "Unable to change server settings"
+msgstr ""
+
+msgid "Unable to configure printer options."
+msgstr ""
+
+msgid "Unable to connect to host."
+msgstr "Не удается подключиться к хосту."
+
+msgid "Unable to contact printer, queuing on next printer in class."
+msgstr ""
+
+#, c-format
+msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
+msgstr ""
+
+#, c-format
+msgid "Unable to copy 64-bit Windows printer driver files (%d)."
+msgstr ""
+
+#, c-format
+msgid "Unable to copy CUPS printer driver files (%d)."
+msgstr ""
+
+#, c-format
+msgid "Unable to copy PPD file - %s"
+msgstr "Не удается копировать PPD-файл - %s"
+
+msgid "Unable to copy PPD file."
+msgstr ""
+
+#, c-format
+msgid "Unable to copy Windows 2000 printer driver files (%d)."
+msgstr ""
+
+#, c-format
+msgid "Unable to copy Windows 9x printer driver files (%d)."
+msgstr ""
+
+#, c-format
+msgid "Unable to copy interface script - %s"
+msgstr "Не удается копировать скрипт интерфейса - %s"
+
+msgid "Unable to create compressed print file"
+msgstr ""
+
+msgid "Unable to create printer-uri"
+msgstr "Не удается создать printer-uri"
+
+msgid "Unable to create temporary file"
+msgstr ""
+
+msgid "Unable to delete class"
+msgstr ""
+
+msgid "Unable to delete printer"
+msgstr ""
+
+msgid "Unable to do maintenance command"
+msgstr ""
+
+msgid "Unable to edit cupsd.conf files larger than 1MB"
+msgstr "Невозможно редактировать файлы cupsd.conf больше 1 МБ"
+
+msgid ""
+"Unable to establish a secure connection to host (certificate chain invalid)."
+msgstr ""
+
+msgid ""
+"Unable to establish a secure connection to host (certificate not yet valid)."
+msgstr ""
+
+msgid "Unable to establish a secure connection to host (expired certificate)."
+msgstr ""
+
+msgid "Unable to establish a secure connection to host (host name mismatch)."
+msgstr ""
+
+msgid ""
+"Unable to establish a secure connection to host (peer dropped connection "
+"before responding)."
+msgstr ""
+
+msgid ""
+"Unable to establish a secure connection to host (self-signed certificate)."
+msgstr ""
+
+msgid ""
+"Unable to establish a secure connection to host (untrusted certificate)."
+msgstr ""
+
+msgid "Unable to establish a secure connection to host."
+msgstr ""
+
+msgid "Unable to find destination for job"
+msgstr "Не удается найти назначение для задания"
+
+msgid "Unable to find printer."
+msgstr ""
+
+msgid "Unable to generate compressed print file"
+msgstr ""
+
+msgid "Unable to get backend exit status."
+msgstr ""
+
+msgid "Unable to get class list"
+msgstr ""
+
+msgid "Unable to get class status"
+msgstr ""
+
+msgid "Unable to get list of printer drivers"
+msgstr ""
+
+msgid "Unable to get printer attributes"
+msgstr ""
+
+msgid "Unable to get printer list"
+msgstr ""
+
+msgid "Unable to get printer status"
+msgstr ""
+
+msgid "Unable to get printer status."
+msgstr ""
+
+#, c-format
+msgid "Unable to install Windows 2000 printer driver files (%d)."
+msgstr ""
+
+#, c-format
+msgid "Unable to install Windows 9x printer driver files (%d)."
+msgstr ""
+
+msgid "Unable to load help index."
+msgstr ""
+
+#, c-format
+msgid "Unable to locate printer \"%s\"."
+msgstr ""
+
+msgid "Unable to locate printer."
+msgstr ""
+
+msgid "Unable to modify class"
+msgstr ""
+
+msgid "Unable to modify printer"
+msgstr ""
+
+msgid "Unable to move job"
+msgstr "Не удается переместить задание"
+
+msgid "Unable to move jobs"
+msgstr "Не удается переместить задания"
+
+msgid "Unable to open PPD file"
+msgstr "Не удается открыть PPD-файл"
+
+msgid "Unable to open compressed print file"
+msgstr ""
+
+msgid "Unable to open cupsd.conf file:"
+msgstr "Не удается открыть файл «cupsd.conf»:"
+
+msgid "Unable to open device file"
+msgstr ""
+
+#, c-format
+msgid "Unable to open document #%d in job #%d."
+msgstr ""
+
+msgid "Unable to open help file."
+msgstr ""
+
+msgid "Unable to open print file"
+msgstr ""
+
+msgid "Unable to open raster file"
+msgstr ""
+
+msgid "Unable to print test page"
+msgstr ""
+
+msgid "Unable to read print data."
+msgstr ""
+
+msgid "Unable to resolve printer URI."
+msgstr ""
+
+#, c-format
+msgid "Unable to run \"%s\": %s"
+msgstr ""
+
+msgid "Unable to see in file"
+msgstr ""
+
+msgid "Unable to send command to printer driver"
+msgstr "Не удается отправить команду драйверу принтера"
+
+msgid "Unable to send data to printer."
+msgstr ""
+
+#, c-format
+msgid "Unable to set Windows printer driver (%d)."
+msgstr ""
+
+msgid "Unable to set options"
+msgstr ""
+
+msgid "Unable to set server default"
+msgstr ""
+
+msgid "Unable to start backend process."
+msgstr ""
+
+msgid "Unable to upload cupsd.conf file"
+msgstr ""
+
+msgid "Unable to use legacy USB class driver."
+msgstr ""
+
+msgid "Unable to write print data"
+msgstr ""
+
+#, c-format
+msgid "Unable to write uncompressed print data: %s"
+msgstr ""
+
+msgid "Unauthorized"
+msgstr "Не санкционировано"
+
+msgid "Units"
+msgstr "Единицы"
+
+msgid "Unknown"
+msgstr "Неизвестный"
+
+#, c-format
+msgid "Unknown choice \"%s\" for option \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unknown encryption option value: \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unknown file order: \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unknown format character: \"%c\"."
+msgstr ""
+
+msgid "Unknown media size name."
+msgstr ""
+
+#, c-format
+msgid "Unknown option \"%s\" with value \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unknown option \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unknown print mode: \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unknown printer-error-policy \"%s\"."
+msgstr "Неизвестная политика printer-error-policy «%s»."
+
+#, c-format
+msgid "Unknown printer-op-policy \"%s\"."
+msgstr "Неизвестная политика printer-op-policy «%s»."
+
+msgid "Unknown service name."
+msgstr ""
+
+#, c-format
+msgid "Unknown version option value: \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unsupported 'compression' value \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unsupported 'document-format' value \"%s\"."
+msgstr ""
+
+msgid "Unsupported 'job-name' value."
+msgstr ""
+
+#, c-format
+msgid "Unsupported character set \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unsupported compression \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unsupported document-format \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unsupported document-format \"%s/%s\"."
+msgstr ""
+
+#, c-format
+msgid "Unsupported format \"%s\"."
+msgstr ""
+
+msgid "Unsupported margins."
+msgstr ""
+
+msgid "Unsupported media value."
+msgstr ""
+
+#, c-format
+msgid "Unsupported number-up value %d, using number-up=1."
+msgstr ""
+
+#, c-format
+msgid "Unsupported number-up-layout value %s, using number-up-layout=lrtb."
+msgstr ""
+
+#, c-format
+msgid "Unsupported page-border value %s, using page-border=none."
+msgstr ""
+
+msgid "Unsupported raster data."
+msgstr ""
+
+msgid "Unsupported value type"
+msgstr "Неподдерживаемый тип значения"
+
+msgid "Upgrade Required"
+msgstr "Требуется обновление"
+
+msgid ""
+"Usage:\n"
+"\n"
+"    lpadmin [-h server] -d destination\n"
+"    lpadmin [-h server] -x destination\n"
+"    lpadmin [-h server] -p printer [-c add-class] [-i interface] [-m model]\n"
+"                       [-r remove-class] [-v device] [-D description]\n"
+"                       [-P ppd-file] [-o name=value]\n"
+"                       [-u allow:user,user] [-u deny:user,user]"
+msgstr ""
+
+#, c-format
+msgid "Usage: %s job-id user title copies options [file]"
+msgstr ""
+
+msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
+msgstr ""
+
+msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
+msgstr ""
+
+msgid "Usage: cupsd [options]"
+msgstr ""
+
+msgid "Usage: cupsfilter [ options ] filename"
+msgstr ""
+
+msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
+msgstr ""
+
+msgid ""
+"Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]"
+msgstr ""
+
+msgid "Usage: ipptool [options] URI filename [ ... filenameN ]"
+msgstr ""
+
+msgid "Usage: lpmove job/src dest"
+msgstr ""
+
+msgid ""
+"Usage: lpoptions [-h server] [-E] -d printer\n"
+"       lpoptions [-h server] [-E] [-p printer] -l\n"
+"       lpoptions [-h server] [-E] -p printer -o option[=value] ...\n"
+"       lpoptions [-h server] [-E] -x printer"
+msgstr ""
+
+msgid "Usage: lppasswd [-g groupname]"
+msgstr ""
+
+msgid ""
+"Usage: lppasswd [-g groupname] [username]\n"
+"       lppasswd [-g groupname] -a [username]\n"
+"       lppasswd [-g groupname] -x [username]"
+msgstr ""
+
+msgid ""
+"Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]"
+msgstr ""
+
+msgid "Usage: ppdc [options] filename.drv [ ... filenameN.drv ]"
+msgstr ""
+
+msgid "Usage: ppdhtml [options] filename.drv >filename.html"
+msgstr ""
+
+msgid "Usage: ppdi [options] filename.ppd [ ... filenameN.ppd ]"
+msgstr ""
+
+msgid "Usage: ppdmerge [options] filename.ppd [ ... filenameN.ppd ]"
+msgstr ""
+
+msgid ""
+"Usage: ppdpo [options] -o filename.po filename.drv [ ... filenameN.drv ]"
+msgstr ""
+
+msgid "Usage: snmp [host-or-ip-address]"
+msgstr ""
+
+msgid "Value uses indefinite length"
+msgstr "Для значения длина не установлена"
+
+msgid "VarBind uses indefinite length"
+msgstr "Для VarBind длина не установлена"
+
+msgid "Version uses indefinite length"
+msgstr "Для Version длина не установлена"
+
+msgid "Waiting for job to complete."
+msgstr ""
+
+msgid "Waiting for printer to become available."
+msgstr ""
+
+msgid "Waiting for printer to finish."
+msgstr ""
+
+msgid "Warning, no Windows 2000 printer drivers are installed."
+msgstr ""
+
+msgid "Web Interface is Disabled"
+msgstr ""
+
+msgid "Yes"
+msgstr "Да"
+
+#, c-format
+msgid ""
+"You must access this page using the URL <A HREF=\"https://%s:%d%s\">https://"
+"%s:%d%s</A>."
+msgstr ""
+"Вы должны получить доступ к этой странице с помощью URL <A HREF=«https://%s:"
+"%d%s»>https://%s:%d%s</A>."
+
+msgid ""
+"Your password must be at least 6 characters long, cannot contain your "
+"username, and must contain at least one letter and number."
+msgstr ""
+
+msgid "ZPL Label Printer"
+msgstr "Принтер для печати этикеток ZPL"
+
+msgid "Zebra"
+msgstr "Zebra"
+
+msgid "aborted"
+msgstr "отменено"
+
+msgid "canceled"
+msgstr "отменено"
+
+msgid "completed"
+msgstr "завершено"
+
+msgid "cups-deviced failed to execute."
+msgstr "Не удалось выполнить cups-deviced."
+
+msgid "cups-driverd failed to execute."
+msgstr "Не удалось выполнить cups-driverd."
+
+#, c-format
+msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
+msgstr ""
+
+msgid "cupsctl: Cannot set Listen or Port directly."
+msgstr ""
+
+#, c-format
+msgid "cupsctl: Unable to connect to server: %s"
+msgstr ""
+
+#, c-format
+msgid "cupsctl: Unknown option \"%s\""
+msgstr ""
+
+#, c-format
+msgid "cupsctl: Unknown option \"-%c\""
+msgstr ""
+
+msgid "cupsd: Expected config filename after \"-c\" option."
+msgstr ""
+
+msgid "cupsd: Expected cups-files.conf filename after \"-s\" option."
+msgstr ""
+
+msgid "cupsd: Relative cups-files.conf filename not allowed."
+msgstr ""
+
+msgid "cupsd: Unable to get current directory."
+msgstr ""
+
+msgid "cupsd: Unable to get path to cups-files.conf file."
+msgstr ""
+
+#, c-format
+msgid "cupsd: Unknown argument \"%s\" - aborting."
+msgstr ""
+
+#, c-format
+msgid "cupsd: Unknown option \"%c\" - aborting."
+msgstr ""
+
+msgid "cupsd: launchd(8) support not compiled in, running in normal mode."
+msgstr ""
+
+#, c-format
+msgid "cupsfilter: Invalid document number %d."
+msgstr ""
+
+#, c-format
+msgid "cupsfilter: Invalid job ID %d."
+msgstr ""
+
+msgid "cupsfilter: Only one filename can be specified."
+msgstr ""
+
+#, c-format
+msgid "cupsfilter: Unable to get job file - %s"
+msgstr ""
+
+msgid "cupstestppd: The -q option is incompatible with the -v option."
+msgstr ""
+
+msgid "cupstestppd: The -v option is incompatible with the -q option."
+msgstr ""
+
+#, c-format
+msgid "device for %s/%s: %s"
+msgstr ""
+
+#, c-format
+msgid "device for %s: %s"
+msgstr ""
+
+msgid "error-index uses indefinite length"
+msgstr "Для error-index длина не установлена"
+
+msgid "error-status uses indefinite length"
+msgstr "Для error-status длина не установлена"
+
+msgid "held"
+msgstr "задержано"
+
+msgid "help\t\tGet help on commands."
+msgstr ""
+
+msgid "idle"
+msgstr "свободен"
+
+msgid "ipptool: \"-i\" and \"-n\" are incompatible with -X\"."
+msgstr ""
+
+#, c-format
+msgid "ipptool: Bad URI - %s."
+msgstr ""
+
+#, c-format
+msgid "ipptool: Bad version %s for \"-V\"."
+msgstr ""
+
+msgid "ipptool: Invalid seconds for \"-i\"."
+msgstr ""
+
+msgid "ipptool: May only specify a single URI."
+msgstr ""
+
+msgid "ipptool: Missing count for \"-n\"."
+msgstr ""
+
+msgid "ipptool: Missing filename for \"-f\"."
+msgstr ""
+
+msgid "ipptool: Missing name=value for \"-d\"."
+msgstr ""
+
+msgid "ipptool: Missing seconds for \"-i\"."
+msgstr ""
+
+msgid "ipptool: Missing timeout for \"-T\"."
+msgstr ""
+
+msgid "ipptool: Missing version for \"-V\"."
+msgstr ""
+
+msgid "ipptool: URI required before test file."
+msgstr ""
+
+#, c-format
+msgid "ipptool: Unknown option \"-%c\"."
+msgstr ""
+
+msgid "job-printer-uri attribute missing."
+msgstr ""
+
+msgid "lpadmin: Class name can only contain printable characters."
+msgstr ""
+
+msgid "lpadmin: Expected PPD after \"-P\" option."
+msgstr ""
+
+msgid "lpadmin: Expected allow/deny:userlist after \"-u\" option."
+msgstr ""
+
+msgid "lpadmin: Expected class after \"-r\" option."
+msgstr ""
+
+msgid "lpadmin: Expected class name after \"-c\" option."
+msgstr ""
+
+msgid "lpadmin: Expected description after \"-D\" option."
+msgstr ""
+
+msgid "lpadmin: Expected device URI after \"-v\" option."
+msgstr ""
+
+msgid "lpadmin: Expected file type(s) after \"-I\" option."
+msgstr ""
+
+msgid "lpadmin: Expected hostname after \"-h\" option."
+msgstr ""
+
+msgid "lpadmin: Expected interface after \"-i\" option."
+msgstr ""
+
+msgid "lpadmin: Expected location after \"-L\" option."
+msgstr ""
+
+msgid "lpadmin: Expected model after \"-m\" option."
+msgstr ""
+
+msgid "lpadmin: Expected name after \"-R\" option."
+msgstr ""
+
+msgid "lpadmin: Expected name=value after \"-o\" option."
+msgstr ""
+
+msgid "lpadmin: Expected printer after \"-p\" option."
+msgstr ""
+
+msgid "lpadmin: Expected printer name after \"-d\" option."
+msgstr ""
+
+msgid "lpadmin: Expected printer or class after \"-x\" option."
+msgstr ""
+
+msgid "lpadmin: No member names were seen."
+msgstr ""
+
+#, c-format
+msgid "lpadmin: Printer %s is already a member of class %s."
+msgstr ""
+
+#, c-format
+msgid "lpadmin: Printer %s is not a member of class %s."
+msgstr ""
+
+msgid "lpadmin: Printer name can only contain printable characters."
+msgstr ""
+
+msgid ""
+"lpadmin: Unable to add a printer to the class:\n"
+"         You must specify a printer name first."
+msgstr ""
+
+#, c-format
+msgid "lpadmin: Unable to connect to server: %s"
+msgstr ""
+
+msgid "lpadmin: Unable to create temporary file"
+msgstr ""
+
+msgid ""
+"lpadmin: Unable to delete option:\n"
+"         You must specify a printer name first."
+msgstr ""
+
+#, c-format
+msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
+msgstr ""
+
+msgid ""
+"lpadmin: Unable to remove a printer from the class:\n"
+"         You must specify a printer name first."
+msgstr ""
+
+msgid ""
+"lpadmin: Unable to set the printer options:\n"
+"         You must specify a printer name first."
+msgstr ""
+
+#, c-format
+msgid "lpadmin: Unknown allow/deny option \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "lpadmin: Unknown argument \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "lpadmin: Unknown option \"%c\"."
+msgstr ""
+
+msgid "lpadmin: Warning - content type list ignored."
+msgstr ""
+
+msgid "lpc> "
+msgstr "lpc> "
+
+msgid "lpinfo: Expected 1284 device ID string after \"--device-id\"."
+msgstr ""
+
+msgid "lpinfo: Expected language after \"--language\"."
+msgstr ""
+
+msgid "lpinfo: Expected make and model after \"--make-and-model\"."
+msgstr ""
+
+msgid "lpinfo: Expected product string after \"--product\"."
+msgstr ""
+
+msgid "lpinfo: Expected scheme list after \"--exclude-schemes\"."
+msgstr ""
+
+msgid "lpinfo: Expected scheme list after \"--include-schemes\"."
+msgstr ""
+
+msgid "lpinfo: Expected timeout after \"--timeout\"."
+msgstr ""
+
+#, c-format
+msgid "lpinfo: Unknown argument \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "lpinfo: Unknown option \"%c\"."
+msgstr ""
+
+#, c-format
+msgid "lpinfo: Unknown option \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "lpmove: Unable to connect to server: %s"
+msgstr ""
+
+#, c-format
+msgid "lpmove: Unknown argument \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "lpmove: Unknown option \"%c\"."
+msgstr ""
+
+msgid "lpoptions: No printers."
+msgstr ""
+
+#, c-format
+msgid "lpoptions: Unable to add printer or instance: %s"
+msgstr ""
+
+#, c-format
+msgid "lpoptions: Unable to get PPD file for %s: %s"
+msgstr ""
+
+#, c-format
+msgid "lpoptions: Unable to open PPD file for %s."
+msgstr ""
+
+msgid "lpoptions: Unknown printer or class."
+msgstr ""
+
+msgid "lppasswd: Only root can add or delete passwords."
+msgstr ""
+
+msgid "lppasswd: Password file busy."
+msgstr ""
+
+msgid "lppasswd: Password file not updated."
+msgstr ""
+
+msgid "lppasswd: Sorry, password doesn't match."
+msgstr ""
+
+msgid "lppasswd: Sorry, password rejected."
+msgstr ""
+
+msgid "lppasswd: Sorry, passwords don't match."
+msgstr ""
+
+#, c-format
+msgid "lppasswd: Unable to copy password string: %s"
+msgstr ""
+
+#, c-format
+msgid "lppasswd: Unable to open password file: %s"
+msgstr ""
+
+#, c-format
+msgid "lppasswd: Unable to write to password file: %s"
+msgstr ""
+
+#, c-format
+msgid "lppasswd: failed to backup old password file: %s"
+msgstr ""
+
+#, c-format
+msgid "lppasswd: failed to rename password file: %s"
+msgstr ""
+
+#, c-format
+msgid "lppasswd: user \"%s\" and group \"%s\" do not exist."
+msgstr ""
+
+#, c-format
+msgid ""
+"lpstat: error - %s environment variable names non-existent destination \"%s"
+"\"."
+msgstr ""
+
+#, c-format
+msgid "members of class %s:"
+msgstr ""
+
+msgid "no entries"
+msgstr ""
+
+msgid "no system default destination"
+msgstr ""
+
+msgid "notify-events not specified."
+msgstr ""
+
+#, c-format
+msgid "notify-recipient-uri URI \"%s\" is already used."
+msgstr ""
+
+#, c-format
+msgid "notify-recipient-uri URI \"%s\" uses unknown scheme."
+msgstr ""
+
+msgid "pending"
+msgstr "задержка"
+
+#, c-format
+msgid "ppdc: Adding include directory \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Adding/updating UI text from %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Bad boolean value (%s) on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Bad font attribute: %s"
+msgstr ""
+
+#, c-format
+msgid "ppdc: Bad resolution name \"%s\" on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Bad status keyword %s on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Bad variable substitution ($%c) on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Choice found on line %d of %s with no Option."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Duplicate #po for locale %s on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected a filter definition on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected a program name on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected boolean value on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected charset after Font on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected choice code on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected choice name/text on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected color order for ColorModel on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected colorspace for ColorModel on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected compression for ColorModel on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected constraints string for UIConstraints on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid ""
+"ppdc: Expected driver type keyword following DriverType on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected duplex type after Duplex on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected encoding after Font on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected filename after #po %s on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected group name/text on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected include filename on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected integer on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected locale after #po on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected name after %s on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected name after FileName on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected name after Font on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected name after Manufacturer on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected name after MediaSize on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected name after ModelName on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected name after PCFileName on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected name/text after %s on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected name/text after Installable on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected name/text after Resolution on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected name/text combination for ColorModel on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected option name/text on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected option section on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected option type on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected override field after Resolution on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected quoted string on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected real number on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid ""
+"ppdc: Expected resolution/mediatype following ColorProfile on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid ""
+"ppdc: Expected resolution/mediatype following SimpleColorProfile on line %d "
+"of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected selector after %s on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected status after Font on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected string after Copyright on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected string after Version on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected two option names on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected value after %s on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Expected version after Font on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Invalid #include/#po filename \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Invalid cost for filter on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Invalid empty MIME type for filter on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Invalid empty program name for filter on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Invalid option section \"%s\" on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Invalid option type \"%s\" on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Loading driver information file \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Loading messages for locale \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Loading messages from \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Missing #endif at end of \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Missing #if on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid ""
+"ppdc: Need a msgid line before any translation strings on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: No message catalog provided for locale %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Option %s defined in two different groups on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Option %s redefined with a different type on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Option constraint must *name on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Too many nested #if's on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unable to create PPD file \"%s\" - %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unable to create output directory %s: %s"
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unable to create output pipes: %s"
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unable to execute cupstestppd: %s"
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unable to find #po file %s on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unable to find include file \"%s\" on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unable to find localization for \"%s\" - %s"
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unable to load localization file \"%s\" - %s"
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unable to open %s: %s"
+msgstr ""
+
+#, c-format
+msgid "ppdc: Undefined variable (%s) on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unexpected text on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unknown driver type %s on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unknown duplex type \"%s\" on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unknown media size \"%s\" on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unknown message catalog format for \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unknown token \"%s\" seen on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid ""
+"ppdc: Unknown trailing characters in real number \"%s\" on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Unterminated string starting with %c on line %d of %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Warning - overlapping filename \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Writing %s."
+msgstr ""
+
+#, c-format
+msgid "ppdc: Writing PPD files to directory \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "ppdmerge: Bad LanguageVersion \"%s\" in %s."
+msgstr ""
+
+#, c-format
+msgid "ppdmerge: Ignoring PPD file %s."
+msgstr ""
+
+#, c-format
+msgid "ppdmerge: Unable to backup %s to %s - %s"
+msgstr ""
+
+#, c-format
+msgid "printer %s disabled since %s -"
+msgstr ""
+
+#, c-format
+msgid "printer %s is idle.  enabled since %s"
+msgstr ""
+
+#, c-format
+msgid "printer %s now printing %s-%d.  enabled since %s"
+msgstr ""
+
+#, c-format
+msgid "printer %s/%s disabled since %s -"
+msgstr ""
+
+#, c-format
+msgid "printer %s/%s is idle.  enabled since %s"
+msgstr ""
+
+#, c-format
+msgid "printer %s/%s now printing %s-%d.  enabled since %s"
+msgstr ""
+
+msgid "processing"
+msgstr "обработка"
+
+#, c-format
+msgid "request id is %s-%d (%d file(s))"
+msgstr ""
+
+msgid "request-id uses indefinite length"
+msgstr "Для request-id длина не определена"
+
+msgid "scheduler is not running"
+msgstr ""
+
+msgid "scheduler is running"
+msgstr ""
+
+#, c-format
+msgid "stat of %s failed: %s"
+msgstr "не удалось установить %s: %s"
+
+msgid "status\t\tShow status of daemon and queue."
+msgstr ""
+
+msgid "stopped"
+msgstr "остановлен"
+
+#, c-format
+msgid "system default destination: %s"
+msgstr ""
+
+#, c-format
+msgid "system default destination: %s/%s"
+msgstr ""
+
+msgid "unknown"
+msgstr "неизвестный"
+
+msgid "untitled"
+msgstr "новый"
+
+msgid "variable-bindings uses indefinite length"
+msgstr "Для variable-bindings длина не установлена"
+
+#~ msgid "\t\t(all)\n"
+#~ msgstr "\t\t(все)\n"
+
+#~ msgid "\t\t(none)\n"
+#~ msgstr "\t\t(нет)\n"
+
+#~ msgid "\t%d entries\n"
+#~ msgstr "\tзаписей: %d\n"
+
+#~ msgid "\tAfter fault: continue\n"
+#~ msgstr "\tПосле ошибки: продолжить\n"
+
+#~ msgid "\tAlerts:"
+#~ msgstr "\tПредупреждения:"
+
+#~ msgid "\tBanner required\n"
+#~ msgstr "\tТребуется баннер\n"
+
+#~ msgid "\tCharset sets:\n"
+#~ msgstr "\tНабор символов устанавливает:\n"
+
+#~ msgid "\tConnection: direct\n"
+#~ msgstr "\tПодключение: прямое\n"
+
+#~ msgid "\tConnection: remote\n"
+#~ msgstr "\tПодключение: удаленное\n"
+
+#~ msgid "\tDefault page size:\n"
+#~ msgstr "\tРазмер страницы по умолчанию:\n"
+
+#~ msgid "\tDefault pitch:\n"
+#~ msgstr "\tВысота по умолчанию:\n"
+
+#~ msgid "\tDefault port settings:\n"
+#~ msgstr "\tНастройки порта по умолчанию:\n"
+
+#~ msgid "\tDescription: %s\n"
+#~ msgstr "\tОписание: %s\n"
+
+#~ msgid ""
+#~ "\tForm mounted:\n"
+#~ "\tContent types: any\n"
+#~ "\tPrinter types: unknown\n"
+#~ msgstr ""
+#~ "\tФорма подключения:\n"
+#~ "\tТипы контента: любые\n"
+#~ "\tТипы принтеров: неизвестно\n"
+
+#~ msgid "\tForms allowed:\n"
+#~ msgstr "\tРазрешенные формы:\n"
+
+#~ msgid "\tInterface: %s.ppd\n"
+#~ msgstr "\tИнтерфейс: %s.ppd\n"
+
+#~ msgid "\tInterface: %s/interfaces/%s\n"
+#~ msgstr "\tИнтерфейс: %s/интерфейсы/%s\n"
+
+#~ msgid "\tInterface: %s/ppd/%s.ppd\n"
+#~ msgstr "\tИнтерфейс: %s/ppd/%s.ppd\n"
+
+#~ msgid "\tLocation: %s\n"
+#~ msgstr "\tРасположение: %s\n"
+
+#~ msgid "\tOn fault: no alert\n"
+#~ msgstr "\tПри ошибке: не выводить предупреждение\n"
+
+#~ msgid "\tUsers allowed:\n"
+#~ msgstr "\tРазрешенные пользователи:\n"
+
+#~ msgid "\tUsers denied:\n"
+#~ msgstr "\tЗапрещенные пользователи:\n"
+
+#~ msgid "\tdaemon present\n"
+#~ msgstr "\tдемон присутствует\n"
+
+#~ msgid "\tno entries\n"
+#~ msgstr "\tнет записей\n"
+
+#~ msgid "\tprinter is on device '%s' speed -1\n"
+#~ msgstr "\tпринтер на скорости -1 устройства «%s»\n"
+
+#~ msgid "\tprinting is disabled\n"
+#~ msgstr "\tпечать отключена\n"
+
+#~ msgid "\tprinting is enabled\n"
+#~ msgstr "\tпечать включена\n"
+
+#~ msgid "\tqueued for %s\n"
+#~ msgstr "\tочередь для %s\n"
+
+#~ msgid "\tqueuing is disabled\n"
+#~ msgstr "\tочередь отключена\n"
+
+#~ msgid "\tqueuing is enabled\n"
+#~ msgstr "\tочередь включена\n"
+
+#~ msgid "\treason unknown\n"
+#~ msgstr "\tпричина неизвестна\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "    DETAILED CONFORMANCE TEST RESULTS\n"
+#~ msgstr ""
+#~ "\n"
+#~ "    ПОДРОБНЫЕ РЕЗУЛЬТАТЫ ТЕСТА СООТВЕТСТВИЯ\n"
+
+#~ msgid "                REF: Page 15, section 3.1.\n"
+#~ msgstr "                REF: Стр. 15, раздел 3.1.\n"
+
+#~ msgid "                REF: Page 15, section 3.2.\n"
+#~ msgstr "                REF: Стр. 15, раздел 3.2.\n"
+
+#~ msgid "                REF: Page 19, section 3.3.\n"
+#~ msgstr "                REF: Стр. 19, раздел 3.3.\n"
+
+#~ msgid "                REF: Page 20, section 3.4.\n"
+#~ msgstr "                REF: Стр. 20, раздел 3.4.\n"
+
+#~ msgid "                REF: Page 27, section 3.5.\n"
+#~ msgstr "                REF: Стр. 27, раздел 3.5.\n"
+
+#~ msgid "                REF: Page 42, section 5.2.\n"
+#~ msgstr "                REF: Стр. 42, раздел 5.2.\n"
+
+#~ msgid "                REF: Pages 16-17, section 3.2.\n"
+#~ msgstr "                REF: Стр. 16-17, раздел 3.2.\n"
+
+#~ msgid "                REF: Pages 42-45, section 5.2.\n"
+#~ msgstr "                REF: Стр. 42-45, раздел 5.2.\n"
+
+#~ msgid "                REF: Pages 45-46, section 5.2.\n"
+#~ msgstr "                REF: Стр. 45-46, раздел 5.2.\n"
+
+#~ msgid "                REF: Pages 48-49, section 5.2.\n"
+#~ msgstr "                REF: Стр. 48-49, раздел 5.2.\n"
+
+#~ msgid "                REF: Pages 52-54, section 5.2.\n"
+#~ msgstr "                REF: Стр. 52-54, раздел 5.2.\n"
+
+#~ msgid "        %-39.39s %.0f bytes\n"
+#~ msgstr "        %-39.39s %.0f байт\n"
+
+#~ msgid "        PASS    Default%s\n"
+#~ msgstr "        PASS    Default%s\n"
+
+#~ msgid "        PASS    DefaultImageableArea\n"
+#~ msgstr "        PASS    DefaultImageableArea\n"
+
+#~ msgid "        PASS    DefaultPaperDimension\n"
+#~ msgstr "        PASS    DefaultPaperDimension\n"
+
+#~ msgid "        PASS    FileVersion\n"
+#~ msgstr "        PASS    FileVersion\n"
+
+#~ msgid "        PASS    FormatVersion\n"
+#~ msgstr "        PASS    FormatVersion\n"
+
+#~ msgid "        PASS    LanguageEncoding\n"
+#~ msgstr "        PASS    LanguageEncoding\n"
+
+#~ msgid "        PASS    LanguageVersion\n"
+#~ msgstr "        PASS    LanguageVersion\n"
+
+#~ msgid "        PASS    Manufacturer\n"
+#~ msgstr "        PASS    Manufacturer\n"
+
+#~ msgid "        PASS    ModelName\n"
+#~ msgstr "        PASS    ModelName\n"
+
+#~ msgid "        PASS    NickName\n"
+#~ msgstr "        PASS    NickName\n"
+
+#~ msgid "        PASS    PCFileName\n"
+#~ msgstr "        PASS    PCFileName\n"
+
+#~ msgid "        PASS    PSVersion\n"
+#~ msgstr "        PASS    PSVersion\n"
+
+#~ msgid "        PASS    PageRegion\n"
+#~ msgstr "        PASS    PageRegion\n"
+
+#~ msgid "        PASS    PageSize\n"
+#~ msgstr "        PASS    PageSize\n"
+
+#~ msgid "        PASS    Product\n"
+#~ msgstr "        PASS    Product\n"
+
+#~ msgid "        PASS    ShortNickName\n"
+#~ msgstr "        PASS    ShortNickName\n"
+
+#~ msgid ""
+#~ "        WARN    \"%s %s\" conflicts with \"%s %s\"\n"
+#~ "                (constraint=\"%s %s %s %s\")\n"
+#~ msgstr ""
+#~ "        WARN    «%s %s» конфликтует с «%s %s»\n"
+#~ "                (constraint=«%s %s %s %s»)\n"
+
+#~ msgid "        WARN    %s has no corresponding options\n"
+#~ msgstr "\tWARN\t%s не имеет соответствующих параметров\n"
+
+#~ msgid ""
+#~ "        WARN    %s shares a common prefix with %s\n"
+#~ "                REF: Page 15, section 3.2.\n"
+#~ msgstr ""
+#~ "        WARN    %s использует общий префикс совместно с %s\n"
+#~ "                REF: Стр. 15, раздел 3.2.\n"
+
+#~ msgid "        WARN    Default choices conflicting\n"
+#~ msgstr "\tWARN\tЗначения, используемые по умолчанию, конфликтуют\n"
+
+#~ msgid ""
+#~ "        WARN    Duplex option keyword %s may not work as expected and "
+#~ "should be named Duplex\n"
+#~ "                REF: Page 122, section 5.17\n"
+#~ msgstr ""
+#~ "\tWARN\tКлючевое слово параметра дуплекса %s может привести к "
+#~ "некорректным результатам. Используйте имя 'Duplex'\n"
+#~ "\t\tREF: Стр. 122, раздел 5.17\n"
+
+#~ msgid ""
+#~ "        WARN    File contains a mix of CR, LF, and CR LF line endings\n"
+#~ msgstr "\tWARN\tФайл содержит комбинацию окончаний строки CR, LF, CR LF \n"
+
+#~ msgid ""
+#~ "        WARN    LanguageEncoding required by PPD 4.3 spec.\n"
+#~ "                REF: Pages 56-57, section 5.3.\n"
+#~ msgstr ""
+#~ "        WARN    LanguageEncoding требуется спецификацией PPD 4.3.\n"
+#~ "                REF: Стр. 56-57, раздел 5.3.\n"
+
+#~ msgid "        WARN    Line %d only contains whitespace\n"
+#~ msgstr "\tWARN\tСтрока %d содержит только пробелы\n"
+
+#~ msgid ""
+#~ "        WARN    Manufacturer required by PPD 4.3 spec.\n"
+#~ "                REF: Pages 58-59, section 5.3.\n"
+#~ msgstr ""
+#~ "        WARN    Manufacturer требуется спецификацией PPD 4.3.\n"
+#~ "                REF: Стр. 58-59, раздел 5.3.\n"
+
+#~ msgid ""
+#~ "        WARN    Non-Windows PPD files should use lines ending with only "
+#~ "LF, not CR LF\n"
+#~ msgstr ""
+#~ "\tWARN\tPPD-файлы не из Windows должны использовать строки только с "
+#~ "окончанием LF, а не с CR LF\n"
+
+#~ msgid ""
+#~ "        WARN    Obsolete PPD version %.1f\n"
+#~ "                REF: Page 42, section 5.2.\n"
+#~ msgstr ""
+#~ "\tWARN\tУстаревшая версия PPD %.1f\n"
+#~ "\t\tREF: Стр. 42, раздел 5.2. \n"
+
+#~ msgid ""
+#~ "        WARN    PCFileName longer than 8.3 in violation of PPD spec.\n"
+#~ "                REF: Pages 61-62, section 5.3.\n"
+#~ msgstr ""
+#~ "        WARN    PCFileName длиннее чем 8.3 нарушает спецификацию PPD.\n"
+#~ "                REF: Стр. 61-62, раздел 5.3.\n"
+
+#~ msgid ""
+#~ "        WARN    PCFileName should contain a unique filename.\n"
+#~ "                REF: Pages 61-62, section 5.3.\n"
+#~ msgstr ""
+#~ "\tWARN\tPCFilename должен содержать уникальное название\n"
+#~ "\t\tREF: Стр. 61-62, раздел 5.3. \n"
+
+#~ msgid ""
+#~ "        WARN    Protocols contains PJL but JCL attributes are not set.\n"
+#~ "                REF: Pages 78-79, section 5.7.\n"
+#~ msgstr ""
+#~ "        WARN    Protocols содержит PJL, но атрибуты JCL не настроены.\n"
+#~ "                REF: Стр. 78-79, раздел 5.7.\n"
+
+#~ msgid ""
+#~ "        WARN    Protocols contains both PJL and BCP; expected TBCP.\n"
+#~ "                REF: Pages 78-79, section 5.7.\n"
+#~ msgstr ""
+#~ "\tWARN\tProtocols содержит PJL и BCP;\n"
+#~ "\t\tREF: Стр. 78-79, раздел 5.7.\n"
+
+#~ msgid ""
+#~ "        WARN    ShortNickName required by PPD 4.3 spec.\n"
+#~ "                REF: Pages 64-65, section 5.3.\n"
+#~ msgstr ""
+#~ "        WARN    ShortNickName требуется спецификацией PPD 4.3.\n"
+#~ "                REF: Стр. 64-65, раздел 5.3.\n"
+
+#~ msgid "      %s  %s %s does not exist\n"
+#~ msgstr "\t%s %s %s не существует\n"
+
+#~ msgid "      %s  %s file \"%s\" has the wrong capitalization\n"
+#~ msgstr "      %s  %s файл \"%s\" имеет неверный регистр\n"
+
+#~ msgid ""
+#~ "      %s  Bad %s choice %s\n"
+#~ "                REF: Page 122, section 5.17\n"
+#~ msgstr ""
+#~ "      %s  Неверный %s выбор %s!\n"
+#~ "                REF: Стр. 122, раздел 5.17\n"
+
+#~ msgid "      %s  Bad UTF-8 \"%s\" translation string for option %s\n"
+#~ msgstr "\t%s Неверный перевод UTF-8 \"%s\" для параметра %s\n"
+
+#~ msgid ""
+#~ "      %s  Bad UTF-8 \"%s\" translation string for option %s, choice %s\n"
+#~ msgstr "\t%s Неверный перевод UTF-8 \"%s\" для параметра %s, выбора %s\n"
+
+#~ msgid "      %s  Bad cupsFilter value \"%s\"\n"
+#~ msgstr "\t%s Неверное значение cupsFilter \"%s\"\n"
+
+#~ msgid "      %s  Bad cupsICCProfile %s\n"
+#~ msgstr "\t%s Неверный cupsICCProfile %s\n"
+
+#~ msgid "      %s  Bad cupsPreFilter value \"%s\"\n"
+#~ msgstr "\t%s Неверное значение cupsPreFilter \"%s\"\n"
+
+#~ msgid "      %s  Bad cupsUIConstraints %s: \"%s\"\n"
+#~ msgstr "\t%s Неверное значение cupsUIConstraints %s: \"%s\"\n"
+
+#~ msgid "      %s  Bad language \"%s\"\n"
+#~ msgstr "\t%s Неверный язык \"%s\"\n"
+
+#~ msgid "      %s  Bad permissions on APDialogExtension file \"%s\"\n"
+#~ msgstr "      %s Неверные права для файла APDialogExtension \"%s\"\n"
+
+#~ msgid "      %s  Bad permissions on APPrinterIconPath file \"%s\"\n"
+#~ msgstr "      %s Неверные права для файла APPrinterIconPath \"%s\"\n"
+
+#~ msgid "      %s  Bad permissions on APPrinterLowInkTool file \"%s\"\n"
+#~ msgstr "      %s Неверные права для файла APPrinterLowInkTool \"%s\"\n"
+
+#~ msgid "      %s  Bad permissions on APPrinterUtilityPath file \"%s\"\n"
+#~ msgstr "      %s Неверные права для файла APPrinterUtilityPath \"%s\"\n"
+
+#~ msgid "      %s  Bad permissions on APScanAppPath file \"%s\"\n"
+#~ msgstr "      %s Неверные права для файла APScanAppPath \"%s\"\n"
+
+#~ msgid "      %s  Bad permissions on cupsFilter file \"%s\"\n"
+#~ msgstr "      %s Неверные права для файла cupsFilter \"%s\"\n"
+
+#~ msgid "      %s  Bad permissions on cupsICCProfile file \"%s\"\n"
+#~ msgstr "      %s Неверные права для файла cupsICCProfile \"%s\"\n"
+
+#~ msgid "      %s  Bad permissions on cupsPreFilter file \"%s\"\n"
+#~ msgstr "      %s Неверные права для файла cupsPreFilter \"%s\"\n"
+
+#~ msgid "      %s  Bad spelling of %s - should be %s\n"
+#~ msgstr "      %s Ошибки в %s - должно быть %s.\n"
+
+#~ msgid "      %s  Cannot provide both APScanAppPath and APScanAppBundleID\n"
+#~ msgstr ""
+#~ "      %s Невозможно предоставить APScanAppPath и APScanAppBundleID "
+#~ "вместе.\n"
+
+#~ msgid "      %s  Empty cupsUIConstraints %s\n"
+#~ msgstr "      %s Пустой cupsUIConstraints %s\n"
+
+#~ msgid "      %s  Missing \"%s\" translation string for option %s\n"
+#~ msgstr "\t%s Перевод \"%s\" отсутствует для параметра %s\n"
+
+#~ msgid ""
+#~ "      %s  Missing \"%s\" translation string for option %s, choice %s\n"
+#~ msgstr "\t%s Перевод \"%s\" отсутствует для параметра %s, выбора %s\n"
+
+#~ msgid "      %s  Missing APDialogExtension file \"%s\"\n"
+#~ msgstr "\t%s Файл APDialogExtention отсутствует \"%s\"\n"
+
+#~ msgid "      %s  Missing APPrinterIconPath file \"%s\"\n"
+#~ msgstr "\t%s Файл APPrinterIconPath отсутствует \"%s\"\n"
+
+#~ msgid "      %s  Missing APPrinterLowInkTool file \"%s\"\n"
+#~ msgstr "\t%s Файл APPrinterLowInkTool отсутствует \"%s\"\n"
+
+#~ msgid "      %s  Missing APPrinterUtilityPath file \"%s\"\n"
+#~ msgstr "\t%s Файл APPrinterUtilityPath отсутствует \"%s\"\n"
+
+#~ msgid "      %s  Missing APScanAppPath file \"%s\"\n"
+#~ msgstr "\t%s Файл APScanAppPath отсутствует \"%s\"\n"
+
+#~ msgid ""
+#~ "      %s  Missing REQUIRED PageRegion option\n"
+#~ "                REF: Page 100, section 5.14.\n"
+#~ msgstr ""
+#~ "\t%s Обязательный параметр PageRegion отсутствует.\n"
+#~ "\t\t REF: Стр. 100, раздел 5.14.\n"
+
+#~ msgid ""
+#~ "      %s  Missing REQUIRED PageSize option\n"
+#~ "                REF: Page 99, section 5.14.\n"
+#~ msgstr ""
+#~ "\t%s Обязательный параметр PageSize отсутствует.\n"
+#~ "\t\t REF: Стр. 99, раздел 5.14.\n"
+
+#~ msgid "      %s  Missing choice *%s %s in UIConstraints \"*%s %s *%s %s\"\n"
+#~ msgstr ""
+#~ "      %s Выбор *%s %s отсутствует в UIConstraints \"*%s %s *%s %s\"\n"
+
+#~ msgid "      %s  Missing choice *%s %s in cupsUIConstraints %s: \"%s\"\n"
+#~ msgstr "      %s Выбор *%s %s отсутствует в cupsUIConstraints %s: \"%s\"\n"
+
+#~ msgid "      %s  Missing cupsFilter file \"%s\"\n"
+#~ msgstr "      %s  Файл cupsFilter отсутствует «%s»\n"
+
+#~ msgid "      %s  Missing cupsICCProfile file \"%s\"\n"
+#~ msgstr "\t%s Файл cupsICCProfile отсутствует \"%s\"\n"
+
+#~ msgid "      %s  Missing cupsPreFilter file \"%s\"\n"
+#~ msgstr "      %s  Файл cupsFilter «%s» отсутствует\n"
+
+#~ msgid "      %s  Missing cupsUIResolver %s\n"
+#~ msgstr "\t%s cupsUIResolver отсутствует %s\n"
+
+#~ msgid "      %s  Missing option %s in UIConstraints \"*%s %s *%s %s\"\n"
+#~ msgstr "\t%s Отсутствует параметр %s у UIConstraints \"*%s %s *%s %s\"\n"
+
+#~ msgid "      %s  Missing option %s in cupsUIConstraints %s: \"%s\"\n"
+#~ msgstr "\t%s Отсутствует параметр %s у cupsUIConstraints %s: \"%s\"\n"
+
+#~ msgid "      %s  No base translation \"%s\" is included in file\n"
+#~ msgstr "\t%s Основной перевод \"%s\" не включен в файл\n"
+
+#~ msgid ""
+#~ "      %s  Non-standard size name \"%s\"\n"
+#~ "                REF: Page 187, section B.2.\n"
+#~ msgstr ""
+#~ "\t%s Не стандартный размер названия \"%s\"\n"
+#~ "\t\tREF: Стр. 187, раздел B.2.\n"
+
+#~ msgid ""
+#~ "      %s  REQUIRED %s does not define choice None\n"
+#~ "                REF: Page 122, section 5.17\n"
+#~ msgstr ""
+#~ "\t ТРЕБУЕТСЯ %s: %s не определяет выбор \"Нет\"\n"
+#~ "\t\tREF: Стр. 122, раздел 5.17\n"
+
+#~ msgid "      %s  Size \"%s\" defined for %s but not for %s\n"
+#~ msgstr "\t%s Размер \"%s\" определен для %s, но не определен для %s\n"
+
+#~ msgid "      %s  Size \"%s\" has unexpected dimensions (%gx%g)\n"
+#~ msgstr "\t%s  Размер \"%s\"  имеет неверное значение (%gx%g)\n"
+
+#~ msgid "      %s  cupsICCProfile %s hash value collides with %s\n"
+#~ msgstr "\tХеш-значение %s cupsICCProfile %s конфликтует с %s\n"
+
+#~ msgid "      %s  cupsUIResolver %s causes a loop\n"
+#~ msgstr "\t%s cupsUIResolver %s создает цикл\n"
+
+#~ msgid ""
+#~ "      %s  cupsUIResolver %s does not list at least two different options\n"
+#~ msgstr "\t%s В cupsUIResolver %s не перечислено как минимум два параметра\n"
+
+#~ msgid "      **FAIL**  %s choice names %s and %s differ only by case\n"
+#~ msgstr ""
+#~ "\t**FAIL** Для выбора %s имена %s и %s различаются только регистром "
+#~ "символов\n"
+
+#~ msgid ""
+#~ "      **FAIL**  %s must be 1284DeviceID\n"
+#~ "                REF: Page 72, section 5.5\n"
+#~ msgstr ""
+#~ "\t**FAIL** %s должно соответствовать 1284DeviceID\n"
+#~ "\t\tREF: Стр. 72, раздел 5.5\n"
+
+#~ msgid ""
+#~ "      **FAIL**  BAD Default%s %s\n"
+#~ "                REF: Page 40, section 4.5.\n"
+#~ msgstr ""
+#~ "      **FAIL**  НЕВЕРНЫЙ Default%s %s\n"
+#~ "                REF: Стр. 40, раздел 4.5.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  BAD DefaultImageableArea %s\n"
+#~ "                REF: Page 102, section 5.15.\n"
+#~ msgstr ""
+#~ "\t**FAIL** Неверный DefaultImageableArea %s\n"
+#~ "\t\tREF: Стр. 102, раздел 5.15.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  BAD DefaultPaperDimension %s\n"
+#~ "                REF: Page 103, section 5.15.\n"
+#~ msgstr ""
+#~ "\t**FAIL** Неверный DefaultPaperDimension %s\n"
+#~ "\t\tREF: Стр. 103, раздел 5.15.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  BAD JobPatchFile attribute in file\n"
+#~ "                REF: Page 24, section 3.4.\n"
+#~ msgstr ""
+#~ "      **FAIL**  НЕВЕРНЫЙ JobPatchFile атрибут в файле\n"
+#~ "                REF: Стр. 24, раздел 3.4.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  BAD Manufacturer (should be \"HP\")\n"
+#~ "                REF: Page 211, table D.1.\n"
+#~ msgstr ""
+#~ "      **FAIL**  НЕВЕРНЫЙ Manufacturer (должен быть «HP»)\n"
+#~ "                REF: Стр. 211, таблица D.1.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  BAD Manufacturer (should be \"Oki\")\n"
+#~ "                REF: Page 211, table D.1.\n"
+#~ msgstr ""
+#~ "      **FAIL**  НЕВЕРНЫЙ Manufacturer (должен быть «Oki»)\n"
+#~ "                REF: Стр. 211, таблица D.1.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  BAD ModelName - \"%c\" not allowed in string.\n"
+#~ "                REF: Pages 59-60, section 5.3.\n"
+#~ msgstr ""
+#~ "      **FAIL**  НЕВЕРНОЕ ModelName – «%c» не разрешено в строке.\n"
+#~ "                REF: Стр. 59-60, раздел 5.3.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  BAD PSVersion - not \"(string) int\".\n"
+#~ "                REF: Pages 62-64, section 5.3.\n"
+#~ msgstr ""
+#~ "      **FAIL**  НЕВЕРНАЯ PSVersion – не «(string) int».\n"
+#~ "                REF: Стр. 62-64, раздел 5.3.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  BAD Product - not \"(string)\".\n"
+#~ "                REF: Page 62, section 5.3.\n"
+#~ msgstr ""
+#~ "      **FAIL**  НЕВЕРНЫЙ Product – не «(string)».\n"
+#~ "                REF: Стр. 62, раздел 5.3.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  BAD ShortNickName - longer than 31 chars.\n"
+#~ "                REF: Pages 64-65, section 5.3.\n"
+#~ msgstr ""
+#~ "      **FAIL**  НЕВЕРНЫЙ ShortNickName – длиннее чем 31 симв.\n"
+#~ "                REF: Стр. 64-65, раздел 5.3.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  Bad %s choice %s\n"
+#~ "                REF: Page 84, section 5.9\n"
+#~ msgstr ""
+#~ "\t**FAIL** Неверный %s выбор %s\n"
+#~ "\t\t REF: Стр. 84, раздел 5.9\n"
+
+#~ msgid ""
+#~ "      **FAIL**  Bad FileVersion \"%s\"\n"
+#~ "                REF: Page 56, section 5.3.\n"
+#~ msgstr ""
+#~ "      **FAIL**  Неверная FileVersion \"%s\"\n"
+#~ "                REF: Стр. 56, раздел 5.3.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  Bad FormatVersion \"%s\"\n"
+#~ "                REF: Page 56, section 5.3.\n"
+#~ msgstr ""
+#~ "      **FAIL**  Неверная FormatVersion \"%s\"\n"
+#~ "                REF: Стр. 56, раздел 5.3.\n"
+
+#~ msgid "      **FAIL**  Bad LanguageEncoding %s - must be ISOLatin1\n"
+#~ msgstr "\t**FAIL**  Неверный LanguageEncoding %s - должен быть ISOLatin1\n"
+
+#~ msgid "      **FAIL**  Bad LanguageVersion %s - must be English\n"
+#~ msgstr "\t**FAIL** Неверный LanguageVersion %s - должен быть английский\n"
+
+#~ msgid "      **FAIL**  Default option code cannot be interpreted: %s\n"
+#~ msgstr ""
+#~ "      **FAIL**  Не удается интерпретировать код параметра по умолчанию: "
+#~ "%s\n"
+
+#~ msgid ""
+#~ "      **FAIL**  Default translation string for option %s choice %s "
+#~ "contains 8-bit characters\n"
+#~ msgstr ""
+#~ "\t**FAIL** Стандартный перевод для параметра %s выбора %s содержит 8-"
+#~ "битовые символы\n"
+
+#~ msgid ""
+#~ "      **FAIL**  Default translation string for option %s contains 8-bit "
+#~ "characters\n"
+#~ msgstr ""
+#~ "\t**FAIL** Стандартный перевод для параметра %s содержит 8-"
+#~ "битовыесимволы\n"
+
+#~ msgid "      **FAIL**  Group names %s and %s differ only by case\n"
+#~ msgstr ""
+#~ "\t**FAIL** Имена групп %s и %s отличаются только регистром символов\n"
+
+#~ msgid "      **FAIL**  Multiple occurrences of %s choice name %s\n"
+#~ msgstr "\t**FAIL** Для выбора %s имя %s  встречается несколько раз\n"
+
+#~ msgid "      **FAIL**  Option names %s and %s differ only by case\n"
+#~ msgstr ""
+#~ "\t**FAIL** Названия параметров %s и %s отличаются лишь регистром "
+#~ "символов\n"
+
+#~ msgid ""
+#~ "      **FAIL**  REQUIRED Default%s\n"
+#~ "                REF: Page 40, section 4.5.\n"
+#~ msgstr ""
+#~ "      **FAIL**  ТРЕБУЕТСЯ Default%s\n"
+#~ "                REF: Стр. 40, раздел 4.5.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  REQUIRED DefaultImageableArea\n"
+#~ "                REF: Page 102, section 5.15.\n"
+#~ msgstr ""
+#~ "      **FAIL**  ТРЕБУЕТСЯ DefaultImageableArea\n"
+#~ "                REF: Стр. 102, раздел 5.15.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  REQUIRED DefaultPaperDimension\n"
+#~ "                REF: Page 103, section 5.15.\n"
+#~ msgstr ""
+#~ "      **FAIL**  ТРЕБУЕТСЯ DefaultPaperDimension\n"
+#~ "                REF: Стр. 103, раздел 5.15.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  REQUIRED FileVersion\n"
+#~ "                REF: Page 56, section 5.3.\n"
+#~ msgstr ""
+#~ "      **FAIL**  ТРЕБУЕТСЯ FileVersion\n"
+#~ "                REF: Стр. 56, раздел 5.3.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  REQUIRED FormatVersion\n"
+#~ "                REF: Page 56, section 5.3.\n"
+#~ msgstr ""
+#~ "      **FAIL**  ТРЕБУЕТСЯ FormatVersion\n"
+#~ "                REF: Стр. 56, раздел 5.3.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  REQUIRED ImageableArea for PageSize %s\n"
+#~ "                REF: Page 41, section 5.\n"
+#~ "                REF: Page 102, section 5.15.\n"
+#~ msgstr ""
+#~ "      **FAIL**  ТРЕБУЕТСЯ ImageableArea для PageSize %s\n"
+#~ "                REF: Стр. 41, раздел 5.\n"
+#~ "                REF: Стр. 102, раздел 5.15.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  REQUIRED LanguageEncoding\n"
+#~ "                REF: Pages 56-57, section 5.3.\n"
+#~ msgstr ""
+#~ "      **FAIL**  ТРЕБУЕТСЯ LanguageEncoding\n"
+#~ "                REF: Стр. 56-57, раздел 5.3.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  REQUIRED LanguageVersion\n"
+#~ "                REF: Pages 57-58, section 5.3.\n"
+#~ msgstr ""
+#~ "      **FAIL**  ТРЕБУЕТСЯ LanguageVersion\n"
+#~ "                REF: Стр. 57-58, раздел 5.3.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  REQUIRED Manufacturer\n"
+#~ "                REF: Pages 58-59, section 5.3.\n"
+#~ msgstr ""
+#~ "      **FAIL**  ТРЕБУЕТСЯ Manufacturer\n"
+#~ "                REF: Стр. 58-59, раздел 5.3.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  REQUIRED ModelName\n"
+#~ "                REF: Pages 59-60, section 5.3.\n"
+#~ msgstr ""
+#~ "      **FAIL**  ТРЕБУЕТСЯ ModelName\n"
+#~ "                REF: Стр. 59-60, раздел 5.3.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  REQUIRED NickName\n"
+#~ "                REF: Page 60, section 5.3.\n"
+#~ msgstr ""
+#~ "      **FAIL**  ТРЕБУЕТСЯ NickName\n"
+#~ "                REF: Стр. 60, раздел 5.3.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  REQUIRED PCFileName\n"
+#~ "                REF: Pages 61-62, section 5.3.\n"
+#~ msgstr ""
+#~ "      **FAIL**  ТРЕБУЕТСЯ PCFileName\n"
+#~ "                REF: Стр. 61-62, раздел 5.3.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  REQUIRED PSVersion\n"
+#~ "                REF: Pages 62-64, section 5.3.\n"
+#~ msgstr ""
+#~ "      **FAIL**  ТРЕБУЕТСЯ PSVersion\n"
+#~ "                REF: Стр. 62-64, раздел 5.3.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  REQUIRED PageRegion\n"
+#~ "                REF: Page 100, section 5.14.\n"
+#~ msgstr ""
+#~ "      **FAIL**  ТРЕБУЕТСЯ PageRegion\n"
+#~ "                REF: Стр. 100, раздел 5.14.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  REQUIRED PageSize\n"
+#~ "                REF: Page 41, section 5.\n"
+#~ "                REF: Page 99, section 5.14.\n"
+#~ msgstr ""
+#~ "      **FAIL**  ТРЕБУЕТСЯ PageSize\n"
+#~ "                REF: Стр. 41, раздел 5.\n"
+#~ "                REF: Стр. 99, раздел 5.14.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  REQUIRED PageSize\n"
+#~ "                REF: Pages 99-100, section 5.14.\n"
+#~ msgstr ""
+#~ "      **FAIL**  ТРЕБУЕТСЯ PageSize\n"
+#~ "                REF: Стр. 99-100, раздел 5.14.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  REQUIRED PaperDimension for PageSize %s\n"
+#~ "                REF: Page 41, section 5.\n"
+#~ "                REF: Page 103, section 5.15.\n"
+#~ msgstr ""
+#~ "      **FAIL**  ТРЕБУЕТСЯ PaperDimension для PageSize %s\n"
+#~ "                REF: Стр. 41, раздел 5.\n"
+#~ "                REF: Стр. 103, раздел 5.15.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  REQUIRED Product\n"
+#~ "                REF: Page 62, section 5.3.\n"
+#~ msgstr ""
+#~ "      **FAIL**  ТРЕБУЕТСЯ Product\n"
+#~ "                REF: Стр. 62, раздел 5.3.\n"
+
+#~ msgid ""
+#~ "      **FAIL**  REQUIRED ShortNickName\n"
+#~ "                REF: Page 64-65, section 5.3.\n"
+#~ msgstr ""
+#~ "      **FAIL**  ТРЕБУЕТСЯ ShortNickName\n"
+#~ "                REF: Стр. 64-65, раздел 5.3.\n"
+
+#~ msgid "    %d ERRORS FOUND\n"
+#~ msgstr "    ОБНАРУЖЕНО ОШИБОК: %d\n"
+
+#~ msgid ""
+#~ "    Bad %%%%BoundingBox: on line %d\n"
+#~ "        REF: Page 39, %%%%BoundingBox:\n"
+#~ msgstr ""
+#~ "    Неверный %%%%BoundingBox: в строке %d\n"
+#~ "\t REF: Стр. 39, %%%%BoundingBox:\n"
+
+#~ msgid ""
+#~ "    Bad %%%%Page: on line %d\n"
+#~ "        REF: Page 53, %%%%Page:\n"
+#~ msgstr ""
+#~ "    Неверная %%%%Page: в строке %d\n"
+#~ "\t REF: Стр. 53, %%%%Page:\n"
+
+#~ msgid ""
+#~ "    Bad %%%%Pages: on line %d\n"
+#~ "        REF: Page 43, %%%%Pages:\n"
+#~ msgstr ""
+#~ "    Неверные %%%%Pages: в строке %d\n"
+#~ "\t REF: Стр. 43, %%%%Pages:\n"
+
+#~ msgid ""
+#~ "    Line %d is longer than 255 characters (%d)\n"
+#~ "        REF: Page 25, Line Length\n"
+#~ msgstr ""
+#~ "\tДлина строки %d больше 255 символов (%d)\n"
+#~ "\t REF: Стр. 25, Длина строки \n"
+
+#~ msgid ""
+#~ "    Missing %!PS-Adobe-3.0 on first line\n"
+#~ "        REF: Page 17, 3.1 Conforming Documents\n"
+#~ msgstr ""
+#~ "    %!PS-Adobe-3.0 отсутствует в первой строке\n"
+#~ "\t REF: Стр. 17, 3.1 Соответствующие документы\n"
+
+#~ msgid ""
+#~ "    Missing %%EndComments comment\n"
+#~ "        REF: Page 41, %%EndComments\n"
+#~ msgstr ""
+#~ "    Комментарий %%EndComments отсутствует\n"
+#~ "\t REF: Стр. 41, %%EndComments\n"
+
+#~ msgid ""
+#~ "    Missing or bad %%BoundingBox: comment\n"
+#~ "        REF: Page 39, %%BoundingBox:\n"
+#~ msgstr ""
+#~ "    Отсутствует или неверный %%BoundingBox: комментарий\n"
+#~ "\t REF: Стр. 39, %%BoundingBox:\n"
+
+#~ msgid ""
+#~ "    Missing or bad %%Page: comments\n"
+#~ "        REF: Page 53, %%Page:\n"
+#~ msgstr ""
+#~ "    Отсутствует или неверная %%Page: комментарий\n"
+#~ "\t REF: Стр. 53, %%Page:\n"
+
+#~ msgid ""
+#~ "    Missing or bad %%Pages: comment\n"
+#~ "        REF: Page 43, %%Pages:\n"
+#~ msgstr ""
+#~ "    Отсутствуют или неверные %%Pages:  комментарий\n"
+#~ "\t REF: Стр. 43, %%Pages:\n"
+
+#~ msgid "    NO ERRORS FOUND\n"
+#~ msgstr "    ОШИБОК НЕ ОБНАРУЖЕНО\n"
+
+#~ msgid "    Saw %d lines that exceeded 255 characters\n"
+#~ msgstr "\tНайдено %d строк, длина которых превышает 255 символов\n"
+
+#~ msgid "    Too many %%BeginDocument comments\n"
+#~ msgstr "   Слишком много комментариев %%BeginDocument\n"
+
+#~ msgid "    Too many %%EndDocument comments\n"
+#~ msgstr "   Слишком много комментариев %%EndDocument\n"
+
+#~ msgid "    Warning: file contains binary data\n"
+#~ msgstr "    WARNING: файл содержит бинарные данные\n"
+
+#~ msgid "    Warning: no %%EndComments comment in file\n"
+#~ msgstr "    WARNING: нет комментария %%EndComments в файле\n"
+
+#~ msgid "    Warning: obsolete DSC version %.1f in file\n"
+#~ msgstr "    WARNING: устаревшая версия DSC %.1f в файле\n"
+
+#~ msgid " FAIL\n"
+#~ msgstr " FAIL\n"
+
+#~ msgid ""
+#~ " FAIL\n"
+#~ "      **FAIL**  Unable to open PPD file - %s\n"
+#~ msgstr ""
+#~ " FAIL\n"
+#~ "      **FAIL**  Не удается открыть PPD-файл – %s\n"
+
+#~ msgid ""
+#~ " FAIL\n"
+#~ "      **FAIL**  Unable to open PPD file - %s on line %d.\n"
+#~ msgstr ""
+#~ " FAIL\n"
+#~ "      **FAIL**  Не удается открыть PPD-файл – %s в строке %d.\n"
+
+#~ msgid " PASS\n"
+#~ msgstr " PASS\n"
+
+#~ msgid "#10 Envelope"
+#~ msgstr "#10 Envelope"
+
+#~ msgid "#11 Envelope"
+#~ msgstr "#11 Envelope"
+
+#~ msgid "#12 Envelope"
+#~ msgstr "#12 Envelope"
+
+#~ msgid "#14 Envelope"
+#~ msgstr "#14 Envelope"
+
+#~ msgid "#9 Envelope"
+#~ msgstr "#9 Envelope"
+
+#~ msgid "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes\n"
+#~ msgstr "%-6s %-10.10s %-4d %-10d %-27.27s %.0f байт\n"
+
+#~ msgid "%-7s %-7.7s %-7d %-31.31s %.0f bytes\n"
+#~ msgstr "%-7s %-7.7s %-7d %-31.31s %.0f байт\n"
+
+#~ msgid "%.0f x %.0f millimeters"
+#~ msgstr "%.0f x %.0f мм"
+
+#~ msgid "%.0f x %.0f to %.0f x %.0f millimeters"
+#~ msgstr "%.0f x %.0f — %.0f x %.0f мм"
+
+#~ msgid "%.2f x %.2f inches"
+#~ msgstr "%.2f x %.2f дюймов"
+
+#~ msgid "%.2f x %.2f to %.2f x %.2f inches"
+#~ msgstr "%.2f x %.2f-%.2f x %.2f дюймов"
+
+#~ msgid "%s accepting requests since %s\n"
+#~ msgstr "%s принимает запросы с момента %s\n"
+
+#~ msgid "%s is not implemented by the CUPS version of lpc.\n"
+#~ msgstr "%s не выполнено версией CUPS для lpc.\n"
+
+#~ msgid "%s is not ready\n"
+#~ msgstr "%s не готов\n"
+
+#~ msgid "%s is ready\n"
+#~ msgstr "%s готов\n"
+
+#~ msgid "%s is ready and printing\n"
+#~ msgstr "%s готов и печатает\n"
+
+#~ msgid ""
+#~ "%s not accepting requests since %s -\n"
+#~ "\t%s\n"
+#~ msgstr ""
+#~ "%s не принимает запросы с момента %s -\n"
+#~ "\t%s\n"
+
+#~ msgid "%s not supported"
+#~ msgstr "%s не поддерживается"
+
+#~ msgid "%s/%s accepting requests since %s\n"
+#~ msgstr "%s/%s принимает запросы с момента %s\n"
+
+#~ msgid ""
+#~ "%s/%s not accepting requests since %s -\n"
+#~ "\t%s\n"
+#~ msgstr ""
+#~ "%s/%s не принимает запросы с момента %s -\n"
+#~ "\t%s\n"
+
+#~ msgid "%s: %-33.33s [job %d localhost]\n"
+#~ msgstr "%s: %-33.33s [задание %d localhost]\n"
+
+#~ msgid "%s: %s failed: %s\n"
+#~ msgstr "%s: ошибка %s: %s\n"
+
+#~ msgid "%s: Don't know what to do\n"
+#~ msgstr "%s: Дальнейшие действия неизвестны\n"
+
+#~ msgid ""
+#~ "%s: Error - %s environment variable names non-existent destination \"%s"
+#~ "\"\n"
+#~ msgstr ""
+#~ "%s: Ошибка - %s переменная окружения указывает на несуществующее "
+#~ "назначение \"%s\"\n"
+
+#~ msgid "%s: Error - bad job ID\n"
+#~ msgstr "%s: Ошибка - неверный ID задания\n"
+
+#~ msgid "%s: Error - cannot print files and alter jobs simultaneously\n"
+#~ msgstr ""
+#~ "%s: Ошибка - невозможно печатать файлы и редактировать задания "
+#~ "одновременно\n"
+
+#~ msgid ""
+#~ "%s: Error - cannot print from stdin if files or a job ID are provided\n"
+#~ msgstr ""
+#~ "%s: Ошибка - не удается печать из stdin, если предоставлены файлы или ID "
+#~ "задания\n"
+
+#~ msgid "%s: Error - expected character set after '-S' option\n"
+#~ msgstr "%s: Ошибка - после параметра '-S' должен идти набор символов\n"
+
+#~ msgid "%s: Error - expected content type after '-T' option\n"
+#~ msgstr "%s: Ошибка - после параметра '-T' должен быть указан тип контента\n"
+
+#~ msgid "%s: Error - expected copies after '-n' option\n"
+#~ msgstr ""
+#~ "%s: Ошибка - после параметра '-n' должно быть указано количество копий\n"
+
+#~ msgid "%s: Error - expected copy count after '-#' option\n"
+#~ msgstr "%s: Ошибка - после параметра '-#' должен быть указан номер копии\n"
+
+#~ msgid "%s: Error - expected destination after '-P' option\n"
+#~ msgstr "%s: Ошибка - после параметра '-P' должно быть указано назначение\n"
+
+#~ msgid "%s: Error - expected destination after '-b' option\n"
+#~ msgstr "%s: Ошибка - после параметра '-b' должно быть указано назначение\n"
+
+#~ msgid "%s: Error - expected destination after '-d' option\n"
+#~ msgstr "%s: Ошибка - после параметра '-d' должно быть указано назначение\n"
+
+#~ msgid "%s: Error - expected form after '-f' option\n"
+#~ msgstr "%s: Ошибка - после параметра '-f' должна быть указана форма\n"
+
+#~ msgid "%s: Error - expected hold name after '-H' option\n"
+#~ msgstr "%s: Ошибка - после параметра '-H' должно быть указано имя хоста\n"
+
+#~ msgid "%s: Error - expected hostname after '-H' option\n"
+#~ msgstr "%s: Ошибка - после параметра '-H' должно быть указано имя хоста\n"
+
+#~ msgid "%s: Error - expected hostname after '-h' option\n"
+#~ msgstr "%s: Ошибка - после параметра '-h' должно быть указано имя хоста\n"
+
+#~ msgid "%s: Error - expected mode list after '-y' option\n"
+#~ msgstr ""
+#~ "%s: Ошибка - после параметра '-y' должен быть указан список режимов\n"
+
+#~ msgid "%s: Error - expected name after '-%c' option\n"
+#~ msgstr "%s: Ошибка - после параметра '-%c' должно быть указано имя\n"
+
+#~ msgid "%s: Error - expected option string after '-o' option\n"
+#~ msgstr ""
+#~ "%s: Ошибка - после параметра '-o' должна быть указана строка параметра\n"
+
+#~ msgid "%s: Error - expected page list after '-P' option\n"
+#~ msgstr "%s: Ошибка - после параметра '-H' должно быть указано имя хоста\n"
+
+#~ msgid "%s: Error - expected priority after '-%c' option\n"
+#~ msgstr "%s: Ошибка - после параметра '-%c' должен быть указан приоритет\n"
+
+#~ msgid "%s: Error - expected reason text after '-r' option\n"
+#~ msgstr "%s: Ошибка - после параметра '-r' должен идти текст причины\n"
+
+#~ msgid "%s: Error - expected title after '-t' option\n"
+#~ msgstr "%s: Ошибка - после параметра '-t' должен быть указан заголовок\n"
+
+#~ msgid "%s: Error - expected username after '-U' option\n"
+#~ msgstr ""
+#~ "%s: Ошибка - после параметра '-U'должно быть указано имя пользователя\n"
+
+#~ msgid "%s: Error - expected username after '-U' option!n"
+#~ msgstr ""
+#~ "%s: Ошибка - после параметра '-U'должно быть указано имя пользователя\n"
+
+#~ msgid "%s: Error - expected username after '-u' option\n"
+#~ msgstr ""
+#~ "%s: Ошибка - после параметра '-u'должно быть указано имя пользователя\n"
+
+#~ msgid "%s: Error - expected value after '-%c' option\n"
+#~ msgstr "%s: Ошибка - после параметра '-%c'должно быть указано значение\n"
+
+#~ msgid ""
+#~ "%s: Error - need \"completed\", \"not-completed\", or \"all\" after '-W' "
+#~ "option\n"
+#~ msgstr ""
+#~ "%s: Ошибка - требуется \"завершено\",\"не завершено\" или \"все\" после "
+#~ "параметра '-W'\n"
+
+#~ msgid "%s: Error - no default destination available.\n"
+#~ msgstr "%s: Ошибка – нет доступного назначения по умолчанию.\n"
+
+#~ msgid "%s: Error - priority must be between 1 and 100.\n"
+#~ msgstr "%s: Ошибка – приоритет должен быть от 1 до 100.\n"
+
+#~ msgid "%s: Error - scheduler not responding\n"
+#~ msgstr "%s: Ошибка - планировщик не отвечает\n"
+
+#~ msgid "%s: Error - too many files - \"%s\"\n"
+#~ msgstr "%s: Ошибка – слишком много файлов – «%s»\n"
+
+#~ msgid "%s: Error - unable to access \"%s\" - %s\n"
+#~ msgstr "%s: Ошибка – не удается получить доступ к «%s» – %s\n"
+
+#~ msgid "%s: Error - unable to queue from stdin - %s\n"
+#~ msgstr "%s: Ошибка – не удается поставить в очередь из stdin - %s\n"
+
+#~ msgid "%s: Error - unknown destination \"%s\"\n"
+#~ msgstr "%s: Ошибка - неизвестное назначение \"%s\"\n"
+
+#~ msgid "%s: Error - unknown destination \"%s/%s\"\n"
+#~ msgstr "%s: ошибка - неизвестное назначение \"%s/%s\"\n"
+
+#~ msgid "%s: Error - unknown option '%c'\n"
+#~ msgstr "%s: Ошибка - неизвестный параметр '%c'\n"
+
+#~ msgid "%s: Error - unknown option '%s'\n"
+#~ msgstr "%s: Ошибка - неизвестный параметр '%s'\n"
+
+#~ msgid "%s: Expected job ID after '-i' option\n"
+#~ msgstr "%s: Ожидается ID задания после параметра '-i'\n"
+
+#~ msgid "%s: Filter \"%s\" not available: %s\n"
+#~ msgstr "%s: Фильтр «%s» недоступен: %s\n"
+
+#~ msgid "%s: Invalid destination name in list \"%s\"\n"
+#~ msgstr "%s: Недопустимое имя назначения в списке \"%s\"\n"
+
+#~ msgid "%s: Invalid filter string \"%s\"\n"
+#~ msgstr "%s: Неверная строка фильтра «%s»\n"
+
+#~ msgid "%s: Need job ID ('-i jobid') before '-H restart'\n"
+#~ msgstr "%s: Необходимо указать ID задания ('-i jobid') перед '-H restart'\n"
+
+#~ msgid "%s: No filter to convert from %s/%s to %s/%s\n"
+#~ msgstr ""
+#~ "%s: Отсутствует фильтр, необходимый для преобразования из %s/%s в %s/%s\n"
+
+#~ msgid "%s: Operation failed: %s\n"
+#~ msgstr "%s: Операция не удалась: %s\n"
+
+#~ msgid "%s: Sorry, no encryption support compiled in\n"
+#~ msgstr "%s:  Нет скомпилированной поддержки шифрования\n"
+
+#~ msgid "%s: Unable to connect to server\n"
+#~ msgstr "%s: Не удается подключиться к серверу\n"
+
+#~ msgid "%s: Unable to contact server\n"
+#~ msgstr "%s: Не удается установить связь с сервером\n"
+
+#~ msgid "%s: Unable to determine MIME type of \"%s\"\n"
+#~ msgstr "%s: Не удается определить тип MIME \"%s\"\n"
+
+#~ msgid "%s: Unable to open %s: %s\n"
+#~ msgstr "%s: Не удается открыть %s: %s\n"
+
+#~ msgid "%s: Unable to open PPD file: %s on line %d\n"
+#~ msgstr "%s: Не удается открыть PPD-файл: %s в строке %d.\n"
+
+#~ msgid "%s: Unable to open PPD file: %s on line %d.\n"
+#~ msgstr "%s: Не удается открыть PPD файл: %s в строке %d.\n"
+
+#~ msgid "%s: Unable to read MIME database from \"%s\" or \"%s\"\n"
+#~ msgstr "%s: Не удается прочитать базу данных MIME из \"%s\" или \"%s\"\n"
+
+#~ msgid "%s: Unknown destination \"%s\"\n"
+#~ msgstr "%s: Неизвестное назначение \"%s\"\n"
+
+#~ msgid "%s: Unknown destination MIME type %s/%s\n"
+#~ msgstr "%s: Неизвестный MIME-тип назначения %s/%s\n"
+
+#~ msgid "%s: Unknown option '%c'\n"
+#~ msgstr "%s: Неизвестный параметр '%c'\n"
+
+#~ msgid "%s: Unknown source MIME type %s/%s\n"
+#~ msgstr "%s: Неизвестный MIME-тип источника %s/%s\n"
+
+#~ msgid ""
+#~ "%s: Warning - '%c' format modifier not supported - output may not be "
+#~ "correct\n"
+#~ msgstr ""
+#~ "%s: Внимание - модификатор формата '%c' не поддерживается - вывод может "
+#~ "быть неправильным\n"
+
+#~ msgid "%s: Warning - character set option ignored\n"
+#~ msgstr "%s: Внимание - параметр набора символов пропущен\n"
+
+#~ msgid "%s: Warning - content type option ignored\n"
+#~ msgstr "%s: Внимание - параметр типа контента пропущен\n"
+
+#~ msgid "%s: Warning - form option ignored\n"
+#~ msgstr "%s: Внимание - параметр формы пропущен\n"
+
+#~ msgid "%s: Warning - mode option ignored\n"
+#~ msgstr "%s: Внимание - параметр режима пропущен\n"
+
+#~ msgid ""
+#~ "%s: error - %s environment variable names non-existent destination \"%s"
+#~ "\"\n"
+#~ msgstr ""
+#~ "%s: ошибка - переменная окружения %s указывает на несуществующее значение "
+#~ "\"%s\"\n"
+
+#~ msgid "%s: error - expected option=value after '-o' option\n"
+#~ msgstr ""
+#~ "%s: ошибка - после параметра '-o' должна идти запись вида option=value\n"
+
+#~ msgid "%s: error - no default destination available.\n"
+#~ msgstr "%s: ошибка – нет доступного назначения по умолчанию.\n"
+
+#~ msgid "10 x 11\""
+#~ msgstr "10 x 11\""
+
+#~ msgid "10 x 13\""
+#~ msgstr "10 x 13\""
+
+#~ msgid "10 x 14\""
+#~ msgstr "10 x 14\""
+
+#~ msgid "12 x 11\""
+#~ msgstr "12 x 11\""
+
+#~ msgid "15 x 11\""
+#~ msgstr "15 x 11\""
+
+#~ msgid "3.5\" Disk - 2 1/8 x 2 3/4\""
+#~ msgstr "Диск 3.5\" - 2 1/8 x 2 3/4\""
+
+#~ msgid "60x720dpi"
+#~ msgstr "60x720dpi"
+
+#~ msgid "7 x 9\""
+#~ msgstr "7 x 9\""
+
+#~ msgid "8 x 10\""
+#~ msgstr "8 x 10\""
+
+#~ msgid "9 x 11\""
+#~ msgstr "9 x 11\""
+
+#~ msgid "9 x 12\""
+#~ msgstr "9 x 12\""
+
+#~ msgid "?Invalid help command unknown\n"
+#~ msgstr "?Неверная команда справки неизвестна\n"
+
+#~ msgid "A class named \"%s\" already exists"
+#~ msgstr "Класс с именем \"%s\" уже существует"
+
+#~ msgid "A printer named \"%s\" already exists"
+#~ msgstr "Принтер с именем \"%s\" уже существует"
+
+#~ msgid "A3 (Oversize)"
+#~ msgstr "A3 (расширенный)"
+
+#~ msgid "A4 (Oversize)"
+#~ msgstr "A4 (расширенный)"
+
+#~ msgid "A4 (Small)"
+#~ msgstr "A4 (уменьшенный)"
+
+#~ msgid "A5 (Oversize)"
+#~ msgstr "A5 (расширенный)"
+
+#~ msgid "ARCH A"
+#~ msgstr "ARCH A"
+
+#~ msgid "ARCH B"
+#~ msgstr "ARCH B"
+
+#~ msgid "Address - 1 1/8 x 3 1/2\""
+#~ msgstr "Адрес - 1 1/8 x 3 1/2\""
+
+#~ msgid "Attempt to set %s printer-state to bad value %d"
+#~ msgstr "Попытка установить %s printer-state на неверное значение %d"
+
+#~ msgid "Attribute groups are out of order (%x < %x)"
+#~ msgstr "Группы атрибутов не действуют (%x < %x)"
+
+#~ msgid "Bad device URI \"%s\"\n"
+#~ msgstr "Неверный URI устройства \"%s\"\n"
+
+#~ msgid "Bad device-uri \"%s\""
+#~ msgstr "Неверное значение device-uri \"%s\""
+
+#~ msgid "Bad device-uri scheme \"%s\""
+#~ msgstr "Неверная схема device-uri \"%s\""
+
+#~ msgid "Bad document-format \"%s\""
+#~ msgstr "Неверное значение document-format \"%s\""
+
+#~ msgid "Bad font attribute: %s\n"
+#~ msgstr "Неверный атрибут шрифта: %s\n"
+
+#~ msgid "Bad job-priority value"
+#~ msgstr "Неверное значение job-priority"
+
+#~ msgid "Bad job-sheets value \"%s\""
+#~ msgstr "Неверное значение job-sheets \"%s\""
+
+#~ msgid "Bad job-sheets value type"
+#~ msgstr "Неверный тип значения job-sheets"
+
+#~ msgid "Bad job-state value"
+#~ msgstr "Неверное значение job-state"
+
+#~ msgid "Bad job-uri attribute \"%s\""
+#~ msgstr "Неверный атрибут job-uri \"%s\""
+
+#~ msgid "Bad notify-pull-method \"%s\""
+#~ msgstr "Неверное значение notify-pull-method \"%s\""
+
+#~ msgid "Bad notify-recipient-uri URI \"%s\""
+#~ msgstr "Неверный URI notify-recipient-uri \"%s\""
+
+#~ msgid "Bad option + choice on line %d"
+#~ msgstr "Неверный параметр + выбор в строке %d"
+
+#~ msgid "Bad port-monitor \"%s\""
+#~ msgstr "Неверное значение port-monitor \"%s\""
+
+#~ msgid "Bad printer-state value %d"
+#~ msgstr "Неверное значение printer-state %d"
+
+#~ msgid "Bad request ID %d"
+#~ msgstr "Неверный ID запроса %d"
+
+#~ msgid "Bad request version number %d.%d"
+#~ msgstr "Неверный номер версии запроса %d.%d"
+
+#~ msgid "Billing Information: "
+#~ msgstr "Реквизиты для выставления счета: "
+
+#~ msgid "C0 Envelope"
+#~ msgstr "Конверт C0"
+
+#~ msgid "C1 Envelope"
+#~ msgstr "Конверт C1"
+
+#~ msgid "C2 Envelope"
+#~ msgstr "Конверт C2"
+
+#~ msgid "C3 Envelope"
+#~ msgstr "Конверт C3"
+
+#~ msgid "C4"
+#~ msgstr "C4"
+
+#~ msgid "C4 Envelope"
+#~ msgstr "Конверт C4"
+
+#~ msgid "C5"
+#~ msgstr "C5"
+
+#~ msgid "C5 Envelope"
+#~ msgstr "Конверт C5"
+
+#~ msgid "C6"
+#~ msgstr "C6"
+
+#~ msgid "C6 Envelope"
+#~ msgstr "Конверт C6"
+
+#~ msgid "C65 Envelope"
+#~ msgstr "Конверт C65"
+
+#~ msgid "C7 Envelope"
+#~ msgstr "Конверт C7"
+
+#~ msgid "Character set \"%s\" not supported"
+#~ msgstr "Набор символов \"%s\" не поддерживается"
+
+#~ msgid "Chou3 Envelope"
+#~ msgstr "Конверт Chou3"
+
+#~ msgid "Chou4 Envelope"
+#~ msgstr "Конверт Chou4"
+
+#~ msgid ""
+#~ "Commands may be abbreviated.  Commands are:\n"
+#~ "\n"
+#~ "exit    help    quit    status  ?\n"
+#~ msgstr ""
+#~ "Команды могут быть сокращены.  Команды:\n"
+#~ "\n"
+#~ "exit    help    quit    status  ?\n"
+
+#~ msgid "Could not scan type \"%s\""
+#~ msgstr "Не удалось сканировать тип \"%s\""
+
+#~ msgid "Created On: "
+#~ msgstr "Дата создания: "
+
+#~ msgid "DL"
+#~ msgstr "DL"
+
+#~ msgid "DL Envelope"
+#~ msgstr "Конверт DL"
+
+#~ msgid "Description: "
+#~ msgstr "Описание: "
+
+#~ msgid ""
+#~ "Device: uri = %s\n"
+#~ "        class = %s\n"
+#~ "        info = %s\n"
+#~ "        make-and-model = %s\n"
+#~ "        device-id = %s\n"
+#~ "        location = %s\n"
+#~ msgstr ""
+#~ "Устройство: uri = %s\n"
+#~ "        class = %s\n"
+#~ "        info = %s\n"
+#~ "        make-and-model = %s\n"
+#~ "        device-id = %s\n"
+#~ "        location = %s\n"
+
+#~ msgid "Document %d not found in job %d."
+#~ msgstr "Документ %d в задании %d не найден."
+
+#~ msgid "Double Postcard"
+#~ msgstr "Двойная открытка"
+
+#~ msgid "Driver Name: "
+#~ msgstr "Имя драйвера: "
+
+#~ msgid "Driver Version: "
+#~ msgstr "Версия драйвера: "
+
+#~ msgid "EMERG: Unable to allocate memory for page info: %s\n"
+#~ msgstr "EMERG: Не удается выделить память для информации страницы: %s\n"
+
+#~ msgid "EMERG: Unable to allocate memory for pages array: %s\n"
+#~ msgstr "EMERG: Не удается выделить память для массива страниц: %s\n"
+
+#~ msgid "ERROR: %s job-id user title copies options [file]\n"
+#~ msgstr "ERROR: %s задание пользователь название копий параметры [файл]\n"
+
+#~ msgid "ERROR: Bad %%BoundingBox: comment seen\n"
+#~ msgstr "ERROR: Неверный %%BoundingBox: комментарий просмотрен\n"
+
+#~ msgid "ERROR: Bad %%IncludeFeature: comment\n"
+#~ msgstr "ERROR: Неверный %%IncludeFeature: комментарий\n"
+
+#~ msgid "ERROR: Bad %%Page: comment in file\n"
+#~ msgstr "ERROR: Неверный %%Page: комментарий в файле\n"
+
+#~ msgid "ERROR: Bad %%PageBoundingBox: comment in file\n"
+#~ msgstr "ERROR: Неверный %%PageBoundingBox: комментарий в файле\n"
+
+#~ msgid "ERROR: Bad charset file %s\n"
+#~ msgstr "ERROR: Неверный файл набора символов %s\n"
+
+#~ msgid "ERROR: Bad charset type %s\n"
+#~ msgstr "ERROR: Неверный тип набора символов %s\n"
+
+#~ msgid "ERROR: Bad columns value %d\n"
+#~ msgstr "ERROR: Неверное значение количества столбцов %d\n"
+
+#~ msgid "ERROR: Bad cpi value %f\n"
+#~ msgstr "ERROR: Неверное значение cpi %f\n"
+
+#~ msgid "ERROR: Bad font description line: %s\n"
+#~ msgstr "ERROR: Неверная строка описания шрифта: %s\n"
+
+#~ msgid "ERROR: Bad lpi value %f\n"
+#~ msgstr "ERROR: Неверное значение lpi %f\n"
+
+#~ msgid "ERROR: Bad page setup\n"
+#~ msgstr "ERROR: Неверные параметры страницы\n"
+
+#~ msgid "ERROR: Bad text direction %s\n"
+#~ msgstr "ERROR: Неверное направление текста %s\n"
+
+#~ msgid "ERROR: Bad text width %s\n"
+#~ msgstr "ERROR: Неверная ширина текста %s\n"
+
+#~ msgid "ERROR: Destination printer does not exist\n"
+#~ msgstr "ERROR: Целевой принтер не существует\n"
+
+#~ msgid "ERROR: Duplicate %%BoundingBox: comment seen\n"
+#~ msgstr "ERROR: Дубликат %%BoundingBox: комментарий просмотрен\n"
+
+#~ msgid "ERROR: Duplicate %%Pages: comment seen\n"
+#~ msgstr "ERROR: Дубликат %%Pages: комментарий просмотрен\n"
+
+#~ msgid "ERROR: Empty print file\n"
+#~ msgstr "ERROR: Пустой файл печати\n"
+
+#~ msgid "ERROR: Error %d sending PAPSendData request: %s\n"
+#~ msgstr "ERROR: Ошибка %d при отправке запроса PAPSendData: %s\n"
+
+#~ msgid "ERROR: Expected quoted string on line %d of %s\n"
+#~ msgstr "ERROR: В строке %d из %s должна быть запись в ковычках\n"
+
+#~ msgid "ERROR: Fatal USB error\n"
+#~ msgstr "ERROR: Критический сбой USB\n"
+
+#~ msgid "ERROR: Missing %%EndProlog\n"
+#~ msgstr "ERROR: Отсутствует %%endProlog\n"
+
+#~ msgid "ERROR: Missing %%EndSetup\n"
+#~ msgstr "ERROR: Отсутствует %%EndSetup\n"
+
+#~ msgid "ERROR: Missing value on line %d of banner file\n"
+#~ msgstr "ERROR: Отсутствует значение в строке %d в файле баннера.\n"
+
+#~ msgid ""
+#~ "ERROR: Need a msgid line before any translation strings on line %d of %s\n"
+#~ msgstr ""
+#~ "ERROR: Требуется строка msgid перед строкой перевода в строке %d из %s\n"
+
+#~ msgid "ERROR: No %%BoundingBox: comment in header\n"
+#~ msgstr "ERROR: Нет %%BoundingBox: комментарий в заголовке\n"
+
+#~ msgid "ERROR: No %%Pages: comment in header\n"
+#~ msgstr "ERROR: Нет %%Pages: комментарий в заголовке\n"
+
+#~ msgid ""
+#~ "ERROR: No device URI found in argv[0] or in DEVICE_URI environment "
+#~ "variable\n"
+#~ msgstr ""
+#~ "ERROR: Не обнаружено URI устройства в argv[0] или переменной окружения "
+#~ "DEVICE_URI\n"
+
+#~ msgid "ERROR: No fonts in charset file %s\n"
+#~ msgstr "ERROR: Отсутствуют шрифты в файле набора символов %s\n"
+
+#~ msgid "ERROR: No pages found\n"
+#~ msgstr "ERROR: Страницы не найдены\n"
+
+#~ msgid "ERROR: Out of paper\n"
+#~ msgstr "ERROR: Не хватает бумаги\n"
+
+#~ msgid "ERROR: PRINTER environment variable not defined\n"
+#~ msgstr "ERROR: Переменная окружения PRINTER не указана\n"
+
+#~ msgid "ERROR: Print file was not accepted (%s)\n"
+#~ msgstr "ERROR: Файл печати не был принят (%s)\n"
+
+#~ msgid "ERROR: Printer not responding\n"
+#~ msgstr "ERROR: Принтер не отвечает\n"
+
+#~ msgid "ERROR: Printer sent unexpected EOF\n"
+#~ msgstr "ERROR: Принтер преждевременно передал индикатор EOF\n"
+
+#~ msgid "ERROR: Remote host did not accept control file (%d)\n"
+#~ msgstr "ERROR: Удаленный хост не принял контрольный файл (%d)\n"
+
+#~ msgid "ERROR: Remote host did not accept data file (%d)\n"
+#~ msgstr "ERROR: Удаленный хост не принял файл данных (%d)\n"
+
+#~ msgid "ERROR: There was a timeout error while sending data to the printer\n"
+#~ msgstr ""
+#~ "ERROR: Сбой, связанный со временем ожидания при отправке данных на "
+#~ "принтер\n"
+
+#~ msgid "ERROR: Unable to add file %d to job: %s\n"
+#~ msgstr "ERROR: Не удается добавить файл %d к заданию: %s\n"
+
+#~ msgid "ERROR: Unable to cancel job %d: %s\n"
+#~ msgstr "ERROR: Не удается отменить задание %d: %s\n"
+
+#~ msgid "ERROR: Unable to connect to printer; will retry in 30 seconds...\n"
+#~ msgstr ""
+#~ "ERROR: Не удается подключиться к принтеру; повторная попытка через 30 "
+#~ "секунд...\n"
+
+#~ msgid "ERROR: Unable to copy PDF file"
+#~ msgstr "ERROR: Не удается копировать файл PDF"
+
+#~ msgid "ERROR: Unable to create pipe"
+#~ msgstr "ERROR: Не удается создать конвейер"
+
+#~ msgid "ERROR: Unable to create socket"
+#~ msgstr "ERROR: Не удается создать сокет"
+
+#~ msgid "ERROR: Unable to create temporary compressed print file: %s\n"
+#~ msgstr "ERROR: Не удается создать временный сжатый файл печати: %s\n"
+
+#~ msgid "ERROR: Unable to create temporary file"
+#~ msgstr "ERROR: Не удается создать временный файл"
+
+#~ msgid "ERROR: Unable to exec pictwpstops: %s\n"
+#~ msgstr "ERROR: Не удается выполнить pictwpstops: %s\n"
+
+#~ msgid "ERROR: Unable to execute gs program"
+#~ msgstr "ERROR: Не удается запустить программу gs"
+
+#~ msgid "ERROR: Unable to execute pdftops program"
+#~ msgstr "ERROR: Не удается запустить программу pdftops"
+
+#~ msgid "ERROR: Unable to execute pstops program"
+#~ msgstr "ERROR: Не удается выполнить pstops"
+
+#~ msgid "ERROR: Unable to fork pictwpstops: %s\n"
+#~ msgstr "ERROR: Не удается разветвить pictwpstops: %s\n"
+
+#~ msgid "ERROR: Unable to get PAP request"
+#~ msgstr "ERROR: Не удается получить запрос PAP"
+
+#~ msgid "ERROR: Unable to get PAP response"
+#~ msgstr "ERROR: Не удается получить ответ PAP"
+
+#~ msgid "ERROR: Unable to get PPD file for printer \"%s\" - %s.\n"
+#~ msgstr "ERROR: Не удается получить PPD-файл для принтера «%s» – %s.\n"
+
+#~ msgid "ERROR: Unable to get default AppleTalk zone"
+#~ msgstr "ERROR: Не удается определить стандартную зону AppleTalk"
+
+#~ msgid "ERROR: Unable to get job %d attributes (%s)\n"
+#~ msgstr "ERROR: Не удается получить список параметров (%s) задания %d \n"
+
+#~ msgid "ERROR: Unable to get printer status (%s)\n"
+#~ msgstr "ERROR: Не удается получить статус (%s) принтера\n"
+
+#~ msgid "ERROR: Unable to locate printer '%s'\n"
+#~ msgstr "ERROR: Принтер '%s' не найден\n"
+
+#~ msgid "ERROR: Unable to look for PAP response"
+#~ msgstr "ERROR: Не удается провести поиск ответа PAP"
+
+#~ msgid "ERROR: Unable to lookup AppleTalk printers"
+#~ msgstr "ERROR: Не удается провести поиск принтеров AppleTalk"
+
+#~ msgid "ERROR: Unable to make AppleTalk address"
+#~ msgstr "ERROR: Не удается ставить адрес AppleTalk"
+
+#~ msgid "ERROR: Unable to open \"%s\" - %s\n"
+#~ msgstr "ERROR: Не удается открыть «%s» – %s\n"
+
+#~ msgid "ERROR: Unable to open %s: %s\n"
+#~ msgstr "ERROR: Не удается открыть %s: %s\n"
+
+#~ msgid "ERROR: Unable to open PPD file\n"
+#~ msgstr "ERROR: Не удается открыть PPD файл\n"
+
+#~ msgid "ERROR: Unable to open banner file \"%s\" - %s\n"
+#~ msgstr "ERROR: Не удается открыть файл баннера «%s» – %s\n"
+
+#~ msgid "ERROR: Unable to open device file \"%s\": %s\n"
+#~ msgstr "ERROR: Не удается открыть файл устройства «%s»: %s\n"
+
+#~ msgid "ERROR: Unable to open file \"%s\" - %s\n"
+#~ msgstr "ERROR: Не удается открыть файл «%s» – %s\n"
+
+#~ msgid "ERROR: Unable to open file \"%s\": %s\n"
+#~ msgstr "ERROR: Не удается открыть файл «%s»: %s\n"
+
+#~ msgid "ERROR: Unable to open image file for printing\n"
+#~ msgstr "ERROR: Не удается открыть изображение для печати\n"
+
+#~ msgid "ERROR: Unable to open print file \"%s\": %s\n"
+#~ msgstr "ERROR: Не удается открыть файл печати «%s»: %s\n"
+
+#~ msgid "ERROR: Unable to open print file %s - %s\n"
+#~ msgstr "ERROR: Не удается открыть файл печати %s – %s\n"
+
+#~ msgid "ERROR: Unable to open print file %s: %s\n"
+#~ msgstr "ERROR: Не удается открыть файл печати %s: %s\n"
+
+#~ msgid "ERROR: Unable to open raster file - %s\n"
+#~ msgstr "ERROR: Не удается открыть растровый файл - %s\n"
+
+#~ msgid "ERROR: Unable to open temporary compressed print file: %s\n"
+#~ msgstr "ERROR: Не удается открыть временный сжатый файл печати: %s\n"
+
+#~ msgid "ERROR: Unable to print %d text columns\n"
+#~ msgstr "ERROR: Не удается напечатать столбцы с текстом %d\n"
+
+#~ msgid "ERROR: Unable to print %dx%d text page\n"
+#~ msgstr "ERROR: Не удается напечатать страницу с текстом %dx%d\n"
+
+#~ msgid "ERROR: Unable to read print data"
+#~ msgstr "ERROR: Не удается считать данные печати"
+
+#~ msgid "ERROR: Unable to read print data\n"
+#~ msgstr "ERROR: Не удается прочитать данные для печати\n"
+
+#~ msgid "ERROR: Unable to reserve port"
+#~ msgstr "ERROR: Не удается зарезервировать порт"
+
+#~ msgid "ERROR: Unable to seek to offset %ld in file - %s\n"
+#~ msgstr "ERROR: Не удается перейти к смещению %ld в файле – %s\n"
+
+#~ msgid "ERROR: Unable to seek to offset %lld in file - %s\n"
+#~ msgstr "ERROR: Не удается перейти к смещению %lld в файле – %s\n"
+
+#~ msgid "ERROR: Unable to send LPD command"
+#~ msgstr "ERROR: Не удается отправить команду LPD"
+
+#~ msgid "ERROR: Unable to send PAP tickle request"
+#~ msgstr "ERROR: Не удается отправить контрольный запрос PAP"
+
+#~ msgid "ERROR: Unable to send initial PAP send data request"
+#~ msgstr "ERROR: Не удается отправить исходный запрос PAP на отправку данных"
+
+#~ msgid "ERROR: Unable to send print data\n"
+#~ msgstr "ERROR: Не удается отправить данные для печати\n"
+
+#~ msgid "ERROR: Unable to send print file to printer"
+#~ msgstr "ERROR: Не удается отправить файл печати на принтер"
+
+#~ msgid "ERROR: Unable to send trailing nul to printer"
+#~ msgstr "ERROR: Не удается отправить конечное нулевое значение на принтер"
+
+#~ msgid "ERROR: Unable to wait for pictwpstops: %s\n"
+#~ msgstr "ERROR: Не удается подождать pictwpstops: %s\n"
+
+#~ msgid "ERROR: Unable to write %d bytes to \"%s\": %s\n"
+#~ msgstr "ERROR: Не удается записать %d байт на «%s»: %s\n"
+
+#~ msgid "ERROR: Unable to write %d bytes to printer\n"
+#~ msgstr "ERROR: Не удается записать %d байт на принтер\n"
+
+#~ msgid "ERROR: Unable to write control file"
+#~ msgstr "ERROR: Не удается записать контрольный файл"
+
+#~ msgid "ERROR: Unable to write print data"
+#~ msgstr "ERROR: Не удается записать данные печати"
+
+#~ msgid "ERROR: Unable to write print data: %s\n"
+#~ msgstr "ERROR: Не удается записать данные печати: %s\n"
+
+#~ msgid "ERROR: Unable to write raster data to driver\n"
+#~ msgstr "Не удается записать растровые данные на принтер\n"
+
+#~ msgid "ERROR: Unable to write uncompressed document data: %s\n"
+#~ msgstr "ERROR: Не удается записать несжатые данные документа: %s\n"
+
+#~ msgid "ERROR: Unexpected text on line %d of %s\n"
+#~ msgstr "ERROR: Неизвестный текст в %s строки %d\n"
+
+#~ msgid "ERROR: Unknown encryption option value \"%s\"\n"
+#~ msgstr "ERROR: Неизвестное значение \"%s\" параметра шифрования\n"
+
+#~ msgid "ERROR: Unknown file order \"%s\"\n"
+#~ msgstr "ERROR: Неизвестный порядок файлов «%s»\n"
+
+#~ msgid "ERROR: Unknown format character \"%c\"\n"
+#~ msgstr "ERROR: Символ неизвестного формата «%c»\n"
+
+#~ msgid "ERROR: Unknown message catalog format for \"%s\"\n"
+#~ msgstr "ERROR: Неизвестный формат каталога сообщений для \"%s\"\n"
+
+#~ msgid "ERROR: Unknown option \"%s\" with value \"%s\"\n"
+#~ msgstr "ERROR: Неизвестный параметр \"%s\" со значением \"%s\"\n"
+
+#~ msgid "ERROR: Unknown print mode \"%s\"\n"
+#~ msgstr "ERROR: Неизвестный режим печати «%s»\n"
+
+#~ msgid "ERROR: Unknown version option value \"%s\"\n"
+#~ msgstr "ERROR: Неизвестное значение параметра версии \"%s\"\n"
+
+#~ msgid "ERROR: Unsupported brightness value %s, using brightness=100\n"
+#~ msgstr ""
+#~ "ERROR: Неподдерживаемое значение яркости %s, используется значение "
+#~ "brightness=100\n"
+
+#~ msgid "ERROR: Unsupported gamma value %s, using gamma=1000\n"
+#~ msgstr ""
+#~ "ERROR: Неподдерживаемое значение гаммы %s, используется значение "
+#~ "gamma=1000\n"
+
+#~ msgid "ERROR: Unsupported number-up value %d, using number-up=1\n"
+#~ msgstr ""
+#~ "ERROR: Неподдерживаемое значение number-up %d, используется значение "
+#~ "number-up=1\n"
+
+#~ msgid ""
+#~ "ERROR: Unsupported number-up-layout value %s, using number-up-"
+#~ "layout=lrtb\n"
+#~ msgstr ""
+#~ "ERROR: Неподдерживаемое значение number-up-layout %s, используется "
+#~ "значение number-up-layout=lrtb\n"
+
+#~ msgid "ERROR: Unsupported page-border value %s, using page-border=none\n"
+#~ msgstr ""
+#~ "ERROR: Неподдерживаемое значение page-border %s, используется значение "
+#~ "page-border=none\n"
+
+#~ msgid "ERROR: doc_printf overflow (%d bytes) detected, aborting\n"
+#~ msgstr "ERROR: Обнаружено переполнение doc_printf (%d байт). Прервать.\n"
+
+#~ msgid "ERROR: pictwpstops exited on signal %d\n"
+#~ msgstr "ERROR: pictwpstops завершился по сигналу %d\n"
+
+#~ msgid "ERROR: pictwpstops exited with status %d\n"
+#~ msgstr "ERROR: pitwpstops завершился со статусом %d\n"
+
+#~ msgid "ERROR: select() failed"
+#~ msgstr "ERROR: Сбой оператора select()"
+
+#~ msgid "ERROR: unable to stat print file"
+#~ msgstr "ERROR: Не удается установить файл печати"
+
+#~ msgid "Empty PPD file"
+#~ msgstr "Пустой PPD файл"
+
+#~ msgid "Error: need hostname after '-h' option\n"
+#~ msgstr "ERROR: Требуется имя хоста после параметра '-h'\n"
+
+#~ msgid "FAIL\n"
+#~ msgstr "FAIL\n"
+
+#~ msgid "File Folder"
+#~ msgstr "Каталог файла"
+
+#~ msgid "File Folder - 9/16 x 3 7/16\""
+#~ msgstr "Каталог файла - 9 16/8 x 3 7/16\""
+
+#~ msgid ""
+#~ "File device URIs have been disabled! To enable, see the FileDevice "
+#~ "directive in \"%s/cupsd.conf\"."
+#~ msgstr ""
+#~ "URI-адреса файлового устройства отключены! Чтобы включить их, используйте "
+#~ "директиву FileDevice в «%s/cupsd.conf»."
+
+#~ msgid "German FanFold"
+#~ msgstr "German FanFold"
+
+#~ msgid "German FanFold Legal"
+#~ msgstr "German FanFold Legal"
+
+#~ msgid "Got a printer-uri attribute but no job-id"
+#~ msgstr "Получен атрибут printer-uri, но не job-id"
+
+#~ msgid "Hanging Folder - 9/16 x 2\""
+#~ msgstr "Папка подвесного хранения - 9/16 x 2\""
+
+#~ msgid "INFO: AppleTalk disabled in System Preferences\n"
+#~ msgstr "INFO: AppleTalk отключен в Системных настройках\n"
+
+#~ msgid "INFO: AppleTalk disabled in System Preferences.\n"
+#~ msgstr "INFO: AppleTalk отключен в Системных настройках.\n"
+
+#~ msgid "INFO: Canceling print job...\n"
+#~ msgstr "INFO: Отмена задания печати…\n"
+
+#~ msgid "INFO: Connected to printer...\n"
+#~ msgstr "INFO: Подключен к принтеру…\n"
+
+#~ msgid "INFO: Connecting to printer...\n"
+#~ msgstr "INFO: Подключение к принтеру…\n"
+
+#~ msgid "INFO: Control file sent successfully\n"
+#~ msgstr "INFO: Контрольный файл успешно отправлен\n"
+
+#~ msgid "INFO: Copying print data...\n"
+#~ msgstr "INFO: Копирование данных печати...\n"
+
+#~ msgid "INFO: Data file sent successfully\n"
+#~ msgstr "INFO: Файл данных успешно отправлен\n"
+
+#~ msgid "INFO: Finished page %d...\n"
+#~ msgstr "INFO: Последняя страница %d...\n"
+
+#~ msgid "INFO: Formatting page %d...\n"
+#~ msgstr "INFO: Форматирование страницы %d…\n"
+
+#~ msgid "INFO: Loading image file...\n"
+#~ msgstr "INFO: Загрузка файла изображения…\n"
+
+#~ msgid "INFO: Looking for printer...\n"
+#~ msgstr "INFO: Поиск принтера...\n"
+
+#~ msgid "INFO: Opening connection\n"
+#~ msgstr "INFO: Установка соединения\n"
+
+#~ msgid "INFO: Print file sent, waiting for printer to finish...\n"
+#~ msgstr "INFO: Файл печати отправлен, ожидание окончания работы принтера…\n"
+
+#~ msgid "INFO: Printer busy; will retry in 10 seconds...\n"
+#~ msgstr "INFO: Принтер занят; попытка будет повторена через 10 секунд…\n"
+
+#~ msgid "INFO: Printer busy; will retry in 30 seconds...\n"
+#~ msgstr "INFO: Принтер занят; попытка будет повторена через 30 секунд…\n"
+
+#~ msgid "INFO: Printer busy; will retry in 5 seconds...\n"
+#~ msgstr "INFO: Принтер занят; попытка будет повторена через 5 секунд…\n"
+
+#~ msgid "INFO: Printer does not support IPP/%d.%d, trying IPP/1.0...\n"
+#~ msgstr ""
+#~ "INFO: Принтер не поддерживает IPP/%d.%d; попытка использовать IPP/1.0…\n"
+
+#~ msgid "INFO: Printer is busy; will retry in 5 seconds...\n"
+#~ msgstr "INFO: Принтер занят; попытка будет повторена через 5 секунд…\n"
+
+#~ msgid "INFO: Printer is currently off-line.\n"
+#~ msgstr "INFO: В данный момент принтер не подключен к сети.\n"
+
+#~ msgid "INFO: Printer is currently offline.\n"
+#~ msgstr "INFO: В данный момент принтер не подключен к сети.\n"
+
+#~ msgid "INFO: Printer is now online.\n"
+#~ msgstr "INFO: Принтер подключен к сети.\n"
+
+#~ msgid "INFO: Printer is offline.\n"
+#~ msgstr "INFO: Принтер не подключен к сети.\n"
+
+#~ msgid "INFO: Printer not connected; will retry in 30 seconds...\n"
+#~ msgstr ""
+#~ "INFO: Принтер не подключен; попытка будет повторена через 30 секунд…\n"
+
+#~ msgid "INFO: Printing page %d, %d%% complete...\n"
+#~ msgstr "INFO: Печать страницы %d, %d%% завершена…\n"
+
+#~ msgid "INFO: Printing page %d...\n"
+#~ msgstr "INFO: Печать страницы %d…\n"
+
+#~ msgid "INFO: Ready to print.\n"
+#~ msgstr "INFO: Готов к печати.\n"
+
+#~ msgid "INFO: Sending control file (%lu bytes)\n"
+#~ msgstr "INFO: Отправка контрольного файла (%lu байт)\n"
+
+#~ msgid "INFO: Sending control file (%u bytes)\n"
+#~ msgstr "INFO: Отправка контрольного файла (%u байт)\n"
+
+#~ msgid "INFO: Sending data\n"
+#~ msgstr "INFO: Отправка данных\n"
+
+#~ msgid "INFO: Sending data file (%ld bytes)\n"
+#~ msgstr "INFO: Отправка файла данных (%ld байт)\n"
+
+#~ msgid "INFO: Sending data file (%lld bytes)\n"
+#~ msgstr "INFO: Отправка файла данных (%lld байт)\n"
+
+#~ msgid "INFO: Sending print data...\n"
+#~ msgstr "INFO: Отправка данных печати…\n"
+
+#~ msgid "INFO: Sent print file, %ld bytes...\n"
+#~ msgstr "INFO: Отправлен файл печати, %ld байт…\n"
+
+#~ msgid "INFO: Sent print file, %lld bytes...\n"
+#~ msgstr "INFO: Отправлен файл печати, %lld байт…\n"
+
+#~ msgid "INFO: Spooling LPR job, %.0f%% complete...\n"
+#~ msgstr "INFO: Спулинг задания LPR, %.0f%% выполнено…\n"
+
+#~ msgid "INFO: Starting page %d...\n"
+#~ msgstr "INFO: Главная страница %d...\n"
+
+#~ msgid ""
+#~ "INFO: Unable to contact printer, queuing on next printer in class...\n"
+#~ msgstr ""
+#~ "INFO: Не удается установить связь с принтером, постановка в очередь на "
+#~ "следующем принтере в классе…\n"
+
+#~ msgid "INFO: Using default AppleTalk zone \"%s\"\n"
+#~ msgstr "INFO: Используется стандартная зона AppleTalk «%s»\n"
+
+#~ msgid "INFO: Waiting for job to complete...\n"
+#~ msgstr "INFO: Ожидание окончания выполнения задания…\n"
+
+#~ msgid "INFO: Waiting for printer to become available...\n"
+#~ msgstr "INFO: Ожидание доступа к принтеру...\n"
+
+#~ msgid "ISO B0"
+#~ msgstr "ISO B0"
+
+#~ msgid "ISO B1"
+#~ msgstr "ISO B1"
+
+#~ msgid "ISO B10"
+#~ msgstr "ISO B10"
+
+#~ msgid "ISO B2"
+#~ msgstr "ISO B2"
+
+#~ msgid "ISO B3"
+#~ msgstr "ISO B3"
+
+#~ msgid "ISO B4"
+#~ msgstr "ISO B4"
+
+#~ msgid "ISO B4 Envelope"
+#~ msgstr "Конверт ISO B4"
+
+#~ msgid "ISO B5"
+#~ msgstr "ISO B5"
+
+#~ msgid "ISO B5 (Oversize)"
+#~ msgstr "ISO B5 (расширенный)"
+
+#~ msgid "ISO B5 Envelope"
+#~ msgstr "Конверт ISO B5"
+
+#~ msgid "ISO B6"
+#~ msgstr "ISO B6"
+
+#~ msgid "ISO B6 Envelope"
+#~ msgstr "Конверт ISO B6"
+
+#~ msgid "ISO B7"
+#~ msgstr "ISO B7"
+
+#~ msgid "ISO B8"
+#~ msgstr "ISO B8"
+
+#~ msgid "ISO B9"
+#~ msgstr "ISO B9"
+
+#~ msgid "Internet Postage 2-Part - 2 1/4 x 7 1/2\""
+#~ msgstr "Наклейки Internet Postage 2-Part - 2 1/4 x 7 1/2\""
+
+#~ msgid "Internet Postage 3-Part - 2 1/4 x 7\""
+#~ msgstr "Наклейки Internet Postage 3-Part - 2 1/4 x 7\""
+
+#~ msgid "Invite Envelope"
+#~ msgstr "Конверт Invite Envelope"
+
+#~ msgid "Italian Envelope"
+#~ msgstr "Конверт Italian Envelope"
+
+#~ msgid "Job #%d cannot be restarted - no files"
+#~ msgstr "Задание #%d не может быть перезапущено - отсутствуют файлы"
+
+#~ msgid "Job #%d does not exist"
+#~ msgstr "Задание #%d не существует"
+
+#~ msgid "Job #%d is finished and cannot be altered"
+#~ msgstr "Задание #%d завершено и не может быть изменено"
+
+#~ msgid "Job #%d is not complete"
+#~ msgstr "Задание #%d не завершено"
+
+#~ msgid "Job #%d is not held"
+#~ msgstr "Задание #%d не задержано"
+
+#~ msgid "Job #%d is not held for authentication"
+#~ msgstr "Задание #%d не задержано для идентификации"
+
+#~ msgid "Job #%s does not exist"
+#~ msgstr "Задание #%d не существует"
+
+#~ msgid "Job %d not found"
+#~ msgstr "Задание %d не найдено"
+
+#~ msgid "Job ID: "
+#~ msgstr "ID задания: "
+
+#~ msgid "Job UUID: "
+#~ msgstr "UUID задания: "
+
+#~ msgid "Job operation failed:"
+#~ msgstr "Сбой операции задания:"
+
+#~ msgid "Job subscriptions cannot be renewed"
+#~ msgstr "Подписки на задание не могут быть обновлены"
+
+#~ msgid "Kaku2 Envelope"
+#~ msgstr "Конверт Kaku2"
+
+#~ msgid "Kaku3 Envelope"
+#~ msgstr "Конверт Kaku3"
+
+#~ msgid "Language \"%s\" not supported"
+#~ msgstr "Язык \"%s\" не поддерживается"
+
+#~ msgid "Large Address - 1 4/10 x 3 1/2\""
+#~ msgstr "Полный адрес - 1 4/10 x 3 1/2\""
+
+#~ msgid "Location: "
+#~ msgstr "Местоположение: "
+
+#~ msgid "Make and Model: "
+#~ msgstr "Марка и модель: "
+
+#~ msgid "Media Dimensions: "
+#~ msgstr "Размеры бумаги: "
+
+#~ msgid "Media Limits: "
+#~ msgstr "Ограничения бумаги: "
+
+#~ msgid "Media Name: "
+#~ msgstr "Название бумаги: "
+
+#~ msgid "Missing document-number attribute"
+#~ msgstr "Отсутствует атрибут document-number"
+
+#~ msgid "Missing double quote on line %d"
+#~ msgstr "Отсутствует двойная кавычка в строке %d"
+
+#~ msgid "Missing notify-subscription-ids attribute"
+#~ msgstr "Отсутствует атрибут notify-subscription-ids"
+
+#~ msgid "Missing requesting-user-name attribute"
+#~ msgstr "Отсутствует атрибут requesting-user-name"
+
+#~ msgid "Missing required attributes"
+#~ msgstr "Отсутствуют обязательные атрибуты"
+
+#~ msgid "Missing value on line %d"
+#~ msgstr "Отсутствует значение в строке %d"
+
+#~ msgid ""
+#~ "Model:  name = %s\n"
+#~ "        natural_language = %s\n"
+#~ "        make-and-model = %s\n"
+#~ "        device-id = %s\n"
+#~ msgstr ""
+#~ "Model:  name = %s\n"
+#~ "        natural_language = %s\n"
+#~ "        make-and-model = %s\n"
+#~ "        device-id = %s\n"
+
+#~ msgid "Monarch"
+#~ msgstr "Monarch"
+
+#~ msgid "Monarch Envelope"
+#~ msgstr "Конверт Monarch"
+
+#~ msgid "NOTICE: Print file accepted - job ID %d.\n"
+#~ msgstr "NOTICE: Файл печати принят – ID задания %d.\n"
+
+#~ msgid "NOTICE: Print file accepted - job ID unknown.\n"
+#~ msgstr "NOTICE: Файл печати принят – ID задания неизвестен.\n"
+
+#~ msgid "Nested classes are not allowed"
+#~ msgstr "Вложенные группы не допускаются"
+
+#~ msgid "No Windows printer drivers are installed"
+#~ msgstr "Нет установленных драйверов принтера Windows"
+
+#~ msgid "No active jobs on %s"
+#~ msgstr "Нет активных заданий на %s"
+
+#~ msgid "No attributes in request"
+#~ msgstr "Нет атрибутов в запросе"
+
+#~ msgid "No authentication information provided"
+#~ msgstr "Нет информации для проверки подлинности"
+
+#~ msgid "No default printer"
+#~ msgstr "Нет принтера по умолчанию"
+
+#~ msgid "No file!?"
+#~ msgstr "Нет файла!?"
+
+#~ msgid "No printer-uri in request"
+#~ msgstr "Нет адреса printer-uri в запросе"
+
+#~ msgid "No subscription attributes in request"
+#~ msgstr "Нет атрибутов подписки в запросе"
+
+#~ msgid "Options: "
+#~ msgstr "Параметры: "
+
+#~ msgid "Output for printer %s is sent to %s\n"
+#~ msgstr "Вывод для принтера %s отправлен на %s\n"
+
+#~ msgid "Output for printer %s is sent to remote printer %s on %s\n"
+#~ msgstr "Вывод для принтера %s отправлен на удаленный принтер %s на %s\n"
+
+#~ msgid "Output for printer %s/%s is sent to %s\n"
+#~ msgstr "Вывод для принтера %s/%s отправлен на %s\n"
+
+#~ msgid "Output for printer %s/%s is sent to remote printer %s on %s\n"
+#~ msgstr "Вывод для принтера %s/%s отправлен на удаленный принтер %s на %s\n"
+
+#~ msgid "PASS\n"
+#~ msgstr "PASS\n"
+
+#~ msgid "PRC1 Envelope"
+#~ msgstr "Конверт PRC1"
+
+#~ msgid "PRC10 Envelope"
+#~ msgstr "Конверт PRC10"
+
+#~ msgid "PRC2 Envelope"
+#~ msgstr "Конверт PRC2"
+
+#~ msgid "PRC3 Envelope"
+#~ msgstr "Конверт PRC3"
+
+#~ msgid "PRC32K (Oversize)"
+#~ msgstr "PRC32K (расширенный)"
+
+#~ msgid "PRC4 Envelope"
+#~ msgstr "Конверт PRC4"
+
+#~ msgid "PRC5 Envelope"
+#~ msgstr "Конверт PRC5"
+
+#~ msgid "PRC6 Envelope"
+#~ msgstr "Конверт PRC6"
+
+#~ msgid "PRC7 Envelope"
+#~ msgstr "Конверт PRC7"
+
+#~ msgid "PRC8 Envelope"
+#~ msgstr "Конверт PRC8"
+
+#~ msgid "PRC9 Envelope"
+#~ msgstr "Конверт PRC9"
+
+#~ msgid "Personal Envelope"
+#~ msgstr "Индивидуальный конверт"
+
+#~ msgid "Printed For: "
+#~ msgstr "Напечатано для: "
+
+#~ msgid "Printed From: "
+#~ msgstr "Напечатано из: "
+
+#~ msgid "Printed On: "
+#~ msgstr "Дата печати: "
+
+#~ msgid "Printer Name: "
+#~ msgstr "Имя принтера: "
+
+#~ msgid "Rank    Owner   Job     File(s)                         Total Size\n"
+#~ msgstr ""
+#~ "Ранг    Владелец   Задание     Файл(ы)                         Общий "
+#~ "размер\n"
+
+#~ msgid ""
+#~ "Rank   Owner      Pri  Job        Files                       Total Size\n"
+#~ msgstr ""
+#~ "Ранг    Владелец   Задание печати     Файл(ы)                         "
+#~ "Общий размер\n"
+
+#~ msgid "Return Address - 3/4 x 2\""
+#~ msgstr "Обратный адрес - 3/4 x 2\""
+
+#~ msgid "Running command: %s %s -N -A %s -c '%s'\n"
+#~ msgstr "Запущенная команда: %s %s -N -A %s -c «%s»\n"
+
+#~ msgid "Serial Port #%d"
+#~ msgstr "Последовательный порт #%d"
+
+#~ msgid "Shipping Address - 2 5/16 x 4\""
+#~ msgstr "Адрес доставки - 2 5/16 x 4\""
+
+#~ msgid "Tabloid (Oversize)"
+#~ msgstr "Tabloid (расширенный)"
+
+#~ msgid "The notify-user-data value is too large (%d > 63 octets)"
+#~ msgstr "Значение notify-user-data слишком большое(%d > 63 октета)"
+
+#~ msgid "The printer is almost out of ink."
+#~ msgstr "Заканчиваются чернила."
+
+#~ msgid "The printer is low on toner."
+#~ msgstr "Заканчивается тонер."
+
+#~ msgid "The printer is out of ink."
+#~ msgstr "Чернила закончились."
+
+#~ msgid "The printer is out of toner."
+#~ msgstr "Тонер закончился."
+
+#~ msgid "The printer or class is not shared"
+#~ msgstr "Нет общего доступа к принтеру или классу."
+
+#~ msgid "The printer or class was not found."
+#~ msgstr "Принтер или класс не найден."
+
+#~ msgid "The printer-uri attribute is required"
+#~ msgstr "Требуется атрибут printer-uri"
+
+#~ msgid "Title: "
+#~ msgstr "Заголовок: "
+
+#~ msgid "Too many job-sheets values (%d > 2)"
+#~ msgstr "Слишком много значений job-sheets (%d>2)"
+
+#~ msgid "Too many printer-state-reasons values (%d > %d)"
+#~ msgstr "Слишком много значений printer-state-reasons (%d > %d)"
+
+#~ msgid "US Executive"
+#~ msgstr "US Executive"
+
+#~ msgid "US Fanfold"
+#~ msgstr "US Fanfold"
+
+#~ msgid "US Legal (Oversize)"
+#~ msgstr "US Legal (расширенный)"
+
+#~ msgid "US Letter (Oversize)"
+#~ msgstr "US Letter (расширенный)"
+
+#~ msgid "US Letter (Small)"
+#~ msgstr "US Letter (уменьшенный)"
+
+#~ msgid "USB Serial Port #%d"
+#~ msgstr "Последовательный порт USB #%d"
+
+#~ msgid "Unable to access cupsd.conf file:"
+#~ msgstr "Не удается получить доступ к файлу «cupsd.conf»:"
+
+#~ msgid "Unable to add RSS subscription:"
+#~ msgstr "Не удается добавить подписку RSS:"
+
+#~ msgid "Unable to add class:"
+#~ msgstr "Не удается добавить класс:"
+
+#~ msgid "Unable to add job for destination \"%s\""
+#~ msgstr "Не удается добавить задание для назначения \"%s\""
+
+#~ msgid "Unable to add printer:"
+#~ msgstr "Не удается добавить принтер:"
+
+#~ msgid "Unable to allocate memory for file types"
+#~ msgstr "Не удается выделить память для типов файлов"
+
+#~ msgid "Unable to cancel RSS subscription:"
+#~ msgstr "Не удается отменить подписку RSS:"
+
+#~ msgid "Unable to change printer-is-shared attribute:"
+#~ msgstr "Не удается изменить атрибут printer-is-shared:"
+
+#~ msgid "Unable to change printer:"
+#~ msgstr "Не удается изменить принтер:"
+
+#~ msgid "Unable to change server settings:"
+#~ msgstr "Не удается изменить настройки сервера:"
+
+#~ msgid "Unable to copy 64-bit CUPS printer driver files (%d)"
+#~ msgstr "Не удается копировать 64-битовые файлы драйвера принтера CUPS (%d)"
+
+#~ msgid "Unable to copy 64-bit Windows printer driver files (%d)"
+#~ msgstr ""
+#~ "Не удается копировать 64-битовые файлы драйвера принтера для Windows (%d)"
+
+#~ msgid "Unable to copy CUPS printer driver files (%d)"
+#~ msgstr "Не удается копировать файлы драйвера принтера CUPS (%d)"
+
+#~ msgid "Unable to copy PPD file"
+#~ msgstr "Не удается копировать PPD-файл"
+
+#~ msgid "Unable to copy Windows 2000 printer driver files (%d)"
+#~ msgstr "Не удается копировать файлы драйвера принтера Windows 2000 (%d)"
+
+#~ msgid "Unable to copy Windows 9x printer driver files (%d)"
+#~ msgstr "Не удается копировать файлы драйвера принтера Windows 9x (%d)"
+
+#~ msgid "Unable to create temporary file:"
+#~ msgstr "Не удается создать временный файл:"
+
+#~ msgid "Unable to delete class:"
+#~ msgstr "Не удается удалить класс:"
+
+#~ msgid "Unable to delete printer:"
+#~ msgstr "Не удается удалить принтер:"
+
+#~ msgid "Unable to do maintenance command:"
+#~ msgstr "Не удается выполнить команду обслуживания:"
+
+#~ msgid "Unable to find printer\n"
+#~ msgstr "Не удается найти принтер\n"
+
+#~ msgid "Unable to get class list:"
+#~ msgstr "Не удается получить список класса:"
+
+#~ msgid "Unable to get class status:"
+#~ msgstr "Не удается получить статус класса:"
+
+#~ msgid "Unable to get list of printer drivers:"
+#~ msgstr "Не удается получить список драйверов принтера:"
+
+#~ msgid "Unable to get printer attributes:"
+#~ msgstr "Не удается получить атрибуты принтера:"
+
+#~ msgid "Unable to get printer list:"
+#~ msgstr "Не удается получить список принтеров:"
+
+#~ msgid "Unable to get printer status:"
+#~ msgstr "Не удается получить статус принтера:"
+
+#~ msgid "Unable to install Windows 2000 printer driver files (%d)"
+#~ msgstr "Не удается установить файлы драйвера принтера Windows 2000 (%d)"
+
+#~ msgid "Unable to install Windows 9x printer driver files (%d)"
+#~ msgstr "Не удается установить файлы драйвера принтера Windows 9x (%d)"
+
+#~ msgid "Unable to modify class:"
+#~ msgstr "Не удается изменить класс:"
+
+#~ msgid "Unable to modify printer:"
+#~ msgstr "Не удается изменить принтер:"
+
+#~ msgid "Unable to open PPD file:"
+#~ msgstr "Не удается открыть PPD-файл:"
+
+#~ msgid "Unable to open document %d in job %d"
+#~ msgstr "Не удается открыть документ %d в задании %d"
+
+#~ msgid "Unable to print test page:"
+#~ msgstr "Не удается напечатать пробную страницу:"
+
+#~ msgid "Unable to run \"%s\": %s\n"
+#~ msgstr "Не удается запустить «%s»: %s\n"
+
+#~ msgid "Unable to set Windows printer driver (%d)"
+#~ msgstr "Не удается настроить драйвер принтера Windows (%d)"
+
+#~ msgid "Unable to set options:"
+#~ msgstr "Не удается настроить параметры:"
+
+#~ msgid "Unable to set server default:"
+#~ msgstr "Не удается назначить сервер используемым по умолчанию:"
+
+#~ msgid "Unable to upload cupsd.conf file:"
+#~ msgstr "Не удается загрузить файл «cupsd.conf»:"
+
+#~ msgid "Unable to use legacy USB class driver\n"
+#~ msgstr "Не удается использовать устаревший драйвер класса USB \n"
+
+#~ msgid "Unsupported character set \"%s\""
+#~ msgstr "Неподдерживаемый набор символов \"%s\""
+
+#~ msgid "Unsupported compression \"%s\""
+#~ msgstr "Неподдерживаемое сжатие \"%s\""
+
+#~ msgid "Unsupported compression attribute %s"
+#~ msgstr "Неподдерживаемый атрибут сжатия %s"
+
+#~ msgid "Unsupported format \"%s\""
+#~ msgstr "Неподдерживаемый формат \"%s\""
+
+#~ msgid "Unsupported format '%s'"
+#~ msgstr "Неподдерживаемый формат '%s'"
+
+#~ msgid "Unsupported format '%s/%s'"
+#~ msgstr "Неподдерживаемый формат '%s/%s'"
+
+#~ msgid ""
+#~ "Usage:\n"
+#~ "\n"
+#~ "    lpadmin [-h server] -d destination\n"
+#~ "    lpadmin [-h server] -x destination\n"
+#~ "    lpadmin [-h server] -p printer [-c add-class] [-i interface] [-m "
+#~ "model]\n"
+#~ "                       [-r remove-class] [-v device] [-D description]\n"
+#~ "                       [-P ppd-file] [-o name=value]\n"
+#~ "                       [-u allow:user,user] [-u deny:user,user]\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Синтаксис:\n"
+#~ "\n"
+#~ "    lpadmin [-h server] -d destination\n"
+#~ "    lpadmin [-h server] -x destination\n"
+#~ "    lpadmin [-h server] -p printer [-c add-class] [-i interface] [-m "
+#~ "model]\n"
+#~ "                       [-r remove-class] [-v device] [-D description]\n"
+#~ "                       [-P ppd-file] [-o name=value]\n"
+#~ "                       [-u allow:user,user] [-u deny:user,user]\n"
+#~ "\n"
+
+#~ msgid "Usage: %s job user title copies options [filename]\n"
+#~ msgstr "Синтаксис: %s job user title copies options [filename]\n"
+
+#~ msgid "Usage: %s job-id user title copies options [file]\n"
+#~ msgstr "Синтаксис: %s job-id user title copies options [file]\n"
+
+#~ msgid "Usage: %s job-id user title copies options file\n"
+#~ msgstr "Синтаксис: %s job-id user title copies options file\n"
+
+#~ msgid ""
+#~ "Usage: convert [ options ]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "\n"
+#~ "  -e                   Use every filter from the PPD file\n"
+#~ "  -f filename          Set file to be converted (otherwise stdin)\n"
+#~ "  -o filename          Set file to be generated (otherwise stdout)\n"
+#~ "  -i mime/type         Set input MIME type (otherwise auto-typed)\n"
+#~ "  -j mime/type         Set output MIME type (otherwise application/pdf)\n"
+#~ "  -P filename.ppd      Set PPD file\n"
+#~ "  -a 'name=value ...'  Set option(s)\n"
+#~ "  -U username          Set username for job\n"
+#~ "  -J title             Set title\n"
+#~ "  -c copies            Set number of copies\n"
+#~ "  -u                   Remove the PPD file when finished\n"
+#~ "  -D                   Remove the input file when finished\n"
+#~ msgstr ""
+#~ "Синтаксис: convert [ options ]\n"
+#~ "\n"
+#~ "Параметры:\n"
+#~ "\n"
+#~ "  -f filename          Указывается конвертируемый файл (в противном "
+#~ "случае stdin)\n"
+#~ "  -o filename          Указывается создаваемый файл (в противном случае "
+#~ "stdout)\n"
+#~ "  -i mime/type         Указывается MIME-тип данных на входе (в противном "
+#~ "случае auto-typed)\n"
+#~ "  -j mime/type         Указывается MIME-тип данных на выходе (в противном "
+#~ "случае application/pdf)\n"
+#~ "  -P filename.ppd      Указывается PPD-файл\n"
+#~ "  -a 'name=value ...'  Указываются параметры\n"
+#~ "  -U username          Указывается имя пользователя для задания\n"
+#~ "  -J title             Указывается заголовок\n"
+#~ "  -c copies            Указывается количество копий\n"
+#~ "  -u                   PPD-файл удаляется после выполнения команды\n"
+#~ "  -D                   Файл, поступивший на вход, удаляется после "
+#~ "выполнения команды\n"
+
+#~ msgid ""
+#~ "Usage: cupsaddsmb [options] printer1 ... printerN\n"
+#~ "       cupsaddsmb [options] -a\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -E               Encrypt the connection to the server\n"
+#~ "  -H samba-server  Use the named SAMBA server\n"
+#~ "  -U samba-user    Authenticate using the named SAMBA user\n"
+#~ "  -a               Export all printers\n"
+#~ "  -h cups-server   Use the named CUPS server\n"
+#~ "  -v               Be verbose (show commands)\n"
+#~ msgstr ""
+#~ "Синтаксис: cupsaddsmb [options] printer1 ... printerN\n"
+#~ "       cupsaddsmb [options] -a\n"
+#~ "\n"
+#~ "Параметры:\n"
+#~ "  -E               Подключение к серверу шифруется\n"
+#~ "  -H samba-server  Используется названный сервер SAMBA\n"
+#~ "  -U samba-user    Выполняется проверка подлинности с использованием "
+#~ "указанного пользователя SAMBA\n"
+#~ "  -a               Экспортируются все принтеры\n"
+#~ "  -h cups-server   Используется названный сервер CUPS\n"
+#~ "  -v               Подробное отображение (показать команды)\n"
+
+#~ msgid ""
+#~ "Usage: cupsctl [options] [param=value ... paramN=valueN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "\n"
+#~ "    -E                      Enable encryption\n"
+#~ "    -U username             Specify username\n"
+#~ "    -h server[:port]        Specify server address\n"
+#~ "\n"
+#~ "    --[no-]debug-logging    Turn debug logging on/off\n"
+#~ "    --[no-]remote-admin     Turn remote administration on/off\n"
+#~ "    --[no-]remote-any       Allow/prevent access from the Internet\n"
+#~ "    --[no-]remote-printers  Show/hide remote printers\n"
+#~ "    --[no-]share-printers   Turn printer sharing on/off\n"
+#~ "    --[no-]user-cancel-any  Allow/prevent users to cancel any job\n"
+#~ msgstr ""
+#~ "Синтаксис: cupsctl [options] [param=value ... paramN=valueN]\n"
+#~ "\n"
+#~ "Параметры:\n"
+#~ "\n"
+#~ "    -E                      Включается шифрование\n"
+#~ "    -U username             Указывается имя пользователя\n"
+#~ "    -h server[:port]        Указывается адрес сервера\n"
+#~ "\n"
+#~ "    --[no-]debug-logging    Включается/отключается ведение журнала "
+#~ "отладки\n"
+#~ "    --[no-]remote-admin     Включается/отключается удаленное "
+#~ "администрирование\n"
+#~ "    --[no-]remote-any       Разрешается/запрещается доступ из Интернета\n"
+#~ "    --[no-]remote-printers  Отображаются/скрываются удаленные принтеры\n"
+#~ "    --[no-]share-printers   Включается/отключается совместное "
+#~ "использование принтеров\n"
+#~ "    --[no-]user-cancel-any  Пользователям разрешается/запрещается "
+#~ "отменять задания\n"
+
+#~ msgid ""
+#~ "Usage: cupsd [-c config-file] [-f] [-F] [-h] [-l]\n"
+#~ "\n"
+#~ "-c config-file      Load alternate configuration file\n"
+#~ "-f                  Run in the foreground\n"
+#~ "-F                  Run in the foreground but detach\n"
+#~ "-h                  Show this usage message\n"
+#~ "-l                  Run cupsd from launchd(8)\n"
+#~ msgstr ""
+#~ "Синтаксис: cupsd [-c config-file] [-f] [-F] [-h] [-l]\n"
+#~ "\n"
+#~ "-c config-file      Загружается альтернативный файл конфигурации\n"
+#~ "-f                  Задание имеет высокий приоритет\n"
+#~ "-F                  Задание имеет высокий приоритет и выделяется\n"
+#~ "-h                  Отображается данное сообщение\n"
+#~ "-l                  cupsd запускается из launchd(8)\n"
+
+#~ msgid ""
+#~ "Usage: cupsfilter -m mime/type [ options ] filename\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "\n"
+#~ "  -c cupsd.conf    Set cupsd.conf file to use\n"
+#~ "  -e               Use every filter from the PPD file\n"
+#~ "  -j job-id[,N]    Filter file N from the specified job (default is file "
+#~ "1)\n"
+#~ "  -n copies        Set number of copies\n"
+#~ "  -o name=value    Set option(s)\n"
+#~ "  -p filename.ppd  Set PPD file\n"
+#~ "  -t title         Set title\n"
+#~ msgstr ""
+#~ "Синтаксис: cupsfilter -m mime/type [ options ] filename\n"
+#~ "\n"
+#~ "Параметры:\n"
+#~ "\n"
+#~ "  -c cupsd.conf    Используется файл cupsd.conf\n"
+#~ "  -j job-id[,N]    Из указанного задания выбирается файл N (по умолчанию "
+#~ "файл 1)\n"
+#~ "  -n copies        Задается количество копий\n"
+#~ "  -o name=value    Задаются параметры\n"
+#~ "  -p filename.ppd  Задается PPD-файл\n"
+#~ "  -t title         Задается заголовок\n"
+
+#~ msgid ""
+#~ "Usage: cupstestdsc [options] filename.ps [... filename.ps]\n"
+#~ "       cupstestdsc [options] -\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "\n"
+#~ "    -h       Show program usage\n"
+#~ "\n"
+#~ "    Note: this program only validates the DSC comments, not the "
+#~ "PostScript itself.\n"
+#~ msgstr ""
+#~ "Синтаксис: cupstestdsc [options] filename.ps [... filename.ps]\n"
+#~ "       cupstestdsc [options] -\n"
+#~ "\n"
+#~ "Параметры:\n"
+#~ "\n"
+#~ "    -h       Отображается справка по использованию программы\n"
+#~ "\n"
+#~ "    Примечание: данная программа проверяет только комментарии DSC, а не "
+#~ "сам PostScript.\n"
+
+#~ msgid ""
+#~ "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]\n"
+#~ "       program | cupstestppd [options] -\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "\n"
+#~ "    -I {filename,filters,none,profiles}\n"
+#~ "                         Ignore specific warnings\n"
+#~ "    -R root-directory    Set alternate root\n"
+#~ "    -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,"
+#~ "translations}\n"
+#~ "                         Issue warnings instead of errors\n"
+#~ "    -q                   Run silently\n"
+#~ "    -r                   Use 'relaxed' open mode\n"
+#~ "    -v                   Be slightly verbose\n"
+#~ "    -vv                  Be very verbose\n"
+#~ msgstr ""
+#~ "Синтаксис: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[."
+#~ "gz]]\n"
+#~ "       program | cupstestppd [options] -\n"
+#~ "\n"
+#~ "Параметры:\n"
+#~ "\n"
+#~ "    -R root-directory    Задается альтернативный корневой каталог\n"
+#~ "    -W {all,none,constraints,defaults,duplex,filters,translations}\n"
+#~ "                         Вместо ошибок выдаются предупреждения\n"
+#~ "    -q                   Команда выполняется в «тихом» режиме\n"
+#~ "    -r                   Используется открытый режим\n"
+#~ "    -v                   Режим более подробного отображения\n"
+#~ "    -vv                  Режим максимально подробного отображения\n"
+
+#~ msgid ""
+#~ "Usage: ipptest [options] URI filename.test [ ... filenameN.test ]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "\n"
+#~ "-E             Test with encryption.\n"
+#~ "-V version     Set default IPP version.\n"
+#~ "-X             Produce XML instead of plain text.\n"
+#~ "-c             Send requests using chunking (default)\n"
+#~ "-d name=value  Define variable.\n"
+#~ "-f filename    Set default test file.\n"
+#~ "-i seconds     Repeat the last test file with the given interval.\n"
+#~ "-l             Send requests using content-length\n"
+#~ "-v             Show all attributes sent and received.\n"
+#~ msgstr ""
+#~ "Синтаксис: ipptest [options] URI filename.test [ ... filenameN.test ]\n"
+#~ "\n"
+#~ "Параметры:\n"
+#~ "\n"
+#~ "-E\t\tТест с шифрованием.\n"
+#~ "-V version\tЗадается стандартная версия IPP.\n"
+#~ "-X\t\tСоздание XML вместо обычного текста.\n"
+#~ "-c\t\tПередача запроса с использованием chunking (по умолчанию)-d "
+#~ "name=value\tОпределение переменной.\n"
+#~ "-f filename\tСоздание стандартного тест-файла.\n"
+#~ "-i seconds\tПовторение последнего тест-файла с заданным интервалом.\n"
+#~ "-l\t\tПередача запроса с использованием content-length.\n"
+#~ "-v\t\tПоказать все атрибуты отправленных и полученных.\n"
+
+#~ msgid "Usage: lpmove job/src dest\n"
+#~ msgstr "Синтаксис: lpmove job/src dest\n"
+
+#~ msgid ""
+#~ "Usage: lpoptions [-h server] [-E] -d printer\n"
+#~ "       lpoptions [-h server] [-E] [-p printer] -l\n"
+#~ "       lpoptions [-h server] [-E] -p printer -o option[=value] ...\n"
+#~ "       lpoptions [-h server] [-E] -x printer\n"
+#~ msgstr ""
+#~ "Usage: lpoptions [-h server] [-E] -d printer\n"
+#~ "       lpoptions [-h server] [-E] [-p printer] -l\n"
+#~ "       lpoptions [-h server] [-E] -p printer -o option[=value] ...\n"
+#~ "       lpoptions [-h server] [-E] -x printer\n"
+
+#~ msgid "Usage: lppasswd [-g groupname]\n"
+#~ msgstr "Синтаксис: lppasswd [-g groupname]\n"
+
+#~ msgid ""
+#~ "Usage: lppasswd [-g groupname] [username]\n"
+#~ "       lppasswd [-g groupname] -a [username]\n"
+#~ "       lppasswd [-g groupname] -x [username]\n"
+#~ msgstr ""
+#~ "{>Синтаксис: lppasswd [-g groupname] [username]\n"
+#~ "       lppasswd [-g groupname] -a [username]\n"
+#~ "       lppasswd [-g groupname] -x [username]\n"
+
+#~ msgid ""
+#~ "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]\n"
+#~ msgstr ""
+#~ "Синтаксис: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] "
+#~ "[+interval]\n"
+
+#~ msgid ""
+#~ "Usage: ppdc [options] filename.drv [ ... filenameN.drv ]\n"
+#~ "Options:\n"
+#~ "  -D name=value        Set named variable to value.\n"
+#~ "  -I include-dir       Add include directory to search path.\n"
+#~ "  -c catalog.po        Load the specified message catalog.\n"
+#~ "  -d output-dir        Specify the output directory.\n"
+#~ "  -l lang[,lang,...]   Specify the output language(s) (locale).\n"
+#~ "  -m                   Use the ModelName value as the filename.\n"
+#~ "  -t                   Test PPDs instead of generating them.\n"
+#~ "  -v                   Be verbose (more v's for more verbosity).\n"
+#~ "  -z                   Compress PPD files using GNU zip.\n"
+#~ "  --cr                 End lines with CR (Mac OS 9).\n"
+#~ "  --crlf               End lines with CR + LF (Windows).\n"
+#~ "  --lf                 End lines with LF (UNIX/Linux/Mac OS X).\n"
+#~ msgstr ""
+#~ "Синтаксис: ppdc [options] filename.drv [ ... filenameN.drv ]\n"
+#~ "Параметры:\n"
+#~ "  -D name=value        Указанной переменной присваивается значение.\n"
+#~ "  -I include-dir       Добавляется каталог в путь поиска.\n"
+#~ "  -c catalog.po        Загружается указанный каталог сообщений.\n"
+#~ "  -d output-dir        Указывается каталог для выходных данных.\n"
+#~ "  -l lang[,lang,...]   Указывается язык (регион) для выходных данных.\n"
+#~ "  -m                   В качестве имени файла используется значение "
+#~ "ModelName.\n"
+#~ "  -t                   Вместо создания PPD-файлов выполняется их "
+#~ "проверка.\n"
+#~ "  -v                   Режим подробного отображения (чем больше букв v, "
+#~ "тем выше уровень детализации).\n"
+#~ "  -z                   Файлы PPD сжимаются с использованием GNU zip.\n"
+#~ "  --cr                 Строки заканчиваются на CR (Mac OS 9).\n"
+#~ "  --crlf               Строки заканчиваются на CR + LF (Windows).\n"
+#~ "  --lf                 Строки заканчиваются на LF (UNIX/Linux/Mac OS X).\n"
+
+#~ msgid ""
+#~ "Usage: ppdhtml [options] filename.drv >filename.html\n"
+#~ "  -D name=value        Set named variable to value.\n"
+#~ "Options:\n"
+#~ "  -I include-dir    Add include directory to search path.\n"
+#~ msgstr ""
+#~ "Синтаксис: ppdhtml [options] filename.drv >filename.html\n"
+#~ "  -D name=value        Указанной переменной присваивается значение.\n"
+#~ "Параметры:\n"
+#~ "  -I include-dir    Добавляется каталог в путь поиска.\n"
+
+#~ msgid ""
+#~ "Usage: ppdi [options] filename.ppd [ ... filenameN.ppd ]\n"
+#~ "Options:\n"
+#~ "  -I include-dir\n"
+#~ "  -o filename.drv\n"
+#~ msgstr ""
+#~ "Синтаксис: ppdi [options] filename.ppd [ ... filenameN.ppd ]\n"
+#~ "Параметры:\n"
+#~ "  -I include-dir\n"
+#~ "  -o filename.drv\n"
+
+#~ msgid ""
+#~ "Usage: ppdmerge [options] filename.ppd [ ... filenameN.ppd ]\n"
+#~ "Options:\n"
+#~ "  -o filename.ppd[.gz]\n"
+#~ msgstr ""
+#~ "Синтаксис: ppdmerge [options] filename.ppd [ ... filenameN.ppd ]\n"
+#~ "Параметры:\n"
+#~ "  -o filename.ppd[.gz]\n"
+
+#~ msgid ""
+#~ "Usage: ppdpo [options] -o filename.po filename.drv [ ... filenameN.drv ]\n"
+#~ "Options:\n"
+#~ "  -D name=value        Set named variable to value.\n"
+#~ "  -I include-dir    Add include directory to search path.\n"
+#~ "  -v                Be verbose (more v's for more verbosity).\n"
+#~ msgstr ""
+#~ "Синтаксис: ppdpo [options] -o filename.po filename.drv [ ... filenameN."
+#~ "drv ]\n"
+#~ "Параметры:\n"
+#~ "  -D name=value        Указанной переменной присваивается значение.\n"
+#~ "  -I include-dir    Добавляется каталог в путь поиска.\n"
+#~ "  -v                Подробный режим (чем больше букв v, тем выше уровень "
+#~ "детализации).\n"
+
+#~ msgid "Usage: snmp [host-or-ip-address]\n"
+#~ msgstr "Синтаксис: snmp [host-or-ip-address]\n"
+
+#~ msgid "WARNING: Adding only the first %d printers found"
+#~ msgstr "WARNING: Будут добавлены только первые найденные принтеры (%d)"
+
+#~ msgid "WARNING: Boolean expected for waiteof option \"%s\"\n"
+#~ msgstr "WARNING: Параметр waiteof «%s» должен иметь булево значение\n"
+
+#~ msgid "WARNING: Network host '%s' is busy; will retry in %d seconds...\n"
+#~ msgstr ""
+#~ "WARNING: Сетевой узел '%s' занят; повторить попытку через %d секунд...\n"
+
+#~ msgid "WARNING: Option \"%s\" cannot be included via IncludeFeature\n"
+#~ msgstr ""
+#~ "WARNING: Параметр \"%s\" не может быть добавлен через IncludeFeature\n"
+
+#~ msgid "WARNING: Printer not responding\n"
+#~ msgstr "WARNING: Принтер не отвечает\n"
+
+#~ msgid "WARNING: Printer sent unexpected EOF\n"
+#~ msgstr "WARNING: Принтер преждевременно передал индикатор EOF\n"
+
+#~ msgid ""
+#~ "WARNING: Remote host did not respond with command status byte after %d "
+#~ "seconds\n"
+#~ msgstr ""
+#~ "WARNING: Удаленный хост не отвечает на команду в течение %d секунд\n"
+
+#~ msgid ""
+#~ "WARNING: Remote host did not respond with control status byte after %d "
+#~ "seconds\n"
+#~ msgstr ""
+#~ "WARNING: Удаленный хост не отвечает на управляющую последовательность в "
+#~ "течение %d секунд\n"
+
+#~ msgid ""
+#~ "WARNING: Remote host did not respond with data status byte after %d "
+#~ "seconds\n"
+#~ msgstr ""
+#~ "WARNING: Удаленный хост не отвечает при передачи данных в течение %d "
+#~ "секунд\n"
+
+#~ msgid ""
+#~ "WARNING: This document does not conform to the Adobe Document Structuring "
+#~ "Conventions and may not print correctly\n"
+#~ msgstr ""
+#~ "WARNING: Этот документ не соответствует Adobe Document Structuring "
+#~ "Conventions и может быть напечатан неправильно\n"
+
+#~ msgid "WARNING: Unable to open \"%s:%s\": %s\n"
+#~ msgstr "WARNING: Не удается открыть «%s:%s»: %s\n"
+
+#~ msgid "WARNING: Unable to send PAP status request"
+#~ msgstr "WARNING: Не удается отправить запрос статуса PAP"
+
+#~ msgid "WARNING: Unexpected PAP packet of type %d\n"
+#~ msgstr "WARNING: Непредвиденный PAP-пакет типа %d\n"
+
+#~ msgid "WARNING: Unknown PAP packet of type %d\n"
+#~ msgstr "WARNING: Неизвестный PAP-пакет типа %d\n"
+
+#~ msgid "WARNING: Unknown choice \"%s\" for option \"%s\"\n"
+#~ msgstr "WARNING: Неизвестный выбор \"%s\" для параметра \"%s\"\n"
+
+#~ msgid "WARNING: Unknown option \"%s\"\n"
+#~ msgstr "WARNING: Неизвестный параметр \"%s\"\n"
+
+#~ msgid "WARNING: Unsupported baud rate %s\n"
+#~ msgstr "WARNING: Неподдерживаемая скорость передачи данных в бодах %s\n"
+
+#~ msgid "WARNING: number expected for status option \"%s\"\n"
+#~ msgstr "WARNING: Параметр статуса «%s» должен иметь числовое значение\n"
+
+#~ msgid "Warning, no Windows 2000 printer drivers are installed"
+#~ msgstr "WARNING: Драйверы принтера Windows 2000 не установлены"
+
+#~ msgid "You4 Envelope"
+#~ msgstr "Конверт You4"
+
+#~ msgid "convert: Use the -f option to specify a file to convert.\n"
+#~ msgstr ""
+#~ "convert: Используйте параметр -f для указания конвертируемого файла.\n"
+
+#~ msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s\n"
+#~ msgstr "cupsaddsmb: Нет PPD-файла для принтера «%s» – %s\n"
+
+#~ msgid "cupsctl: Unable to connect to server: %s\n"
+#~ msgstr "cupsctl: Не удается подключиться к серверу: %s\n"
+
+#~ msgid "cupsctl: Unknown option \"%s\"\n"
+#~ msgstr "cupsctl: Неизвестный параметр \"%s\"\n"
+
+#~ msgid "cupsctl: Unknown option \"-%c\"\n"
+#~ msgstr "cupsctl: Неизвестный параметр \"-%c\"\n"
+
+#~ msgid "cupsd: Expected config filename after \"-c\" option\n"
+#~ msgstr "cupsd: Ожидаемое имя файла конфигурации после параметра \"-с\"\n"
+
+#~ msgid "cupsd: Unable to get current directory\n"
+#~ msgstr "cupsd: Не удается определить текущий каталог\n"
+
+#~ msgid "cupsd: Unknown argument \"%s\" - aborting\n"
+#~ msgstr "cupsd: Неизвестный аргумент \"%s\" - отмена\n"
+
+#~ msgid "cupsd: Unknown option \"%c\" - aborting\n"
+#~ msgstr "cupsd: Неизвестный параметр \"%c\" - отмена\n"
+
+#~ msgid "cupsd: launchd(8) support not compiled in, running in normal mode.\n"
+#~ msgstr ""
+#~ "cupsd: Поддержка launchd(8) не скомпилирована, работа в нормальном "
+#~ "режиме.\n"
+
+#~ msgid "cupsfilter: Invalid document number %d\n"
+#~ msgstr "cupsfilter: Недопустимый номер документа %d\n"
+
+#~ msgid "cupsfilter: Invalid job ID %d\n"
+#~ msgstr "cupsfilter: Недопустимый ID задания %d\n"
+
+#~ msgid "cupsfilter: Only one filename can be specified\n"
+#~ msgstr "cupsfilter: Может быть указано только одно имя файла\n"
+
+#~ msgid "cupsfilter: Unable to get job file - %s\n"
+#~ msgstr "cupsfilter: Не удается получить файл задания - %s\n"
+
+#~ msgid "cupstestppd: The -q option is incompatible with the -v option.\n"
+#~ msgstr "cupstestppd: Параметр «-q» несовместим с параметром «-v».\n"
+
+#~ msgid "cupstestppd: The -v option is incompatible with the -q option.\n"
+#~ msgstr "cupstestppd: Параметр «-v» несовместим с параметром «-q».\n"
+
+#~ msgid "device for %s/%s: %s\n"
+#~ msgstr "устройство для %s/%s: %s\n"
+
+#~ msgid "device for %s: %s\n"
+#~ msgstr "устройство для %s: %s\n"
+
+#~ msgid "help\t\tget help on commands\n"
+#~ msgstr "справка\t\tполучить справку о командах\n"
+
+#~ msgid "ipptest: \"-i\" is incompatible with \"-x\".\n"
+#~ msgstr "ipptest: \"-i\" несовместимо с \"-x\".\n"
+
+#~ msgid "ipptest: Bad URI - %s.\n"
+#~ msgstr "ipptest: Неверный URI - %s.\n"
+
+#~ msgid "ipptest: Bad version %s for \"-V\".\n"
+#~ msgstr "ipptest: Неверная версия %s для \"-V\".\n"
+
+#~ msgid "ipptest: May only specify a single URI.\n"
+#~ msgstr "ipptest: Может быть определен лишь один URI.\n"
+
+#~ msgid "ipptest: Missing filename for \"-f\".\n"
+#~ msgstr "ipptest: Не определено имя файла для \"-f\".\n"
+
+#~ msgid "ipptest: Missing name=value for \"-d\".\n"
+#~ msgstr "ipptest: Не определено name=value для \"-d\".\n"
+
+#~ msgid "ipptest: Missing seconds for \"-i\".\n"
+#~ msgstr "ipptest: Не указаны секунды для \"-i\".\n"
+
+#~ msgid "ipptest: Missing version for \"-V\".\n"
+#~ msgstr "ipptest: Не определена версия для \"-V\".\n"
+
+#~ msgid "ipptest: Only http, https, and ipp URIs are supported."
+#~ msgstr "ipptest: Поддерживаются только http, https и ipp URI."
+
+#~ msgid "ipptest: URI required before test file."
+#~ msgstr "ipptest: Необходим URI перед указанием тест-файла."
+
+#~ msgid "ipptest: Unknown option \"-%c\".\n"
+#~ msgstr "ipptest: Неизвестный параметр \"-%c\".\n"
+
+#~ msgid "job-printer-uri attribute missing"
+#~ msgstr "Атрибут job-printer-uri отсутствует."
+
+#~ msgid "lpadmin: Class name can only contain printable characters\n"
+#~ msgstr "lpadmin: Имя класса может содержать только печатные символы\n"
+
+#~ msgid "lpadmin: Expected PPD after '-P' option\n"
+#~ msgstr "lpadmin: После параметра '-P' должен быть указан PPD\n"
+
+#~ msgid "lpadmin: Expected allow/deny:userlist after '-u' option\n"
+#~ msgstr ""
+#~ "lpadmin: После параметра '-u' должен быть указан allow/deny:userlist.\n"
+
+#~ msgid "lpadmin: Expected class after '-r' option\n"
+#~ msgstr "lpadmin: После параметра '-r' должно быть указано имя класса\n"
+
+#~ msgid "lpadmin: Expected class name after '-c' option\n"
+#~ msgstr "lpadmin: После параметра '-c' должно быть указано имя группы\n"
+
+#~ msgid "lpadmin: Expected description after '-D' option\n"
+#~ msgstr "lpadmin: После параметра '-D' должно быть указано описание\n"
+
+#~ msgid "lpadmin: Expected device URI after '-v' option\n"
+#~ msgstr "lpadmin: После параметра '-v' должно быть указано URI\n"
+
+#~ msgid "lpadmin: Expected file type(s) after '-I' option\n"
+#~ msgstr ""
+#~ "lpadmin: После параметра '-I' должен(-ны) быть указан(-ы) тип(-ы) файла(-"
+#~ "ов)\n"
+
+#~ msgid "lpadmin: Expected hostname after '-h' option\n"
+#~ msgstr "lpadmin: После параметра '-h' должно быть указано имя хоста\n"
+
+#~ msgid "lpadmin: Expected interface after '-i' option\n"
+#~ msgstr "lpadmin: После параметра '-i' должен быть указан интерфейс.\n"
+
+#~ msgid "lpadmin: Expected location after '-L' option\n"
+#~ msgstr "lpadmin: После параметра '-L' должно быть указано местоположение\n"
+
+#~ msgid "lpadmin: Expected model after '-m' option\n"
+#~ msgstr "lpadmin: После параметра '-m'должна быть указана модель\n"
+
+#~ msgid "lpadmin: Expected name=value after '-o' option\n"
+#~ msgstr "lpadmin: После параметра '-o' должно быть указано name=value\n"
+
+#~ msgid "lpadmin: Expected printer after '-p' option\n"
+#~ msgstr "lpadmin: После параметра '-p' должен быть указан принтер\n"
+
+#~ msgid "lpadmin: Expected printer name after '-d' option\n"
+#~ msgstr "lpadmin: После параметра '-d' должно быть указано имя принтера\n"
+
+#~ msgid "lpadmin: Expected printer or class after '-x' option\n"
+#~ msgstr ""
+#~ "lpadmin: После параметра '-x' должен быть указан принтер или класс\n"
+
+#~ msgid "lpadmin: No member names were seen\n"
+#~ msgstr "lpadmin: Имена пользователей не были найдены\n"
+
+#~ msgid "lpadmin: Printer %s is already a member of class %s.\n"
+#~ msgstr "lpadmin: Принтер %s уже является членом класса %s.\n"
+
+#~ msgid "lpadmin: Printer %s is not a member of class %s.\n"
+#~ msgstr "lpadmin: Принтер %s не является членом класса %s.\n"
+
+#~ msgid "lpadmin: Printer name can only contain printable characters\n"
+#~ msgstr "lpadmin: Имя принтера может содержать только печатные принтеры\n"
+
+#~ msgid ""
+#~ "lpadmin: Unable to add a printer to the class:\n"
+#~ "         You must specify a printer name first\n"
+#~ msgstr ""
+#~ "lpadmin: Не удается добавить принтер в класс:\n"
+#~ "\t  Необходимо сначала указать имя принтера\n"
+
+#~ msgid "lpadmin: Unable to connect to server: %s\n"
+#~ msgstr "lpadmin: Не удается подключиться к серверу: %s\n"
+
+#~ msgid "lpadmin: Unable to open PPD file \"%s\" - %s\n"
+#~ msgstr "lpadmin: Не удается открыть PPD-файл «%s» – %s\n"
+
+#~ msgid "lpadmin: Unable to open file \"%s\": %s\n"
+#~ msgstr "lpadmin: Не удается открыть файл «%s»: %s\n"
+
+#~ msgid ""
+#~ "lpadmin: Unable to remove a printer from the class:\n"
+#~ "         You must specify a printer name first\n"
+#~ msgstr ""
+#~ "lpadmin: Не удается удалить принтер из класса:\n"
+#~ "\t  Необходимо сначала указать имя принтера\n"
+
+#~ msgid ""
+#~ "lpadmin: Unable to set the PPD file:\n"
+#~ "         You must specify a printer name first\n"
+#~ msgstr ""
+#~ "lpadmin: Не удается настроить PPD-файл:\n"
+#~ "\t  Необходимо сначала указать имя принтера\n"
+
+#~ msgid ""
+#~ "lpadmin: Unable to set the device URI:\n"
+#~ "         You must specify a printer name first\n"
+#~ msgstr ""
+#~ "lpadmin: не удается настроить URI устройства:\n"
+#~ "\t  Необходимо сначала указать имя принтера\n"
+
+#~ msgid ""
+#~ "lpadmin: Unable to set the interface script or PPD file:\n"
+#~ "         You must specify a printer name first\n"
+#~ msgstr ""
+#~ "lpadmin: Не удается настроить скрипт интерфейса или PPD-файл:\n"
+#~ "\t  Необходимо сначала указать имя принтера\n"
+
+#~ msgid ""
+#~ "lpadmin: Unable to set the interface script:\n"
+#~ "         You must specify a printer name first\n"
+#~ msgstr ""
+#~ "lpadmin: не удается настроить скрипт интерфейса:\n"
+#~ "\t  Необходимо сначала указать имя принтера\n"
+
+#~ msgid ""
+#~ "lpadmin: Unable to set the printer description:\n"
+#~ "         You must specify a printer name first\n"
+#~ msgstr ""
+#~ "lpadmin: Не удается настроить описание принтера:\n"
+#~ "\t  Необходимо сначала указать имя принтера\n"
+
+#~ msgid ""
+#~ "lpadmin: Unable to set the printer location:\n"
+#~ "         You must specify a printer name first\n"
+#~ msgstr ""
+#~ "lpadmin: Не удается настроить размещение принтера:\n"
+#~ "\t  Необходимо сначала указать имя принтера\n"
+
+#~ msgid ""
+#~ "lpadmin: Unable to set the printer options:\n"
+#~ "         You must specify a printer name first\n"
+#~ msgstr ""
+#~ "lpadmin: Не удается настроить параметры принтера:\n"
+#~ "\t  Необходимо сначала указать имя принтера\n"
+
+#~ msgid "lpadmin: Unknown allow/deny option \"%s\"\n"
+#~ msgstr "lpadmin: Неизвестный параметр allow/deny \"%s\"\n"
+
+#~ msgid "lpadmin: Unknown argument '%s'\n"
+#~ msgstr "lpadmin: Неизвестный аргумент '%s'\n"
+
+#~ msgid "lpadmin: Unknown option '%c'\n"
+#~ msgstr "lpadmin: Неизвестный параметр '%c'\n"
+
+#~ msgid "lpadmin: Warning - content type list ignored\n"
+#~ msgstr "lpadmin: Warning - список типов контента пропущен\n"
+
+#~ msgid "lpinfo: Expected 1284 device ID string after --device-id\n"
+#~ msgstr "lpinfo: После --device-id должна идти строка ID устройства 1284\n"
+
+#~ msgid "lpinfo: Expected language after --language\n"
+#~ msgstr "lpinfo: После --language необходимо указать язык\n"
+
+#~ msgid "lpinfo: Expected make and model after --make-and-model\n"
+#~ msgstr "lpinfo: После --make-and-model должна быть указана марка и модель\n"
+
+#~ msgid "lpinfo: Expected product string after --product\n"
+#~ msgstr "lpinfo: После --product должна идти строка продукта\n"
+
+#~ msgid "lpinfo: Expected scheme list after --exclude-schemes\n"
+#~ msgstr "lpinfo: После --exclude-schemes должен идти список схем\n"
+
+#~ msgid "lpinfo: Expected scheme list after --include-schemes\n"
+#~ msgstr "lpinfo: После --include-schemes должен идти список схем\n"
+
+#~ msgid "lpinfo: Expected timeout after --timeout\n"
+#~ msgstr "lpinfo: После --timeout должно быть указано время ожидания\n"
+
+#~ msgid "lpinfo: Unknown argument '%s'\n"
+#~ msgstr "lpinfo: Неизвестный аргумент '%s'\n"
+
+#~ msgid "lpinfo: Unknown option '%c'\n"
+#~ msgstr "lpinfo: Неизвестный параметр '%c'\n"
+
+#~ msgid "lpinfo: Unknown option '%s'\n"
+#~ msgstr "lpinfo: Неизвестный параметр '%s'\n"
+
+#~ msgid "lpmove: Unable to connect to server: %s\n"
+#~ msgstr "lpmove: Не удается подключиться к серверу: %s\n"
+
+#~ msgid "lpmove: Unknown argument '%s'\n"
+#~ msgstr "lpmove: Неизвестный аргумент '%s'\n"
+
+#~ msgid "lpmove: Unknown option '%c'\n"
+#~ msgstr "lpmove: Неизвестный параметр '%c'\n"
+
+#~ msgid "lpoptions: No printers\n"
+#~ msgstr "lpoptions: Нет принтеров?!\n"
+
+#~ msgid "lpoptions: Unable to add printer or instance: %s\n"
+#~ msgstr ""
+#~ "lpoptions: Не удается добавить принтер или представителя класса: %s\n"
+
+#~ msgid "lpoptions: Unable to get PPD file for %s: %s\n"
+#~ msgstr "lpoptions: Не удается получить PPD-файл для %s: %s\n"
+
+#~ msgid "lpoptions: Unable to open PPD file for %s\n"
+#~ msgstr "lpoptions: Не удается открыть PPD файл для %s\n"
+
+#~ msgid "lpoptions: Unknown printer or class\n"
+#~ msgstr "lpoptions: Неизвестный принтер или класс\n"
+
+#~ msgid "lppasswd: Only root can add or delete passwords\n"
+#~ msgstr ""
+#~ "lppasswd: Только пользователь root может добавлять или удалять пароли\n"
+
+#~ msgid "lppasswd: Password file busy\n"
+#~ msgstr "lppasswd: Файл пароля занят\n"
+
+#~ msgid "lppasswd: Password file not updated\n"
+#~ msgstr "lppasswd: Файл пароля не обновлен"
+
+#~ msgid "lppasswd: Sorry, password doesn't match\n"
+#~ msgstr "lppasswd: Пароль не встретился\n"
+
+#~ msgid ""
+#~ "lppasswd: Sorry, password rejected.\n"
+#~ "Your password must be at least 6 characters long, cannot contain\n"
+#~ "your username, and must contain at least one letter and number.\n"
+#~ msgstr ""
+#~ "lppasswd: Пароль отклонен.\n"
+#~ "Пароль должен состоять как минимум из 6 символов, не может содержать\n"
+#~ "Ваше имя пользователя и должен содержать по крайней мере одну букву и "
+#~ "цифру.\n"
+
+#~ msgid "lppasswd: Sorry, passwords don't match\n"
+#~ msgstr "lppasswd: Пароль не встретился\n"
+
+#~ msgid "lppasswd: Unable to copy password string: %s\n"
+#~ msgstr "lppasswd: Не удается копировать строку пароля: %s\n"
+
+#~ msgid "lppasswd: Unable to open password file: %s\n"
+#~ msgstr "lppasswd: Не удается открыть файл пароля: %s\n"
+
+#~ msgid "lppasswd: Unable to write to password file: %s\n"
+#~ msgstr "lppasswd: Не удается записать файл пароля: %s\n"
+
+#~ msgid "lppasswd: failed to backup old password file: %s\n"
+#~ msgstr "lppasswd: Не удалось создать рез. копию старого файла пароля: %s\n"
+
+#~ msgid "lppasswd: failed to rename password file: %s\n"
+#~ msgstr "lppasswd: Не удалось переименовать файл пароля: %s\n"
+
+#~ msgid "lppasswd: user \"%s\" and group \"%s\" do not exist.\n"
+#~ msgstr "lppasswd: Пользователь «%s» и группа «%s» не существуют.\n"
+
+#~ msgid ""
+#~ "lpstat: error - %s environment variable names non-existent destination "
+#~ "\"%s\"\n"
+#~ msgstr ""
+#~ "lpstat: ошибка - %s переменная окружения указывает несуществующее "
+#~ "назначение \"%s\"\n"
+
+#~ msgid "members of class %s:\n"
+#~ msgstr "члены класса %s:\n"
+
+#~ msgid "no entries\n"
+#~ msgstr "нет записей\n"
+
+#~ msgid "no system default destination\n"
+#~ msgstr "нет назначения системы по умолчанию\n"
+
+#~ msgid "notify-events not specified"
+#~ msgstr "notify-events не указаны"
+
+#~ msgid "notify-recipient-uri URI \"%s\" is already used"
+#~ msgstr "notify-recipient-uri URI \"%s\" уже используется"
+
+#~ msgid "notify-recipient-uri URI \"%s\" uses unknown scheme"
+#~ msgstr "notify-recipient-uri URI \"%s\" использует неизвестную схему"
+
+#~ msgid "notify-subscription-id %d no good"
+#~ msgstr "Неверный notify-subscription-id %d"
+
+#~ msgid "ppdc: Adding include directory \"%s\"...\n"
+#~ msgstr "ppdc: Добавляю каталог «%s»...\n"
+
+#~ msgid "ppdc: Adding/updating UI text from %s...\n"
+#~ msgstr "ppdc: Добавляю/обновляю текст интерфейса из %s...\n"
+
+#~ msgid "ppdc: Bad boolean value (%s) on line %d of %s.\n"
+#~ msgstr "ppdc: Недопустимое булево значение (%s) в строке %d из %s.\n"
+
+#~ msgid "ppdc: Bad resolution name \"%s\" on line %d of %s\n"
+#~ msgstr "ppdc: Недопустимое имя разрешения \"%s\" в строке %d bp %s.\n"
+
+#~ msgid "ppdc: Bad status keyword %s on line %d of %s\n"
+#~ msgstr "ppdc: Недопустимое ключевое слово статуса %s в строке %d из %s.\n"
+
+#~ msgid "ppdc: Bad variable substitution ($%c) on line %d of %s.\n"
+#~ msgstr "ppdc: Недопустимая замена переменной ($%c) в строке %d из %s.\n"
+
+#~ msgid "ppdc: Choice found on line %d of %s with no Option\n"
+#~ msgstr ""
+#~ "ppdc: В строке %d из %s обнаружено значение, не привязанное к параметру\n"
+
+#~ msgid "ppdc: Duplicate #po for locale %s on line %d of %s\n"
+#~ msgstr "ppdc: Дубликат #po для региона %s в строке %d из %s\n"
+
+#~ msgid "ppdc: Expected a filter definition on line %d of %s\n"
+#~ msgstr "ppdc: В строке %d из %s должно быть определение фильтра\n"
+
+#~ msgid "ppdc: Expected a program name on line %d of %s\n"
+#~ msgstr "ppdc: В строке %d из %s должно быть имя программы\n"
+
+#~ msgid "ppdc: Expected boolean value on line %d of %s.\n"
+#~ msgstr "ppdc: В строке %d из %s должно быть булево значение.\n"
+
+#~ msgid "ppdc: Expected charset after Font on line %d of %s\n"
+#~ msgstr ""
+#~ "ppdc: После Font в строке %d из %s должен быть указан набор символов.\n"
+
+#~ msgid "ppdc: Expected choice code on line %d of %s.\n"
+#~ msgstr "ppdc: В строке %d из %s должен быть код выбора.\n"
+
+#~ msgid "ppdc: Expected choice name/text on line %d of %s.\n"
+#~ msgstr "ppdc: В строке %d из %s должно быть имя/текст выбора.\n"
+
+#~ msgid "ppdc: Expected color order for ColorModel on line %d of %s\n"
+#~ msgstr ""
+#~ "ppdc: После ColorModel в строке %d из %s должна быть указана цветовая "
+#~ "схема\n"
+
+#~ msgid "ppdc: Expected colorspace for ColorModel on line %d of %s\n"
+#~ msgstr ""
+#~ "ppdc: Для ColorModel в строке %d из %s должно быть указано пространство "
+#~ "цветов.\n"
+
+#~ msgid "ppdc: Expected compression for ColorModel on line %d of %s\n"
+#~ msgstr ""
+#~ "ppdc: Для ColorModel в строке %d из %s должно быть указано сжатие.\n"
+
+#~ msgid ""
+#~ "ppdc: Expected constraints string for UIConstraints on line %d of %s\n"
+#~ msgstr ""
+#~ "ppdc: Для UIConstraints в строке %d из %s должна быть указана строка "
+#~ "ограничений\n"
+
+#~ msgid ""
+#~ "ppdc: Expected driver type keyword following DriverType on line %d of %s\n"
+#~ msgstr ""
+#~ "ppdc: После DriverType в строке %d из %s должно быть указано ключевое "
+#~ "слово типа драйвера.\n"
+
+#~ msgid "ppdc: Expected duplex type after Duplex on line %d of %s\n"
+#~ msgstr ""
+#~ "ppdc: После Duplex в строке %d из %s должен быть указан тип дуплекса.\n"
+
+#~ msgid "ppdc: Expected encoding after Font on line %d of %s\n"
+#~ msgstr "ppdc: После Font в строке %d из %s должна быть указана кодировка.\n"
+
+#~ msgid "ppdc: Expected filename after #po %s on line %d of %s\n"
+#~ msgstr ""
+#~ "ppdc: После #po %s в строке %d из %s должно быть указано имя файла.\n"
+
+#~ msgid "ppdc: Expected group name/text on line %d of %s\n"
+#~ msgstr "ppdc: В строке %d из %s должно быть указанно имя группы/текст.\n"
+
+#~ msgid "ppdc: Expected include filename on line %d of %s\n"
+#~ msgstr "ppdc: В строке %d из %s должно быть указано имя файла.\n"
+
+#~ msgid "ppdc: Expected integer on line %d of %s\n"
+#~ msgstr "ppdc: В строке %d из %s должно быть целое число.\n"
+
+#~ msgid "ppdc: Expected locale after #po on line %d of %s\n"
+#~ msgstr "ppdc: После #po в строке %d из %s должен быть указан регион.\n"
+
+#~ msgid "ppdc: Expected name after %s on line %d of %s\n"
+#~ msgstr "ppdc: После %s в строке %d из %s должно быть указано имя.\n"
+
+#~ msgid "ppdc: Expected name after FileName on line %d of %s\n"
+#~ msgstr "ppdc: После FileName в строке %d из %s должно быть указано имя.\n"
+
+#~ msgid "ppdc: Expected name after Font on line %d of %s\n"
+#~ msgstr "ppdc: После Font в строке %d из %s должно быть указано имя.\n"
+
+#~ msgid "ppdc: Expected name after Manufacturer on line %d of %s\n"
+#~ msgstr ""
+#~ "ppdc: После Manufacturer в строке %d из %s должно быть указано имя.\n"
+
+#~ msgid "ppdc: Expected name after MediaSize on line %d of %s\n"
+#~ msgstr "ppdc: После MediaSize в строке %d из %s должно быть указано имя.\n"
+
+#~ msgid "ppdc: Expected name after ModelName on line %d of %s\n"
+#~ msgstr "ppdc: После ModelName в строке %d из %s должно быть указано имя.\n"
+
+#~ msgid "ppdc: Expected name after PCFileName on line %d of %s\n"
+#~ msgstr "ppdc: После PCFileName в строке %d из %s должно быть указано имя.\n"
+
+#~ msgid "ppdc: Expected name/text after %s on line %d of %s\n"
+#~ msgstr "ppdc: После %s в строке %d из %s должно быть указано имя/текст.\n"
+
+#~ msgid "ppdc: Expected name/text after Installable on line %d of %s\n"
+#~ msgstr ""
+#~ "ppdc: После Installable в строке %d из %s должно быть указано имя/текст.\n"
+
+#~ msgid "ppdc: Expected name/text after Resolution on line %d of %s\n"
+#~ msgstr ""
+#~ "ppdc: После Resolution в строке %d из %s должно быть указано имя/текст.\n"
+
+#~ msgid ""
+#~ "ppdc: Expected name/text combination for ColorModel on line %d of %s\n"
+#~ msgstr ""
+#~ "ppdc: После ColorModel в строке %d из %s должно быть указано имя/текст.\n"
+
+#~ msgid "ppdc: Expected option name/text on line %d of %s\n"
+#~ msgstr "ppdc: В строке %d из %s должно быть указано имя параметра/текст.\n"
+
+#~ msgid "ppdc: Expected option section on line %d of %s\n"
+#~ msgstr "ppdc: В строке %d из %s должен быть указан раздел параметров.\n"
+
+#~ msgid "ppdc: Expected option type on line %d of %s\n"
+#~ msgstr "ppdc: В строке %d из %s должен быть указан тип параметра.\n"
+
+#~ msgid "ppdc: Expected override field after Resolution on line %d of %s\n"
+#~ msgstr ""
+#~ "ppdc: После Resolution в строке %d из %s должно быть поле "
+#~ "переопределения.\n"
+
+#~ msgid "ppdc: Expected real number on line %d of %s\n"
+#~ msgstr "ppdc: В строке %d из %s должно быть действительное число.\n"
+
+#~ msgid ""
+#~ "ppdc: Expected resolution/mediatype following ColorProfile on line %d of "
+#~ "%s\n"
+#~ msgstr ""
+#~ "ppdc: После ColorProfile в строке %d из %s должно быть указано разрешение/"
+#~ "тип носителя.\n"
+
+#~ msgid ""
+#~ "ppdc: Expected resolution/mediatype following SimpleColorProfile on line "
+#~ "%d of %s\n"
+#~ msgstr ""
+#~ "ppdc: После SimpleColorProfile в строке %d из %s должно быть указано "
+#~ "разрешение/тип носителя.\n"
+
+#~ msgid "ppdc: Expected selector after %s on line %d of %s\n"
+#~ msgstr "ppdc: После %s в строке %d из %s должен быть селектор.\n"
+
+#~ msgid "ppdc: Expected status after Font on line %d of %s\n"
+#~ msgstr "ppdc: После Font в строке %d из %s должен быть указан статус.\n"
+
+#~ msgid "ppdc: Expected string after Copyright on line %d of %s\n"
+#~ msgstr "ppdc: В строке %d из %s пропущено значение параметра Copyright.\n"
+
+#~ msgid "ppdc: Expected string after Version on line %d of %s\n"
+#~ msgstr "ppdc: В строке %d из %s пропущено значение параметра Version.\n"
+
+#~ msgid "ppdc: Expected two option names on line %d of %s\n"
+#~ msgstr "ppdc: В строке %d из %s должны быть два имени параметра.\n"
+
+#~ msgid "ppdc: Expected value after %s on line %d of %s\n"
+#~ msgstr "ppdc: После %s в строке %d из %s должно быть значение.\n"
+
+#~ msgid "ppdc: Expected version after Font on line %d of %s\n"
+#~ msgstr "ppdc: после Font в строке %d из %s должна быть указана версия.\n"
+
+#~ msgid "ppdc: Invalid #include/#po filename \"%s\"\n"
+#~ msgstr "ppdc: Неверное имя файла #include/#po \"%s\"\n"
+
+#~ msgid "ppdc: Invalid cost for filter on line %d of %s\n"
+#~ msgstr "ppdc: Затраты на фильтр в строке %d из %s указаны неверно.\n"
+
+#~ msgid "ppdc: Invalid empty MIME type for filter on line %d of %s\n"
+#~ msgstr "ppdc: Недопустимый пустой MIME-тип для фильтра в строке %d из %s.\n"
+
+#~ msgid "ppdc: Invalid empty program name for filter on line %d of %s\n"
+#~ msgstr ""
+#~ "ppdc: Недопустимое пустое имя программы для фильтра в строке %d из %s.\n"
+
+#~ msgid "ppdc: Invalid option section \"%s\" on line %d of %s\n"
+#~ msgstr "ppdc: Неверный раздел параметров \"%s\" в строке %d из %s.\n"
+
+#~ msgid "ppdc: Invalid option type \"%s\" on line %d of %s\n"
+#~ msgstr "ppdc: Неверный тип параметра \"%s\" в строке %d из %s.\n"
+
+#~ msgid "ppdc: Loading driver information file \"%s\"...\n"
+#~ msgstr "ppdc: Загружаю файл с информацией о драйвере «%s»...\n"
+
+#~ msgid "ppdc: Loading messages for locale \"%s\"...\n"
+#~ msgstr "ppdc: Загружаю сообщения для региона «%s»...\n"
+
+#~ msgid "ppdc: Loading messages from \"%s\"...\n"
+#~ msgstr "ppdc: Загружаю сообщения из «%s»...\n"
+
+#~ msgid "ppdc: Missing #endif at end of \"%s\"\n"
+#~ msgstr "ppdc: Отсутствует #endif в конце \"%s\".\n"
+
+#~ msgid "ppdc: Missing #if on line %d of %s\n"
+#~ msgstr "ppdc: Отсутствует #if в строке %d из %s.\n"
+
+#~ msgid "ppdc: No message catalog provided for locale %s\n"
+#~ msgstr "ppdc: Не указан каталог сообщений для региона %s.\n"
+
+#~ msgid "ppdc: Option %s defined in two different groups on line %d of %s\n"
+#~ msgstr ""
+#~ "ppdc: Параметр %s определен в двух разных группах в строке %d из %s.\n"
+
+#~ msgid "ppdc: Option %s redefined with a different type on line %d of %s\n"
+#~ msgstr "ppdc: Для параметра %s определен другой тип в строке %d из %s.\n"
+
+#~ msgid "ppdc: Option constraint must *name on line %d of %s\n"
+#~ msgstr ""
+#~ "ppdc: Для ограничения параметра должно быть указано *name в строке %d из "
+#~ "%s.\n"
+
+#~ msgid "ppdc: Too many nested #if's on line %d of %s\n"
+#~ msgstr "ppdc: Слишком много вложенных операторов #if в строке %d из %s.\n"
+
+#~ msgid "ppdc: Unable to create PPD file \"%s\" - %s.\n"
+#~ msgstr "lpadmin: Не удается создать PPD-файл «%s» – %s\n"
+
+#~ msgid "ppdc: Unable to create output directory %s: %s\n"
+#~ msgstr "ppdc: Не удается создать каталог для выходных данных %s: %s\n"
+
+#~ msgid "ppdc: Unable to create output pipes: %s\n"
+#~ msgstr "ppdc: Не удается создать конвейеры для выходных данных: %s\n"
+
+#~ msgid "ppdc: Unable to execute cupstestppd: %s\n"
+#~ msgstr "ppdc: Не удается выполнить cupstestppd: %s\n"
+
+#~ msgid "ppdc: Unable to find #po file %s on line %d of %s\n"
+#~ msgstr "ppdc: Не удается найти файл #po %s в строке %d из %s.\n"
+
+#~ msgid "ppdc: Unable to find include file \"%s\" on line %d of %s\n"
+#~ msgstr "ppdc: Не удается найти файл \"%s\" в строке %d из %s.\n"
+
+#~ msgid "ppdc: Unable to find localization for \"%s\" - %s\n"
+#~ msgstr "ppdc: Не удается найти локализацию для «%s» - %s\n"
+
+#~ msgid "ppdc: Unable to load localization file \"%s\" - %s\n"
+#~ msgstr "ppdc: Не удается загрузить файл локализации «%s» - %s\n"
+
+#~ msgid "ppdc: Undefined variable (%s) on line %d of %s.\n"
+#~ msgstr "ppdc: Не определена переменная (%s) в строке %d из %s.\n"
+
+#~ msgid "ppdc: Unknown driver type %s on line %d of %s\n"
+#~ msgstr "ppdc: Неизвестный тип драйвера %s в строке %d из %s.\n"
+
+#~ msgid "ppdc: Unknown duplex type \"%s\" on line %d of %s\n"
+#~ msgstr "ppdc: Неизвестный тип дуплекса \"%s\" в строке %d из %s.\n"
+
+#~ msgid "ppdc: Unknown media size \"%s\" on line %d of %s\n"
+#~ msgstr "ppdc: Неизвестный размер носителя \"%s\" в строке %d из %s.\n"
+
+#~ msgid "ppdc: Unknown token \"%s\" seen on line %d of %s\n"
+#~ msgstr "ppdc: Неизвестный маркер  \"%s\" в строке %d из %s.\n"
+
+#~ msgid ""
+#~ "ppdc: Unknown trailing characters in real number \"%s\" on line %d of %s\n"
+#~ msgstr ""
+#~ "ppdc: Неизвестные конечные символы в вещественном числе \"%s\" в строке "
+#~ "%d из %s.\n"
+
+#~ msgid "ppdc: Unterminated string starting with %c on line %d of %s\n"
+#~ msgstr "ppdc: Не завершена строка, начинающаяся с %c в строке %d из %s.\n"
+
+#~ msgid "ppdc: Warning - overlapping filename \"%s\".\n"
+#~ msgstr "ppdc: Внимание - дублирующееся имя \"%s\".\n"
+
+#~ msgid "ppdc: Writing %s...\n"
+#~ msgstr "ppdc: Записываю %s...\n"
+
+#~ msgid "ppdc: Writing PPD files to directory \"%s\"...\n"
+#~ msgstr "ppdc: Записываю PPD-файлы в каталог «%s»...\n"
+
+#~ msgid "ppdmerge: Bad LanguageVersion \"%s\" in %s\n"
+#~ msgstr "ppdmerge: Неверное значение LanguageVersion \"%s\" в %s\n"
+
+#~ msgid "ppdmerge: Ignoring PPD file %s...\n"
+#~ msgstr "ppdmerge: Пропускаю PPD-файл %s...\n"
+
+#~ msgid "ppdmerge: Unable to backup %s to %s- %s\n"
+#~ msgstr "ppdmerge: Не удается создать резервную копию %s на %s- %s\n"
+
+#~ msgid "printer %s disabled since %s -\n"
+#~ msgstr "принтер %s отключен с момента %s -\n"
+
+#~ msgid "printer %s is idle.  enabled since %s\n"
+#~ msgstr "принтер %s свободен. Включен с момента %s\n"
+
+#~ msgid "printer %s now printing %s-%d.  enabled since %s\n"
+#~ msgstr "принтер %s сейчас печатает %s-%d. Включен с момента %s\n"
+
+#~ msgid "printer %s/%s disabled since %s -\n"
+#~ msgstr "принтер %s/%s отключен с момента %s -\n"
+
+#~ msgid "printer %s/%s is idle.  enabled since %s\n"
+#~ msgstr "принтер %s/%s свободен. Включен с момента %s\n"
+
+#~ msgid "printer %s/%s now printing %s-%d.  enabled since %s\n"
+#~ msgstr "принтер %s/%s сейчас печатает %s-%d. Включен с момента %s\n"
+
+#~ msgid "request id is %s-%d (%d file(s))\n"
+#~ msgstr "id запроса %s-%d (%d файл.)\n"
+
+#~ msgid "scheduler is not running\n"
+#~ msgstr "планировщик не запущен\n"
+
+#~ msgid "scheduler is running\n"
+#~ msgstr "планировщик запущен\n"
+
+#~ msgid "status\t\tshow status of daemon and queue\n"
+#~ msgstr "статус\t\tпоказать статус демона и очереди\n"
+
+#~ msgid "system default destination: %s\n"
+#~ msgstr "назначение системы по умолчанию: %s\n"
+
+#~ msgid "system default destination: %s/%s\n"
+#~ msgstr "назначение системы по умолчанию: %s/%s\n"
diff --git a/man/Makefile b/man/Makefile
index 03f98b5d..572bb99b 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 10515 2012-05-25 03:11:46Z mike $"
+# "$Id: Makefile 10710 2012-11-26 18:26:01Z mike $"
 #
 #   Man page makefile for CUPS.
 #
@@ -39,6 +39,7 @@ MAN1	=	cancel.$(MAN1EXT) \
 		ppdpo.$(MAN1EXT)
 MAN5	=	classes.conf.$(MAN5EXT) \
 		client.conf.$(MAN5EXT) \
+		cups-files.conf.$(MAN5EXT) \
 		cups-snmp.conf.$(MAN5EXT) \
 		cupsd.conf.$(MAN5EXT) \
 		ipptoolfile.$(MAN5EXT) \
@@ -236,5 +237,5 @@ mantohtml:	mantohtml.o
 
 
 #
-# End of "$Id: Makefile 10515 2012-05-25 03:11:46Z mike $".
+# End of "$Id: Makefile 10710 2012-11-26 18:26:01Z mike $".
 #
diff --git a/man/backend.man b/man/backend.man
index ab5e7aaa..c1f156e5 100644
--- a/man/backend.man
+++ b/man/backend.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: backend.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: backend.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   Backend man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -166,7 +166,7 @@ All other exit code values are reserved.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: backend.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: backend.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/cancel.man b/man/cancel.man
index a69c6647..c3833ac2 100644
--- a/man/cancel.man
+++ b/man/cancel.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cancel.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: cancel.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   cancel man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -69,7 +69,7 @@ Cancel-Jobs operations in \fIcupsd.conf(5)\fR.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cancel.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: cancel.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/classes.conf.man b/man/classes.conf.man
index 843e7e95..6d7eebbb 100644
--- a/man/classes.conf.man
+++ b/man/classes.conf.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: classes.conf.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: classes.conf.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   classes.conf man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -104,7 +104,7 @@ Specifies the date/time associated with the state.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: classes.conf.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: classes.conf.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/client.conf.man.in b/man/client.conf.man.in
index 6fa94bd0..d1da5d66 100644
--- a/man/client.conf.man.in
+++ b/man/client.conf.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: client.conf.man.in 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: client.conf.man.in 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   client.conf man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -53,7 +53,7 @@ Specifies the default user name to use for requests.
 .SH SEE ALSO
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: client.conf.man.in 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: client.conf.man.in 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/cups-config.man b/man/cups-config.man
index 6fc47d8d..3c75f732 100644
--- a/man/cups-config.man
+++ b/man/cups-config.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cups-config.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: cups-config.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   cups-config man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -111,7 +111,7 @@ Displays the full version number of the CUPS installation
 .SH SEE ALSO
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cups-config.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: cups-config.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/cups-deviced.man.in b/man/cups-deviced.man.in
index 56e761fd..209380e4 100644
--- a/man/cups-deviced.man.in
+++ b/man/cups-deviced.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cups-deviced.man.in 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: cups-deviced.man.in 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   cups-deviced man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -38,7 +38,7 @@ backend(7), cupsd(8), cupsd.conf(5),
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cups-deviced.man.in 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: cups-deviced.man.in 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/cups-driverd.man.in b/man/cups-driverd.man.in
index f0cd27ff..a2ebe445 100644
--- a/man/cups-driverd.man.in
+++ b/man/cups-driverd.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cups-driverd.man.in 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: cups-driverd.man.in 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   cups-driverd man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -116,7 +116,7 @@ cupsd(8), cupsd.conf(5), cupstestppd(1), lpinfo(8),
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cups-driverd.man.in 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: cups-driverd.man.in 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/cups-files.conf.man.in b/man/cups-files.conf.man.in
new file mode 100644
index 00000000..d7658034
--- /dev/null
+++ b/man/cups-files.conf.man.in
@@ -0,0 +1,146 @@
+.\"
+.\" "$Id: cups-files.conf.man.in 10818 2013-01-16 17:41:27Z mike $"
+.\"
+.\"   cupsd.conf man page for CUPS.
+.\"
+.\"   Copyright 2007-2013 by Apple Inc.
+.\"   Copyright 1997-2006 by Easy Software Products.
+.\"
+.\"   These coded instructions, statements, and computer programs are the
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   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 cups-files.conf 5 "CUPS" "19 November 2012" "Apple Inc."
+.SH NAME
+cups-files.conf \- file and directory configuration file for cups
+.SH DESCRIPTION
+The \fIcups-files.conf\fR file configures the files and directories used by the
+CUPS scheduler, \fIcupsd(8)\fR.  It is normally located in the
+\fI@CUPS_SERVERROOT@\fR directory.
+.LP
+Each line in the file can be a configuration directive, a blank line,
+or a comment. Comment lines start with the # character.
+.SH DIRECTIVES
+The following directives are understood by \fIcupsd(8)\fR. Consult the
+on-line help for detailed descriptions:
+.TP 5
+AccessLog filename
+.TP 5
+AccessLog syslog
+.br
+Defines the access log filename.
+.TP 5
+ConfigFilePerm mode
+.br
+Specifies the permissions for all configuration files that the scheduler
+writes.
+.TP 5
+DataDir path
+.br
+Specified the directory where data files can be found.
+.TP 5
+DocumentRoot directory
+.br
+Specifies the root directory for the internal web server documents.
+.TP 5
+ErrorLog filename
+.TP 5
+ErrorLog syslog
+.br
+Specifies the error log filename.
+.TP 5
+FatalErrors none
+.TP 5
+FatalErrors all -kind [... -kind]
+.TP 5
+FatalErrors kind [... kind]
+.br
+Specifies which errors are fatal, causing the scheduler to exit. "Kind" is
+"browse", "config", "listen", "log", or "permissions".
+.TP 5
+FileDevice Yes
+.TP 5
+FileDevice No
+.br
+Specifies whether the file pseudo-device can be used for new
+printer queues.
+.TP 5
+FontPath directory[:directory:...]
+.br
+Specifies the search path for fonts.
+.TP 5
+Group group-name-or-number
+.br
+Specifies the group name or ID that will be used when executing
+external programs.
+.TP 5
+LogFilePerm mode
+.br
+Specifies the permissions for all log files that the scheduler writes.
+.TP 5
+PageLog filename
+.TP 5
+PageLog syslog
+.br
+Specifies the page log filename.
+.TP 5
+Printcap
+.TP 5
+Printcap filename
+.br
+Specifies the filename for a printcap file that is updated
+automatically with a list of available printers (needed for
+legacy applications); specifying Printcap with no filename
+disables printcap generation.
+.TP 5
+RemoteRoot user-name
+.br
+Specifies the username that is associated with unauthenticated root
+accesses.
+.TP 5
+RequestRoot directory
+.br
+Specifies the directory to store print jobs and other HTTP request
+data.
+.TP 5
+ServerBin directory
+.br
+Specifies the directory where backends, CGIs, daemons, and filters may
+be found.
+.TP 5
+ServerCertificate filename
+.br
+Specifies the encryption certificate to use.
+.TP 5
+ServerKey filename
+.br
+Specifies the encryption key to use.
+.TP 5
+ServerRoot directory
+.br
+Specifies the directory where the server configuration files can be found.
+.TP 5
+SystemGroup group-name [group-name ...]
+.br
+Specifies the group(s) to use for System class authentication.
+.TP 5
+TempDir directory
+.br
+Specifies the directory where temporary files are stored.
+.TP 5
+User user-name
+.br
+Specifies the user name or ID that is used when running external programs.
+.SH SEE ALSO
+\fIclasses.conf(5)\fR, \fIcupsd(8)\fR, \fIcupsd.conf(5)\fR, \fImime.convs(5)\fR,
+\fImime.types(5)\fR, \fIprinters.conf(5)\fR,
+\fIsubscriptions.conf(5)\fR,
+.br
+http://localhost:631/help
+.SH COPYRIGHT
+Copyright 2007-2013 by Apple Inc.
+.\"
+.\" End of "$Id: cups-files.conf.man.in 10818 2013-01-16 17:41:27Z mike $".
+.\"
diff --git a/man/cups-lpd.man.in b/man/cups-lpd.man.in
index ebc9fa75..103b7295 100644
--- a/man/cups-lpd.man.in
+++ b/man/cups-lpd.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cups-lpd.man.in 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: cups-lpd.man.in 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   cups-lpd man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -118,7 +118,7 @@ clients may be unreliable.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cups-lpd.man.in 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: cups-lpd.man.in 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/cups-snmp.conf.man b/man/cups-snmp.conf.man
index 140c90b4..e1d13ac6 100644
--- a/man/cups-snmp.conf.man
+++ b/man/cups-snmp.conf.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cups-snmp.conf.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: cups-snmp.conf.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   snmp.conf man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -72,7 +72,7 @@ cups-snmp(8),
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cups-snmp.conf.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: cups-snmp.conf.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/cups-snmp.man.in b/man/cups-snmp.man.in
index da2538f4..c8f8d091 100644
--- a/man/cups-snmp.man.in
+++ b/man/cups-snmp.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cups-snmp.man.in 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: cups-snmp.man.in 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   SNMP backend man page for CUPS.
 .\"
-.\"   Copyright 2012 by Apple Inc.
+.\"   Copyright 2012-2013 by Apple Inc.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
 .\"   property of Apple Inc. and are protected by Federal copyright
@@ -53,7 +53,7 @@ environment variable.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cups-snmp.man.in 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: cups-snmp.man.in 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/cupsaccept.man b/man/cupsaccept.man
index 3405040e..6ee5cc31 100644
--- a/man/cupsaccept.man
+++ b/man/cupsaccept.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupsaccept.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: cupsaccept.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   accept/reject man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -73,7 +73,7 @@ require the root user to execute these commands.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cupsaccept.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: cupsaccept.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/cupsaddsmb.man.in b/man/cupsaddsmb.man.in
index c26858f8..eac6c676 100644
--- a/man/cupsaddsmb.man.in
+++ b/man/cupsaddsmb.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupsaddsmb.man.in 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: cupsaddsmb.man.in 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   cupsaddsmb man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -208,7 +208,7 @@ http://localhost:631/help
 http://www.cups.org/windows/
 
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cupsaddsmb.man.in 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: cupsaddsmb.man.in 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/cupsctl.man b/man/cupsctl.man
index dc301f07..33bb7b6b 100644
--- a/man/cupsctl.man
+++ b/man/cupsctl.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupsctl.man 10544 2012-07-16 17:14:39Z mike $"
+.\" "$Id: cupsctl.man 10807 2013-01-11 21:50:12Z mike $"
 .\"
 .\"   cupsctl man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 2007 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -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 cupsctl 8 "CUPS" "16 July 2012" "Apple Inc."
+.TH cupsctl 8 "CUPS" "11 January 2013" "Apple Inc."
 .SH NAME
 cupsctl \- configure cupsd.conf options
 .SH SYNOPSIS
@@ -82,12 +82,7 @@ Get the current debug logging state:
 .LP
 Disable printer sharing:
 .nf
-    cupsctl --no-shared-printers
-.fi
-.LP
-Enable printing using the file: pseudo-device:
-.nf
-    cupsctl FileDevice=Yes
+    cupsctl --no-share-printers
 .fi
 .SH KNOWN ISSUES
 You cannot set the Listen or Port directives using \fIcupsctl\fR.
@@ -96,7 +91,7 @@ You cannot set the Listen or Port directives using \fIcupsctl\fR.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cupsctl.man 10544 2012-07-16 17:14:39Z mike $".
+.\" End of "$Id: cupsctl.man 10807 2013-01-11 21:50:12Z mike $".
 .\"
diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in
index 4ca249ae..43ab8b79 100644
--- a/man/cupsd.conf.man.in
+++ b/man/cupsd.conf.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupsd.conf.man.in 10482 2012-05-18 19:51:02Z mike $"
+.\" "$Id: cupsd.conf.man.in 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   cupsd.conf man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -12,12 +12,15 @@
 .\"   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" "18 May 2012" "Apple Inc."
+.TH cupsd.conf 5 "CUPS" "19 November 2012" "Apple Inc."
 .SH NAME
 cupsd.conf \- server configuration file for cups
 .SH DESCRIPTION
 The \fIcupsd.conf\fR file configures the CUPS scheduler, \fIcupsd(8)\fR.  It
-is normally located in the \fI@CUPS_SERVERROOT@\fR directory.
+is normally located in the \fI@CUPS_SERVERROOT@\fR directory. \fBNote:\fR
+File, directory, and user configuration directives that used to be allowed in
+the \fIcupsd.conf\fR file are now stored in the \fIcups-files.conf(5)\fR instead
+in order to prevent certain types of privilege escalation attacks.
 .LP
 Each line in the file can be a configuration directive, a blank line,
 or a comment. Comment lines start with the # character. The
@@ -27,12 +30,6 @@ popular Apache web server software and are described below.
 The following directives are understood by \fIcupsd(8)\fR. Consult the
 on-line help for detailed descriptions:
 .TP 5
-AccessLog filename
-.TP 5
-AccessLog syslog
-.br
-Defines the access log filename.
-.TP 5
 AccessLogLevel config
 .TP 5
 AccessLogLevel actions
@@ -61,20 +58,6 @@ Allow @LOCAL
 .br
 Allows access from the named hosts or addresses.
 .TP 5
-AuthClass User
-.TP 5
-AuthClass Group
-.TP 5
-AuthClass System
-.br
-Specifies the authentication class (User, Group, System) -
-\fBthis directive is deprecated\fR.
-.TP 5
-AuthGroupName group-name
-.br
-Specifies the authentication group - \fBthis directive is
-deprecated\fR.
-.TP 5
 AuthType None
 .TP 5
 AuthType Basic
@@ -108,7 +91,7 @@ Browsing Yes
 .TP 5
 Browsing No
 .br
-Specifies whether or not remote printer browsing should be enabled.
+Specifies whether or not shared printers should be advertised.
 .TP 5
 Classification banner
 .br
@@ -121,15 +104,6 @@ ClassifyOverride No
 Specifies whether to allow users to override the classification
 of individual print jobs.
 .TP 5
-ConfigFilePerm mode
-.br
-Specifies the permissions for all configuration files that the scheduler
-writes.
-.TP 5
-DataDir path
-.br
-Specified the directory where data files can be found.
-.TP 5
 DefaultAuthType Basic
 .TP 5
 DefaultAuthType BasicDigest
@@ -197,10 +171,6 @@ 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.
-.TP 5
 Encryption IfRequested
 .TP 5
 Encryption Never
@@ -210,28 +180,6 @@ Encryption Required
 Specifies the level of encryption that is required for a particular
 location.
 .TP 5
-ErrorLog filename
-.TP 5
-ErrorLog syslog
-.br
-Specifies the error log filename.
-.TP 5
-FatalErrors none
-.TP 5
-FatalErrors all -kind [... -kind]
-.TP 5
-FatalErrors kind [... kind]
-.br
-Specifies which errors are fatal, causing the scheduler to exit. "Kind" is
-"browse", "config", "listen", "log", or "permissions".
-.TP 5
-FileDevice Yes
-.TP 5
-FileDevice No
-.br
-Specifies whether the file pseudo-device can be used for new
-printer queues.
-.TP 5
 FilterLimit limit
 .br
 Specifies the maximum cost of filters that are run concurrently.
@@ -241,15 +189,6 @@ FilterNice nice-value
 Specifies the scheduling priority ("nice" value) of filters that
 are run to print a job.
 .TP 5
-FontPath directory[:directory:...]
-.br
-Specifies the search path for fonts.
-.TP 5
-Group group-name-or-number
-.br
-Specifies the group name or ID that will be used when executing
-external programs.
-.TP 5
 GSSServiceName name
 .br
 Specifies the service name when using Kerberos authentication. The default
@@ -341,10 +280,6 @@ LogDebugHistory #-messages
 Specifies the number of debugging messages that are logged when an error
 occurs in a print job.
 .TP 5
-LogFilePerm mode
-.br
-Specifies the permissions for all log files that the scheduler writes.
-.TP 5
 LogLevel alert
 .TP 5
 LogLevel crit
@@ -429,12 +364,6 @@ Order deny,allow
 .br
 Specifies the order of HTTP access control (allow,deny or deny,allow)
 .TP 5
-PageLog filename
-.TP 5
-PageLog syslog
-.br
-Specifies the page log filename.
-.TP 5
 PageLogFormat format string
 .br
 Specifies the format of page log lines.
@@ -464,15 +393,6 @@ PreserveJobHistory No
 Specifies whether or not to preserve the job history after they are
 printed.
 .TP 5
-Printcap
-.TP 5
-Printcap filename
-.br
-Specifies the filename for a printcap file that is updated
-automatically with a list of available printers (needed for
-legacy applications); specifying Printcap with no filename
-disables printcap generation.
-.TP 5
 PrintcapFormat bsd
 .TP 5
 PrintcapFormat plist
@@ -481,29 +401,11 @@ PrintcapFormat solaris
 .br
 Specifies the format of the printcap file.
 .TP 5
-PrintcapGUI
-.TP 5
-PrintcapGUI gui-program-filename
-.br
-Specifies whether to generate option panel definition files on
-some operating systems. When provided with no program filename,
-disables option panel definition files.
-.TP 5
 ReloadTimeout seconds
 .br
 Specifies the amount of time to wait for job completion before
 restarting the scheduler.
 .TP 5
-RemoteRoot user-name
-.br
-Specifies the username that is associated with unauthenticated root
-accesses.
-.TP 5
-RequestRoot directory
-.br
-Specifies the directory to store print jobs and other HTTP request
-data.
-.TP 5
 Require group group-name-list
 .TP 5
 Require user user-name-list
@@ -535,27 +437,10 @@ ServerAlias *
 Specifies an alternate name that the server is known by. The special name "*"
 allows any name to be used.
 .TP 5
-ServerBin directory
-.br
-Specifies the directory where backends, CGIs, daemons, and filters may
-be found.
-.TP 5
-ServerCertificate filename
-.br
-Specifies the encryption certificate to use.
-.TP 5
-ServerKey filename
-.br
-Specifies the encryption key to use.
-.TP 5
 ServerName hostname-or-ip-address
 .br
 Specifies the fully-qualified hostname of the server.
 .TP 5
-ServerRoot directory
-.br
-Specifies the directory where the server configuration files can be found.
-.TP 5
 ServerTokens Full
 .TP 5
 ServerTokens Major
@@ -619,34 +504,22 @@ Specifies the list of job values to make private. The "default" values are
 "notify-events", "notify-pull-method", "notify-recipient-uri",
 "notify-subscriber-user-name", and "notify-user-data".
 .TP 5
-SystemGroup group-name [group-name ...]
-.br
-Specifies the group(s) to use for System class authentication.
-.TP 5
-TempDir directory
-.br
-Specifies the directory where temporary files are stored.
-.TP 5
 Timeout seconds
 .br
 Specifies the HTTP request timeout in seconds.
 .TP 5
-User user-name
-.br
-Specifies the user name or ID that is used when running external programs.
-.TP 5
 WebInterface yes
 .TP 5
 WebInterface no
 Specifies whether the web interface is enabled.
 .SH SEE ALSO
-\fIclasses.conf(5)\fR, \fIcupsd(8)\fR, \fImime.convs(5)\fR,
-\fImime.types(5)\fR, \fIprinters.conf(5)\fR,
+\fIclasses.conf(5)\fR, \fIcups-files.conf(5)\fR, \fIcupsd(8)\fR,
+\fImime.convs(5)\fR, \fImime.types(5)\fR, \fIprinters.conf(5)\fR,
 \fIsubscriptions.conf(5)\fR,
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cupsd.conf.man.in 10482 2012-05-18 19:51:02Z mike $".
+.\" End of "$Id: cupsd.conf.man.in 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/cupsd.man.in b/man/cupsd.man.in
index c7768dba..4d1edb18 100644
--- a/man/cupsd.man.in
+++ b/man/cupsd.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupsd.man.in 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: cupsd.man.in 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   cupsd man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -66,7 +66,7 @@ operations.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cupsd.man.in 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: cupsd.man.in 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/cupsenable.man b/man/cupsenable.man
index f2616eec..8e774119 100644
--- a/man/cupsenable.man
+++ b/man/cupsenable.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupsenable.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: cupsenable.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   cupsenable/cupsdisable man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -86,8 +86,8 @@ require the root user to execute these commands.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 
 .\"
-.\" End of "$Id: cupsenable.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: cupsenable.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/cupsfilter.man b/man/cupsfilter.man
index f791ec8b..c8ae719f 100644
--- a/man/cupsfilter.man
+++ b/man/cupsfilter.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupsfilter.man 10525 2012-06-20 15:59:17Z mike $"
+.\" "$Id: cupsfilter.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   cupsfilter man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
 .\"   property of Apple Inc. and are protected by Federal copyright
@@ -103,7 +103,7 @@ Delete the PPD file after conversion.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cupsfilter.man 10525 2012-06-20 15:59:17Z mike $".
+.\" End of "$Id: cupsfilter.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/cupstestdsc.man b/man/cupstestdsc.man
index b834eb11..27cd9134 100644
--- a/man/cupstestdsc.man
+++ b/man/cupstestdsc.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupstestdsc.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: cupstestdsc.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   cupstestdsc man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -44,7 +44,7 @@ http://localhost:631/help
 Adobe PostScript Language Document Structuring Conventions
 Specification, Version 3.0.
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cupstestdsc.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: cupstestdsc.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/cupstestppd.man b/man/cupstestppd.man
index 2c44ce78..56913935 100644
--- a/man/cupstestppd.man
+++ b/man/cupstestppd.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupstestppd.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: cupstestppd.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   cupstestppd man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -159,7 +159,7 @@ http://localhost:631/help
 .br
 Adobe PostScript Printer Description File Format Specification, Version 4.3.
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: cupstestppd.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: cupstestppd.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/filter.man b/man/filter.man
index b95283ac..99550537 100644
--- a/man/filter.man
+++ b/man/filter.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: filter.man 10485 2012-05-18 20:17:41Z mike $"
+.\" "$Id: filter.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   filter man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2007 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -232,7 +232,7 @@ only filter.  Typically the interface script will be provided via the
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: filter.man 10485 2012-05-18 20:17:41Z mike $".
+.\" End of "$Id: filter.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/ipptool.man b/man/ipptool.man
index 81c83ef6..d7ae869b 100644
--- a/man/ipptool.man
+++ b/man/ipptool.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: ipptool.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: ipptool.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   ipptool man page for CUPS.
 .\"
-.\"   Copyright 2010-2012 by Apple Inc.
+.\"   Copyright 2010-2013 by Apple Inc.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
 .\"   property of Apple Inc. and are protected by Federal copyright
@@ -137,7 +137,7 @@ The following standard files are available:
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: ipptool.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: ipptool.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/ipptoolfile.man b/man/ipptoolfile.man
index aa667c16..e03ef929 100644
--- a/man/ipptoolfile.man
+++ b/man/ipptoolfile.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: ipptoolfile.man 10461 2012-05-11 23:01:21Z mike $"
+.\" "$Id: ipptoolfile.man 10789 2013-01-10 16:51:10Z mike $"
 .\"
 .\"   ipptoolfile man page for CUPS.
 .\"
-.\"   Copyright 2010-2012 by Apple Inc.
+.\"   Copyright 2010-2013 by Apple Inc.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
 .\"   property of Apple Inc. and are protected by Federal copyright
@@ -11,12 +11,12 @@
 .\"   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 ipptoolfile 5 "CUPS" "11 May 2012" "Apple Inc."
+.TH ipptoolfile 5 "CUPS" "10 January 2013" "Apple Inc."
 .SH NAME
 ipptoolfile \- ipptool file format
 
 .SH DESCRIPTION
-The \fIipptool(1)\fR program accepts free-form plain text files that describe one or more IPP requests. Comments start with the "#" character and continue to the end of the line. Each request is enclosed by curley braces, for example:
+The \fIipptool(1)\fR program accepts free-form plain text files that describe one or more IPP requests. Comments start with the "#" character and continue to the end of the line. Each request is enclosed by curly braces, for example:
 .nf
 
     # This is a comment
@@ -323,6 +323,12 @@ Requires that at least one value of the EXPECT attribute matches the regular exp
 .SH STATUS PREDICATES
 The following predicates are understood following the STATUS test directive:
 .TP 5
+DEFINE-MATCH variable-name
+Defines the variable to "1" when the STATUS matches. A side-effect of this predicate is that this STATUS will never fail a test.
+.TP 5
+DEFINE-NO-MATCH variable-name
+Defines the variable to "1" when the STATUS does not match. A side-effect of this predicate is that this STATUS will never fail a test.
+.TP 5
 IF-DEFINED variable-name
 Makes the STATUS apply only if the specified variable is defined.
 .TP 5
@@ -538,7 +544,7 @@ $scheme
 Inserts the scheme from the URI provided to \fIipptool\fR.
 .TP 5
 $notify-subscription-id
-Inserts the last notify-subscription-id value returnd in a test response or 0 if
+Inserts the last notify-subscription-id value returned in a test response or 0 if
 no notify-subscription-id has been seen.
 .TP 5
 $port
@@ -562,7 +568,7 @@ Inserts the username from the URI provided to \fIipptool\fR, if any.
 http://localhost:631/help
 
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: ipptoolfile.man 10461 2012-05-11 23:01:21Z mike $".
+.\" End of "$Id: ipptoolfile.man 10789 2013-01-10 16:51:10Z mike $".
 .\"
diff --git a/man/lp.man b/man/lp.man
index f9c904d9..0c5b54a2 100644
--- a/man/lp.man
+++ b/man/lp.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lp.man 10541 2012-07-16 16:53:26Z mike $"
+.\" "$Id: lp.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   lp man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -246,7 +246,7 @@ is highest priority).
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: lp.man 10541 2012-07-16 16:53:26Z mike $".
+.\" End of "$Id: lp.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/lpadmin.man b/man/lpadmin.man
index 7ccd2940..3a8d3966 100644
--- a/man/lpadmin.man
+++ b/man/lpadmin.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpadmin.man 10542 2012-07-16 16:56:04Z mike $"
+.\" "$Id: lpadmin.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   lpadmin man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -221,7 +221,7 @@ System V or Solaris printing system configuration options.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: lpadmin.man 10542 2012-07-16 16:56:04Z mike $".
+.\" End of "$Id: lpadmin.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/lpc.man b/man/lpc.man
index 60ae768f..d60bc6c3 100644
--- a/man/lpc.man
+++ b/man/lpc.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpc.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: lpc.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   lpc man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -65,7 +65,7 @@ standard Berkeley or LPRng commands.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: lpc.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: lpc.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/lpinfo.man b/man/lpinfo.man
index be031217..08aa5af2 100644
--- a/man/lpinfo.man
+++ b/man/lpinfo.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpinfo.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: lpinfo.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   lpinfo man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -109,7 +109,7 @@ The \fIlpinfo\fR command is unique to CUPS.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: lpinfo.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: lpinfo.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/lpmove.man b/man/lpmove.man
index 9cc1a53c..3507c416 100644
--- a/man/lpmove.man
+++ b/man/lpmove.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpmove.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: lpmove.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   lpmove man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -60,7 +60,7 @@ Specifies an alternate server.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: lpmove.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: lpmove.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/lpoptions.man.in b/man/lpoptions.man.in
index d59e60c3..6de7db91 100644
--- a/man/lpoptions.man.in
+++ b/man/lpoptions.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpoptions.man.in 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: lpoptions.man.in 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   lpoptions man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -129,7 +129,7 @@ created by the root user.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: lpoptions.man.in 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: lpoptions.man.in 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/lppasswd.man b/man/lppasswd.man
index a1136070..81d8b0fa 100644
--- a/man/lppasswd.man
+++ b/man/lppasswd.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lppasswd.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: lppasswd.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   lpadmin man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -62,7 +62,7 @@ accounts managed by PAM instead.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: lppasswd.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: lppasswd.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/lpq.man b/man/lpq.man
index ceafabcf..561537af 100644
--- a/man/lpq.man
+++ b/man/lpq.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpq.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: lpq.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   lpq man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -66,7 +66,7 @@ Requests a more verbose (long) reporting format.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: lpq.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: lpq.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/lpr.man b/man/lpr.man
index 25c294c2..4e35c401 100644
--- a/man/lpr.man
+++ b/man/lpr.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpr.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: lpr.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   lpr man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -116,7 +116,7 @@ are not supported by CUPS and produce a warning message if used.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: lpr.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: lpr.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/lprm.man b/man/lprm.man
index 2ae0058b..76661217 100644
--- a/man/lprm.man
+++ b/man/lprm.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lprm.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: lprm.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   lprm man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -59,7 +59,7 @@ Berkeley \fIlprm\fR command.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: lprm.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: lprm.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/lpstat.man b/man/lpstat.man
index 9302e290..047fdfde 100644
--- a/man/lpstat.man
+++ b/man/lpstat.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpstat.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: lpstat.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   lpstat man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -137,7 +137,7 @@ The Solaris "-f", "-P", and "-S" options are silently ignored.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: lpstat.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: lpstat.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/mailto.conf.man b/man/mailto.conf.man
index c5551d61..d8bd046f 100644
--- a/man/mailto.conf.man
+++ b/man/mailto.conf.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: mailto.conf.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: mailto.conf.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   mailto.conf man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -54,7 +54,7 @@ Specifies a prefix string for the subject line of an email notification.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: mailto.conf.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: mailto.conf.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/mime.convs.man b/man/mime.convs.man
index b9f74874..0461498e 100644
--- a/man/mime.convs.man
+++ b/man/mime.convs.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: mime.convs.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: mime.convs.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   mime.convs man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -40,7 +40,7 @@ application/postscript application/vnd.cups-raster 50 pstoraster
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: mime.convs.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: mime.convs.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/mime.types.man b/man/mime.types.man
index cf85f057..3e35698c 100644
--- a/man/mime.types.man
+++ b/man/mime.types.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: mime.types.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: mime.types.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   mime.types man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -109,7 +109,7 @@ higher priority than "text/bar", "text/foo" will be chosen instead.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: mime.types.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: mime.types.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/notifier.man b/man/notifier.man
index 39bf9125..1db0da94 100644
--- a/man/notifier.man
+++ b/man/notifier.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: notifier.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: notifier.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   notifier man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2007 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -151,7 +151,7 @@ file for the current setting.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: notifier.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: notifier.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/ppdc.man b/man/ppdc.man
index f8696d22..5436f94f 100644
--- a/man/ppdc.man
+++ b/man/ppdc.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: ppdc.man 10306 2012-02-16 05:31:55Z mike $"
+.\" "$Id: ppdc.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   ppdc man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2007 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -75,7 +75,7 @@ ppdhtml(1), ppdi(1), ppdmerge(1), ppdpo(1), ppdcfile(5)
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: ppdc.man 10306 2012-02-16 05:31:55Z mike $".
+.\" End of "$Id: ppdc.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/ppdcfile.man b/man/ppdcfile.man
index 3d019eab..57e5d08e 100644
--- a/man/ppdcfile.man
+++ b/man/ppdcfile.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: ppdcfile.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: ppdcfile.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   ppdcfile man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2007 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -12,22 +12,21 @@
 .\"   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 ppdcfile 5 "CUPS" "20 May 2008" "Apple Inc."
+.TH ppdcfile 5 "CUPS" "3 December 2012" "Apple Inc."
 .SH NAME
 ppdcfile \- cups ppd compiler source file format
 .SH DESCRIPTION
 The CUPS PPD compiler reads meta files that contain descriptions
 of one or more PPD files to be generated by \fIppdc\fR. This man
 page provides a quick reference to the supported keywords and
-should be used in conjuction with the Common UNIX Printing System
-Developers Manual.
+should be used in conjunction with the online help for CUPS.
 .PP
 The source file format is plain ASCII text that can be edited
 using your favorite text editor. Comments are supported using
 the C (/* ... */) and C++ (// ...) comment mechanisms.
 .PP
 Printer driver information can be grouped and shared using
-curley braces ({ ... }); PPD files are written when a close
+curly braces ({ ... }); PPD files are written when a close
 brace or end-of-file is seen and a PCFileName directive has been
 defined.
 .PP
@@ -165,7 +164,7 @@ ppdc(1), ppdhtml(1), ppdi(1), ppdmerge(1), ppdpo(1)
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: ppdcfile.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: ppdcfile.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/ppdhtml.man b/man/ppdhtml.man
index 4918ab85..fe869742 100644
--- a/man/ppdhtml.man
+++ b/man/ppdhtml.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: ppdhtml.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: ppdhtml.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   ppdhtml man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2007 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -40,7 +40,7 @@ ppdc(1), ppdcfile(5), ppdi(1), ppdmerge(1), ppdpo(1)
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: ppdhtml.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: ppdhtml.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/ppdi.man b/man/ppdi.man
index 90eb58af..65cf2ad1 100644
--- a/man/ppdi.man
+++ b/man/ppdi.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: ppdi.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: ppdi.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   ppdi man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2007 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -40,7 +40,7 @@ ppdc(1), ppdhtml(1), ppdmerge(1), ppdpo(1), ppdcfile(5)
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: ppdi.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: ppdi.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/ppdmerge.man b/man/ppdmerge.man
index f579c6bb..9df39a90 100644
--- a/man/ppdmerge.man
+++ b/man/ppdmerge.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: ppdmerge.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: ppdmerge.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   ppdmerge man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2007 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -41,7 +41,7 @@ cupsprofile(1), ppdc(1), ppdhtml(1), ppdi(1), ppdpo(1), ppdcfile(5)
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: ppdmerge.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: ppdmerge.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/ppdpo.man b/man/ppdpo.man
index 62441509..9b544a56 100644
--- a/man/ppdpo.man
+++ b/man/ppdpo.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: ppdpo.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: ppdpo.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   ppdpo man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2007 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -46,7 +46,7 @@ ppdc(1), ppdhtml(1), ppdi(1), ppdmerge(1), ppdcfile(5)
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: ppdpo.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: ppdpo.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/printers.conf.man b/man/printers.conf.man
index dcd0e562..82b9a787 100644
--- a/man/printers.conf.man
+++ b/man/printers.conf.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: printers.conf.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: printers.conf.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   printers.conf man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -118,7 +118,7 @@ Specifies the date/time associated with the state.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: printers.conf.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: printers.conf.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/man/subscriptions.conf.man b/man/subscriptions.conf.man
index d8e16e39..68e1d70f 100644
--- a/man/subscriptions.conf.man
+++ b/man/subscriptions.conf.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: subscriptions.conf.man 10424 2012-04-23 17:26:57Z mike $"
+.\" "$Id: subscriptions.conf.man 10791 2013-01-10 16:58:21Z mike $"
 .\"
 .\"   subscriptions.conf man page for CUPS.
 .\"
-.\"   Copyright 2007-2012 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -83,7 +83,7 @@ is typically the "from" address in mailto: notifications.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2012 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: subscriptions.conf.man 10424 2012-04-23 17:26:57Z mike $".
+.\" End of "$Id: subscriptions.conf.man 10791 2013-01-10 16:58:21Z mike $".
 .\"
diff --git a/packaging/cups.list.in b/packaging/cups.list.in
index 3e313b34..9ff8dc49 100644
--- a/packaging/cups.list.in
+++ b/packaging/cups.list.in
@@ -1,5 +1,5 @@
 #
-# "$Id: cups.list.in 10456 2012-05-07 22:41:42Z mike $"
+# "$Id: cups.list.in 10710 2012-11-26 18:26:01Z mike $"
 #
 #   ESP Package Manager (EPM) file list for CUPS.
 #
@@ -293,7 +293,6 @@ f 0555 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
 d 0755 root sys $SERVERBIN/driver -
 d 0755 root sys $SERVERBIN/filter -
 f 0555 root sys $SERVERBIN/filter/commandtops filter/commandtops
@@ -366,8 +365,6 @@ f 0555 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()
 l 0755 root sys $LIBDIR/libcupscgi.sl libcupscgi.sl.1
-f 0555 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()
 l 0755 root sys $LIBDIR/libcupsimage.sl libcupsimage.sl.2
 f 0555 root sys $LIBDIR/libcupsmime.sl.1 scheduler/libcupsmime.sl.1 nostrip()
@@ -377,7 +374,6 @@ 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()
@@ -386,8 +382,6 @@ f 0555 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()
 l 0755 root sys $LIBDIR/libcupscgi.dylib libcupscgi.1.dylib
-f 0555 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()
 l 0755 root sys $LIBDIR/libcupsimage.dylib libcupsimage.2.dylib
 f 0555 root sys $LIBDIR/libcupsmime.1.dylib scheduler/libcupsmime.1.dylib nostrip()
@@ -399,8 +393,6 @@ f 0555 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()
 l 0755 root sys $LIBDIR/libcupscgi.so libcupscgi.so.1
-f 0555 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()
 l 0755 root sys $LIBDIR/libcupsimage.so libcupsimage.so.2
 f 0555 root sys $LIBDIR/libcupsmime.so.1 scheduler/libcupsmime.so.1 nostrip()
@@ -418,7 +410,9 @@ d 1770 root $CUPS_GROUP $REQUESTS/tmp -
 d 0775 root $CUPS_GROUP $CACHEDIR -
 d 0775 root $CUPS_GROUP $CACHEDIR/rss -
 #d 0755 root $CUPS_GROUP $CACHEDIR/ppd -
+%system !darwin
 d 0755 root $CUPS_GROUP $STATEDIR -
+%system all
 d 0511 root $CUPS_PRIMARY_SYSTEM_GROUP $STATEDIR/certs -
 
 # Data files
@@ -530,10 +524,12 @@ f 0444 root sys $DATADIR/templates templates/*.tmpl
 #f 0444 root sys $DATADIR/templates/zh_TW templates/zh_TW/*.tmpl
 
 # Config files
-d 0755 root sys $SERVERROOT -
+d 0755 root $CUPS_GROUP $SERVERROOT -
 d 0755 root $CUPS_GROUP $SERVERROOT/interfaces -
 d 0755 root $CUPS_GROUP $SERVERROOT/ppd -
 d 0700 root $CUPS_GROUP $SERVERROOT/ssl -
+c $CUPS_PERM root $CUPS_GROUP $SERVERROOT/cups-files.conf conf/cups-files.conf
+f $CUPS_PERM root $CUPS_GROUP $SERVERROOT/cups-files.conf.default conf/cups-files.conf
 c $CUPS_PERM root $CUPS_GROUP $SERVERROOT/cupsd.conf conf/cupsd.conf
 f $CUPS_PERM root $CUPS_GROUP $SERVERROOT/cupsd.conf.default conf/cupsd.conf
 c $CUPS_PERM root $CUPS_GROUP $SERVERROOT/snmp.conf conf/snmp.conf
@@ -740,5 +736,5 @@ f 0444 root sys $XINETD/cups-lpd scheduler/cups-lpd.xinetd
 %subpackage
 
 #
-# End of "$Id: cups.list.in 10456 2012-05-07 22:41:42Z mike $".
+# End of "$Id: cups.list.in 10710 2012-11-26 18:26:01Z mike $".
 #
diff --git a/packaging/cups.spec b/packaging/cups.spec
index eae1d12e..42f930bb 100644
--- a/packaging/cups.spec
+++ b/packaging/cups.spec
@@ -1,11 +1,11 @@
 #
-# "$Id: cups.spec.in 10558 2012-07-27 20:33:27Z mike $"
+# "$Id: cups.spec.in 10913 2013-03-18 17:00:03Z mike $"
 #
 #   RPM "spec" file for CUPS.
 #
 #   Original version by Jason McMullan <jmcc@ontv.com>.
 #
-#   Copyright 2007-2012 by Apple Inc.
+#   Copyright 2007-2013 by Apple Inc.
 #   Copyright 1999-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -35,12 +35,12 @@
 
 Summary: CUPS
 Name: cups
-Version: 1.6.1
+Version: 1.6.2
 Release: 1
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
-Source: http://ftp.easysw.com/pub/cups/1.6.1/cups-1.6.1-source.tar.bz2
+Source: http://ftp.easysw.com/pub/cups/1.6.2/cups-1.6.2-source.tar.bz2
 Url: http://www.cups.org
 Packager: Anonymous <anonymous@foo.com>
 Vendor: Apple Inc.
@@ -245,17 +245,29 @@ rm -rf $RPM_BUILD_ROOT
 
 %dir /usr/share/doc/cups/ca
 /usr/share/doc/cups/ca/*
+%dir /usr/share/doc/cups/cs
+/usr/share/doc/cups/cs/*
 %dir /usr/share/doc/cups/es
 /usr/share/doc/cups/es/*
+%dir /usr/share/doc/cups/fr
+/usr/share/doc/cups/fr/*
 %dir /usr/share/doc/cups/ja
 /usr/share/doc/cups/ja/*
+%dir /usr/share/doc/cups/ru
+/usr/share/doc/cups/ru/*
 
 %dir /usr/share/locale/ca
 /usr/share/locale/ca/cups_ca.po
+%dir /usr/share/locale/cs
+/usr/share/locale/cs/cups_cs.po
 %dir /usr/share/locale/es
 /usr/share/locale/es/cups_es.po
+%dir /usr/share/locale/fr
+/usr/share/locale/fr/cups_fr.po
 %dir /usr/share/locale/ja
 /usr/share/locale/ja/cups_ja.po
+%dir /usr/share/locale/ru
+/usr/share/locale/ru/cups_ru.po
 
 %dir /usr/share/man/man1
 /usr/share/man/man1/cancel.1.gz
@@ -349,5 +361,5 @@ rm -rf $RPM_BUILD_ROOT
 
 
 #
-# End of "$Id: cups.spec.in 10558 2012-07-27 20:33:27Z mike $".
+# End of "$Id: cups.spec.in 10913 2013-03-18 17:00:03Z mike $".
 #
diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in
index 35315452..45b45317 100644
--- a/packaging/cups.spec.in
+++ b/packaging/cups.spec.in
@@ -1,11 +1,11 @@
 #
-# "$Id: cups.spec.in 10558 2012-07-27 20:33:27Z mike $"
+# "$Id: cups.spec.in 10913 2013-03-18 17:00:03Z mike $"
 #
 #   RPM "spec" file for CUPS.
 #
 #   Original version by Jason McMullan <jmcc@ontv.com>.
 #
-#   Copyright 2007-2012 by Apple Inc.
+#   Copyright 2007-2013 by Apple Inc.
 #   Copyright 1999-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -245,17 +245,29 @@ rm -rf $RPM_BUILD_ROOT
 
 %dir /usr/share/doc/cups/ca
 /usr/share/doc/cups/ca/*
+%dir /usr/share/doc/cups/cs
+/usr/share/doc/cups/cs/*
 %dir /usr/share/doc/cups/es
 /usr/share/doc/cups/es/*
+%dir /usr/share/doc/cups/fr
+/usr/share/doc/cups/fr/*
 %dir /usr/share/doc/cups/ja
 /usr/share/doc/cups/ja/*
+%dir /usr/share/doc/cups/ru
+/usr/share/doc/cups/ru/*
 
 %dir /usr/share/locale/ca
 /usr/share/locale/ca/cups_ca.po
+%dir /usr/share/locale/cs
+/usr/share/locale/cs/cups_cs.po
 %dir /usr/share/locale/es
 /usr/share/locale/es/cups_es.po
+%dir /usr/share/locale/fr
+/usr/share/locale/fr/cups_fr.po
 %dir /usr/share/locale/ja
 /usr/share/locale/ja/cups_ja.po
+%dir /usr/share/locale/ru
+/usr/share/locale/ru/cups_ru.po
 
 %dir /usr/share/man/man1
 /usr/share/man/man1/cancel.1.gz
@@ -349,5 +361,5 @@ rm -rf $RPM_BUILD_ROOT
 
 
 #
-# End of "$Id: cups.spec.in 10558 2012-07-27 20:33:27Z mike $".
+# End of "$Id: cups.spec.in 10913 2013-03-18 17:00:03Z mike $".
 #
diff --git a/ppdc/ppdc-driver.cxx b/ppdc/ppdc-driver.cxx
index 5235f441..6714ab14 100644
--- a/ppdc/ppdc-driver.cxx
+++ b/ppdc/ppdc-driver.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: ppdc-driver.cxx 9793 2011-05-20 03:49:49Z mike $"
+// "$Id: ppdc-driver.cxx 10803 2013-01-11 20:59:59Z mike $"
 //
 //   PPD file compiler definitions for the CUPS PPD Compiler.
 //
@@ -1025,7 +1025,16 @@ ppdcDriver::write_ppd_file(
       if (!o->choices->count)
         continue;
 
-      if (!o->text->value)
+      if (o->section == PPDC_SECTION_JCL)
+      {
+	if (!o->text->value)
+	  cupsFilePrintf(fp, "*JCLOpenUI *%s/%s: ", o->name->value,
+			 catalog->find_message(o->name->value));
+	else
+	  cupsFilePrintf(fp, "*JCLOpenUI *%s/%s: ", o->name->value,
+			 catalog->find_message(o->text->value));
+      }
+      else if (!o->text->value)
 	cupsFilePrintf(fp, "*OpenUI *%s/%s: ", o->name->value,
 	               catalog->find_message(o->name->value));
       else
@@ -1335,5 +1344,5 @@ ppdcDriver::write_ppd_file(
 
 
 //
-// End of "$Id: ppdc-driver.cxx 9793 2011-05-20 03:49:49Z mike $".
+// End of "$Id: ppdc-driver.cxx 10803 2013-01-11 20:59:59Z mike $".
 //
diff --git a/scheduler/auth.c b/scheduler/auth.c
index 5791c025..a82a605e 100644
--- a/scheduler/auth.c
+++ b/scheduler/auth.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: auth.c 10376 2012-03-22 20:53:47Z mike $"
+ * "$Id: auth.c 10776 2012-12-17 22:17:08Z mike $"
  *
  *   Authorization routines for the CUPS scheduler.
  *
@@ -89,14 +89,13 @@ extern const char *cssmErrorString(int error);
 typedef struct xucred cupsd_ucred_t;
 #  define CUPSD_UCRED_UID(c) (c).cr_uid
 #else
+#  ifndef __OpenBSD__
 typedef struct ucred cupsd_ucred_t;
+#  else
+typedef struct sockpeercred cupsd_ucred_t;
+#  endif
 #  define CUPSD_UCRED_UID(c) (c).uid
 #endif /* HAVE_SYS_UCRED_H */
-#ifdef HAVE_KRB5_IPC_CLIENT_SET_TARGET_UID
-/* Not in public headers... */
-extern void	krb5_ipc_client_set_target_uid(uid_t);
-extern void	krb5_ipc_client_clear_target(void);
-#endif /* HAVE_KRB5_IPC_CLIENT_SET_TARGET_UID */
 
 
 /*
@@ -593,15 +592,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
     while (isspace(*authorization & 255))
       authorization ++;
 
-    if ((localuser = cupsdFindCert(authorization)) != NULL)
-    {
-      strlcpy(username, localuser->username, sizeof(username));
-
-      cupsdLogMessage(CUPSD_LOG_DEBUG,
-		      "[Client %d] Authorized as %s using Local", con->http.fd,
-		      username);
-    }
-    else
+    if ((localuser = cupsdFindCert(authorization)) == NULL)
     {
       cupsdLogMessage(CUPSD_LOG_ERROR,
                       "[Client %d] Local authentication certificate not found.",
@@ -609,12 +600,12 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
       return;
     }
 
-#ifdef HAVE_GSSAPI
-    if (localuser->ccache)
-      con->type = CUPSD_AUTH_NEGOTIATE;
-    else
-#endif /* HAVE_GSSAPI */
-      con->type = CUPSD_AUTH_BASIC;
+    strlcpy(username, localuser->username, sizeof(username));
+    con->type = localuser->type;
+
+    cupsdLogMessage(CUPSD_LOG_DEBUG,
+		    "[Client %d] Authorized as %s using Local", con->http.fd,
+		    username);
   }
   else if (!strncmp(authorization, "Basic", 5))
   {
@@ -2597,5 +2588,5 @@ to64(char          *s,			/* O - Output string */
 
 
 /*
- * End of "$Id: auth.c 10376 2012-03-22 20:53:47Z mike $".
+ * End of "$Id: auth.c 10776 2012-12-17 22:17:08Z mike $".
  */
diff --git a/scheduler/cert.c b/scheduler/cert.c
index 1937d35f..5e0f06e1 100644
--- a/scheduler/cert.c
+++ b/scheduler/cert.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: cert.c 10257 2012-02-12 04:34:46Z mike $"
+ * "$Id: cert.c 10776 2012-12-17 22:17:08Z mike $"
  *
  *   Authentication certificate routines for the CUPS scheduler.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -42,7 +42,7 @@
 void
 cupsdAddCert(int        pid,		/* I - Process ID */
              const char *username,	/* I - Username */
-             void       *ccache)	/* I - Kerberos credentials or NULL */
+             int        type)		/* I - AuthType for username */
 {
   int		i;			/* Looping var */
   cupsd_cert_t	*cert;			/* Current certificate */
@@ -66,7 +66,8 @@ cupsdAddCert(int        pid,		/* I - Process ID */
   * Fill in the certificate information...
   */
 
-  cert->pid = pid;
+  cert->pid  = pid;
+  cert->type = type;
   strlcpy(cert->username, username, sizeof(cert->username));
 
   for (i = 0; i < 32; i ++)
@@ -260,16 +261,6 @@ cupsdAddCert(int        pid,		/* I - Process ID */
   close(fd);
 
  /*
-  * Add Kerberos credentials as needed...
-  */
-
-#ifdef HAVE_GSSAPI
-  cert->ccache = (krb5_ccache)ccache;
-#else
-  (void)ccache;
-#endif /* HAVE_GSSAPI */
-
- /*
   * Insert the certificate at the front of the list...
   */
 
@@ -308,15 +299,6 @@ cupsdDeleteCert(int pid)		/* I - Process ID */
       else
         prev->next = cert->next;
 
-#ifdef HAVE_GSSAPI
-     /*
-      * Release Kerberos credentials as needed...
-      */
-
-      if (cert->ccache)
-	krb5_cc_destroy(KerberosContext, cert->ccache);
-#endif /* HAVE_GSSAPI */
-
       free(cert);
 
      /*
@@ -449,10 +431,10 @@ cupsdInitCerts(void)
   */
 
   if (!RunUser)
-    cupsdAddCert(0, "root", NULL);
+    cupsdAddCert(0, "root", cupsdDefaultAuthType());
 }
 
 
 /*
- * End of "$Id: cert.c 10257 2012-02-12 04:34:46Z mike $".
+ * End of "$Id: cert.c 10776 2012-12-17 22:17:08Z mike $".
  */
diff --git a/scheduler/cert.h b/scheduler/cert.h
index e456a1ad..fbec27c8 100644
--- a/scheduler/cert.h
+++ b/scheduler/cert.h
@@ -1,9 +1,9 @@
 /*
- * "$Id: cert.h 9350 2010-11-04 23:23:25Z mike $"
+ * "$Id: cert.h 10776 2012-12-17 22:17:08Z mike $"
  *
  *   Authentication certificate definitions for the CUPS scheduler.
  *
- *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -23,9 +23,7 @@ typedef struct cupsd_cert_s
   int		pid;			/* Process ID (0 for root certificate) */
   char		certificate[33];	/* 32 hex characters, or 128 bits */
   char		username[33];		/* Authenticated username */
-#ifdef HAVE_GSSAPI
-  krb5_ccache	ccache;			/* Kerberos credential cache */
-#endif /* HAVE_GSSAPI */
+  int		type;			/* AuthType for username */
 } cupsd_cert_t;
 
 
@@ -43,8 +41,7 @@ VAR time_t		RootCertTime	/* Root certificate update time */
  * Prototypes...
  */
 
-extern void		cupsdAddCert(int pid, const char *username,
-			             void *ccache);
+extern void		cupsdAddCert(int pid, const char *username, int type);
 extern void		cupsdDeleteCert(int pid);
 extern void		cupsdDeleteAllCerts(void);
 extern cupsd_cert_t	*cupsdFindCert(const char *certificate);
@@ -52,5 +49,5 @@ extern void		cupsdInitCerts(void);
 
 
 /*
- * End of "$Id: cert.h 9350 2010-11-04 23:23:25Z mike $".
+ * End of "$Id: cert.h 10776 2012-12-17 22:17:08Z mike $".
  */
diff --git a/scheduler/client.c b/scheduler/client.c
index 4d42bcea..75ed7578 100644
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: client.c 10455 2012-05-07 22:41:30Z mike $"
+ * "$Id: client.c 10834 2013-01-21 15:29:47Z mike $"
  *
  *   Client routines for the CUPS scheduler.
  *
@@ -32,7 +32,7 @@
  *   compare_clients()	    - Compare two client connections.
  *   data_ready()	    - Check whether data is available from a client.
  *   get_file() 	    - Get a filename and state info.
- *   install_conf_file()    - Install a configuration file.
+ *   install_cupsd_conf()    - Install a configuration file.
  *   is_cgi()		    - Is the resource a CGI script/program?
  *   is_path_absolute()     - Is a path absolute and free of relative elements
  *			      (i.e. "..").
@@ -95,7 +95,7 @@ static int		compare_clients(cupsd_client_t *a, cupsd_client_t *b,
 static int		data_ready(cupsd_client_t *con);
 static char		*get_file(cupsd_client_t *con, struct stat *filestats,
 			          char *filename, int len);
-static http_status_t	install_conf_file(cupsd_client_t *con);
+static http_status_t	install_cupsd_conf(cupsd_client_t *con);
 static int		is_cgi(cupsd_client_t *con, const char *filename,
 		               struct stat *filestats, mime_type_t *type);
 static int		is_path_absolute(const char *path);
@@ -1271,7 +1271,8 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
       switch (con->http.state)
       {
 	case HTTP_GET_SEND :
-            if (!strncmp(con->uri, "/printers/", 10) &&
+            if ((!strncmp(con->uri, "/ppd/", 5) ||
+		 !strncmp(con->uri, "/printers/", 10)) &&
 		!strcmp(con->uri + strlen(con->uri) - 4, ".ppd"))
 	    {
 	     /*
@@ -1281,8 +1282,15 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 
               con->uri[strlen(con->uri) - 4] = '\0';	/* Drop ".ppd" */
 
-              if ((p = cupsdFindPrinter(con->uri + 10)) != NULL)
+	      if (!strncmp(con->uri, "/ppd/", 5))
+		p = cupsdFindPrinter(con->uri + 5);
+	      else
+		p = cupsdFindPrinter(con->uri + 10);
+
+	      if (p)
+	      {
 		snprintf(con->uri, sizeof(con->uri), "/ppd/%s.ppd", p->name);
+	      }
 	      else
 	      {
 		if (!cupsdSendError(con, HTTP_NOT_FOUND, CUPSD_AUTH_NONE))
@@ -1294,7 +1302,8 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 		break;
 	      }
 	    }
-            else if ((!strncmp(con->uri, "/printers/", 10) ||
+            else if ((!strncmp(con->uri, "/icons/", 7) ||
+		      !strncmp(con->uri, "/printers/", 10) ||
 		      !strncmp(con->uri, "/classes/", 9)) &&
 		     !strcmp(con->uri + strlen(con->uri) - 4, ".png"))
 	    {
@@ -1305,7 +1314,9 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 
 	      con->uri[strlen(con->uri) - 4] = '\0';	/* Drop ".png" */
 
-              if (!strncmp(con->uri, "/printers/", 10))
+              if (!strncmp(con->uri, "/icons/", 7))
+                p = cupsdFindPrinter(con->uri + 7);
+              else if (!strncmp(con->uri, "/printers/", 10))
                 p = cupsdFindPrinter(con->uri + 10);
               else
                 p = cupsdFindClass(con->uri + 9);
@@ -1666,17 +1677,14 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	    * Validate the resource name...
 	    */
 
-            if (strncmp(con->uri, "/admin/conf/", 12) ||
-	        strchr(con->uri + 12, '/') ||
-		strlen(con->uri) == 12)
+            if (strcmp(con->uri, "/admin/conf/cupsd.conf"))
 	    {
 	     /*
-	      * PUT can only be done to configuration files under
-	      * /admin/conf...
+	      * PUT can only be done to the cupsd.conf file...
 	      */
 
 	      cupsdLogMessage(CUPSD_LOG_ERROR,
-			      "[Client %d] Request for subdirectory \"%s\".",
+			      "[Client %d] Disallowed PUT request for \"%s\".",
 			      con->http.fd, con->uri);
 
 	      if (!cupsdSendError(con, HTTP_FORBIDDEN, CUPSD_AUTH_NONE))
@@ -2044,7 +2052,7 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
 	  * Install the configuration file...
 	  */
 
-          status = install_conf_file(con);
+          status = install_cupsd_conf(con);
 
          /*
 	  * Return the status to the client...
@@ -2573,14 +2581,7 @@ cupsdSendHeader(
 	       con->http.hostname);
 #ifdef HAVE_GSSAPI
     else if (auth_type == CUPSD_AUTH_NEGOTIATE)
-    {
-#  ifdef AF_LOCAL
-      if (_httpAddrFamily(con->http.hostaddr) == AF_LOCAL)
-        strlcpy(auth_str, "Basic realm=\"CUPS\"", sizeof(auth_str));
-      else
-#  endif /* AF_LOCAL */
       strlcpy(auth_str, "Negotiate", sizeof(auth_str));
-    }
 #endif /* HAVE_GSSAPI */
 
     if (con->best && auth_type != CUPSD_AUTH_NEGOTIATE &&
@@ -3301,14 +3302,13 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
 
 
 /*
- * 'install_conf_file()' - Install a configuration file.
+ * 'install_cupsd_conf()' - Install a configuration file.
  */
 
 static http_status_t			/* O - Status */
-install_conf_file(cupsd_client_t *con)	/* I - Connection */
+install_cupsd_conf(cupsd_client_t *con)	/* I - Connection */
 {
   char		filename[1024];		/* Configuration filename */
-  mode_t	mode;			/* Permissions */
   cups_file_t	*in,			/* Input file */
 		*out;			/* Output file */
   char		buffer[16384];		/* Copy buffer */
@@ -3330,19 +3330,14 @@ install_conf_file(cupsd_client_t *con)	/* I - Connection */
   * Open the new config file...
   */
 
-  snprintf(filename, sizeof(filename), "%s%s", ServerRoot, con->uri + 11);
-  if (!strcmp(con->uri, "/admin/conf/printers.conf"))
-    mode = ConfigFilePerm & 0600;
-  else
-    mode = ConfigFilePerm;
-
-  if ((out = cupsdCreateConfFile(filename, mode)) == NULL)
+  if ((out = cupsdCreateConfFile(ConfigurationFile, ConfigFilePerm)) == NULL)
   {
     cupsFileClose(in);
     return (HTTP_SERVER_ERROR);
   }
 
-  cupsdLogMessage(CUPSD_LOG_INFO, "Installing config file \"%s\"...", filename);
+  cupsdLogMessage(CUPSD_LOG_INFO, "Installing config file \"%s\"...",
+                  ConfigurationFile);
 
  /*
   * Copy from the request to the new config file...
@@ -3353,12 +3348,12 @@ install_conf_file(cupsd_client_t *con)	/* I - Connection */
     {
       cupsdLogMessage(CUPSD_LOG_ERROR,
                       "Unable to copy to config file \"%s\": %s",
-        	      filename, strerror(errno));
+        	      ConfigurationFile, strerror(errno));
 
       cupsFileClose(in);
       cupsFileClose(out);
 
-      snprintf(filename, sizeof(filename), "%s%s.N", ServerRoot, con->uri + 11);
+      snprintf(filename, sizeof(filename), "%s.N", ConfigurationFile);
       cupsdRemoveFile(filename);
 
       return (HTTP_SERVER_ERROR);
@@ -3370,7 +3365,7 @@ install_conf_file(cupsd_client_t *con)	/* I - Connection */
 
   cupsFileClose(in);
 
-  if (cupsdCloseCreatedConfFile(out, filename))
+  if (cupsdCloseCreatedConfFile(out, ConfigurationFile))
     return (HTTP_SERVER_ERROR);
 
  /*
@@ -3381,14 +3376,10 @@ install_conf_file(cupsd_client_t *con)	/* I - Connection */
   cupsdClearString(&con->filename);
 
  /*
-  * If the cupsd.conf file was updated, set the NeedReload flag...
+  * Set the NeedReload flag...
   */
 
-  if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
-    NeedReload = RELOAD_CUPSD;
-  else
-    NeedReload = RELOAD_ALL;
-
+  NeedReload = RELOAD_CUPSD;
   ReloadTime = time(NULL);
 
  /*
@@ -3621,7 +3612,6 @@ pipe_command(cupsd_client_t *con,	/* I - Client connection */
 		server_name[1024],	/* SERVER_NAME environment variable */
 		server_port[1024];	/* SERVER_PORT environment variable */
   ipp_attribute_t *attr;		/* attributes-natural-language attribute */
-  void		*ccache = NULL;		/* Kerberos credentials */
 
 
  /*
@@ -3973,7 +3963,7 @@ pipe_command(cupsd_client_t *con,	/* I - Client connection */
     */
 
     if (con->username[0])
-      cupsdAddCert(pid, con->username, ccache);
+      cupsdAddCert(pid, con->username, con->type);
 
     cupsdLogMessage(CUPSD_LOG_DEBUG, "[CGI] Started %s (PID %d)", command, pid);
 
@@ -4021,7 +4011,7 @@ valid_host(cupsd_client_t *con)		/* I - Client connection */
 	    !strncmp(host, "[::1]:", 6));
   }
 
-#ifdef HAVE_DNSSD
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
  /*
   * Check if the hostname is something.local (Bonjour); if so, allow it.
   */
@@ -4040,7 +4030,7 @@ valid_host(cupsd_client_t *con)		/* I - Client connection */
 	      !_cups_strcasecmp(end, ".local.") ||
 	      !_cups_strncasecmp(end, ".local.:", 8)))
     return (1);
-#endif /* HAVE_DNSSD */
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
 
  /*
   * Check if the hostname is an IP address...
@@ -4101,7 +4091,7 @@ valid_host(cupsd_client_t *con)		/* I - Client connection */
     }
   }
 
-#ifdef HAVE_DNSSD
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
   for (a = (cupsd_alias_t *)cupsArrayFirst(DNSSDAlias);
        a;
        a = (cupsd_alias_t *)cupsArrayNext(DNSSDAlias))
@@ -4126,7 +4116,7 @@ valid_host(cupsd_client_t *con)		/* I - Client connection */
         return (1);
     }
   }
-#endif /* HAVE_DNSSD */
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
 
  /*
   * Check for interface hostname matches...
@@ -4228,5 +4218,5 @@ write_pipe(cupsd_client_t *con)		/* I - Client connection */
 
 
 /*
- * End of "$Id: client.c 10455 2012-05-07 22:41:30Z mike $".
+ * End of "$Id: client.c 10834 2013-01-21 15:29:47Z mike $".
  */
diff --git a/scheduler/colorman.c b/scheduler/colorman.c
index 061c505a..acbc1f97 100644
--- a/scheduler/colorman.c
+++ b/scheduler/colorman.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: colorman.c 10514 2012-05-25 03:11:18Z mike $"
+ * "$Id: colorman.c 10869 2013-02-19 23:53:01Z mike $"
  *
  *   Color management routines for the CUPS scheduler.
  *
@@ -1128,14 +1128,14 @@ colord_delete_device(
   message = COLORD_DBUS_MSG(COLORD_DBUS_PATH, "DeleteDevice");
 
   dbus_message_iter_init_append(message, &args);
-  dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &device_id);
+  dbus_message_iter_append_basic(&args, DBUS_TYPE_OBJECT_PATH, &device_path);
 
  /*
   * Send the DeleteDevice request synchronously...
   */
 
   dbus_error_init(&error);
-  cupsdLogMessage(CUPSD_LOG_DEBUG, "Calling DeleteDevice(%s)", device_id);
+  cupsdLogMessage(CUPSD_LOG_DEBUG, "Calling DeleteDevice(%s)", device_path);
   reply = dbus_connection_send_with_reply_and_block(colord_con, message,
                                                     COLORD_DBUS_TIMEOUT,
                                                     &error);
@@ -1505,5 +1505,5 @@ colord_unregister_printer(
 
 
 /*
- * End of "$Id: colorman.c 10514 2012-05-25 03:11:18Z mike $".
+ * End of "$Id: colorman.c 10869 2013-02-19 23:53:01Z mike $".
  */
diff --git a/scheduler/conf.c b/scheduler/conf.c
index aaf42734..e319a2ca 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: conf.c 10482 2012-05-18 19:51:02Z mike $"
+ * "$Id: conf.c 10824 2013-01-18 19:58:41Z mike $"
  *
  *   Configuration routines for the CUPS scheduler.
  *
@@ -14,23 +14,25 @@
  *
  * Contents:
  *
- *   cupsdAddAlias()          - Add a host alias.
+ *   cupsdAddAlias()	      - Add a host alias.
  *   cupsdCheckPermissions()  - Fix the mode and ownership of a file or
- *                              directory.
+ *				directory.
  *   cupsdDefaultAuthType()   - Get the default AuthType.
  *   cupsdFreeAliases()       - Free all of the alias entries.
  *   cupsdReadConfiguration() - Read the cupsd.conf file.
- *   get_address()            - Get an address + port number from a line.
+ *   get_address()	      - Get an address + port number from a line.
  *   get_addr_and_mask()      - Get an IP address and netmask.
- *   mime_error_cb()          - Log a MIME error.
- *   parse_aaa()              - Parse authentication, authorization, and access
- *                              control lines.
+ *   mime_error_cb()	      - Log a MIME error.
+ *   parse_aaa()	      - Parse authentication, authorization, and access
+ *				control lines.
  *   parse_fatal_errors()     - Parse FatalErrors values in a string.
- *   parse_groups()           - Parse system group names in a string.
- *   parse_protocols()        - Parse browse protocols in a string.
- *   read_configuration()     - Read a configuration file.
- *   read_location()          - Read a <Location path> definition.
- *   read_policy()            - Read a <Policy name> definition.
+ *   parse_groups()	      - Parse system group names in a string.
+ *   parse_protocols()	      - Parse browse protocols in a string.
+ *   parse_variable()	      - Parse a variable line.
+ *   read_cupsd_conf()	      - Read the cupsd.conf configuration file.
+ *   read_cups_files_conf()   - Read the cups-files.conf configuration file.
+ *   read_location()	      - Read a <Location path> definition.
+ *   read_policy()	      - Read a <Policy name> definition.
  *   set_policy_defaults()    - Set default policy values as needed.
  */
 
@@ -83,35 +85,25 @@ typedef struct
  * Local globals...
  */
 
-static int			default_auth_type	= CUPSD_AUTH_AUTO;
-					/* Default AuthType, if not specified */
-static const cupsd_var_t	variables[] =
+static const cupsd_var_t	cupsd_vars[] =
 {
-  { "AccessLog",		&AccessLog,		CUPSD_VARTYPE_STRING },
   { "AutoPurgeJobs", 		&JobAutoPurge,		CUPSD_VARTYPE_BOOLEAN },
-#ifdef HAVE_DNSSD
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
   { "BrowseDNSSDSubTypes",	&DNSSDSubTypes,		CUPSD_VARTYPE_STRING },
-#endif /* HAVE_DNSSD */
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
   { "BrowseWebIF",		&BrowseWebIF,		CUPSD_VARTYPE_BOOLEAN },
   { "Browsing",			&Browsing,		CUPSD_VARTYPE_BOOLEAN },
-  { "CacheDir",			&CacheDir,		CUPSD_VARTYPE_STRING },
   { "Classification",		&Classification,	CUPSD_VARTYPE_STRING },
   { "ClassifyOverride",		&ClassifyOverride,	CUPSD_VARTYPE_BOOLEAN },
-  { "ConfigFilePerm",		&ConfigFilePerm,	CUPSD_VARTYPE_INTEGER },
-  { "DataDir",			&DataDir,		CUPSD_VARTYPE_STRING },
   { "DefaultLanguage",		&DefaultLanguage,	CUPSD_VARTYPE_STRING },
   { "DefaultLeaseDuration",	&DefaultLeaseDuration,	CUPSD_VARTYPE_TIME },
   { "DefaultPaperSize",		&DefaultPaperSize,	CUPSD_VARTYPE_STRING },
   { "DefaultPolicy",		&DefaultPolicy,		CUPSD_VARTYPE_STRING },
   { "DefaultShared",		&DefaultShared,		CUPSD_VARTYPE_BOOLEAN },
   { "DirtyCleanInterval",	&DirtyCleanInterval,	CUPSD_VARTYPE_TIME },
-  { "DocumentRoot",		&DocumentRoot,		CUPSD_VARTYPE_STRING },
-  { "ErrorLog",			&ErrorLog,		CUPSD_VARTYPE_STRING },
   { "ErrorPolicy",		&ErrorPolicy,		CUPSD_VARTYPE_STRING },
-  { "FileDevice",		&FileDevice,		CUPSD_VARTYPE_BOOLEAN },
   { "FilterLimit",		&FilterLimit,		CUPSD_VARTYPE_INTEGER },
   { "FilterNice",		&FilterNice,		CUPSD_VARTYPE_INTEGER },
-  { "FontPath",			&FontPath,		CUPSD_VARTYPE_STRING },
 #ifdef HAVE_GSSAPI
   { "GSSServiceName",		&GSSServiceName,	CUPSD_VARTYPE_STRING },
 #endif /* HAVE_GSSAPI */
@@ -126,8 +118,6 @@ static const cupsd_var_t	variables[] =
   { "LimitRequestBody",		&MaxRequestSize,	CUPSD_VARTYPE_INTEGER },
   { "ListenBackLog",		&ListenBackLog,		CUPSD_VARTYPE_INTEGER },
   { "LogDebugHistory",		&LogDebugHistory,	CUPSD_VARTYPE_INTEGER },
-  { "LogFilePerm",		&LogFilePerm,		CUPSD_VARTYPE_INTEGER },
-  { "LPDConfigFile",		&LPDConfigFile,		CUPSD_VARTYPE_STRING },
   { "MaxActiveJobs",		&MaxActiveJobs,		CUPSD_VARTYPE_INTEGER },
   { "MaxClients",		&MaxClients,		CUPSD_VARTYPE_INTEGER },
   { "MaxClientsPerHost",	&MaxClientsPerHost,	CUPSD_VARTYPE_INTEGER },
@@ -146,18 +136,34 @@ static const cupsd_var_t	variables[] =
   { "MaxSubscriptionsPerPrinter",&MaxSubscriptionsPerPrinter,	CUPSD_VARTYPE_INTEGER },
   { "MaxSubscriptionsPerUser",	&MaxSubscriptionsPerUser,	CUPSD_VARTYPE_INTEGER },
   { "MultipleOperationTimeout",	&MultipleOperationTimeout,	CUPSD_VARTYPE_TIME },
-  { "PageLog",			&PageLog,		CUPSD_VARTYPE_STRING },
   { "PageLogFormat",		&PageLogFormat,		CUPSD_VARTYPE_STRING },
   { "PreserveJobFiles",		&JobFiles,		CUPSD_VARTYPE_TIME },
   { "PreserveJobHistory",	&JobHistory,		CUPSD_VARTYPE_TIME },
-  { "Printcap",			&Printcap,		CUPSD_VARTYPE_STRING },
-  { "PrintcapGUI",		&PrintcapGUI,		CUPSD_VARTYPE_STRING },
   { "ReloadTimeout",		&ReloadTimeout,		CUPSD_VARTYPE_TIME },
-  { "RemoteRoot",		&RemoteRoot,		CUPSD_VARTYPE_STRING },
-  { "RequestRoot",		&RequestRoot,		CUPSD_VARTYPE_STRING },
   { "RIPCache",			&RIPCache,		CUPSD_VARTYPE_STRING },
   { "RootCertDuration",		&RootCertDuration,	CUPSD_VARTYPE_TIME },
   { "ServerAdmin",		&ServerAdmin,		CUPSD_VARTYPE_STRING },
+  { "ServerName",		&ServerName,		CUPSD_VARTYPE_STRING },
+  { "StrictConformance",	&StrictConformance,	CUPSD_VARTYPE_BOOLEAN },
+  { "Timeout",			&Timeout,		CUPSD_VARTYPE_TIME },
+  { "WebInterface",		&WebInterface,		CUPSD_VARTYPE_BOOLEAN }
+};
+static const cupsd_var_t	cupsfiles_vars[] =
+{
+  { "AccessLog",		&AccessLog,		CUPSD_VARTYPE_STRING },
+  { "CacheDir",			&CacheDir,		CUPSD_VARTYPE_STRING },
+  { "ConfigFilePerm",		&ConfigFilePerm,	CUPSD_VARTYPE_INTEGER },
+  { "DataDir",			&DataDir,		CUPSD_VARTYPE_STRING },
+  { "DocumentRoot",		&DocumentRoot,		CUPSD_VARTYPE_STRING },
+  { "ErrorLog",			&ErrorLog,		CUPSD_VARTYPE_STRING },
+  { "FileDevice",		&FileDevice,		CUPSD_VARTYPE_BOOLEAN },
+  { "FontPath",			&FontPath,		CUPSD_VARTYPE_STRING },
+  { "LogFilePerm",		&LogFilePerm,		CUPSD_VARTYPE_INTEGER },
+  { "LPDConfigFile",		&LPDConfigFile,		CUPSD_VARTYPE_STRING },
+  { "PageLog",			&PageLog,		CUPSD_VARTYPE_STRING },
+  { "Printcap",			&Printcap,		CUPSD_VARTYPE_STRING },
+  { "RemoteRoot",		&RemoteRoot,		CUPSD_VARTYPE_STRING },
+  { "RequestRoot",		&RequestRoot,		CUPSD_VARTYPE_STRING },
   { "ServerBin",		&ServerBin,		CUPSD_VARTYPE_PATHNAME },
 #ifdef HAVE_SSL
   { "ServerCertificate",	&ServerCertificate,	CUPSD_VARTYPE_PATHNAME },
@@ -165,20 +171,17 @@ static const cupsd_var_t	variables[] =
   { "ServerKey",		&ServerKey,		CUPSD_VARTYPE_PATHNAME },
 #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
 #endif /* HAVE_SSL */
-  { "ServerName",		&ServerName,		CUPSD_VARTYPE_STRING },
   { "ServerRoot",		&ServerRoot,		CUPSD_VARTYPE_PATHNAME },
   { "SMBConfigFile",		&SMBConfigFile,		CUPSD_VARTYPE_STRING },
   { "StateDir",			&StateDir,		CUPSD_VARTYPE_STRING },
-  { "StrictConformance",	&StrictConformance,	CUPSD_VARTYPE_BOOLEAN },
 #ifdef HAVE_AUTHORIZATION_H
   { "SystemGroupAuthKey",	&SystemGroupAuthKey,	CUPSD_VARTYPE_STRING },
 #endif /* HAVE_AUTHORIZATION_H */
-  { "TempDir",			&TempDir,		CUPSD_VARTYPE_PATHNAME },
-  { "Timeout",			&Timeout,		CUPSD_VARTYPE_TIME },
-  { "WebInterface",		&WebInterface,		CUPSD_VARTYPE_BOOLEAN }
+  { "TempDir",			&TempDir,		CUPSD_VARTYPE_PATHNAME }
 };
-#define NUM_VARS	(sizeof(variables) / sizeof(variables[0]))
 
+static int		default_auth_type = CUPSD_AUTH_AUTO;
+					/* Default AuthType, if not specified */
 
 static const unsigned	ones[4] =
 			{
@@ -203,7 +206,12 @@ static int		parse_aaa(cupsd_location_t *loc, char *line,
 static int		parse_fatal_errors(const char *s);
 static int		parse_groups(const char *s);
 static int		parse_protocols(const char *s);
-static int		read_configuration(cups_file_t *fp);
+static int		parse_variable(const char *filename, int linenum,
+			               const char *line, const char *value,
+			               size_t num_vars,
+			               const cupsd_var_t *vars);
+static int		read_cupsd_conf(cups_file_t *fp);
+static int		read_cups_files_conf(cups_file_t *fp);
 static int		read_location(cups_file_t *fp, char *name, int linenum);
 static int		read_policy(cups_file_t *fp, char *name, int linenum);
 static void		set_policy_defaults(cupsd_policy_t *pol);
@@ -583,7 +591,7 @@ cupsdReadConfiguration(void)
   cupsdSetString(&PrintcapGUI, "/usr/bin/glpoptions");
   cupsdSetString(&FontPath, CUPS_FONTPATH);
   cupsdSetString(&RemoteRoot, "remroot");
-  cupsdSetStringf(&ServerHeader, "CUPS/%d.%d", CUPS_VERSION_MAJOR,
+  cupsdSetStringf(&ServerHeader, "CUPS/%d.%d IPP/2.1", CUPS_VERSION_MAJOR,
                   CUPS_VERSION_MINOR);
   cupsdSetString(&StateDir, CUPS_STATEDIR);
 
@@ -735,9 +743,9 @@ cupsdReadConfiguration(void)
   Browsing                 = CUPS_DEFAULT_BROWSING;
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
-#ifdef HAVE_DNSSD
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
   cupsdSetString(&DNSSDSubTypes, "_cups,_print");
-#endif /* HAVE_DNSSD */
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
 
   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
@@ -780,21 +788,63 @@ cupsdReadConfiguration(void)
   cupsdInitEnv();
 
  /*
-  * Read the configuration file...
+  * Read the cups-files.conf file...
+  */
+
+  if ((fp = cupsFileOpen(CupsFilesFile, "r")) != NULL)
+  {
+    status = read_cups_files_conf(fp);
+
+    cupsFileClose(fp);
+
+    if (!status)
+    {
+      if (TestConfigFile)
+        printf("\"%s\" contains errors.\n", CupsFilesFile);
+      else
+        syslog(LOG_LPR, "Unable to read \"%s\" due to errors.",
+               CupsFilesFile);
+
+      return (0);
+    }
+  }
+  else if (errno == ENOENT)
+    cupsdLogMessage(CUPSD_LOG_INFO, "No %s, using defaults.", CupsFilesFile);
+  else
+  {
+    syslog(LOG_LPR, "Unable to open \"%s\": %s", CupsFilesFile,
+	   strerror(errno));
+    return (0);
+  }
+
+  if (!ErrorLog)
+    cupsdSetString(&ErrorLog, CUPS_LOGDIR "/error_log");
+
+ /*
+  * Read the cupsd.conf file...
   */
 
   if ((fp = cupsFileOpen(ConfigurationFile, "r")) == NULL)
+  {
+    syslog(LOG_LPR, "Unable to open \"%s\": %s", ConfigurationFile,
+	   strerror(errno));
     return (0);
+  }
 
-  status = read_configuration(fp);
+  status = read_cupsd_conf(fp);
 
   cupsFileClose(fp);
 
   if (!status)
-    return (0);
+  {
+    if (TestConfigFile)
+      printf("\"%s\" contains errors.\n", ConfigurationFile);
+    else
+      syslog(LOG_LPR, "Unable to read \"%s\" due to errors.",
+	     ConfigurationFile);
 
-  if (!ErrorLog)
-    cupsdSetString(&ErrorLog, CUPS_LOGDIR "/error_log");
+    return (0);
+  }
 
   RunUser = getuid();
 
@@ -908,6 +958,13 @@ cupsdReadConfiguration(void)
   }
 
  /*
+  * Make sure ConfigFilePerm and LogFilePerm have sane values...
+  */
+
+  ConfigFilePerm &= 0664;
+  LogFilePerm    &= 0664;
+
+ /*
   * Open the system log for cupsd if necessary...
   */
 
@@ -1068,7 +1125,9 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
-       cupsdCheckPermissions(ServerRoot, "cupsd.conf", ConfigFilePerm, RunUser,
+       cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
+			     Group, 0, 0) < 0 ||
+       cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
@@ -1083,11 +1142,20 @@ cupsdReadConfiguration(void)
   * Update TempDir to the default if it hasn't been set already...
   */
 
+#ifdef __APPLE__
+  if (TempDir && !RunUser &&
+      (!strncmp(TempDir, "/private/tmp", 12) || !strncmp(TempDir, "/tmp", 4)))
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR, "Cannot use %s for TempDir.", TempDir);
+    cupsdClearString(&TempDir);
+  }
+#endif /* __APPLE__ */
+
   if (!TempDir)
   {
 #ifdef __APPLE__
     if ((tmpdir = getenv("TMPDIR")) != NULL &&
-        strncmp(tmpdir, "/private/tmp", 12))
+        strncmp(tmpdir, "/private/tmp", 12) && strncmp(tmpdir, "/tmp", 4))
 #else
     if ((tmpdir = getenv("TMPDIR")) != NULL)
 #endif /* __APPLE__ */
@@ -1110,13 +1178,13 @@ cupsdReadConfiguration(void)
       else
         cupsdSetString(&TempDir, tmpdir);
     }
+  }
 
-    if (!TempDir)
-    {
-      cupsdLogMessage(CUPSD_LOG_INFO, "Using default TempDir of %s/tmp...",
-	              RequestRoot);
-      cupsdSetStringf(&TempDir, "%s/tmp", RequestRoot);
-    }
+  if (!TempDir)
+  {
+    cupsdLogMessage(CUPSD_LOG_INFO, "Using default TempDir of %s/tmp...",
+		    RequestRoot);
+    cupsdSetStringf(&TempDir, "%s/tmp", RequestRoot);
   }
 
  /*
@@ -2550,13 +2618,244 @@ parse_protocols(const char *s)		/* I - Space-delimited protocols */
 
 
 /*
- * 'read_configuration()' - Read a configuration file.
+ * 'parse_variable()' - Parse a variable line.
  */
 
 static int				/* O - 1 on success, 0 on failure */
-read_configuration(cups_file_t *fp)	/* I - File to read from */
+parse_variable(
+    const char        *filename,	/* I - Name of configuration file */
+    int               linenum,		/* I - Line in configuration file */
+    const char        *line,		/* I - Line from configuration file */
+    const char        *value,		/* I - Value from configuration file */
+    size_t            num_vars,		/* I - Number of variables */
+    const cupsd_var_t *vars)		/* I - Variables */
+{
+  size_t		i;		/* Looping var */
+  const cupsd_var_t	*var;		/* Variables */
+  char			temp[1024];	/* Temporary string */
+
+
+  for (i = num_vars, var = vars; i > 0; i --, var ++)
+    if (!_cups_strcasecmp(line, var->name))
+      break;
+
+  if (i == 0)
+  {
+   /*
+    * Unknown directive!  Output an error message and continue...
+    */
+
+    if (!value)
+      cupsdLogMessage(CUPSD_LOG_ERROR, "Missing value for %s on line %d of %s.",
+		      line, linenum, filename);
+    else
+      cupsdLogMessage(CUPSD_LOG_ERROR, "Unknown directive %s on line %d of %s.",
+		      line, linenum, filename);
+
+    return (0);
+  }
+
+  switch (var->type)
+  {
+    case CUPSD_VARTYPE_INTEGER :
+	if (!value)
+	{
+	  cupsdLogMessage(CUPSD_LOG_ERROR,
+			  "Missing integer value for %s on line %d of %s.",
+			  line, linenum, filename);
+          return (0);
+	}
+	else if (!isdigit(*value & 255))
+	{
+	  cupsdLogMessage(CUPSD_LOG_ERROR,
+			  "Bad integer value for %s on line %d of %s.",
+			  line, linenum, filename);
+          return (0);
+	}
+	else
+	{
+	  int	n;		/* Number */
+	  char	*units;		/* Units */
+
+	  n = strtol(value, &units, 0);
+
+	  if (units && *units)
+	  {
+	    if (tolower(units[0] & 255) == 'g')
+	      n *= 1024 * 1024 * 1024;
+	    else if (tolower(units[0] & 255) == 'm')
+	      n *= 1024 * 1024;
+	    else if (tolower(units[0] & 255) == 'k')
+	      n *= 1024;
+	    else if (tolower(units[0] & 255) == 't')
+	      n *= 262144;
+	    else
+	    {
+	      cupsdLogMessage(CUPSD_LOG_ERROR,
+			      "Unknown integer value for %s on line %d of %s.",
+			      line, linenum, filename);
+	      return (0);
+	    }
+	  }
+
+	  if (n < 0)
+	  {
+	    cupsdLogMessage(CUPSD_LOG_ERROR,
+			    "Bad negative integer value for %s on line %d of "
+			    "%s.", line, linenum, filename);
+	    return (0);
+	  }
+	  else
+	  {
+	    *((int *)var->ptr) = n;
+	  }
+	}
+	break;
+
+    case CUPSD_VARTYPE_TIME :
+	if (!value)
+	{
+	  cupsdLogMessage(CUPSD_LOG_ERROR,
+			  "Missing time interval value for %s on line %d of "
+			  "%s.", line, linenum, filename);
+	  return (0);
+	}
+	else if (!_cups_strncasecmp(line, "PreserveJob", 11) &&
+		 (!_cups_strcasecmp(value, "true") ||
+		  !_cups_strcasecmp(value, "on") ||
+		  !_cups_strcasecmp(value, "enabled") ||
+		  !_cups_strcasecmp(value, "yes")))
+	{
+	  *((int *)var->ptr) = INT_MAX;
+	}
+	else if (!_cups_strcasecmp(value, "false") ||
+		 !_cups_strcasecmp(value, "off") ||
+		 !_cups_strcasecmp(value, "disabled") ||
+		 !_cups_strcasecmp(value, "no"))
+	{
+	  *((int *)var->ptr) = 0;
+	}
+	else if (!isdigit(*value & 255))
+	{
+	  cupsdLogMessage(CUPSD_LOG_ERROR,
+			  "Unknown time interval value for %s on line %d of "
+			  "%s.", line, linenum, filename);
+          return (0);
+	}
+	else
+	{
+	  double	n;		/* Number */
+	  char		*units;		/* Units */
+
+	  n = strtod(value, &units);
+
+	  if (units && *units)
+	  {
+	    if (tolower(units[0] & 255) == 'w')
+	      n *= 7 * 24 * 60 * 60;
+	    else if (tolower(units[0] & 255) == 'd')
+	      n *= 24 * 60 * 60;
+	    else if (tolower(units[0] & 255) == 'h')
+	      n *= 60 * 60;
+	    else if (tolower(units[0] & 255) == 'm')
+	      n *= 60;
+	    else
+	    {
+	      cupsdLogMessage(CUPSD_LOG_ERROR,
+			      "Unknown time interval value for %s on line "
+			      "%d of %s.", line, linenum, filename);
+	      return (0);
+	    }
+	  }
+
+	  if (n < 0.0 || n > INT_MAX)
+	  {
+	    cupsdLogMessage(CUPSD_LOG_ERROR,
+			    "Bad time value for %s on line %d of %s.",
+			    line, linenum, filename);
+	    return (0);
+	  }
+	  else
+	  {
+	    *((int *)var->ptr) = (int)n;
+	  }
+	}
+	break;
+
+    case CUPSD_VARTYPE_BOOLEAN :
+	if (!value)
+	{
+	  cupsdLogMessage(CUPSD_LOG_ERROR,
+			  "Missing boolean value for %s on line %d of %s.",
+			  line, linenum, filename);
+	  return (0);
+	}
+	else if (!_cups_strcasecmp(value, "true") ||
+		 !_cups_strcasecmp(value, "on") ||
+		 !_cups_strcasecmp(value, "enabled") ||
+		 !_cups_strcasecmp(value, "yes") ||
+		 atoi(value) != 0)
+	{
+	  *((int *)var->ptr) = TRUE;
+	}
+	else if (!_cups_strcasecmp(value, "false") ||
+		 !_cups_strcasecmp(value, "off") ||
+		 !_cups_strcasecmp(value, "disabled") ||
+		 !_cups_strcasecmp(value, "no") ||
+		 !_cups_strcasecmp(value, "0"))
+	{
+	  *((int *)var->ptr) = FALSE;
+	}
+	else
+	{
+	  cupsdLogMessage(CUPSD_LOG_ERROR,
+			  "Unknown boolean value %s on line %d of %s.",
+			  value, linenum, filename);
+	  return (0);
+	}
+	break;
+
+    case CUPSD_VARTYPE_PATHNAME :
+	if (!value)
+	{
+	  cupsdLogMessage(CUPSD_LOG_ERROR,
+			  "Missing pathname value for %s on line %d of %s.",
+			  line, linenum, filename);
+	  return (0);
+	}
+
+	if (value[0] == '/')
+	  strlcpy(temp, value, sizeof(temp));
+	else
+	  snprintf(temp, sizeof(temp), "%s/%s", ServerRoot, value);
+
+	if (access(temp, 0))
+	{
+	  cupsdLogMessage(CUPSD_LOG_ERROR,
+			  "File or directory for \"%s %s\" on line %d of %s "
+			  "does not exist.", line, value, linenum, filename);
+	  return (0);
+	}
+
+	cupsdSetString((char **)var->ptr, temp);
+	break;
+
+    case CUPSD_VARTYPE_STRING :
+	cupsdSetString((char **)var->ptr, value);
+	break;
+  }
+
+  return (1);
+}
+
+
+/*
+ * 'read_cupsd_conf()' - Read the cupsd.conf configuration file.
+ */
+
+static int				/* O - 1 on success, 0 on failure */
+read_cupsd_conf(cups_file_t *fp)	/* I - File to read from */
 {
-  int			i;		/* Looping var */
   int			linenum;	/* Current line number */
   char			line[HTTP_MAX_BUFFER],
 					/* Line from file */
@@ -2565,12 +2864,10 @@ read_configuration(cups_file_t *fp)	/* I - File to read from */
 			*value,		/* Pointer to value */
 			*valueptr;	/* Pointer into value */
   int			valuelen;	/* Length of value */
-  cupsd_var_t const	*var;		/* Current variable */
   http_addrlist_t	*addrlist,	/* Address list */
 			*addr;		/* Current address */
   cups_file_t		*incfile;	/* Include file */
   char			incname[1024];	/* Include filename */
-  struct group		*group;		/* Group */
 
 
  /*
@@ -2602,7 +2899,7 @@ read_configuration(cups_file_t *fp)	/* I - File to read from */
 	                incname, strerror(errno));
       else
       {
-        read_configuration(incfile);
+        read_cupsd_conf(incfile);
 	cupsFileClose(incfile);
       }
     }
@@ -2626,8 +2923,6 @@ read_configuration(cups_file_t *fp)	/* I - File to read from */
       if (linenum == 0)
 	return (0);
     }
-    else if (!_cups_strcasecmp(line, "FatalErrors"))
-      FatalErrors = parse_fatal_errors(value);
     else if (!_cups_strcasecmp(line, "FaxRetryInterval") && value)
     {
       JobRetryInterval = atoi(value);
@@ -2771,10 +3066,10 @@ read_configuration(cups_file_t *fp)	/* I - File to read from */
 
       BrowseLocalProtocols = protocols;
     }
-    else if (!_cups_strcasecmp(line, "default_auth_type") && value)
+    else if (!_cups_strcasecmp(line, "DefaultAuthType") && value)
     {
      /*
-      * default_auth_type {basic,digest,basicdigest,negotiate}
+      * DefaultAuthType {basic,digest,basicdigest,negotiate}
       */
 
       if (!_cups_strcasecmp(value, "none"))
@@ -2823,81 +3118,6 @@ read_configuration(cups_file_t *fp)	/* I - File to read from */
       }
     }
 #endif /* HAVE_SSL */
-    else if (!_cups_strcasecmp(line, "User") && value)
-    {
-     /*
-      * User ID to run as...
-      */
-
-      if (isdigit(value[0] & 255))
-      {
-        int uid = atoi(value);
-
-	if (!uid)
-	  cupsdLogMessage(CUPSD_LOG_ERROR,
-	                  "Will not use User 0 as specified on line %d "
-			  "for security reasons.  You must use a non-"
-			  "privileged account instead.",
-	                  linenum);
-        else
-	  User = atoi(value);
-      }
-      else
-      {
-        struct passwd *p;	/* Password information */
-
-        endpwent();
-	p = getpwnam(value);
-
-	if (p)
-	{
-	  if (!p->pw_uid)
-	    cupsdLogMessage(CUPSD_LOG_ERROR,
-	                    "Will not use User %s (UID=0) as specified on line "
-			    "%d for security reasons.  You must use a non-"
-			    "privileged account instead.",
-	                    value, linenum);
-	  else
-	    User = p->pw_uid;
-	}
-	else
-	  cupsdLogMessage(CUPSD_LOG_ERROR,
-	                  "Unknown User \"%s\" on line %d, ignoring.",
-	                  value, linenum);
-      }
-    }
-    else if (!_cups_strcasecmp(line, "Group") && value)
-    {
-     /*
-      * Group ID to run as...
-      */
-
-      if (isdigit(value[0]))
-        Group = atoi(value);
-      else
-      {
-        endgrent();
-	group = getgrnam(value);
-
-	if (group != NULL)
-	  Group = group->gr_gid;
-	else
-	  cupsdLogMessage(CUPSD_LOG_ERROR,
-	                  "Unknown Group \"%s\" on line %d, ignoring.",
-	                  value, linenum);
-      }
-    }
-    else if (!_cups_strcasecmp(line, "SystemGroup") && value)
-    {
-     /*
-      * SystemGroup (admin) group(s)...
-      */
-
-      if (!parse_groups(value))
-	cupsdLogMessage(CUPSD_LOG_ERROR,
-	                "Unknown SystemGroup \"%s\" on line %d, ignoring.",
-	                value, linenum);
-    }
     else if (!_cups_strcasecmp(line, "HostNameLookups") && value)
     {
      /*
@@ -2976,22 +3196,6 @@ read_configuration(cups_file_t *fp)	/* I - File to read from */
         cupsdLogMessage(CUPSD_LOG_WARN, "Unknown LogTimeFormat %s on line %d.",
 	                value, linenum);
     }
-    else if (!_cups_strcasecmp(line, "PrintcapFormat") && value)
-    {
-     /*
-      * Format of printcap file?
-      */
-
-      if (!_cups_strcasecmp(value, "bsd"))
-        PrintcapFormat = PRINTCAP_BSD;
-      else if (!_cups_strcasecmp(value, "plist"))
-        PrintcapFormat = PRINTCAP_PLIST;
-      else if (!_cups_strcasecmp(value, "solaris"))
-        PrintcapFormat = PRINTCAP_SOLARIS;
-      else
-	cupsdLogMessage(CUPSD_LOG_WARN, "Unknown PrintcapFormat %s on line %d.",
-	                value, linenum);
-    }
     else if (!_cups_strcasecmp(line, "ServerTokens") && value)
     {
      /*
@@ -3004,19 +3208,20 @@ read_configuration(cups_file_t *fp)	/* I - File to read from */
       uname(&plat);
 
       if (!_cups_strcasecmp(value, "ProductOnly"))
-	cupsdSetString(&ServerHeader, "CUPS");
+	cupsdSetString(&ServerHeader, "CUPS IPP");
       else if (!_cups_strcasecmp(value, "Major"))
-	cupsdSetStringf(&ServerHeader, "CUPS/%d", CUPS_VERSION_MAJOR);
+	cupsdSetStringf(&ServerHeader, "CUPS/%d IPP/2", CUPS_VERSION_MAJOR);
       else if (!_cups_strcasecmp(value, "Minor"))
-	cupsdSetStringf(&ServerHeader, "CUPS/%d.%d", CUPS_VERSION_MAJOR,
+	cupsdSetStringf(&ServerHeader, "CUPS/%d.%d IPP/2.1", CUPS_VERSION_MAJOR,
 	                CUPS_VERSION_MINOR);
       else if (!_cups_strcasecmp(value, "Minimal"))
-	cupsdSetString(&ServerHeader, CUPS_MINIMAL);
+	cupsdSetString(&ServerHeader, CUPS_MINIMAL " IPP/2.1");
       else if (!_cups_strcasecmp(value, "OS"))
-	cupsdSetStringf(&ServerHeader, CUPS_MINIMAL " (%s)", plat.sysname);
+	cupsdSetStringf(&ServerHeader, CUPS_MINIMAL " (%s %s) IPP/2.1",
+	                plat.sysname, plat.release);
       else if (!_cups_strcasecmp(value, "Full"))
-	cupsdSetStringf(&ServerHeader, CUPS_MINIMAL " (%s) IPP/2.1",
-	                plat.sysname);
+	cupsdSetStringf(&ServerHeader, CUPS_MINIMAL " (%s %s; %s) IPP/2.1",
+	                plat.sysname, plat.release, plat.machine);
       else if (!_cups_strcasecmp(value, "None"))
 	cupsdClearString(&ServerHeader);
       else
@@ -3117,182 +3322,193 @@ read_configuration(cups_file_t *fp)	/* I - File to read from */
 			"line %d.", value, linenum);
     }
 #endif /* HAVE_SSL */
+    else if (!_cups_strcasecmp(line, "AccessLog") ||
+             !_cups_strcasecmp(line, "CacheDir") ||
+             !_cups_strcasecmp(line, "ConfigFilePerm") ||
+             !_cups_strcasecmp(line, "DataDir") ||
+             !_cups_strcasecmp(line, "DocumentRoot") ||
+             !_cups_strcasecmp(line, "ErrorLog") ||
+             !_cups_strcasecmp(line, "FatalErrors") ||
+             !_cups_strcasecmp(line, "FileDevice") ||
+             !_cups_strcasecmp(line, "FontPath") ||
+             !_cups_strcasecmp(line, "Group") ||
+             !_cups_strcasecmp(line, "LogFilePerm") ||
+             !_cups_strcasecmp(line, "LPDConfigFile") ||
+             !_cups_strcasecmp(line, "PageLog") ||
+             !_cups_strcasecmp(line, "Printcap") ||
+             !_cups_strcasecmp(line, "PrintcapFormat") ||
+             !_cups_strcasecmp(line, "RemoteRoot") ||
+             !_cups_strcasecmp(line, "RequestRoot") ||
+             !_cups_strcasecmp(line, "ServerBin") ||
+             !_cups_strcasecmp(line, "ServerCertificate") ||
+             !_cups_strcasecmp(line, "ServerKey") ||
+             !_cups_strcasecmp(line, "ServerRoot") ||
+             !_cups_strcasecmp(line, "SMBConfigFile") ||
+             !_cups_strcasecmp(line, "StateDir") ||
+             !_cups_strcasecmp(line, "SystemGroup") ||
+             !_cups_strcasecmp(line, "SystemGroupAuthKey") ||
+             !_cups_strcasecmp(line, "TempDir") ||
+	     !_cups_strcasecmp(line, "User"))
+    {
+      cupsdLogMessage(CUPSD_LOG_WARN,
+		      "Please move \"%s%s%s\" on line %d of %s to the %s file; "
+		      "this will become an error in a future release.",
+		      line, value ? " " : "", value ? value : "", linenum,
+		      ConfigurationFile, CupsFilesFile);
+    }
     else
+      parse_variable(ConfigurationFile, linenum, line, value,
+                     sizeof(cupsd_vars) / sizeof(cupsd_vars[0]), cupsd_vars);
+  }
+
+  return (1);
+}
+
+
+/*
+ * 'read_cups_files_conf()' - Read the cups-files.conf configuration file.
+ */
+
+static int				/* O - 1 on success, 0 on failure */
+read_cups_files_conf(cups_file_t *fp)	/* I - File to read from */
+{
+  int		linenum;		/* Current line number */
+  char		line[HTTP_MAX_BUFFER],	/* Line from file */
+		*value;			/* Value from line */
+  struct group	*group;			/* Group */
+
+
+ /*
+  * Loop through each line in the file...
+  */
+
+  linenum = 0;
+
+  while (cupsFileGetConf(fp, line, sizeof(line), &value, &linenum))
+  {
+    if (!_cups_strcasecmp(line, "FatalErrors"))
+      FatalErrors = parse_fatal_errors(value);
+    else if (!_cups_strcasecmp(line, "Group") && value)
     {
      /*
-      * Find a simple variable in the list...
+      * Group ID to run as...
       */
 
-      for (i = NUM_VARS, var = variables; i > 0; i --, var ++)
-        if (!_cups_strcasecmp(line, var->name))
-	  break;
-
-      if (i == 0)
+      if (isdigit(value[0]))
+        Group = atoi(value);
+      else
       {
-       /*
-        * Unknown directive!  Output an error message and continue...
-	*/
+        endgrent();
+	group = getgrnam(value);
 
-        if (!value)
-	  cupsdLogMessage(CUPSD_LOG_ERROR, "Missing value for %s on line %d.",
-	                  line, linenum);
+	if (group != NULL)
+	  Group = group->gr_gid;
 	else
-	  cupsdLogMessage(CUPSD_LOG_ERROR, "Unknown directive %s on line %d.",
-	                  line, linenum);
-        continue;
+	{
+	  cupsdLogMessage(CUPSD_LOG_ERROR,
+	                  "Unknown Group \"%s\" on line %d of %s.", value,
+	                  linenum, CupsFilesFile);
+	  if (FatalErrors & CUPSD_FATAL_CONFIG)
+	    return (0);
+	}
       }
+    }
+    else if (!_cups_strcasecmp(line, "PrintcapFormat") && value)
+    {
+     /*
+      * Format of printcap file?
+      */
 
-      switch (var->type)
+      if (!_cups_strcasecmp(value, "bsd"))
+        PrintcapFormat = PRINTCAP_BSD;
+      else if (!_cups_strcasecmp(value, "plist"))
+        PrintcapFormat = PRINTCAP_PLIST;
+      else if (!_cups_strcasecmp(value, "solaris"))
+        PrintcapFormat = PRINTCAP_SOLARIS;
+      else
       {
-        case CUPSD_VARTYPE_INTEGER :
-	    if (!value)
-	      cupsdLogMessage(CUPSD_LOG_ERROR,
-	                      "Missing integer value for %s on line %d.",
-			      line, linenum);
-	    else if (!isdigit(*value & 255))
-	      cupsdLogMessage(CUPSD_LOG_ERROR,
-	                      "Bad integer value for %s on line %d.",
-			      line, linenum);
-	    else
-	    {
-	      int	n;		/* Number */
-	      char	*units;		/* Units */
-
-              n = strtol(value, &units, 0);
-
-	      if (units && *units)
-	      {
-        	if (tolower(units[0] & 255) == 'g')
-		  n *= 1024 * 1024 * 1024;
-        	else if (tolower(units[0] & 255) == 'm')
-		  n *= 1024 * 1024;
-		else if (tolower(units[0] & 255) == 'k')
-		  n *= 1024;
-		else if (tolower(units[0] & 255) == 't')
-		  n *= 262144;
-		else
-		{
-		  cupsdLogMessage(CUPSD_LOG_ERROR,
-				  "Unknown integer value for %s on line %d.",
-				  line, linenum);
-		  break;
-		}
-	      }
-
-              if (n < 0)
-		cupsdLogMessage(CUPSD_LOG_ERROR,
-	                	"Bad negative integer value for %s on line %d.",
-				line, linenum);
-	      else
-		*((int *)var->ptr) = n;
-	    }
-	    break;
-
-        case CUPSD_VARTYPE_TIME :
-	    if (!value)
-	      cupsdLogMessage(CUPSD_LOG_ERROR,
-	                      "Missing time interval value for %s on line %d.",
-			      line, linenum);
-	    else if (!_cups_strncasecmp(line, "PreserveJob", 11) &&
-	             (!_cups_strcasecmp(value, "true") ||
-		      !_cups_strcasecmp(value, "on") ||
-		      !_cups_strcasecmp(value, "enabled") ||
-		      !_cups_strcasecmp(value, "yes")))
-	      *((int *)var->ptr) = INT_MAX;
-	    else if (!_cups_strcasecmp(value, "false") ||
-	             !_cups_strcasecmp(value, "off") ||
-	             !_cups_strcasecmp(value, "disabled") ||
-	             !_cups_strcasecmp(value, "no"))
-	      *((int *)var->ptr) = 0;
-	    else if (!isdigit(*value & 255))
-	      cupsdLogMessage(CUPSD_LOG_ERROR,
-	                      "Unknown time interval value for %s on line %d.",
-			      line, linenum);
-	    else
-	    {
-	      double	n;		/* Number */
-	      char	*units;		/* Units */
-
-              n = strtod(value, &units);
-
-	      if (units && *units)
-	      {
-        	if (tolower(units[0] & 255) == 'w')
-		  n *= 7 * 24 * 60 * 60;
-        	else if (tolower(units[0] & 255) == 'd')
-		  n *= 24 * 60 * 60;
-		else if (tolower(units[0] & 255) == 'h')
-		  n *= 60 * 60;
-		else if (tolower(units[0] & 255) == 'm')
-		  n *= 60;
-		else
-		{
-		  cupsdLogMessage(CUPSD_LOG_ERROR,
-				  "Unknown time interval value for %s on line "
-				  "%d.", line, linenum);
-		  break;
-		}
-	      }
-
-              if (n < 0.0 || n > INT_MAX)
-		cupsdLogMessage(CUPSD_LOG_ERROR,
-	                	"Bad time value for %s on line %d.",
-				line, linenum);
-	      else
-		*((int *)var->ptr) = (int)n;
-	    }
-	    break;
+	cupsdLogMessage(CUPSD_LOG_ERROR,
+	                "Unknown PrintcapFormat \"%s\" on line %d of %s.",
+	                value, linenum, CupsFilesFile);
+        if (FatalErrors & CUPSD_FATAL_CONFIG)
+          return (0);
+      }
+    }
+    else if (!_cups_strcasecmp(line, "SystemGroup") && value)
+    {
+     /*
+      * SystemGroup (admin) group(s)...
+      */
 
-	case CUPSD_VARTYPE_BOOLEAN :
-	    if (!value)
-	      cupsdLogMessage(CUPSD_LOG_ERROR,
-	                      "Missing boolean value for %s on line %d.",
-			      line, linenum);
-            else if (!_cups_strcasecmp(value, "true") ||
-	             !_cups_strcasecmp(value, "on") ||
-		     !_cups_strcasecmp(value, "enabled") ||
-		     !_cups_strcasecmp(value, "yes") ||
-		     atoi(value) != 0)
-              *((int *)var->ptr) = TRUE;
-	    else if (!_cups_strcasecmp(value, "false") ||
-	             !_cups_strcasecmp(value, "off") ||
-		     !_cups_strcasecmp(value, "disabled") ||
-		     !_cups_strcasecmp(value, "no") ||
-		     !_cups_strcasecmp(value, "0"))
-              *((int *)var->ptr) = FALSE;
-	    else
-              cupsdLogMessage(CUPSD_LOG_ERROR,
-	                      "Unknown boolean value %s on line %d.",
-	                      value, linenum);
-	    break;
+      if (!parse_groups(value))
+      {
+	cupsdLogMessage(CUPSD_LOG_ERROR,
+	                "Unknown SystemGroup \"%s\" on line %d of %s.", value,
+	                linenum, CupsFilesFile);
+        if (FatalErrors & CUPSD_FATAL_CONFIG)
+          return (0);
+      }
+    }
+    else if (!_cups_strcasecmp(line, "User") && value)
+    {
+     /*
+      * User ID to run as...
+      */
 
-	case CUPSD_VARTYPE_PATHNAME :
-            if (!value)
-	    {
-	      cupsdLogMessage(CUPSD_LOG_ERROR,
-	                      "Missing pathname value for %s on line %d.",
-			      line, linenum);
-              break;
-	    }
+      if (isdigit(value[0] & 255))
+      {
+        int uid = atoi(value);
 
-	    if (value[0] == '/')
-	      strlcpy(temp, value, sizeof(temp));
-	    else
-	      snprintf(temp, sizeof(temp), "%s/%s", ServerRoot, value);
+	if (!uid)
+	{
+	  cupsdLogMessage(CUPSD_LOG_ERROR,
+	                  "Will not use User 0 as specified on line %d of %s "
+			  "for security reasons.  You must use a non-"
+			  "privileged account instead.",
+	                  linenum, CupsFilesFile);
+          if (FatalErrors & CUPSD_FATAL_CONFIG)
+            return (0);
+        }
+        else
+	  User = atoi(value);
+      }
+      else
+      {
+        struct passwd *p;	/* Password information */
 
-            if (access(temp, 0))
-	    {
-	      cupsdLogMessage(CUPSD_LOG_ERROR,
-	                      "File or directory for \"%s %s\" on line %d "
-			      "does not exist.", line, value, linenum);
-              break;
-	    }
+        endpwent();
+	p = getpwnam(value);
 
-	case CUPSD_VARTYPE_STRING :
-	    cupsdSetString((char **)var->ptr, value);
-	    break;
+	if (p)
+	{
+	  if (!p->pw_uid)
+	  {
+	    cupsdLogMessage(CUPSD_LOG_ERROR,
+	                    "Will not use User %s (UID=0) as specified on line "
+			    "%d of %s for security reasons.  You must use a "
+			    "non-privileged account instead.",
+	                    value, linenum, CupsFilesFile);
+	    if (FatalErrors & CUPSD_FATAL_CONFIG)
+	      return (0);
+	  }
+	  else
+	    User = p->pw_uid;
+	}
+	else
+	{
+	  cupsdLogMessage(CUPSD_LOG_ERROR,
+	                  "Unknown User \"%s\" on line %d of %s.",
+	                  value, linenum, CupsFilesFile);
+          if (FatalErrors & CUPSD_FATAL_CONFIG)
+            return (0);
+        }
       }
     }
+    else if (!parse_variable(CupsFilesFile, linenum, line, value,
+			     sizeof(cupsfiles_vars) / sizeof(cupsfiles_vars[0]),
+			     cupsfiles_vars) &&
+	     (FatalErrors & CUPSD_FATAL_CONFIG))
+      return (0);
   }
 
   return (1);
@@ -3864,5 +4080,5 @@ set_policy_defaults(cupsd_policy_t *pol)/* I - Policy */
 
 
 /*
- * End of "$Id: conf.c 10482 2012-05-18 19:51:02Z mike $".
+ * End of "$Id: conf.c 10824 2013-01-18 19:58:41Z mike $".
  */
diff --git a/scheduler/conf.h b/scheduler/conf.h
index 776a54bf..5ee713ca 100644
--- a/scheduler/conf.h
+++ b/scheduler/conf.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: conf.h 10482 2012-05-18 19:51:02Z mike $"
+ * "$Id: conf.h 10710 2012-11-26 18:26:01Z mike $"
  *
  *   Configuration file definitions for the CUPS scheduler.
  *
@@ -96,7 +96,9 @@ typedef struct
  */
 
 VAR char		*ConfigurationFile	VALUE(NULL),
-					/* Configuration file to use */
+					/* cupsd.conf file to use */
+			*CupsFilesFile		VALUE(NULL),
+					/* cups-files.conf file to use */
 			*ServerName		VALUE(NULL),
 					/* FQDN for server */
 			*ServerAdmin		VALUE(NULL),
@@ -294,5 +296,5 @@ extern int	cupsdWriteErrorLog(int level, const char *message);
 
 
 /*
- * End of "$Id: conf.h 10482 2012-05-18 19:51:02Z mike $".
+ * End of "$Id: conf.h 10710 2012-11-26 18:26:01Z mike $".
  */
diff --git a/scheduler/cupsd.h b/scheduler/cupsd.h
index def25e30..6df5d175 100644
--- a/scheduler/cupsd.h
+++ b/scheduler/cupsd.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: cupsd.h 10490 2012-05-21 17:40:22Z mike $"
+ * "$Id: cupsd.h 10776 2012-12-17 22:17:08Z mike $"
  *
  *   Main header file for the CUPS scheduler.
  *
@@ -160,13 +160,6 @@ VAR int			NeedReload	VALUE(RELOAD_ALL),
 VAR void		*DefaultProfile	VALUE(0);
 					/* Default security profile */
 
-#ifdef HAVE_GSSAPI
-VAR int			KerberosInitialized	VALUE(0);
-					/* Has Kerberos been initialized? */
-VAR krb5_context	KerberosContext VALUE(NULL);
-					/* Kerberos context for credentials */
-#endif /* HAVE_GSSAPI */
-
 #ifdef HAVE_LAUNCH_H
 VAR int			Launchd		VALUE(0);
 					/* Running from launchd */
@@ -237,5 +230,5 @@ extern void		cupsdStopServer(void);
 
 
 /*
- * End of "$Id: cupsd.h 10490 2012-05-21 17:40:22Z mike $".
+ * End of "$Id: cupsd.h 10776 2012-12-17 22:17:08Z mike $".
  */
diff --git a/scheduler/cupsfilter.c b/scheduler/cupsfilter.c
index ba7a9ce6..0761cde9 100644
--- a/scheduler/cupsfilter.c
+++ b/scheduler/cupsfilter.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: cupsfilter.c 10434 2012-04-23 21:47:41Z mike $"
+ * "$Id: cupsfilter.c 10869 2013-02-19 23:53:01Z mike $"
  *
  *   Filtering program for CUPS.
  *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -409,6 +409,7 @@ main(int  argc,				/* I - Number of command-line args */
 
   if (srctype)
   {
+   /* sscanf return value already checked above */
     sscanf(srctype, "%15[^/]/%255s", super, type);
     if ((src = mimeType(mime, super, type)) == NULL)
     {
@@ -426,6 +427,7 @@ main(int  argc,				/* I - Number of command-line args */
     return (1);
   }
 
+ /* sscanf return value already checked above */
   sscanf(dsttype, "%15[^/]/%255s", super, type);
   if (!_cups_strcasecmp(super, "printer"))
     dst = printer_type;
@@ -915,7 +917,7 @@ exec_filters(mime_type_t   *srctype,	/* I - Source type */
 {
   int		i;			/* Looping var */
   const char	*argv[8],		/* Command-line arguments */
-		*envp[15],		/* Environment variables */
+		*envp[16],		/* Environment variables */
 		*temp;			/* Temporary string */
   char		*optstr,		/* Filter options */
 		content_type[1024],	/* CONTENT_TYPE */
@@ -1038,7 +1040,8 @@ exec_filters(mime_type_t   *srctype,	/* I - Source type */
   envp[11] = printer_name;
   envp[12] = rip_max_cache;
   envp[13] = userenv;
-  envp[14] = NULL;
+  envp[14] = "CHARSET=utf-8";
+  envp[15] = NULL;
 
   for (i = 0; argv[i]; i ++)
     fprintf(stderr, "DEBUG: argv[%d]=\"%s\"\n", i, argv[i]);
@@ -1456,5 +1459,5 @@ usage(const char *opt)			/* I - Incorrect option, if any */
 
 
 /*
- * End of "$Id: cupsfilter.c 10434 2012-04-23 21:47:41Z mike $".
+ * End of "$Id: cupsfilter.c 10869 2013-02-19 23:53:01Z mike $".
  */
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index b575fb43..e491d94d 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dirsvc.c 10472 2012-05-18 02:25:18Z mike $"
+ * "$Id: dirsvc.c 10641 2012-10-03 14:17:41Z mike $"
  *
  *   Directory services routines for the CUPS scheduler.
  *
@@ -234,9 +234,12 @@ cupsdStartBrowsing(void)
 
         if (FatalErrors & CUPSD_FATAL_BROWSE)
 	  cupsdEndProcess(getpid(), 0);
-      }
 
-      avahi_threaded_poll_start(DNSSDMaster);
+        avahi_threaded_poll_free(DNSSDMaster);
+        DNSSDMaster = NULL;
+      }
+      else
+	avahi_threaded_poll_start(DNSSDMaster);
     }
 #  endif /* HAVE_DNSSD */
 
@@ -456,17 +459,30 @@ cupsdUpdateDNSSDName(void)
   else
 #  endif /* __APPLE__ */
 #  ifdef HAVE_AVAHI
+  if (DNSSDClient)
   {
-    cupsdSetString(&DNSSDComputerName, avahi_client_get_host_name(DNSSDClient));
-    cupsdSetString(&DNSSDHostName,
-                   avahi_client_get_host_name_fqdn(DNSSDClient));
+    const char	*host_name = avahi_client_get_host_name(DNSSDClient);
+    const char	*host_fqdn = avahi_client_get_host_name_fqdn(DNSSDClient);
+
+    cupsdSetString(&DNSSDComputerName, host_name ? host_name : ServerName);
+
+    if (host_fqdn)
+      cupsdSetString(&DNSSDHostName, host_fqdn);
+    else if (strchr(ServerName, '.'))
+      cupsdSetString(&DNSSDHostName, ServerName);
+    else
+      cupsdSetStringf(&DNSSDHostName, "%s.local", ServerName);
   }
-#  else /* HAVE_DNSSD */
+  else
+#  endif /* HAVE_AVAHI */
   {
     cupsdSetString(&DNSSDComputerName, ServerName);
-    cupsdSetString(&DNSSDHostName, ServerName);
+
+    if (strchr(ServerName, '.'))
+      cupsdSetString(&DNSSDHostName, ServerName);
+    else
+      cupsdSetStringf(&DNSSDHostName, "%s.local", ServerName);
   }
-#  endif /* HAVE_AVAHI */
 
  /*
   * Then (re)register the web interface if enabled...
@@ -1650,5 +1666,5 @@ update_smb(int onoff)			/* I - 1 = turn on, 0 = turn off */
 
 
 /*
- * End of "$Id: dirsvc.c 10472 2012-05-18 02:25:18Z mike $".
+ * End of "$Id: dirsvc.c 10641 2012-10-03 14:17:41Z mike $".
  */
diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index 5139ddc8..2c318404 100644
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: ipp.c 10490 2012-05-21 17:40:22Z mike $"
+ * "$Id: ipp.c 10899 2013-03-11 18:44:36Z mike $"
  *
  *   IPP routines for the CUPS scheduler.
  *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   This file contains Kerberos support code, copyright 2006 by
@@ -1285,6 +1285,21 @@ add_job(cupsd_client_t  *con,		/* I - Client connection */
   ipp_attribute_t *media_col,		/* media-col attribute */
 		*media_margin;		/* media-*-margin attribute */
   ipp_t		*unsup_col;		/* media-col in unsupported response */
+  static const char * const readonly[] =/* List of read-only attributes */
+  {
+    "job-id",
+    "job-k-octets",
+    /*"job-impressions",*/		/* For now we allow this since cupsd can't count */
+    "job-impressions-completed",
+    "job-media-sheets",
+    "job-media-sheets-completed",
+    "job-state",
+    "job-state-message",
+    "job-state-reasons",
+    "time-at-completed",
+    "time-at-creation",
+    "time-at-processing"
+  };
 
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))",
@@ -1353,6 +1368,27 @@ add_job(cupsd_client_t  *con,		/* I - Client connection */
   * copies, number-up, and page-ranges...
   */
 
+  for (i = 0; i < (int)(sizeof(readonly) / sizeof(readonly[0])); i ++)
+  {
+    if ((attr = ippFindAttribute(con->request, readonly[i],
+                                 IPP_TAG_ZERO)) != NULL)
+    {
+      ippDeleteAttribute(con->request, attr);
+
+      if (StrictConformance)
+      {
+	send_ipp_status(con, IPP_BAD_REQUEST,
+			_("The '%s' Job Description attribute cannot be "
+			  "supplied in a job creation request."), readonly[i]);
+	return (NULL);
+      }
+
+      cupsdLogMessage(CUPSD_LOG_WARN,
+                      "Unexpected '%s' Job Description attribute in a job "
+                      "creation request.", readonly[i]);
+    }
+  }
+
   if (filetype && printer->filetypes &&
       !cupsArrayFind(printer->filetypes, filetype))
   {
@@ -1538,9 +1574,71 @@ add_job(cupsd_client_t  *con,		/* I - Client connection */
                   priority);
   }
 
-  if (!ippFindAttribute(con->request, "job-name", IPP_TAG_NAME))
+  if ((attr = ippFindAttribute(con->request, "job-name", IPP_TAG_ZERO)) == NULL)
     ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL,
                  "Untitled");
+  else if ((attr->value_tag != IPP_TAG_NAME &&
+            attr->value_tag != IPP_TAG_NAMELANG) ||
+           attr->num_values != 1)
+  {
+    send_ipp_status(con, IPP_ATTRIBUTES,
+                    _("Bad job-name value: Wrong type or count."));
+    if ((attr = ippCopyAttribute(con->response, attr, 0)) != NULL)
+      attr->group_tag = IPP_TAG_UNSUPPORTED_GROUP;
+    return (NULL);
+  }
+  else
+  {
+    const char	*ptr;			/* Pointer into string */
+
+    for (ptr = attr->values[0].string.text; *ptr; ptr ++)
+    {
+      if ((*ptr & 0xe0) == 0xc0)
+      {
+	ptr ++;
+	if ((*ptr & 0xc0) != 0x80)
+	  break;
+      }
+      else if ((*ptr & 0xf0) == 0xe0)
+      {
+	ptr ++;
+	if ((*ptr & 0xc0) != 0x80)
+	  break;
+	ptr ++;
+	if ((*ptr & 0xc0) != 0x80)
+	  break;
+      }
+      else if ((*ptr & 0xf8) == 0xf0)
+      {
+	ptr ++;
+	if ((*ptr & 0xc0) != 0x80)
+	  break;
+	ptr ++;
+	if ((*ptr & 0xc0) != 0x80)
+	  break;
+	ptr ++;
+	if ((*ptr & 0xc0) != 0x80)
+	  break;
+      }
+      else if (*ptr & 0x80)
+	break;
+    }
+
+    if (*ptr || (ptr - attr->values[0].string.text) > (IPP_MAX_NAME - 1))
+    {
+      if (*ptr)
+	send_ipp_status(con, IPP_ATTRIBUTES,
+	                _("Bad job-name value: Bad UTF-8 sequence."));
+      else
+	send_ipp_status(con, IPP_ATTRIBUTES,
+	                _("Bad job-name value: Name too long."));
+
+      if ((attr = ippCopyAttribute(con->response, attr, 0)) != NULL)
+	attr->group_tag = IPP_TAG_UNSUPPORTED_GROUP;
+
+      return (NULL);
+    }
+  }
 
   if ((job = cupsdAddJob(priority, printer->name)) == NULL)
   {
@@ -2334,6 +2432,21 @@ add_printer(cupsd_client_t  *con,	/* I - Client connection */
     http_uri_status_t	uri_status;	/* URI separation status */
     char		old_device_uri[1024];
 					/* Old device URI */
+    static const char * const uri_status_strings[] =
+    {
+      "URI too large.",
+      "Bad arguments to function.",
+      "Bad resource path.",
+      "Bad port number.",
+      "Bad hostname/address.",
+      "Bad username/password.",
+      "Bad URI scheme.",
+      "Bad URI.",
+      "OK",
+      "Missing URI scheme.",
+      "Unknown URI scheme",
+      "Missing resource path."
+    };
 
 
     need_restart_job = 1;
@@ -2345,12 +2458,14 @@ add_printer(cupsd_client_t  *con,	/* I - Client connection */
 				 host, sizeof(host), &port,
 				 resource, sizeof(resource));
 
+    cupsdLogMessage(CUPSD_LOG_DEBUG,
+		    "%s device-uri: %s", printer->name,
+		    uri_status_strings[uri_status - HTTP_URI_OVERFLOW]);
+
     if (uri_status < HTTP_URI_OK)
     {
       send_ipp_status(con, IPP_NOT_POSSIBLE, _("Bad device-uri \"%s\"."),
 		      attr->values[0].string.text);
-      cupsdLogMessage(CUPSD_LOG_DEBUG,
-                      "add_printer: httpSeparateURI returned %d", uri_status);
       return;
     }
 
@@ -2369,7 +2484,7 @@ add_printer(cupsd_client_t  *con,	/* I - Client connection */
 	send_ipp_status(con, IPP_NOT_POSSIBLE,
 	                _("File device URIs have been disabled. "
 	                  "To enable, see the FileDevice directive in "
-			  "\"%s/cupsd.conf\"."),
+			  "\"%s/cups-files.conf\"."),
 			ServerRoot);
 	return;
       }
@@ -4813,7 +4928,7 @@ copy_printer_attrs(
     ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
                ippTimeToDate(curtime));
 
-#ifdef HAVE_DNSSD
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
   if (!ra || cupsArrayFind(ra, "printer-dns-sd-name"))
   {
     if (printer->reg_name)
@@ -4823,7 +4938,7 @@ copy_printer_attrs(
       ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_NOVALUE,
                    "printer-dns-sd-name", 0);
   }
-#endif /* HAVE_DNSSD */
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
 
   if (!ra || cupsArrayFind(ra, "printer-error-policy"))
     ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
@@ -8217,7 +8332,7 @@ print_job(cupsd_client_t  *con,		/* I - Client connection */
     * Grab format from client...
     */
 
-    if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]", super,
+    if (sscanf(format->values[0].string.text, "%15[^/]/%255[^;]", super,
                type) != 2)
     {
       send_ipp_status(con, IPP_BAD_REQUEST,
@@ -8234,7 +8349,7 @@ print_job(cupsd_client_t  *con,		/* I - Client connection */
     * Use default document format...
     */
 
-    if (sscanf(default_format, "%15[^/]/%31[^;]", super, type) != 2)
+    if (sscanf(default_format, "%15[^/]/%255[^;]", super, type) != 2)
     {
       send_ipp_status(con, IPP_BAD_REQUEST,
                       _("Bad document-format \"%s\"."),
@@ -9448,7 +9563,7 @@ send_document(cupsd_client_t  *con,	/* I - Client connection */
     * Grab format from client...
     */
 
-    if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]",
+    if (sscanf(format->values[0].string.text, "%15[^/]/%255[^;]",
                super, type) != 2)
     {
       send_ipp_status(con, IPP_BAD_REQUEST, _("Bad document-format \"%s\"."),
@@ -9464,7 +9579,7 @@ send_document(cupsd_client_t  *con,	/* I - Client connection */
     * Use default document format...
     */
 
-    if (sscanf(default_format, "%15[^/]/%31[^;]", super, type) != 2)
+    if (sscanf(default_format, "%15[^/]/%255[^;]", super, type) != 2)
     {
       send_ipp_status(con, IPP_BAD_REQUEST,
                       _("Bad document-format-default \"%s\"."), default_format);
@@ -10920,7 +11035,8 @@ validate_job(cupsd_client_t  *con,	/* I - Client connection */
   http_status_t		status;		/* Policy status */
   ipp_attribute_t	*attr,		/* Current attribute */
 			*auth_info;	/* auth-info attribute */
-  ipp_attribute_t	*format;	/* Document-format attribute */
+  ipp_attribute_t	*format,	/* Document-format attribute */
+			*name;		/* Job-name attribute */
   cups_ptype_t		dtype;		/* Destination type (printer/class) */
   char			super[MIME_MAX_SUPER],
 					/* Supertype of file */
@@ -10947,7 +11063,7 @@ validate_job(cupsd_client_t  *con,	/* I - Client connection */
       )
     {
       send_ipp_status(con, IPP_ATTRIBUTES,
-                      _("Unsupported compression \"%s\"."),
+                      _("Unsupported 'compression' value \"%s\"."),
         	      attr->values[0].string.text);
       ippAddString(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_KEYWORD,
 	           "compression", NULL, attr->values[0].string.text);
@@ -10962,10 +11078,11 @@ validate_job(cupsd_client_t  *con,	/* I - Client connection */
   if ((format = ippFindAttribute(con->request, "document-format",
                                  IPP_TAG_MIMETYPE)) != NULL)
   {
-    if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]",
+    if (sscanf(format->values[0].string.text, "%15[^/]/%255[^;]",
                super, type) != 2)
     {
-      send_ipp_status(con, IPP_BAD_REQUEST, _("Bad document-format \"%s\"."),
+      send_ipp_status(con, IPP_BAD_REQUEST,
+                      _("Bad 'document-format' value \"%s\"."),
 		      format->values[0].string.text);
       return;
     }
@@ -10976,7 +11093,7 @@ validate_job(cupsd_client_t  *con,	/* I - Client connection */
       cupsdLogMessage(CUPSD_LOG_INFO,
                       "Hint: Do you have the raw file printing rules enabled?");
       send_ipp_status(con, IPP_DOCUMENT_FORMAT,
-                      _("Unsupported document-format \"%s\"."),
+                      _("Unsupported 'document-format' value \"%s\"."),
 		      format->values[0].string.text);
       ippAddString(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_MIMETYPE,
                    "document-format", NULL, format->values[0].string.text);
@@ -10985,6 +11102,86 @@ validate_job(cupsd_client_t  *con,	/* I - Client connection */
   }
 
  /*
+  * Is the job-name valid?
+  */
+
+  if ((name = ippFindAttribute(con->request, "job-name", IPP_TAG_ZERO)) != NULL)
+  {
+    int bad_name = 0;			/* Is the job-name value bad? */
+
+    if ((name->value_tag != IPP_TAG_NAME && name->value_tag != IPP_TAG_NAMELANG) ||
+        name->num_values != 1)
+    {
+      bad_name = 1;
+    }
+    else
+    {
+     /*
+      * Validate that job-name conforms to RFC 5198 (Network Unicode) and
+      * IPP Everywhere requirements for "name" values...
+      */
+
+      const unsigned char *nameptr;	/* Pointer into "job-name" attribute */
+
+      for (nameptr = (unsigned char *)name->values[0].string.text;
+           *nameptr;
+           nameptr ++)
+      {
+        if (*nameptr < ' ' && *nameptr != '\t')
+          break;
+        else if (*nameptr == 0x7f)
+          break;
+        else if ((*nameptr & 0xe0) == 0xc0)
+        {
+          if ((nameptr[1] & 0xc0) != 0x80)
+            break;
+
+          nameptr ++;
+        }
+        else if ((*nameptr & 0xf0) == 0xe0)
+        {
+          if ((nameptr[1] & 0xc0) != 0x80 ||
+              (nameptr[2] & 0xc0) != 0x80)
+	    break;
+
+	  nameptr += 2;
+	}
+        else if ((*nameptr & 0xf8) == 0xf0)
+        {
+          if ((nameptr[1] & 0xc0) != 0x80 ||
+	      (nameptr[2] & 0xc0) != 0x80 ||
+	      (nameptr[3] & 0xc0) != 0x80)
+	    break;
+
+	  nameptr += 3;
+	}
+        else if (*nameptr & 0x80)
+          break;
+      }
+
+      if (*nameptr)
+        bad_name = 1;
+    }
+
+    if (bad_name)
+    {
+      if (StrictConformance)
+      {
+	send_ipp_status(con, IPP_ATTRIBUTES,
+	                _("Unsupported 'job-name' value."));
+	ippCopyAttribute(con->response, name, 0);
+	return;
+      }
+      else
+      {
+        cupsdLogMessage(CUPSD_LOG_WARN,
+                        "Unsupported 'job-name' value, deleting from request.");
+        ippDeleteAttribute(con->request, name);
+      }
+    }
+  }
+
+ /*
   * Is the destination valid?
   */
 
@@ -11109,5 +11306,5 @@ validate_user(cupsd_job_t    *job,	/* I - Job */
 
 
 /*
- * End of "$Id: ipp.c 10490 2012-05-21 17:40:22Z mike $".
+ * End of "$Id: ipp.c 10899 2013-03-11 18:44:36Z mike $".
  */
diff --git a/scheduler/job.c b/scheduler/job.c
index 73a3a3ab..3b3964b9 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: job.c 10502 2012-05-23 01:36:50Z mike $"
+ * "$Id: job.c 10776 2012-12-17 22:17:08Z mike $"
  *
  *   Job management routines for the CUPS scheduler.
  *
@@ -2195,7 +2195,16 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - Job */
   }
 
   if (!cupsdCloseCreatedConfFile(fp, filename))
+  {
+   /*
+    * Remove backup file and mark this job as clean...
+    */
+
+    strlcat(filename, ".O", sizeof(filename));
+    unlink(filename);
+
     job->dirty = 0;
+  }
 }
 
 
@@ -2468,8 +2477,10 @@ cupsdSetJobState(
   * Set the new job state...
   */
 
-  job->state->values[0].integer = newstate;
-  job->state_value              = newstate;
+  job->state_value = newstate;
+
+  if (job->state)
+    job->state->values[0].integer = newstate;
 
   switch (newstate)
   {
@@ -2977,7 +2988,8 @@ finalize_job(cupsd_job_t *job,		/* I - Job */
   * rarely have current information for network devices...
   */
 
-  if (strncmp(job->printer->device_uri, "usb:", 4))
+  if (strncmp(job->printer->device_uri, "usb:", 4) &&
+      strncmp(job->printer->device_uri, "ippusb:", 7))
     cupsdSetPrinterReasons(job->printer, "-offline-report");
 
  /*
@@ -2988,10 +3000,11 @@ finalize_job(cupsd_job_t *job,		/* I - Job */
   job->profile = NULL;
 
  /*
-  * Clear the unresponsive job watchdog timer...
+  * Clear the unresponsive job watchdog timers...
   */
 
-  job->kill_time = 0;
+  job->cancel_time = 0;
+  job->kill_time   = 0;
 
  /*
   * Close pipes and status buffer...
@@ -3083,6 +3096,8 @@ finalize_job(cupsd_job_t *job,		/* I - Job */
 		    exit_code == CUPS_BACKEND_HOLD ? "hold job" :
 		    exit_code == CUPS_BACKEND_STOP ? "stop printer" :
 		    exit_code == CUPS_BACKEND_CANCEL ? "cancel job" :
+		    exit_code == CUPS_BACKEND_RETRY ? "retry job later" :
+		    exit_code == CUPS_BACKEND_RETRY_CURRENT ? "retry job immediately" :
 		    exit_code < 0 ? "crashed" : "unknown");
 
    /*
@@ -3645,7 +3660,13 @@ get_options(cupsd_job_t *job,		/* I - Job */
 	  attr->value_tag == IPP_TAG_BEGIN_COLLECTION) /* Not yet supported */
 	continue;
 
-      if (!strcmp(attr->name, "job-hold-until"))
+      if (!strcmp(attr->name, "job-hold-until") ||
+          !strcmp(attr->name, "job-id") ||
+          !strcmp(attr->name, "job-k-octets") ||
+          !strcmp(attr->name, "job-media-sheets") ||
+          !strcmp(attr->name, "job-media-sheets-completed") ||
+          !strcmp(attr->name, "job-state") ||
+          !strcmp(attr->name, "job-state-reasons"))
 	continue;
 
       if (!strncmp(attr->name, "job-", 4) &&
@@ -4272,6 +4293,8 @@ load_request_root(void)
 	else
 	  unload_job(job);
       }
+      else
+        free(job);
     }
 
   cupsDirClose(dir);
@@ -4363,7 +4386,7 @@ set_time(cupsd_job_t *job,		/* I - Job to update */
 
   if (!strcmp(name, "time-at-completed"))
   {
-    if (JobHistory < INT_MAX)
+    if (JobHistory < INT_MAX && attr)
       job->history_time = attr->values[0].integer + JobHistory;
     else
       job->history_time = INT_MAX;
@@ -4371,7 +4394,7 @@ set_time(cupsd_job_t *job,		/* I - Job to update */
     if (job->history_time < JobHistoryUpdate || !JobHistoryUpdate)
       JobHistoryUpdate = job->history_time;
 
-    if (JobFiles < INT_MAX)
+    if (JobFiles < INT_MAX && attr)
       job->file_time = attr->values[0].integer + JobFiles;
     else
       job->file_time = INT_MAX;
@@ -4703,7 +4726,7 @@ update_job(cupsd_job_t *job)		/* I - Job to check */
         cupsdStopPrinter(job->printer, 1);
 	return;
       }
-      else if (cupsdSetPrinterReasons(job->printer, message))
+      else if (message[0] && cupsdSetPrinterReasons(job->printer, message))
       {
 	event |= CUPSD_EVENT_PRINTER_STATE;
 
@@ -5074,5 +5097,5 @@ update_job_attrs(cupsd_job_t *job,	/* I - Job to update */
 
 
 /*
- * End of "$Id: job.c 10502 2012-05-23 01:36:50Z mike $".
+ * End of "$Id: job.c 10776 2012-12-17 22:17:08Z mike $".
  */
diff --git a/scheduler/log.c b/scheduler/log.c
index 00a0fd95..1ab483d1 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: log.c 10158 2012-01-05 05:50:57Z mike $"
+ * "$Id: log.c 10752 2012-12-12 18:03:02Z mike $"
  *
  *   Log file routines for the CUPS scheduler.
  *
@@ -41,6 +41,22 @@
 static int	log_linesize = 0;	/* Size of line for output file */
 static char	*log_line = NULL;	/* Line for output file */
 
+#ifdef HAVE_VSYSLOG
+static const int syslevels[] =		/* SYSLOG levels... */
+		{
+		  0,
+		  LOG_EMERG,
+		  LOG_ALERT,
+		  LOG_CRIT,
+		  LOG_ERR,
+		  LOG_WARNING,
+		  LOG_NOTICE,
+		  LOG_INFO,
+		  LOG_DEBUG,
+		  LOG_DEBUG
+		};
+#endif /* HAVE_VSYSLOG */
+
 
 /*
  * Local functions...
@@ -543,8 +559,12 @@ cupsdLogMessage(int        level,	/* I - Log level */
   if ((TestConfigFile || !ErrorLog) && level <= CUPSD_LOG_WARN)
   {
     va_start(ap, message);
+#ifdef HAVE_VSYSLOG
+    vsyslog(LOG_LPR | syslevels[level], message, ap);
+#else
     vfprintf(stderr, message, ap);
     putc('\n', stderr);
+#endif /* HAVE_VSYSLOG */
     va_end(ap);
 
     return (1);
@@ -984,21 +1004,6 @@ cupsdWriteErrorLog(int        level,	/* I - Log level */
 		  'D',
 		  'd'
 		};
-#ifdef HAVE_VSYSLOG
-  static const int	syslevels[] =	/* SYSLOG levels... */
-		{
-		  0,
-		  LOG_EMERG,
-		  LOG_ALERT,
-		  LOG_CRIT,
-		  LOG_ERR,
-		  LOG_WARNING,
-		  LOG_NOTICE,
-		  LOG_INFO,
-		  LOG_DEBUG,
-		  LOG_DEBUG
-		};
-#endif /* HAVE_VSYSLOG */
 
 
 #ifdef HAVE_VSYSLOG
@@ -1098,5 +1103,5 @@ format_log_line(const char *message,	/* I - Printf-style format string */
 
 
 /*
- * End of "$Id: log.c 10158 2012-01-05 05:50:57Z mike $".
+ * End of "$Id: log.c 10752 2012-12-12 18:03:02Z mike $".
  */
diff --git a/scheduler/main.c b/scheduler/main.c
index d3b43a05..58776fea 100644
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: main.c 10431 2012-04-23 19:19:19Z mike $"
+ * "$Id: main.c 10777 2012-12-17 22:18:10Z mike $"
  *
  *   Main loop for the CUPS scheduler.
  *
@@ -65,10 +65,15 @@
 #if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
 #  include <malloc.h>
 #endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
+
 #ifdef HAVE_NOTIFY_H
 #  include <notify.h>
 #endif /* HAVE_NOTIFY_H */
 
+#ifdef HAVE_SYS_PARAM_H
+#  include <sys/param.h>
+#endif /* HAVE_SYS_PARAM_H */
+
 
 /*
  * Local functions...
@@ -207,7 +212,6 @@ main(int  argc,				/* I - Number of command-line args */
 
                 char *current;		/* Current directory */
 
-
 	       /*
 	        * Allocate a buffer for the current working directory to
 		* reduce run-time stack usage; this approximates the
@@ -271,6 +275,29 @@ main(int  argc,				/* I - Number of command-line args */
 	      UseProfiles = 0;
 	      break;
 
+          case 's' : /* Set cups-files.conf location */
+              i ++;
+	      if (i >= argc)
+	      {
+	        _cupsLangPuts(stderr, _("cupsd: Expected cups-files.conf "
+	                                "filename after \"-s\" option."));
+	        usage(1);
+	      }
+
+              if (argv[i][0] != '/')
+	      {
+	       /*
+	        * Relative filename not allowed...
+		*/
+
+	        _cupsLangPuts(stderr, _("cupsd: Relative cups-files.conf "
+	                                "filename not allowed."));
+	        usage(1);
+              }
+
+	      cupsdSetString(&CupsFilesFile, argv[i]);
+	      break;
+
 #ifdef __APPLE__
           case 'S' : /* Disable system management functions */
               fputs("cupsd: -S (disable system management) for internal "
@@ -298,7 +325,39 @@ main(int  argc,				/* I - Number of command-line args */
     }
 
   if (!ConfigurationFile)
+  {
     cupsdSetString(&ConfigurationFile, CUPS_SERVERROOT "/cupsd.conf");
+    cupsdSetString(&CupsFilesFile, CUPS_SERVERROOT "/cups-files.conf");
+  }
+
+  if (!CupsFilesFile)
+  {
+    char	*filename,		/* Copy of cupsd.conf filename */
+		*slash;			/* Final slash in cupsd.conf filename */
+    size_t	len;			/* Size of buffer */
+
+    len = strlen(ConfigurationFile) + 15;
+    if ((filename = malloc(len)) == NULL)
+    {
+      _cupsLangPrintf(stderr,
+		      _("cupsd: Unable to get path to "
+			"cups-files.conf file."));
+      return (1);
+    }
+
+    strlcpy(filename, ConfigurationFile, len);
+    if ((slash = strrchr(filename, '/')) == NULL)
+    {
+      _cupsLangPrintf(stderr,
+		      _("cupsd: Unable to get path to "
+			"cups-files.conf file."));
+      return (1);
+    }
+
+    strlcpy(slash, "/cups-files.conf", len - (slash - filename));
+    cupsdSetString(&CupsFilesFile, filename);
+    free(filename);
+  }
 
  /*
   * If the user hasn't specified "-f", run in the background...
@@ -365,15 +424,15 @@ main(int  argc,				/* I - Number of command-line args */
       }
     }
 
-#ifdef __OpenBSD__
+#if defined(__OpenBSD__) && OpenBSD < 201211
    /*
     * Call _thread_sys_closefrom() so the child process doesn't reset the
     * parent's file descriptors to be blocking.  This is a workaround for a
-    * limitation of userland libpthread on OpenBSD.
+    * limitation of userland libpthread on older versions of OpenBSD.
     */
 
     _thread_sys_closefrom(0);
-#endif /* __OpenBSD__ */
+#endif /* __OpenBSD__ && OpenBSD < 201211 */
 
    /*
     * Since CoreFoundation and DBUS both create fork-unsafe data on execution of
@@ -483,17 +542,11 @@ main(int  argc,				/* I - Number of command-line args */
   */
 
   if (!cupsdReadConfiguration())
-  {
-    if (TestConfigFile)
-      printf("%s contains errors\n", ConfigurationFile);
-    else
-      syslog(LOG_LPR, "Unable to read configuration file \'%s\' - exiting!",
-	     ConfigurationFile);
     return (1);
-  }
   else if (TestConfigFile)
   {
-    printf("%s is OK\n", ConfigurationFile);
+    printf("\"%s\" is OK.\n", CupsFilesFile);
+    printf("\"%s\" is OK.\n", ConfigurationFile);
     return (0);
   }
 
@@ -781,9 +834,9 @@ main(int  argc,				/* I - Number of command-line args */
       * Got an error from select!
       */
 
-#ifdef HAVE_DNSSD
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
       cupsd_printer_t	*p;		/* Current printer */
-#endif /* HAVE_DNSSD */
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
 
 
       if (errno == EINTR)		/* Just interrupted by a signal */
@@ -824,13 +877,13 @@ main(int  argc,				/* I - Number of command-line args */
 			job->print_pipes[0], job->print_pipes[1],
 			job->back_pipes[0], job->back_pipes[1]);
 
-#ifdef HAVE_DNSSD
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
       for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
 	   p;
 	   p = (cupsd_printer_t *)cupsArrayNext(Printers))
         cupsdLogMessage(CUPSD_LOG_EMERG, "printer[%s] reg_name=\"%s\"", p->name,
 	                p->reg_name ? p->reg_name : "(null)");
-#endif /* HAVE_DNSSD */
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
 
       break;
     }
@@ -922,7 +975,7 @@ main(int  argc,				/* I - Number of command-line args */
       */
 
       cupsdDeleteCert(0);
-      cupsdAddCert(0, "root", NULL);
+      cupsdAddCert(0, "root", cupsdDefaultAuthType());
     }
 #endif /* !HAVE_AUTHORIZATION_H */
 
@@ -1114,23 +1167,6 @@ main(int  argc,				/* I - Number of command-line args */
     cupsdStopSystemMonitor();
 #endif /* __APPLE__ */
 
-#ifdef HAVE_GSSAPI
- /*
-  * Free the scheduler's Kerberos context...
-  */
-
-#  ifdef __APPLE__
- /*
-  * If the weak-linked GSSAPI/Kerberos library is not present, don't try
-  * to use it...
-  */
-
-  if (krb5_init_context != NULL)
-#  endif /* __APPLE__ */
-  if (KerberosContext)
-    krb5_free_context(KerberosContext);
-#endif /* HAVE_GSSAPI */
-
 #ifdef __sgi
  /*
   * Remove the fake IRIX lpsched lock file, but only if the existing
@@ -2030,5 +2066,5 @@ usage(int status)			/* O - Exit status */
 
 
 /*
- * End of "$Id: main.c 10431 2012-04-23 19:19:19Z mike $".
+ * End of "$Id: main.c 10777 2012-12-17 22:18:10Z mike $".
  */
diff --git a/scheduler/printers.c b/scheduler/printers.c
index cf9cfee6..b56018d5 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.c 10501 2012-05-23 01:19:11Z mike $"
+ * "$Id: printers.c 10762 2012-12-13 20:28:30Z mike $"
  *
  *   Printer routines for the CUPS scheduler.
  *
@@ -2074,23 +2074,12 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
 {
   int		i;			/* Looping var */
   char		resource[HTTP_MAX_URI];	/* Resource portion of URI */
-  int		num_air;		/* Number of auth-info-required values */
-  const char	* const *air;		/* auth-info-required values */
   cupsd_location_t *auth;		/* Pointer to authentication element */
   const char	*auth_supported;	/* Authentication supported */
   ipp_t		*oldattrs;		/* Old printer attributes */
   ipp_attribute_t *attr;		/* Attribute data */
   char		*name,			/* Current user/group name */
 		*filter;		/* Current filter */
-  static const char * const air_none[] =
-		{			/* No authentication */
-		  "none"
-		};
-  static const char * const air_userpass[] =
-		{			/* Basic/Digest authentication */
-		  "username",
-		  "password"
-		};
 
 
   DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
@@ -2114,19 +2103,6 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
   */
 
   auth_supported = "requesting-user-name";
-  num_air        = 1;
-  air            = air_none;
-
-  if (p->num_auth_info_required > 0 && strcmp(p->auth_info_required[0], "none"))
-  {
-    num_air = p->num_auth_info_required;
-    air     = p->auth_info_required;
-  }
-  else if (p->type & CUPS_PRINTER_AUTHENTICATED)
-  {
-    num_air = 2;
-    air     = air_userpass;
-  }
 
   if (p->type & CUPS_PRINTER_CLASS)
     snprintf(resource, sizeof(resource), "/classes/%s", p->name);
@@ -2205,8 +2181,10 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
                 "job-k-limit", p->k_limit);
   ippAddInteger(p->attrs, IPP_TAG_PRINTER, IPP_TAG_INTEGER,
                 "job-page-limit", p->page_limit);
-  ippAddStrings(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
-		"auth-info-required", num_air, NULL, air);
+  if (p->num_auth_info_required > 0 && strcmp(p->auth_info_required[0], "none"))
+    ippAddStrings(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
+		  "auth-info-required", p->num_auth_info_required, NULL,
+		  p->auth_info_required);
 
   if (cupsArrayCount(Banners) > 0)
   {
@@ -4829,13 +4807,13 @@ load_ppd(cupsd_printer_t *p)		/* I - Printer */
 		   "printer-make-and-model", NULL,
 		   "Local System V Printer");
     }
-    else if (!strncmp(p->device_uri, "ipp://", 6) &&
-	     (strstr(p->device_uri, "/printers/") != NULL ||
-	      strstr(p->device_uri, "/classes/") != NULL ||
-	      ((strstr(p->device_uri, "._ipp.") != NULL ||
-	        strstr(p->device_uri, "._ipps.") != NULL) &&
-	       !strcmp(p->device_uri + strlen(p->device_uri) - 5,
-		       "/cups"))))
+    else if (((!strncmp(p->device_uri, "ipp://", 6) ||
+               !strncmp(p->device_uri, "ipps://", 7)) &&
+	      (strstr(p->device_uri, "/printers/") != NULL ||
+	       strstr(p->device_uri, "/classes/") != NULL)) ||
+	     ((strstr(p->device_uri, "._ipp.") != NULL ||
+	       strstr(p->device_uri, "._ipps.") != NULL) &&
+	      !strcmp(p->device_uri + strlen(p->device_uri) - 5, "/cups")))
     {
      /*
       * Tell the client this is really a hard-wired remote printer.
@@ -5339,5 +5317,5 @@ write_xml_string(cups_file_t *fp,	/* I - File to write to */
 
 
 /*
- * End of "$Id: printers.c 10501 2012-05-23 01:19:11Z mike $".
+ * End of "$Id: printers.c 10762 2012-12-13 20:28:30Z mike $".
  */
diff --git a/scheduler/testmime.c b/scheduler/testmime.c
index de495447..aa68a2cd 100644
--- a/scheduler/testmime.c
+++ b/scheduler/testmime.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: testmime.c 9862 2011-08-03 02:44:09Z mike $"
+ * "$Id: testmime.c 10869 2013-02-19 23:53:01Z mike $"
  *
  *   MIME test program for CUPS.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -132,7 +132,7 @@ main(int  argc,				/* I - Number of command-line args */
     }
     else
     {
-      sscanf(argv[i], "%15[^/]/%31s", super, type);
+      sscanf(argv[i], "%15[^/]/%255s", super, type);
       dst = mimeType(mime, super, type);
 
       filters = mimeFilter2(mime, src, srcinfo.st_size, dst, &cost);
@@ -527,5 +527,5 @@ type_dir(mime_t     *mime,		/* I - MIME database */
 
 
 /*
- * End of "$Id: testmime.c 9862 2011-08-03 02:44:09Z mike $".
+ * End of "$Id: testmime.c 10869 2013-02-19 23:53:01Z mike $".
  */
diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c
index 141790f5..9a5608ce 100644
--- a/systemv/cupstestppd.c
+++ b/systemv/cupstestppd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: cupstestppd.c 10431 2012-04-23 19:19:19Z mike $"
+ * "$Id: cupstestppd.c 10661 2012-10-24 11:57:40Z mike $"
  *
  *   PPD test program for CUPS.
  *
@@ -3279,8 +3279,8 @@ check_sizes(ppd_file_t *ppd,		/* I - PPD file */
 	  * Check for EnvSizeName as well...
 	  */
 
-      if (strncmp(pwg_media->ppd, "Env", 3) &&
-          !strncmp(size->name, "Env", 3))
+	  if (strncmp(pwg_media->ppd, "Env", 3) &&
+	      !strncmp(size->name, "Env", 3))
             snprintf(buf, sizeof(buf), "Env%s", pwg_media->ppd);
 
 	  if (strcmp(size->name, buf))
@@ -3972,5 +3972,5 @@ valid_utf8(const char *s)		/* I - String to check */
 
 
 /*
- * End of "$Id: cupstestppd.c 10431 2012-04-23 19:19:19Z mike $".
+ * End of "$Id: cupstestppd.c 10661 2012-10-24 11:57:40Z mike $".
  */
diff --git a/systemv/lp.c b/systemv/lp.c
index 3ef59bab..fb4d367f 100644
--- a/systemv/lp.c
+++ b/systemv/lp.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: lp.c 10494 2012-05-21 22:39:01Z mike $"
+ * "$Id: lp.c 10830 2013-01-21 13:14:40Z mike $"
  *
  *   "lp" command for CUPS.
  *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -489,6 +489,13 @@ main(int  argc,				/* I - Number of command-line arguments */
 	    break;
 
         case '-' : /* Stop processing options */
+            if (argv[i][2])
+            {
+	      _cupsLangPrintf(stderr, _("%s: Error - unknown option \"%s\"."),
+			      argv[0], argv[i]);
+	      return (1);
+	    }
+
 	    end_options = 1;
 	    break;
 
@@ -724,5 +731,5 @@ set_job_attrs(const char    *command,	/* I - Command name */
 
 
 /*
- * End of "$Id: lp.c 10494 2012-05-21 22:39:01Z mike $".
+ * End of "$Id: lp.c 10830 2013-01-21 13:14:40Z mike $".
  */
diff --git a/templates/ca/trailer.tmpl b/templates/ca/trailer.tmpl
index f16123f7..f75af724 100644
--- a/templates/ca/trailer.tmpl
+++ b/templates/ca/trailer.tmpl
@@ -1,7 +1,7 @@
 </TD></TR>
 <TR><TD>&nbsp;</TD></TR>
 <TR><TD CLASS="trailer">CUPS i el logotip de CUPS s&oacute;n marques registrades per
-<A HREF="http://www.apple.com">Apple Inc.</A> CUPS t&eacute; copyright 2007-2012 Apple
+<A HREF="http://www.apple.com">Apple Inc.</A> CUPS t&eacute; copyright 2007-2013 Apple
 Inc. Tots els drets reservats.</TD></TR>
 </TABLE>
 </BODY>
diff --git a/templates/cs/add-class.tmpl b/templates/cs/add-class.tmpl
new file mode 100644
index 00000000..06bb9add
--- /dev/null
+++ b/templates/cs/add-class.tmpl
@@ -0,0 +1,40 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Přidat třídu</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+
+<TABLE>
+<TR>
+<TH CLASS="label">Název:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(Může obsahovat libovolné tisknutelné znaky kromě "/", "#" a mezery)</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Popis:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(Srozumitelný popis)</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Umístění:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(Srozumitelný popis umístění)</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">členové:</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="Přidat třídu"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+\ No newline at end of file
diff --git a/templates/cs/add-printer.tmpl b/templates/cs/add-printer.tmpl
new file mode 100644
index 00000000..1e557d2e
--- /dev/null
+++ b/templates/cs/add-printer.tmpl
@@ -0,0 +1,47 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Přidat tiskárnu</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<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}">
+{?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">Název:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?template_name}"><BR>
+<SMALL>(Může obsahovat libovolné tisknutelné znaky kromě "/", "#" a mezery)</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Popis:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_INFO}"><BR>
+<SMALL>(Srozumitelný popis)</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Umístění:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_LOCATION}"><BR>
+<SMALL>(Srozumitelný popis umístění)</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Připojení:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Sdílení:</TH>
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
+sdílet tuto tiskárnu</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Pokračovat"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+\ No newline at end of file
diff --git a/templates/cs/add-rss-subscription.tmpl b/templates/cs/add-rss-subscription.tmpl
new file mode 100644
index 00000000..d1568f7c
--- /dev/null
+++ b/templates/cs/add-rss-subscription.tmpl
@@ -0,0 +1,44 @@
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription">
+
+<H2 CLASS="title">Přidat RSS předplatné</H2>
+
+<TABLE SUMMARY="Add RSS Subscription form">
+<TR>
+<TH CLASS="label">Název:</TH>
+<TD COLSPAN="5"><INPUT TYPE="TEXT" NAME="SUBSCRIPTION_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?SUBSCRIPTION_NAME}"><BR>
+<SMALL>(Může obsahovat libovolné tisknutelné znaky s výjimkou mezery, "/", "?" a "#")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Fronta:</TH>
+<TD COLSPAN="5"><SELECT NAME="PRINTER_URI" SIZE="10"><OPTION VALUE="#ALL#"{?PRINTER_URI=#ALL#? SELECTED:}>Všechny fronty</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">Události:</TH>
+<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CREATED" {?EVENT_JOB_CREATED}>Vytvoření úlohy<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_COMPLETED" {?EVENT_JOB_COMPLETED}>Dokončení úlohy<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_STOPPED" {?EVENT_JOB_STOPPED}>Zastavení úlohy<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CONFIG_CHANGED" {?EVENT_JOB_CONFIG_CHANGED}>Změna parametrů úlohy</TD>
+<TD>&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_STOPPED" {?EVENT_PRINTER_STOPPED}>Zastavení fronty<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_ADDED" {?EVENT_PRINTER_ADDED}>Přidání fronty<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_MODIFIED" {?EVENT_PRINTER_MODIFIED}>Změna fronty<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_DELETED" {?EVENT_PRINTER_DELETED}>Vymazání fronty</TD>
+<TD>&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STARTED" {?EVENT_SERVER_STARTED}>Start serveru<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STOPPED" {?EVENT_SERVER_STOPPED}>Zastavení serveru<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_RESTARTED" {?EVENT_SERVER_RESTARTED}>Restart serveru<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_AUDIT" {?EVENT_SERVER_AUDIT}>Audit bezpečnosti serveru</TD>
+</TR>
+<TR>
+<TH CLASS="label">Maximální počet zobrazených událostí:</TH>
+<TD COLSPAN="5"><INPUT TYPE="NUMBER" 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="Přidat RSS předplatné"></TD>
+</TR>
+</TABLE>
+
+</FORM>
diff --git a/templates/cs/admin.tmpl b/templates/cs/admin.tmpl
new file mode 100644
index 00000000..247a10f4
--- /dev/null
+++ b/templates/cs/admin.tmpl
@@ -0,0 +1,102 @@
+<TABLE CLASS="indent" SUMMARY="Administration Tasks">
+<TR><TD VALIGN="TOP">
+
+<H2 CLASS="title">Tiskárny</H2>
+
+<P>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="SUBMIT" VALUE="Přidat tiskárnu"></FORM>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="find-new-printers"><INPUT TYPE="SUBMIT" VALUE="Hledat nové tiskárny"></FORM>
+<FORM ACTION="/printers/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Správa tiskáren"></FORM>
+{have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="Export tiskáren do Samby"></FORM>:}
+</P>
+
+<H2 CLASS="title">Třídy</H2>
+
+<P>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-class"><INPUT TYPE="SUBMIT" VALUE="Přidat třídu"></FORM>
+<FORM ACTION="/classes/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Správa tříd"></FORM>
+</P>
+
+<H2 CLASS="title">Úlohy</H2>
+
+<P>
+<FORM ACTION="/jobs/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Správa úloh"></FORM>
+</P>
+
+</TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">
+
+<H2 CLASS="title">Server</H2>
+
+<P>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="Úprava konfiguračního souboru"></FORM>
+<FORM ACTION="/admin/log/access_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Prohlížení Access Log"></FORM>
+<FORM ACTION="/admin/log/error_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Prohlížení Error Log"></FORM>
+<FORM ACTION="/admin/log/page_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Prohlížení Page Log"></FORM>
+</P>
+
+{SETTINGS_ERROR?<P>{SETTINGS_MESSAGE}</P>
+<BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>:
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+
+{ADVANCEDSETTINGS?<P><B>Nastavení serveru\:</B></P>
+
+<P><A HREF="/admin/">Skrýt rozšířené nastavení <SMALL>&#x25bc;</SMALL></A><BR>
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+<INPUT TYPE="HIDDEN" NAME="ADVANCEDSETTINGS" VALUE="YES">
+<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Sdílet tiskárny připojené k tomuto systému<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Maximální počet klientů\:
+<INPUT TYPE="TEXT" NAME="MAX_CLIENTS" VALUE="{?max_clients}" SIZE="6"><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Povolit tisk z internetu<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" {?browse_web_if}> Nabízet webové rozhraní<BR>
+<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Povolit vzdálenou správu<BR>
+{have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Používat ověřování Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">časté dotazy</A>)<BR>:}
+<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Povolit uživatelům zrušit jakoukoliv úlohu (nejen vlastní)<BR>
+<INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOBS" {?preserve_jobs}> Zachovat historii úloh<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Maximální počet úloh (0 bez omezení)\:
+<INPUT TYPE="TEXT" NAME="MAX_JOBS" VALUE="{?max_jobs}" SIZE="6"><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Zachovat metadata\:
+<INPUT TYPE="TEXT" NAME="PRESERVE_JOB_HISTORY" VALUE="{?preserve_job_history}" SIZE="6"><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Zachovat dokumenty\:
+<INPUT TYPE="TEXT" NAME="PRESERVE_JOB_FILES" VALUE="{?preserve_job_files}" SIZE="6"><BR>
+<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Uložit informace o ladění pro řešení problémů<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Maximální velikost log souboru\:
+<INPUT TYPE="TEXT" NAME="MAX_LOG_SIZE" VALUE="{?max_log_size}" SIZE="6"></P>
+
+:<P><B>Nastavení serveru:</B></P>
+
+<P><A HREF="/admin/?ADVANCEDSETTINGS=YES">Zobrazit rozšířené nastavení <SMALL>&#x25b6;</SMALL></A><BR>
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Sdílet tiskárny připojené k tomuto systému<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Povolit tisk z internetu<BR>
+<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Povolit vzdálenou správu<BR>
+{have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Používat ověřování Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">časté dotazy</A>)<BR>:}
+<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Povolit uživatelům zrušit jakoukoliv úlohu (nejen vlastní)<BR>
+<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Uložit informace o ladění pro řešení problémů</P>
+
+}
+<P><INPUT TYPE="SUBMIT" NAME="CHANGESETTINGS" VALUE="Změnit nastavení"></P>
+
+</FORM>}
+
+</TD></TR>
+</TABLE>
+
+<DIV CLASS="indent">
+
+<H2 CLASS="title">RSS předplatné</H2>
+
+<P>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="Přidat RSS předplatné"></FORM>
+</P>
+
+</DIV>
+
+{notify_subscription_id?<TABLE CLASS="list" SUMMARY="RSS Subscriptions">
+<THEAD><TR><TH>Název</TH><TH>Události</TH><TH>Název fronty</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="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Zrušit RSS předplatné"></FORM>&nbsp;</TD><TD>{notify_events}</TD><TD NOWRAP>&nbsp;{notify_printer_name?{notify_printer_name}:Všechny fronty}</TD></TR>}
+</TBODY>
+</TABLE>:}
diff --git a/templates/cs/choose-device.tmpl b/templates/cs/choose-device.tmpl
new file mode 100644
index 00000000..aa8a649c
--- /dev/null
+++ b/templates/cs/choose-device.tmpl
@@ -0,0 +1,53 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Úprava tiskárny {printer_name}:Přidat tiskárnu}</H2>
+
+{CUPS_GET_DEVICES_DONE?<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<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">Aktuální připojení\:</TH>
+<TD><INPUT TYPE="RADIO" NAME="DEVICE_URI" VALUE="{current_device_uri}" CHECKED>
+{current_device_uri}</TD>
+</TR>}
+<TR>
+<TH CLASS="label">Místní tiskárny\:</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">Nalezené síťové tiskárny\:</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">Ostatní síťové tiskárny\:</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="Pokračovat"></TD>
+</TR>
+</TABLE>
+
+</FORM>:<P><IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16" ALIGN="ABSMIDDLE"
+ALT="Busy Indicator"> Hledání tiskáren ...</P>}
+
+</DIV>
diff --git a/templates/cs/choose-make.tmpl b/templates/cs/choose-make.tmpl
new file mode 100644
index 00000000..f018f0e3
--- /dev/null
+++ b/templates/cs/choose-make.tmpl
@@ -0,0 +1,64 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Úprava tiskárny {printer_name}:Přidat tiskárnu}</H2>
+
+<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<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">Název:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
+</TR>}
+<TR>
+<TH CLASS="label">Popis:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{printer_info}">{printer_info}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Umístění:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{printer_location}">{printer_location}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Připojení:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Sdílení:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_IS_SHARED" VALUE="{?printer_is_shared}">
+{?printer_is_shared=?ne:{?printer_is_shared=0?ne:}}sdílená</TD>
+</TR>
+<TR>
+<TH CLASS="label">Výrobce:</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="Pokračovat"></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD>&nbsp;</TD>
+</TR>
+<TR>
+<TH CLASS="label">Nebo vybrat soubor PPD:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
+TYPE="FILE" NAME="PPD_FILE"></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="{op=add-printer?Přidat tiskárnu:Upravit tiskárnu}"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+\ No newline at end of file
diff --git a/templates/cs/choose-model.tmpl b/templates/cs/choose-model.tmpl
new file mode 100644
index 00000000..75fc46f2
--- /dev/null
+++ b/templates/cs/choose-model.tmpl
@@ -0,0 +1,60 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Úprava tiskárny {printer_name}:Přidat tiskárnu}</H2>
+
+<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<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">Název:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
+</TR>}
+<TR>
+<TH CLASS="label">Popis:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{printer_info}">{printer_info}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Umístění:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{printer_location}">{printer_location}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Připojení:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Sdílení:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_IS_SHARED" VALUE="{?printer_is_shared}">
+{?printer_is_shared=?ne:{?printer_is_shared=0?ne:}}sdílená</TD>
+</TR>
+<TR>
+<TH CLASS="label">Výrobce:</TH>
+<TD>{PPD_MAKE} <INPUT TYPE="SUBMIT" NAME="SELECT_MAKE" VALUE="Vybrat jiného výrobce"></TD>
+</TR>
+<TR>
+<TH CLASS="label">Model:</TH>
+<TD>
+<SELECT NAME="PPD_NAME" SIZE="10">
+{op=add-printer?:<OPTION VALUE="__no_change__" SELECTED>Aktuální: {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">Nebo vybrat soubor PPD:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
+TYPE="FILE" NAME="PPD_FILE"></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="{op=add-printer?Přidat tiskárnu:Upravit tiskárnu}"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+\ No newline at end of file
diff --git a/templates/cs/choose-serial.tmpl b/templates/cs/choose-serial.tmpl
new file mode 100644
index 00000000..593bcdde
--- /dev/null
+++ b/templates/cs/choose-serial.tmpl
@@ -0,0 +1,52 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Úprava tiskárny {printer_name}:Přidat tiskárnu}</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:}
+
+<TABLE>
+<TR>
+<TH CLASS="label">Připojení:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Přenosová rychlost:</TH>
+<TD><SELECT NAME="BAUDRATE">
+{[baudrates]<OPTION {?baudrate={baudrates}?SELECTED:}>{baudrates}}
+</SELECT></TD>
+</TR>
+<TR>
+<TH CLASS="label">Parita:</TH>
+<TD><SELECT NAME="PARITY">
+<OPTION VALUE="none" {?parity=none?SELECTED:}>Žádná
+<OPTION VALUE="even" {?parity=even?SELECTED:}>Sudá
+<OPTION VALUE="odd" {?parity=odd?SELECTED:}>Lichá
+</SELECT></TD>
+</TR>
+<TR>
+<TH CLASS="label">Datových bitů:</TH>
+<TD><SELECT NAME="BITS">
+<OPTION {?bits=8?SELECTED:}>8
+<OPTION {?bits=7?SELECTED:}>7
+</SELECT></TD>
+</TR>
+<TR>
+<TH CLASS="label">Řízení toku dat:</TH>
+<TD><SELECT NAME="FLOW">
+<OPTION VALUE="none" {?flow=none?SELECTED:}>Žádné
+<OPTION VALUE="soft" {?flow=soft?SELECTED:}>XON/XOFF (software)
+<OPTION VALUE="hard" {?flow=hard?SELECTED:}>RTS/CTS (hardware)
+<OPTION VALUE="dtrdsr" {?flow=dtrdsr?SELECTED:}>DTR/DSR (hardware)
+</SELECT></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Pokračovat"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+\ No newline at end of file
diff --git a/templates/cs/choose-uri.tmpl b/templates/cs/choose-uri.tmpl
new file mode 100644
index 00000000..ad919b75
--- /dev/null
+++ b/templates/cs/choose-uri.tmpl
@@ -0,0 +1,44 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Úprava tiskárny {printer_name}:Přidat tiskárnu}</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<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">Připojení:</TH>
+<TD><INPUT TYPE="URL" SIZE="60" MAXLENGTH="1023" NAME="DEVICE_URI" VALUE="{current_device_uri?{current_device_uri}:{device_uri}}"></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD>Příklady:
+<PRE>
+    http://hostname:631/ipp/
+    http://hostname:631/ipp/port1
+
+    ipp://hostname/ipp/
+    ipp://hostname/ipp/port1
+
+    lpd://hostname/queue
+
+    socket://hostname
+    socket://hostname:9100
+</PRE>
+
+<P>Viz. <A HREF="/help/network.html" TARGET="_blank">"Síťové tiskárny"</A> pro zadání správného URI tiskárny.</P>
+
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Pokračovat"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+
diff --git a/templates/cs/class-added.tmpl b/templates/cs/class-added.tmpl
new file mode 100644
index 00000000..d6443033
--- /dev/null
+++ b/templates/cs/class-added.tmpl
@@ -0,0 +1,7 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Přidat třídu</H2>
+
+<P>Třída <A HREF="/classes/{printer_name}">{printer_name}</A> byla úspěšně přidána.
+
+</DIV>
diff --git a/templates/cs/class-confirm.tmpl b/templates/cs/class-confirm.tmpl
new file mode 100644
index 00000000..87c16140
--- /dev/null
+++ b/templates/cs/class-confirm.tmpl
@@ -0,0 +1,10 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Výmaz třídy {printer_name}</H2>
+
+<P><B>Varování:</B> Opravdu chcete vymazat třídu
+{printer_name}?</P>
+
+<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Vymazat třídu"></FORM></P>
+
+</DIV>
diff --git a/templates/cs/class-deleted.tmpl b/templates/cs/class-deleted.tmpl
new file mode 100644
index 00000000..e2fb7f8f
--- /dev/null
+++ b/templates/cs/class-deleted.tmpl
@@ -0,0 +1,7 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Výmaz třídy {printer_name}</H2>
+
+<P>Třída {printer_name} byla úspěšně vymazána.
+
+</DIV>
+\ No newline at end of file
diff --git a/templates/cs/class-jobs-header.tmpl b/templates/cs/class-jobs-header.tmpl
new file mode 100644
index 00000000..d8142d1c
--- /dev/null
+++ b/templates/cs/class-jobs-header.tmpl
@@ -0,0 +1,3 @@
+<DIV CLASS="indent">
+<H3 CLASS="title">Úlohy</H3>
+</DIV>
diff --git a/templates/cs/class-modified.tmpl b/templates/cs/class-modified.tmpl
new file mode 100644
index 00000000..131fd08f
--- /dev/null
+++ b/templates/cs/class-modified.tmpl
@@ -0,0 +1,7 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Úprava třídy {printer_name}</H2>
+
+<P>Třída <A HREF="/classes/{printer_name}">{printer_name}</A> byla úspěšně upravena.
+
+</DIV>
+\ No newline at end of file
diff --git a/templates/cs/class.tmpl b/templates/cs/class.tmpl
new file mode 100644
index 00000000..39f72bf9
--- /dev/null
+++ b/templates/cs/class.tmpl
@@ -0,0 +1,44 @@
+<DIV CLASS="indent">
+<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>
+({printer_state=3?čeká:{printer_state=4?tiskne:pauza}},
+{printer_is_accepting_jobs=0?ne:}přijímá úlohy,
+{server_is_sharing_printers=0?není:{printer_is_shared=0?není:}} sdílení{default_name={printer_name}?, výchozí server:})</H2>
+
+<FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<SELECT NAME="OP" ONCHANGE="document.maintenance.submit();">
+<OPTION VALUE="">Údržba</OPTION>
+<OPTION VALUE="print-test-page">Tisk zkušební stránky</OPTION>
+{printer_state=5?<OPTION VALUE="start-class">Obnovení třídy</OPTION>:<OPTION VALUE="stop-class">Pozastavení třídy</OPTION>}
+{printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Příjem úloh</OPTION>:<OPTION VALUE="reject-jobs">Odmítnutí úloh</OPTION>}
+<OPTION VALUE="move-jobs">Přesun všech úloh</OPTION>
+<OPTION VALUE="purge-jobs">Výmaz všech úloh</OPTION>
+</SELECT>
+<INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;">
+</FORM>
+
+<FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">
+<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="1">
+<SELECT NAME="OP" ONCHANGE="document.administration.submit();">
+<OPTION VALUE="">Administrace</OPTION>
+<OPTION VALUE="modify-class">Úprava třídy</OPTION>
+<OPTION VALUE="delete-class">Výmaz třídy</OPTION>
+<OPTION VALUE="set-class-options">Nastavení parametrů</OPTION>
+<OPTION VALUE="set-as-default">Nastavení jako výchozí na serveru</OPTION>
+<OPTION VALUE="set-allowed-users">Nastavení přístupu uživatelů</OPTION>
+</SELECT>
+<INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;">
+</FORM>
+
+<TABLE SUMMARY="{printer_name}">
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Popis:</TH><TD>{printer_info}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Umístění:</TH><TD>{printer_location}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Členové:</TH><TD>{?member_uris=?None:{member_uris}}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Nastavení:</TH><TD>job-sheets={job_sheets_default}
+media={media_default?{media_default}:unknown}
+{sides_default?sides={sides_default}:}</TD></TR>
+</TABLE>
+
+</DIV>
diff --git a/templates/cs/classes-header.tmpl b/templates/cs/classes-header.tmpl
new file mode 100644
index 00000000..5bfeeee7
--- /dev/null
+++ b/templates/cs/classes-header.tmpl
@@ -0,0 +1 @@
+<P ALIGN="CENTER">{total=0?Žádné třídy:Zobrazení {#printer_name} z {total} tříd{total=1?y:}}.</P>
diff --git a/templates/cs/classes.tmpl b/templates/cs/classes.tmpl
new file mode 100644
index 00000000..02d32a63
--- /dev/null
+++ b/templates/cs/classes.tmpl
@@ -0,0 +1,12 @@
+{#printer_name=0?:
+<TABLE CLASS="list" SUMMARY="Class List">
+<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> Název fromty <SMALL>&#x25b2;</SMALL>:<SMALL>&#x25bc;</SMALL> Název fronty <SMALL>&#x25bc;</SMALL>}</A></TH><TH>Popis</TH><TH>Umístění</TH><TH>Členové</TH><TH>Stav</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=?Žádný:{member_uris}}</TD><TD>{printer_state=3?Čeká:{printer_state=4?Tiskne:Pauza}}{printer_state_message? - "{printer_state_message}":}</TD></TR>
+}
+</TBODY>
+</TABLE></DIV>}
diff --git a/templates/cs/command.tmpl b/templates/cs/command.tmpl
new file mode 100644
index 00000000..b2a4fd47
--- /dev/null
+++ b/templates/cs/command.tmpl
@@ -0,0 +1,12 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{title} u {printer_name}</H2>
+
+<P>{job_state>5?:<IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16"
+ALIGN="ABSMIDDLE" ALT="Busy Indicator"> }Stav úlohy
+{job_state=3?čeká:{job_state=4?pozastaveno:
+{job_state=5?zpracováváno:{job_state=6?zastaveno:
+{job_state=7?zrušeno:{job_state=8?zrušeno:dokončeno}}}}}}{job_state=9?:{job_printer_state_message?,
+<EM>"{job_printer_state_message}"</EM>:}}.</P>
+
+</DIV>
diff --git a/templates/cs/edit-config.tmpl b/templates/cs/edit-config.tmpl
new file mode 100644
index 00000000..ab3bf652
--- /dev/null
+++ b/templates/cs/edit-config.tmpl
@@ -0,0 +1,24 @@
+<SCRIPT TYPE="text/javascript">
+function reset_config()
+{
+  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
+}
+</SCRIPT>
+
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Úprava konfiguračního souboru</H2>
+
+<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+
+<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
+
+<P><INPUT TYPE="SUBMIT" NAME="SAVECHANGES" VALUE="Uložit změny">
+<INPUT TYPE="BUTTON" VALUE="Použít výchozí konfigurační soubor"
+onClick="reset_config();"></P>
+
+</FORM>
+
+</DIV>
diff --git a/templates/cs/error-op.tmpl b/templates/cs/error-op.tmpl
new file mode 100644
index 00000000..636edc2d
--- /dev/null
+++ b/templates/cs/error-op.tmpl
@@ -0,0 +1,9 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Chyba {?title} u {?printer_name}</H2>
+
+<P>Chyba:</P>
+
+<BLOCKQUOTE>Neznámá operace "{op}"!</BLOCKQUOTE>
+
+</DIV>
diff --git a/templates/cs/error.tmpl b/templates/cs/error.tmpl
new file mode 100644
index 00000000..7ee1926a
--- /dev/null
+++ b/templates/cs/error.tmpl
@@ -0,0 +1,9 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Chyba {?title} u {?printer_name}</H2>
+
+<P>{?message?{message}:Chyba}:</P>
+
+<BLOCKQUOTE>{error}</BLOCKQUOTE>
+
+</DIV>
diff --git a/templates/cs/header.tmpl.in b/templates/cs/header.tmpl.in
new file mode 100644
index 00000000..739e51dd
--- /dev/null
+++ b/templates/cs/header.tmpl.in
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//CZ" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+<HEAD>
+	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+	<TITLE>{title} - 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">
+	{refresh_page?<META HTTP-EQUIV="Refresh" CONTENT="{refresh_page}">:}
+</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="unsel"><A HREF="/">&nbsp;&nbsp;Hlavní strana&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=admin?:un}sel"><A HREF="/admin">&nbsp;&nbsp;Administrace&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=classes?:un}sel"><A HREF="/classes/">&nbsp;&nbsp;Třídy tiskáren&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=help?:un}sel"><A HREF="/help/">&nbsp;&nbsp;Nápověda&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=jobs?:un}sel"><A HREF="/jobs/">&nbsp;&nbsp;Úlohy&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=printers?:un}sel"><A HREF="/printers/">&nbsp;&nbsp;Tiskárny&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel" WIDTH="100%"><FORM ACTION="/help/" METHOD="GET"><INPUT
+TYPE="SEARCH" NAME="QUERY" SIZE="20" PLACEHOLDER="Hledat"
+VALUE="{SECTION=help?{?QUERY}:}" AUTOSAVE="org.cups.help" RESULTS="20"></FORM></TD>
+<TD><IMG SRC="/images/right.gif" WIDTH="4" HEIGHT="36" ALT=""></TD>
+</TR>
+<TR><TD COLSPAN="9">&nbsp;</TD></TR>
+</TABLE>
diff --git a/templates/cs/help-header.tmpl b/templates/cs/help-header.tmpl
new file mode 100644
index 00000000..fe8dca84
--- /dev/null
+++ b/templates/cs/help-header.tmpl
@@ -0,0 +1,48 @@
+<DIV CLASS="indent">
+<FORM ACTION="/help/{?HELPFILE}" METHOD="GET">
+{TOPIC?<INPUT TYPE="HIDDEN" NAME="TOPIC" VALUE="{TOPIC}">:}
+
+<P ALIGN="CENTER"><B>Hledat v{HELPTITLE? {HELPTITLE}:{TOPIC? {TOPIC}:e všech dokumentech}}:</B> <INPUT
+TYPE="SEARCH" NAME="QUERY" VALUE="{?QUERY}" SIZE="40" PLACEHOLDER=""
+AUTOSAVE="org.cups.help" RESULTS="20">
+<INPUT TYPE="SUBMIT" NAME="SEARCH" VALUE="Hledat">
+<INPUT TYPE="SUBMIT" NAME="CLEAR" VALUE="Smazat"></P>
+
+</FORM>
+
+<!-- Bookmarks -->
+<DIV CLASS="sidebar"><TABLE CLASS="inset" SUMMARY="Contents">
+<TR><TD>
+
+<H3 CLASS="title">Dokumenty nápovědy</H3>
+
+<P CLASS="l0"><A HREF="/help/{QUERY??QUERY={QUERY}:}">Všechny dokumenty</A></P>
+<HR>
+
+{[BMTEXT]<P CLASS="l{BMINDENT}"><A HREF="{BMLINK}">{BMTEXT}</A></P>
+}
+</TD></TR>
+</TABLE></DIV>
+
+{QUERY?<P>Výsledky hledání v{HELPFILE? {HELPTITLE}:{TOPIC? {TOPIC}:e všech dokumentech}}\:</P>
+{QTEXT?<UL>
+{[QTEXT]<LI><A HREF="{QLINK}">{QTEXT}</A>{QPTEXT? (v <I><A HREF="{QPLINK}">{QPTEXT}</A></I>):}</LI>}
+{QTEXT?</UL>:}
+:<P>Nebyl nalezen záznam.</P>}
+<HR NOSHADE>:}
+{HELPTITLE?<H1>{HELPTITLE}</H1>
+<FORM ACTION="/help/{?HELPFILE}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="PRINTABLE" VALUE="YES"><INPUT TYPE="SUBMIT" VALUE="Zobrazit verzi pro tisk"></FORM>:
+
+<H1>Nápověda</H1>
+
+<P>Toto je rozhraní nápovědy CUPS. Zadejte hledané slovo nebo klikněte na
+některý z odkazů dokumentace k zobrazení nápovědy.</P>
+
+<P>Pokud jste nový uživatel programu CUPS, přečtěte si stránku "<a
+href="/help/overview.html">Popis programu CUPS</a>". Zkušení uživatelé by
+si měli přečíst stránku "<a href="/help/whatsnew.html">Co je nového v CUPS 1.6</a>".</P>
+
+<P><A HREF="http://www.cups.org/">Hlavní strana programu CUPS</A> také
+poskytuje mnoho zdrojů, včetně uživatelského diskuzního fóra, odpovědí
+na často kladené otázky a formuláře pro odesílání zpráv o chybách a
+požadavky na nové funkce.</P>}
diff --git a/templates/cs/help-printable.tmpl b/templates/cs/help-printable.tmpl
new file mode 100644
index 00000000..763a98b7
--- /dev/null
+++ b/templates/cs/help-printable.tmpl
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//CS" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+<HEAD>
+	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+	<TITLE>{HELPTITLE}</TITLE>
+	<LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups-printable.css">
+	<LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png">
+</HEAD>
+<BODY>
diff --git a/templates/cs/help-trailer.tmpl b/templates/cs/help-trailer.tmpl
new file mode 100644
index 00000000..4c1ebed8
--- /dev/null
+++ b/templates/cs/help-trailer.tmpl
@@ -0,0 +1 @@
+</DIV>
diff --git a/templates/cs/job-cancel.tmpl b/templates/cs/job-cancel.tmpl
new file mode 100644
index 00000000..31f50ead
--- /dev/null
+++ b/templates/cs/job-cancel.tmpl
@@ -0,0 +1,7 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Zrušit úlohu {job_id}</H2>
+
+<P><A HREF="{job_printer_uri}">Úloha {job_id}</A> byla zrušena.
+
+</DIV>
diff --git a/templates/cs/job-hold.tmpl b/templates/cs/job-hold.tmpl
new file mode 100644
index 00000000..f0e7b631
--- /dev/null
+++ b/templates/cs/job-hold.tmpl
@@ -0,0 +1,7 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Pozastavení úlohy {job_id}</H2>
+
+<P><A HREF="{job_printer_uri}">Úloha {job_id}</A> byla pozastavena.
+
+</DIV>
diff --git a/templates/cs/job-move.tmpl b/templates/cs/job-move.tmpl
new file mode 100644
index 00000000..b706ca83
--- /dev/null
+++ b/templates/cs/job-move.tmpl
@@ -0,0 +1,27 @@
+<DIV CLASS="indent">
+
+<FORM METHOD="POST" ACTION="/{SECTION}/{job_id?:{printer_name}}">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:}
+
+<H2 CLASS="title">{job_id?Přesun úlohy {job_id}:Přesun všech úloh}</H2>
+
+<TABLE>
+<TR>
+<TH CLASS="label">Nová tiskárna:</TH>
+<TD>
+<SELECT NAME="JOB_PRINTER_URI" SIZE="10">
+{[job_printer_uri]<OPTION VALUE="{job_printer_uri}">{job_printer_name}}
+</SELECT>
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Přesunout {job_id?úlohu:úlohy}"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+
+</DIV>
diff --git a/templates/cs/job-moved.tmpl b/templates/cs/job-moved.tmpl
new file mode 100644
index 00000000..40e5eef8
--- /dev/null
+++ b/templates/cs/job-moved.tmpl
@@ -0,0 +1,8 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{job_id?Přesun úlohy {job_id}:Přesun všech úloh}</H2>
+
+<P>{job_id?<A HREF="/jobs/{job_id}">Úloha přesunuta {job_id}</A>:Všechny úlohy přesunuty} na tiskárnu 
+<A HREF="/{is_class?classes:printers}/{job_printer_name}">{job_printer_name}</A>.</P>
+
+</DIV>
diff --git a/templates/cs/job-release.tmpl b/templates/cs/job-release.tmpl
new file mode 100644
index 00000000..199c7989
--- /dev/null
+++ b/templates/cs/job-release.tmpl
@@ -0,0 +1,7 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Uvolnit úlohu {job_id}</H2>
+
+<P><A HREF="{job_printer_uri}">Úloha {job_id}</A> byla uvolněna k tisku.
+
+</DIV>
diff --git a/templates/cs/job-restart.tmpl b/templates/cs/job-restart.tmpl
new file mode 100644
index 00000000..56c113a1
--- /dev/null
+++ b/templates/cs/job-restart.tmpl
@@ -0,0 +1,7 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Opakovaný tisk úlohy {job_id}</H2>
+
+<P><A HREF="{job_printer_uri}">Úloha {job_id}</A> byla znovu spuštěna.
+
+</DIV>
diff --git a/templates/cs/jobs-header.tmpl b/templates/cs/jobs-header.tmpl
new file mode 100644
index 00000000..591d4ce1
--- /dev/null
+++ b/templates/cs/jobs-header.tmpl
@@ -0,0 +1,5 @@
+<DIV CLASS="indent">{?which_jobs=?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Aktivní úlohy"></FORM>}
+{?which_jobs=completed?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="completed"><INPUT TYPE="SUBMIT" VALUE="Dokončené úlohy"></FORM>}
+{?which_jobs=all?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="all"><INPUT TYPE="SUBMIT" VALUE="Všechny úlohy"></FORM>}</DIV>
+
+<P ALIGN="CENTER">{total=0?Žádné úlohy:Zobrazení {#job_id} z {total} {?which_jobs=?aktivních:{which_jobs=all?:dokončených}} {total=1?úloha:úloh}}.</P>
diff --git a/templates/cs/jobs.tmpl b/templates/cs/jobs.tmpl
new file mode 100644
index 00000000..75b483a6
--- /dev/null
+++ b/templates/cs/jobs.tmpl
@@ -0,0 +1,37 @@
+{#job_id=0?:
+<TABLE CLASS="list" SUMMARY="Job List">
+<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> ID <SMALL>&#x25b2;</SMALL>:<SMALL>&#x25bc;</SMALL> ID <SMALL>&#x25bc;</SMALL>}</A></TH><TH>Jméno</TH><TH>Uživatel</TH><TH>Velikost</TH><TH>Počet stran</TH><TH>Stav</TH><TH>Řízení</TH></TR>
+</THEAD>
+<TBODY>
+{[job_id]
+<TR VALIGN="TOP">
+<TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id}{?phone? ({phone}):}&nbsp;</TD>
+<TD>{?job_name=?Neznámý:{job_name}}&nbsp;</TD>
+<TD>{?job_originating_user_name=?Neznámý:{job_originating_user_name}}&nbsp;</TD>
+<TD>{job_k_octets} k&nbsp;</TD>
+<TD>{job_media_sheets_completed=0?Neznámý:{?job_media_sheets_completed}}&nbsp;</TD>
+<TD>{job_state=3?Čeká od<BR>{time_at_creation}:{job_state=4?Pozastaveno od<BR>{time_at_creation}:
+{job_state=5?Zpracováváno od<BR>{time_at_processing}:{job_state=6?Zastaveno:
+{job_state=7?Zrušeno v<BR>{time_at_completed}:{job_state=8?Zrušeno:Dokončeno v<BR>{time_at_completed}}}}}}}&nbsp;{job_printer_state_message?<BR>
+<EM>"{job_printer_state_message}"</EM>:}</TD>
+<TD>
+{job_preserved>0?{job_state>5?
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="restart-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"><INPUT TYPE="SUBMIT"
+VALUE="Opakovat tisk"></FORM>:}:}
+{job_state=4?
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="release-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}">
+<INPUT TYPE="SUBMIT" VALUE="Uvolnit"></FORM>:}
+{job_state=3?
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="hold-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}">
+<INPUT TYPE="SUBMIT" VALUE="Pozastavit"></FORM>:}
+{job_state<7?
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}">
+<INPUT TYPE="SUBMIT" VALUE="Zrušit"></FORM>
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="move-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="SUBMIT" VALUE="Přesunout"></FORM>:}
+&nbsp;</TD>
+</TR>
+}
+</TBODY>
+</TABLE>
+}
diff --git a/templates/cs/list-available-printers.tmpl b/templates/cs/list-available-printers.tmpl
new file mode 100644
index 00000000..8c01b27e
--- /dev/null
+++ b/templates/cs/list-available-printers.tmpl
@@ -0,0 +1,11 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Dostupné tiskárny</H2>
+
+{#device_uri=0?<P>Žádné tiskárny nenalezeny.</P>
+:<UL>{[device_uri]
+<LI><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="HIDDEN" NAME="TEMPLATE_NAME" VALUE="{template_name}"><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE=""><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{device_make_and_model}"><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}"><INPUT TYPE="SUBMIT" VALUE="Přidat tiskárnu"></FORM>
+{device_make_and_model} ({device_info})</LI>
+}</UL>}
+
+</DIV>
diff --git a/templates/cs/modify-class.tmpl b/templates/cs/modify-class.tmpl
new file mode 100644
index 00000000..9e4881a2
--- /dev/null
+++ b/templates/cs/modify-class.tmpl
@@ -0,0 +1,34 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Úprava třídy {printer_name}</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+
+<TABLE>
+<TR>
+<TH CLASS="label">Popis:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"></TD>
+</TR>
+<TR>
+<TH CLASS="label">Umístění:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"></TD>
+</TR>
+<TR>
+<TH CLASS="label">Členové:</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="Upravit třídu"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+\ No newline at end of file
diff --git a/templates/cs/modify-printer.tmpl b/templates/cs/modify-printer.tmpl
new file mode 100644
index 00000000..8fc48ed6
--- /dev/null
+++ b/templates/cs/modify-printer.tmpl
@@ -0,0 +1,42 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Úprava tiskárny {printer_name}</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<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}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+
+<TABLE>
+<TR>
+<TH CLASS="label">Popis:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(Srozumitelný popis)</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Location:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(Srozumitelný popis umístění)</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Připojení:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Sdílení:</TH>
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
+sdílet tuto tiskárnu</TD>
+</TR>
+<TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Pokračovat"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
diff --git a/templates/cs/norestart.tmpl b/templates/cs/norestart.tmpl
new file mode 100644
index 00000000..4f09e8b2
--- /dev/null
+++ b/templates/cs/norestart.tmpl
@@ -0,0 +1,8 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Změna nastavení</H2>
+
+<P>Server nebyl dosud restartován, protože nebyly provedeny žádné změny v
+konfiguraci ...</P>
+
+</DIV>
diff --git a/templates/cs/option-boolean.tmpl b/templates/cs/option-boolean.tmpl
new file mode 100644
index 00000000..e832ee10
--- /dev/null
+++ b/templates/cs/option-boolean.tmpl
@@ -0,0 +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-1}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
+</TD>
+</TR>
diff --git a/templates/cs/option-conflict.tmpl b/templates/cs/option-conflict.tmpl
new file mode 100644
index 00000000..8c683269
--- /dev/null
+++ b/templates/cs/option-conflict.tmpl
@@ -0,0 +1,7 @@
+<P><B>Chyba:</B> Následující parametry jsou v rozporu:</P>
+
+<UL>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
+}</UL>
+
+<P>Prosím změňte jeden nebo více parametrů pro vyřešení problému.</P>
diff --git a/templates/cs/option-header.tmpl b/templates/cs/option-header.tmpl
new file mode 100644
index 00000000..464726a5
--- /dev/null
+++ b/templates/cs/option-header.tmpl
@@ -0,0 +1,5 @@
+<DIV CLASS="tab" ID="{group_id}">
+
+<H3 ALIGN="CENTER">{group}</H3>
+
+<TABLE WIDTH="100%">
diff --git a/templates/cs/option-pickmany.tmpl b/templates/cs/option-pickmany.tmpl
new file mode 100644
index 00000000..0da75e5d
--- /dev/null
+++ b/templates/cs/option-pickmany.tmpl
@@ -0,0 +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}}
+</SELECT></TD>
+</TR>
diff --git a/templates/cs/option-pickone.tmpl b/templates/cs/option-pickone.tmpl
new file mode 100644
index 00000000..9c7e2a2b
--- /dev/null
+++ b/templates/cs/option-pickone.tmpl
@@ -0,0 +1,18 @@
+<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}}
+</SELECT>
+{iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
+<TR><TH CLASS="sublabel">{paramtext}:</TH>
+<TD>{params=Units?<SELECT NAME="{keyword-1}.{params}">
+<OPTION VALUE="pt"{paramvalue=pt? SELECTED:}>Body</OPTION>
+<OPTION VALUE="mm"{paramvalue=mm? SELECTED:}>Millimetry</OPTION>
+<OPTION VALUE="cm"{paramvalue=cm? SELECTED:}>Centimetry</OPTION>
+<OPTION VALUE="in"{paramvalue=in? SELECTED:}>Palce</OPTION>
+<OPTION VALUE="ft"{paramvalue=ft? SELECTED:}>Stopy</OPTION>
+<OPTION VALUE="m"{paramvalue=m? SELECTED:}>Metry</OPTION>
+</SELECT>:<INPUT TYPE="{inputtype}" NAME="{keyword-1}.{params}" VALUE="{paramvalue}">}</TD></TR>
+}</TABLE>
+</TD>:}
+</TR>
diff --git a/templates/cs/option-trailer.tmpl b/templates/cs/option-trailer.tmpl
new file mode 100644
index 00000000..916de2fe
--- /dev/null
+++ b/templates/cs/option-trailer.tmpl
@@ -0,0 +1,5 @@
+</TABLE>
+
+<P ALIGN="CENTER"><INPUT TYPE="SUBMIT" VALUE="Nastavit parametry"></P>
+
+</DIV>
+\ No newline at end of file
diff --git a/templates/cs/pager.tmpl b/templates/cs/pager.tmpl
new file mode 100644
index 00000000..35a7a926
--- /dev/null
+++ b/templates/cs/pager.tmpl
@@ -0,0 +1,6 @@
+<TABLE CLASS="inset" SUMMARY="Paging Bar">
+<TR>
+	<TD WIDTH="50%">{PREV?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{PREV}"><INPUT TYPE="SUBMIT" VALUE="&#x25c0; Předchozí"></FORM>:&nbsp;}</TD>
+	<TD WIDTH="50%" ALIGN="RIGHT">{NEXT?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{NEXT}"><INPUT TYPE="SUBMIT" VALUE="Další &#x25b6;"></FORM>:&nbsp;}</TD>
+</TR>
+</TABLE>
diff --git a/templates/cs/printer-accept.tmpl b/templates/cs/printer-accept.tmpl
new file mode 100644
index 00000000..c81faefe
--- /dev/null
+++ b/templates/cs/printer-accept.tmpl
@@ -0,0 +1,9 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Příjem úloh u {is_class?třídy:tiskárny} {printer_name}</H2>
+
+<P>{is_class?Třída:Tiskárna} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+nyní přijímá úlohy.</P>
+
+</DIV>
diff --git a/templates/cs/printer-added.tmpl b/templates/cs/printer-added.tmpl
new file mode 100644
index 00000000..ac59405e
--- /dev/null
+++ b/templates/cs/printer-added.tmpl
@@ -0,0 +1,7 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Přidat tiskárnu</H2>
+
+<P>Tiskárna <A HREF="/printers/{printer_name}">{printer_name}</A> byla úspěšně přidána.
+
+</DIV>
diff --git a/templates/cs/printer-configured.tmpl b/templates/cs/printer-configured.tmpl
new file mode 100644
index 00000000..c002232f
--- /dev/null
+++ b/templates/cs/printer-configured.tmpl
@@ -0,0 +1,8 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Nastavení parametrů u {printer_name}</H2>
+
+<P>{OP=set-class-options?Class <A HREF="/classes/{printer_name}">:Tiskárna <A HREF="/printers/{printer_name}">}{printer_name}</A>
+byla úspěšně nastavena.
+
+</DIV>
diff --git a/templates/cs/printer-confirm.tmpl b/templates/cs/printer-confirm.tmpl
new file mode 100644
index 00000000..5ace8a6c
--- /dev/null
+++ b/templates/cs/printer-confirm.tmpl
@@ -0,0 +1,10 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Výmaz tiskárny {printer_name}</H2>
+
+<P><B>Varování:</B> Opravdu chcete vymazat tiskárnu
+{printer_name}?</P>
+
+<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Vymazat tiskárnu"></FORM></P>
+
+</DIV>
diff --git a/templates/cs/printer-default.tmpl b/templates/cs/printer-default.tmpl
new file mode 100644
index 00000000..d066cc08
--- /dev/null
+++ b/templates/cs/printer-default.tmpl
@@ -0,0 +1,11 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Nastavení {is_class?třídy:tiskárny} {printer_name} jako výchozí</H2>
+
+<P>{is_class?Třída:Tiskárna} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+byla nastavena jako výchozí na serveru.</P>
+
+<BLOCKQUOTE><B>Pozn.</B> libovolný uživatel může pomocí příkazu <TT>lpoptions</TT> přepsat toto nastavení.</BLOCKQUOTE>
+
+</DIV>
diff --git a/templates/cs/printer-deleted.tmpl b/templates/cs/printer-deleted.tmpl
new file mode 100644
index 00000000..76c8b22a
--- /dev/null
+++ b/templates/cs/printer-deleted.tmpl
@@ -0,0 +1,7 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Výmaz tiskárny {printer_name}</H2>
+
+<P>Tiskárna {printer_name} byla úspěšně vymazána.
+
+</DIV>
diff --git a/templates/cs/printer-jobs-header.tmpl b/templates/cs/printer-jobs-header.tmpl
new file mode 100644
index 00000000..d8142d1c
--- /dev/null
+++ b/templates/cs/printer-jobs-header.tmpl
@@ -0,0 +1,3 @@
+<DIV CLASS="indent">
+<H3 CLASS="title">Úlohy</H3>
+</DIV>
diff --git a/templates/cs/printer-modified.tmpl b/templates/cs/printer-modified.tmpl
new file mode 100644
index 00000000..3dd91d25
--- /dev/null
+++ b/templates/cs/printer-modified.tmpl
@@ -0,0 +1,8 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Úprava tiskárny {printer_name}</H2>
+
+<P>Tiskárna <A HREF="/printers/{printer_name}">{printer_name}</A> byla
+úspěšně upravena.
+
+</DIV>
+\ No newline at end of file
diff --git a/templates/cs/printer-purge.tmpl b/templates/cs/printer-purge.tmpl
new file mode 100644
index 00000000..b85195fd
--- /dev/null
+++ b/templates/cs/printer-purge.tmpl
@@ -0,0 +1,10 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Výmaz úloh u {is_class?třídy:tiskárny} {printer_name}</H2>
+
+<P>U {is_class?třídy:tiskárny} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+byly vymazány všechny úlohy.</P>
+
+</DIV>
+
diff --git a/templates/cs/printer-reject.tmpl b/templates/cs/printer-reject.tmpl
new file mode 100644
index 00000000..6ce184bc
--- /dev/null
+++ b/templates/cs/printer-reject.tmpl
@@ -0,0 +1,9 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Odmítnutí úloh u {is_class?třídy:tiskárny} {printer_name}</H2>
+
+<P>{is_class?Třída:Tiskárna} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+už nepřijímá úlohy.</P>
+
+</DIV>
diff --git a/templates/cs/printer-start.tmpl b/templates/cs/printer-start.tmpl
new file mode 100644
index 00000000..cc9f3ebd
--- /dev/null
+++ b/templates/cs/printer-start.tmpl
@@ -0,0 +1,9 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Obnovení {is_class?třídy:tiskárny} {printer_name}</H2>
+
+<P>{is_class?Třída:Tiskárna} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+byla obnovena.</P>
+
+</DIV>
+\ No newline at end of file
diff --git a/templates/cs/printer-stop.tmpl b/templates/cs/printer-stop.tmpl
new file mode 100644
index 00000000..cfecaa0a
--- /dev/null
+++ b/templates/cs/printer-stop.tmpl
@@ -0,0 +1,9 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Pozastavení {is_class?třídy:tiskárny} {printer_name}</H2>
+
+<P>{is_class?Třída:Tiskárna} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+byla pozastavena.</P>
+
+</DIV>
+\ No newline at end of file
diff --git a/templates/cs/printer.tmpl b/templates/cs/printer.tmpl
new file mode 100644
index 00000000..3cddce20
--- /dev/null
+++ b/templates/cs/printer.tmpl
@@ -0,0 +1,48 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>
+({printer_state=3?čeká:{printer_state=4?tiskne:pauza}},
+{printer_is_accepting_jobs=0?ne:}přijímá úlohy,
+{server_is_sharing_printers=0?není:{printer_is_shared=0?není:}} sdílení{default_name={printer_name}?, výchozí server:})</H2>
+
+<FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<SELECT NAME="OP" ONCHANGE="document.maintenance.submit();">
+<OPTION VALUE="">Údržba</OPTION>
+<OPTION VALUE="print-test-page">Tisk zkušební stránky</OPTION>
+{printer_commands~.*Clean.*?<OPTION VALUE="clean-print-heads">Vyčištění tiskových hlav</OPTION>:}
+{printer_commands~.*PrintSelfTestPage.*?<OPTION VALUE="print-self-test-page">Tisk self-test stránky</OPTION>:}
+{printer_state=5?<OPTION VALUE="start-printer">Obnovení tiskárny</OPTION>:<OPTION VALUE="stop-printer">Pozastavení tiskárny</OPTION>}
+{printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Příjem úloh</OPTION>:<OPTION VALUE="reject-jobs">Odmítnutí úloh</OPTION>}
+<OPTION VALUE="move-jobs">Přesun všech úloh</OPTION>
+<OPTION VALUE="purge-jobs">Výmaz všech úloh</OPTION>
+</SELECT>
+<INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;">
+</FORM>
+
+<FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">
+<SELECT NAME="OP" ONCHANGE="document.administration.submit();">
+<OPTION VALUE="">Administrace</OPTION>
+<OPTION VALUE="modify-printer">Úprava tiskárny</OPTION>
+<OPTION VALUE="delete-printer">Výmaz tiskárny</OPTION>
+<OPTION VALUE="set-printer-options">Nastavení parametrů</OPTION>
+<OPTION VALUE="set-as-default">Nastavení jako výchozí na serveru</OPTION>
+<OPTION VALUE="set-allowed-users">Nastavení přístupu uživatelů</OPTION>
+</SELECT>
+<INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;">
+</FORM>
+
+<TABLE SUMMARY="{printer_name}">
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Popis:</TH><TD>{printer_info}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Umístění:</TH><TD>{printer_location}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Výrobce a model:</TH><TD>{printer_make_and_model}
+({color_supported=1?barevná:černobílá}{sides_supported?, oboustranný tisk:})<BR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Připojení:</TH><TD>{device_uri}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Nastavení:</TH><TD>job-sheets={job_sheets_default}
+media={media_default?{media_default}:unknown}
+{sides_default?sides={sides_default}:}</TD></TR>
+</TABLE>
+
+</DIV>
+\ No newline at end of file
diff --git a/templates/cs/printers-header.tmpl b/templates/cs/printers-header.tmpl
new file mode 100644
index 00000000..4755aff3
--- /dev/null
+++ b/templates/cs/printers-header.tmpl
@@ -0,0 +1 @@
+<P ALIGN="CENTER">{total=0?Žádné tiskárny:Zobrazení {#printer_name} z {total} tiskár{total=1?ny:en}}.</P>
diff --git a/templates/cs/printers.tmpl b/templates/cs/printers.tmpl
new file mode 100644
index 00000000..3861ac33
--- /dev/null
+++ b/templates/cs/printers.tmpl
@@ -0,0 +1,11 @@
+{#printer_name=0?:
+<TABLE CLASS="list" SUMMARY="Printers List">
+<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> Název fronty <SMALL>&#x25b2;</SMALL>:<SMALL>&#x25bc;</SMALL> Název fronty <SMALL>&#x25bc;</SMALL>}</A></TH><TH>Popis</TH><TH>Umístění</TH><TH>Výrobce a model</TH><TH>Stav</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>{printer_make_and_model}</TD><TD>{printer_state=3?Čeká:{printer_state=4?Tiskne:Pauza}}{printer_state_message? - "{printer_state_message}":}</TD></TR>
+}
+</TBODY>
+</TABLE></DIV>}
diff --git a/templates/cs/restart.tmpl b/templates/cs/restart.tmpl
new file mode 100644
index 00000000..1c68b059
--- /dev/null
+++ b/templates/cs/restart.tmpl
@@ -0,0 +1,8 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Změna nastavení</H2>
+
+<P><IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16" ALIGN="ABSMIDDLE"
+ALT="Busy Indicator"> Prosím čekejte, probíhá restart serveru ...</P>
+
+</DIV>
diff --git a/templates/cs/samba-export.tmpl b/templates/cs/samba-export.tmpl
new file mode 100644
index 00000000..afc0bea6
--- /dev/null
+++ b/templates/cs/samba-export.tmpl
@@ -0,0 +1,55 @@
+<SCRIPT TYPE="text/javascript"><!--
+function select_printers() {
+  var list = document.export_samba.EXPORT_NAME;
+  var sel = document.export_samba.EXPORT_ALL.checked;
+
+  for (i = 0; i < list.length; i ++) {
+    list.options[i].selected = sel;
+  }
+}
+--></SCRIPT>
+
+<FORM METHOD="POST" ACTION="/admin/" NAME="export_samba">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba">
+
+<H2 CLASS="title">Export tiskáren do Samby</H2>
+
+{error?<P>Nelze exportovat tiskárny do Samby\:</P>
+<BLOCKQUOTE>{error}</BLOCKQUOTE>
+<P>Nahlédnout do <A HREF="/admin/log/error_log"
+TARGET="_blank">error_log</A> souboru pro více informací.</P>:
+
+<P>Tato stránka umožňuje export tiskáren do Samby, aby k nim klienti
+systému Windows mohli přistupovat pomocí ikon <VAR>Okolní počítače</VAR>
+nebo <VAR>Místa v síti</VAR> na své pracovní ploše. Musíte předem
+nainstalovat ovladače OS Windows pro postScriptové tiskárny, jak je popsáno v
+ <A HREF="/help/man-cupsaddsmb.html" TARGET="_blank">cupsaddsmb(8)</A> 
+manuálové stránky.</P>}
+
+<TABLE>
+<TR>
+<TH CLASS="label">Tiskárny:</TH>
+<TD>
+<SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE>
+{[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}}
+</SELECT><BR>
+<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL"{export_all? CHECKED:}
+onChange="select_printers()"> Export všech tiskáren
+</TD>
+</TR>
+<TR>
+<TH CLASS="label">Uživatel Samby:</TH>
+<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> (povinný údaj)</TD>
+</TR>
+<TR>
+<TH CLASS="label">Heslo uživatele:</TH>
+<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> (povinný údaj)</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Export tiskáren"></TD>
+</TR>
+</TABLE>
+
+</FORM>
diff --git a/templates/cs/samba-exported.tmpl b/templates/cs/samba-exported.tmpl
new file mode 100644
index 00000000..121fe488
--- /dev/null
+++ b/templates/cs/samba-exported.tmpl
@@ -0,0 +1 @@
+<P>Export tiskáren do Samby byl úspěšně proveden.</P>
diff --git a/templates/cs/search.tmpl b/templates/cs/search.tmpl
new file mode 100644
index 00000000..cad77ca0
--- /dev/null
+++ b/templates/cs/search.tmpl
@@ -0,0 +1,10 @@
+<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET">
+{WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:}
+{ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:}
+
+<P ALIGN="CENTER"><B>Hledat v
+{SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?třídách:{SECTION=jobs?úlohách:tiskárnách}}}:</B>
+<INPUT TYPE="SEARCH" NAME="QUERY" VALUE="{?QUERY}" SIZE="40"  PLACEHOLDER="" AUTOSAVE="org.cups.{SECTION}" RESULTS="20"> <INPUT
+TYPE="SUBMIT" VALUE="Hledat"> <INPUT TYPE="SUBMIT" NAME="CLEAR" VALUE="Smazat"></P>
+
+</FORM>
diff --git a/templates/cs/set-printer-options-header.tmpl b/templates/cs/set-printer-options-header.tmpl
new file mode 100644
index 00000000..160ae6bc
--- /dev/null
+++ b/templates/cs/set-printer-options-header.tmpl
@@ -0,0 +1,26 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Nastavení parametrů u {printer_name}</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{HAVE_AUTOCONFIGURE?<INPUT TYPE="SUBMIT" NAME="AUTOCONFIGURE" VALUE="Nastavit výchozí parametry tiskárny">:}
+
+<SCRIPT TYPE="text/javascript"><!--
+function update_paramtable(option)
+{
+  var cb = document.getElementById("select-" + option)
+  var paramstable = document.getElementById(option + "-params");
+  if (cb.value == "Custom")
+    paramstable.style.display = "table";
+  else
+    paramstable.style.display = "none";
+}
+--></SCRIPT>
+
+<H3 CLASS="title">{[group_id]
+<A HREF="#{group_id}">{group}</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}</H3>
+
+<DIV CLASS="tabs">
diff --git a/templates/cs/set-printer-options-trailer.tmpl b/templates/cs/set-printer-options-trailer.tmpl
new file mode 100644
index 00000000..11adc701
--- /dev/null
+++ b/templates/cs/set-printer-options-trailer.tmpl
@@ -0,0 +1,16 @@
+</DIV>
+
+<SCRIPT TYPE="text/javascript"><!--
+// Hide custom options parameters for browsers that understand Javascript
+var paramtables = document.getElementsByName("paramtable");
+for (var i = 0; i < paramtables.length; i++)
+{
+  var opt = paramtables[i].id.substr(0, paramtables[i].id.lastIndexOf("-"));
+  var cb = document.getElementById("select-" + opt);
+  if (cb.value != "Custom")
+    paramtables[i].style.display = "none";
+}
+--></SCRIPT>
+</FORM>
+
+</DIV>
diff --git a/templates/cs/subscription-added.tmpl b/templates/cs/subscription-added.tmpl
new file mode 100644
index 00000000..926d7969
--- /dev/null
+++ b/templates/cs/subscription-added.tmpl
@@ -0,0 +1,5 @@
+<DIV CLASS="indent">
+
+<P>Předplatné {subscription_name} bylo úspěšně přidáno.</P>
+
+</DIV>
diff --git a/templates/cs/subscription-canceled.tmpl b/templates/cs/subscription-canceled.tmpl
new file mode 100644
index 00000000..0e25268b
--- /dev/null
+++ b/templates/cs/subscription-canceled.tmpl
@@ -0,0 +1,5 @@
+<DIV CLASS="indent">
+
+<P>Předplatné #{notify_subscription_id} bylo zrušeno.</P>
+
+</DIV>
diff --git a/templates/cs/test-page.tmpl b/templates/cs/test-page.tmpl
new file mode 100644
index 00000000..d1a1d9d8
--- /dev/null
+++ b/templates/cs/test-page.tmpl
@@ -0,0 +1,8 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Tisk zkušební stránky na {printer_name}</H2>
+
+<P>Zkušební stránka odeslána; ID úlohy je <A HREF="/{SECTION}/{printer_name}">
+{printer_name}-{job_id}</A>.</P>
+
+</DIV>
diff --git a/templates/cs/trailer.tmpl b/templates/cs/trailer.tmpl
new file mode 100644
index 00000000..44f358b0
--- /dev/null
+++ b/templates/cs/trailer.tmpl
@@ -0,0 +1,8 @@
+</TD></TR>
+<TR><TD>&nbsp;</TD></TR>
+<TR><TD CLASS="trailer">CUPS a logo CUPS jsou ochranné známky společnosti
+<A HREF="http://www.apple.com">Apple Inc.</A> CUPS je chráněn autorskými
+právy 2007-2013 Apple Inc. Všechna práva vyhrazena.</TD></TR>
+</TABLE>
+</BODY>
+</HTML>
diff --git a/templates/cs/users.tmpl b/templates/cs/users.tmpl
new file mode 100644
index 00000000..ff39cc3c
--- /dev/null
+++ b/templates/cs/users.tmpl
@@ -0,0 +1,30 @@
+<DIV CLASS="indent">
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+{IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:}
+
+<H2 CLASS="title">Nastavení přístupu uživatelů u {printer_name}</H2>
+
+<TABLE>
+<TR>
+<TH CLASS="label">Uživatelé:</TH>
+<TD>
+<INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'>
+<BR>
+<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>Povolit uživatelům tisknout
+<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>Zakázat uživatelům tisknout
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD>
+<INPUT TYPE="SUBMIT" VALUE="Nastavení přístupů">
+</TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
diff --git a/templates/es/trailer.tmpl b/templates/es/trailer.tmpl
index a1992454..017693e3 100644
--- a/templates/es/trailer.tmpl
+++ b/templates/es/trailer.tmpl
@@ -2,7 +2,7 @@
 <TR><TD>&nbsp;</TD></TR>
 <TR><TD CLASS="trailer">CUPS y el logo de CUPS son marcas registradas de
 <A HREF="http://www.apple.com">Apple, Inc.</A> Los derechos de copia de CUPS
-2007-2012 son de Apple Inc. Todos los derechos reservados.</TD></TR>
+2007-2013 son de Apple Inc. Todos los derechos reservados.</TD></TR>
 </TABLE>
 </BODY>
 </HTML>
diff --git a/templates/fr/add-class.tmpl b/templates/fr/add-class.tmpl
new file mode 100644
index 00000000..a4402d4a
--- /dev/null
+++ b/templates/fr/add-class.tmpl
@@ -0,0 +1,40 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Ajouter une classe</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+
+<TABLE>
+<TR>
+<TH CLASS="label">Nom:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(Peux contenir n'importe quel caract&egrave;re sauf "/", "#", et espace)</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Description:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(Description compr&eacute;hensible comme "HP LaserJet Recto/Verso")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Emplacement:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(Emplacement compr&eacute;hensible comme "Lab 1")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Membres:</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="Ajouter la classe"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+\ No newline at end of file
diff --git a/templates/fr/add-printer.tmpl b/templates/fr/add-printer.tmpl
new file mode 100644
index 00000000..22dc07b1
--- /dev/null
+++ b/templates/fr/add-printer.tmpl
@@ -0,0 +1,47 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Ajouter une imprimante</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<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}">
+{?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">Nom:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?template_name}"><BR>
+<SMALL>(Peux contenir n'importe quel caract&egrave;re sauf "/", "#", et espace)</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Description:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_INFO}"><BR>
+<SMALL>(Description compr&eacute;hensible comme "HP LaserJet Recto/Verso")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Emplacement:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_LOCATION}"><BR>
+<SMALL>(Emplacement compr&eacute;hensible comme "Lab 1")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Connexion:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Partage:</TH>
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
+Partager cette imprimante</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Continuer"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+\ No newline at end of file
diff --git a/templates/fr/add-rss-subscription.tmpl b/templates/fr/add-rss-subscription.tmpl
new file mode 100644
index 00000000..e98ee1cc
--- /dev/null
+++ b/templates/fr/add-rss-subscription.tmpl
@@ -0,0 +1,44 @@
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription">
+
+<H2 CLASS="title">S'abonner &agrave; un flux RSS</H2>
+
+<TABLE SUMMARY="S'abonner &agrave; un flux RSS">
+<TR>
+<TH CLASS="label">Nom:</TH>
+<TD COLSPAN="5"><INPUT TYPE="TEXT" NAME="SUBSCRIPTION_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?SUBSCRIPTION_NAME}"><BR>
+<SMALL>(Peux contenir n'importe quel caract&egrave;re sauf "/", "#", et espace)</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">File:</TH>
+<TD COLSPAN="5"><SELECT NAME="PRINTER_URI" SIZE="10"><OPTION VALUE="#ALL#"{?PRINTER_URI=#ALL#? SELECTED:}>Toutes les files</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">Ev&eacute;nements:</TH>
+<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CREATED" {?EVENT_JOB_CREATED}>T&acirc;ches cr&eacute;es<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_COMPLETED" {?EVENT_JOB_COMPLETED}>T&acirc;ches finies<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_STOPPED" {?EVENT_JOB_STOPPED}>T&acirc;ches stopp&eacute;es<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CONFIG_CHANGED" {?EVENT_JOB_CONFIG_CHANGED}>Options de t&acirc;che modifi&eacute;es</TD>
+<TD>&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_STOPPED" {?EVENT_PRINTER_STOPPED}>Files arr&ecirc;t&eacute;es<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_ADDED" {?EVENT_PRINTER_ADDED}>File ajout&eacute;e<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_MODIFIED" {?EVENT_PRINTER_MODIFIED}>File modifi&eacute;e<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_DELETED" {?EVENT_PRINTER_DELETED}>File supprim&eacute;e</TD>
+<TD>&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STARTED" {?EVENT_SERVER_STARTED}>Serveur d&eacute;marr&eacute;<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STOPPED" {?EVENT_SERVER_STOPPED}>Serveur arr&ecirc;t&eacute;<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_RESTARTED" {?EVENT_SERVER_RESTARTED}>Serveur red&eacute;marr&eacute;<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_AUDIT" {?EVENT_SERVER_AUDIT}>Audit de s&eacute;curit&eacute; du serveur</TD>
+</TR>
+<TR>
+<TH CLASS="label">Nombre maximum d'&eacute;v&eacute;nements:</TH>
+<TD COLSPAN="5"><INPUT TYPE="NUMBER" 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="S'abonner &agrave; un flux RSS"></TD>
+</TR>
+</TABLE>
+
+</FORM>
diff --git a/templates/fr/admin.tmpl b/templates/fr/admin.tmpl
new file mode 100644
index 00000000..304e77bb
--- /dev/null
+++ b/templates/fr/admin.tmpl
@@ -0,0 +1,102 @@
+<TABLE CLASS="indent" SUMMARY="T&acirc;ches d'Administration">
+<TR><TD VALIGN="TOP">
+
+<H2 CLASS="title">Imprimantes</H2>
+
+<P>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="SUBMIT" VALUE="Ajouter une imprimante"></FORM>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="find-new-printers"><INPUT TYPE="SUBMIT" VALUE="Trouver de nouvelles imprimantes"></FORM>
+<FORM ACTION="/printers/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="G&eacute;rer les Imprimantes"></FORM>
+{have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="Exporter les imprimantes vers Samba"></FORM>:}
+</P>
+
+<H2 CLASS="title">Classes</H2>
+
+<P>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-class"><INPUT TYPE="SUBMIT" VALUE="Ajouter une classe"></FORM>
+<FORM ACTION="/classes/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="G&eacute;rer les Classes"></FORM>
+</P>
+
+<H2 CLASS="title">T&acirc;ches</H2>
+
+<P>
+<FORM ACTION="/jobs/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="G&eacute;rer les T&acirc;ches"></FORM>
+</P>
+
+</TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">
+
+<H2 CLASS="title">Serveur</H2>
+
+<P>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="Editer le Fichier de Configuration"></FORM>
+<FORM ACTION="/admin/log/access_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Visualiser Access Log"></FORM>
+<FORM ACTION="/admin/log/error_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Visualiser Error Log"></FORM>
+<FORM ACTION="/admin/log/page_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Visualiser Page Log"></FORM>
+</P>
+
+{SETTINGS_ERROR?<P>{SETTINGS_MESSAGE}</P>
+<BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>:
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+
+{ADVANCEDSETTINGS?<P><B>Param&egrave;tres du serveur\:</B></P>
+
+<P><A HREF="/admin/">Avanc&eacute; <SMALL>&#x25bc;</SMALL></A><BR>
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+<INPUT TYPE="HIDDEN" NAME="ADVANCEDSETTINGS" VALUE="YES">
+<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Partager les imprimantes connect&eacute;es &agrave; ce syst&egrave;me<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Nombre maximum de clients\:
+<INPUT TYPE="TEXT" NAME="MAX_CLIENTS" VALUE="{?max_clients}" SIZE="6"><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Autoriser l'impression depuis Internet<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" {?browse_web_if}> Annoncer l'interface Web<BR>
+<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Autoriser l'administration &agrave; distance<BR>
+{have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Utiliser l'authentification Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:}
+<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Autoriser les utilisateurs &agrave; annuler n'importe quelle t&acirc;che (Pas seulement les leurs)<BR>
+<INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOBS" {?preserve_jobs}> Conserver l'historique des t&acirc;ches<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Nombre de t&acirc;ches\:
+<INPUT TYPE="TEXT" NAME="MAX_JOBS" VALUE="{?max_jobs}" SIZE="6"><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Conserver les meta-donn&eacute;es\:
+<INPUT TYPE="TEXT" NAME="PRESERVE_JOB_HISTORY" VALUE="{?preserve_job_history}" SIZE="6"><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Conserver les documents\:
+<INPUT TYPE="TEXT" NAME="PRESERVE_JOB_FILES" VALUE="{?preserve_job_files}" SIZE="6"><BR>
+<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Enregistrer les informations de debug pour la r&eacute;solution de probl&egrave;mes<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Taille maximum du fichier de log\:
+<INPUT TYPE="TEXT" NAME="MAX_LOG_SIZE" VALUE="{?max_log_size}" SIZE="6"></P>
+
+:<P><B>Param&egrave;tres du Serveur:</B></P>
+
+<P><A HREF="/admin/?ADVANCEDSETTINGS=YES">Avanc&eacute; <SMALL>&#x25b6;</SMALL></A><BR>
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Partager les imprimantes connect&eacute;es &agrave; ce syst&egrave;me<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Autoriser l'impression depuis Internet<BR>
+<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Autoriser l'administration &agrave; distance<BR>
+{have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Utiliser l'authentification Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:}
+<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Autoriser les utilisateurs &agrave; annuler n'importe quelle t&acirc;che (Pas seulement les leurs)<BR>
+<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Enregistrer les informations de debug pour la r&eacute;solution de probl&egrave;mes</P>
+
+}
+<P><INPUT TYPE="SUBMIT" NAME="CHANGESETTINGS" VALUE="Modifier les param&egrave;tres"></P>
+
+</FORM>}
+
+</TD></TR>
+</TABLE>
+
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Abonnements RSS</H2>
+
+<P>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="Ajouter un abonnement RSS"></FORM>
+</P>
+
+</DIV>
+
+{notify_subscription_id?<TABLE CLASS="list" SUMMARY="Abonnements RSS">
+<THEAD><TR><TH>Nom</TH><TH>Ev&eacute;nements</TH><TH>Nom de la File</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="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Annuler l'abonnement RSS"></FORM>&nbsp;</TD><TD>{notify_events}</TD><TD NOWRAP>&nbsp;{notify_printer_name?{notify_printer_name}:Toutes les Files}</TD></TR>}
+</TBODY>
+</TABLE>:}
diff --git a/templates/fr/choose-device.tmpl b/templates/fr/choose-device.tmpl
new file mode 100644
index 00000000..2bcb430c
--- /dev/null
+++ b/templates/fr/choose-device.tmpl
@@ -0,0 +1,53 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Modifier {printer_name}:Ajouter une imprimante}</H2>
+
+{CUPS_GET_DEVICES_DONE?<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<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">Connexion courante\:</TH>
+<TD><INPUT TYPE="RADIO" NAME="DEVICE_URI" VALUE="{current_device_uri}" CHECKED>
+{current_device_uri}</TD>
+</TR>}
+<TR>
+<TH CLASS="label">Imprimantes locales\:</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">Imprimantes R&eacute;seaux D&eacute;couvertes\:</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">Autres Imprimantes R&eacute;seaux\:</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="Continuer"></TD>
+</TR>
+</TABLE>
+
+</FORM>:<P><IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16" ALIGN="ABSMIDDLE"
+ALT="Indicateur d'occupation"> Recherche en cours...</P>}
+
+</DIV>
diff --git a/templates/fr/choose-make.tmpl b/templates/fr/choose-make.tmpl
new file mode 100644
index 00000000..d48dfc10
--- /dev/null
+++ b/templates/fr/choose-make.tmpl
@@ -0,0 +1,64 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Modifier {printer_name}:Ajouter une imprimante}</H2>
+
+<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<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">Nom:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
+</TR>}
+<TR>
+<TH CLASS="label">Description:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{printer_info}">{printer_info}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Emplacement:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{printer_location}">{printer_location}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Connexion:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Partage:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_IS_SHARED" VALUE="{?printer_is_shared}">
+{?printer_is_shared=?Ne pas:{?printer_is_shared=0?Ne pas:}} Partager cette Imprimante</TD>
+</TR>
+<TR>
+<TH CLASS="label">Marque:</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="Continuer"></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD>&nbsp;</TD>
+</TR>
+<TR>
+<TH CLASS="label">Ou donner un fichier PPD:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
+TYPE="FILE" NAME="PPD_FILE"></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="{op=add-printer?Ajouter une imprimante:Modifier l'imprimante}"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+\ No newline at end of file
diff --git a/templates/fr/choose-model.tmpl b/templates/fr/choose-model.tmpl
new file mode 100644
index 00000000..5428153d
--- /dev/null
+++ b/templates/fr/choose-model.tmpl
@@ -0,0 +1,60 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Modifier {printer_name}:Ajouter une imprimante}</H2>
+
+<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<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">Nom:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
+</TR>}
+<TR>
+<TH CLASS="label">Description:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{printer_info}">{printer_info}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Emplacement:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{printer_location}">{printer_location}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Connexion:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Partage:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_IS_SHARED" VALUE="{?printer_is_shared}">
+{?printer_is_shared=?Ne pas:{?printer_is_shared=0?Ne pas:}} Partager cette imprimante</TD>
+</TR>
+<TR>
+<TH CLASS="label">Marque:</TH>
+<TD>{PPD_MAKE} <INPUT TYPE="SUBMIT" NAME="SELECT_MAKE" VALUE="Choisir un autre fabriquant"></TD>
+</TR>
+<TR>
+<TH CLASS="label">Mod&egrave;le:</TH>
+<TD>
+<SELECT NAME="PPD_NAME" SIZE="10">
+{op=add-printer?:<OPTION VALUE="__no_change__" SELECTED>Pilote courrant - {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">Ou donner un fichier PPD:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
+TYPE="FILE" NAME="PPD_FILE"></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="{op=add-printer?Ajouter une imprimante:Modifier une imprimante}"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+\ No newline at end of file
diff --git a/templates/fr/choose-serial.tmpl b/templates/fr/choose-serial.tmpl
new file mode 100644
index 00000000..a1c72045
--- /dev/null
+++ b/templates/fr/choose-serial.tmpl
@@ -0,0 +1,52 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Modifier {printer_name}:Ajouter une imprimante}</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:}
+
+<TABLE>
+<TR>
+<TH CLASS="label">Connexion:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Baud/s:</TH>
+<TD><SELECT NAME="BAUDRATE">
+{[baudrates]<OPTION {?baudrate={baudrates}?SELECTED:}>{baudrates}}
+</SELECT></TD>
+</TR>
+<TR>
+<TH CLASS="label">Parit&eacute;:</TH>
+<TD><SELECT NAME="PARITY">
+<OPTION VALUE="none" {?parity=none?SELECTED:}>Aucune
+<OPTION VALUE="even" {?parity=even?SELECTED:}>Paire
+<OPTION VALUE="odd" {?parity=odd?SELECTED:}>Impaire
+</SELECT></TD>
+</TR>
+<TR>
+<TH CLASS="label">Bits de donn&eacute;es:</TH>
+<TD><SELECT NAME="BITS">
+<OPTION {?bits=8?SELECTED:}>8
+<OPTION {?bits=7?SELECTED:}>7
+</SELECT></TD>
+</TR>
+<TR>
+<TH CLASS="label">Contr&ocirc;le de flux:</TH>
+<TD><SELECT NAME="FLOW">
+<OPTION VALUE="none" {?flow=none?SELECTED:}>Aucun
+<OPTION VALUE="soft" {?flow=soft?SELECTED:}>XON/XOFF (Logiciel)
+<OPTION VALUE="hard" {?flow=hard?SELECTED:}>RTS/CTS (Mat&egrave;riel)
+<OPTION VALUE="dtrdsr" {?flow=dtrdsr?SELECTED:}>DTR/DSR (Mat&egrave;riel)
+</SELECT></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Continuer"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+\ No newline at end of file
diff --git a/templates/fr/choose-uri.tmpl b/templates/fr/choose-uri.tmpl
new file mode 100644
index 00000000..72b4a5ee
--- /dev/null
+++ b/templates/fr/choose-uri.tmpl
@@ -0,0 +1,44 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Modifier {printer_name}:Ajouter une imprimante}</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<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">Connexion:</TH>
+<TD><INPUT TYPE="URL" SIZE="60" MAXLENGTH="1023" NAME="DEVICE_URI" VALUE="{current_device_uri?{current_device_uri}:{device_uri}}"></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD>Exemples:
+<PRE>
+    http://hostname:631/ipp/
+    http://hostname:631/ipp/port1
+
+    ipp://hostname/ipp/
+    ipp://hostname/ipp/port1
+
+    lpd://hostname/queue
+
+    socket://hostname
+    socket://hostname:9100
+</PRE>
+
+<P>Cf. <A HREF="/help/network.html" TARGET="_blank">"Imprimantes
+R&eacute;seaux"</A> pour construire l'URI &agrave; employ&eacute;e avec votre imprimante.</P>
+
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Continuer"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+\ No newline at end of file
diff --git a/templates/fr/class-added.tmpl b/templates/fr/class-added.tmpl
new file mode 100644
index 00000000..7ed16483
--- /dev/null
+++ b/templates/fr/class-added.tmpl
@@ -0,0 +1,8 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Ajouter une Classe</H2>
+
+<P>La classe <A HREF="/classes/{printer_name}">{printer_name}</A> a &eacute;t&eacute; ajout&eacute;e
+avec succ&egrave;s.
+
+</DIV>
diff --git a/templates/fr/class-confirm.tmpl b/templates/fr/class-confirm.tmpl
new file mode 100644
index 00000000..276ec34f
--- /dev/null
+++ b/templates/fr/class-confirm.tmpl
@@ -0,0 +1,10 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Supprimer la classe {printer_name}</H2>
+
+<P><B>Attention:</B> Etes-vous sur(e) de vouloir supprimer la classe 
+{printer_name}?</P>
+
+<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Supprimer la classe"></FORM></P>
+
+</DIV>
diff --git a/templates/fr/class-deleted.tmpl b/templates/fr/class-deleted.tmpl
new file mode 100644
index 00000000..6f8aefaf
--- /dev/null
+++ b/templates/fr/class-deleted.tmpl
@@ -0,0 +1,7 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Supprimer la classe {printer_name}</H2>
+
+<P>La classe {printer_name} a &eacute;t&eacute; supprim&eacute;e avec succ&egrave;s.
+
+</DIV>
+\ No newline at end of file
diff --git a/templates/fr/class-jobs-header.tmpl b/templates/fr/class-jobs-header.tmpl
new file mode 100644
index 00000000..551f47e4
--- /dev/null
+++ b/templates/fr/class-jobs-header.tmpl
@@ -0,0 +1,3 @@
+<DIV CLASS="indent">
+<H3 CLASS="title">T&acirc;ches</H3>
+</DIV>
diff --git a/templates/fr/class-modified.tmpl b/templates/fr/class-modified.tmpl
new file mode 100644
index 00000000..e4b8b5a8
--- /dev/null
+++ b/templates/fr/class-modified.tmpl
@@ -0,0 +1,8 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Modifier la Classe {printer_name}</H2>
+
+<P>La classe <A HREF="/classes/{printer_name}">{printer_name}</A> a &eacute;t&eacute; 
+modifi&eacute;e avec succ&egrave;s.
+
+</DIV>
+\ No newline at end of file
diff --git a/templates/fr/class.tmpl b/templates/fr/class.tmpl
new file mode 100644
index 00000000..0d6d891f
--- /dev/null
+++ b/templates/fr/class.tmpl
@@ -0,0 +1,44 @@
+<DIV CLASS="indent">
+<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>
+({printer_state=3?En attente:{printer_state=4?En cours d'impression:Arr&ecirc;t&eacute;}},
+{printer_is_accepting_jobs=0?Rejette les t&acirc;ches:Accepte les t&acirc;ches},
+{server_is_sharing_printers=0?Non:{printer_is_shared=0?Non:}} Partag&eacute;e{default_name={printer_name}?, Imprimante par d&eacute;faut:})</H2>
+
+<FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<SELECT NAME="OP" ONCHANGE="document.maintenance.submit();">
+<OPTION VALUE="">Maintenance</OPTION>
+<OPTION VALUE="print-test-page">Imprimer une page de test</OPTION>
+{printer_state=5?<OPTION VALUE="start-class">D&eacute;marrer la classe</OPTION>:<OPTION VALUE="stop-class">Arr&ecirc;ter la classe</OPTION>}
+{printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Accepter les t&acirc;ches</OPTION>:<OPTION VALUE="reject-jobs">Rejeter les t&acirc;ches</OPTION>}
+<OPTION VALUE="move-jobs">Transf&eacute;rer toutes les t&acirc;ches</OPTION>
+<OPTION VALUE="purge-jobs">Annuler toutes les t&acirc;ches</OPTION>
+</SELECT>
+<INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;">
+</FORM>
+
+<FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">
+<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="1">
+<SELECT NAME="OP" ONCHANGE="document.administration.submit();">
+<OPTION VALUE="">Administration</OPTION>
+<OPTION VALUE="modify-class">Modifier la classe</OPTION>
+<OPTION VALUE="delete-class">Supprimer la classe</OPTION>
+<OPTION VALUE="set-class-options">R&eacute;initialiser les options</OPTION>
+<OPTION VALUE="set-as-default">D&eacute;finir par d&eacute;faut</OPTION>
+<OPTION VALUE="set-allowed-users">D&eacute;finir les autorisations</OPTION>
+</SELECT>
+<INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;">
+</FORM>
+
+<TABLE SUMMARY="{printer_name}">
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Description:</TH><TD>{printer_info}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Emplacement:</TH><TD>{printer_location}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Membres:</TH><TD>{?member_uris=?None:{member_uris}}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">D&eacute;fauts:</TH><TD>job-sheets={job_sheets_default}
+media={media_default?{media_default}:inconnu}
+{sides_default?sides={sides_default}:}</TD></TR>
+</TABLE>
+
+</DIV>
diff --git a/templates/fr/classes-header.tmpl b/templates/fr/classes-header.tmpl
new file mode 100644
index 00000000..3c4d1ba5
--- /dev/null
+++ b/templates/fr/classes-header.tmpl
@@ -0,0 +1 @@
+<P ALIGN="CENTER">{total=0?Pas de classes:Affichage de {#printer_name} classe{total=1?:s}} sur {total}.</P>
diff --git a/templates/fr/classes.tmpl b/templates/fr/classes.tmpl
new file mode 100644
index 00000000..0a04ebe5
--- /dev/null
+++ b/templates/fr/classes.tmpl
@@ -0,0 +1,11 @@
+{#printer_name=0?:
+<TABLE CLASS="list" SUMMARY="Liste des Classes">
+<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> Nom de la file <SMALL>&#x25b2;</SMALL>:<SMALL>&#x25bc;</SMALL> Nom de la file <SMALL>&#x25bc;</SMALL>}</A></TH><TH>Description</TH><TH>Emplacement</TH><TH>Membres</TH><TH>&Eacute;tat</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=?Aucun:{member_uris}}</TD><TD>{printer_state=3?Inoccup&eacute;:{printer_state=4?En cours d'impression:En pause}}{printer_state_message? - "{printer_state_message}":}</TD></TR>
+}
+</TBODY>
+</TABLE></DIV>}
diff --git a/templates/fr/command.tmpl b/templates/fr/command.tmpl
new file mode 100644
index 00000000..bcd0f905
--- /dev/null
+++ b/templates/fr/command.tmpl
@@ -0,0 +1,12 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{title} sur {printer_name}</H2>
+
+<P>{job_state>5?:<IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16"
+ALIGN="ABSMIDDLE" ALT="Busy Indicator"> }Commandes de t&acirc;che d'impression
+{job_state=3?en attente:{job_state=4?retenu:
+{job_state=5?en cours d'impression:{job_state=6?arr&ecirc;t&eacute;:
+{job_state=7?annul&eacute;:{job_state=8?annul&eacute;:termin&eacute;}}}}}}{job_state=9?:{job_printer_state_message?,
+<EM>"{job_printer_state_message}"</EM>:}}</P>
+
+</DIV>
diff --git a/templates/fr/edit-config.tmpl b/templates/fr/edit-config.tmpl
new file mode 100644
index 00000000..62d1414a
--- /dev/null
+++ b/templates/fr/edit-config.tmpl
@@ -0,0 +1,24 @@
+<SCRIPT TYPE="text/javascript">
+function reset_config()
+{
+  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
+}
+</SCRIPT>
+
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Edition du Fichier de Configuration</H2>
+
+<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+
+<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
+
+<P><INPUT TYPE="SUBMIT" NAME="SAVECHANGES" VALUE="Enregistrer les modifications">
+<INPUT TYPE="BUTTON" VALUE="Utiliser le fichier de configuration par d&eacute;faut"
+onClick="reset_config();"></P>
+
+</FORM>
+
+</DIV>
diff --git a/templates/fr/error-op.tmpl b/templates/fr/error-op.tmpl
new file mode 100644
index 00000000..ba5c91cd
--- /dev/null
+++ b/templates/fr/error-op.tmpl
@@ -0,0 +1,9 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{?title} {?printer_name} Erreur</H2>
+
+<P>Erreur:</P>
+
+<BLOCKQUOTE>Op&eacute;ration inconnue "{op}"!</BLOCKQUOTE>
+
+</DIV>
diff --git a/templates/fr/error.tmpl b/templates/fr/error.tmpl
new file mode 100644
index 00000000..2ce2451b
--- /dev/null
+++ b/templates/fr/error.tmpl
@@ -0,0 +1,9 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{?title} {?printer_name} Erreur</H2>
+
+<P>{?message?{message}:Erreur}:</P>
+
+<BLOCKQUOTE>{error}</BLOCKQUOTE>
+
+</DIV>
diff --git a/templates/fr/header.tmpl.in b/templates/fr/header.tmpl.in
new file mode 100644
index 00000000..d7f00c1b
--- /dev/null
+++ b/templates/fr/header.tmpl.in
@@ -0,0 +1,29 @@
+<!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>{title} - 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">
+	{refresh_page?<META HTTP-EQUIV="Refresh" CONTENT="{refresh_page}">:}
+</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="unsel"><A HREF="/">&nbsp;&nbsp;Accueil&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=admin?:un}sel"><A HREF="/admin">&nbsp;&nbsp;Administration&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=classes?:un}sel"><A HREF="/classes/">&nbsp;&nbsp;Classes&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=help?:un}sel"><A HREF="/help/">&nbsp;&nbsp;Aide&nbsp;En&nbsp;Ligne&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=jobs?:un}sel"><A HREF="/jobs/">&nbsp;&nbsp;T&acirc;ches&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=printers?:un}sel"><A HREF="/printers/">&nbsp;&nbsp;Imprimantes&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel" WIDTH="100%"><FORM ACTION="/help/" METHOD="GET"><INPUT
+TYPE="SEARCH" NAME="QUERY" SIZE="20" PLACEHOLDER="Search Help"
+VALUE="{SECTION=help?{?QUERY}:}" AUTOSAVE="org.cups.help" RESULTS="20"></FORM></TD>
+<TD><IMG SRC="/images/right.gif" WIDTH="4" HEIGHT="36" ALT=""></TD>
+</TR>
+<TR><TD COLSPAN="9">&nbsp;</TD></TR>
+</TABLE>
diff --git a/templates/fr/help-header.tmpl b/templates/fr/help-header.tmpl
new file mode 100644
index 00000000..751136d4
--- /dev/null
+++ b/templates/fr/help-header.tmpl
@@ -0,0 +1,51 @@
+<DIV CLASS="indent">
+<FORM ACTION="/help/{?HELPFILE}" METHOD="GET">
+{TOPIC?<INPUT TYPE="HIDDEN" NAME="TOPIC" VALUE="{TOPIC}">:}
+
+<P ALIGN="CENTER"><B>Rechercher dans
+{HELPTITLE?{HELPTITLE}:{TOPIC?{TOPIC}:tous les documents}}:</B> <INPUT
+TYPE="SEARCH" NAME="QUERY" VALUE="{?QUERY}" SIZE="40" PLACEHOLDER=""
+AUTOSAVE="org.cups.help" RESULTS="20">
+<INPUT TYPE="SUBMIT" NAME="SEARCH" VALUE="Rechercher">
+<INPUT TYPE="SUBMIT" NAME="CLEAR" VALUE="Vider"></P>
+
+</FORM>
+
+<!-- Bookmarks -->
+<DIV CLASS="sidebar"><TABLE CLASS="inset" SUMMARY="Contenus">
+<TR><TD>
+
+<H3 CLASS="title">Documents d'aide en ligne</H3>
+
+<P CLASS="l0"><A HREF="/help/{QUERY??QUERY={QUERY}:}">Tous les documents</A></P>
+<HR>
+
+{[BMTEXT]<P CLASS="l{BMINDENT}"><A HREF="{BMLINK}">{BMTEXT}</A></P>
+}
+</TD></TR>
+</TABLE></DIV>
+
+{QUERY?<P>R&eacute;sultats de la recherche dans {HELPFILE?{HELPTITLE}:{TOPIC?{TOPIC}:tous les documents}}\:</P>
+{QTEXT?<UL>
+{[QTEXT]<LI><A HREF="{QLINK}">{QTEXT}</A>{QPTEXT? (in <I><A HREF="{QPLINK}">{QPTEXT}</A></I>):}</LI>}
+{QTEXT?</UL>:}
+:<P>Aucun r&eacute;sultat trouv&eacute;.</P>}
+<HR NOSHADE>:}
+{HELPTITLE?<H1>{HELPTITLE}</H1>
+<FORM ACTION="/help/{?HELPFILE}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="PRINTABLE" VALUE="YES"><INPUT TYPE="SUBMIT" VALUE="Voir la version imprimable"></FORM>:
+
+<H1>Aide en ligne</H1>
+
+<P>Voici l'interface d'aide en ligne de CUPS. Entrez ci-dessus les mots &agrave; rechercher
+ou cliquez sur un lien ci-contre pour afficher
+l'aide en ligne du document.</P>
+
+<P>Si vous &ecirc;tes un nouvel utilisateur de CUPS, lisez la page "<a
+href="/help/overview.html">Pr&eacute;sentation de CUPS</a>". Il est conseill&eacute; aux utilisateurs habitu&eacute;s
+de lire la page "<a href="/help/whatsnew.html">Quoi de neuf dans CUPS
+1.6</a>".</P>
+
+<P>La <A HREF="http://www.cups.org/">page d'accueil de CUPS</A> donne aussi
+acc&egrave;s &agrave; de nombreuses ressources, comme des forums de discussion pour les
+utilisateurs, des r&eacute;ponses aux questions fr&eacute;quentes, et un formulaire pour
+soumettre des rapports de bug ou des demandes pour de nouvelles fonctionnalit&eacute;s.</P>}
diff --git a/templates/fr/help-printable.tmpl b/templates/fr/help-printable.tmpl
new file mode 100644
index 00000000..2463c163
--- /dev/null
+++ b/templates/fr/help-printable.tmpl
@@ -0,0 +1,9 @@
+<!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>{HELPTITLE}</TITLE>
+	<LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups-printable.css">
+	<LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png">
+</HEAD>
+<BODY>
diff --git a/templates/fr/help-trailer.tmpl b/templates/fr/help-trailer.tmpl
new file mode 100644
index 00000000..4c1ebed8
--- /dev/null
+++ b/templates/fr/help-trailer.tmpl
@@ -0,0 +1 @@
+</DIV>
diff --git a/templates/fr/job-cancel.tmpl b/templates/fr/job-cancel.tmpl
new file mode 100644
index 00000000..ab54269e
--- /dev/null
+++ b/templates/fr/job-cancel.tmpl
@@ -0,0 +1,7 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Annuler la T&acirc;che {job_id}</H2>
+
+<P><A HREF="{job_printer_uri}">La t&acirc;che {job_id}</A> a &eacute;t&eacute; annul&eacute;e.
+
+</DIV>
diff --git a/templates/fr/job-hold.tmpl b/templates/fr/job-hold.tmpl
new file mode 100644
index 00000000..7c85916b
--- /dev/null
+++ b/templates/fr/job-hold.tmpl
@@ -0,0 +1,7 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Retenir la t&acirc;che {job_id}</H2>
+
+<P><A HREF="{job_printer_uri}">La t&acirc;che {job_id}</A> a &eacute;t&eacute; retenue.
+
+</DIV>
diff --git a/templates/fr/job-move.tmpl b/templates/fr/job-move.tmpl
new file mode 100644
index 00000000..4cca760b
--- /dev/null
+++ b/templates/fr/job-move.tmpl
@@ -0,0 +1,27 @@
+<DIV CLASS="indent">
+
+<FORM METHOD="POST" ACTION="/{SECTION}/{job_id?:{printer_name}}">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:}
+
+<H2 CLASS="title">{job_id?Transf&eacute;rer la t&acirc;che {job_id}:Transf&eacute;rer toutes les t&acirc;ches}</H2>
+
+<TABLE>
+<TR>
+<TH CLASS="label">Nouvelle destination:</TH>
+<TD>
+<SELECT NAME="JOB_PRINTER_URI" SIZE="10">
+{[job_printer_uri]<OPTION VALUE="{job_printer_uri}">{job_printer_name}}
+</SELECT>
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="{job_id?Transf&eacute;rer la t&acirc;che:Transf&eacute;rer les t&acirc;ches}"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+
+</DIV>
diff --git a/templates/fr/job-moved.tmpl b/templates/fr/job-moved.tmpl
new file mode 100644
index 00000000..ba28d334
--- /dev/null
+++ b/templates/fr/job-moved.tmpl
@@ -0,0 +1,8 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{job_id?Transf&eacute;rer la t&acirc;che {job_id}:Transf&eacute;rer toutes les t&acirc;ches}</H2>
+
+<P>{job_id?<A HREF="/jobs/{job_id}">Job {job_id}</A>:Toutes les t&acirc;ches} transf&eacute;r&eacute;e(s) vers
+<A HREF="/{is_class?classes:printers}/{job_printer_name}">{job_printer_name}</A>.</P>
+
+</DIV>
diff --git a/templates/fr/job-release.tmpl b/templates/fr/job-release.tmpl
new file mode 100644
index 00000000..4bfc1b91
--- /dev/null
+++ b/templates/fr/job-release.tmpl
@@ -0,0 +1,7 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Lib&eacute;rer la T&acirc;che {job_id}</H2>
+
+<P><A HREF="{job_printer_uri}">La t&acirc;che {job_id}</A> a &eacute;t&eacute; lib&eacute;r&eacute;e.
+
+</DIV>
diff --git a/templates/fr/job-restart.tmpl b/templates/fr/job-restart.tmpl
new file mode 100644
index 00000000..08588402
--- /dev/null
+++ b/templates/fr/job-restart.tmpl
@@ -0,0 +1,7 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">R&eacute;imprimer la T&acirc;che {job_id}</H2>
+
+<P><A HREF="{job_printer_uri}">La t&acirc;che {job_id}</A> a &eacute;t&eacute; relanc&eacute;e.
+
+</DIV>
diff --git a/templates/fr/jobs-header.tmpl b/templates/fr/jobs-header.tmpl
new file mode 100644
index 00000000..c8630059
--- /dev/null
+++ b/templates/fr/jobs-header.tmpl
@@ -0,0 +1,5 @@
+<DIV CLASS="indent">{?which_jobs=?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Affichage des t&acirc;ches actives"></FORM>}
+{?which_jobs=completed?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="completed"><INPUT TYPE="SUBMIT" VALUE="Affichage des t&acirc;ches termin&eacute;es"></FORM>}
+{?which_jobs=all?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="all"><INPUT TYPE="SUBMIT" VALUE="Affichage de toutes les t&acirc;ches"></FORM>}</DIV>
+
+<P ALIGN="CENTER">{total=0?Pas de t&acirc;che:Affichage de {#job_id} t&acirc;che{total>1?s:}} {?which_jobs=?active{total>1?s:}:{which_jobs=all?:termin&eacute;e{total>1?s:}}} {total=0?:sur {total}} .</P>
diff --git a/templates/fr/jobs.tmpl b/templates/fr/jobs.tmpl
new file mode 100644
index 00000000..c760d76d
--- /dev/null
+++ b/templates/fr/jobs.tmpl
@@ -0,0 +1,36 @@
+{#job_id=0?:
+<TABLE CLASS="list" SUMMARY="Listes des t&acirc;ches">
+<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> ID <SMALL>&#x25b2;</SMALL>:<SMALL>&#x25bc;</SMALL> ID <SMALL>&#x25bc;</SMALL>}</A></TH><TH>Nom</TH><TH>Utilisateur</TH><TH>Taille</TH><TH>Pages</TH><TH>&Eacute;tat</TH><TH>Contr&ocirc;le</TH></TR>
+</THEAD>
+<TBODY>
+{[job_id]
+<TR VALIGN="TOP">
+<TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id}{?phone? ({phone}):}&nbsp;</TD>
+<TD>{?job_name=?Inconnu:{job_name}}&nbsp;</TD>
+<TD>{?job_originating_user_name=?Withheld:{job_originating_user_name}}&nbsp;</TD>
+<TD>{job_k_octets}k&nbsp;</TD>
+<TD>{job_media_sheets_completed=0?Inconnu:{?job_media_sheets_completed}}&nbsp;</TD>
+<TD>{job_state=3?en attente depuis<BR>{time_at_creation}:{job_state=4?retenu depuis<BR>{time_at_creation}:
+{job_state=5?en cours d'impression depuis<BR>{time_at_processing}:{job_state=6?arr&ecirc;t&eacute;:
+{job_state=7?annul&eacute; &acirc;<BR>{time_at_completed}:{job_state=8?annul&eacute;:termin&eacute; &agrave;<BR>{time_at_completed}}}}}}}&nbsp;{job_printer_state_message?<BR>
+<EM>"{job_printer_state_message}"</EM>:}</TD>
+<TD>
+{job_preserved>0?{job_state>5?
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="restart-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"><INPUT TYPE="SUBMIT" VALUE="R&eacute;imprimer la t&acirc;che"></FORM>:}:}
+{job_state=4?
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="release-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}">
+<INPUT TYPE="SUBMIT" VALUE="Lib&eacute;rer la t&acirc;che"></FORM>:}
+{job_state=3?
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="hold-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}">
+<INPUT TYPE="SUBMIT" VALUE="Retenir la t&acirc;che"></FORM>:}
+{job_state<7?
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}">
+<INPUT TYPE="SUBMIT" VALUE="Annuler la t&acirc;che"></FORM>
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="move-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="SUBMIT" VALUE="Transf&eacute;rer la t&acirc;che"></FORM>:}
+&nbsp;</TD>
+</TR>
+}
+</TBODY>
+</TABLE>
+}
diff --git a/templates/fr/list-available-printers.tmpl b/templates/fr/list-available-printers.tmpl
new file mode 100644
index 00000000..dcc9937b
--- /dev/null
+++ b/templates/fr/list-available-printers.tmpl
@@ -0,0 +1,11 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Imprimantes Disponibles</H2>
+
+{#device_uri=0?<P>Aucune imprimante trouv&eacute;e.</P>
+:<UL>{[device_uri]
+<LI><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="HIDDEN" NAME="TEMPLATE_NAME" VALUE="{template_name}"><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="Local Printer"><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{device_make_and_model}"><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}"><INPUT TYPE="SUBMIT" VALUE="Ajouter cette imprimante"></FORM>
+{device_make_and_model} ({device_info})</LI>
+}</UL>}
+
+</DIV>
diff --git a/templates/fr/modify-class.tmpl b/templates/fr/modify-class.tmpl
new file mode 100644
index 00000000..791c5604
--- /dev/null
+++ b/templates/fr/modify-class.tmpl
@@ -0,0 +1,34 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Modifier la Classe {printer_name}</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+
+<TABLE>
+<TR>
+<TH CLASS="label">Description:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"></TD>
+</TR>
+<TR>
+<TH CLASS="label">Emplacement:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"></TD>
+</TR>
+<TR>
+<TH CLASS="label">Membres:</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="Modifier la classe"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+\ No newline at end of file
diff --git a/templates/fr/modify-printer.tmpl b/templates/fr/modify-printer.tmpl
new file mode 100644
index 00000000..03e1b66d
--- /dev/null
+++ b/templates/fr/modify-printer.tmpl
@@ -0,0 +1,42 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Modifier {printer_name}</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<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}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+
+<TABLE>
+<TR>
+<TH CLASS="label">Description:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(Description compr&eacute;hensible comme "HP LaserJet Recto/Verso")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Emplacement:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(Emplacement compr&eacute;hensible comme "Lab 1")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Connexion:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Partage:</TH>
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
+Partager cette imprimante</TD>
+</TR>
+<TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Continuer"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
diff --git a/templates/fr/norestart.tmpl b/templates/fr/norestart.tmpl
new file mode 100644
index 00000000..95965c6f
--- /dev/null
+++ b/templates/fr/norestart.tmpl
@@ -0,0 +1,8 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Modifier les Param&egrave;tres</H2>
+
+<P>Le serveur n'a pas &eacute;t&eacute; red&eacute;marr&eacute; car la configuration
+n'a pas &eacute;t&eacute; modifi&eacute;e...</P>
+
+</DIV>
diff --git a/templates/fr/option-boolean.tmpl b/templates/fr/option-boolean.tmpl
new file mode 100644
index 00000000..e832ee10
--- /dev/null
+++ b/templates/fr/option-boolean.tmpl
@@ -0,0 +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-1}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
+</TD>
+</TR>
diff --git a/templates/fr/option-conflict.tmpl b/templates/fr/option-conflict.tmpl
new file mode 100644
index 00000000..7077aac5
--- /dev/null
+++ b/templates/fr/option-conflict.tmpl
@@ -0,0 +1,7 @@
+<P><B>Erreur:</B> Les options suivantes sont incompatibles entre elles:</P>
+
+<UL>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
+}</UL>
+
+<P>Veuillez modifier une ou plusieurs de ces options pour r&eacute;soudre les conflits.</P>
diff --git a/templates/fr/option-header.tmpl b/templates/fr/option-header.tmpl
new file mode 100644
index 00000000..464726a5
--- /dev/null
+++ b/templates/fr/option-header.tmpl
@@ -0,0 +1,5 @@
+<DIV CLASS="tab" ID="{group_id}">
+
+<H3 ALIGN="CENTER">{group}</H3>
+
+<TABLE WIDTH="100%">
diff --git a/templates/fr/option-pickmany.tmpl b/templates/fr/option-pickmany.tmpl
new file mode 100644
index 00000000..0da75e5d
--- /dev/null
+++ b/templates/fr/option-pickmany.tmpl
@@ -0,0 +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}}
+</SELECT></TD>
+</TR>
diff --git a/templates/fr/option-pickone.tmpl b/templates/fr/option-pickone.tmpl
new file mode 100644
index 00000000..3e3deebe
--- /dev/null
+++ b/templates/fr/option-pickone.tmpl
@@ -0,0 +1,18 @@
+<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}}
+</SELECT>
+{iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
+<TR><TH CLASS="sublabel">{paramtext}:</TH>
+<TD>{params=Units?<SELECT NAME="{keyword-1}.{params}">
+<OPTION VALUE="pt"{paramvalue=pt? SELECTED:}>Points</OPTION>
+<OPTION VALUE="mm"{paramvalue=mm? SELECTED:}>Millim&eagrave;tres</OPTION>
+<OPTION VALUE="cm"{paramvalue=cm? SELECTED:}>Centim&eagrave;tres</OPTION>
+<OPTION VALUE="in"{paramvalue=in? SELECTED:}>Pouces</OPTION>
+<OPTION VALUE="ft"{paramvalue=ft? SELECTED:}>Pieds</OPTION>
+<OPTION VALUE="m"{paramvalue=m? SELECTED:}>M&egrave;tres</OPTION>
+</SELECT>:<INPUT TYPE="{inputtype}" NAME="{keyword-1}.{params}" VALUE="{paramvalue}">}</TD></TR>
+}</TABLE>
+</TD>:}
+</TR>
diff --git a/templates/fr/option-trailer.tmpl b/templates/fr/option-trailer.tmpl
new file mode 100644
index 00000000..ceff313e
--- /dev/null
+++ b/templates/fr/option-trailer.tmpl
@@ -0,0 +1,5 @@
+</TABLE>
+
+<P ALIGN="CENTER"><INPUT TYPE="SUBMIT" VALUE="D&eacute;finir les options par d&eacute;faut"></P>
+
+</DIV>
+\ No newline at end of file
diff --git a/templates/fr/pager.tmpl b/templates/fr/pager.tmpl
new file mode 100644
index 00000000..c4e7ba5b
--- /dev/null
+++ b/templates/fr/pager.tmpl
@@ -0,0 +1,6 @@
+<TABLE CLASS="inset" SUMMARY="Mise en Page">
+<TR>
+	<TD WIDTH="50%">{PREV?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{PREV}"><INPUT TYPE="SUBMIT" VALUE="&#x25c0; Montrer les pr&eacute;c&eacute;dentes"></FORM>:&nbsp;}</TD>
+	<TD WIDTH="50%" ALIGN="RIGHT">{NEXT?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{NEXT}"><INPUT TYPE="SUBMIT" VALUE="Montrer les suivantes &#x25b6;"></FORM>:&nbsp;}</TD>
+</TR>
+</TABLE>
diff --git a/templates/fr/printer-accept.tmpl b/templates/fr/printer-accept.tmpl
new file mode 100644
index 00000000..cc25a09b
--- /dev/null
+++ b/templates/fr/printer-accept.tmpl
@@ -0,0 +1,9 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Accepte les T&acirc;ches sur {is_class?la classe:l'imprimante} {printer_name}</H2>
+
+<P>{is_class?La classe:L'imprimante} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+accepte d&eacute;sormais les t&acirc;ches d'impression.</P>
+
+</DIV>
diff --git a/templates/fr/printer-added.tmpl b/templates/fr/printer-added.tmpl
new file mode 100644
index 00000000..ce0a3b40
--- /dev/null
+++ b/templates/fr/printer-added.tmpl
@@ -0,0 +1,8 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Ajouter une imprimante</H2>
+
+<P>L'imprimante <A HREF="/printers/{printer_name}">{printer_name}</A> a &eacute;t&eacute; ajout&eacute;e
+avec succ&egrave;s.
+
+</DIV>
diff --git a/templates/fr/printer-configured.tmpl b/templates/fr/printer-configured.tmpl
new file mode 100644
index 00000000..79ccb157
--- /dev/null
+++ b/templates/fr/printer-configured.tmpl
@@ -0,0 +1,8 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">D&eacute;finir les options par d&eacute;faut pour {printer_name}</H2>
+
+<P>{OP=set-class-options?Class <A HREF="/classes/{printer_name}">:l'imprimante <A HREF="/printers/{printer_name}">}{printer_name}</A>
+ a &eacute;t&eacute; configur&eacute;e avec succ&egrave;s.
+
+</DIV>
diff --git a/templates/fr/printer-confirm.tmpl b/templates/fr/printer-confirm.tmpl
new file mode 100644
index 00000000..715ddd11
--- /dev/null
+++ b/templates/fr/printer-confirm.tmpl
@@ -0,0 +1,10 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Supprimer l'imprimante {printer_name}</H2>
+
+<P><B>Warning:</B> Etes-vous s&ucirc;r(e) de vouloir supprimer l'imprimante 
+{printer_name}?</P>
+
+<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Supprimer l'imprimante"></FORM></P>
+
+</DIV>
diff --git a/templates/fr/printer-default.tmpl b/templates/fr/printer-default.tmpl
new file mode 100644
index 00000000..d7f3703f
--- /dev/null
+++ b/templates/fr/printer-default.tmpl
@@ -0,0 +1,13 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">D&eacute;finir {is_class?la classe:l'imprimante} {printer_name} comme imprimante par d&eacute;faut</H2>
+
+<P>{is_class?La classe:L'imprimante} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+a &eacute;t&eacute; d&eacute;finie comme imprimante par d&eacute;faut du serveur.</P>
+
+<BLOCKQUOTE><B>Note:</B> Tout param&egrave;tre utilisateur d&eacute;fini via la commande 
+<TT>lpoptions</TT> sera prioritaire sur le param&egrave;tre d&eacute;fini i&ccedil;i.
+</BLOCKQUOTE>
+
+</DIV>
diff --git a/templates/fr/printer-deleted.tmpl b/templates/fr/printer-deleted.tmpl
new file mode 100644
index 00000000..43af955f
--- /dev/null
+++ b/templates/fr/printer-deleted.tmpl
@@ -0,0 +1,7 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Supprimer l'imprimante {printer_name}</H2>
+
+<P>L'imprimante {printer_name} a &eacute;t&eacute; supprim&eacute;e avec succ&egrave;s.
+
+</DIV>
diff --git a/templates/fr/printer-jobs-header.tmpl b/templates/fr/printer-jobs-header.tmpl
new file mode 100644
index 00000000..551f47e4
--- /dev/null
+++ b/templates/fr/printer-jobs-header.tmpl
@@ -0,0 +1,3 @@
+<DIV CLASS="indent">
+<H3 CLASS="title">T&acirc;ches</H3>
+</DIV>
diff --git a/templates/fr/printer-modified.tmpl b/templates/fr/printer-modified.tmpl
new file mode 100644
index 00000000..db962dc0
--- /dev/null
+++ b/templates/fr/printer-modified.tmpl
@@ -0,0 +1,8 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Modifier l'Imprimante {printer_name}</H2>
+
+<P>L'imprimante <A HREF="/printers/{printer_name}">{printer_name}</A> a &eacute;t&eacute;
+modifi&eacute;e avec succ&egrave;s.
+
+</DIV>
+\ No newline at end of file
diff --git a/templates/fr/printer-purge.tmpl b/templates/fr/printer-purge.tmpl
new file mode 100644
index 00000000..ce167b9d
--- /dev/null
+++ b/templates/fr/printer-purge.tmpl
@@ -0,0 +1,9 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Purger les T&acirc;ches sur {is_class?la classe:l'imprimante} {printer_name}</H2>
+
+<P>Toutes les t&acirc;ches de {is_class?la classe:l'imprimante} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+ont &eacute;t&eacute; purg&eacute;es.</P> 
+
+</DIV>
+\ No newline at end of file
diff --git a/templates/fr/printer-reject.tmpl b/templates/fr/printer-reject.tmpl
new file mode 100644
index 00000000..36edcb81
--- /dev/null
+++ b/templates/fr/printer-reject.tmpl
@@ -0,0 +1,9 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Rejeter les T&acirc;ches sur {is_class?Classe:Imprimante} {printer_name}</H2>
+
+<P>{is_class?La classe:L'imprimante} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+n'accepte plus les t&acirc;ches d'impression.</P>
+
+</DIV>
diff --git a/templates/fr/printer-start.tmpl b/templates/fr/printer-start.tmpl
new file mode 100644
index 00000000..f476c623
--- /dev/null
+++ b/templates/fr/printer-start.tmpl
@@ -0,0 +1,9 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">D&eacute;marrer {is_class?la classe:l'imprimante} {printer_name}</H2>
+
+<P>{is_class?La classe:L'imprimante} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+a &eacute;t&eacute; d&eacute;marr&eacute;e.</P>
+
+</DIV>
+\ No newline at end of file
diff --git a/templates/fr/printer-stop.tmpl b/templates/fr/printer-stop.tmpl
new file mode 100644
index 00000000..eb36fb58
--- /dev/null
+++ b/templates/fr/printer-stop.tmpl
@@ -0,0 +1,9 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Arr&ecirc;ter {is_class?la classe:l'imprimante} {printer_name}</H2>
+
+<P>{is_class?La classe:L'imprimante} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+a &eacute;t&eacute; arr&ecirc;t&eacute;e.</P>
+
+</DIV>
+\ No newline at end of file
diff --git a/templates/fr/printer.tmpl b/templates/fr/printer.tmpl
new file mode 100644
index 00000000..b5e89f0d
--- /dev/null
+++ b/templates/fr/printer.tmpl
@@ -0,0 +1,47 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>
+({printer_state=3?Inoccup&eacute;e:{printer_state=4?En cours d'impression:En pause}},
+{printer_is_accepting_jobs=0?Rejette les t&acirc;ches:Accepte les t&acirc;ches},
+{server_is_sharing_printers=0?Non:{printer_is_shared=0?Non:}} Partag&eacute;e{default_name={printer_name}?, Imprimante par d&eacute;faut:})</H2>
+
+<FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<SELECT NAME="OP" ONCHANGE="document.maintenance.submit();">
+<OPTION VALUE="">Maintenance</OPTION>
+<OPTION VALUE="print-test-page">Imprimer une page de test</OPTION>
+{printer_commands~.*Clean.*?<OPTION VALUE="clean-print-heads">Nettoyer les t&ecirc;tes d'impression</OPTION>:}
+{printer_commands~.*PrintSelfTestPage.*?<OPTION VALUE="print-self-test-page">Imprimer la page de test de l'imprimante</OPTION>:}
+{printer_state=5?<OPTION VALUE="start-printer">D&eacute;marrer l'imprimante</OPTION>:<OPTION VALUE="stop-printer">Arr&ecirc;ter l'imprimante</OPTION>}
+{printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Accepter les t&acirc;ches</OPTION>:<OPTION VALUE="reject-jobs">Rejeter les t&acirc;ches</OPTION>}
+<OPTION VALUE="move-jobs">Transf&eacute;rer toutes les t&acirc;ches</OPTION>
+<OPTION VALUE="purge-jobs">Purger toutes les t&acirc;ches</OPTION>
+</SELECT>
+<INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;">
+</FORM>
+
+<FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">
+<SELECT NAME="OP" ONCHANGE="document.administration.submit();">
+<OPTION VALUE="">Administration</OPTION>
+<OPTION VALUE="modify-printer">Modifier l'imprimante</OPTION>
+<OPTION VALUE="delete-printer">Supprimer l'imprimante</OPTION>
+<OPTION VALUE="set-printer-options">D&eacute;finir les options de l'imprimante</OPTION>
+<OPTION VALUE="set-as-default">D&eacute;finir par d&eacute;faut</OPTION>
+<OPTION VALUE="set-allowed-users">D&eacute;finir les autorisations</OPTION>
+</SELECT>
+<INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;">
+</FORM>
+
+<TABLE SUMMARY="{printer_name}">
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Description:</TH><TD>{printer_info}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Emplacement:</TH><TD>{printer_location}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Pilote:</TH><TD>{printer_make_and_model} ({color_supported=1?color:grayscale}{sides_supported?, 2-sided printing:})<BR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Connexion:</TH><TD>{device_uri}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">D&eacute;fauts:</TH><TD>job-sheets={job_sheets_default}
+media={media_default?{media_default}:inconnu}
+{sides_default?sides={sides_default}:}</TD></TR>
+</TABLE>
+
+</DIV>
+\ No newline at end of file
diff --git a/templates/fr/printers-header.tmpl b/templates/fr/printers-header.tmpl
new file mode 100644
index 00000000..fe6753fc
--- /dev/null
+++ b/templates/fr/printers-header.tmpl
@@ -0,0 +1 @@
+<P ALIGN="CENTER">{total=0?Pas d'imprimante:Affichage de {#printer_name} sur {total} imprimante{total>1?s:}}.</P>
diff --git a/templates/fr/printers.tmpl b/templates/fr/printers.tmpl
new file mode 100644
index 00000000..2abc59c4
--- /dev/null
+++ b/templates/fr/printers.tmpl
@@ -0,0 +1,11 @@
+{#printer_name=0?:
+<TABLE CLASS="list" SUMMARY="Liste des Imprimantes">
+<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> Nom de la file <SMALL>&#x25b2;</SMALL>:<SMALL>&#x25bc;</SMALL> Nom de la file <SMALL>&#x25bc;</SMALL>}</A></TH><TH>Description</TH><TH>Emplacement</TH><TH>Marque et Mod&egrave;le</TH><TH>&Eacute;tat</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>{printer_make_and_model}</TD><TD>{printer_state=3?Inoccup&eacute;e:{printer_state=4?En cours d'impression:En pause}}{printer_state_message? - "{printer_state_message}":}</TD></TR>
+}
+</TBODY>
+</TABLE></DIV>}
diff --git a/templates/fr/restart.tmpl b/templates/fr/restart.tmpl
new file mode 100644
index 00000000..da164b7e
--- /dev/null
+++ b/templates/fr/restart.tmpl
@@ -0,0 +1,8 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Modifier les Param&egrave;tres</H2>
+
+<P><IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16" ALIGN="ABSMIDDLE"
+ALT="Busy Indicator"> Veuillez patienter pendant que le serveur red&eacute;marre...</P>
+
+</DIV>
diff --git a/templates/fr/samba-export.tmpl b/templates/fr/samba-export.tmpl
new file mode 100644
index 00000000..94ff4fdc
--- /dev/null
+++ b/templates/fr/samba-export.tmpl
@@ -0,0 +1,54 @@
+<SCRIPT TYPE="text/javascript"><!--
+function select_printers() {
+  var list = document.export_samba.EXPORT_NAME;
+  var sel = document.export_samba.EXPORT_ALL.checked;
+
+  for (i = 0; i < list.length; i ++) {
+    list.options[i].selected = sel;
+  }
+}
+--></SCRIPT>
+
+<FORM METHOD="POST" ACTION="/admin/" NAME="export_samba">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba">
+
+<H2 CLASS="title">Exporter les Imprimantes vers Samba</H2>
+
+{error?<P>Impossible d'exporter les imprimantes vers Samba\:</P>
+<BLOCKQUOTE>{error}</BLOCKQUOTE>
+<P>Consulter le fichier <A HREF="/admin/log/error_log"
+TARGET="_blank">error_log</A> pour plus d'informations.</P>:
+<P>Cette page vous permet d'exporter des imprimantes vers Samba de sorte que des
+clients Windows puissent y acc&eacute;der via l'ic&oacirc;ne <VAR>Voisinage r&eacute;seau</VAR> ou
+<VAR>Favoris r&eacute;seau</VAR> du bureau. Vous devez au pr&eacute;alable installer les
+pilotes Windows d'imprimante PostScript : cf. la page <i>man</i> <A
+HREF="/help/man-cupsaddsmb.html"
+TARGET="_blank">cupsaddsmb(8)</A>.</P>}
+
+<TABLE>
+<TR>
+<TH CLASS="label">Imprimantes:</TH>
+<TD>
+<SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE>
+{[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}}
+</SELECT><BR>
+<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL"{export_all? CHECKED:}
+onChange="select_printers()"> Exporter toutes les imprimantes
+</TD>
+</TR>
+<TR>
+<TH CLASS="label">Utilisateur Samba:</TH>
+<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> (required)</TD>
+</TR>
+<TR>
+<TH CLASS="label">Mot de passe Samba:</TH>
+<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> (required)</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Exporter les imprimantes vers Samba"></TD>
+</TR>
+</TABLE>
+
+</FORM>
diff --git a/templates/fr/samba-exported.tmpl b/templates/fr/samba-exported.tmpl
new file mode 100644
index 00000000..d4ad778d
--- /dev/null
+++ b/templates/fr/samba-exported.tmpl
@@ -0,0 +1 @@
+<P>Les imprimantes ont &eacute;t&eacute; export&eacute;es vers Samba avec succ&egrave;s.</P>
diff --git a/templates/fr/search.tmpl b/templates/fr/search.tmpl
new file mode 100644
index 00000000..50b1b4e7
--- /dev/null
+++ b/templates/fr/search.tmpl
@@ -0,0 +1,10 @@
+<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET">
+{WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:}
+{ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:}
+
+<P ALIGN="CENTER"><B>Rechercher dans
+{SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?les classes:{SECTION=jobs?les t&acirc;ches:les imprimantes}}}:</B>
+<INPUT TYPE="SEARCH" NAME="QUERY" VALUE="{?QUERY}" SIZE="40"  PLACEHOLDER="" AUTOSAVE="org.cups.{SECTION}" RESULTS="20"> <INPUT
+TYPE="SUBMIT" VALUE="Rechercher"> <INPUT TYPE="SUBMIT" NAME="CLEAR" VALUE="Vider"></P>
+
+</FORM>
diff --git a/templates/fr/set-printer-options-header.tmpl b/templates/fr/set-printer-options-header.tmpl
new file mode 100644
index 00000000..12e0b1d1
--- /dev/null
+++ b/templates/fr/set-printer-options-header.tmpl
@@ -0,0 +1,26 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">D&eacute;finir les Options pour {printer_name}</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{HAVE_AUTOCONFIGURE?<INPUT TYPE="SUBMIT" NAME="AUTOCONFIGURE" VALUE="Interroger l'imprimante pour les options par d&eacute;faut">:}
+
+<SCRIPT TYPE="text/javascript"><!--
+function update_paramtable(option)
+{
+  var cb = document.getElementById("select-" + option)
+  var paramstable = document.getElementById(option + "-params");
+  if (cb.value == "Custom")
+    paramstable.style.display = "table";
+  else
+    paramstable.style.display = "none";
+}
+--></SCRIPT>
+
+<H3 CLASS="title">{[group_id]
+<A HREF="#{group_id}">{group}</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}</H3>
+
+<DIV CLASS="tabs">
diff --git a/templates/fr/set-printer-options-trailer.tmpl b/templates/fr/set-printer-options-trailer.tmpl
new file mode 100644
index 00000000..11adc701
--- /dev/null
+++ b/templates/fr/set-printer-options-trailer.tmpl
@@ -0,0 +1,16 @@
+</DIV>
+
+<SCRIPT TYPE="text/javascript"><!--
+// Hide custom options parameters for browsers that understand Javascript
+var paramtables = document.getElementsByName("paramtable");
+for (var i = 0; i < paramtables.length; i++)
+{
+  var opt = paramtables[i].id.substr(0, paramtables[i].id.lastIndexOf("-"));
+  var cb = document.getElementById("select-" + opt);
+  if (cb.value != "Custom")
+    paramtables[i].style.display = "none";
+}
+--></SCRIPT>
+</FORM>
+
+</DIV>
diff --git a/templates/fr/subscription-added.tmpl b/templates/fr/subscription-added.tmpl
new file mode 100644
index 00000000..54ffe8fb
--- /dev/null
+++ b/templates/fr/subscription-added.tmpl
@@ -0,0 +1,5 @@
+<DIV CLASS="indent">
+
+<P>L'abonnement au flux RSS {subscription_name} a &eacute;t&eacute; ajout&eacute; avec succ&egrave;s.</P>
+
+</DIV>
diff --git a/templates/fr/subscription-canceled.tmpl b/templates/fr/subscription-canceled.tmpl
new file mode 100644
index 00000000..54fbcefb
--- /dev/null
+++ b/templates/fr/subscription-canceled.tmpl
@@ -0,0 +1,5 @@
+<DIV CLASS="indent">
+
+<P>L'abonnement #{notify_subscription_id} au flux RSS a &eacute;t&eacute; annul&eacute;.</P>
+
+</DIV>
diff --git a/templates/fr/test-page.tmpl b/templates/fr/test-page.tmpl
new file mode 100644
index 00000000..8be7c6f7
--- /dev/null
+++ b/templates/fr/test-page.tmpl
@@ -0,0 +1,8 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Imprimer une Page de Test sur {printer_name}</H2>
+
+<P>La page de test a &eacute;t&eacute; envoy&eacute;e; l'identifiant de la t&acirc;che est <A HREF="/{SECTION}/{printer_name}">
+{printer_name}-{job_id}</A>.</P>
+
+</DIV>
diff --git a/templates/fr/trailer.tmpl b/templates/fr/trailer.tmpl
new file mode 100644
index 00000000..f3a46c22
--- /dev/null
+++ b/templates/fr/trailer.tmpl
@@ -0,0 +1,8 @@
+</TD></TR>
+<TR><TD>&nbsp;</TD></TR>
+<TR><TD CLASS="trailer">CUPS et le logo CUPS sont des marques d&eacute;pos&eacute;es de
+<A HREF="http://www.apple.com">Apple Inc.</A> CUPS est sous copyright 2007-2013 Apple
+Inc. Tous droits r&eacute;serv&eacute;s.</TD></TR>
+</TABLE>
+</BODY>
+</HTML>
diff --git a/templates/fr/users.tmpl b/templates/fr/users.tmpl
new file mode 100644
index 00000000..cb9a0527
--- /dev/null
+++ b/templates/fr/users.tmpl
@@ -0,0 +1,30 @@
+<DIV CLASS="indent">
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+{IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:}
+
+<H2 CLASS="title">Utilisateurs autoris&eacute;s &agrave; utiliser {printer_name}</H2>
+
+<TABLE>
+<TR>
+<TH CLASS="label">Utilisateurs:</TH>
+<TD>
+<INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'>
+<BR>
+<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>Autoriser ces utilisateurs &agrave; imprimer
+<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>Emp&ecirc;cher ces utilisateurs d'imprimer
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD>
+<INPUT TYPE="SUBMIT" VALUE="D&eacute;finir les autorisations">
+</TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
diff --git a/templates/ja/trailer.tmpl b/templates/ja/trailer.tmpl
index 123a1972..e804b753 100644
--- a/templates/ja/trailer.tmpl
+++ b/templates/ja/trailer.tmpl
@@ -1,7 +1,7 @@
 </TD></TR>
 <TR><TD>&nbsp;</TD></TR>
 <TR><TD CLASS="trailer">CUPS and the CUPS logo are trademarks of
-<A HREF="http://www.apple.com">Apple Inc.</A> CUPS is copyright 2007-2012 Apple
+<A HREF="http://www.apple.com">Apple Inc.</A> CUPS is copyright 2007-2013 Apple
 Inc. All rights reserved.</TD></TR>
 </TABLE>
 </BODY>
diff --git a/templates/ru/add-class.tmpl b/templates/ru/add-class.tmpl
new file mode 100644
index 00000000..dbb60c62
--- /dev/null
+++ b/templates/ru/add-class.tmpl
@@ -0,0 +1,80 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Новая группа</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+
+<TABLE>
+<TR>
+<TH CLASS="label">Название:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(может содержать любые символы, кроме "/", "#" и пробела)</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Описание:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(Расширенное описание группы, например, "Дуплексный принтер")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Расположение:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(Месторасположение группы, например, "Кабинет 55")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Состав группы:</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="Добавить группу"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Новая группа</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+
+<TABLE>
+<TR>
+<TH CLASS="label">Название:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(может содержать любые символы кроме "/", "#" и пробела)</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Описание:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(Расширенное описание группы, например, "Дуплексный принтер")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Расположение:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(Место расположение группы, например, "Кабинет 55")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Состав группы:</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="Добавить группу"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+\ No newline at end of file
diff --git a/templates/ru/add-printer.tmpl b/templates/ru/add-printer.tmpl
new file mode 100644
index 00000000..05d105f9
--- /dev/null
+++ b/templates/ru/add-printer.tmpl
@@ -0,0 +1,94 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Добавление принтера</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<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}">
+{?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">Название:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?template_name}"><BR>
+<SMALL>(может содержать любые символы, кроме "/","#" и пробела)</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Описание:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_INFO}"><BR>
+<SMALL>(расширенное описание, например, "HP LaserJet с дуплексной печатью")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Расположение:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_LOCATION}"><BR>
+<SMALL>(месторасположение принтера, например, "Кабинет 55")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Подключение:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Совместный доступ:</TH>
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
+Разрешить совместный доступ к этому принтеру</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Продолжить"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Add Printer</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<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}">
+{?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">Название:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?template_name}"><BR>
+<SMALL>(может содержать любые символы кроме "/","#" и пробела)</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Описание:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_INFO}"><BR>
+<SMALL>(расширенное описание, например "HP LaserJet с дуплексной печатью")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Расположение:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_LOCATION}"><BR>
+<SMALL>(месторасположение принтера, например, "Кабинет 55")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Подключение:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Совместный доступ:</TH>
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
+Разрешить совместный доступ к этому принтеру</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Продолжить"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+\ No newline at end of file
diff --git a/templates/ru/add-rss-subscription.tmpl b/templates/ru/add-rss-subscription.tmpl
new file mode 100644
index 00000000..dcc79b5a
--- /dev/null
+++ b/templates/ru/add-rss-subscription.tmpl
@@ -0,0 +1,88 @@
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription">
+
+<H2 CLASS="title">Добавление подписки по RSS</H2>
+
+<TABLE SUMMARY="Добавление подписки по RSS">
+<TR>
+<TH CLASS="label">Название:</TH>
+<TD COLSPAN="5"><INPUT TYPE="TEXT" NAME="SUBSCRIPTION_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?SUBSCRIPTION_NAME}"><BR>
+<SMALL>(Может содержать любые символы, кроме "/", "#", "?" и пробела)</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Очередь:</TH>
+<TD COLSPAN="5"><SELECT NAME="PRINTER_URI" SIZE="10"><OPTION VALUE="#ALL#"{?PRINTER_URI=#ALL#? SELECTED:}>Все очереди</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">События:</TH>
+<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CREATED" {?EVENT_JOB_CREATED}>Новое задание<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_COMPLETED" {?EVENT_JOB_COMPLETED}>Задание выполнено<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_STOPPED" {?EVENT_JOB_STOPPED}>Задание остановлено<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CONFIG_CHANGED" {?EVENT_JOB_CONFIG_CHANGED}>Изменены параметры задания</TD>
+<TD>&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_STOPPED" {?EVENT_PRINTER_STOPPED}>Очередь остановлена<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_ADDED" {?EVENT_PRINTER_ADDED}>Очередь добавлена<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_MODIFIED" {?EVENT_PRINTER_MODIFIED}>Очередь изменена<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_DELETED" {?EVENT_PRINTER_DELETED}>Очередь удалена</TD>
+<TD>&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STARTED" {?EVENT_SERVER_STARTED}>Сервер запущен<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STOPPED" {?EVENT_SERVER_STOPPED}>Сервер остановлен<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_RESTARTED" {?EVENT_SERVER_RESTARTED}>Сервер перезапущен<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_AUDIT" {?EVENT_SERVER_AUDIT}>Проверка безопасности сервера</TD>
+</TR>
+<TR>
+<TH CLASS="label">Количество событий в ленте:</TH>
+<TD COLSPAN="5"><INPUT TYPE="NUMBER" 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="Добавить подписку по RSS"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription">
+
+<H2 CLASS="title">Добавление подписки по RSS</H2>
+
+<TABLE SUMMARY="Добавление подписки по RSS">
+<TR>
+<TH CLASS="label">Название:</TH>
+<TD COLSPAN="5"><INPUT TYPE="TEXT" NAME="SUBSCRIPTION_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?SUBSCRIPTION_NAME}"><BR>
+<SMALL>(Может содержать любые символы кроме "/", "#", "?" и пробела)</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Очередь:</TH>
+<TD COLSPAN="5"><SELECT NAME="PRINTER_URI" SIZE="10"><OPTION VALUE="#ALL#"{?PRINTER_URI=#ALL#? SELECTED:}>Все очереди</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">События:</TH>
+<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CREATED" {?EVENT_JOB_CREATED}>Новое задание<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_COMPLETED" {?EVENT_JOB_COMPLETED}>Задание выполнено<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_STOPPED" {?EVENT_JOB_STOPPED}>Задание остановленно<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CONFIG_CHANGED" {?EVENT_JOB_CONFIG_CHANGED}>Изменены параметры задания</TD>
+<TD>&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_STOPPED" {?EVENT_PRINTER_STOPPED}>Очередь остановлена<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_ADDED" {?EVENT_PRINTER_ADDED}>Очередь добавлена<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_MODIFIED" {?EVENT_PRINTER_MODIFIED}>Очередь изменена<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_DELETED" {?EVENT_PRINTER_DELETED}>Очередь удалена</TD>
+<TD>&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STARTED" {?EVENT_SERVER_STARTED}>Сервер запущен<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STOPPED" {?EVENT_SERVER_STOPPED}>Сервер остановлен<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_RESTARTED" {?EVENT_SERVER_RESTARTED}>Сервер перезапущен<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_AUDIT" {?EVENT_SERVER_AUDIT}>Проверка безопасности сервера</TD>
+</TR>
+<TR>
+<TH CLASS="label">Количество событий в ленте:</TH>
+<TD COLSPAN="5"><INPUT TYPE="NUMBER" 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="Добавить подписку по RSS"></TD>
+</TR>
+</TABLE>
+
+</FORM>
diff --git a/templates/ru/admin.tmpl b/templates/ru/admin.tmpl
new file mode 100644
index 00000000..d9650855
--- /dev/null
+++ b/templates/ru/admin.tmpl
@@ -0,0 +1,204 @@
+<TABLE CLASS="indent" SUMMARY="Администрирование">
+<TR><TD VALIGN="TOP">
+
+<H2 CLASS="title">Принтеры</H2>
+
+<P>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="SUBMIT" VALUE="Добавить принтер"></FORM>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="find-new-printers"><INPUT TYPE="SUBMIT" VALUE="Найти новый принтер"></FORM>
+<FORM ACTION="/printers/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Управление принтерами"></FORM>
+{have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="Экспортировать принтер в Samba"></FORM>:}
+</P>
+
+<H2 CLASS="title">Группы</H2>
+
+<P>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-class"><INPUT TYPE="SUBMIT" VALUE="Добавить группу"></FORM>
+<FORM ACTION="/classes/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Управление группами"></FORM>
+</P>
+
+<H2 CLASS="title">Задания</H2>
+
+<P>
+<FORM ACTION="/jobs/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Управление заданиями"></FORM>
+</P>
+
+</TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">
+
+<H2 CLASS="title">Сервер</H2>
+
+<P>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="Редактировать конфигурационный файл"></FORM>
+<FORM ACTION="/admin/log/access_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Показать журнал заданий"></FORM>
+<FORM ACTION="/admin/log/error_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Показать журнал ошибок"></FORM>
+<FORM ACTION="/admin/log/page_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Показать журнал страниц"></FORM>
+</P>
+
+{SETTINGS_ERROR?<P>{SETTINGS_MESSAGE}</P>
+<BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>:
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+
+{ADVANCEDSETTINGS?<P><B>Параметры сервера\:</B></P>
+
+<P><A HREF="/admin/">Дополнительные параметры<SMALL>&#x25bc;</SMALL></A><BR>
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+<INPUT TYPE="HIDDEN" NAME="ADVANCEDSETTINGS" VALUE="YES">
+<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Показать принтеры, использующиеся в других системах<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Протоколы\:
+<INPUT TYPE="TEXT" NAME="MAX_CLIENTS" VALUE="{?max_clients}" SIZE="6"><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Разрешить печать из интернета<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" {?browse_web_if}> Анонсировать веб-интерфейс<BR>
+<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Разрешить удаленное администрирование<BR>
+{have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Разрешить аутентификацию Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:}
+<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Разрешать пользователям отменять любое задание(не только их собственные)<BR>
+<INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOBS" {?preserve_jobs}> Вести журнал заданий<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Количество заданий\:
+<INPUT TYPE="TEXT" NAME="MAX_JOBS" VALUE="{?max_jobs}" SIZE="6"><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Записывать метаданные(Retain Metadata)\:
+<INPUT TYPE="TEXT" NAME="PRESERVE_JOB_HISTORY" VALUE="{?preserve_job_history}" SIZE="6"><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Существующие документы(Retain Documents)\:
+<INPUT TYPE="TEXT" NAME="PRESERVE_JOB_FILES" VALUE="{?preserve_job_files}" SIZE="6"><BR>
+<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Сохранять отладочную информацию в журнале<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Максимальный размер журнала ошибок\:
+<INPUT TYPE="TEXT" NAME="MAX_LOG_SIZE" VALUE="{?max_log_size}" SIZE="6"></P>
+
+:<P><B>Параметры сервера:</B></P>
+
+<P><A HREF="/admin/?ADVANCEDSETTINGS=YES">Дополнительные параметры <SMALL>&#x25b6;</SMALL></A><BR>
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Разрешить совместный доступ к принтерам, подключенным к этой системе<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Разрешить печать из Интернета<BR>
+<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Разрешить удаленное администрирование<BR>
+{have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Разрешить аутентификацию Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:}
+<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Разрешить пользователям отменять любое задание(не только их собственные)<BR>
+<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Сохранять отладочную информацию в журнале</P>
+
+}
+<P><INPUT TYPE="SUBMIT" NAME="CHANGESETTINGS" VALUE="Сохранить"></P>
+
+</FORM>}
+
+</TD></TR>
+</TABLE>
+
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Подписка по RSS</H2>
+
+<P>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="Добавить подписку по RSS"></FORM>
+</P>
+
+</DIV>
+
+{notify_subscription_id?<TABLE CLASS="list" SUMMARY="Подписки по RSS">
+<THEAD><TR><TH>Название</TH><TH>События</TH><TH>Очередь</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="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Отменить подписку по RSS"></FORM>&nbsp;</TD><TD>{notify_events}</TD><TD NOWRAP>&nbsp;{notify_printer_name?{notify_printer_name}:Все очереди}</TD></TR>}
+</TBODY>
+</TABLE>:}
+<TABLE CLASS="indent" SUMMARY="Администрирование">
+<TR><TD VALIGN="TOP">
+
+<H2 CLASS="title">Принтеры</H2>
+
+<P>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="SUBMIT" VALUE="Добавить принтер"></FORM>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="find-new-printers"><INPUT TYPE="SUBMIT" VALUE="Найти новый принтер"></FORM>
+<FORM ACTION="/printers/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Управление принтерами"></FORM>
+{have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="Экспортировать принтер в Samba"></FORM>:}
+</P>
+
+<H2 CLASS="title">Группы</H2>
+
+<P>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-class"><INPUT TYPE="SUBMIT" VALUE="Добавить группу"></FORM>
+<FORM ACTION="/classes/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Управление группами"></FORM>
+</P>
+
+<H2 CLASS="title">Задания</H2>
+
+<P>
+<FORM ACTION="/jobs/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Управление заданиями"></FORM>
+</P>
+
+</TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">
+
+<H2 CLASS="title">Сервер</H2>
+
+<P>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="Редактировать конфигурационный файл"></FORM>
+<FORM ACTION="/admin/log/access_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Показать журнал заданий"></FORM>
+<FORM ACTION="/admin/log/error_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Показать журнал ошибок"></FORM>
+<FORM ACTION="/admin/log/page_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Показать журнал страниц"></FORM>
+</P>
+
+{SETTINGS_ERROR?<P>{SETTINGS_MESSAGE}</P>
+<BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>:
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+
+{ADVANCEDSETTINGS?<P><B>Параметры сервера\:</B></P>
+
+<P><A HREF="/admin/">Дополнительные параметры<SMALL>&#x25bc;</SMALL></A><BR>
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+<INPUT TYPE="HIDDEN" NAME="ADVANCEDSETTINGS" VALUE="YES">
+<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Показать принтеры, использующиеся в других системах<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Протоколы\:
+<INPUT TYPE="TEXT" NAME="MAX_CLIENTS" VALUE="{?max_clients}" SIZE="6"><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Разрешить печать из интернета<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" {?browse_web_if}> Анонсировать веб-интерфейс<BR>
+<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Разрешить удаленное администрирование<BR>
+{have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Разрешить аутентификацию Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:}
+<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Разрешать пользователям отменять любое задание(не только их собственное)<BR>
+<INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOBS" {?preserve_jobs}> Вести журнал заданий<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Количество заданий\:
+<INPUT TYPE="TEXT" NAME="MAX_JOBS" VALUE="{?max_jobs}" SIZE="6"><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Записывать метаданные(Retain Metadata)\:
+<INPUT TYPE="TEXT" NAME="PRESERVE_JOB_HISTORY" VALUE="{?preserve_job_history}" SIZE="6"><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Существующие документы(Retain Documents)\:
+<INPUT TYPE="TEXT" NAME="PRESERVE_JOB_FILES" VALUE="{?preserve_job_files}" SIZE="6"><BR>
+<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Сохранять отладочную информацию в журнале<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Максимальный размер журнала ошибок\:
+<INPUT TYPE="TEXT" NAME="MAX_LOG_SIZE" VALUE="{?max_log_size}" SIZE="6"></P>
+
+:<P><B>Параметры сервера:</B></P>
+
+<P><A HREF="/admin/?ADVANCEDSETTINGS=YES">Дополнительные параметры <SMALL>&#x25b6;</SMALL></A><BR>
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Разрешить совместный доступ к принтерам, подключенных к этой системе<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Разрешить печать из Интернета<BR>
+<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Разрешить удаленное администрирование<BR>
+{have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Разрешить аутентификацию Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:}
+<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Разрешить пользователям отменять любое задание(не только их собственные)<BR>
+<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Сохранять отладочную информацию в журнале</P>
+
+}
+<P><INPUT TYPE="SUBMIT" NAME="CHANGESETTINGS" VALUE="Сохранить"></P>
+
+</FORM>}
+
+</TD></TR>
+</TABLE>
+
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Подписка по RSS</H2>
+
+<P>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="Добавить подписку по RSS"></FORM>
+</P>
+
+</DIV>
+
+{notify_subscription_id?<TABLE CLASS="list" SUMMARY="Подписки по RSS">
+<THEAD><TR><TH>Name</TH><TH>События</TH><TH>Очередь</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="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Отменить подписку по RSS"></FORM>&nbsp;</TD><TD>{notify_events}</TD><TD NOWRAP>&nbsp;{notify_printer_name?{notify_printer_name}:Все очереди}</TD></TR>}
+</TBODY>
+</TABLE>:}
diff --git a/templates/ru/choose-device.tmpl b/templates/ru/choose-device.tmpl
new file mode 100644
index 00000000..13d08b81
--- /dev/null
+++ b/templates/ru/choose-device.tmpl
@@ -0,0 +1,106 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Изменение {printer_name}:Добавление принтера}</H2>
+
+{CUPS_GET_DEVICES_DONE?<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<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">Текущее подключение\:</TH>
+<TD><INPUT TYPE="RADIO" NAME="DEVICE_URI" VALUE="{current_device_uri}" CHECKED>
+{current_device_uri}</TD>
+</TR>}
+<TR>
+<TH CLASS="label">Локальные принтеры\:</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">Обнаруженные сетевые принтеры\:</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">Другие сетевые принтеры\:</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="Продолжить"></TD>
+</TR>
+</TABLE>
+
+</FORM>:<P><IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16" ALIGN="ABSMIDDLE"
+ALT="Busy Indicator"> Поиск принтеров...</P>}
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Изменение {printer_name}:Добавление принтера}</H2>
+
+{CUPS_GET_DEVICES_DONE?<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<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">Текущее подключение\:</TH>
+<TD><INPUT TYPE="RADIO" NAME="DEVICE_URI" VALUE="{current_device_uri}" CHECKED>
+{current_device_uri}</TD>
+</TR>}
+<TR>
+<TH CLASS="label">Локальные принтеры\:</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">Обнаруженные сетевые принтеры\:</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">Другие сетевые принтеры\:</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="Продолжить"></TD>
+</TR>
+</TABLE>
+
+</FORM>:<P><IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16" ALIGN="ABSMIDDLE"
+ALT="Busy Indicator"> Поиск принтеров...</P>}
+
+</DIV>
diff --git a/templates/ru/choose-make.tmpl b/templates/ru/choose-make.tmpl
new file mode 100644
index 00000000..e61e1143
--- /dev/null
+++ b/templates/ru/choose-make.tmpl
@@ -0,0 +1,128 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Изменение {printer_name}:Добавление принтера}</H2>
+
+<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<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">Название:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
+</TR>}
+<TR>
+<TH CLASS="label">Описание:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{printer_info}">{printer_info}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Расположение:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{printer_location}">{printer_location}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Подключение:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Совместный доступ:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_IS_SHARED" VALUE="{?printer_is_shared}">
+{?printer_is_shared=?Нет совместного доступа:{?printer_is_shared=0?Нет совместного доступа:Разрешить совместный доступ}} к этому принтеру</TD>
+</TR>
+<TR>
+<TH CLASS="label">Создать:</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="Продолжить"></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD>&nbsp;</TD>
+</TR>
+<TR>
+<TH CLASS="label">или использовать файл PPD:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
+TYPE="FILE" NAME="PPD_FILE"></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="{op=add-printer?Добавить принтер:Сохранить}"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Изменение {printer_name}:Добавление принтера}</H2>
+
+<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<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">Название:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
+</TR>}
+<TR>
+<TH CLASS="label">Описание:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{printer_info}">{printer_info}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Расположение:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{printer_location}">{printer_location}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Подключение:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Совместный доступ:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_IS_SHARED" VALUE="{?printer_is_shared}">
+{?printer_is_shared=?Нет совместного доступа:{?printer_is_shared=0?Нет совместного доступа:}} Разрешить совместный доступ к этому принтеру</TD>
+</TR>
+<TR>
+<TH CLASS="label">Создать:</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="Продолжить"></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD>&nbsp;</TD>
+</TR>
+<TR>
+<TH CLASS="label">или использовать файл PPD:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
+TYPE="FILE" NAME="PPD_FILE"></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="{op=add-printer?Добавить принтер:Сохранить}"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+\ No newline at end of file
diff --git a/templates/ru/choose-model.tmpl b/templates/ru/choose-model.tmpl
new file mode 100644
index 00000000..06a268d9
--- /dev/null
+++ b/templates/ru/choose-model.tmpl
@@ -0,0 +1,120 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Изменение {printer_name}:Добавление принтера}</H2>
+
+<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<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">Название:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
+</TR>}
+<TR>
+<TH CLASS="label">Описание:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{printer_info}">{printer_info}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Расположение:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{printer_location}">{printer_location}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Подключение:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Совместный доступ:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_IS_SHARED" VALUE="{?printer_is_shared}">
+{?printer_is_shared=?Нет совместного доступа:{?printer_is_shared=0?Нет совместного доступа:Разрешить совместный доступ}} к этому принтеру</TD>
+</TR>
+<TR>
+<TH CLASS="label">Создать:</TH>
+<TD>{PPD_MAKE} <INPUT TYPE="SUBMIT" NAME="SELECT_MAKE" VALUE="Выбрать другую модель"></TD>
+</TR>
+<TR>
+<TH CLASS="label">Модель:</TH>
+<TD>
+<SELECT NAME="PPD_NAME" SIZE="10">
+{op=add-printer?:<OPTION VALUE="__no_change__" SELECTED>Текущий драйвер - {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">или использовать файл PPD:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
+TYPE="FILE" NAME="PPD_FILE"></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="{op=add-printer?Добавить принтер:Сохранить}"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Изменение {printer_name}:Добавление принтера}</H2>
+
+<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<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">Название:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
+</TR>}
+<TR>
+<TH CLASS="label">Описание:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{printer_info}">{printer_info}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Расположение:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{printer_location}">{printer_location}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Подключение:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Совместный доступ:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_IS_SHARED" VALUE="{?printer_is_shared}">
+{?printer_is_shared=?Нет совместного доступа:{?printer_is_shared=0?Нет совместного доступа:}} Разрешить совместный доступ к этому принтеру</TD>
+</TR>
+<TR>
+<TH CLASS="label">Создать:</TH>
+<TD>{PPD_MAKE} <INPUT TYPE="SUBMIT" NAME="SELECT_MAKE" VALUE="Выбрать другую модель"></TD>
+</TR>
+<TR>
+<TH CLASS="label">Модель:</TH>
+<TD>
+<SELECT NAME="PPD_NAME" SIZE="10">
+{op=add-printer?:<OPTION VALUE="__no_change__" SELECTED>Текущий драйвер - {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">или использовать файл PPD:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
+TYPE="FILE" NAME="PPD_FILE"></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="{op=add-printer?Добавить принтер:Сохранить}"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+\ No newline at end of file
diff --git a/templates/ru/choose-serial.tmpl b/templates/ru/choose-serial.tmpl
new file mode 100644
index 00000000..3cfd30c2
--- /dev/null
+++ b/templates/ru/choose-serial.tmpl
@@ -0,0 +1,104 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Изменение {printer_name}:Добавление принтера}</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:}
+
+<TABLE>
+<TR>
+<TH CLASS="label">Подключение:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Скорость передачи:</TH>
+<TD><SELECT NAME="BAUDRATE">
+{[baudrates]<OPTION {?baudrate={baudrates}?SELECTED:}>{baudrates}}
+</SELECT></TD>
+</TR>
+<TR>
+<TH CLASS="label">Печать страниц:</TH>
+<TD><SELECT NAME="PARITY">
+<OPTION VALUE="none" {?parity=none?SELECTED:}>Все
+<OPTION VALUE="even" {?parity=even?SELECTED:}>Только четные
+<OPTION VALUE="odd" {?parity=odd?SELECTED:}>Только нечетные
+</SELECT></TD>
+</TR>
+<TR>
+<TH CLASS="label">Биты данных:</TH>
+<TD><SELECT NAME="BITS">
+<OPTION {?bits=8?SELECTED:}>8
+<OPTION {?bits=7?SELECTED:}>7
+</SELECT></TD>
+</TR>
+<TR>
+<TH CLASS="label">Управление:</TH>
+<TD><SELECT NAME="FLOW">
+<OPTION VALUE="none" {?flow=none?SELECTED:}>Нет
+<OPTION VALUE="soft" {?flow=soft?SELECTED:}>XON/XOFF (Программное)
+<OPTION VALUE="hard" {?flow=hard?SELECTED:}>RTS/CTS (Аппаратное)
+<OPTION VALUE="dtrdsr" {?flow=dtrdsr?SELECTED:}>DTR/DSR (Аппаратное)
+</SELECT></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Продолжить"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Изменение {printer_name}:Добавление принтера}</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:}
+
+<TABLE>
+<TR>
+<TH CLASS="label">Подключение:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Скорость передачи:</TH>
+<TD><SELECT NAME="BAUDRATE">
+{[baudrates]<OPTION {?baudrate={baudrates}?SELECTED:}>{baudrates}}
+</SELECT></TD>
+</TR>
+<TR>
+<TH CLASS="label">Печать страниц:</TH>
+<TD><SELECT NAME="PARITY">
+<OPTION VALUE="none" {?parity=none?SELECTED:}>Все
+<OPTION VALUE="even" {?parity=even?SELECTED:}>Только четные
+<OPTION VALUE="odd" {?parity=odd?SELECTED:}>Только нечетные
+</SELECT></TD>
+</TR>
+<TR>
+<TH CLASS="label">Биты данных:</TH>
+<TD><SELECT NAME="BITS">
+<OPTION {?bits=8?SELECTED:}>8
+<OPTION {?bits=7?SELECTED:}>7
+</SELECT></TD>
+</TR>
+<TR>
+<TH CLASS="label">Управление:</TH>
+<TD><SELECT NAME="FLOW">
+<OPTION VALUE="none" {?flow=none?SELECTED:}>Нет
+<OPTION VALUE="soft" {?flow=soft?SELECTED:}>XON/XOFF (Программное)
+<OPTION VALUE="hard" {?flow=hard?SELECTED:}>RTS/CTS (Аппаратное)
+<OPTION VALUE="dtrdsr" {?flow=dtrdsr?SELECTED:}>DTR/DSR (Аппаратное)
+</SELECT></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Продолжить"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+\ No newline at end of file
diff --git a/templates/ru/choose-uri.tmpl b/templates/ru/choose-uri.tmpl
new file mode 100644
index 00000000..c56cf5bc
--- /dev/null
+++ b/templates/ru/choose-uri.tmpl
@@ -0,0 +1,86 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Изменение {printer_name}:Добавление принтера}</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<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">Подключение:</TH>
+<TD><INPUT TYPE="URL" SIZE="60" MAXLENGTH="1023" NAME="DEVICE_URI" VALUE="{current_device_uri?{current_device_uri}:{device_uri}}"></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD>Примеры:
+<PRE>
+    http://hostname:631/ipp/
+    http://hostname:631/ipp/port1
+
+    ipp://hostname/ipp/
+    ipp://hostname/ipp/port1
+
+    lpd://hostname/queue
+
+    socket://hostname
+    socket://hostname:9100
+</PRE>
+
+<P>Смотрите раздел <A HREF="/help/network.html" TARGET="_blank">"Сетевые принтеры"</A> для выяснения правильного адреса вашего принтера.</P>
+
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Продолжить"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Изменение {printer_name}:Добавление принтера}</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<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">Подключение:</TH>
+<TD><INPUT TYPE="URL" SIZE="60" MAXLENGTH="1023" NAME="DEVICE_URI" VALUE="{current_device_uri?{current_device_uri}:{device_uri}}"></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD>Примеры:
+<PRE>
+    http://hostname:631/ipp/
+    http://hostname:631/ipp/port1
+
+    ipp://hostname/ipp/
+    ipp://hostname/ipp/port1
+
+    lpd://hostname/queue
+
+    socket://hostname
+    socket://hostname:9100
+</PRE>
+
+<P>Смотрите раздел <A HREF="/help/network.html" TARGET="_blank">"Сетевые принтеры"</A> для выяснения правильного адреса вашего принтера.</P>
+
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Продолжить"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+\ No newline at end of file
diff --git a/templates/ru/class-added.tmpl b/templates/ru/class-added.tmpl
new file mode 100644
index 00000000..7d04612f
--- /dev/null
+++ b/templates/ru/class-added.tmpl
@@ -0,0 +1,14 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Новая группа</H2>
+
+<P>Группа <A HREF="/classes/{printer_name}">{printer_name}</A> успешно добавлена.
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Новая группа</H2>
+
+<P>Группа <A HREF="/classes/{printer_name}">{printer_name}</A> успешно добавлена.
+
+</DIV>
diff --git a/templates/ru/class-confirm.tmpl b/templates/ru/class-confirm.tmpl
new file mode 100644
index 00000000..70b56279
--- /dev/null
+++ b/templates/ru/class-confirm.tmpl
@@ -0,0 +1,20 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Удаление группы {printer_name}</H2>
+
+<P><B>Предупреждение:</B> Вы действительно хотите удалить группу
+{printer_name}?</P>
+
+<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Удалить группу"></FORM></P>
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Удаление группы {printer_name}</H2>
+
+<P><B>Предупреждение:</B> Вы действительно хотите удалить группу
+{printer_name}?</P>
+
+<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Удалить группу"></FORM></P>
+
+</DIV>
diff --git a/templates/ru/class-deleted.tmpl b/templates/ru/class-deleted.tmpl
new file mode 100644
index 00000000..c1764982
--- /dev/null
+++ b/templates/ru/class-deleted.tmpl
@@ -0,0 +1,14 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Удаление группы {printer_name}</H2>
+
+<P>Группа {printer_name} успешно удалена.
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Удаление группы {printer_name}</H2>
+
+<P>Группа {printer_name} успешно удалена.
+
+</DIV>
+\ No newline at end of file
diff --git a/templates/ru/class-jobs-header.tmpl b/templates/ru/class-jobs-header.tmpl
new file mode 100644
index 00000000..b552f2c4
--- /dev/null
+++ b/templates/ru/class-jobs-header.tmpl
@@ -0,0 +1,6 @@
+<DIV CLASS="indent">
+<H3 CLASS="title">Задания</H3>
+</DIV>
+<DIV CLASS="indent">
+<H3 CLASS="title">Задания</H3>
+</DIV>
diff --git a/templates/ru/class-modified.tmpl b/templates/ru/class-modified.tmpl
new file mode 100644
index 00000000..c7a87318
--- /dev/null
+++ b/templates/ru/class-modified.tmpl
@@ -0,0 +1,14 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Изменение группы {printer_name}</H2>
+
+<P>Группа <A HREF="/classes/{printer_name}">{printer_name}</A> успешно изменена.
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Изменение группы {printer_name}</H2>
+
+<P>Группа <A HREF="/classes/{printer_name}">{printer_name}</A> успешно изменена.
+
+</DIV>
+\ No newline at end of file
diff --git a/templates/ru/class.tmpl b/templates/ru/class.tmpl
new file mode 100644
index 00000000..2b22ca36
--- /dev/null
+++ b/templates/ru/class.tmpl
@@ -0,0 +1,88 @@
+<DIV CLASS="indent">
+<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>
+({printer_state=3?Idle:{printer_state=4?печать:приостановлен}},
+{printer_is_accepting_jobs=0?Не принимает задания:Принимает задания},
+{server_is_sharing_printers=0?нет совместного доступа:{printer_is_shared=0?нет совместного доступа:разрешен совместный доступ}} {default_name={printer_name}?, Сервер по умолчанию:})</H2>
+
+<FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<SELECT NAME="OP" ONCHANGE="document.maintenance.submit();">
+<OPTION VALUE="">Обслуживание</OPTION>
+<OPTION VALUE="print-test-page">Печать пробной страницы</OPTION>
+{printer_state=5?<OPTION VALUE="start-class">Данные группы</OPTION>:<OPTION VALUE="stop-class">Приостановить группу</OPTION>}
+{printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Принимать задания</OPTION>:<OPTION VALUE="reject-jobs">Не принимать задания</OPTION>}
+<OPTION VALUE="move-jobs">Переместить все задания</OPTION>
+<OPTION VALUE="purge-jobs">Отменить все задания</OPTION>
+</SELECT>
+<INPUT TYPE="SUBMIT" VALUE="Сохранить" STYLE="display: none;">
+</FORM>
+
+<FORM METHOD="POST" ACTION="{admin_uri}" NAME="Администрирование">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">
+<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="1">
+<SELECT NAME="OP" ONCHANGE="document.administration.submit();">
+<OPTION VALUE="">Администрирование</OPTION>
+<OPTION VALUE="modify-class">Изменить группу</OPTION>
+<OPTION VALUE="delete-class">Удалить группу</OPTION>
+<OPTION VALUE="set-class-options">Установить параметры по умолчанию</OPTION>
+<OPTION VALUE="set-as-default">Установить как принтер по умолчанию</OPTION>
+<OPTION VALUE="set-allowed-users">Список разрешенных пользователей</OPTION>
+</SELECT>
+<INPUT TYPE="SUBMIT" VALUE="Сохранить" STYLE="display: none;">
+</FORM>
+
+<TABLE SUMMARY="{printer_name}">
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Описание:</TH><TD>{printer_info}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Расположение:</TH><TD>{printer_location}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Состав:</TH><TD>{?member_uris=?Нет принтеров:{member_uris}}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">По умолчанию:</TH><TD>job-sheets={job_sheets_default}
+media={media_default?{media_default}:неизвестный}
+{sides_default?sides={sides_default}:}</TD></TR>
+</TABLE>
+
+</DIV>
+<DIV CLASS="indent">
+<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>
+({printer_state=3?Idle:{printer_state=4?печать:приостановлен}},
+{printer_is_accepting_jobs=0?Не принимает задания:Принимает задания},
+{server_is_sharing_printers=0?нет совместного доступа:{printer_is_shared=0?нет совместного доступа:}} Разрешен совместный доступ{default_name={printer_name}?, Сервер по умолчанию:})</H2>
+
+<FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<SELECT NAME="OP" ONCHANGE="document.maintenance.submit();">
+<OPTION VALUE="">Обслуживание</OPTION>
+<OPTION VALUE="print-test-page">Печать пробной страницы</OPTION>
+{printer_state=5?<OPTION VALUE="start-class">Данные группы</OPTION>:<OPTION VALUE="stop-class">Приостановить группу</OPTION>}
+{printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Принимать задания</OPTION>:<OPTION VALUE="reject-jobs">Не принимать задания</OPTION>}
+<OPTION VALUE="move-jobs">Переместить все задания</OPTION>
+<OPTION VALUE="purge-jobs">Отменить все задания</OPTION>
+</SELECT>
+<INPUT TYPE="SUBMIT" VALUE="Сохранить" STYLE="display: none;">
+</FORM>
+
+<FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">
+<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="1">
+<SELECT NAME="OP" ONCHANGE="document.administration.submit();">
+<OPTION VALUE="">Администрирование</OPTION>
+<OPTION VALUE="modify-class">Изменить группу</OPTION>
+<OPTION VALUE="delete-class">Удалить группу</OPTION>
+<OPTION VALUE="set-class-options">Установить параметры по умолчанию</OPTION>
+<OPTION VALUE="set-as-default">Установить как принтер по умолчанию</OPTION>
+<OPTION VALUE="set-allowed-users">Список разрешенных пользователей</OPTION>
+</SELECT>
+<INPUT TYPE="SUBMIT" VALUE="Сохранить" STYLE="display: none;">
+</FORM>
+
+<TABLE SUMMARY="{printer_name}">
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Описание:</TH><TD>{printer_info}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Расположение:</TH><TD>{printer_location}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Состав:</TH><TD>{?member_uris=?Нет принтеров:{member_uris}}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">По умолчанию:</TH><TD>job-sheets={job_sheets_default}
+media={media_default?{media_default}:неизвестный}
+{sides_default?sides={sides_default}:}</TD></TR>
+</TABLE>
+
+</DIV>
diff --git a/templates/ru/classes-header.tmpl b/templates/ru/classes-header.tmpl
new file mode 100644
index 00000000..dec28f27
--- /dev/null
+++ b/templates/ru/classes-header.tmpl
@@ -0,0 +1,2 @@
+<P ALIGN="CENTER">{total=0?Нет групп:Показать {#printer_name} из {total} группы{total=1?:es}}.</P>
+<P ALIGN="CENTER">{total=0?Нет групп:Показать {#printer_name} из {total} группы{total=1?:es}}.</P>
diff --git a/templates/ru/classes.tmpl b/templates/ru/classes.tmpl
new file mode 100644
index 00000000..96ff65a7
--- /dev/null
+++ b/templates/ru/classes.tmpl
@@ -0,0 +1,22 @@
+{#printer_name=0?:
+<TABLE CLASS="list" SUMMARY="Список групп">
+<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> Очередь <SMALL>&#x25b2;</SMALL>:<SMALL>&#x25bc;</SMALL> Очередь <SMALL>&#x25bc;</SMALL>}</A></TH><TH>Описание</TH><TH>Расположение</TH><TH>Состав</TH><TH>Статус</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=?Нет принтеров:{member_uris}}</TD><TD>{printer_state=3?В ожидании:{printer_state=4?Печатает:Приостановлен}}{printer_state_message? - "{printer_state_message}":}</TD></TR>
+}
+</TBODY>
+</TABLE></DIV>}
+{#printer_name=0?:
+<TABLE CLASS="list" SUMMARY="Список групп">
+<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> Очередь <SMALL>&#x25b2;</SMALL>:<SMALL>&#x25bc;</SMALL> Очередь <SMALL>&#x25bc;</SMALL>}</A></TH><TH>Описание</TH><TH>Расположение</TH><TH>Состав</TH><TH>Статус</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=?Нет принтеров:{member_uris}}</TD><TD>{printer_state=3?В ожидании:{printer_state=4?Печатает:Приостановлен}}{printer_state_message? - "{printer_state_message}":}</TD></TR>
+}
+</TBODY>
+</TABLE></DIV>}
diff --git a/templates/ru/command.tmpl b/templates/ru/command.tmpl
new file mode 100644
index 00000000..bb79affc
--- /dev/null
+++ b/templates/ru/command.tmpl
@@ -0,0 +1,24 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{title} для {printer_name}</H2>
+
+<P>{job_state>5?:<IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16"
+ALIGN="ABSMIDDLE" ALT="Индикатор занятости"> }Обработка задания
+{job_state=3?в очереди:{job_state=4?удерживается:
+{job_state=5?обрабатывается:{job_state=6?остановлено:
+{job_state=7?отменено:{job_state=8?прервано:завершено}}}}}}{job_state=9?:{job_printer_state_message?,
+<EM>"{job_printer_state_message}"</EM>:}}</P>
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{title} для {printer_name}</H2>
+
+<P>{job_state>5?:<IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16"
+ALIGN="ABSMIDDLE" ALT="Busy Indicator"> }Обработка задания
+{job_state=3?в очереди:{job_state=4?удерживается:
+{job_state=5?обрабатывается:{job_state=6?остановлено:
+{job_state=7?отменено:{job_state=8?прервано:завершено}}}}}}{job_state=9?:{job_printer_state_message?,
+<EM>"{job_printer_state_message}"</EM>:}}</P>
+
+</DIV>
diff --git a/templates/ru/edit-config.tmpl b/templates/ru/edit-config.tmpl
new file mode 100644
index 00000000..8b356849
--- /dev/null
+++ b/templates/ru/edit-config.tmpl
@@ -0,0 +1,48 @@
+<SCRIPT TYPE="text/javascript">
+function reset_config()
+{
+  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
+}
+</SCRIPT>
+
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Редактирование конфигурационного файла</H2>
+
+<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+
+<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
+
+<P><INPUT TYPE="SUBMIT" NAME="SAVECHANGES" VALUE="Сохранить изменения">
+<INPUT TYPE="BUTTON" VALUE="Сбросить все изменения"
+onClick="reset_config();"></P>
+
+</FORM>
+
+</DIV>
+<SCRIPT TYPE="text/javascript">
+function reset_config()
+{
+  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
+}
+</SCRIPT>
+
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Редактирование конфигурационного файла</H2>
+
+<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+
+<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
+
+<P><INPUT TYPE="SUBMIT" NAME="SAVECHANGES" VALUE="Сохранить изменения">
+<INPUT TYPE="BUTTON" VALUE="Сбросить все изменения"
+onClick="reset_config();"></P>
+
+</FORM>
+
+</DIV>
diff --git a/templates/ru/error-op.tmpl b/templates/ru/error-op.tmpl
new file mode 100644
index 00000000..029fe762
--- /dev/null
+++ b/templates/ru/error-op.tmpl
@@ -0,0 +1,18 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{?title} {?printer_name} - ошибка </H2>
+
+<P>Ошибка:</P>
+
+<BLOCKQUOTE>Неизвестная операция "{op}"!</BLOCKQUOTE>
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{?title} {?printer_name} - ошибка </H2>
+
+<P>Ошибка:</P>
+
+<BLOCKQUOTE>Неизвестная операция "{op}"!</BLOCKQUOTE>
+
+</DIV>
diff --git a/templates/ru/error.tmpl b/templates/ru/error.tmpl
new file mode 100644
index 00000000..ce3ebb68
--- /dev/null
+++ b/templates/ru/error.tmpl
@@ -0,0 +1,18 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{?title} {?printer_name} - ошибка</H2>
+
+<P>{?message?{message}:Ошибка}:</P>
+
+<BLOCKQUOTE>{error}</BLOCKQUOTE>
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{?title} {?printer_name} - ошибка</H2>
+
+<P>{?message?{message}:Ошибка}:</P>
+
+<BLOCKQUOTE>{error}</BLOCKQUOTE>
+
+</DIV>
diff --git a/templates/ru/header.tmpl.in b/templates/ru/header.tmpl.in
new file mode 100644
index 00000000..de9c26c3
--- /dev/null
+++ b/templates/ru/header.tmpl.in
@@ -0,0 +1,58 @@
+<!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>{title} - 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">
+	{refresh_page?<META HTTP-EQUIV="Refresh" CONTENT="{refresh_page}">:}
+</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="unsel"><A HREF="/">&nbsp;&nbsp;Начало&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=admin?:un}sel"><A HREF="/admin">&nbsp;&nbsp;Администрирование&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=classes?:un}sel"><A HREF="/classes/">&nbsp;&nbsp;Группы&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=help?:un}sel"><A HREF="/help/">&nbsp;&nbsp;Справка&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=jobs?:un}sel"><A HREF="/jobs/">&nbsp;&nbsp;Задания&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=printers?:un}sel"><A HREF="/printers/">&nbsp;&nbsp;Принтеры&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel" WIDTH="100%"><FORM ACTION="/help/" METHOD="GET"><INPUT
+TYPE="SEARCH" NAME="QUERY" SIZE="20" PLACEHOLDER="Поиск по справке"
+VALUE="{SECTION=help?{?QUERY}:}" AUTOSAVE="org.cups.help" RESULTS="20"></FORM></TD>
+<TD><IMG SRC="/images/right.gif" WIDTH="4" HEIGHT="36" ALT=""></TD>
+</TR>
+<TR><TD COLSPAN="9">&nbsp;</TD></TR>
+</TABLE>
+<!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>{title} - 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">
+	{refresh_page?<META HTTP-EQUIV="Refresh" CONTENT="{refresh_page}">:}
+</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="unsel"><A HREF="/">&nbsp;&nbsp;Начало&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=admin?:un}sel"><A HREF="/admin">&nbsp;&nbsp;Администрирование&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=classes?:un}sel"><A HREF="/classes/">&nbsp;&nbsp;Группы&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=help?:un}sel"><A HREF="/help/">&nbsp;&nbsp;Справка&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=jobs?:un}sel"><A HREF="/jobs/">&nbsp;&nbsp;Задания&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=printers?:un}sel"><A HREF="/printers/">&nbsp;&nbsp;Принтеры&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel" WIDTH="100%"><FORM ACTION="/help/" METHOD="GET"><INPUT
+TYPE="SEARCH" NAME="QUERY" SIZE="20" PLACEHOLDER="Поиск по справке"
+VALUE="{SECTION=help?{?QUERY}:}" AUTOSAVE="org.cups.help" RESULTS="20"></FORM></TD>
+<TD><IMG SRC="/images/right.gif" WIDTH="4" HEIGHT="36" ALT=""></TD>
+</TR>
+<TR><TD COLSPAN="9">&nbsp;</TD></TR>
+</TABLE>
diff --git a/templates/ru/help-header.tmpl b/templates/ru/help-header.tmpl
new file mode 100644
index 00000000..219a5b2d
--- /dev/null
+++ b/templates/ru/help-header.tmpl
@@ -0,0 +1,90 @@
+<DIV CLASS="indent">
+<FORM ACTION="/help/{?HELPFILE}" METHOD="GET">
+{TOPIC?<INPUT TYPE="HIDDEN" NAME="TOPIC" VALUE="{TOPIC}">:}
+
+<P ALIGN="CENTER"><B>Поиск
+{HELPTITLE?в {HELPTITLE}:{TOPIC?в {TOPIC}:по справке}}:</B> <INPUT
+TYPE="SEARCH" NAME="QUERY" VALUE="{?QUERY}" SIZE="40" PLACEHOLDER=""
+AUTOSAVE="org.cups.help" RESULTS="20">
+<INPUT TYPE="SUBMIT" NAME="SEARCH" VALUE="Поиск">
+<INPUT TYPE="SUBMIT" NAME="CLEAR" VALUE="Очистить"></P>
+
+</FORM>
+
+<!-- Bookmarks -->
+<DIV CLASS="sidebar"><TABLE CLASS="inset" SUMMARY="Содержание">
+<TR><TD>
+
+<H3 CLASS="title">Документация</H3>
+
+<P CLASS="l0"><A HREF="/help/{QUERY??QUERY={QUERY}:}">Все разделы</A></P>
+<HR>
+
+{[BMTEXT]<P CLASS="l{BMINDENT}"><A HREF="{BMLINK}">{BMTEXT}</A></P>
+}
+</TD></TR>
+</TABLE></DIV>
+
+{QUERY?<P>Результаты поиска в {HELPFILE?{HELPTITLE}:{TOPIC?{TOPIC}:всей справке}}\:</P>
+{QTEXT?<UL>
+{[QTEXT]<LI><A HREF="{QLINK}">{QTEXT}</A>{QPTEXT? (in <I><A HREF="{QPLINK}">{QPTEXT}</A></I>):}</LI>}
+{QTEXT?</UL>:}
+:<P>Не найдено совпадений.</P>}
+<HR NOSHADE>:}
+{HELPTITLE?<H1>{HELPTITLE}</H1>
+<FORM ACTION="/help/{?HELPFILE}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="PRINTABLE" VALUE="YES"><INPUT TYPE="SUBMIT" VALUE="Показать версию для печати"></FORM>:
+
+<H1>Справка</H1>
+
+<P>Это справка CUPS. Введите выше слова для поиска в справке и нажмите "Поиск", чтобы показать результаты поиска.</P>
+
+<P>Если вы пока мало знакомы с CUPS, прочтите раздел "<a
+href="/help/overview.html">Введение в CUPS</a>". Опытные пользователи
+могут обратиться к разделу "<a href="/help/whatsnew.html">Что нового в CUPS 1.6</a>".</P>
+
+<P><A HREF="http://www.cups.org/">Веб-сайт CUPS</A> так же содержит большое количество ресурсов для пользователей, включая форум, ответы на часто задаваемые вопросы и форму для регистрации ошибок и пожеланий.</P>}
+<DIV CLASS="indent">
+<FORM ACTION="/help/{?HELPFILE}" METHOD="GET">
+{TOPIC?<INPUT TYPE="HIDDEN" NAME="TOPIC" VALUE="{TOPIC}">:}
+
+<P ALIGN="CENTER"><B>Поиск
+{HELPTITLE?{HELPTITLE}:{TOPIC?{TOPIC}:All Documents}}:</B> <INPUT
+TYPE="SEARCH" NAME="QUERY" VALUE="{?QUERY}" SIZE="40" PLACEHOLDER=""
+AUTOSAVE="org.cups.help" RESULTS="20">
+<INPUT TYPE="SUBMIT" NAME="SEARCH" VALUE="Поиск">
+<INPUT TYPE="SUBMIT" NAME="CLEAR" VALUE="Очистить"></P>
+
+</FORM>
+
+<!-- Bookmarks -->
+<DIV CLASS="sidebar"><TABLE CLASS="inset" SUMMARY="Содержание">
+<TR><TD>
+
+<H3 CLASS="title">Документация</H3>
+
+<P CLASS="l0"><A HREF="/help/{QUERY??QUERY={QUERY}:}">Все разделы</A></P>
+<HR>
+
+{[BMTEXT]<P CLASS="l{BMINDENT}"><A HREF="{BMLINK}">{BMTEXT}</A></P>
+}
+</TD></TR>
+</TABLE></DIV>
+
+{QUERY?<P>Результаты поиска в {HELPFILE?{HELPTITLE}:{TOPIC?{TOPIC}:всей справке}}\:</P>
+{QTEXT?<UL>
+{[QTEXT]<LI><A HREF="{QLINK}">{QTEXT}</A>{QPTEXT? (in <I><A HREF="{QPLINK}">{QPTEXT}</A></I>):}</LI>}
+{QTEXT?</UL>:}
+:<P>Не найдено совпадений.</P>}
+<HR NOSHADE>:}
+{HELPTITLE?<H1>{HELPTITLE}</H1>
+<FORM ACTION="/help/{?HELPFILE}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="PRINTABLE" VALUE="YES"><INPUT TYPE="SUBMIT" VALUE="Показать версию для печати"></FORM>:
+
+<H1>Спрвака</H1>
+
+<P>Это справка CUPS. Введите выше слова для поиска в справке и нажмите "Поиск", чтобы показать результаты поиска.</P>
+
+<P>Если вы пока мало знакомы с CUPS, прочтите раздел "<a
+href="/help/overview.html">Введение в CUPS</a>". Опытные пользователи
+могут обратиться к разделу "<a href="/help/whatsnew.html">Что нового в CUPS 1.6</a>".</P>
+
+<P><A HREF="http://www.cups.org/">Веб-сайт CUPS</A> так же содержит большое количество ресурсов лоя пользователей, включая форум, ответы на часто задаваемые вопросы и форму для регистрации ошибок и пожеланий.</P>}
diff --git a/templates/ru/help-printable.tmpl b/templates/ru/help-printable.tmpl
new file mode 100644
index 00000000..88635226
--- /dev/null
+++ b/templates/ru/help-printable.tmpl
@@ -0,0 +1,18 @@
+<!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>{HELPTITLE}</TITLE>
+	<LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups-printable.css">
+	<LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png">
+</HEAD>
+<BODY>
+<!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>{HELPTITLE}</TITLE>
+	<LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups-printable.css">
+	<LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png">
+</HEAD>
+<BODY>
diff --git a/templates/ru/help-trailer.tmpl b/templates/ru/help-trailer.tmpl
new file mode 100644
index 00000000..1266bd33
--- /dev/null
+++ b/templates/ru/help-trailer.tmpl
@@ -0,0 +1,2 @@
+</DIV>
+</DIV>
diff --git a/templates/ru/job-cancel.tmpl b/templates/ru/job-cancel.tmpl
new file mode 100644
index 00000000..7500df45
--- /dev/null
+++ b/templates/ru/job-cancel.tmpl
@@ -0,0 +1,14 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Отмена задания {job_id}</H2>
+
+<P><A HREF="{job_printer_uri}">Задание {job_id}</A> отменено.
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Отмена задания {job_id}</H2>
+
+<P><A HREF="{job_printer_uri}">Задание {job_id}</A> отменено.
+
+</DIV>
diff --git a/templates/ru/job-hold.tmpl b/templates/ru/job-hold.tmpl
new file mode 100644
index 00000000..c840b134
--- /dev/null
+++ b/templates/ru/job-hold.tmpl
@@ -0,0 +1,14 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Приостановка задания {job_id}</H2>
+
+<P><A HREF="{job_printer_uri}">Задание {job_id}</A> приостановлено.
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Приостановка задания {job_id}</H2>
+
+<P><A HREF="{job_printer_uri}">Задание {job_id}</A> приостановлено.
+
+</DIV>
diff --git a/templates/ru/job-move.tmpl b/templates/ru/job-move.tmpl
new file mode 100644
index 00000000..005ede5c
--- /dev/null
+++ b/templates/ru/job-move.tmpl
@@ -0,0 +1,54 @@
+<DIV CLASS="indent">
+
+<FORM METHOD="POST" ACTION="/{SECTION}/{job_id?:{printer_name}}">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:}
+
+<H2 CLASS="title">{job_id?Перемещение задания {job_id}:Перемещение всех заданий}</H2>
+
+<TABLE>
+<TR>
+<TH CLASS="label">Переместить на принтер:</TH>
+<TD>
+<SELECT NAME="JOB_PRINTER_URI" SIZE="10">
+{[job_printer_uri]<OPTION VALUE="{job_printer_uri}">{job_printer_name}}
+</SELECT>
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="{job_id?Переместить задание:Переместить все задания}"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+
+</DIV>
+<DIV CLASS="indent">
+
+<FORM METHOD="POST" ACTION="/{SECTION}/{job_id?:{printer_name}}">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:}
+
+<H2 CLASS="title">{job_id?Перемещение задания {job_id}:Перемещение всех заданий}</H2>
+
+<TABLE>
+<TR>
+<TH CLASS="label">Переместить на принтер:</TH>
+<TD>
+<SELECT NAME="JOB_PRINTER_URI" SIZE="10">
+{[job_printer_uri]<OPTION VALUE="{job_printer_uri}">{job_printer_name}}
+</SELECT>
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="{job_id?Переместить задание:Переместить все задания}"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+
+</DIV>
diff --git a/templates/ru/job-moved.tmpl b/templates/ru/job-moved.tmpl
new file mode 100644
index 00000000..b54bf4e2
--- /dev/null
+++ b/templates/ru/job-moved.tmpl
@@ -0,0 +1,16 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{job_id?Перемещение задания {job_id}:Перемещение всех заданий}</H2>
+
+<P>{job_id?<A HREF="/jobs/{job_id}">Задание {job_id}</A>:Все задания} перемещены на
+<A HREF="/{is_class?группы:принтеры}/{job_printer_name}">{job_printer_name}</A>.</P>
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{job_id?Перемещение задания {job_id}:Перемещение всех заданий}</H2>
+
+<P>{job_id?<A HREF="/jobs/{job_id}">Задание {job_id}</A>:Все задания} перемещены на
+<A HREF="/{is_class?группы:принтеры}/{job_printer_name}">{job_printer_name}</A>.</P>
+
+</DIV>
diff --git a/templates/ru/job-release.tmpl b/templates/ru/job-release.tmpl
new file mode 100644
index 00000000..8a6a3e77
--- /dev/null
+++ b/templates/ru/job-release.tmpl
@@ -0,0 +1,14 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Разблокирование задания {job_id}</H2>
+
+<P><A HREF="{job_printer_uri}">Задание {job_id}</A> разблокировано.
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Разблокирование задания {job_id}</H2>
+
+<P><A HREF="{job_printer_uri}">Задание {job_id}</A> разблокировано.
+
+</DIV>
diff --git a/templates/ru/job-restart.tmpl b/templates/ru/job-restart.tmpl
new file mode 100644
index 00000000..2f4b87b3
--- /dev/null
+++ b/templates/ru/job-restart.tmpl
@@ -0,0 +1,14 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Перезапуск задания {job_id}</H2>
+
+<P><A HREF="{job_printer_uri}">Задание {job_id}</A> запущено заново.
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Перезапуск задания {job_id}</H2>
+
+<P><A HREF="{job_printer_uri}">Задание {job_id}</A> запущено заново.
+
+</DIV>
diff --git a/templates/ru/jobs-header.tmpl b/templates/ru/jobs-header.tmpl
new file mode 100644
index 00000000..b56f98fa
--- /dev/null
+++ b/templates/ru/jobs-header.tmpl
@@ -0,0 +1,10 @@
+<DIV CLASS="indent">{?which_jobs=?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Показать активные задания"></FORM>}
+{?which_jobs=completed?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="completed"><INPUT TYPE="SUBMIT" VALUE="Показать завершенные задания"></FORM>}
+{?which_jobs=all?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="all"><INPUT TYPE="SUBMIT" VALUE="Показать все задания"></FORM>}</DIV>
+
+<P ALIGN="CENTER">{total=0?Нет заданий:Задание {#job_id} из {total} {?which_jobs=?активных:{which_jobs=all?:завершенных}}}.</P>
+<DIV CLASS="indent">{?which_jobs=?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Показать активные задания"></FORM>}
+{?which_jobs=completed?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="completed"><INPUT TYPE="SUBMIT" VALUE="Показать завершенные задания"></FORM>}
+{?which_jobs=all?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="all"><INPUT TYPE="SUBMIT" VALUE="Показать все задания"></FORM>}</DIV>
+
+<P ALIGN="CENTER">{total=0?Нет заданий:Задание {#job_id} из {total} {?which_jobs=?активных:{which_jobs=all?:завершенных}}}.</P>
diff --git a/templates/ru/jobs.tmpl b/templates/ru/jobs.tmpl
new file mode 100644
index 00000000..d64a4b6b
--- /dev/null
+++ b/templates/ru/jobs.tmpl
@@ -0,0 +1,72 @@
+{#job_id=0?:
+<TABLE CLASS="list" SUMMARY="Задания">
+<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> Номер <SMALL>&#x25b2;</SMALL>:<SMALL>&#x25bc;</SMALL> ID <SMALL>&#x25bc;</SMALL>}</A></TH><TH>Название</TH><TH>Пользователь</TH><TH>Размер</TH><TH>Страниц</TH><TH>Статус</TH><TH>Управление</TH></TR>
+</THEAD>
+<TBODY>
+{[job_id]
+<TR VALIGN="TOP">
+<TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id}{?phone? ({phone}):}&nbsp;</TD>
+<TD>{?job_name=?Неизвестное:{job_name}}&nbsp;</TD>
+<TD>{?job_originating_user_name=?Приостановлено пользователем:{job_originating_user_name}}&nbsp;</TD>
+<TD>{job_k_octets}k&nbsp;</TD>
+<TD>{job_media_sheets_completed=0?Неизвестно:{?job_media_sheets_completed}}&nbsp;</TD>
+<TD>{job_state=3?В очереди<BR>{time_at_creation}:{job_state=4?Приостановлено с<BR>{time_at_creation}:
+{job_state=5?Создано<BR>{time_at_processing}:{job_state=6?Остановлено:
+{job_state=7?Отменено<BR>{time_at_completed}:{job_state=8?Прервано:Завершено<BR>{time_at_completed}}}}}}}&nbsp;{job_printer_state_message?<BR>
+<EM>"{job_printer_state_message}"</EM>:}</TD>
+<TD>
+{job_preserved>0?{job_state>5?
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="restart-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"><INPUT TYPE="SUBMIT" VALUE="Перезапустить"></FORM>:}:}
+{job_state=4?
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="release-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}">
+<INPUT TYPE="SUBMIT" VALUE="Продолжить"></FORM>:}
+{job_state=3?
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="hold-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}">
+<INPUT TYPE="SUBMIT" VALUE="Приостановить"></FORM>:}
+{job_state<7?
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}">
+<INPUT TYPE="SUBMIT" VALUE="Отменить"></FORM>
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="move-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="SUBMIT" VALUE="Переместить"></FORM>:}
+&nbsp;</TD>
+</TR>
+}
+</TBODY>
+</TABLE>
+}
+{#job_id=0?:
+<TABLE CLASS="list" SUMMARY="Задания">
+<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> Номер <SMALL>&#x25b2;</SMALL>:<SMALL>&#x25bc;</SMALL> ID <SMALL>&#x25bc;</SMALL>}</A></TH><TH>Название</TH><TH>Пользователь</TH><TH>Размер</TH><TH>Страниц</TH><TH>Статус</TH><TH>Управление</TH></TR>
+</THEAD>
+<TBODY>
+{[job_id]
+<TR VALIGN="TOP">
+<TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id}{?phone? ({phone}):}&nbsp;</TD>
+<TD>{?job_name=?Неизвестное:{job_name}}&nbsp;</TD>
+<TD>{?job_originating_user_name=?Приостановленно пользователем:{job_originating_user_name}}&nbsp;</TD>
+<TD>{job_k_octets}k&nbsp;</TD>
+<TD>{job_media_sheets_completed=0?Неизвестно:{?job_media_sheets_completed}}&nbsp;</TD>
+<TD>{job_state=3?В очереди<BR>{time_at_creation}:{job_state=4?Приостановлено с<BR>{time_at_creation}:
+{job_state=5?Создано<BR>{time_at_processing}:{job_state=6?Остановлено:
+{job_state=7?Отменено<BR>{time_at_completed}:{job_state=8?Прервано:Завершено<BR>{time_at_completed}}}}}}}&nbsp;{job_printer_state_message?<BR>
+<EM>"{job_printer_state_message}"</EM>:}</TD>
+<TD>
+{job_preserved>0?{job_state>5?
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="restart-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"><INPUT TYPE="SUBMIT" VALUE="Перезапустить"></FORM>:}:}
+{job_state=4?
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="release-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}">
+<INPUT TYPE="SUBMIT" VALUE="Продолжить"></FORM>:}
+{job_state=3?
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="hold-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}">
+<INPUT TYPE="SUBMIT" VALUE="Приостановить"></FORM>:}
+{job_state<7?
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}">
+<INPUT TYPE="SUBMIT" VALUE="Отменить"></FORM>
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="move-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="SUBMIT" VALUE="Переместить"></FORM>:}
+&nbsp;</TD>
+</TR>
+}
+</TBODY>
+</TABLE>
+}
diff --git a/templates/ru/list-available-printers.tmpl b/templates/ru/list-available-printers.tmpl
new file mode 100644
index 00000000..34592151
--- /dev/null
+++ b/templates/ru/list-available-printers.tmpl
@@ -0,0 +1,22 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Доступные принтеры</H2>
+
+{#device_uri=0?<P>Не обнаружено ни одного принтера.</P>
+:<UL>{[device_uri]
+<LI><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="HIDDEN" NAME="TEMPLATE_NAME" VALUE="{template_name}"><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="Локальный принтер"><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{device_make_and_model}"><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}"><INPUT TYPE="SUBMIT" VALUE="Добавить этот принтер"></FORM>
+{device_make_and_model} ({device_info})</LI>
+}</UL>}
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Доступные принтеры</H2>
+
+{#device_uri=0?<P>Не обнаружено ни одного принтера.</P>
+:<UL>{[device_uri]
+<LI><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="HIDDEN" NAME="TEMPLATE_NAME" VALUE="{template_name}"><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="Локальный принтер"><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{device_make_and_model}"><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}"><INPUT TYPE="SUBMIT" VALUE="Добавить этот принтер"></FORM>
+{device_make_and_model} ({device_info})</LI>
+}</UL>}
+
+</DIV>
diff --git a/templates/ru/modify-class.tmpl b/templates/ru/modify-class.tmpl
new file mode 100644
index 00000000..43927bbc
--- /dev/null
+++ b/templates/ru/modify-class.tmpl
@@ -0,0 +1,68 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Изменение группы {printer_name}</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+
+<TABLE>
+<TR>
+<TH CLASS="label">Описание:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"></TD>
+</TR>
+<TR>
+<TH CLASS="label">Расположение:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"></TD>
+</TR>
+<TR>
+<TH CLASS="label">Состав группы:</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="Изменить группу"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Изменение группы {printer_name}</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+
+<TABLE>
+<TR>
+<TH CLASS="label">Описание:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"></TD>
+</TR>
+<TR>
+<TH CLASS="label">Расположение:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"></TD>
+</TR>
+<TR>
+<TH CLASS="label">Состав группы:</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="Изменить группу"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+\ No newline at end of file
diff --git a/templates/ru/modify-printer.tmpl b/templates/ru/modify-printer.tmpl
new file mode 100644
index 00000000..0c4dde15
--- /dev/null
+++ b/templates/ru/modify-printer.tmpl
@@ -0,0 +1,84 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Изменение принтера {printer_name}</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<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}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+
+<TABLE>
+<TR>
+<TH CLASS="label">Описание:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(расширенное описание принтера, например,  "HP LaserJet с дуплексной печатью")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Расположение:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(местоположение принтера, например, "Кабинет 55")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Подключение:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Совместный доступ:</TH>
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
+Разрешить совместный доступ к этому принтеру</TD>
+</TR>
+<TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Продолжить"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Изменение принтера {printer_name}</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<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}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+
+<TABLE>
+<TR>
+<TH CLASS="label">Описание:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(расширенное описание принтера, например,  "HP LaserJet с дуплексной печатью")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Расположение:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(местоположение принтера, например, "Кабинет 55")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Подключение:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Совместный доступ:</TH>
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
+Разрешить совместный доступ к этому принтеру</TD>
+</TR>
+<TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Продолжить"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
diff --git a/templates/ru/norestart.tmpl b/templates/ru/norestart.tmpl
new file mode 100644
index 00000000..405b4714
--- /dev/null
+++ b/templates/ru/norestart.tmpl
@@ -0,0 +1,14 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Применение изменений</H2>
+
+<P>Сервер не был перезапущен,поскольку не произошло изменений в конфигурации...</P>
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Применение изменений</H2>
+
+<P>Сервер не был перезапущен,поскольку не произошло изменений в конфигурации...</P>
+
+</DIV>
diff --git a/templates/ru/option-boolean.tmpl b/templates/ru/option-boolean.tmpl
new file mode 100644
index 00000000..f8d3eef2
--- /dev/null
+++ b/templates/ru/option-boolean.tmpl
@@ -0,0 +1,12 @@
+<TR>
+<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
+<TD>
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword-1}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
+</TD>
+</TR>
+<TR>
+<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
+<TD>
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword-1}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
+</TD>
+</TR>
diff --git a/templates/ru/option-conflict.tmpl b/templates/ru/option-conflict.tmpl
new file mode 100644
index 00000000..cf442782
--- /dev/null
+++ b/templates/ru/option-conflict.tmpl
@@ -0,0 +1,14 @@
+<P><B>Ошибка:</B> следующие параметры конфликтуют:</P>
+
+<UL>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
+}</UL>
+
+<P>Измените один или несколько параметров для того, чтобы избежать конфликта.</P>
+<P><B>Ошибка:</B> следующие параметры конфликтуют:</P>
+
+<UL>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
+}</UL>
+
+<P>Измените один или несколько параметров для того, чтобы избежать конфликта.</P>
diff --git a/templates/ru/option-header.tmpl b/templates/ru/option-header.tmpl
new file mode 100644
index 00000000..dcabc17d
--- /dev/null
+++ b/templates/ru/option-header.tmpl
@@ -0,0 +1,10 @@
+<DIV CLASS="tab" ID="{group_id}">
+
+<H3 ALIGN="CENTER">{group}</H3>
+
+<TABLE WIDTH="100%">
+<DIV CLASS="tab" ID="{group_id}">
+
+<H3 ALIGN="CENTER">{group}</H3>
+
+<TABLE WIDTH="100%">
diff --git a/templates/ru/option-pickmany.tmpl b/templates/ru/option-pickmany.tmpl
new file mode 100644
index 00000000..90d742bd
--- /dev/null
+++ b/templates/ru/option-pickmany.tmpl
@@ -0,0 +1,12 @@
+<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}}
+</SELECT></TD>
+</TR>
+<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}}
+</SELECT></TD>
+</TR>
diff --git a/templates/ru/option-pickone.tmpl b/templates/ru/option-pickone.tmpl
new file mode 100644
index 00000000..1e8676ea
--- /dev/null
+++ b/templates/ru/option-pickone.tmpl
@@ -0,0 +1,36 @@
+<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}}
+</SELECT>
+{iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
+<TR><TH CLASS="sublabel">{paramtext}:</TH>
+<TD>{params=Units?<SELECT NAME="{keyword-1}.{params}">
+<OPTION VALUE="pt"{paramvalue=pt? SELECTED:}>Пункты</OPTION>
+<OPTION VALUE="mm"{paramvalue=mm? SELECTED:}>Миллиметры</OPTION>
+<OPTION VALUE="cm"{paramvalue=cm? SELECTED:}>Сантиметры</OPTION>
+<OPTION VALUE="in"{paramvalue=in? SELECTED:}>Дюймы</OPTION>
+<OPTION VALUE="ft"{paramvalue=ft? SELECTED:}>Футы</OPTION>
+<OPTION VALUE="m"{paramvalue=m? SELECTED:}>Метры</OPTION>
+</SELECT>:<INPUT TYPE="{inputtype}" NAME="{keyword-1}.{params}" VALUE="{paramvalue}">}</TD></TR>
+}</TABLE>
+</TD>:}
+</TR>
+<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}}
+</SELECT>
+{iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
+<TR><TH CLASS="sublabel">{paramtext}:</TH>
+<TD>{params=Units?<SELECT NAME="{keyword-1}.{params}">
+<OPTION VALUE="pt"{paramvalue=pt? SELECTED:}>Пункты</OPTION>
+<OPTION VALUE="mm"{paramvalue=mm? SELECTED:}>Милиметры</OPTION>
+<OPTION VALUE="cm"{paramvalue=cm? SELECTED:}>Сантиметры</OPTION>
+<OPTION VALUE="in"{paramvalue=in? SELECTED:}>Дюймы</OPTION>
+<OPTION VALUE="ft"{paramvalue=ft? SELECTED:}>Футы</OPTION>
+<OPTION VALUE="m"{paramvalue=m? SELECTED:}>Метры</OPTION>
+</SELECT>:<INPUT TYPE="{inputtype}" NAME="{keyword-1}.{params}" VALUE="{paramvalue}">}</TD></TR>
+}</TABLE>
+</TD>:}
+</TR>
diff --git a/templates/ru/option-trailer.tmpl b/templates/ru/option-trailer.tmpl
new file mode 100644
index 00000000..e111c93f
--- /dev/null
+++ b/templates/ru/option-trailer.tmpl
@@ -0,0 +1,10 @@
+</TABLE>
+
+<P ALIGN="CENTER"><INPUT TYPE="SUBMIT" VALUE="Сохранить параметры по умолчанию"></P>
+
+</DIV>
+</TABLE>
+
+<P ALIGN="CENTER"><INPUT TYPE="SUBMIT" VALUE="Сохранить параметры по умолчанию"></P>
+
+</DIV>
+\ No newline at end of file
diff --git a/templates/ru/pager.tmpl b/templates/ru/pager.tmpl
new file mode 100644
index 00000000..ebdab35d
--- /dev/null
+++ b/templates/ru/pager.tmpl
@@ -0,0 +1,12 @@
+<TABLE CLASS="inset" SUMMARY="Просмотр по страницам">
+<TR>
+	<TD WIDTH="50%">{PREV?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{PREV}"><INPUT TYPE="SUBMIT" VALUE="&#x25c0; Предварительный просмотр"></FORM>:&nbsp;}</TD>
+	<TD WIDTH="50%" ALIGN="RIGHT">{NEXT?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{NEXT}"><INPUT TYPE="SUBMIT" VALUE="Показать следующую &#x25b6;"></FORM>:&nbsp;}</TD>
+</TR>
+</TABLE>
+<TABLE CLASS="inset" SUMMARY="Paging Bar">
+<TR>
+	<TD WIDTH="50%">{PREV?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{PREV}"><INPUT TYPE="SUBMIT" VALUE="&#x25c0; Предварительный просмотр"></FORM>:&nbsp;}</TD>
+	<TD WIDTH="50%" ALIGN="RIGHT">{NEXT?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{NEXT}"><INPUT TYPE="SUBMIT" VALUE="Показать следующую &#x25b6;"></FORM>:&nbsp;}</TD>
+</TR>
+</TABLE>
diff --git a/templates/ru/printer-accept.tmpl b/templates/ru/printer-accept.tmpl
new file mode 100644
index 00000000..d6a3b056
--- /dev/null
+++ b/templates/ru/printer-accept.tmpl
@@ -0,0 +1,18 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Прием заданий {is_class?в группу:на принтер} {printer_name}</H2>
+
+<P>{is_class?Группа:Принтер} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+теперь принимает задания.</P>
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Прием заданий {is_class?в группу:на принтер} {printer_name}</H2>
+
+<P>{is_class?Группа:Принтер} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+теперь принимает задания.</P>
+
+</DIV>
diff --git a/templates/ru/printer-added.tmpl b/templates/ru/printer-added.tmpl
new file mode 100644
index 00000000..63e43c1a
--- /dev/null
+++ b/templates/ru/printer-added.tmpl
@@ -0,0 +1,14 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Добавить принтер</H2>
+
+<P>Принтер <A HREF="/printers/{printer_name}">{printer_name}</A> успешно добавлен.
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Добавить принтер</H2>
+
+<P>Принтер <A HREF="/printers/{printer_name}">{printer_name}</A> успешно добавлен.
+
+</DIV>
diff --git a/templates/ru/printer-configured.tmpl b/templates/ru/printer-configured.tmpl
new file mode 100644
index 00000000..00bd731e
--- /dev/null
+++ b/templates/ru/printer-configured.tmpl
@@ -0,0 +1,16 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Настройки по умолчанию для {printer_name}</H2>
+
+<P>{OP=set-class-options?Группа <A HREF="/classes/{printer_name}">:Принтер <A HREF="/printers/{printer_name}">}{printer_name}</A>
+теперь используют параметры по умолчанию.
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Настройки по умолчанию для {printer_name}</H2>
+
+<P>{OP=set-class-options?Группа <A HREF="/classes/{printer_name}">:Принтер <A HREF="/printers/{printer_name}">}{printer_name}</A>
+теперь используют параметры по умолчанию.
+
+</DIV>
diff --git a/templates/ru/printer-confirm.tmpl b/templates/ru/printer-confirm.tmpl
new file mode 100644
index 00000000..75969169
--- /dev/null
+++ b/templates/ru/printer-confirm.tmpl
@@ -0,0 +1,20 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Удаление принтера {printer_name}</H2>
+
+<P><B>Предупреждение:</B> вы действительно хотите удалить принтер
+{printer_name}?</P>
+
+<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Удалить принтер"></FORM></P>
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Удаление принтера {printer_name}</H2>
+
+<P><B>Предупреждение:</B> вы действительно хотите удалить принтер
+{printer_name}?</P>
+
+<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Удалить принтер"></FORM></P>
+
+</DIV>
diff --git a/templates/ru/printer-default.tmpl b/templates/ru/printer-default.tmpl
new file mode 100644
index 00000000..113815a1
--- /dev/null
+++ b/templates/ru/printer-default.tmpl
@@ -0,0 +1,24 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Установка {is_class?группы:принтера} {printer_name} по умолчанию</H2>
+
+<P>{is_class?Группа:Принтер} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+установлены на сервере по умолчанию для новых заданий.</P>
+
+<BLOCKQUOTE><B>Примечания:</B> вы можете переопределить это поведение с помощью команды
+the <TT>lpoptions</TT>.</BLOCKQUOTE>
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Установка {is_class?группы:принтера} {printer_name} по умолчанию</H2>
+
+<P>{is_class?Группа:Принтер} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+установлены на сервере по умолчанию для новых заданий.</P>
+
+<BLOCKQUOTE><B>Примечания:</B> вы можете переопределить это поведение с помощью команды
+the <TT>lpoptions</TT>.</BLOCKQUOTE>
+
+</DIV>
diff --git a/templates/ru/printer-deleted.tmpl b/templates/ru/printer-deleted.tmpl
new file mode 100644
index 00000000..63abc912
--- /dev/null
+++ b/templates/ru/printer-deleted.tmpl
@@ -0,0 +1,14 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Удаление принтера {printer_name}</H2>
+
+<P>Принтер {printer_name} успешно удален.
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Удаление принтера {printer_name}</H2>
+
+<P>Принтер {printer_name} успешно удален.
+
+</DIV>
diff --git a/templates/ru/printer-jobs-header.tmpl b/templates/ru/printer-jobs-header.tmpl
new file mode 100644
index 00000000..b552f2c4
--- /dev/null
+++ b/templates/ru/printer-jobs-header.tmpl
@@ -0,0 +1,6 @@
+<DIV CLASS="indent">
+<H3 CLASS="title">Задания</H3>
+</DIV>
+<DIV CLASS="indent">
+<H3 CLASS="title">Задания</H3>
+</DIV>
diff --git a/templates/ru/printer-modified.tmpl b/templates/ru/printer-modified.tmpl
new file mode 100644
index 00000000..33d4c4b4
--- /dev/null
+++ b/templates/ru/printer-modified.tmpl
@@ -0,0 +1,14 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Изменение принтера {printer_name}</H2>
+
+<P>Параметры принтера <A HREF="/printers/{printer_name}">{printer_name}</A> успешно изменены.
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Изменение принтера {printer_name}</H2>
+
+<P>Параметры принтера <A HREF="/printers/{printer_name}">{printer_name}</A> успешно изменены.
+
+</DIV>
+\ No newline at end of file
diff --git a/templates/ru/printer-purge.tmpl b/templates/ru/printer-purge.tmpl
new file mode 100644
index 00000000..492f3ed2
--- /dev/null
+++ b/templates/ru/printer-purge.tmpl
@@ -0,0 +1,18 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Очистка всех заданий для {is_class?группы:принтера} {printer_name}</H2>
+
+<P>Все задания для {is_class?группы:принтера} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+очищены.</P>
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Очистка всех заданий для {is_class?группы:принтера} {printer_name}</H2>
+
+<P>Все задания для {is_class?группы:принтера} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+очищены.</P>
+
+</DIV>
+\ No newline at end of file
diff --git a/templates/ru/printer-reject.tmpl b/templates/ru/printer-reject.tmpl
new file mode 100644
index 00000000..81958bf0
--- /dev/null
+++ b/templates/ru/printer-reject.tmpl
@@ -0,0 +1,18 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Отмена заданий для {is_class?группы:принтера} {printer_name}</H2>
+
+<P>{is_class?Группа:Принтер} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+больше не принимает задания.</P>
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Отмена заданий для {is_class?группы:принтера} {printer_name}</H2>
+
+<P>{is_class?Группа:Принтер} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+больше не принимает задания.</P>
+
+</DIV>
diff --git a/templates/ru/printer-start.tmpl b/templates/ru/printer-start.tmpl
new file mode 100644
index 00000000..909b2b62
--- /dev/null
+++ b/templates/ru/printer-start.tmpl
@@ -0,0 +1,18 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Возобновить работу {is_class?группы:принтера} {printer_name}</H2>
+
+<P>{is_class?Группа:Принтер} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+теперь принимают задания.</P>
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Возобновить работу {is_class?группы:принтера} {printer_name}</H2>
+
+<P>{is_class?Группа:Принтер} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+теперь принимают задания.</P>
+
+</DIV>
+\ No newline at end of file
diff --git a/templates/ru/printer-stop.tmpl b/templates/ru/printer-stop.tmpl
new file mode 100644
index 00000000..4cf6344b
--- /dev/null
+++ b/templates/ru/printer-stop.tmpl
@@ -0,0 +1,18 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Приостановить {is_class?группу:принтер} {printer_name}</H2>
+
+<P>{is_class?Группа:Принтер} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+{is_class?была приостановлена:был приостановлен}.</P>
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Приостановить {is_class?группу:принтер} {printer_name}</H2>
+
+<P>{is_class?Группа:Принтер} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+{is_class?была приостановлена:был приостановлен}.</P>
+
+</DIV>
+\ No newline at end of file
diff --git a/templates/ru/printer.tmpl b/templates/ru/printer.tmpl
new file mode 100644
index 00000000..00f0167b
--- /dev/null
+++ b/templates/ru/printer.tmpl
@@ -0,0 +1,94 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>
+({printer_state=3?в ожидании:{printer_state=4?печать:приостановлен}},
+{printer_is_accepting_jobs=0?не принимает задания:принимает задания},
+{server_is_sharing_printers=0?нет совместного доступа:{printer_is_shared=0?нет совместного доступа:разрешен совместный доступ}} {default_name={printer_name}?, По умолчанию:})</H2>
+
+<FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<SELECT NAME="OP" ONCHANGE="document.maintenance.submit();">
+<OPTION VALUE="">Обслуживание</OPTION>
+<OPTION VALUE="print-test-page">Печать пробной страницы</OPTION>
+{printer_commands~.*Clean.*?<OPTION VALUE="clean-print-heads">Очистить головки</OPTION>:}
+{printer_commands~.*PrintSelfTestPage.*?<OPTION VALUE="print-self-test-page">Печать пробной страницы принтера</OPTION>:}
+{printer_state=5?<OPTION VALUE="start-printer">Восстановить печать</OPTION>:<OPTION VALUE="stop-printer">Приостановить принтер</OPTION>}
+{printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Принимать задания</OPTION>:<OPTION VALUE="reject-jobs">Не принимать задания</OPTION>}
+<OPTION VALUE="move-jobs">Переместить все задания</OPTION>
+<OPTION VALUE="purge-jobs">Закрыть все задания</OPTION>
+</SELECT>
+<INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;">
+</FORM>
+
+<FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">
+<SELECT NAME="OP" ONCHANGE="document.administration.submit();">
+<OPTION VALUE="">Администрирование</OPTION>
+<OPTION VALUE="modify-printer">Изменить принтер</OPTION>
+<OPTION VALUE="delete-printer">Удалить принтер</OPTION>
+<OPTION VALUE="set-printer-options">Установить параметры по умолчанию</OPTION>
+<OPTION VALUE="set-as-default">Установить как принтер по умолчанию</OPTION>
+<OPTION VALUE="set-allowed-users">Список разрешенных пользователей</OPTION>
+</SELECT>
+<INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;">
+</FORM>
+
+<TABLE SUMMARY="{printer_name}">
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Описание:</TH><TD>{printer_info}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Расположение:</TH><TD>{printer_location}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Драйвер:</TH><TD>{printer_make_and_model} ({color_supported=1?цветной:черно-белый}{sides_supported?, дуплексная печать:})<BR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Подключение:</TH><TD>{device_uri}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">По умолчанию:</TH><TD>job-sheets={job_sheets_default}
+media={media_default?{media_default}:неизвестный}
+{sides_default?sides={sides_default}:}</TD></TR>
+</TABLE>
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>
+({printer_state=3?в ожидании:{printer_state=4?печать:приостановлен}},
+{printer_is_accepting_jobs=0?не принимает задания:принимает задания},
+{server_is_sharing_printers=0?нет совместного доступа:{printer_is_shared=0?нет совместного доступа:разрешен совместный доступ}} {default_name={printer_name}?, По умолчанию:})</H2>
+
+<FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<SELECT NAME="OP" ONCHANGE="document.maintenance.submit();">
+<OPTION VALUE="">Обслуживание</OPTION>
+<OPTION VALUE="print-test-page">Печать пробной страницы</OPTION>
+{printer_commands~.*Clean.*?<OPTION VALUE="clean-print-heads">Очистить головки</OPTION>:}
+{printer_commands~.*PrintSelfTestPage.*?<OPTION VALUE="print-self-test-page">печать пробной страницы принтера</OPTION>:}
+{printer_state=5?<OPTION VALUE="start-printer">Resume Printer</OPTION>:<OPTION VALUE="stop-printer">Приостановить принтер</OPTION>}
+{printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Возобновить печать</OPTION>:<OPTION VALUE="reject-jobs">Приостановить печать</OPTION>}
+<OPTION VALUE="move-jobs">Переместить все задания</OPTION>
+<OPTION VALUE="purge-jobs">Закрыть все задания</OPTION>
+</SELECT>
+<INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;">
+</FORM>
+
+<FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">
+<SELECT NAME="OP" ONCHANGE="document.administration.submit();">
+<OPTION VALUE="">Администрирование</OPTION>
+<OPTION VALUE="modify-printer">Изменить принтер</OPTION>
+<OPTION VALUE="delete-printer">Удалить принтер</OPTION>
+<OPTION VALUE="set-printer-options">Установить параметры по умолчанию</OPTION>
+<OPTION VALUE="set-as-default">Установить как принтер по умолчанию</OPTION>
+<OPTION VALUE="set-allowed-users">Список разрешенных пользователей</OPTION>
+</SELECT>
+<INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;">
+</FORM>
+
+<TABLE SUMMARY="{printer_name}">
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Описание:</TH><TD>{printer_info}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Расположение:</TH><TD>{printer_location}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Драйвер:</TH><TD>{printer_make_and_model} ({color_supported=1?цветной:черно-белый}{sides_supported?, дуплексная печать:})<BR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Подключение:</TH><TD>{device_uri}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">По умолчанию:</TH><TD>job-sheets={job_sheets_default}
+media={media_default?{media_default}:неизвестный}
+{sides_default?sides={sides_default}:}</TD></TR>
+</TABLE>
+
+</DIV>
+\ No newline at end of file
diff --git a/templates/ru/printers-header.tmpl b/templates/ru/printers-header.tmpl
new file mode 100644
index 00000000..693572e6
--- /dev/null
+++ b/templates/ru/printers-header.tmpl
@@ -0,0 +1,2 @@
+<P ALIGN="CENTER">{total=0?Нет принтеров:Принтер {#printer_name} из {total}}.</P>
+<P ALIGN="CENTER">{total=0?Нет принтеров:Принтер {#printer_name} из {total}}.</P>
diff --git a/templates/ru/printers.tmpl b/templates/ru/printers.tmpl
new file mode 100644
index 00000000..4006b084
--- /dev/null
+++ b/templates/ru/printers.tmpl
@@ -0,0 +1,22 @@
+{#printer_name=0?:
+<TABLE CLASS="list" SUMMARY="Список принтеров">
+<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> Очередь <SMALL>&#x25b2;</SMALL>:<SMALL>&#x25bc;</SMALL> Очередь <SMALL>&#x25bc;</SMALL>}</A></TH><TH>Описание</TH><TH>Расположение</TH><TH>Драйвер</TH><TH>Статус</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>{printer_make_and_model}</TD><TD>{printer_state=3?Idle:{printer_state=4?Печатает:Приостановлен}}{printer_state_message? - "{printer_state_message}":}</TD></TR>
+}
+</TBODY>
+</TABLE></DIV>}
+{#printer_name=0?:
+<TABLE CLASS="list" SUMMARY="Список принтеров">
+<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> Очередь <SMALL>&#x25b2;</SMALL>:<SMALL>&#x25bc;</SMALL> Очередь <SMALL>&#x25bc;</SMALL>}</A></TH><TH> Описание </TH><TH>Расположение</TH><TH>Драйвер</TH><TH>Статус</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>{printer_make_and_model}</TD><TD>{printer_state=3?Idle:{printer_state=4?Печатает:Приостановлен}}{printer_state_message? - "{printer_state_message}":}</TD></TR>
+}
+</TBODY>
+</TABLE></DIV>}
diff --git a/templates/ru/restart.tmpl b/templates/ru/restart.tmpl
new file mode 100644
index 00000000..d2e73fae
--- /dev/null
+++ b/templates/ru/restart.tmpl
@@ -0,0 +1,16 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Применение изменений параметров</H2>
+
+<P><IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16" ALIGN="ABSMIDDLE"
+ALT="Ожидание"> Дождитесь перезагрузки сервера...</P>
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Применение изменений параметров</H2>
+
+<P><IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16" ALIGN="ABSMIDDLE"
+ALT="Busy Indicator"> Дождитесь перезагрузки сервера...</P>
+
+</DIV>
diff --git a/templates/ru/samba-export.tmpl b/templates/ru/samba-export.tmpl
new file mode 100644
index 00000000..a9dfde00
--- /dev/null
+++ b/templates/ru/samba-export.tmpl
@@ -0,0 +1,106 @@
+<SCRIPT TYPE="text/javascript"><!--
+function select_printers() {
+  var list = document.export_samba.EXPORT_NAME;
+  var sel = document.export_samba.EXPORT_ALL.checked;
+
+  for (i = 0; i < list.length; i ++) {
+    list.options[i].selected = sel;
+  }
+}
+--></SCRIPT>
+
+<FORM METHOD="POST" ACTION="/admin/" NAME="export_samba">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba">
+
+<H2 CLASS="title">Экспорт принтеров в Samba</H2>
+
+{error?<P>Невозможно экспортировать принтеры в Samba\:</P>
+<BLOCKQUOTE>{error}</BLOCKQUOTE>
+<P>Посмотрите файл <A HREF="/admin/log/error_log"
+TARGET="_blank">error_log</A> для более подробной информации.</P>:
+<P>Эта страница позволяет добавить принтеры в Samba так, чтобы
+клиенты Windows могли получить доступ к ним через значок <VAR>Сетевое окружение</VAR> или <VAR>Сетевые подключения</VAR> на их рабочем столе. Вы должны установить на Windows драйвер принтера PostScript
+как описано на странице руководства <A
+HREF="/help/man-cupsaddsmb.html"
+TARGET="_blank">cupsaddsmb(8)</A>.</P>}
+
+<TABLE>
+<TR>
+<TH CLASS="label">Принтеры:</TH>
+<TD>
+<SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE>
+{[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}}
+</SELECT><BR>
+<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL"{export_all? CHECKED:}
+onChange="select_printers()"> Экспортировать все принтеры
+</TD>
+</TR>
+<TR>
+<TH CLASS="label">Имя пользователя Samba:</TH>
+<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> (обязательный параметр)</TD>
+</TR>
+<TR>
+<TH CLASS="label">Пароль Samba:</TH>
+<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> (обязательный параметр)</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Экспортировать принтеры в Samba"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+<SCRIPT TYPE="text/javascript"><!--
+function select_printers() {
+  var list = document.export_samba.EXPORT_NAME;
+  var sel = document.export_samba.EXPORT_ALL.checked;
+
+  for (i = 0; i < list.length; i ++) {
+    list.options[i].selected = sel;
+  }
+}
+--></SCRIPT>
+
+<FORM METHOD="POST" ACTION="/admin/" NAME="export_samba">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba">
+
+<H2 CLASS="title">Экспорт принтеров в Samba</H2>
+
+{error?<P>Невозможно экспортировать принтеры в Samba\:</P>
+<BLOCKQUOTE>{error}</BLOCKQUOTE>
+<P>Посмотрите файл <A HREF="/admin/log/error_log"
+TARGET="_blank">error_log</A> для более подробной информации.</P>:
+<P>Эта страница позволяет добавить принтеры в Samba так, чтобы
+клиенты Windows могли получить доступ к ним через значок <VAR>Сетевое окружение</VAR> или <VAR>Сетевые подключения</VAR> на их рабочем столе. Вы должны установить на Windows драйвер принтера PostScript
+как описано на странице руководства <A
+HREF="/help/man-cupsaddsmb.html"
+TARGET="_blank">cupsaddsmb(8)</A>.</P>}
+
+<TABLE>
+<TR>
+<TH CLASS="label">Принтеры:</TH>
+<TD>
+<SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE>
+{[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}}
+</SELECT><BR>
+<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL"{export_all? CHECKED:}
+onChange="select_printers()"> Экспортировать все принтеры
+</TD>
+</TR>
+<TR>
+<TH CLASS="label">Имя пользователя Samba:</TH>
+<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> (обязательный параметр)</TD>
+</TR>
+<TR>
+<TH CLASS="label">Пароль Samba:</TH>
+<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> (обязательный параметр)</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Экспортировать принтеры в Samba"></TD>
+</TR>
+</TABLE>
+
+</FORM>
diff --git a/templates/ru/samba-exported.tmpl b/templates/ru/samba-exported.tmpl
new file mode 100644
index 00000000..4762398e
--- /dev/null
+++ b/templates/ru/samba-exported.tmpl
@@ -0,0 +1,2 @@
+<P>Принтеры успешно экспортированы в Samba.</P>
+<P>Принтеры успешно экспортированны в Samba.</P>
diff --git a/templates/ru/search.tmpl b/templates/ru/search.tmpl
new file mode 100644
index 00000000..81c64bdc
--- /dev/null
+++ b/templates/ru/search.tmpl
@@ -0,0 +1,20 @@
+<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET">
+{WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:}
+{ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:}
+
+<P ALIGN="CENTER"><B>Поиск
+{SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?группы:{SECTION=jobs?задания:принтеры}}}:</B>
+<INPUT TYPE="SEARCH" NAME="QUERY" VALUE="{?QUERY}" SIZE="40"  PLACEHOLDER="" AUTOSAVE="org.cups.{SECTION}" RESULTS="20"> <INPUT
+TYPE="SUBMIT" VALUE="Поиск"> <INPUT TYPE="SUBMIT" NAME="CLEAR" VALUE="Очистить"></P>
+
+</FORM>
+<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET">
+{WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:}
+{ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:}
+
+<P ALIGN="CENTER"><B>Поиск
+{SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?группы:{SECTION=jobs?задания:принтеры}}}:</B>
+<INPUT TYPE="SEARCH" NAME="QUERY" VALUE="{?QUERY}" SIZE="40"  PLACEHOLDER="" AUTOSAVE="org.cups.{SECTION}" RESULTS="20"> <INPUT
+TYPE="SUBMIT" VALUE="Поиск"> <INPUT TYPE="SUBMIT" NAME="CLEAR" VALUE="Очистить"></P>
+
+</FORM>
diff --git a/templates/ru/set-printer-options-header.tmpl b/templates/ru/set-printer-options-header.tmpl
new file mode 100644
index 00000000..e23fc25d
--- /dev/null
+++ b/templates/ru/set-printer-options-header.tmpl
@@ -0,0 +1,52 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Установить параметры по умолчанию для {printer_name}</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{HAVE_AUTOCONFIGURE?<INPUT TYPE="SUBMIT" NAME="AUTOCONFIGURE" VALUE="Запрос принтера для параметров по умолчанию">:}
+
+<SCRIPT TYPE="text/javascript"><!--
+function update_paramtable(option)
+{
+  var cb = document.getElementById("select-" + option)
+  var paramstable = document.getElementById(option + "-params");
+  if (cb.value == "Custom")
+    paramstable.style.display = "table";
+  else
+    paramstable.style.display = "none";
+}
+--></SCRIPT>
+
+<H3 CLASS="title">{[group_id]
+<A HREF="#{group_id}">{group}</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}</H3>
+
+<DIV CLASS="tabs">
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Установить параметры по умолчанию для {printer_name}</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{HAVE_AUTOCONFIGURE?<INPUT TYPE="SUBMIT" NAME="AUTOCONFIGURE" VALUE="Запрос принтера для параметров по умолчанию">:}
+
+<SCRIPT TYPE="text/javascript"><!--
+function update_paramtable(option)
+{
+  var cb = document.getElementById("select-" + option)
+  var paramstable = document.getElementById(option + "-params");
+  if (cb.value == "Custom")
+    paramstable.style.display = "table";
+  else
+    paramstable.style.display = "none";
+}
+--></SCRIPT>
+
+<H3 CLASS="title">{[group_id]
+<A HREF="#{group_id}">{group}</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}</H3>
+
+<DIV CLASS="tabs">
diff --git a/templates/ru/set-printer-options-trailer.tmpl b/templates/ru/set-printer-options-trailer.tmpl
new file mode 100644
index 00000000..d9ac4cd9
--- /dev/null
+++ b/templates/ru/set-printer-options-trailer.tmpl
@@ -0,0 +1,32 @@
+</DIV>
+
+<SCRIPT TYPE="text/javascript"><!--
+// Hide custom options parameters for browsers that understand Javascript
+var paramtables = document.getElementsByName("paramtable");
+for (var i = 0; i < paramtables.length; i++)
+{
+  var opt = paramtables[i].id.substr(0, paramtables[i].id.lastIndexOf("-"));
+  var cb = document.getElementById("select-" + opt);
+  if (cb.value != "Custom")
+    paramtables[i].style.display = "none";
+}
+--></SCRIPT>
+</FORM>
+
+</DIV>
+</DIV>
+
+<SCRIPT TYPE="text/javascript"><!--
+// Hide custom options parameters for browsers that understand Javascript
+var paramtables = document.getElementsByName("paramtable");
+for (var i = 0; i < paramtables.length; i++)
+{
+  var opt = paramtables[i].id.substr(0, paramtables[i].id.lastIndexOf("-"));
+  var cb = document.getElementById("select-" + opt);
+  if (cb.value != "Custom")
+    paramtables[i].style.display = "none";
+}
+--></SCRIPT>
+</FORM>
+
+</DIV>
diff --git a/templates/ru/subscription-added.tmpl b/templates/ru/subscription-added.tmpl
new file mode 100644
index 00000000..8ccff04e
--- /dev/null
+++ b/templates/ru/subscription-added.tmpl
@@ -0,0 +1,10 @@
+<DIV CLASS="indent">
+
+<P>Подписка {subscription_name} была успешно добавлена.</P>
+
+</DIV>
+<DIV CLASS="indent">
+
+<P>Подписка {subscription_name} была успешно добавлена.</P>
+
+</DIV>
diff --git a/templates/ru/subscription-canceled.tmpl b/templates/ru/subscription-canceled.tmpl
new file mode 100644
index 00000000..4046fb29
--- /dev/null
+++ b/templates/ru/subscription-canceled.tmpl
@@ -0,0 +1,10 @@
+<DIV CLASS="indent">
+
+<P>Подписка #{notify_subscription_id} была отменена.</P>
+
+</DIV>
+<DIV CLASS="indent">
+
+<P>Подписка #{notify_subscription_id} была отменена.</P>
+
+</DIV>
diff --git a/templates/ru/test-page.tmpl b/templates/ru/test-page.tmpl
new file mode 100644
index 00000000..bbe25281
--- /dev/null
+++ b/templates/ru/test-page.tmpl
@@ -0,0 +1,16 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Печать пробной страницы на {printer_name}</H2>
+
+<P>Пробная страница отправлена на печать;Номер задания <A HREF="/{SECTION}/{printer_name}">
+{printer_name}-{job_id}</A>.</P>
+
+</DIV>
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Печать пробной страницы на {printer_name}</H2>
+
+<P>Пробная страница отправлена на печать;Номер задания <A HREF="/{SECTION}/{printer_name}">
+{printer_name}-{job_id}</A>.</P>
+
+</DIV>
diff --git a/templates/ru/trailer.tmpl b/templates/ru/trailer.tmpl
new file mode 100644
index 00000000..113e988f
--- /dev/null
+++ b/templates/ru/trailer.tmpl
@@ -0,0 +1,14 @@
+</TD></TR>
+<TR><TD>&nbsp;</TD></TR>
+<TR><TD CLASS="trailer">CUPS, а так же логотип CUPS являются зарегистрированными торговыми марками
+<A HREF="http://www.apple.com">Apple Inc.</A> Авторские права на CUPS принадлежат (2007-2013) компании Apple Inc. Все права защищены.</TD></TR>
+</TABLE>
+</BODY>
+</HTML>
+</TD></TR>
+<TR><TD>&nbsp;</TD></TR>
+<TR><TD CLASS="trailer">CUPS, а так же логотип CUPS являются зарегистрированными торговыми марками
+<A HREF="http://www.apple.com">Apple Inc.</A> Авторские права на CUPS принадлежат (2007-2013) компании Apple Inc. Все права защищены.</TD></TR>
+</TABLE>
+</BODY>
+</HTML>
diff --git a/templates/ru/users.tmpl b/templates/ru/users.tmpl
new file mode 100644
index 00000000..5489f5a9
--- /dev/null
+++ b/templates/ru/users.tmpl
@@ -0,0 +1,60 @@
+<DIV CLASS="indent">
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+{IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:}
+
+<H2 CLASS="title">Доступ пользователей на {printer_name}</H2>
+
+<TABLE>
+<TR>
+<TH CLASS="label">Пользователи:</TH>
+<TD>
+<INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'>
+<BR>
+<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>Разрешить этим пользователям печатать
+<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>Запретить этим пользователям печатать
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD>
+<INPUT TYPE="SUBMIT" VALUE="Сохранить">
+</TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
+<DIV CLASS="indent">
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+{IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:}
+
+<H2 CLASS="title">Доступ пользователей на {printer_name}</H2>
+
+<TABLE>
+<TR>
+<TH CLASS="label">Пользователи:</TH>
+<TD>
+<INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'>
+<BR>
+<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>Разрешить этим пользователям печатать
+<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>Запретить этим пользователям печатать
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD>
+<INPUT TYPE="SUBMIT" VALUE="Сохранить">
+</TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>
diff --git a/templates/trailer.tmpl b/templates/trailer.tmpl
index 123a1972..c66986a4 100644
--- a/templates/trailer.tmpl
+++ b/templates/trailer.tmpl
@@ -1,7 +1,7 @@
 </TD></TR>
 <TR><TD>&nbsp;</TD></TR>
 <TR><TD CLASS="trailer">CUPS and the CUPS logo are trademarks of
-<A HREF="http://www.apple.com">Apple Inc.</A> CUPS is copyright 2007-2012 Apple
+<A HREF="http://www.apple.com">Apple Inc.</A> Copyright 2007-2013 Apple
 Inc. All rights reserved.</TD></TR>
 </TABLE>
 </BODY>
diff --git a/test/color.jpg b/test/color.jpg
index 46cbfd78..170e28b1 100644
--- a/test/color.jpg
+++ b/test/color.jpg
diff --git a/test/ipp-1.1.test b/test/ipp-1.1.test
index e89a275e..f4127249 100644
--- a/test/ipp-1.1.test
+++ b/test/ipp-1.1.test
@@ -1,5 +1,5 @@
 #
-# "$Id: ipp-1.1.test 10461 2012-05-11 23:01:21Z mike $"
+# "$Id: ipp-1.1.test 10863 2013-02-06 01:09:31Z mike $"
 #
 #   IPP/1.1 test suite.
 #
@@ -2124,7 +2124,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/"
 	GROUP job-attributes-tag
 	ATTR keyword media $OPTIONAL_4X6_MEDIA
 	ATTR enum print-quality 3
-	FILE color.jpeg
+	FILE color.jpg
 
 	STATUS successful-ok
 	STATUS server-error-job-canceled
@@ -2162,7 +2162,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/"
 	GROUP job-attributes-tag
 	ATTR keyword media $OPTIONAL_4X6_MEDIA
 	ATTR enum print-quality 4
-	FILE color.jpeg
+	FILE color.jpg
 
 	STATUS successful-ok
 	STATUS server-error-job-canceled
@@ -2200,7 +2200,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/"
 	GROUP job-attributes-tag
 	ATTR keyword media $OPTIONAL_4X6_MEDIA
 	ATTR enum print-quality 5
-	FILE color.jpeg
+	FILE color.jpg
 
 	STATUS successful-ok
 	STATUS server-error-job-canceled
@@ -2346,5 +2346,5 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/"
 
 
 #
-# End of "$Id: ipp-1.1.test 10461 2012-05-11 23:01:21Z mike $".
+# End of "$Id: ipp-1.1.test 10863 2013-02-06 01:09:31Z mike $".
 #
diff --git a/test/ippserver.c b/test/ippserver.c
index ef084e37..cce95848 100644
--- a/test/ippserver.c
+++ b/test/ippserver.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ippserver.c 10165 2012-01-06 20:42:45Z mike $"
+ * "$Id: ippserver.c 10777 2012-12-17 22:18:10Z mike $"
  *
  *   Sample IPP/2.0 server for CUPS.
  *
@@ -80,6 +80,7 @@
 #ifdef HAVE_DNSSD
 #  include <dns_sd.h>
 #endif /* HAVE_DNSSD */
+#include <limits.h>
 #include <sys/stat.h>
 #include <poll.h>
 #ifdef HAVE_SYS_MOUNT_H
@@ -5251,5 +5252,5 @@ valid_job_attributes(
 
 
 /*
- * End of "$Id: ippserver.c 10165 2012-01-06 20:42:45Z mike $".
+ * End of "$Id: ippserver.c 10777 2012-12-17 22:18:10Z mike $".
  */
diff --git a/test/ipptool.c b/test/ipptool.c
index dac5541c..fee9fc5d 100644
--- a/test/ipptool.c
+++ b/test/ipptool.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: ipptool.c 10461 2012-05-11 23:01:21Z mike $"
+ * "$Id: ipptool.c 10828 2013-01-21 13:00:37Z mike $"
  *
  *   ipptool command for CUPS.
  *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -113,7 +113,10 @@ typedef struct _cups_status_s		/**** Status info ****/
 {
   ipp_status_t	status;			/* Expected status code */
   char		*if_defined,		/* Only if variable is defined */
-		*if_not_defined;	/* Only if variable is not defined */
+		*if_not_defined,	/* Only if variable is not defined */
+		*define_match,		/* Variable to define on match */
+		*define_no_match,	/* Variable to define on no-match */
+		*define_value;		/* Variable to define with value */
   int		repeat_limit,		/* Maximum number of times to repeat */
 		repeat_match,		/* Repeat the test when it does not match */
 		repeat_no_match;	/* Repeat the test when it matches */
@@ -1184,7 +1187,9 @@ do_tests(_cups_vars_t *vars,		/* I - Variables */
           _cups_strcasecmp(token, "WITH-VALUE"))
         last_expect = NULL;
 
-      if (_cups_strcasecmp(token, "IF-DEFINED") &&
+      if (_cups_strcasecmp(token, "DEFINE-MATCH") &&
+          _cups_strcasecmp(token, "DEFINE-NO-MATCH") &&
+	  _cups_strcasecmp(token, "IF-DEFINED") &&
           _cups_strcasecmp(token, "IF-NOT-DEFINED") &&
           _cups_strcasecmp(token, "REPEAT-LIMIT") &&
           _cups_strcasecmp(token, "REPEAT-MATCH") &&
@@ -1459,13 +1464,15 @@ do_tests(_cups_vars_t *vars,		/* I - Variables */
         * Operation...
 	*/
 
-	if (!get_token(fp, token, sizeof(token), &linenum))
+	if (!get_token(fp, temp, sizeof(temp), &linenum))
 	{
 	  print_fatal_error("Missing OPERATION code on line %d.", linenum);
 	  pass = 0;
 	  goto test_exit;
 	}
 
+	expand_variables(vars, token, temp, sizeof(token));
+
 	if ((op = ippOpValue(token)) == (ipp_op_t)-1 &&
 	    (op = strtol(token, NULL, 0)) == 0)
 	{
@@ -1508,13 +1515,15 @@ do_tests(_cups_vars_t *vars,		/* I - Variables */
 
         double delay;
 
-	if (!get_token(fp, token, sizeof(token), &linenum))
+	if (!get_token(fp, temp, sizeof(temp), &linenum))
 	{
 	  print_fatal_error("Missing DELAY value on line %d.", linenum);
 	  pass = 0;
 	  goto test_exit;
 	}
 
+	expand_variables(vars, token, temp, sizeof(token));
+
 	if ((delay = _cupsStrScand(token, NULL, localeconv())) <= 0.0)
 	{
 	  print_fatal_error("Bad DELAY value \"%s\" on line %d.", token,
@@ -1702,6 +1711,11 @@ do_tests(_cups_vars_t *vars,		/* I - Variables */
 	      }
 	      break;
 
+          case IPP_TAG_STRING :
+              attrptr = ippAddOctetString(request, group, attr, token,
+                                          strlen(token));
+	      break;
+
 	  default :
 	      print_fatal_error("Unsupported ATTR value tag %s on line %d.",
 				ippTagString(value), linenum);
@@ -1804,6 +1818,8 @@ do_tests(_cups_vars_t *vars,		/* I - Variables */
         last_status = statuses + num_statuses;
 	num_statuses ++;
 
+        last_status->define_match    = NULL;
+        last_status->define_no_match = NULL;
 	last_status->if_defined      = NULL;
 	last_status->if_not_defined  = NULL;
 	last_status->repeat_limit    = 1000;
@@ -1887,10 +1903,12 @@ do_tests(_cups_vars_t *vars,		/* I - Variables */
 
 	if (last_expect)
 	  last_expect->define_match = strdup(token);
+	else if (last_status)
+	  last_status->define_match = strdup(token);
 	else
 	{
-	  print_fatal_error("DEFINE-MATCH without a preceding EXPECT on line "
-	                    "%d.", linenum);
+	  print_fatal_error("DEFINE-MATCH without a preceding EXPECT or STATUS "
+	                    "on line %d.", linenum);
 	  pass = 0;
 	  goto test_exit;
 	}
@@ -1907,10 +1925,12 @@ do_tests(_cups_vars_t *vars,		/* I - Variables */
 
 	if (last_expect)
 	  last_expect->define_no_match = strdup(token);
+	else if (last_status)
+	  last_status->define_no_match = strdup(token);
 	else
 	{
-	  print_fatal_error("DEFINE-NO-MATCH without a preceding EXPECT on "
-	                    "line %d.", linenum);
+	  print_fatal_error("DEFINE-NO-MATCH without a preceding EXPECT or "
+	                    "STATUS on line %d.", linenum);
 	  pass = 0;
 	  goto test_exit;
 	}
@@ -1929,8 +1949,8 @@ do_tests(_cups_vars_t *vars,		/* I - Variables */
 	  last_expect->define_value = strdup(token);
 	else
 	{
-	  print_fatal_error("DEFINE-VALUE without a preceding EXPECT on line "
-			    "%d.", linenum);
+	  print_fatal_error("DEFINE-VALUE without a preceding EXPECT on "
+	                    "line %d.", linenum);
 	  pass = 0;
 	  goto test_exit;
 	}
@@ -2204,7 +2224,8 @@ do_tests(_cups_vars_t *vars,		/* I - Variables */
       if (request->attrs)
       {
 	puts("<dict>");
-	for (attrptr = request->attrs, group = attrptr->group_tag;
+	for (attrptr = request->attrs,
+	         group = attrptr ? attrptr->group_tag : IPP_TAG_ZERO;
 	     attrptr;
 	     attrptr = attrptr->next)
 	  print_attr(attrptr, &group);
@@ -2240,8 +2261,7 @@ do_tests(_cups_vars_t *vars,		/* I - Variables */
 	puts("<key>StatusCode</key>");
 	print_xml_string("string", "skip");
 	puts("<key>ResponseAttributes</key>");
-	puts("<dict>");
-	puts("</dict>");
+	puts("<dict />");
       }
       else if (Output == _CUPS_OUTPUT_TEST)
 	puts("SKIP]");
@@ -2554,7 +2574,8 @@ do_tests(_cups_vars_t *vars,		/* I - Variables */
 
 	a = cupsArrayNew((cups_array_func_t)strcmp, NULL);
 
-	for (attrptr = response->attrs, group = attrptr->group_tag;
+	for (attrptr = response->attrs,
+	         group = attrptr ? attrptr->group_tag : IPP_TAG_ZERO;
 	     attrptr;
 	     attrptr = attrptr->next)
 	{
@@ -2641,11 +2662,23 @@ do_tests(_cups_vars_t *vars,		/* I - Variables */
 	        repeat_count < statuses[i].repeat_limit)
 	      repeat_test = 1;
 
-	    break;
+            if (statuses[i].define_match)
+              set_variable(vars, statuses[i].define_match, "1");
+
+            break;
 	  }
-	  else if (statuses[i].repeat_no_match &&
-		   repeat_count < statuses[i].repeat_limit)
-	    repeat_test = 1;
+	  else
+	  {
+	    if (statuses[i].repeat_no_match &&
+		repeat_count < statuses[i].repeat_limit)
+	      repeat_test = 1;
+
+            if (statuses[i].define_no_match)
+            {
+              set_variable(vars, statuses[i].define_no_match, "1");
+              break;
+            }
+          }
 	}
 
 	if (i == num_statuses && num_statuses > 0)
@@ -2660,9 +2693,10 @@ do_tests(_cups_vars_t *vars,		/* I - Variables */
 		get_variable(vars, statuses[i].if_not_defined))
 	      continue;
 
-	    add_stringf(errors, "EXPECTED: STATUS %s (got %s)",
-			ippErrorString(statuses[i].status),
-			ippErrorString(cupsLastError()));
+            if (!statuses[i].repeat_match)
+	      add_stringf(errors, "EXPECTED: STATUS %s (got %s)",
+			  ippErrorString(statuses[i].status),
+			  ippErrorString(cupsLastError()));
 	  }
 
 	  if ((attrptr = ippFindAttribute(response, "status-message",
@@ -2726,7 +2760,8 @@ do_tests(_cups_vars_t *vars,		/* I - Variables */
 	  {
 	    if (expect->define_no_match)
 	      set_variable(vars, expect->define_no_match, "1");
-	    else if (!expect->define_match && !expect->define_value)
+	    else if (!expect->define_match && !expect->define_value &&
+	             !expect->repeat_match && !expect->repeat_no_match)
 	    {
 	      if (expect->with_flags & _CUPS_WITH_REGEX)
 		add_stringf(errors, "EXPECTED: %s %s /%s/",
@@ -2958,7 +2993,7 @@ do_tests(_cups_vars_t *vars,		/* I - Variables */
     }
 
     if (num_displayed > 0 && !Verbosity && response &&
-        (Output == _CUPS_OUTPUT_TEST || Output == _CUPS_OUTPUT_PLIST))
+        Output == _CUPS_OUTPUT_TEST)
     {
       for (attrptr = response->attrs;
 	   attrptr != NULL;
@@ -2994,6 +3029,10 @@ do_tests(_cups_vars_t *vars,		/* I - Variables */
         free(statuses[i].if_defined);
       if (statuses[i].if_not_defined)
         free(statuses[i].if_not_defined);
+      if (statuses[i].define_match)
+        free(statuses[i].define_match);
+      if (statuses[i].define_no_match)
+        free(statuses[i].define_no_match);
     }
     num_statuses = 0;
 
@@ -3044,6 +3083,10 @@ do_tests(_cups_vars_t *vars,		/* I - Variables */
       free(statuses[i].if_defined);
     if (statuses[i].if_not_defined)
       free(statuses[i].if_not_defined);
+      if (statuses[i].define_match)
+        free(statuses[i].define_match);
+      if (statuses[i].define_no_match)
+        free(statuses[i].define_no_match);
   }
 
   for (i = num_expects, expect = expects; i > 0; i --, expect ++)
@@ -3716,8 +3759,11 @@ print_attr(ipp_attribute_t *attr,	/* I  - Attribute to print */
   {
     if (!attr->name || (group && *group != attr->group_tag))
     {
-      puts("</dict>");
-      puts("<dict>");
+      if (attr->group_tag != IPP_TAG_ZERO)
+      {
+	puts("</dict>");
+	puts("<dict>");
+      }
 
       if (group)
         *group = attr->group_tag;
@@ -3788,6 +3834,41 @@ print_attr(ipp_attribute_t *attr,	/* I  - Attribute to print */
 	  break;
 
       case IPP_TAG_STRING :
+          for (i = 0; i < attr->num_values; i ++)
+          {
+            if (Output == _CUPS_OUTPUT_PLIST)
+            {
+	      char	buffer[IPP_MAX_LENGTH * 5 / 4 + 1];
+					/* Output buffer */
+
+              printf("<data>%s</data>\n",
+                     httpEncode64_2(buffer, sizeof(buffer),
+                                    attr->values[i].unknown.data,
+                                    attr->values[i].unknown.length));
+            }
+            else
+            {
+              char	*ptr,		/* Pointer into data */
+        		*end;		/* End of data */
+
+              putchar('\"');
+              for (ptr = attr->values[i].unknown.data,
+                       end = ptr + attr->values[i].unknown.length;
+                   ptr < end;
+                   ptr ++)
+              {
+                if (*ptr == '\\' || *ptr == '\"')
+                  printf("\\%c", *ptr);
+                else if (!isprint(*ptr & 255))
+                  printf("\\%03o", *ptr & 255);
+                else
+                  putchar(*ptr);
+              }
+              putchar('\"');
+            }
+          }
+          break;
+
       case IPP_TAG_TEXT :
       case IPP_TAG_NAME :
       case IPP_TAG_KEYWORD :
@@ -5396,5 +5477,5 @@ with_value(cups_array_t    *errors,	/* I - Errors array */
 
 
 /*
- * End of "$Id: ipptool.c 10461 2012-05-11 23:01:21Z mike $".
+ * End of "$Id: ipptool.c 10828 2013-01-21 13:00:37Z mike $".
  */
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index ca3e51f7..76915154 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: run-stp-tests.sh 10488 2012-05-21 15:35:25Z mike $"
+# "$Id: run-stp-tests.sh 10710 2012-11-26 18:26:01Z mike $"
 #
 #   Perform the complete set of IPP compliance tests specified in the
 #   CUPS Software Test Plan.
@@ -368,6 +368,11 @@ else
 	ln -s /usr/lib/cups/filter/texttops /tmp/cups-$user/bin/filter
 
 	ln -s /usr/share/cups/mime/legacy.convs /tmp/cups-$user/share/mime
+	ln -s /usr/share/cups/charsets /tmp/cups-$user/share
+	if test -f $root/data/psglyphs; then
+		ln -s /usr/share/cups/data/psglyphs $root/data
+	fi
+	ln -s /usr/share/cups/fonts /tmp/cups-$user/share
 fi
 
 #
@@ -385,26 +390,11 @@ fi
 cat >/tmp/cups-$user/cupsd.conf <<EOF
 StrictConformance Yes
 Browsing Off
-FileDevice yes
-Printcap
 Listen localhost:$port
-User $user
-ServerRoot /tmp/cups-$user
-StateDir /tmp/cups-$user
-ServerBin /tmp/cups-$user/bin
-CacheDir /tmp/cups-$user/share
-DataDir /tmp/cups-$user/share
-FontPath /tmp/cups-$user/share/fonts
 PassEnv LOCALEDIR
 PassEnv DYLD_INSERT_LIBRARIES
-DocumentRoot $root/doc
-RequestRoot /tmp/cups-$user/spool
-TempDir /tmp/cups-$user/spool/temp
 MaxSubscriptions 3
 MaxLogSize 0
-AccessLog /tmp/cups-$user/log/access_log
-ErrorLog /tmp/cups-$user/log/error_log
-PageLog /tmp/cups-$user/log/page_log
 AccessLogLevel actions
 LogLevel debug2
 LogTimeFormat usecs
@@ -417,6 +407,24 @@ $encryption
 </Policy>
 EOF
 
+cat >/tmp/cups-$user/cups-files.conf <<EOF
+FileDevice yes
+Printcap
+User $user
+ServerRoot /tmp/cups-$user
+StateDir /tmp/cups-$user
+ServerBin /tmp/cups-$user/bin
+CacheDir /tmp/cups-$user/share
+DataDir /tmp/cups-$user/share
+FontPath /tmp/cups-$user/share/fonts
+DocumentRoot $root/doc
+RequestRoot /tmp/cups-$user/spool
+TempDir /tmp/cups-$user/spool/temp
+AccessLog /tmp/cups-$user/log/access_log
+ErrorLog /tmp/cups-$user/log/error_log
+PageLog /tmp/cups-$user/log/page_log
+EOF
+
 #
 # Setup lots of test queues - half with PPD files, half without...
 #
@@ -936,5 +944,5 @@ if test $fail != 0; then
 fi
 
 #
-# End of "$Id: run-stp-tests.sh 10488 2012-05-21 15:35:25Z mike $"
+# End of "$Id: run-stp-tests.sh 10710 2012-11-26 18:26:01Z mike $"
 #
diff --git a/test/str-header.html b/test/str-header.html
index f9204bbe..64a3425c 100644
--- a/test/str-header.html
+++ b/test/str-header.html
@@ -1,10 +1,10 @@
 <HTML>
 <HEAD>
 	<META NAME="Description" CONTENT="CUPS Test Report">
-	<META NAME="COPYRIGHT" CONTENT="Copyright 2007-2011, All Rights Reserved">
+	<META NAME="COPYRIGHT" CONTENT="Copyright 2007-2012, All Rights Reserved">
 	<META NAME="DOCNUMBER" CONTENT="CUPS-STR-1.6">
 	<META NAME="Author" CONTENT="Apple Inc.">
-	<TITLE>CUPS 1.5 Software Test Report</TITLE>
+	<TITLE>CUPS 1.6 Software Test Report</TITLE>
 	<STYLE TYPE="text/css"><!--
 	PRE {
 	  font-size: 80%;
author	Didier Raboud <odyx@debian.org>	2013-03-19 11:05:58 +0100
committer	Didier Raboud <odyx@debian.org>	2013-03-19 11:05:58 +0100
commit	ea5667a811b20e235ce1975e763469edd1f7f0de (patch)
tree	a02b8034aba8666f06fdbc971905ca760b1c3aa7
parent	6fd17d1b328ea9230585f7ad1e3c478343157220 (diff)
download	cups-ea5667a811b20e235ce1975e763469edd1f7f0de.tar.gz