Clean up localizations throughout.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10431 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/backend/ipp.c b/backend/ipp.c
index 00039cc0bd414312a8fc39b1ff801e87c5b1ffbf..7cf169a8a1566665abb717195d966ee0de4c10d9 100644 (file)
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -752,7 +752,7 @@ main(int  argc,                             /* I - Number of command-line args */
          case ECONNREFUSED :
          default :
              _cupsLangPrintFilter(stderr, "WARNING",
-                                  _("The printer is busy."));
+                                  _("The printer is in use."));
              break;
         }
 
@@ -869,7 +869,7 @@ main(int  argc,                             /* I - Number of command-line args */
          return (CUPS_BACKEND_FAILED);
        }
 
-       _cupsLangPrintFilter(stderr, "INFO", _("The printer is busy."));
+       _cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
 
         report_printer_state(supported);
 
@@ -887,14 +887,14 @@ main(int  argc,                           /* I - Number of command-line args */
         if (version >= 20)
        {
          _cupsLangPrintFilter(stderr, "INFO",
-                              _("Printer does not support IPP/%d.%d, trying "
+                              _("The printer does not support IPP/%d.%d, trying "
                                 "IPP/%s."), version / 10, version % 10, "1.1");
          version = 11;
        }
        else
        {
          _cupsLangPrintFilter(stderr, "INFO",
-                              _("Printer does not support IPP/%d.%d, trying "
+                              _("The printer does not support IPP/%d.%d, trying "
                                 "IPP/%s."), version / 10, version % 10, "1.0");
          version = 10;
         }
@@ -975,7 +975,7 @@ main(int  argc,                             /* I - Number of command-line args */
 
       if (busy)
       {
-       _cupsLangPrintFilter(stderr, "INFO", _("The printer is busy."));
+       _cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
 
        report_printer_state(supported);
 
@@ -1302,7 +1302,7 @@ main(int  argc,                           /* I - Number of command-line args */
 
     if (ipp_status == IPP_SERVICE_UNAVAILABLE || ipp_status == IPP_PRINTER_BUSY)
     {
-      _cupsLangPrintFilter(stderr, "INFO", _("The printer is busy."));
+      _cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
       sleep(10);
     }
     else if (ipp_status == IPP_FORBIDDEN ||
@@ -1450,7 +1450,7 @@ main(int  argc,                           /* I - Number of command-line args */
           ipp_status == IPP_NOT_POSSIBLE ||
          ipp_status == IPP_PRINTER_BUSY)
       {
-       _cupsLangPrintFilter(stderr, "INFO", _("The printer is busy."));
+       _cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
        sleep(10);
 
        if (num_files == 0)

diff --git a/backend/lpd.c b/backend/lpd.c
index b450b4d7b40d741b021ed9b1f9b335805213a8fb..0d1a90e2080e19b1563344f17a41bcd6e720e4ec 100644 (file)
--- a/backend/lpd.c
+++ b/backend/lpd.c
@@ -616,7 +616,7 @@ lpd_command(int  fd,                /* I - Socket connection to LPD host */
 
   if (recv(fd, &status, 1, 0) < 1)
   {
-    _cupsLangPrintFilter(stderr, "WARNING", _("Printer did not respond."));
+    _cupsLangPrintFilter(stderr, "WARNING", _("The printer did not respond."));
     status = errno;
   }
 
@@ -825,7 +825,7 @@ lpd_queue(const char      *hostname,        /* I - Host to connect to */
          case ECONNREFUSED :
          default :
              _cupsLangPrintFilter(stderr, "WARNING",
-                                  _("The printer is busy."));
+                                  _("The printer is in use."));
              break;
         }
 
@@ -1006,7 +1006,7 @@ lpd_queue(const char      *hostname,      /* I - Host to connect to */
         if (read(fd, &status, 1) < 1)
        {
          _cupsLangPrintFilter(stderr, "WARNING",
-                              _("Printer did not respond."));
+                              _("The printer did not respond."));
          status = errno;
        }
       }
@@ -1088,7 +1088,7 @@ lpd_queue(const char      *hostname,      /* I - Host to connect to */
           if (recv(fd, &status, 1, 0) < 1)
          {
            _cupsLangPrintFilter(stderr, "WARNING",
-                                _("Printer did not respond."));
+                                _("The printer did not respond."));
            status = 0;
           }
        }
@@ -1138,7 +1138,7 @@ lpd_queue(const char      *hostname,      /* I - Host to connect to */
         if (read(fd, &status, 1) < 1)
        {
          _cupsLangPrintFilter(stderr, "WARNING",
-                              _("Printer did not respond."));
+                              _("The printer did not respond."));
          status = errno;
        }
       }

diff --git a/backend/runloop.c b/backend/runloop.c
index ddeaaa7cd12ce68567ab42a5aa9ddad5c4412f4f..61689c2844c89a61e745ab8dcc1d49a7443d58c6 100644 (file)
--- a/backend/runloop.c
+++ b/backend/runloop.c
@@ -92,7 +92,8 @@ backendDrainOutput(int print_fd,      /* I - Print file descriptor */
 
       if (errno != EAGAIN || errno != EINTR)
       {
-        _cupsLangPrintError("ERROR", _("Unable to read print data"));
+       fprintf(stderr, "DEBUG: Read failed: %s\n", strerror(errno));
+       _cupsLangPrintFilter("ERROR", _("Unable to read print data."));
        return (-1);
       }
 
@@ -250,7 +251,7 @@ backendRunLoop(
        {
          fputs("STATE: +offline-report\n", stderr);
          _cupsLangPrintFilter(stderr, "INFO",
-                              _("Printer is not currently connected."));
+                              _("The printer is not connected."));
          offline = 1;
        }
        else if (errno == EINTR && total_bytes == 0)
@@ -319,7 +320,8 @@ backendRunLoop(
 
        if (errno != EAGAIN || errno != EINTR)
        {
-         _cupsLangPrintError("ERROR", _("Unable to read print data"));
+         fprintf(stderr, "DEBUG: Read failed: %s\n", strerror(errno));
+         _cupsLangPrintFilter("ERROR", _("Unable to read print data."));
          return (-1);
        }
 
@@ -368,7 +370,7 @@ backendRunLoop(
          {
            fputs("STATE: +offline-report\n", stderr);
            _cupsLangPrintFilter(stderr, "INFO",
-                                _("Printer is not currently connected."));
+                                _("The printer is not connected."));
            offline = 1;
          }
        }
@@ -389,7 +391,8 @@ backendRunLoop(
        if (offline && update_state)
        {
          fputs("STATE: -offline-report\n", stderr);
-         _cupsLangPrintFilter(stderr, "INFO", _("Printer is now connected."));
+         _cupsLangPrintFilter(stderr, "INFO",
+                              _("The printer is now connected."));
          offline = 0;
        }
 

diff --git a/backend/socket.c b/backend/socket.c
index 0f708fd1885a7b1aafe9b431f11d45bd6f86056c..79bf7573d3ab06aefb0f1b65d1135deb26b40b88 100644 (file)
--- a/backend/socket.c
+++ b/backend/socket.c
@@ -371,7 +371,7 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
          case ECONNREFUSED :
          default :
              _cupsLangPrintFilter(stderr, "WARNING",
-                                  _("The printer is busy."));
+                                  _("The printer is in use."));
              break;
         }
 

diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c
index 1de83b209a3ce448fa7a91ef6871d5d8612043dd..0b6f2197bb12963efb88ae18587172ab64770e38 100644 (file)
--- a/backend/usb-darwin.c
+++ b/backend/usb-darwin.c
@@ -1,7 +1,7 @@
 /*
 * "$Id$"
 *
-* Copyright 2005-2011 Apple Inc. All rights reserved.
+* Copyright 2005-2012 Apple Inc. All rights reserved.
 *
 * IMPORTANT:  This Apple software is supplied to you by Apple Computer,
 * Inc. ("Apple") in consideration of your agreement to the following
@@ -820,10 +820,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;
@@ -833,7 +833,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,
@@ -1283,7 +1283,7 @@ static Boolean find_device_cb(void *refcon,
   if (!keepLooking && g.status_timer != NULL)
   {
     fputs("STATE: -offline-report\n", stderr);
-    _cupsLangPrintFilter(stderr, "INFO", _("Printer is now online."));
+    _cupsLangPrintFilter(stderr, "INFO", _("The printer is now online."));
     CFRunLoopRemoveTimer(CFRunLoopGetCurrent(), g.status_timer, kCFRunLoopDefaultMode);
     CFRelease(g.status_timer);
     g.status_timer = NULL;
@@ -1304,7 +1304,7 @@ static void status_timer_cb(CFRunLoopTimerRef timer,
   (void)info;
 
   fputs("STATE: +offline-report\n", stderr);
-  _cupsLangPrintFilter(stderr, "INFO", _("Printer is offline."));
+  _cupsLangPrintFilter(stderr, "INFO", _("The printer is offline."));
 
   if (getenv("CLASS") != NULL)
   {

diff --git a/backend/usb-unix.c b/backend/usb-unix.c
index b0365e4701d2cdb5c3193911b084745e17f493c4..7b46ec07d915965dfdf245e715bfaed701bcc9b4 100644 (file)
--- a/backend/usb-unix.c
+++ b/backend/usb-unix.c
@@ -5,7 +5,7 @@
  *
  *   This file is included from "usb.c" when compiled on UNIX/Linux.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -128,16 +128,12 @@ print_device(const char *uri,             /* I - Device URI */
 
       if (errno == EBUSY)
       {
-        _cupsLangPrintFilter(stderr, "INFO",
-                            _("Printer busy, will retry in 10 seconds."));
+        _cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
        sleep(10);
       }
       else if (errno == ENXIO || errno == EIO || errno == ENOENT ||
                errno == ENODEV)
       {
-        _cupsLangPrintFilter(stderr, "INFO",
-                            _("Printer not connected, will retry in 30 "
-                              "seconds."));
        sleep(30);
       }
       else
@@ -425,8 +421,7 @@ open_device(const char *uri,                /* I - Device URI */
       */
 
       if (busy)
-       _cupsLangPrintFilter(stderr, "INFO",
-                            _("Printer is busy, will retry in 5 seconds."));
+       _cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
 
       sleep(5);
     }
@@ -509,8 +504,7 @@ open_device(const char *uri,                /* I - Device URI */
 
       if (busy)
       {
-       _cupsLangPrintFilter(stderr, "INFO",
-                            _("Printer is busy, will retry in 5 seconds."));
+       _cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
        sleep(5);
       }
     }

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index 8b275f5d630cc2418f9f43f4986ac30e310d2129..73eca2b2442f28899fa94f66057ad2f75a0dd5a2 100644 (file)
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -523,7 +523,7 @@ do_add_rss_subscription(http_t *http)       /* I - HTTP connection */
   else if (cupsLastError() > IPP_OK_CONFLICT)
   {
     cgiStartHTML(_("Add RSS Subscription"));
-    cgiShowIPPError(_("Unable to add RSS subscription:"));
+    cgiShowIPPError(_("Unable to add RSS subscription"));
   }
   else
   {
@@ -810,8 +810,8 @@ do_am_class(http_t *http,           /* I - HTTP connection */
   else if (cupsLastError() > IPP_OK_CONFLICT)
   {
     cgiStartHTML(title);
-    cgiShowIPPError(modify ? _("Unable to modify class:") :
-                             _("Unable to add class:"));
+    cgiShowIPPError(modify ? _("Unable to modify class") :
+                             _("Unable to add class"));
   }
   else
   {
@@ -1055,8 +1055,8 @@ do_am_printer(http_t *http,               /* I - HTTP connection */
       else
       {
        cgiStartHTML(title);
-       cgiShowIPPError(modify ? _("Unable to modify printer:") :
-                                _("Unable to add printer:"));
+       cgiShowIPPError(modify ? _("Unable to modify printer") :
+                                _("Unable to add printer"));
        cgiEndHTML();
         return;
       }
@@ -1317,7 +1317,7 @@ do_am_printer(http_t *http,               /* I - HTTP connection */
     else
     {
       cgiStartHTML(title);
-      cgiShowIPPError(_("Unable to get list of printer drivers:"));
+      cgiShowIPPError(_("Unable to get list of printer drivers"));
       cgiCopyTemplateLang("error.tmpl");
       cgiEndHTML();
     }
@@ -1415,8 +1415,8 @@ do_am_printer(http_t *http,               /* I - HTTP connection */
     else if (cupsLastError() > IPP_OK_CONFLICT)
     {
       cgiStartHTML(title);
-      cgiShowIPPError(modify ? _("Unable to modify printer:") :
-                               _("Unable to add printer:"));
+      cgiShowIPPError(modify ? _("Unable to modify printer") :
+                               _("Unable to add printer"));
     }
     else if (modify)
     {
@@ -1522,7 +1522,7 @@ do_cancel_subscription(http_t *http)/* I - HTTP connection */
   else if (cupsLastError() > IPP_OK_CONFLICT)
   {
     cgiStartHTML(_("Cancel RSS Subscription"));
-    cgiShowIPPError(_("Unable to cancel RSS subscription:"));
+    cgiShowIPPError(_("Unable to cancel RSS subscription"));
   }
   else
   {
@@ -1654,7 +1654,7 @@ do_config_server(http_t *http)            /* I - HTTP connection */
     {
       cgiStartHTML(cgiText(_("Change Settings")));
       cgiSetVariable("MESSAGE",
-                     cgiText(_("Unable to change server settings:")));
+                     cgiText(_("Unable to change server settings")));
       cgiSetVariable("ERROR", cupsLastErrorString());
       cgiCopyTemplateLang("error.tmpl");
       cgiEndHTML();
@@ -1796,7 +1796,7 @@ do_config_server(http_t *http)            /* I - HTTP connection */
 
        cgiStartHTML(cgiText(_("Change Settings")));
        cgiSetVariable("MESSAGE",
-                       cgiText(_("Unable to change server settings:")));
+                       cgiText(_("Unable to change server settings")));
        cgiSetVariable("ERROR", cupsLastErrorString());
        cgiCopyTemplateLang("error.tmpl");
       }
@@ -1847,7 +1847,7 @@ do_config_server(http_t *http)            /* I - HTTP connection */
     if ((tempfd = cupsTempFd(tempfile, sizeof(tempfile))) < 0)
     {
       cgiStartHTML(cgiText(_("Edit Configuration File")));
-      cgiSetVariable("MESSAGE", cgiText(_("Unable to create temporary file:")));
+      cgiSetVariable("MESSAGE", cgiText(_("Unable to create temporary file")));
       cgiSetVariable("ERROR", strerror(errno));
       cgiCopyTemplateLang("error.tmpl");
       cgiEndHTML();
@@ -1859,7 +1859,7 @@ do_config_server(http_t *http)            /* I - HTTP connection */
     if ((temp = cupsFileOpenFd(tempfd, "w")) == NULL)
     {
       cgiStartHTML(cgiText(_("Edit Configuration File")));
-      cgiSetVariable("MESSAGE", cgiText(_("Unable to create temporary file:")));
+      cgiSetVariable("MESSAGE", cgiText(_("Unable to create temporary file")));
       cgiSetVariable("ERROR", strerror(errno));
       cgiCopyTemplateLang("error.tmpl");
       cgiEndHTML();
@@ -1909,7 +1909,7 @@ do_config_server(http_t *http)            /* I - HTTP connection */
     else if (status != HTTP_CREATED)
     {
       cgiSetVariable("MESSAGE",
-                     cgiText(_("Unable to upload cupsd.conf file:")));
+                     cgiText(_("Unable to upload cupsd.conf file")));
       cgiSetVariable("ERROR", httpStatus(status));
 
       cgiStartHTML(cgiText(_("Edit Configuration File")));
@@ -1956,7 +1956,7 @@ do_config_server(http_t *http)            /* I - HTTP connection */
     {
       cgiStartHTML(cgiText(_("Edit Configuration File")));
       cgiSetVariable("MESSAGE",
-                     cgiText(_("Unable to access cupsd.conf file:")));
+                     cgiText(_("Unable to access cupsd.conf file")));
       cgiSetVariable("ERROR", strerror(errno));
       cgiCopyTemplateLang("error.tmpl");
       cgiEndHTML();
@@ -1969,7 +1969,7 @@ do_config_server(http_t *http)            /* I - HTTP connection */
     {
       cgiStartHTML(cgiText(_("Edit Configuration File")));
       cgiSetVariable("MESSAGE",
-                     cgiText(_("Unable to access cupsd.conf file:")));
+                     cgiText(_("Unable to access cupsd.conf file")));
       cgiSetVariable("ERROR",
                      cgiText(_("Unable to edit cupsd.conf files larger than "
                               "1MB")));
@@ -1993,7 +1993,7 @@ do_config_server(http_t *http)            /* I - HTTP connection */
 
       cgiStartHTML(cgiText(_("Edit Configuration File")));
       cgiSetVariable("MESSAGE",
-                     cgiText(_("Unable to access cupsd.conf file:")));
+                     cgiText(_("Unable to access cupsd.conf file")));
       cgiSetVariable("ERROR", strerror(errno));
       cgiCopyTemplateLang("error.tmpl");
       cgiEndHTML();
@@ -2150,7 +2150,7 @@ do_delete_class(http_t *http)             /* I - HTTP connection */
   cgiStartHTML(cgiText(_("Delete Class")));
 
   if (cupsLastError() > IPP_OK_CONFLICT)
-    cgiShowIPPError(_("Unable to delete class:"));
+    cgiShowIPPError(_("Unable to delete class"));
   else
     cgiCopyTemplateLang("class-deleted.tmpl");
 
@@ -2235,7 +2235,7 @@ do_delete_printer(http_t *http)           /* I - HTTP connection */
   cgiStartHTML(cgiText(_("Delete Printer")));
 
   if (cupsLastError() > IPP_OK_CONFLICT)
-    cgiShowIPPError(_("Unable to delete printer:"));
+    cgiShowIPPError(_("Unable to delete printer"));
   else
     cgiCopyTemplateLang("printer-deleted.tmpl");
 
@@ -2837,7 +2837,7 @@ do_set_allowed_users(http_t *http)        /* I - HTTP connection */
       exit(0);
     }
     else if (cupsLastError() > IPP_OK_CONFLICT)
-      cgiShowIPPError(_("Unable to get printer attributes:"));
+      cgiShowIPPError(_("Unable to get printer attributes"));
     else
       cgiCopyTemplateLang("users.tmpl");
 
@@ -2987,7 +2987,7 @@ do_set_allowed_users(http_t *http)        /* I - HTTP connection */
     else if (cupsLastError() > IPP_OK_CONFLICT)
     {
       cgiStartHTML(cgiText(_("Set Allowed Users")));
-      cgiShowIPPError(_("Unable to change printer:"));
+      cgiShowIPPError(_("Unable to change printer"));
     }
     else
     {
@@ -3074,7 +3074,7 @@ do_set_default(http_t *http)              /* I - HTTP connection */
   else if (cupsLastError() > IPP_OK_CONFLICT)
   {
     cgiStartHTML(title);
-    cgiShowIPPError(_("Unable to set server default:"));
+    cgiShowIPPError(_("Unable to set server default"));
   }
   else
   {
@@ -3183,7 +3183,7 @@ do_set_options(http_t *http,              /* I - HTTP connection */
     if ((ppd = ppdOpenFile(filename)) == NULL)
     {
       cgiSetVariable("ERROR", ppdErrorString(ppdLastError(&i)));
-      cgiSetVariable("MESSAGE", cgiText(_("Unable to open PPD file:")));
+      cgiSetVariable("MESSAGE", cgiText(_("Unable to open PPD file")));
       cgiStartHTML(title);
       cgiCopyTemplateLang("error.tmpl");
       cgiEndHTML();
@@ -3804,7 +3804,7 @@ do_set_options(http_t *http,              /* I - HTTP connection */
     else if (cupsLastError() > IPP_OK_CONFLICT)
     {
       cgiStartHTML(title);
-      cgiShowIPPError(_("Unable to set options:"));
+      cgiShowIPPError(_("Unable to set options"));
     }
     else
     {
@@ -3903,7 +3903,7 @@ do_set_sharing(http_t *http)              /* I - HTTP connection */
   else if (cupsLastError() > IPP_OK_CONFLICT)
   {
     cgiStartHTML(cgiText(_("Set Publishing")));
-    cgiShowIPPError(_("Unable to change printer-is-shared attribute:"));
+    cgiShowIPPError(_("Unable to change printer-is-shared attribute"));
   }
   else
   {

diff --git a/cgi-bin/classes.c b/cgi-bin/classes.c
index 293b2c3a8cd9df3a7d9a89603974935f322199f2..82a86329d893bc68e9adc2c26fb16adea069f63c 100644 (file)
--- a/cgi-bin/classes.c
+++ b/cgi-bin/classes.c
@@ -3,7 +3,7 @@
  *
  *   Class status CGI for CUPS.
  *
- *   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
@@ -257,7 +257,7 @@ do_class_op(http_t      *http,              /* I - HTTP connection */
   else if (cupsLastError() > IPP_OK_CONFLICT)
   {
     cgiStartHTML(title);
-    cgiShowIPPError(_("Unable to do maintenance command:"));
+    cgiShowIPPError(_("Unable to do maintenance command"));
   }
   else
   {
@@ -447,7 +447,7 @@ show_all_classes(http_t     *http,  /* I - Connection to server */
     * Show the error...
     */
 
-    cgiShowIPPError(_("Unable to get class list:"));
+    cgiShowIPPError(_("Unable to get class list"));
   }
 
    cgiEndHTML();
@@ -546,7 +546,7 @@ show_class(http_t     *http,                /* I - Connection to server */
     */
 
     cgiStartHTML(pclass);
-    cgiShowIPPError(_("Unable to get class status:"));
+    cgiShowIPPError(_("Unable to get class status"));
   }
 
    cgiEndHTML();

diff --git a/cgi-bin/ipp-var.c b/cgi-bin/ipp-var.c
index d5981b9f71b98aea40c20458ee8a312a12307970..6f72c1c8024abf2a5db9e63cf2855c0bcc335ce1 100644 (file)
--- a/cgi-bin/ipp-var.c
+++ b/cgi-bin/ipp-var.c
@@ -792,7 +792,7 @@ cgiPrintTestPage(http_t     *http,  /* I - Connection to server */
   cgiStartHTML(cgiText(_("Print Test Page")));
 
   if (cupsLastError() > IPP_OK_CONFLICT)
-    cgiShowIPPError(_("Unable to print test page:"));
+    cgiShowIPPError(_("Unable to print test page"));
   else
   {
     cgiSetVariable("PRINTER_NAME", dest);

diff --git a/cgi-bin/jobs.c b/cgi-bin/jobs.c
index 6c4f09852e9a1b7c513b6fd642bc09541baf1ace..283e2c314efa53a76ab0ed7a2d40e901df4aec0b 100644 (file)
--- a/cgi-bin/jobs.c
+++ b/cgi-bin/jobs.c
@@ -3,7 +3,7 @@
  *
  *   Job status CGI for CUPS.
  *
- *   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
@@ -195,7 +195,7 @@ do_job_op(http_t      *http,                /* I - HTTP connection */
   cgiStartHTML(cgiText(_("Jobs")));
 
   if (cupsLastError() > IPP_OK_CONFLICT)
-    cgiShowIPPError(_("Job operation failed:"));
+    cgiShowIPPError(_("Job operation failed"));
   else if (op == IPP_CANCEL_JOB)
     cgiCopyTemplateLang("job-cancel.tmpl");
   else if (op == IPP_HOLD_JOB)

diff --git a/cgi-bin/printers.c b/cgi-bin/printers.c
index adea388a4c60b8f23e43351441d94016e94913c8..ba416877c60defe70feb56dbba8c8d07e17e911c 100644 (file)
--- a/cgi-bin/printers.c
+++ b/cgi-bin/printers.c
@@ -3,7 +3,7 @@
  *
  *   Printer status CGI for CUPS.
  *
- *   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
@@ -266,7 +266,7 @@ do_printer_op(http_t      *http,    /* I - HTTP connection */
   else if (cupsLastError() > IPP_OK_CONFLICT)
   {
     cgiStartHTML(title);
-    cgiShowIPPError(_("Unable to do maintenance command:"));
+    cgiShowIPPError(_("Unable to do maintenance command"));
   }
   else
   {
@@ -464,7 +464,7 @@ show_all_printers(http_t     *http, /* I - Connection to server */
     * Show the error...
     */
 
-    cgiShowIPPError(_("Unable to get printer list:"));
+    cgiShowIPPError(_("Unable to get printer list"));
   }
 
    cgiEndHTML();
@@ -566,7 +566,7 @@ show_printer(http_t     *http,              /* I - Connection to server */
     */
 
     cgiStartHTML(printer);
-    cgiShowIPPError(_("Unable to get printer status:"));
+    cgiShowIPPError(_("Unable to get printer status"));
   }
 
    cgiEndHTML();

diff --git a/data/media.defs b/data/media.defs
index 43b48c352d569c41df341641d0b0a1e78324cc4f..6f0be82e8716ff946c160b0ac3dbf4353757bf09 100644 (file)
--- a/data/media.defs
+++ b/data/media.defs
@@ -198,7 +198,7 @@
 #media "w167h288/Shipping Address" 167 288
 #media "w162h540/Internet Postage 2-Part" 162 540
 #media "w162h504/Internet Postage 3-Part" 162 504
-#media "w41h248/File Folder" 41 248
+#media "w41h248/File Folder " 41 248
 #media "w41h144/Hanging Folder" 41 144
 #media "w153h198/3.5\" Disk" 153 198
 

diff --git a/filter/commandtops.c b/filter/commandtops.c
index e49a443b65dbb1ae65a9b1a4a8d6a6045ed07ef1..fd8e35a02cc00c97c605526966bb383574bd5f20 100644 (file)
--- a/filter/commandtops.c
+++ b/filter/commandtops.c
@@ -71,7 +71,7 @@ main(int  argc,                               /* I - Number of command-line arguments */
     */
 
     _cupsLangPrintf(stderr,
-                    _("Usage: %s job-id user title copies options file"),
+                    _("Usage: %s job-id user title copies options [file]"),
                     argv[0]);
     return (1);
   }

diff --git a/filter/gziptoany.c b/filter/gziptoany.c
index bde1c81a6fea6d24f0f79e1023da1754139304cf..a1b1e2b84b497ed22d6bc88c928e7b23fe23db3e 100644 (file)
--- a/filter/gziptoany.c
+++ b/filter/gziptoany.c
@@ -3,7 +3,7 @@
  *
  *   GZIP/raw pre-filter for CUPS.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -47,7 +47,7 @@ main(int  argc,                               /* I - Number of command-line arguments */
   if (argc != 7)
   {
     _cupsLangPrintf(stderr,
-                    _("Usage: %s job-id user title copies options file"),
+                    _("Usage: %s job-id user title copies options [file]"),
                     argv[0]);
     return (1);
   }

diff --git a/filter/pstops.c b/filter/pstops.c
index 66bb154b9a8ca418dd2705fcc37b8f4ce3591f3b..a3a334597a78513ab4dad9ad9345e196b5d73830 100644 (file)
--- a/filter/pstops.c
+++ b/filter/pstops.c
@@ -261,7 +261,7 @@ main(int  argc,                             /* I - Number of command-line args */
   if (argc < 6 || argc > 7)
   {
     _cupsLangPrintf(stderr,
-                    _("Usage: %s job-id user title copies options file"),
+                    _("Usage: %s job-id user title copies options [file]"),
                     argv[0]);
     return (1);
   }

diff --git a/locale/cups.pot b/locale/cups.pot
index c4a83b114c4a21b10dc3247b512249ddbc538743..89c33342e2b58abc92ec5c7bc019fdb545c9a098 100644 (file)
--- a/locale/cups.pot
+++ b/locale/cups.pot
@@ -30,10 +30,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2012-03-07 13:37-0800\n"
+"POT-Creation-Date: 2012-04-23 12:19-0700\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,7 +48,7 @@ msgstr ""
 msgid "\t\t(none)"
 msgstr ""
 
-#: berkeley/lpc.c:433
+#: berkeley/lpc.c:434
 #, c-format
 msgid "\t%d entries"
 msgstr ""
@@ -153,24 +154,24 @@ msgstr ""
 msgid "\tUsers denied:"
 msgstr ""
 
-#: berkeley/lpc.c:435
+#: berkeley/lpc.c:436
 msgid "\tdaemon present"
 msgstr ""
 
-#: berkeley/lpc.c:431
+#: berkeley/lpc.c:432
 msgid "\tno entries"
 msgstr ""
 
-#: berkeley/lpc.c:403 berkeley/lpc.c:415
+#: berkeley/lpc.c:404 berkeley/lpc.c:416
 #, c-format
 msgid "\tprinter is on device '%s' speed -1"
 msgstr ""
 
-#: berkeley/lpc.c:428
+#: berkeley/lpc.c:429
 msgid "\tprinting is disabled"
 msgstr ""
 
-#: berkeley/lpc.c:426
+#: berkeley/lpc.c:427
 msgid "\tprinting is enabled"
 msgstr ""
 
@@ -179,11 +180,11 @@ msgstr ""
 msgid "\tqueued for %s"
 msgstr ""
 
-#: berkeley/lpc.c:423
+#: berkeley/lpc.c:424
 msgid "\tqueuing is disabled"
 msgstr ""
 
-#: berkeley/lpc.c:421
+#: berkeley/lpc.c:422
 msgid "\tqueuing is enabled"
 msgstr ""
 
@@ -197,11 +198,11 @@ msgid ""
 "    DETAILED CONFORMANCE TEST RESULTS"
 msgstr ""
 
-#: systemv/cupstestppd.c:3799
+#: systemv/cupstestppd.c:3800
 msgid "                          Ignore specific warnings."
 msgstr ""
 
-#: systemv/cupstestppd.c:3803
+#: systemv/cupstestppd.c:3804
 msgid "                          Issue warnings instead of errors."
 msgstr ""
 
@@ -283,118 +284,118 @@ msgstr ""
 msgid "        PASS    LanguageVersion"
 msgstr ""
 
-#: systemv/cupstestppd.c:767
+#: systemv/cupstestppd.c:769
 msgid "        PASS    Manufacturer"
 msgstr ""
 
-#: systemv/cupstestppd.c:807
+#: systemv/cupstestppd.c:809
 msgid "        PASS    ModelName"
 msgstr ""
 
-#: systemv/cupstestppd.c:827
+#: systemv/cupstestppd.c:829
 msgid "        PASS    NickName"
 msgstr ""
 
-#: systemv/cupstestppd.c:887
+#: systemv/cupstestppd.c:889
 msgid "        PASS    PCFileName"
 msgstr ""
 
-#: systemv/cupstestppd.c:962
+#: systemv/cupstestppd.c:964
 msgid "        PASS    PSVersion"
 msgstr ""
 
-#: systemv/cupstestppd.c:867
+#: systemv/cupstestppd.c:869
 msgid "        PASS    PageRegion"
 msgstr ""
 
-#: systemv/cupstestppd.c:847
+#: systemv/cupstestppd.c:849
 msgid "        PASS    PageSize"
 msgstr ""
 
-#: systemv/cupstestppd.c:922
+#: systemv/cupstestppd.c:924
 msgid "        PASS    Product"
 msgstr ""
 
-#: systemv/cupstestppd.c:997
+#: systemv/cupstestppd.c:999
 msgid "        PASS    ShortNickName"
 msgstr ""
 
-#: systemv/cupstestppd.c:1372
+#: systemv/cupstestppd.c:1374
 #, c-format
 msgid "        WARN    %s has no corresponding options."
 msgstr ""
 
-#: systemv/cupstestppd.c:1484
+#: 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:1343
+#: 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:1742
+#: systemv/cupstestppd.c:1744
 msgid "        WARN    File contains a mix of CR, LF, and CR LF line endings."
 msgstr ""
 
-#: systemv/cupstestppd.c:1388
+#: 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:1724
+#: systemv/cupstestppd.c:1726
 #, c-format
 msgid "        WARN    Line %d only contains whitespace."
 msgstr ""
 
-#: systemv/cupstestppd.c:1396
+#: 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:1747
+#: systemv/cupstestppd.c:1749
 msgid "        WARN    Non-Windows PPD files should use lines ending with only LF, not CR LF."
 msgstr ""
 
-#: systemv/cupstestppd.c:1380
+#: systemv/cupstestppd.c:1382
 #, c-format
 msgid ""
 "        WARN    Obsolete PPD version %.1f.\n"
 "                REF: Page 42, section 5.2."
 msgstr ""
 
-#: systemv/cupstestppd.c:1411
+#: 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:1419
+#: systemv/cupstestppd.c:1421
 msgid ""
 "        WARN    PCFileName should contain a unique filename.\n"
 "                REF: Pages 61-62, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1454
+#: 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:1445
+#: 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:1428
+#: systemv/cupstestppd.c:1430
 msgid ""
 "        WARN    ShortNickName required by PPD 4.3 spec.\n"
 "                REF: Pages 64-65, section 5.3."
@@ -408,188 +409,188 @@ msgstr ""
 msgid "       cupstestdsc [options] -"
 msgstr ""
 
-#: systemv/cupstestppd.c:3794
+#: systemv/cupstestppd.c:3795
 msgid "       program | cupstestppd [options] -"
 msgstr ""
 
-#: systemv/cupstestppd.c:3726
+#: systemv/cupstestppd.c:3727
 #, c-format
 msgid ""
 "      %s  \"%s %s\" conflicts with \"%s %s\"\n"
 "                (constraint=\"%s %s %s %s\")."
 msgstr ""
 
-#: systemv/cupstestppd.c:2246
+#: systemv/cupstestppd.c:2248
 #, c-format
 msgid "      %s  %s %s does not exist."
 msgstr ""
 
-#: systemv/cupstestppd.c:3883
+#: systemv/cupstestppd.c:3884
 #, c-format
 msgid "      %s  %s file \"%s\" has the wrong capitalization."
 msgstr ""
 
-#: systemv/cupstestppd.c:2316
+#: systemv/cupstestppd.c:2318
 #, c-format
 msgid ""
 "      %s  Bad %s choice %s.\n"
 "                REF: Page 122, section 5.17"
 msgstr ""
 
-#: systemv/cupstestppd.c:3486 systemv/cupstestppd.c:3535
-#: systemv/cupstestppd.c:3574
+#: 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:3440
+#: systemv/cupstestppd.c:3441
 #, c-format
 msgid "      %s  Bad UTF-8 \"%s\" translation string for option %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:2387
+#: systemv/cupstestppd.c:2389
 #, c-format
 msgid "      %s  Bad cupsFilter value \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:2473
+#: systemv/cupstestppd.c:2475
 #, c-format
 msgid "      %s  Bad cupsFilter2 value \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:2962
+#: systemv/cupstestppd.c:2964
 #, c-format
 msgid "      %s  Bad cupsICCProfile %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:2569
+#: systemv/cupstestppd.c:2571
 #, c-format
 msgid "      %s  Bad cupsPreFilter value \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:1820
+#: systemv/cupstestppd.c:1822
 #, c-format
 msgid "      %s  Bad cupsUIConstraints %s: \"%s\""
 msgstr ""
 
-#: systemv/cupstestppd.c:3390
+#: systemv/cupstestppd.c:3391
 #, c-format
 msgid "      %s  Bad language \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:2431 systemv/cupstestppd.c:2527
-#: systemv/cupstestppd.c:2613 systemv/cupstestppd.c:2671
-#: systemv/cupstestppd.c:2726 systemv/cupstestppd.c:2781
-#: systemv/cupstestppd.c:2836 systemv/cupstestppd.c:2889
-#: systemv/cupstestppd.c:3011
+#: 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:2371 systemv/cupstestppd.c:2457
-#: systemv/cupstestppd.c:2553 systemv/cupstestppd.c:2640
-#: systemv/cupstestppd.c:2695 systemv/cupstestppd.c:2750
-#: systemv/cupstestppd.c:2805 systemv/cupstestppd.c:2860
+#: 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:2905
+#: systemv/cupstestppd.c:2907
 #, c-format
 msgid "      %s  Cannot provide both APScanAppPath and APScanAppBundleID."
 msgstr ""
 
-#: systemv/cupstestppd.c:2203
+#: systemv/cupstestppd.c:2205
 #, c-format
 msgid "      %s  Default choices conflicting."
 msgstr ""
 
-#: systemv/cupstestppd.c:1801
+#: systemv/cupstestppd.c:1803
 #, c-format
 msgid "      %s  Empty cupsUIConstraints %s"
 msgstr ""
 
-#: systemv/cupstestppd.c:3518 systemv/cupstestppd.c:3558
+#: 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:3426
+#: systemv/cupstestppd.c:3427
 #, c-format
 msgid "      %s  Missing \"%s\" translation string for option %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:2416 systemv/cupstestppd.c:2512
-#: systemv/cupstestppd.c:2598 systemv/cupstestppd.c:2656
-#: systemv/cupstestppd.c:2711 systemv/cupstestppd.c:2766
-#: systemv/cupstestppd.c:2821 systemv/cupstestppd.c:2873
-#: systemv/cupstestppd.c:2996
+#: 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:3119
+#: systemv/cupstestppd.c:3121
 #, c-format
 msgid ""
 "      %s  Missing REQUIRED PageRegion option.\n"
 "                REF: Page 100, section 5.14."
 msgstr ""
 
-#: systemv/cupstestppd.c:3104
+#: systemv/cupstestppd.c:3106
 #, c-format
 msgid ""
 "      %s  Missing REQUIRED PageSize option.\n"
 "                REF: Page 99, section 5.14."
 msgstr ""
 
-#: systemv/cupstestppd.c:2011 systemv/cupstestppd.c:2052
+#: 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:1906
+#: systemv/cupstestppd.c:1908
 #, c-format
 msgid "      %s  Missing choice *%s %s in cupsUIConstraints %s: \"%s\""
 msgstr ""
 
-#: systemv/cupstestppd.c:1838
+#: systemv/cupstestppd.c:1840
 #, c-format
 msgid "      %s  Missing cupsUIResolver %s"
 msgstr ""
 
-#: systemv/cupstestppd.c:1997 systemv/cupstestppd.c:2038
+#: 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:1890
+#: systemv/cupstestppd.c:1892
 #, c-format
 msgid "      %s  Missing option %s in cupsUIConstraints %s: \"%s\""
 msgstr ""
 
-#: systemv/cupstestppd.c:3612
+#: systemv/cupstestppd.c:3613
 #, c-format
 msgid "      %s  No base translation \"%s\" is included in file."
 msgstr ""
 
-#: systemv/cupstestppd.c:2292
+#: 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:3177 systemv/cupstestppd.c:3191
+#: 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:3157
+#: systemv/cupstestppd.c:3160
 #, c-format
 msgid "      %s  Size \"%s\" has unexpected dimensions (%gx%g)."
 msgstr ""
 
-#: systemv/cupstestppd.c:3331
+#: systemv/cupstestppd.c:3332
 #, c-format
 msgid "      %s  Size \"%s\" should be \"%s\"."
 msgstr ""
@@ -599,27 +600,22 @@ msgstr ""
 msgid "      %s  Size \"%s\" should be the Adobe standard name \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:3039
+#: systemv/cupstestppd.c:3041
 #, c-format
 msgid "      %s  cupsICCProfile %s hash value collides with %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:1961
+#: systemv/cupstestppd.c:1963
 #, c-format
 msgid "      %s  cupsUIResolver %s causes a loop."
 msgstr ""
 
-#: systemv/cupstestppd.c:1943
+#: systemv/cupstestppd.c:1945
 #, c-format
 msgid "      %s  cupsUIResolver %s does not list at least two different options."
 msgstr ""
 
-#: systemv/cupstestppd.c:2161
-#, c-format
-msgid "      **FAIL**  %s choice names %s and %s differ only by case."
-msgstr ""
-
-#: systemv/cupstestppd.c:1166
+#: systemv/cupstestppd.c:1168
 #, c-format
 msgid ""
 "      **FAIL**  %s must be 1284DeviceID\n"
@@ -629,124 +625,124 @@ msgstr ""
 #: systemv/cupstestppd.c:580
 #, c-format
 msgid ""
-"      **FAIL**  BAD Default%s %s\n"
+"      **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"
+"      **FAIL**  Bad DefaultImageableArea %s\n"
 "                REF: Page 102, section 5.15."
 msgstr ""
 
 #: systemv/cupstestppd.c:550
 #, c-format
 msgid ""
-"      **FAIL**  BAD DefaultPaperDimension %s\n"
+"      **FAIL**  Bad DefaultPaperDimension %s\n"
 "                REF: Page 103, section 5.15."
 msgstr ""
 
-#: systemv/cupstestppd.c:1023
+#: systemv/cupstestppd.c:623
+#, c-format
 msgid ""
-"      **FAIL**  BAD JobPatchFile attribute in file\n"
-"                REF: Page 24, section 3.4."
+"      **FAIL**  Bad FileVersion \"%s\"\n"
+"                REF: Page 56, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:743
+#: systemv/cupstestppd.c:667
+#, c-format
 msgid ""
-"      **FAIL**  BAD Manufacturer (should be \"HP\")\n"
-"                REF: Page 211, table D.1."
+"      **FAIL**  Bad FormatVersion \"%s\"\n"
+"                REF: Page 56, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:759
+#: systemv/cupstestppd.c:1025
 msgid ""
-"      **FAIL**  BAD Manufacturer (should be \"Oki\")\n"
-"                REF: Page 211, table D.1."
+"      **FAIL**  Bad JobPatchFile attribute in file\n"
+"                REF: Page 24, section 3.4."
 msgstr ""
 
-#: systemv/cupstestppd.c:798
+#: systemv/cupstestppd.c:1213
 #, c-format
-msgid ""
-"      **FAIL**  BAD ModelName - \"%c\" not allowed in string.\n"
-"                REF: Pages 59-60, section 5.3."
-msgstr ""
-
-#: systemv/cupstestppd.c:954
-msgid ""
-"      **FAIL**  BAD PSVersion - not \"(string) int\".\n"
-"                REF: Pages 62-64, section 5.3."
+msgid "      **FAIL**  Bad LanguageEncoding %s - must be ISOLatin1."
 msgstr ""
 
-#: systemv/cupstestppd.c:915
-msgid ""
-"      **FAIL**  BAD Product - not \"(string)\".\n"
-"                REF: Page 62, section 5.3."
+#: systemv/cupstestppd.c:1227
+#, c-format
+msgid "      **FAIL**  Bad LanguageVersion %s - must be English."
 msgstr ""
 
-#: systemv/cupstestppd.c:989
+#: systemv/cupstestppd.c:743 systemv/cupstestppd.c:760
+#, c-format
 msgid ""
-"      **FAIL**  BAD ShortNickName - longer than 31 chars.\n"
-"                REF: Pages 64-65, section 5.3."
+"      **FAIL**  Bad Manufacturer (should be \"%s\")\n"
+"                REF: Page 211, table D.1."
 msgstr ""
 
-#: systemv/cupstestppd.c:1147
+#: systemv/cupstestppd.c:800
 #, c-format
 msgid ""
-"      **FAIL**  Bad %s choice %s\n"
-"                REF: Page 84, section 5.9"
+"      **FAIL**  Bad ModelName - \"%c\" not allowed in string.\n"
+"                REF: Pages 59-60, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:623
-#, c-format
+#: systemv/cupstestppd.c:956
 msgid ""
-"      **FAIL**  Bad FileVersion \"%s\"\n"
-"                REF: Page 56, section 5.3."
+"      **FAIL**  Bad PSVersion - not \"(string) int\".\n"
+"                REF: Pages 62-64, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:667
-#, c-format
+#: systemv/cupstestppd.c:917
 msgid ""
-"      **FAIL**  Bad FormatVersion \"%s\"\n"
-"                REF: Page 56, section 5.3."
+"      **FAIL**  Bad Product - not \"(string)\".\n"
+"                REF: Page 62, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1211
-#, c-format
-msgid "      **FAIL**  Bad LanguageEncoding %s - must be ISOLatin1."
+#: systemv/cupstestppd.c:991
+msgid ""
+"      **FAIL**  Bad ShortNickName - longer than 31 chars.\n"
+"                REF: Pages 64-65, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1225
+#: systemv/cupstestppd.c:1149
 #, c-format
-msgid "      **FAIL**  Bad LanguageVersion %s - must be English."
+msgid ""
+"      **FAIL**  Bad option %s choice %s\n"
+"                REF: Page 84, section 5.9"
 msgstr ""
 
-#: systemv/cupstestppd.c:3753 systemv/cupstestppd.c:3775
+#: systemv/cupstestppd.c:3754 systemv/cupstestppd.c:3776
 #, c-format
 msgid "      **FAIL**  Default option code cannot be interpreted: %s"
 msgstr ""
 
-#: systemv/cupstestppd.c:1284
+#: systemv/cupstestppd.c:1286
 #, c-format
 msgid "      **FAIL**  Default translation string for option %s choice %s contains 8-bit characters."
 msgstr ""
 
-#: systemv/cupstestppd.c:1257
+#: systemv/cupstestppd.c:1259
 #, c-format
 msgid "      **FAIL**  Default translation string for option %s contains 8-bit characters."
 msgstr ""
 
-#: systemv/cupstestppd.c:2099
+#: systemv/cupstestppd.c:2101
 #, c-format
 msgid "      **FAIL**  Group names %s and %s differ only by case."
 msgstr ""
 
-#: systemv/cupstestppd.c:2144
+#: 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**  Multiple occurrences of %s choice name %s."
+msgid "      **FAIL**  Option %s choice names %s and %s differ only by case."
 msgstr ""
 
-#: systemv/cupstestppd.c:2121
+#: systemv/cupstestppd.c:2123
 #, c-format
 msgid "      **FAIL**  Option names %s and %s differ only by case."
 msgstr ""
@@ -782,7 +778,7 @@ msgid ""
 "                REF: Page 56, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1074
+#: systemv/cupstestppd.c:1076
 #, c-format
 msgid ""
 "      **FAIL**  REQUIRED ImageableArea for PageSize %s\n"
@@ -802,56 +798,56 @@ msgid ""
 "                REF: Pages 57-58, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:777
+#: systemv/cupstestppd.c:779
 msgid ""
 "      **FAIL**  REQUIRED Manufacturer\n"
 "                REF: Pages 58-59, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:817
+#: systemv/cupstestppd.c:819
 msgid ""
 "      **FAIL**  REQUIRED ModelName\n"
 "                REF: Pages 59-60, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:837
+#: systemv/cupstestppd.c:839
 msgid ""
 "      **FAIL**  REQUIRED NickName\n"
 "                REF: Page 60, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:897
+#: systemv/cupstestppd.c:899
 msgid ""
 "      **FAIL**  REQUIRED PCFileName\n"
 "                REF: Pages 61-62, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:972
+#: systemv/cupstestppd.c:974
 msgid ""
 "      **FAIL**  REQUIRED PSVersion\n"
 "                REF: Pages 62-64, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:877
+#: systemv/cupstestppd.c:879
 msgid ""
 "      **FAIL**  REQUIRED PageRegion\n"
 "                REF: Page 100, section 5.14."
 msgstr ""
 
-#: systemv/cupstestppd.c:1043
+#: 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:857
+#: systemv/cupstestppd.c:859
 msgid ""
 "      **FAIL**  REQUIRED PageSize\n"
 "                REF: Pages 99-100, section 5.14."
 msgstr ""
 
-#: systemv/cupstestppd.c:1096
+#: systemv/cupstestppd.c:1098
 #, c-format
 msgid ""
 "      **FAIL**  REQUIRED PaperDimension for PageSize %s\n"
@@ -859,29 +855,25 @@ msgid ""
 "                REF: Page 103, section 5.15."
 msgstr ""
 
-#: systemv/cupstestppd.c:932
+#: systemv/cupstestppd.c:934
 msgid ""
 "      **FAIL**  REQUIRED Product\n"
 "                REF: Page 62, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1007
+#: 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
-#, c-format
-msgid "      **FAIL**  Unable to open PPD file - %s"
-msgstr ""
-
 #: systemv/cupstestppd.c:365
 #, c-format
 msgid "      **FAIL**  Unable to open PPD file - %s on line %d."
 msgstr ""
 
-#: systemv/cupstestppd.c:1496
+#: systemv/cupstestppd.c:1498
 #, c-format
 msgid "    %d ERRORS FOUND"
 msgstr ""
@@ -950,7 +942,7 @@ msgid ""
 "        REF: Page 43, %%Pages:"
 msgstr ""
 
-#: systemv/cupstestppd.c:1498
+#: systemv/cupstestppd.c:1500
 msgid "    NO ERRORS FOUND"
 msgstr ""
 
@@ -1003,16 +995,16 @@ msgstr ""
 msgid "  --[no-]user-cancel-any  Allow/prevent users to cancel any job."
 msgstr ""
 
-#: ppdc/ppdc.cxx:456
+#: ppdc/ppdc.cxx:455
 msgid "  --cr                    End lines with CR (Mac OS 9)."
 msgstr ""
 
-#: ppdc/ppdc.cxx:458
+#: ppdc/ppdc.cxx:457
 msgid "  --crlf                  End lines with CR + LF (Windows)."
 msgstr ""
 
-#: ppdc/ppdc.cxx:460
-msgid "  --lf                    End lines with LF (UNIX/Linux/Mac OS X)."
+#: ppdc/ppdc.cxx:459
+msgid "  --lf                    End lines with LF (UNIX/Linux/OS X)."
 msgstr ""
 
 #: test/ipptool.c:4337
@@ -1027,7 +1019,7 @@ msgstr ""
 msgid "  -C                      Send requests using chunking (default)."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1439 scheduler/cupsfilter.c:1466
+#: scheduler/cupsfilter.c:1431
 msgid "  -D                      Remove the input file when finished."
 msgstr ""
 
@@ -1035,23 +1027,19 @@ msgstr ""
 msgid "  -D name=value           Set named variable to value."
 msgstr ""
 
-#: systemv/cupsctl.c:205
-msgid "  -E                      Enable encryption."
-msgstr ""
-
-#: systemv/cupsaddsmb.c:285
-msgid "  -E                      Encrypt the connection to the server."
+#: systemv/cupsaddsmb.c:285 systemv/cupsctl.c:205
+msgid "  -E                      Encrypt the connection."
 msgstr ""
 
 #: test/ipptool.c:4341
-msgid "  -E                      Test with TLS encryption."
+msgid "  -E                      Test with HTTP Upgrade to TLS."
 msgstr ""
 
-#: scheduler/main.c:2023
+#: scheduler/main.c:2021
 msgid "  -F                      Run in the foreground but detach from console."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:287
+#: systemv/cupsaddsmb.c:286
 msgid "  -H samba-server         Use the named SAMBA server."
 msgstr ""
 
@@ -1063,23 +1051,19 @@ msgstr ""
 msgid "  -I include-dir          Add include directory to search path."
 msgstr ""
 
-#: systemv/cupstestppd.c:3798
+#: systemv/cupstestppd.c:3799
 msgid "  -I {filename,filters,none,profiles}"
 msgstr ""
 
-#: scheduler/cupsfilter.c:1468
-msgid "  -J title                Set title."
-msgstr ""
-
 #: test/ipptool.c:4344
 msgid "  -L                      Send requests using content-length."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1441 scheduler/cupsfilter.c:1469
+#: scheduler/cupsfilter.c:1433
 msgid "  -P filename.ppd         Set PPD file."
 msgstr ""
 
-#: systemv/cupstestppd.c:3800
+#: systemv/cupstestppd.c:3801
 msgid "  -R root-directory       Set alternate root."
 msgstr ""
 
@@ -1091,15 +1075,7 @@ msgstr ""
 msgid "  -T seconds              Set the receive/send timeout in seconds."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:289
-msgid "  -U samba-user           Authenticate using the named SAMBA user."
-msgstr ""
-
-#: scheduler/cupsfilter.c:1442 scheduler/cupsfilter.c:1470
-msgid "  -U username             Set username for job."
-msgstr ""
-
-#: systemv/cupsctl.c:206
+#: scheduler/cupsfilter.c:1434 systemv/cupsaddsmb.c:288 systemv/cupsctl.c:206
 msgid "  -U username             Specify username."
 msgstr ""
 
@@ -1107,7 +1083,7 @@ msgstr ""
 msgid "  -V version              Set default IPP version."
 msgstr ""
 
-#: systemv/cupstestppd.c:3801
+#: systemv/cupstestppd.c:3802
 msgid "  -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,translations}"
 msgstr ""
 
@@ -1115,27 +1091,15 @@ msgstr ""
 msgid "  -X                      Produce XML plist instead of plain text."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:291
+#: systemv/cupsaddsmb.c:289
 msgid "  -a                      Export all printers."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1471
-msgid "  -a 'name=value ...'     Set option(s)."
-msgstr ""
-
 #: ppdc/ppdc.cxx:442
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr ""
 
-#: scheduler/main.c:2020
-msgid "  -c config-file          Load alternate configuration file."
-msgstr ""
-
-#: scheduler/cupsfilter.c:1472
-msgid "  -c copies               Set number of copies."
-msgstr ""
-
-#: scheduler/cupsfilter.c:1443
+#: scheduler/cupsfilter.c:1435 scheduler/main.c:2019
 msgid "  -c cupsd.conf           Set cupsd.conf file to use."
 msgstr ""
 
@@ -1147,15 +1111,15 @@ msgstr ""
 msgid "  -d output-dir           Specify the output directory."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1445 scheduler/cupsfilter.c:1473
+#: scheduler/cupsfilter.c:1437
 msgid "  -d printer              Use the named printer."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1447 scheduler/cupsfilter.c:1475
+#: scheduler/cupsfilter.c:1439
 msgid "  -e                      Use every filter from the PPD file."
 msgstr ""
 
-#: scheduler/main.c:2022
+#: scheduler/main.c:2020
 msgid "  -f                      Run in the foreground."
 msgstr ""
 
@@ -1163,23 +1127,15 @@ msgstr ""
 msgid "  -f filename             Set default request filename."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1477
-msgid "  -f filename             Set file to be converted (otherwise stdin)."
-msgstr ""
-
-#: scheduler/main.c:2025
+#: scheduler/main.c:2023
 msgid "  -h                      Show this usage message."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:292
-msgid "  -h cups-server          Use the named CUPS server."
-msgstr ""
-
-#: systemv/cupsctl.c:207
+#: systemv/cupsaddsmb.c:290 systemv/cupsctl.c:207
 msgid "  -h server[:port]        Specify server address."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1449 scheduler/cupsfilter.c:1479
+#: scheduler/cupsfilter.c:1441
 msgid "  -i mime/type            Set input MIME type (otherwise auto-typed)."
 msgstr ""
 
@@ -1187,15 +1143,11 @@ msgstr ""
 msgid "  -i seconds              Repeat the last file with the given time interval."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1451
+#: scheduler/cupsfilter.c:1443
 msgid "  -j job-id[,N]           Filter file N from the specified job (default is file 1)."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1481
-msgid "  -j mime/type            Set output MIME type (otherwise application/pdf)."
-msgstr ""
-
-#: scheduler/main.c:2026
+#: scheduler/main.c:2024
 msgid "  -l                      Run cupsd from launchd(8)."
 msgstr ""
 
@@ -1207,11 +1159,11 @@ msgstr ""
 msgid "  -m                      Use the ModelName value as the filename."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1453
+#: scheduler/cupsfilter.c:1445
 msgid "  -m mime/type            Set output MIME type (otherwise application/pdf)."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1455
+#: scheduler/cupsfilter.c:1447
 msgid "  -n copies               Set number of copies."
 msgstr ""
 
@@ -1219,10 +1171,6 @@ msgstr ""
 msgid "  -n count                Repeat the last file the given number of times."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1483
-msgid "  -o filename             Set file to be generated (otherwise stdout)."
-msgstr ""
-
 #: ppdc/ppdi.cxx:133
 msgid "  -o filename.drv         Set driver information file (otherwise ppdi.drv)."
 msgstr ""
@@ -1231,27 +1179,23 @@ msgstr ""
 msgid "  -o filename.ppd[.gz]    Set output file (otherwise stdout)."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1456
+#: scheduler/cupsfilter.c:1448
 msgid "  -o name=value           Set option(s)."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1457
+#: scheduler/cupsfilter.c:1449
 msgid "  -p filename.ppd         Set PPD file."
 msgstr ""
 
-#: test/ipptool.c:4362
-msgid "  -q                      Be quiet - no output except errors."
-msgstr ""
-
-#: systemv/cupstestppd.c:3805
+#: systemv/cupstestppd.c:3806 test/ipptool.c:4362
 msgid "  -q                      Run silently."
 msgstr ""
 
-#: systemv/cupstestppd.c:3806
+#: systemv/cupstestppd.c:3807
 msgid "  -r                      Use 'relaxed' open mode."
 msgstr ""
 
-#: test/ipptool.c:4364
+#: test/ipptool.c:4363
 msgid "  -t                      Produce a test report."
 msgstr ""
 
@@ -1259,39 +1203,28 @@ msgstr ""
 msgid "  -t                      Test PPDs instead of generating them."
 msgstr ""
 
-#: scheduler/main.c:2027
+#: scheduler/main.c:2025
 msgid "  -t                      Test the configuration file."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1458
+#: scheduler/cupsfilter.c:1450
 msgid "  -t title                Set title."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1459 scheduler/cupsfilter.c:1485
+#: scheduler/cupsfilter.c:1451
 msgid "  -u                      Remove the PPD file when finished."
 msgstr ""
 
-#: systemv/cupstestppd.c:3807
-msgid "  -v                      Be slightly verbose."
-msgstr ""
-
+#: systemv/cupsaddsmb.c:291 systemv/cupstestppd.c:3808 test/ipptool.c:4364
 #: ppdc/ppdc.cxx:452 ppdc/ppdpo.cxx:259
-msgid "  -v                      Be verbose (more v's for more verbosity)."
-msgstr ""
-
-#: systemv/cupsaddsmb.c:294
-msgid "  -v                      Be verbose (show commands)."
+msgid "  -v                      Be verbose."
 msgstr ""
 
-#: test/ipptool.c:4365
-msgid "  -v                      Show all attributes sent and received."
-msgstr ""
-
-#: systemv/cupstestppd.c:3808
+#: systemv/cupstestppd.c:3809
 msgid "  -vv                     Be very verbose."
 msgstr ""
 
-#: ppdc/ppdc.cxx:454
+#: ppdc/ppdc.cxx:453
 msgid "  -z                      Compress PPD files using GNU zip."
 msgstr ""
 
@@ -1303,56 +1236,56 @@ msgstr ""
 #: 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:756 systemv/cupstestppd.c:774
-#: systemv/cupstestppd.c:795 systemv/cupstestppd.c:814
-#: systemv/cupstestppd.c:834 systemv/cupstestppd.c:854
-#: systemv/cupstestppd.c:874 systemv/cupstestppd.c:894
-#: systemv/cupstestppd.c:912 systemv/cupstestppd.c:929
-#: systemv/cupstestppd.c:951 systemv/cupstestppd.c:969
-#: systemv/cupstestppd.c:986 systemv/cupstestppd.c:1004
-#: systemv/cupstestppd.c:1020 systemv/cupstestppd.c:1040
-#: systemv/cupstestppd.c:1071 systemv/cupstestppd.c:1093
-#: systemv/cupstestppd.c:1144 systemv/cupstestppd.c:1163
-#: systemv/cupstestppd.c:1207 systemv/cupstestppd.c:1221
-#: systemv/cupstestppd.c:1253 systemv/cupstestppd.c:1280
-#: systemv/cupstestppd.c:1798 systemv/cupstestppd.c:1817
-#: systemv/cupstestppd.c:1835 systemv/cupstestppd.c:1887
-#: systemv/cupstestppd.c:1903 systemv/cupstestppd.c:1940
-#: systemv/cupstestppd.c:1958 systemv/cupstestppd.c:1994
-#: systemv/cupstestppd.c:2008 systemv/cupstestppd.c:2035
-#: systemv/cupstestppd.c:2049 systemv/cupstestppd.c:2095
-#: systemv/cupstestppd.c:2117 systemv/cupstestppd.c:2140
-#: systemv/cupstestppd.c:2157 systemv/cupstestppd.c:2199
-#: systemv/cupstestppd.c:2242 systemv/cupstestppd.c:2289
-#: systemv/cupstestppd.c:2313 systemv/cupstestppd.c:2367
-#: systemv/cupstestppd.c:2383 systemv/cupstestppd.c:2413
-#: systemv/cupstestppd.c:2427 systemv/cupstestppd.c:2453
-#: systemv/cupstestppd.c:2469 systemv/cupstestppd.c:2509
-#: systemv/cupstestppd.c:2523 systemv/cupstestppd.c:2549
-#: systemv/cupstestppd.c:2565 systemv/cupstestppd.c:2595
-#: systemv/cupstestppd.c:2609 systemv/cupstestppd.c:2636
-#: systemv/cupstestppd.c:2653 systemv/cupstestppd.c:2667
-#: systemv/cupstestppd.c:2691 systemv/cupstestppd.c:2708
-#: systemv/cupstestppd.c:2722 systemv/cupstestppd.c:2746
-#: systemv/cupstestppd.c:2763 systemv/cupstestppd.c:2777
-#: systemv/cupstestppd.c:2801 systemv/cupstestppd.c:2818
-#: systemv/cupstestppd.c:2832 systemv/cupstestppd.c:2856
-#: systemv/cupstestppd.c:2870 systemv/cupstestppd.c:2885
-#: systemv/cupstestppd.c:2902 systemv/cupstestppd.c:2958
-#: systemv/cupstestppd.c:2993 systemv/cupstestppd.c:3007
-#: systemv/cupstestppd.c:3035 systemv/cupstestppd.c:3100
-#: systemv/cupstestppd.c:3115 systemv/cupstestppd.c:3153
-#: systemv/cupstestppd.c:3173 systemv/cupstestppd.c:3187
-#: systemv/cupstestppd.c:3386 systemv/cupstestppd.c:3422
-#: systemv/cupstestppd.c:3436 systemv/cupstestppd.c:3482
-#: systemv/cupstestppd.c:3514 systemv/cupstestppd.c:3531
-#: systemv/cupstestppd.c:3554 systemv/cupstestppd.c:3570
-#: systemv/cupstestppd.c:3608 systemv/cupstestppd.c:3749
-#: systemv/cupstestppd.c:3771 systemv/cupstestppd.c:3879
+#: 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:1304
+#: systemv/cupstestppd.c:1306
 msgid " PASS"
 msgstr ""
 
@@ -1428,7 +1361,7 @@ msgid "%s: %-33.33s [job %d localhost]"
 msgstr ""
 
 #. TRANSLATORS: Message is "subject: error"
-#: cups/langprintf.c:86 scheduler/cupsfilter.c:720 systemv/lpadmin.c:805
+#: 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
@@ -1640,7 +1573,7 @@ msgstr ""
 msgid "%s: Invalid destination name in list \"%s\"."
 msgstr ""
 
-#: scheduler/cupsfilter.c:573
+#: scheduler/cupsfilter.c:567
 #, c-format
 msgid "%s: Invalid filter string \"%s\"."
 msgstr ""
@@ -1650,7 +1583,7 @@ msgstr ""
 msgid "%s: Need job ID (\"-i jobid\") before \"-H restart\"."
 msgstr ""
 
-#: scheduler/cupsfilter.c:464
+#: scheduler/cupsfilter.c:458
 #, c-format
 msgid "%s: No filter to convert from %s/%s to %s/%s."
 msgstr ""
@@ -1668,7 +1601,7 @@ msgstr ""
 msgid "%s: Sorry, no encryption support."
 msgstr ""
 
-#: berkeley/lpq.c:295 scheduler/cupsfilter.c:1227 systemv/cancel.c:237
+#: 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."
@@ -1679,7 +1612,7 @@ msgstr ""
 msgid "%s: Unable to contact server."
 msgstr ""
 
-#: scheduler/cupsfilter.c:430
+#: scheduler/cupsfilter.c:424
 #, c-format
 msgid "%s: Unable to determine MIME type of \"%s\"."
 msgstr ""
@@ -1689,12 +1622,12 @@ msgstr ""
 msgid "%s: Unable to open %s: %s"
 msgstr ""
 
-#: scheduler/cupsfilter.c:668 ppdc/ppdmerge.cxx:112
+#: 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:398
+#: scheduler/cupsfilter.c:392
 #, c-format
 msgid "%s: Unable to read MIME database from \"%s\" or \"%s\"."
 msgstr ""
@@ -1704,17 +1637,17 @@ msgstr ""
 msgid "%s: Unknown destination \"%s\"."
 msgstr ""
 
-#: scheduler/cupsfilter.c:441
+#: scheduler/cupsfilter.c:435
 #, c-format
 msgid "%s: Unknown destination MIME type %s/%s."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1433
+#: scheduler/cupsfilter.c:1427
 #, c-format
 msgid "%s: Unknown option \"%c\"."
 msgstr ""
 
-#: scheduler/cupsfilter.c:422
+#: scheduler/cupsfilter.c:416
 #, c-format
 msgid "%s: Unknown source MIME type %s/%s."
 msgstr ""
@@ -1744,195 +1677,195 @@ msgstr ""
 msgid "%s: Warning - mode option ignored."
 msgstr ""
 
-#: ppdc/sample.c:319
+#: ppdc/sample.c:310
 msgid "-1"
 msgstr ""
 
-#: ppdc/sample.c:310
+#: ppdc/sample.c:301
 msgid "-10"
 msgstr ""
 
-#: ppdc/sample.c:402
+#: ppdc/sample.c:393
 msgid "-100"
 msgstr ""
 
-#: ppdc/sample.c:401
+#: ppdc/sample.c:392
 msgid "-105"
 msgstr ""
 
-#: ppdc/sample.c:309
+#: ppdc/sample.c:300
 msgid "-11"
 msgstr ""
 
-#: ppdc/sample.c:400
+#: ppdc/sample.c:391
 msgid "-110"
 msgstr ""
 
-#: ppdc/sample.c:399
+#: ppdc/sample.c:390
 msgid "-115"
 msgstr ""
 
-#: ppdc/sample.c:308
+#: ppdc/sample.c:299
 msgid "-12"
 msgstr ""
 
-#: ppdc/sample.c:398
+#: ppdc/sample.c:389
 msgid "-120"
 msgstr ""
 
-#: ppdc/sample.c:307
+#: ppdc/sample.c:298
 msgid "-13"
 msgstr ""
 
-#: ppdc/sample.c:306
+#: ppdc/sample.c:297
 msgid "-14"
 msgstr ""
 
-#: ppdc/sample.c:305
+#: ppdc/sample.c:296
 msgid "-15"
 msgstr ""
 
-#: ppdc/sample.c:318
+#: ppdc/sample.c:309
 msgid "-2"
 msgstr ""
 
-#: ppdc/sample.c:418
+#: ppdc/sample.c:409
 msgid "-20"
 msgstr ""
 
-#: ppdc/sample.c:417
+#: ppdc/sample.c:408
 msgid "-25"
 msgstr ""
 
-#: ppdc/sample.c:317
+#: ppdc/sample.c:308
 msgid "-3"
 msgstr ""
 
-#: ppdc/sample.c:416
+#: ppdc/sample.c:407
 msgid "-30"
 msgstr ""
 
-#: ppdc/sample.c:415
+#: ppdc/sample.c:406
 msgid "-35"
 msgstr ""
 
-#: ppdc/sample.c:316
+#: ppdc/sample.c:307
 msgid "-4"
 msgstr ""
 
-#: ppdc/sample.c:414
+#: ppdc/sample.c:405
 msgid "-40"
 msgstr ""
 
-#: ppdc/sample.c:413
+#: ppdc/sample.c:404
 msgid "-45"
 msgstr ""
 
-#: ppdc/sample.c:315
+#: ppdc/sample.c:306
 msgid "-5"
 msgstr ""
 
-#: ppdc/sample.c:412
+#: ppdc/sample.c:403
 msgid "-50"
 msgstr ""
 
-#: ppdc/sample.c:411
+#: ppdc/sample.c:402
 msgid "-55"
 msgstr ""
 
-#: ppdc/sample.c:314
+#: ppdc/sample.c:305
 msgid "-6"
 msgstr ""
 
-#: ppdc/sample.c:410
+#: ppdc/sample.c:401
 msgid "-60"
 msgstr ""
 
-#: ppdc/sample.c:409
+#: ppdc/sample.c:400
 msgid "-65"
 msgstr ""
 
-#: ppdc/sample.c:313
+#: ppdc/sample.c:304
 msgid "-7"
 msgstr ""
 
-#: ppdc/sample.c:408
+#: ppdc/sample.c:399
 msgid "-70"
 msgstr ""
 
-#: ppdc/sample.c:407
+#: ppdc/sample.c:398
 msgid "-75"
 msgstr ""
 
-#: ppdc/sample.c:312
+#: ppdc/sample.c:303
 msgid "-8"
 msgstr ""
 
-#: ppdc/sample.c:406
+#: ppdc/sample.c:397
 msgid "-80"
 msgstr ""
 
-#: ppdc/sample.c:405
+#: ppdc/sample.c:396
 msgid "-85"
 msgstr ""
 
-#: ppdc/sample.c:311
+#: ppdc/sample.c:302
 msgid "-9"
 msgstr ""
 
-#: ppdc/sample.c:404
+#: ppdc/sample.c:395
 msgid "-90"
 msgstr ""
 
-#: ppdc/sample.c:403
+#: ppdc/sample.c:394
 msgid "-95"
 msgstr ""
 
-#: ppdc/sample.c:320
+#: ppdc/sample.c:311
 msgid "0"
 msgstr ""
 
-#: ppdc/sample.c:321
+#: ppdc/sample.c:312
 msgid "1"
 msgstr ""
 
-#: ppdc/sample.c:393
+#: ppdc/sample.c:384
 msgid "1 inch/sec."
 msgstr ""
 
-#: ppdc/sample.c:181
+#: ppdc/sample.c:172
 msgid "1.25x0.25\""
 msgstr ""
 
-#: ppdc/sample.c:182
+#: ppdc/sample.c:173
 msgid "1.25x2.25\""
 msgstr ""
 
-#: ppdc/sample.c:441
+#: ppdc/sample.c:432
 msgid "1.5 inch/sec."
 msgstr ""
 
-#: ppdc/sample.c:183
+#: ppdc/sample.c:174
 msgid "1.50x0.25\""
 msgstr ""
 
-#: ppdc/sample.c:184
+#: ppdc/sample.c:175
 msgid "1.50x0.50\""
 msgstr ""
 
-#: ppdc/sample.c:185
+#: ppdc/sample.c:176
 msgid "1.50x1.00\""
 msgstr ""
 
-#: ppdc/sample.c:186
+#: ppdc/sample.c:177
 msgid "1.50x2.00\""
 msgstr ""
 
-#: ppdc/sample.c:330
+#: ppdc/sample.c:321
 msgid "10"
 msgstr ""
 
-#: ppdc/sample.c:452
+#: ppdc/sample.c:443
 msgid "10 inches/sec."
 msgstr ""
 
@@ -1948,39 +1881,39 @@ msgstr ""
 msgid "10 x 14"
 msgstr ""
 
-#: ppdc/sample.c:432
+#: ppdc/sample.c:423
 msgid "100"
 msgstr ""
 
-#: ppdc/sample.c:343
+#: ppdc/sample.c:334
 msgid "100 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:433
+#: ppdc/sample.c:424
 msgid "105"
 msgstr ""
 
-#: ppdc/sample.c:331
+#: ppdc/sample.c:322
 msgid "11"
 msgstr ""
 
-#: ppdc/sample.c:453
+#: ppdc/sample.c:444
 msgid "11 inches/sec."
 msgstr ""
 
-#: ppdc/sample.c:434
+#: ppdc/sample.c:425
 msgid "110"
 msgstr ""
 
-#: ppdc/sample.c:435
+#: ppdc/sample.c:426
 msgid "115"
 msgstr ""
 
-#: ppdc/sample.c:332
+#: ppdc/sample.c:323
 msgid "12"
 msgstr ""
 
-#: ppdc/sample.c:454
+#: ppdc/sample.c:445
 msgid "12 inches/sec."
 msgstr ""
 
@@ -1988,39 +1921,39 @@ msgstr ""
 msgid "12 x 11"
 msgstr ""
 
-#: ppdc/sample.c:436
+#: ppdc/sample.c:427
 msgid "120"
 msgstr ""
 
-#: ppdc/sample.c:344
+#: ppdc/sample.c:335
 msgid "120 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:252
+#: ppdc/sample.c:243
 msgid "120x60dpi"
 msgstr ""
 
-#: ppdc/sample.c:258
+#: ppdc/sample.c:249
 msgid "120x72dpi"
 msgstr ""
 
-#: ppdc/sample.c:333
+#: ppdc/sample.c:324
 msgid "13"
 msgstr ""
 
-#: ppdc/sample.c:241
+#: ppdc/sample.c:232
 msgid "136dpi"
 msgstr ""
 
-#: ppdc/sample.c:334
+#: ppdc/sample.c:325
 msgid "14"
 msgstr ""
 
-#: ppdc/sample.c:335
+#: ppdc/sample.c:326
 msgid "15"
 msgstr ""
 
-#: ppdc/sample.c:337
+#: ppdc/sample.c:328
 msgid "15 mm/sec."
 msgstr ""
 
@@ -2028,187 +1961,187 @@ msgstr ""
 msgid "15 x 11"
 msgstr ""
 
-#: ppdc/sample.c:345
+#: ppdc/sample.c:336
 msgid "150 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:292
+#: ppdc/sample.c:283
 msgid "150dpi"
 msgstr ""
 
-#: ppdc/sample.c:377
+#: ppdc/sample.c:368
 msgid "16"
 msgstr ""
 
-#: ppdc/sample.c:378
+#: ppdc/sample.c:369
 msgid "17"
 msgstr ""
 
-#: ppdc/sample.c:379
+#: ppdc/sample.c:370
 msgid "18"
 msgstr ""
 
-#: ppdc/sample.c:253
+#: ppdc/sample.c:244
 msgid "180dpi"
 msgstr ""
 
-#: ppdc/sample.c:380
+#: ppdc/sample.c:371
 msgid "19"
 msgstr ""
 
-#: ppdc/sample.c:322
+#: ppdc/sample.c:313
 msgid "2"
 msgstr ""
 
-#: ppdc/sample.c:394
+#: ppdc/sample.c:385
 msgid "2 inches/sec."
 msgstr ""
 
-#: ppdc/sample.c:279
+#: ppdc/sample.c:270
 msgid "2-Sided Printing"
 msgstr ""
 
-#: ppdc/sample.c:187
+#: ppdc/sample.c:178
 msgid "2.00x0.37\""
 msgstr ""
 
-#: ppdc/sample.c:188
+#: ppdc/sample.c:179
 msgid "2.00x0.50\""
 msgstr ""
 
-#: ppdc/sample.c:189
+#: ppdc/sample.c:180
 msgid "2.00x1.00\""
 msgstr ""
 
-#: ppdc/sample.c:190
+#: ppdc/sample.c:181
 msgid "2.00x1.25\""
 msgstr ""
 
-#: ppdc/sample.c:191
+#: ppdc/sample.c:182
 msgid "2.00x2.00\""
 msgstr ""
 
-#: ppdc/sample.c:192
+#: ppdc/sample.c:183
 msgid "2.00x3.00\""
 msgstr ""
 
-#: ppdc/sample.c:193
+#: ppdc/sample.c:184
 msgid "2.00x4.00\""
 msgstr ""
 
-#: ppdc/sample.c:194
+#: ppdc/sample.c:185
 msgid "2.00x5.50\""
 msgstr ""
 
-#: ppdc/sample.c:195
+#: ppdc/sample.c:186
 msgid "2.25x0.50\""
 msgstr ""
 
-#: ppdc/sample.c:196
+#: ppdc/sample.c:187
 msgid "2.25x1.25\""
 msgstr ""
 
-#: ppdc/sample.c:197
+#: ppdc/sample.c:188
 msgid "2.25x4.00\""
 msgstr ""
 
-#: ppdc/sample.c:198
+#: ppdc/sample.c:189
 msgid "2.25x5.50\""
 msgstr ""
 
-#: ppdc/sample.c:199
+#: ppdc/sample.c:190
 msgid "2.38x5.50\""
 msgstr ""
 
-#: ppdc/sample.c:442
+#: ppdc/sample.c:433
 msgid "2.5 inches/sec."
 msgstr ""
 
-#: ppdc/sample.c:200
+#: ppdc/sample.c:191
 msgid "2.50x1.00\""
 msgstr ""
 
-#: ppdc/sample.c:201
+#: ppdc/sample.c:192
 msgid "2.50x2.00\""
 msgstr ""
 
-#: ppdc/sample.c:202
+#: ppdc/sample.c:193
 msgid "2.75x1.25\""
 msgstr ""
 
-#: ppdc/sample.c:203
+#: ppdc/sample.c:194
 msgid "2.9 x 1\""
 msgstr ""
 
-#: ppdc/sample.c:381
+#: ppdc/sample.c:372
 msgid "20"
 msgstr ""
 
-#: ppdc/sample.c:338
+#: ppdc/sample.c:329
 msgid "20 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:346
+#: ppdc/sample.c:337
 msgid "200 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:242
+#: ppdc/sample.c:233
 msgid "203dpi"
 msgstr ""
 
-#: ppdc/sample.c:382
+#: ppdc/sample.c:373
 msgid "21"
 msgstr ""
 
-#: ppdc/sample.c:383
+#: ppdc/sample.c:374
 msgid "22"
 msgstr ""
 
-#: ppdc/sample.c:384
+#: ppdc/sample.c:375
 msgid "23"
 msgstr ""
 
-#: ppdc/sample.c:385
+#: ppdc/sample.c:376
 msgid "24"
 msgstr ""
 
-#: ppdc/sample.c:250
+#: ppdc/sample.c:241
 msgid "24-Pin Series"
 msgstr ""
 
-#: ppdc/sample.c:259
+#: ppdc/sample.c:250
 msgid "240x72dpi"
 msgstr ""
 
-#: ppdc/sample.c:386
+#: ppdc/sample.c:377
 msgid "25"
 msgstr ""
 
-#: ppdc/sample.c:347
+#: ppdc/sample.c:338
 msgid "250 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:387
+#: ppdc/sample.c:378
 msgid "26"
 msgstr ""
 
-#: ppdc/sample.c:388
+#: ppdc/sample.c:379
 msgid "27"
 msgstr ""
 
-#: ppdc/sample.c:389
+#: ppdc/sample.c:380
 msgid "28"
 msgstr ""
 
-#: ppdc/sample.c:390
+#: ppdc/sample.c:381
 msgid "29"
 msgstr ""
 
-#: ppdc/sample.c:323
+#: ppdc/sample.c:314
 msgid "3"
 msgstr ""
 
-#: ppdc/sample.c:395
+#: ppdc/sample.c:386
 msgid "3 inches/sec."
 msgstr ""
 
@@ -2216,43 +2149,43 @@ msgstr ""
 msgid "3 x 5"
 msgstr ""
 
-#: ppdc/sample.c:204
+#: ppdc/sample.c:195
 msgid "3.00x1.00\""
 msgstr ""
 
-#: ppdc/sample.c:205
+#: ppdc/sample.c:196
 msgid "3.00x1.25\""
 msgstr ""
 
-#: ppdc/sample.c:206
+#: ppdc/sample.c:197
 msgid "3.00x2.00\""
 msgstr ""
 
-#: ppdc/sample.c:207
+#: ppdc/sample.c:198
 msgid "3.00x3.00\""
 msgstr ""
 
-#: ppdc/sample.c:208
+#: ppdc/sample.c:199
 msgid "3.00x5.00\""
 msgstr ""
 
-#: ppdc/sample.c:209
+#: ppdc/sample.c:200
 msgid "3.25x2.00\""
 msgstr ""
 
-#: ppdc/sample.c:210
+#: ppdc/sample.c:201
 msgid "3.25x5.00\""
 msgstr ""
 
-#: ppdc/sample.c:211
+#: ppdc/sample.c:202
 msgid "3.25x5.50\""
 msgstr ""
 
-#: ppdc/sample.c:212
+#: ppdc/sample.c:203
 msgid "3.25x5.83\""
 msgstr ""
 
-#: ppdc/sample.c:213
+#: ppdc/sample.c:204
 msgid "3.25x7.83\""
 msgstr ""
 
@@ -2264,103 +2197,99 @@ msgstr ""
 msgid "3.5\" Disk"
 msgstr ""
 
-#: ppdc/sample.c:180
-msgid "3.5\" Disk - 2 1/8 x 2 3/4\""
-msgstr ""
-
-#: ppdc/sample.c:214
+#: ppdc/sample.c:205
 msgid "3.50x1.00\""
 msgstr ""
 
-#: ppdc/sample.c:391
+#: ppdc/sample.c:382
 msgid "30"
 msgstr ""
 
-#: ppdc/sample.c:339
+#: ppdc/sample.c:330
 msgid "30 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:348
+#: ppdc/sample.c:339
 msgid "300 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:243
+#: ppdc/sample.c:234
 msgid "300dpi"
 msgstr ""
 
-#: ppdc/sample.c:419
+#: ppdc/sample.c:410
 msgid "35"
 msgstr ""
 
-#: ppdc/sample.c:255
+#: ppdc/sample.c:246
 msgid "360dpi"
 msgstr ""
 
-#: ppdc/sample.c:254
+#: ppdc/sample.c:245
 msgid "360x180dpi"
 msgstr ""
 
-#: ppdc/sample.c:324
+#: ppdc/sample.c:315
 msgid "4"
 msgstr ""
 
-#: ppdc/sample.c:396
+#: ppdc/sample.c:387
 msgid "4 inches/sec."
 msgstr ""
 
-#: ppdc/sample.c:215
+#: ppdc/sample.c:206
 msgid "4.00x1.00\""
 msgstr ""
 
-#: ppdc/sample.c:223
+#: ppdc/sample.c:214
 msgid "4.00x13.00\""
 msgstr ""
 
-#: ppdc/sample.c:216
+#: ppdc/sample.c:207
 msgid "4.00x2.00\""
 msgstr ""
 
-#: ppdc/sample.c:217
+#: ppdc/sample.c:208
 msgid "4.00x2.50\""
 msgstr ""
 
-#: ppdc/sample.c:218
+#: ppdc/sample.c:209
 msgid "4.00x3.00\""
 msgstr ""
 
-#: ppdc/sample.c:219
+#: ppdc/sample.c:210
 msgid "4.00x4.00\""
 msgstr ""
 
-#: ppdc/sample.c:220
+#: ppdc/sample.c:211
 msgid "4.00x5.00\""
 msgstr ""
 
-#: ppdc/sample.c:221
+#: ppdc/sample.c:212
 msgid "4.00x6.00\""
 msgstr ""
 
-#: ppdc/sample.c:222
+#: ppdc/sample.c:213
 msgid "4.00x6.50\""
 msgstr ""
 
-#: ppdc/sample.c:420
+#: ppdc/sample.c:411
 msgid "40"
 msgstr ""
 
-#: ppdc/sample.c:340
+#: ppdc/sample.c:331
 msgid "40 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:421
+#: ppdc/sample.c:412
 msgid "45"
 msgstr ""
 
-#: ppdc/sample.c:325
+#: ppdc/sample.c:316
 msgid "5"
 msgstr ""
 
-#: ppdc/sample.c:446
+#: ppdc/sample.c:437
 msgid "5 inches/sec."
 msgstr ""
 
@@ -2368,79 +2297,79 @@ msgstr ""
 msgid "5 x 7"
 msgstr ""
 
-#: ppdc/sample.c:422
+#: ppdc/sample.c:413
 msgid "50"
 msgstr ""
 
-#: ppdc/sample.c:423
+#: ppdc/sample.c:414
 msgid "55"
 msgstr ""
 
-#: ppdc/sample.c:326
+#: ppdc/sample.c:317
 msgid "6"
 msgstr ""
 
-#: ppdc/sample.c:447
+#: ppdc/sample.c:438
 msgid "6 inches/sec."
 msgstr ""
 
-#: ppdc/sample.c:224
+#: ppdc/sample.c:215
 msgid "6.00x1.00\""
 msgstr ""
 
-#: ppdc/sample.c:225
+#: ppdc/sample.c:216
 msgid "6.00x2.00\""
 msgstr ""
 
-#: ppdc/sample.c:226
+#: ppdc/sample.c:217
 msgid "6.00x3.00\""
 msgstr ""
 
-#: ppdc/sample.c:227
+#: ppdc/sample.c:218
 msgid "6.00x4.00\""
 msgstr ""
 
-#: ppdc/sample.c:228
+#: ppdc/sample.c:219
 msgid "6.00x5.00\""
 msgstr ""
 
-#: ppdc/sample.c:229
+#: ppdc/sample.c:220
 msgid "6.00x6.00\""
 msgstr ""
 
-#: ppdc/sample.c:230
+#: ppdc/sample.c:221
 msgid "6.00x6.50\""
 msgstr ""
 
-#: ppdc/sample.c:424
+#: ppdc/sample.c:415
 msgid "60"
 msgstr ""
 
-#: ppdc/sample.c:341
+#: ppdc/sample.c:332
 msgid "60 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:270
+#: ppdc/sample.c:261
 msgid "600dpi"
 msgstr ""
 
-#: ppdc/sample.c:251
+#: ppdc/sample.c:242
 msgid "60dpi"
 msgstr ""
 
-#: ppdc/sample.c:257
+#: ppdc/sample.c:248
 msgid "60x72dpi"
 msgstr ""
 
-#: ppdc/sample.c:425
+#: ppdc/sample.c:416
 msgid "65"
 msgstr ""
 
-#: ppdc/sample.c:327
+#: ppdc/sample.c:318
 msgid "7"
 msgstr ""
 
-#: ppdc/sample.c:449
+#: ppdc/sample.c:440
 msgid "7 inches/sec."
 msgstr ""
 
@@ -2448,23 +2377,23 @@ msgstr ""
 msgid "7 x 9"
 msgstr ""
 
-#: ppdc/sample.c:426
+#: ppdc/sample.c:417
 msgid "70"
 msgstr ""
 
-#: ppdc/sample.c:261
+#: ppdc/sample.c:252
 msgid "720dpi"
 msgstr ""
 
-#: ppdc/sample.c:427
+#: ppdc/sample.c:418
 msgid "75"
 msgstr ""
 
-#: ppdc/sample.c:328
+#: ppdc/sample.c:319
 msgid "8"
 msgstr ""
 
-#: ppdc/sample.c:450
+#: ppdc/sample.c:441
 msgid "8 inches/sec."
 msgstr ""
 
@@ -2472,51 +2401,51 @@ msgstr ""
 msgid "8 x 10"
 msgstr ""
 
-#: ppdc/sample.c:231
+#: ppdc/sample.c:222
 msgid "8.00x1.00\""
 msgstr ""
 
-#: ppdc/sample.c:232
+#: ppdc/sample.c:223
 msgid "8.00x2.00\""
 msgstr ""
 
-#: ppdc/sample.c:233
+#: ppdc/sample.c:224
 msgid "8.00x3.00\""
 msgstr ""
 
-#: ppdc/sample.c:234
+#: ppdc/sample.c:225
 msgid "8.00x4.00\""
 msgstr ""
 
-#: ppdc/sample.c:235
+#: ppdc/sample.c:226
 msgid "8.00x5.00\""
 msgstr ""
 
-#: ppdc/sample.c:236
+#: ppdc/sample.c:227
 msgid "8.00x6.00\""
 msgstr ""
 
-#: ppdc/sample.c:237
+#: ppdc/sample.c:228
 msgid "8.00x6.50\""
 msgstr ""
 
-#: ppdc/sample.c:428
+#: ppdc/sample.c:419
 msgid "80"
 msgstr ""
 
-#: ppdc/sample.c:342
+#: ppdc/sample.c:333
 msgid "80 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:429
+#: ppdc/sample.c:420
 msgid "85"
 msgstr ""
 
-#: ppdc/sample.c:329
+#: ppdc/sample.c:320
 msgid "9"
 msgstr ""
 
-#: ppdc/sample.c:451
+#: ppdc/sample.c:442
 msgid "9 inches/sec."
 msgstr ""
 
@@ -2528,15 +2457,15 @@ msgstr ""
 msgid "9 x 12"
 msgstr ""
 
-#: ppdc/sample.c:256
+#: ppdc/sample.c:247
 msgid "9-Pin Series"
 msgstr ""
 
-#: ppdc/sample.c:430
+#: ppdc/sample.c:421
 msgid "90"
 msgstr ""
 
-#: ppdc/sample.c:431
+#: ppdc/sample.c:422
 msgid "95"
 msgstr ""
 
@@ -2544,11 +2473,11 @@ msgstr ""
 msgid "?Invalid help command unknown."
 msgstr ""
 
-#: cgi-bin/admin.c:2349
+#: cgi-bin/admin.c:2368
 msgid "A Samba password is required to export printer drivers"
 msgstr ""
 
-#: cgi-bin/admin.c:2345
+#: cgi-bin/admin.c:2364
 msgid "A Samba username is required to export printer drivers"
 msgstr ""
 
@@ -2702,7 +2631,7 @@ msgstr ""
 msgid "Accept Jobs"
 msgstr ""
 
-#: cups/http-support.c:1257
+#: cups/http-support.c:1284
 msgid "Accepted"
 msgstr ""
 
@@ -2723,15 +2652,11 @@ msgstr ""
 msgid "Address"
 msgstr ""
 
-#: ppdc/sample.c:172
-msgid "Address - 1 1/8 x 3 1/2\""
-msgstr ""
-
-#: cgi-bin/admin.c:210 cgi-bin/admin.c:284 cgi-bin/admin.c:2723
+#: cgi-bin/admin.c:210 cgi-bin/admin.c:284 cgi-bin/admin.c:2745
 msgid "Administration"
 msgstr ""
 
-#: ppdc/sample.c:438
+#: ppdc/sample.c:429
 msgid "Always"
 msgstr ""
 
@@ -2739,7 +2664,7 @@ msgstr ""
 msgid "AppSocket/HP JetDirect"
 msgstr ""
 
-#: ppdc/sample.c:459
+#: ppdc/sample.c:450
 msgid "Applicator"
 msgstr ""
 
@@ -2801,7 +2726,7 @@ msgstr ""
 msgid "B9"
 msgstr ""
 
-#: cups/dest.c:1536
+#: cups/dest.c:1533
 msgid "Bad NULL dests pointer"
 msgstr ""
 
@@ -2830,7 +2755,7 @@ msgstr ""
 msgid "Bad PPD cache file."
 msgstr ""
 
-#: cups/http-support.c:1272
+#: cups/http-support.c:1299
 msgid "Bad Request"
 msgstr ""
 
@@ -2851,7 +2776,7 @@ msgstr ""
 msgid "Bad custom parameter"
 msgstr ""
 
-#: cups/http-support.c:1424 scheduler/ipp.c:2362
+#: cups/http-support.c:1451 scheduler/ipp.c:2362
 #, c-format
 msgid "Bad device-uri \"%s\"."
 msgstr ""
@@ -2931,7 +2856,7 @@ msgstr ""
 msgid "Bad port-monitor \"%s\"."
 msgstr ""
 
-#: cups/dest.c:626 cups/dest.c:1189
+#: cups/dest.c:621 cups/dest.c:1186
 msgid "Bad printer URI."
 msgstr ""
 
@@ -2958,11 +2883,11 @@ msgstr ""
 msgid "Bad value string"
 msgstr ""
 
-#: cgi-bin/admin.c:3268 cgi-bin/admin.c:3514
+#: cgi-bin/admin.c:3290 cgi-bin/admin.c:3536
 msgid "Banners"
 msgstr ""
 
-#: ppdc/sample.c:296
+#: ppdc/sample.c:287
 msgid "Bond Paper"
 msgstr ""
 
@@ -2975,11 +2900,11 @@ msgstr ""
 msgid "Buffer overflow detected, aborting."
 msgstr ""
 
-#: ppdc/sample.c:263
+#: ppdc/sample.c:254
 msgid "CMYK"
 msgstr ""
 
-#: ppdc/sample.c:372
+#: ppdc/sample.c:363
 msgid "CPCL Label Printer"
 msgstr ""
 
@@ -2987,7 +2912,7 @@ msgstr ""
 msgid "Cancel RSS Subscription"
 msgstr ""
 
-#: backend/ipp.c:1903
+#: backend/ipp.c:1908
 msgid "Canceling print job."
 msgstr ""
 
@@ -2995,12 +2920,12 @@ msgstr ""
 msgid "Cannot share a remote Kerberized printer."
 msgstr ""
 
-#: ppdc/sample.c:288
+#: ppdc/sample.c:279
 msgid "Cassette"
 msgstr ""
 
-#: cgi-bin/admin.c:1636 cgi-bin/admin.c:1778 cgi-bin/admin.c:1791
-#: cgi-bin/admin.c:1802
+#: cgi-bin/admin.c:1655 cgi-bin/admin.c:1797 cgi-bin/admin.c:1810
+#: cgi-bin/admin.c:1821
 msgid "Change Settings"
 msgstr ""
 
@@ -3021,11 +2946,11 @@ msgstr ""
 msgid "Close-Job doesn't support the job-uri attribute."
 msgstr ""
 
-#: ppdc/sample.c:291
+#: ppdc/sample.c:282
 msgid "Color"
 msgstr ""
 
-#: ppdc/sample.c:262
+#: ppdc/sample.c:253
 msgid "Color Mode"
 msgstr ""
 
@@ -3040,19 +2965,19 @@ msgstr ""
 msgid "Community name uses indefinite length"
 msgstr ""
 
-#: backend/ipp.c:779 backend/lpd.c:871 backend/socket.c:395
+#: backend/ipp.c:784 backend/lpd.c:871 backend/socket.c:395
 msgid "Connected to printer."
 msgstr ""
 
-#: backend/ipp.c:686 backend/lpd.c:694 backend/socket.c:314
+#: backend/ipp.c:689 backend/lpd.c:694 backend/socket.c:314
 msgid "Connecting to printer."
 msgstr ""
 
-#: cups/http-support.c:1245
+#: cups/http-support.c:1272
 msgid "Continue"
 msgstr ""
 
-#: ppdc/sample.c:374
+#: ppdc/sample.c:365
 msgid "Continuous"
 msgstr ""
 
@@ -3060,11 +2985,11 @@ msgstr ""
 msgid "Control file sent successfully."
 msgstr ""
 
-#: backend/ipp.c:1223 backend/lpd.c:464
+#: backend/ipp.c:1226 backend/lpd.c:464
 msgid "Copying print data."
 msgstr ""
 
-#: cups/http-support.c:1254
+#: cups/http-support.c:1281
 msgid "Created"
 msgstr ""
 
@@ -3072,27 +2997,27 @@ msgstr ""
 msgid "Custom"
 msgstr ""
 
-#: ppdc/sample.c:368
+#: ppdc/sample.c:359
 msgid "CustominCutInterval"
 msgstr ""
 
-#: ppdc/sample.c:366
+#: ppdc/sample.c:357
 msgid "CustominTearInterval"
 msgstr ""
 
-#: ppdc/sample.c:352
+#: ppdc/sample.c:343
 msgid "Cut"
 msgstr ""
 
-#: ppdc/sample.c:460
+#: ppdc/sample.c:451
 msgid "Cutter"
 msgstr ""
 
-#: ppdc/sample.c:248
+#: ppdc/sample.c:239
 msgid "Dark"
 msgstr ""
 
-#: ppdc/sample.c:244
+#: ppdc/sample.c:235
 msgid "Darkness"
 msgstr ""
 
@@ -3100,15 +3025,15 @@ msgstr ""
 msgid "Data file sent successfully."
 msgstr ""
 
-#: cgi-bin/admin.c:2075 cgi-bin/admin.c:2086 cgi-bin/admin.c:2131
+#: cgi-bin/admin.c:2094 cgi-bin/admin.c:2105 cgi-bin/admin.c:2150
 msgid "Delete Class"
 msgstr ""
 
-#: cgi-bin/admin.c:2160 cgi-bin/admin.c:2171 cgi-bin/admin.c:2216
+#: cgi-bin/admin.c:2179 cgi-bin/admin.c:2190 cgi-bin/admin.c:2235
 msgid "Delete Printer"
 msgstr ""
 
-#: ppdc/sample.c:290
+#: ppdc/sample.c:281
 msgid "DeskJet Series"
 msgstr ""
 
@@ -3128,7 +3053,7 @@ msgid ""
 "        location = %s"
 msgstr ""
 
-#: ppdc/sample.c:445
+#: ppdc/sample.c:436
 msgid "Direct Thermal Media"
 msgstr ""
 
@@ -3157,7 +3082,7 @@ msgstr ""
 msgid "Directory \"%s\" permissions OK (0%o/uid=%d/gid=%d)."
 msgstr ""
 
-#: ppdc/sample.c:354
+#: ppdc/sample.c:345
 msgid "Disabled"
 msgstr ""
 
@@ -3166,25 +3091,25 @@ msgstr ""
 msgid "Document #%d does not exist in job #%d."
 msgstr ""
 
-#: ppdc/sample.c:284
+#: ppdc/sample.c:275
 msgid "Duplexer"
 msgstr ""
 
-#: ppdc/sample.c:238
+#: ppdc/sample.c:229
 msgid "Dymo"
 msgstr ""
 
-#: ppdc/sample.c:440
+#: ppdc/sample.c:431
 msgid "EPL1 Label Printer"
 msgstr ""
 
-#: ppdc/sample.c:443
+#: ppdc/sample.c:434
 msgid "EPL2 Label Printer"
 msgstr ""
 
-#: cgi-bin/admin.c:1830 cgi-bin/admin.c:1842 cgi-bin/admin.c:1896
-#: cgi-bin/admin.c:1903 cgi-bin/admin.c:1938 cgi-bin/admin.c:1951
-#: cgi-bin/admin.c:1975 cgi-bin/admin.c:2048
+#: 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 ""
 
@@ -3193,7 +3118,7 @@ msgid "Empty PPD file."
 msgstr ""
 
 #. TRANSLATORS: Banner/cover sheet after the print job.
-#: cgi-bin/admin.c:3539
+#: cgi-bin/admin.c:3561
 msgid "Ending Banner"
 msgstr ""
 
@@ -3213,7 +3138,7 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: scheduler/client.c:2498
+#: 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 ""
 
@@ -3305,7 +3230,7 @@ msgstr ""
 msgid "Envelope DL"
 msgstr ""
 
-#: ppdc/sample.c:278
+#: ppdc/sample.c:269
 msgid "Envelope Feed"
 msgstr ""
 
@@ -3429,11 +3354,11 @@ msgstr ""
 msgid "Envelope You4 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:249
+#: ppdc/sample.c:240
 msgid "Epson"
 msgstr ""
 
-#: cgi-bin/admin.c:3582
+#: cgi-bin/admin.c:3604
 msgid "Error Policy"
 msgstr ""
 
@@ -3446,43 +3371,43 @@ msgstr ""
 msgid "Error: need hostname after \"-h\" option."
 msgstr ""
 
-#: ppdc/sample.c:364
+#: ppdc/sample.c:355
 msgid "Every 10 Labels"
 msgstr ""
 
-#: ppdc/sample.c:356
+#: ppdc/sample.c:347
 msgid "Every 2 Labels"
 msgstr ""
 
-#: ppdc/sample.c:357
+#: ppdc/sample.c:348
 msgid "Every 3 Labels"
 msgstr ""
 
-#: ppdc/sample.c:358
+#: ppdc/sample.c:349
 msgid "Every 4 Labels"
 msgstr ""
 
-#: ppdc/sample.c:359
+#: ppdc/sample.c:350
 msgid "Every 5 Labels"
 msgstr ""
 
-#: ppdc/sample.c:360
+#: ppdc/sample.c:351
 msgid "Every 6 Labels"
 msgstr ""
 
-#: ppdc/sample.c:361
+#: ppdc/sample.c:352
 msgid "Every 7 Labels"
 msgstr ""
 
-#: ppdc/sample.c:362
+#: ppdc/sample.c:353
 msgid "Every 8 Labels"
 msgstr ""
 
-#: ppdc/sample.c:363
+#: ppdc/sample.c:354
 msgid "Every 9 Labels"
 msgstr ""
 
-#: ppdc/sample.c:355
+#: ppdc/sample.c:346
 msgid "Every Label"
 msgstr ""
 
@@ -3490,11 +3415,11 @@ msgstr ""
 msgid "Executive"
 msgstr ""
 
-#: cups/http-support.c:1300
+#: cups/http-support.c:1327
 msgid "Expectation Failed"
 msgstr ""
 
-#: cgi-bin/admin.c:2337 cgi-bin/admin.c:2356
+#: cgi-bin/admin.c:2356 cgi-bin/admin.c:2375
 msgid "Export Printers to Samba"
 msgstr ""
 
@@ -3546,11 +3471,7 @@ msgid "File \"%s\" permissions OK (0%o/uid=%d/gid=%d)."
 msgstr ""
 
 #: ppdc/sample.c:169
-msgid "File Folder"
-msgstr ""
-
-#: ppdc/sample.c:178
-msgid "File Folder - 9/16 x 3 7/16\""
+msgid "File Folder "
 msgstr ""
 
 #: scheduler/ipp.c:2382
@@ -3568,7 +3489,7 @@ msgstr ""
 msgid "Folio"
 msgstr ""
 
-#: cups/http-support.c:1279
+#: cups/http-support.c:1306
 msgid "Forbidden"
 msgstr ""
 
@@ -3576,7 +3497,7 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: ppdc/sample.c:268
+#: ppdc/sample.c:259
 msgid "Generic"
 msgstr ""
 
@@ -3584,7 +3505,7 @@ msgstr ""
 msgid "Get-Response-PDU uses indefinite length"
 msgstr ""
 
-#: ppdc/sample.c:299
+#: ppdc/sample.c:290
 msgid "Glossy Paper"
 msgstr ""
 
@@ -3595,11 +3516,11 @@ msgstr ""
 msgid "Got a printer-uri attribute but no job-id."
 msgstr ""
 
-#: ppdc/sample.c:264
+#: ppdc/sample.c:255
 msgid "Grayscale"
 msgstr ""
 
-#: ppdc/sample.c:289
+#: ppdc/sample.c:280
 msgid "HP"
 msgstr ""
 
@@ -3607,83 +3528,83 @@ msgstr ""
 msgid "Hanging Folder"
 msgstr ""
 
-#: ppdc/sample.c:179
-msgid "Hanging Folder - 9/16 x 2\""
+#: cgi-bin/help.c:143
+msgid "Help file not in index."
 msgstr ""
 
-#: cups/ipp.c:2677 cups/ipp.c:2704 cups/ipp.c:2727
+#: cups/ipp.c:2687 cups/ipp.c:2714 cups/ipp.c:2737
 msgid "IPP 1setOf attribute with incompatible value tags."
 msgstr ""
 
-#: cups/ipp.c:2640
+#: cups/ipp.c:2650
 msgid "IPP attribute has no name."
 msgstr ""
 
-#: cups/ipp.c:5519
+#: cups/ipp.c:5525
 msgid "IPP attribute is not a member of the message."
 msgstr ""
 
-#: cups/ipp.c:3067
+#: cups/ipp.c:3077
 msgid "IPP begCollection value not 0 bytes."
 msgstr ""
 
-#: cups/ipp.c:2863
+#: cups/ipp.c:2873
 msgid "IPP boolean value not 1 byte."
 msgstr ""
 
-#: cups/ipp.c:2921
+#: cups/ipp.c:2931
 msgid "IPP date value not 11 bytes."
 msgstr ""
 
-#: cups/ipp.c:3088
+#: cups/ipp.c:3098
 msgid "IPP endCollection value not 0 bytes."
 msgstr ""
 
-#: cups/ipp.c:2838
+#: cups/ipp.c:2848
 msgid "IPP enum value not 4 bytes."
 msgstr ""
 
-#: cups/ipp.c:2569
+#: cups/ipp.c:2579
 msgid "IPP extension tag larger than 0x7FFFFFFF."
 msgstr ""
 
-#: cups/ipp.c:2835
+#: cups/ipp.c:2845
 msgid "IPP integer value not 4 bytes."
 msgstr ""
 
-#: cups/ipp.c:3030
+#: cups/ipp.c:3040
 msgid "IPP language length overflows value."
 msgstr ""
 
-#: cups/ipp.c:2754
+#: cups/ipp.c:2764
 msgid "IPP member name is not empty."
 msgstr ""
 
-#: cups/ipp.c:2623
+#: cups/ipp.c:2633
 msgid "IPP name larger than 32767 bytes."
 msgstr ""
 
-#: cups/ipp.c:2997
+#: cups/ipp.c:3007
 msgid "IPP nameWithLanguage value less than minimum 4 bytes."
 msgstr ""
 
-#: cups/ipp.c:2966
+#: cups/ipp.c:2976
 msgid "IPP rangeOfInteger value not 8 bytes."
 msgstr ""
 
-#: cups/ipp.c:2939
+#: cups/ipp.c:2949
 msgid "IPP resolution value not 9 bytes."
 msgstr ""
 
-#: cups/ipp.c:3047
+#: cups/ipp.c:3057
 msgid "IPP string length overflows value."
 msgstr ""
 
-#: cups/ipp.c:2993
+#: cups/ipp.c:3003
 msgid "IPP textWithLanguage value less than minimum 4 bytes."
 msgstr ""
 
-#: cups/ipp.c:2821
+#: cups/ipp.c:2831
 msgid "IPP value larger than 32767 bytes."
 msgstr ""
 
@@ -3711,23 +3632,23 @@ msgstr ""
 msgid "Illegal whitespace character"
 msgstr ""
 
-#: ppdc/sample.c:283
+#: ppdc/sample.c:274
 msgid "Installable Options"
 msgstr ""
 
-#: ppdc/sample.c:286
+#: ppdc/sample.c:277
 msgid "Installed"
 msgstr ""
 
-#: ppdc/sample.c:302
+#: ppdc/sample.c:293
 msgid "IntelliBar Label Printer"
 msgstr ""
 
-#: ppdc/sample.c:301
+#: ppdc/sample.c:292
 msgid "Intellitech"
 msgstr ""
 
-#: cups/http-support.c:1306
+#: cups/http-support.c:1333
 msgid "Internal Server Error"
 msgstr ""
 
@@ -3739,18 +3660,10 @@ msgstr ""
 msgid "Internet Postage 2-Part"
 msgstr ""
 
-#: ppdc/sample.c:176
-msgid "Internet Postage 2-Part - 2 1/4 x 7 1/2\""
-msgstr ""
-
 #: ppdc/sample.c:168
 msgid "Internet Postage 3-Part"
 msgstr ""
 
-#: ppdc/sample.c:177
-msgid "Internet Postage 3-Part - 2 1/4 x 7\""
-msgstr ""
-
 #: backend/ipp.c:305
 msgid "Internet Printing Protocol"
 msgstr ""
@@ -3895,7 +3808,7 @@ msgid "Job is completed and cannot be changed."
 msgstr ""
 
 #: cgi-bin/jobs.c:198
-msgid "Job operation failed:"
+msgid "Job operation failed"
 msgstr ""
 
 #: scheduler/ipp.c:10798 scheduler/ipp.c:10817 scheduler/ipp.c:10828
@@ -3914,11 +3827,11 @@ msgstr ""
 msgid "LPD/LPR Host or Printer"
 msgstr ""
 
-#: ppdc/sample.c:239
+#: ppdc/sample.c:230
 msgid "Label Printer"
 msgstr ""
 
-#: ppdc/sample.c:455
+#: ppdc/sample.c:446
 msgid "Label Top"
 msgstr ""
 
@@ -3931,11 +3844,7 @@ msgstr ""
 msgid "Large Address"
 msgstr ""
 
-#: ppdc/sample.c:173
-msgid "Large Address - 1 4/10 x 3 1/2\""
-msgstr ""
-
-#: ppdc/sample.c:300
+#: ppdc/sample.c:291
 msgid "LaserJet Series PCL 4/5"
 msgstr ""
 
@@ -3947,7 +3856,7 @@ msgstr ""
 msgid "Letter Oversize Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:245
+#: ppdc/sample.c:236
 msgid "Light"
 msgstr ""
 
@@ -3955,19 +3864,19 @@ msgstr ""
 msgid "Line longer than the maximum allowed (255 characters)"
 msgstr ""
 
-#: cgi-bin/admin.c:2374
+#: cgi-bin/admin.c:2393
 msgid "List Available Printers"
 msgstr ""
 
-#: ppdc/sample.c:281
+#: ppdc/sample.c:272
 msgid "Long-Edge (Portrait)"
 msgstr ""
 
-#: cups/http-support.c:1525
+#: cups/http-support.c:1558
 msgid "Looking for printer."
 msgstr ""
 
-#: ppdc/sample.c:277
+#: ppdc/sample.c:268
 msgid "Manual Feed"
 msgstr ""
 
@@ -3975,19 +3884,19 @@ msgstr ""
 msgid "Media Size"
 msgstr ""
 
-#: cups/ppd.c:793 cups/ppd.c:1361 ppdc/sample.c:271
+#: cups/ppd.c:793 cups/ppd.c:1361 ppdc/sample.c:262
 msgid "Media Source"
 msgstr ""
 
-#: ppdc/sample.c:373
+#: ppdc/sample.c:364
 msgid "Media Tracking"
 msgstr ""
 
-#: cups/ppd.c:791 cups/ppd.c:1359 ppdc/sample.c:294
+#: cups/ppd.c:791 cups/ppd.c:1359 ppdc/sample.c:285
 msgid "Media Type"
 msgstr ""
 
-#: ppdc/sample.c:246
+#: ppdc/sample.c:237
 msgid "Medium"
 msgstr ""
 
@@ -4016,9 +3925,9 @@ msgstr ""
 msgid "Missing double quote on line %d."
 msgstr ""
 
-#: cgi-bin/admin.c:736 cgi-bin/admin.c:2087 cgi-bin/admin.c:2172
-#: cgi-bin/admin.c:2763 cgi-bin/admin.c:3017 cgi-bin/admin.c:3128
-#: cgi-bin/admin.c:3838
+#: 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 ""
 
@@ -4026,11 +3935,11 @@ msgstr ""
 msgid "Missing last-document attribute in request."
 msgstr ""
 
-#: cups/pwg-media.c:473
+#: cups/pwg-media.c:474
 msgid "Missing media or media-col."
 msgstr ""
 
-#: cups/pwg-media.c:392
+#: cups/pwg-media.c:393
 msgid "Missing media-size in media-col."
 msgstr ""
 
@@ -4059,11 +3968,11 @@ msgstr ""
 msgid "Missing value string"
 msgstr ""
 
-#: cups/pwg-media.c:380
+#: cups/pwg-media.c:381
 msgid "Missing x-dimension in media-size."
 msgstr ""
 
-#: cups/pwg-media.c:386
+#: cups/pwg-media.c:387
 msgid "Missing y-dimension in media-size."
 msgstr ""
 
@@ -4092,7 +4001,7 @@ msgstr ""
 msgid "Move Job"
 msgstr ""
 
-#: cups/http-support.c:1263
+#: cups/http-support.c:1290
 msgid "Moved Permanently"
 msgstr ""
 
@@ -4108,15 +4017,15 @@ msgstr ""
 msgid "Nested classes are not allowed."
 msgstr ""
 
-#: ppdc/sample.c:439
+#: ppdc/sample.c:430
 msgid "Never"
 msgstr ""
 
-#: ppdc/sample.c:265
+#: ppdc/sample.c:256
 msgid "New Stylus Color Series"
 msgstr ""
 
-#: ppdc/sample.c:267
+#: ppdc/sample.c:258
 msgid "New Stylus Photo Series"
 msgstr ""
 
@@ -4124,7 +4033,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: cups/http-support.c:1260
+#: cups/http-support.c:1287
 msgid "No Content"
 msgstr ""
 
@@ -4140,7 +4049,7 @@ msgstr ""
 msgid "No Windows printer drivers are installed."
 msgstr ""
 
-#: cups/request.c:571 cups/request.c:914
+#: cups/request.c:571 cups/request.c:913
 msgid "No active connection"
 msgstr ""
 
@@ -4234,35 +4143,35 @@ msgstr ""
 msgid "No version number"
 msgstr ""
 
-#: ppdc/sample.c:376
+#: ppdc/sample.c:367
 msgid "Non-continuous (Mark sensing)"
 msgstr ""
 
-#: ppdc/sample.c:375
+#: ppdc/sample.c:366
 msgid "Non-continuous (Web sensing)"
 msgstr ""
 
-#: ppdc/sample.c:247
+#: ppdc/sample.c:238
 msgid "Normal"
 msgstr ""
 
-#: cups/http-support.c:1282
+#: cups/http-support.c:1309
 msgid "Not Found"
 msgstr ""
 
-#: cups/http-support.c:1294
+#: cups/http-support.c:1321
 msgid "Not Implemented"
 msgstr ""
 
-#: ppdc/sample.c:285
+#: ppdc/sample.c:276
 msgid "Not Installed"
 msgstr ""
 
-#: cups/http-support.c:1269
+#: cups/http-support.c:1296
 msgid "Not Modified"
 msgstr ""
 
-#: cups/http-support.c:1297
+#: cups/http-support.c:1324
 msgid "Not Supported"
 msgstr ""
 
@@ -4278,19 +4187,19 @@ msgstr ""
 msgid "Note: this program only validates the DSC comments, not the PostScript itself."
 msgstr ""
 
-#: cups/http-support.c:1251 cups/ppd.c:338
+#: cups/http-support.c:1278 cups/ppd.c:338
 msgid "OK"
 msgstr ""
 
-#: ppdc/sample.c:280
+#: ppdc/sample.c:271
 msgid "Off (1-Sided)"
 msgstr ""
 
-#: ppdc/sample.c:370
+#: ppdc/sample.c:361
 msgid "Oki"
 msgstr ""
 
-#: cgi-bin/help.c:90 cgi-bin/help.c:131 cgi-bin/help.c:141 cgi-bin/help.c:172
+#: cgi-bin/help.c:91 cgi-bin/help.c:132 cgi-bin/help.c:142 cgi-bin/help.c:172
 msgid "Online Help"
 msgstr ""
 
@@ -4307,7 +4216,7 @@ msgstr ""
 msgid "OpenUI/JCLOpenUI without a CloseUI/JCLCloseUI first"
 msgstr ""
 
-#: cgi-bin/admin.c:3609
+#: cgi-bin/admin.c:3631
 msgid "Operation Policy"
 msgstr ""
 
@@ -4316,15 +4225,14 @@ msgstr ""
 msgid "Option \"%s\" cannot be included via %%%%IncludeFeature."
 msgstr ""
 
-#: cgi-bin/admin.c:3259 cgi-bin/admin.c:3343
+#: cgi-bin/admin.c:3281 cgi-bin/admin.c:3365
 msgid "Options Installed"
 msgstr ""
 
-#: scheduler/cupsfilter.c:1438 scheduler/cupsfilter.c:1465
-#: scheduler/main.c:2019 systemv/cupsaddsmb.c:284 systemv/cupsctl.c:203
-#: systemv/cupstestdsc.c:429 systemv/cupstestppd.c:3796 test/ipptool.c:4336
-#: ppdc/ppdc.cxx:437 ppdc/ppdhtml.cxx:174 ppdc/ppdi.cxx:130
-#: ppdc/ppdmerge.cxx:369 ppdc/ppdpo.cxx:254
+#: 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:4336 ppdc/ppdc.cxx:437 ppdc/ppdhtml.cxx:174
+#: ppdc/ppdi.cxx:130 ppdc/ppdmerge.cxx:369 ppdc/ppdpo.cxx:254
 msgid "Options:"
 msgstr ""
 
@@ -4364,7 +4272,7 @@ msgstr ""
 msgid "PASS"
 msgstr ""
 
-#: ppdc/sample.c:269
+#: ppdc/sample.c:260
 msgid "PCL Laser Printer"
 msgstr ""
 
@@ -4400,11 +4308,11 @@ msgstr ""
 msgid "Packet does not start with SEQUENCE"
 msgstr ""
 
-#: ppdc/sample.c:369
+#: ppdc/sample.c:360
 msgid "ParamCustominCutInterval"
 msgstr ""
 
-#: ppdc/sample.c:367
+#: ppdc/sample.c:358
 msgid "ParamCustominTearInterval"
 msgstr ""
 
@@ -4426,7 +4334,7 @@ msgstr ""
 msgid "Pause Printer"
 msgstr ""
 
-#: ppdc/sample.c:457
+#: ppdc/sample.c:448
 msgid "Peel-Off"
 msgstr ""
 
@@ -4438,19 +4346,19 @@ msgstr ""
 msgid "Photo Labels"
 msgstr ""
 
-#: ppdc/sample.c:295
+#: ppdc/sample.c:286
 msgid "Plain Paper"
 msgstr ""
 
-#: cgi-bin/admin.c:3277 cgi-bin/admin.c:3558
+#: cgi-bin/admin.c:3299 cgi-bin/admin.c:3580
 msgid "Policies"
 msgstr ""
 
-#: cgi-bin/admin.c:3284 cgi-bin/admin.c:3627 cgi-bin/admin.c:3640
+#: cgi-bin/admin.c:3306 cgi-bin/admin.c:3649 cgi-bin/admin.c:3662
 msgid "Port Monitor"
 msgstr ""
 
-#: ppdc/sample.c:287
+#: ppdc/sample.c:278
 msgid "PostScript Printer"
 msgstr ""
 
@@ -4470,7 +4378,7 @@ msgstr ""
 msgid "Postcard Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:304
+#: ppdc/sample.c:295
 msgid "Print Density"
 msgstr ""
 
@@ -4478,11 +4386,11 @@ msgstr ""
 msgid "Print Job:"
 msgstr ""
 
-#: ppdc/sample.c:349
+#: ppdc/sample.c:340
 msgid "Print Mode"
 msgstr ""
 
-#: ppdc/sample.c:392
+#: ppdc/sample.c:383
 msgid "Print Rate"
 msgstr ""
 
@@ -4490,7 +4398,7 @@ msgstr ""
 msgid "Print Self-Test Page"
 msgstr ""
 
-#: ppdc/sample.c:336
+#: ppdc/sample.c:327
 msgid "Print Speed"
 msgstr ""
 
@@ -4498,32 +4406,36 @@ msgstr ""
 msgid "Print Test Page"
 msgstr ""
 
-#: ppdc/sample.c:365
+#: ppdc/sample.c:356
 msgid "Print and Cut"
 msgstr ""
 
-#: ppdc/sample.c:353
+#: ppdc/sample.c:344
 msgid "Print and Tear"
 msgstr ""
 
-#: backend/ipp.c:1523
+#: backend/ipp.c:1526
 #, c-format
 msgid "Print file accepted - job ID %d."
 msgstr ""
 
-#: backend/ipp.c:1513
+#: backend/ipp.c:1516
 msgid "Print file accepted - job ID unknown."
 msgstr ""
 
-#: backend/socket.c:424 backend/usb-unix.c:195
+#: backend/socket.c:424 backend/usb-unix.c:191
 msgid "Print file sent."
 msgstr ""
 
-#: backend/ipp.c:1474
+#: backend/ipp.c:1477
 msgid "Print file was not accepted."
 msgstr ""
 
-#: backend/ipp.c:1875
+#: backend/ipp.c:1882
+msgid "Print job canceled at printer."
+msgstr ""
+
+#: backend/ipp.c:1880
 msgid "Print job too large."
 msgstr ""
 
@@ -4531,7 +4443,7 @@ msgstr ""
 msgid "Printer Added"
 msgstr ""
 
-#: ppdc/sample.c:272
+#: ppdc/sample.c:263
 msgid "Printer Default"
 msgstr ""
 
@@ -4547,47 +4459,10 @@ msgstr ""
 msgid "Printer Paused"
 msgstr ""
 
-#: ppdc/sample.c:303
+#: ppdc/sample.c:294
 msgid "Printer Settings"
 msgstr ""
 
-#: backend/usb-unix.c:132
-msgid "Printer busy, will retry in 10 seconds."
-msgstr ""
-
-#: backend/lpd.c:619 backend/lpd.c:1009 backend/lpd.c:1091 backend/lpd.c:1141
-msgid "Printer did not respond."
-msgstr ""
-
-#: backend/ipp.c:885 backend/ipp.c:892
-#, c-format
-msgid "Printer does not support IPP/%d.%d, trying IPP/%s."
-msgstr ""
-
-#: backend/usb-unix.c:429 backend/usb-unix.c:513
-msgid "Printer is busy, will retry in 5 seconds."
-msgstr ""
-
-#: backend/runloop.c:253 backend/runloop.c:371
-msgid "Printer is not currently connected."
-msgstr ""
-
-#: backend/runloop.c:392
-msgid "Printer is now connected."
-msgstr ""
-
-#: backend/usb-darwin.c:1286
-msgid "Printer is now online."
-msgstr ""
-
-#: backend/usb-darwin.c:1307
-msgid "Printer is offline."
-msgstr ""
-
-#: backend/usb-unix.c:139
-msgid "Printer not connected, will retry in 30 seconds."
-msgstr ""
-
 #: cups/notify.c:126
 msgid "Printer:"
 msgstr ""
@@ -4623,11 +4498,6 @@ msgstr ""
 msgid "Rank   Owner      Pri  Job        Files                       Total Size"
 msgstr ""
 
-#: backend/ipp.c:1882 backend/socket.c:475 filter/rastertoepson.c:1152
-#: filter/rastertohp.c:881 filter/rastertolabel.c:1307
-msgid "Ready to print."
-msgstr ""
-
 #: cgi-bin/classes.c:171 cgi-bin/printers.c:174
 msgid "Reject Jobs"
 msgstr ""
@@ -4642,15 +4512,15 @@ msgstr ""
 msgid "Remote host did not accept data file (%d)."
 msgstr ""
 
-#: ppdc/sample.c:437
+#: ppdc/sample.c:428
 msgid "Reprint After Error"
 msgstr ""
 
-#: cups/http-support.c:1285
+#: cups/http-support.c:1312
 msgid "Request Entity Too Large"
 msgstr ""
 
-#: cups/ppd.c:797 cups/ppd.c:1365 ppdc/sample.c:240
+#: cups/ppd.c:797 cups/ppd.c:1365 ppdc/sample.c:231
 msgid "Resolution"
 msgstr ""
 
@@ -4666,11 +4536,7 @@ msgstr ""
 msgid "Return Address"
 msgstr ""
 
-#: ppdc/sample.c:174
-msgid "Return Address - 3/4 x 2\""
-msgstr ""
-
-#: ppdc/sample.c:458
+#: ppdc/sample.c:449
 msgid "Rewind"
 msgstr ""
 
@@ -4683,11 +4549,11 @@ msgstr ""
 msgid "SEQUENCE uses indefinite length"
 msgstr ""
 
-#: cups/http-support.c:1309
+#: cups/http-support.c:1336
 msgid "SSL/TLS Negotiation Error"
 msgstr ""
 
-#: cups/http-support.c:1266
+#: cups/http-support.c:1293
 msgid "See Other"
 msgstr ""
 
@@ -4711,28 +4577,28 @@ msgstr ""
 msgid "Server Stopped"
 msgstr ""
 
-#: cups/http-support.c:1303
+#: cups/http-support.c:1330
 msgid "Service Unavailable"
 msgstr ""
 
-#: cgi-bin/admin.c:2764 cgi-bin/admin.c:2810 cgi-bin/admin.c:2967
-#: cgi-bin/admin.c:2986
+#: 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:3013
+#: cgi-bin/admin.c:3035
 msgid "Set As Server Default"
 msgstr ""
 
-#: cgi-bin/admin.c:3113
+#: cgi-bin/admin.c:3135
 msgid "Set Class Options"
 msgstr ""
 
-#: cgi-bin/admin.c:3113 cgi-bin/admin.c:3287 cgi-bin/admin.c:3669
+#: cgi-bin/admin.c:3135 cgi-bin/admin.c:3309 cgi-bin/admin.c:3691
 msgid "Set Printer Options"
 msgstr ""
 
-#: cgi-bin/admin.c:3839 cgi-bin/admin.c:3883 cgi-bin/admin.c:3901
+#: cgi-bin/admin.c:3861 cgi-bin/admin.c:3905 cgi-bin/admin.c:3923
 msgid "Set Publishing"
 msgstr ""
 
@@ -4740,15 +4606,11 @@ msgstr ""
 msgid "Shipping Address"
 msgstr ""
 
-#: ppdc/sample.c:175
-msgid "Shipping Address - 2 5/16 x 4\""
-msgstr ""
-
-#: ppdc/sample.c:282
+#: ppdc/sample.c:273
 msgid "Short-Edge (Landscape)"
 msgstr ""
 
-#: ppdc/sample.c:297
+#: ppdc/sample.c:288
 msgid "Special Paper"
 msgstr ""
 
@@ -4757,12 +4619,12 @@ msgstr ""
 msgid "Spooling job, %.0f%% complete."
 msgstr ""
 
-#: ppdc/sample.c:350
+#: ppdc/sample.c:341
 msgid "Standard"
 msgstr ""
 
 #. TRANSLATORS: Banner/cover sheet before the print job.
-#: cgi-bin/admin.c:3530
+#: cgi-bin/admin.c:3552
 msgid "Starting Banner"
 msgstr ""
 
@@ -4776,11 +4638,11 @@ msgstr ""
 msgid "Statement"
 msgstr ""
 
-#: ppdc/sample.c:260
+#: ppdc/sample.c:251
 msgid "Stylus Color Series"
 msgstr ""
 
-#: ppdc/sample.c:266
+#: ppdc/sample.c:257
 msgid "Stylus Photo Series"
 msgstr ""
 
@@ -4802,7 +4664,7 @@ msgstr ""
 msgid "Super B/A3"
 msgstr ""
 
-#: cups/http-support.c:1248
+#: cups/http-support.c:1275
 msgid "Switching Protocols"
 msgstr ""
 
@@ -4818,15 +4680,15 @@ msgstr ""
 msgid "Tabloid Oversize Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:351
+#: ppdc/sample.c:342
 msgid "Tear"
 msgstr ""
 
-#: ppdc/sample.c:456
+#: ppdc/sample.c:447
 msgid "Tear-Off"
 msgstr ""
 
-#: ppdc/sample.c:397
+#: ppdc/sample.c:388
 msgid "Tear-Off Adjust Position"
 msgstr ""
 
@@ -4916,24 +4778,46 @@ msgstr ""
 msgid "The paper tray needs to be filled."
 msgstr ""
 
-#: backend/ipp.c:902
+#: backend/ipp.c:907
 msgid "The printer URI is incorrect or no longer exists."
 msgstr ""
 
-#: backend/ipp.c:752 backend/ipp.c:867 backend/ipp.c:973 backend/ipp.c:1302
-#: backend/ipp.c:1450 backend/lpd.c:828 backend/socket.c:374
-msgid "The printer is busy."
+#: 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:890 backend/ipp.c:897
+#, c-format
+msgid "The printer does not support IPP/%d.%d, trying IPP/%s."
 msgstr ""
 
-#: cups/localize.c:311
+#: backend/ipp.c:755 backend/ipp.c:872 backend/ipp.c:978 backend/ipp.c:1305
+#: backend/ipp.c:1453 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:373 cups/localize.c:311
 msgid "The printer is not connected."
 msgstr ""
 
-#: backend/ipp.c:730 backend/ipp.c:763 backend/ipp.c:863 backend/lpd.c:807
+#: backend/ipp.c:733 backend/ipp.c:766 backend/ipp.c:868 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:395
+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 ""
@@ -4942,7 +4826,7 @@ msgstr ""
 msgid "The printer is running low on toner."
 msgstr ""
 
-#: backend/ipp.c:745 backend/lpd.c:821 backend/socket.c:367
+#: backend/ipp.c:748 backend/lpd.c:821 backend/socket.c:367
 msgid "The printer is unreachable at this time."
 msgstr ""
 
@@ -4954,7 +4838,7 @@ msgstr ""
 msgid "The printer may be out of toner."
 msgstr ""
 
-#: backend/ipp.c:739 backend/lpd.c:815 backend/socket.c:361
+#: backend/ipp.c:742 backend/lpd.c:815 backend/socket.c:361
 msgid "The printer may not exist or is unavailable at this time."
 msgstr ""
 
@@ -5018,7 +4902,7 @@ msgstr ""
 msgid "The subscription name may not contain spaces, slashes (/), question marks (?), or the pound sign (#)."
 msgstr ""
 
-#: scheduler/client.c:2521
+#: scheduler/client.c:2450
 msgid "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to enable it."
 msgstr ""
 
@@ -5040,7 +4924,7 @@ msgstr ""
 msgid "There was an unrecoverable USB error."
 msgstr ""
 
-#: ppdc/sample.c:444
+#: ppdc/sample.c:435
 msgid "Thermal Transfer Media"
 msgstr ""
 
@@ -5058,31 +4942,31 @@ msgstr ""
 msgid "Too many printer-state-reasons values (%d > %d)."
 msgstr ""
 
-#: ppdc/sample.c:298
+#: ppdc/sample.c:289
 msgid "Transparency"
 msgstr ""
 
-#: ppdc/sample.c:293
+#: ppdc/sample.c:284
 msgid "Tray"
 msgstr ""
 
-#: ppdc/sample.c:273
+#: ppdc/sample.c:264
 msgid "Tray 1"
 msgstr ""
 
-#: ppdc/sample.c:274
+#: ppdc/sample.c:265
 msgid "Tray 2"
 msgstr ""
 
-#: ppdc/sample.c:275
+#: ppdc/sample.c:266
 msgid "Tray 3"
 msgstr ""
 
-#: ppdc/sample.c:276
+#: ppdc/sample.c:267
 msgid "Tray 4"
 msgstr ""
 
-#: cups/http-support.c:1288
+#: cups/http-support.c:1315
 msgid "URI Too Long"
 msgstr ""
 
@@ -5118,19 +5002,23 @@ msgstr ""
 msgid "US Letter Small"
 msgstr ""
 
-#: cgi-bin/admin.c:1940 cgi-bin/admin.c:1953 cgi-bin/admin.c:1977
-msgid "Unable to access cupsd.conf file:"
+#: cgi-bin/admin.c:1959 cgi-bin/admin.c:1972 cgi-bin/admin.c:1996
+msgid "Unable to access cupsd.conf file"
+msgstr ""
+
+#: cgi-bin/help.c:133
+msgid "Unable to access help file."
 msgstr ""
 
 #: cgi-bin/admin.c:526
-msgid "Unable to add RSS subscription:"
+msgid "Unable to add RSS subscription"
 msgstr ""
 
 #: cgi-bin/admin.c:814
-msgid "Unable to add class:"
+msgid "Unable to add class"
 msgstr ""
 
-#: backend/ipp.c:1620
+#: backend/ipp.c:1624
 msgid "Unable to add document to print job."
 msgstr ""
 
@@ -5140,7 +5028,7 @@ msgid "Unable to add job for destination \"%s\"."
 msgstr ""
 
 #: cgi-bin/admin.c:1059 cgi-bin/admin.c:1419
-msgid "Unable to add printer:"
+msgid "Unable to add printer"
 msgstr ""
 
 #: scheduler/ipp.c:1258
@@ -5156,34 +5044,34 @@ msgid "Unable to allocate memory for pages array"
 msgstr ""
 
 #: cgi-bin/admin.c:1525
-msgid "Unable to cancel RSS subscription:"
+msgid "Unable to cancel RSS subscription"
 msgstr ""
 
-#: backend/ipp.c:1924
+#: backend/ipp.c:1929
 msgid "Unable to cancel print job."
 msgstr ""
 
-#: cgi-bin/admin.c:3884
-msgid "Unable to change printer-is-shared attribute:"
+#: cgi-bin/admin.c:2990
+msgid "Unable to change printer"
 msgstr ""
 
-#: cgi-bin/admin.c:2968
-msgid "Unable to change printer:"
+#: cgi-bin/admin.c:3906
+msgid "Unable to change printer-is-shared attribute"
 msgstr ""
 
-#: cgi-bin/admin.c:1638 cgi-bin/admin.c:1780
-msgid "Unable to change server settings:"
+#: cgi-bin/admin.c:1657 cgi-bin/admin.c:1799
+msgid "Unable to change server settings"
 msgstr ""
 
-#: filter/commandtops.c:421
+#: filter/commandtops.c:420
 msgid "Unable to configure printer options."
 msgstr ""
 
-#: cups/adminutil.c:911 cups/request.c:1022
+#: cups/adminutil.c:911 cups/request.c:1021
 msgid "Unable to connect to host."
 msgstr ""
 
-#: backend/ipp.c:708 backend/ipp.c:1123 backend/lpd.c:787 backend/socket.c:333
+#: backend/ipp.c:711 backend/ipp.c:1131 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 ""
@@ -5227,7 +5115,7 @@ msgstr ""
 msgid "Unable to copy interface script - %s"
 msgstr ""
 
-#: backend/ipp.c:2016
+#: backend/ipp.c:2021
 msgid "Unable to create compressed print file"
 msgstr ""
 
@@ -5235,59 +5123,55 @@ msgstr ""
 msgid "Unable to create printer-uri"
 msgstr ""
 
-#: scheduler/cupsfilter.c:1242
+#: 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:1831 cgi-bin/admin.c:1843
-msgid "Unable to create temporary file:"
-msgstr ""
-
-#: cgi-bin/admin.c:2134
-msgid "Unable to delete class:"
+#: cgi-bin/admin.c:2153
+msgid "Unable to delete class"
 msgstr ""
 
-#: cgi-bin/admin.c:2219
-msgid "Unable to delete printer:"
+#: 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:"
+msgid "Unable to do maintenance command"
 msgstr ""
 
-#: cgi-bin/admin.c:1955
+#: cgi-bin/admin.c:1974
 msgid "Unable to edit cupsd.conf files larger than 1MB"
 msgstr ""
 
-#: cups/http.c:4258
+#: cups/http.c:4259
 msgid "Unable to establish a secure connection to host (certificate chain invalid)."
 msgstr ""
 
-#: cups/http.c:4248
+#: cups/http.c:4249
 msgid "Unable to establish a secure connection to host (certificate not yet valid)."
 msgstr ""
 
-#: cups/http.c:4243
+#: cups/http.c:4244
 msgid "Unable to establish a secure connection to host (expired certificate)."
 msgstr ""
 
-#: cups/http.c:4253
+#: cups/http.c:4254
 msgid "Unable to establish a secure connection to host (host name mismatch)."
 msgstr ""
 
-#: cups/http.c:4263
+#: cups/http.c:4264
 msgid "Unable to establish a secure connection to host (peer dropped connection before responding)."
 msgstr ""
 
-#: cups/http.c:4238
+#: cups/http.c:4239
 msgid "Unable to establish a secure connection to host (self-signed certificate)."
 msgstr ""
 
-#: cups/http.c:4233
+#: cups/http.c:4234
 msgid "Unable to establish a secure connection to host (untrusted certificate)."
 msgstr ""
 
-#: cups/http.c:3995 cups/http.c:4290 cups/http.c:4323 cups/http.c:4340
+#: cups/http.c:3995 cups/http.c:4291 cups/http.c:4324 cups/http.c:4341
 msgid "Unable to establish a secure connection to host."
 msgstr ""
 
@@ -5295,44 +5179,44 @@ msgstr ""
 msgid "Unable to find destination for job"
 msgstr ""
 
-#: cups/http-support.c:1644
+#: cups/http-support.c:1748
 msgid "Unable to find printer."
 msgstr ""
 
-#: backend/ipp.c:2038
+#: backend/ipp.c:2043
 msgid "Unable to generate compressed print file"
 msgstr ""
 
-#: backend/ipp.c:2945
+#: backend/ipp.c:2995
 msgid "Unable to get backend exit status."
 msgstr ""
 
 #: cgi-bin/classes.c:450
-msgid "Unable to get class list:"
+msgid "Unable to get class list"
 msgstr ""
 
 #: cgi-bin/classes.c:549
-msgid "Unable to get class status:"
+msgid "Unable to get class status"
 msgstr ""
 
 #: cgi-bin/admin.c:1320
-msgid "Unable to get list of printer drivers:"
+msgid "Unable to get list of printer drivers"
 msgstr ""
 
-#: cgi-bin/admin.c:2818
-msgid "Unable to get printer attributes:"
+#: cgi-bin/admin.c:2840
+msgid "Unable to get printer attributes"
 msgstr ""
 
 #: cgi-bin/printers.c:467
-msgid "Unable to get printer list:"
+msgid "Unable to get printer list"
 msgstr ""
 
-#: backend/ipp.c:926
-msgid "Unable to get printer status."
+#: cgi-bin/printers.c:569
+msgid "Unable to get printer status"
 msgstr ""
 
-#: cgi-bin/printers.c:569
-msgid "Unable to get printer status:"
+#: backend/ipp.c:931
+msgid "Unable to get printer status."
 msgstr ""
 
 #: cups/adminutil.c:565 cups/adminutil.c:769
@@ -5345,22 +5229,26 @@ msgstr ""
 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:640 backend/lpd.c:421 backend/socket.c:275
 #, c-format
 msgid "Unable to locate printer \"%s\"."
 msgstr ""
 
-#: backend/dnssd.c:529 backend/ipp.c:322 backend/lpd.c:204
+#: backend/dnssd.c:787 backend/ipp.c:322 backend/lpd.c:204
 #: backend/socket.c:171
 msgid "Unable to locate printer."
 msgstr ""
 
 #: cgi-bin/admin.c:813
-msgid "Unable to modify class:"
+msgid "Unable to modify class"
 msgstr ""
 
 #: cgi-bin/admin.c:1058 cgi-bin/admin.c:1418
-msgid "Unable to modify printer:"
+msgid "Unable to modify printer"
 msgstr ""
 
 #: cgi-bin/ipp-var.c:432 cgi-bin/ipp-var.c:521
@@ -5371,23 +5259,19 @@ msgstr ""
 msgid "Unable to move jobs"
 msgstr ""
 
-#: cups/ppd.c:339
+#: cgi-bin/admin.c:3186 cups/ppd.c:339
 msgid "Unable to open PPD file"
 msgstr ""
 
-#: cgi-bin/admin.c:3164
-msgid "Unable to open PPD file:"
-msgstr ""
-
-#: backend/ipp.c:2022
+#: backend/ipp.c:2027
 msgid "Unable to open compressed print file"
 msgstr ""
 
-#: cgi-bin/admin.c:2589
+#: cgi-bin/admin.c:2608
 msgid "Unable to open cupsd.conf file:"
 msgstr ""
 
-#: backend/usb-unix.c:145
+#: backend/usb-unix.c:141
 msgid "Unable to open device file"
 msgstr ""
 
@@ -5396,7 +5280,11 @@ msgstr ""
 msgid "Unable to open document #%d in job #%d."
 msgstr ""
 
-#: backend/ipp.c:363 backend/ipp.c:1384 backend/ipp.c:1580 backend/ipp.c:2028
+#: cgi-bin/help.c:364
+msgid "Unable to open help file."
+msgstr ""
+
+#: backend/ipp.c:363 backend/ipp.c:1387 backend/ipp.c:1583 backend/ipp.c:2033
 #: 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"
@@ -5408,19 +5296,15 @@ msgid "Unable to open raster file"
 msgstr ""
 
 #: cgi-bin/ipp-var.c:795
-msgid "Unable to print test page:"
-msgstr ""
-
-#: backend/runloop.c:95 backend/runloop.c:322
-msgid "Unable to read print data"
+msgid "Unable to print test page"
 msgstr ""
 
-#: backend/usb-darwin.c:613 backend/usb-darwin.c:657 backend/usb-libusb.c:343
-#: backend/usb-libusb.c:378
+#: backend/runloop.c:96 backend/runloop.c:324 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:2974
+#: cups/dest.c:2968
 msgid "Unable to resolve printer URI."
 msgstr ""
 
@@ -5446,27 +5330,27 @@ msgstr ""
 msgid "Unable to set Windows printer driver (%d)."
 msgstr ""
 
-#: cgi-bin/admin.c:3785
-msgid "Unable to set options:"
+#: cgi-bin/admin.c:3807
+msgid "Unable to set options"
 msgstr ""
 
-#: cgi-bin/admin.c:3055
-msgid "Unable to set server default:"
+#: cgi-bin/admin.c:3077
+msgid "Unable to set server default"
 msgstr ""
 
-#: backend/ipp.c:2804 backend/ipp.c:2881 backend/ipp.c:2889
+#: backend/ipp.c:2854 backend/ipp.c:2931 backend/ipp.c:2939
 msgid "Unable to start backend process."
 msgstr ""
 
-#: cgi-bin/admin.c:1893
-msgid "Unable to upload cupsd.conf file:"
+#: cgi-bin/admin.c:1912
+msgid "Unable to upload cupsd.conf file"
 msgstr ""
 
 #: backend/usb-darwin.c:1985 backend/usb-darwin.c:2009
 msgid "Unable to use legacy USB class driver."
 msgstr ""
 
-#: backend/runloop.c:124 backend/runloop.c:377
+#: backend/runloop.c:125 backend/runloop.c:379
 msgid "Unable to write print data"
 msgstr ""
 
@@ -5475,15 +5359,15 @@ msgstr ""
 msgid "Unable to write uncompressed print data: %s"
 msgstr ""
 
-#: cups/http-support.c:1276
+#: cups/http-support.c:1303
 msgid "Unauthorized"
 msgstr ""
 
-#: cgi-bin/admin.c:3481
+#: cgi-bin/admin.c:3503
 msgid "Units"
 msgstr ""
 
-#: cups/http-support.c:1316 cups/ppd.c:366
+#: cups/http-support.c:1343 cups/ppd.c:366
 msgid "Unknown"
 msgstr ""
 
@@ -5536,7 +5420,7 @@ msgstr ""
 msgid "Unknown printer-op-policy \"%s\"."
 msgstr ""
 
-#: cups/http-addrlist.c:708
+#: cups/http-addrlist.c:710
 msgid "Unknown service name."
 msgstr ""
 
@@ -5574,7 +5458,7 @@ msgstr ""
 msgid "Unsupported margins."
 msgstr ""
 
-#: cups/pwg-media.c:467
+#: cups/pwg-media.c:468
 msgid "Unsupported media value."
 msgstr ""
 
@@ -5601,7 +5485,7 @@ msgstr ""
 msgid "Unsupported value type"
 msgstr ""
 
-#: cups/http-support.c:1291
+#: cups/http-support.c:1318
 msgid "Upgrade Required"
 msgstr ""
 
@@ -5617,21 +5501,14 @@ msgid ""
 "                       [-u allow:user,user] [-u deny:user,user]"
 msgstr ""
 
-#: backend/dnssd.c:174 backend/ipp.c:311 backend/lpd.c:191
-#: backend/socket.c:135 backend/usb.c:183 monitor/bcp.c:62 monitor/tbcp.c:61
+#: backend/dnssd.c:241 backend/ipp.c:311 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 ""
 
-#: filter/commandtops.c:74 filter/gziptoany.c:50 filter/pstops.c:264
-#, c-format
-msgid "Usage: %s job-id user title copies options file"
-msgstr ""
-
-#: scheduler/cupsfilter.c:1464
-msgid "Usage: convert [ options ]"
-msgstr ""
-
 #: systemv/cupsaddsmb.c:281
 msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
 msgstr ""
@@ -5640,11 +5517,11 @@ msgstr ""
 msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
 msgstr ""
 
-#: scheduler/main.c:2018
+#: scheduler/main.c:2017
 msgid "Usage: cupsd [options]"
 msgstr ""
 
-#: scheduler/cupsfilter.c:1437
+#: scheduler/cupsfilter.c:1429
 msgid "Usage: cupsfilter [ options ] filename"
 msgstr ""
 
@@ -5652,7 +5529,7 @@ msgstr ""
 msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
 msgstr ""
 
-#: systemv/cupstestppd.c:3792
+#: systemv/cupstestppd.c:3793
 msgid "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]"
 msgstr ""
 
@@ -5723,7 +5600,7 @@ msgstr ""
 msgid "Version uses indefinite length"
 msgstr ""
 
-#: backend/ipp.c:1660
+#: backend/ipp.c:1664
 msgid "Waiting for job to complete."
 msgstr ""
 
@@ -5739,7 +5616,7 @@ msgstr ""
 msgid "Warning, no Windows 2000 printer drivers are installed."
 msgstr ""
 
-#: cups/http-support.c:1312
+#: cups/http-support.c:1339
 msgid "Web Interface is Disabled"
 msgstr ""
 
@@ -5747,7 +5624,7 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: scheduler/client.c:2508
+#: 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 ""
@@ -5756,11 +5633,11 @@ msgstr ""
 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:448
+#: ppdc/sample.c:439
 msgid "ZPL Label Printer"
 msgstr ""
 
-#: ppdc/sample.c:371
+#: ppdc/sample.c:362
 msgid "Zebra"
 msgstr ""
 
@@ -5776,10 +5653,6 @@ msgstr ""
 msgid "completed"
 msgstr ""
 
-#: scheduler/cupsfilter.c:356
-msgid "convert: Use the -f option to specify a file to convert."
-msgstr ""
-
 #: scheduler/ipp.c:6706
 msgid "cups-deviced failed to execute."
 msgstr ""
@@ -5812,43 +5685,43 @@ msgstr ""
 msgid "cupsctl: Unknown option \"-%c\""
 msgstr ""
 
-#: scheduler/main.c:193
+#: scheduler/main.c:189
 msgid "cupsd: Expected config filename after \"-c\" option."
 msgstr ""
 
-#: scheduler/main.c:225 scheduler/main.c:232
+#: scheduler/main.c:221 scheduler/main.c:228
 msgid "cupsd: Unable to get current directory."
 msgstr ""
 
-#: scheduler/main.c:299
+#: scheduler/main.c:295
 #, c-format
 msgid "cupsd: Unknown argument \"%s\" - aborting."
 msgstr ""
 
-#: scheduler/main.c:292
+#: scheduler/main.c:288
 #, c-format
 msgid "cupsd: Unknown option \"%c\" - aborting."
 msgstr ""
 
-#: scheduler/main.c:259
+#: scheduler/main.c:255
 msgid "cupsd: launchd(8) support not compiled in, running in normal mode."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1215
+#: scheduler/cupsfilter.c:1209
 #, c-format
 msgid "cupsfilter: Invalid document number %d."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1209
+#: scheduler/cupsfilter.c:1203
 #, c-format
 msgid "cupsfilter: Invalid job ID %d."
 msgstr ""
 
-#: scheduler/cupsfilter.c:364
+#: scheduler/cupsfilter.c:358
 msgid "cupsfilter: Only one filename can be specified."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1257
+#: scheduler/cupsfilter.c:1251
 #, c-format
 msgid "cupsfilter: Unable to get job file - %s"
 msgstr ""
@@ -5891,18 +5764,10 @@ msgstr ""
 msgid "idle"
 msgstr ""
 
-#: test/ipptool.c:371
+#: test/ipptool.c:371 test/ipptool.c:510 test/ipptool.c:534
 msgid "ipptool: \"-i\" and \"-n\" are incompatible with -X\"."
 msgstr ""
 
-#: test/ipptool.c:510
-msgid "ipptool: \"-i\" is incompatible with \"-X\"."
-msgstr ""
-
-#: test/ipptool.c:534
-msgid "ipptool: \"-n\" is incompatible with \"-X\"."
-msgstr ""
-
 #: test/ipptool.c:592
 #, c-format
 msgid "ipptool: Bad URI - %s."
@@ -6298,7 +6163,7 @@ msgstr ""
 msgid "ppdc: Bad font attribute: %s"
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1795
+#: ppdc/ppdc-source.cxx:1796
 #, c-format
 msgid "ppdc: Bad resolution name \"%s\" on line %d of %s."
 msgstr ""
@@ -6308,17 +6173,17 @@ msgstr ""
 msgid "ppdc: Bad status keyword %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2032
+#: ppdc/ppdc-source.cxx:2033
 #, c-format
 msgid "ppdc: Bad variable substitution ($%c) on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2718
+#: ppdc/ppdc-source.cxx:2719
 #, c-format
 msgid "ppdc: Choice found on line %d of %s with no Option."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1697
+#: ppdc/ppdc-source.cxx:1698
 #, c-format
 msgid "ppdc: Duplicate #po for locale %s on line %d of %s."
 msgstr ""
@@ -6373,7 +6238,7 @@ msgstr ""
 msgid "ppdc: Expected constraints string for UIConstraints on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2904
+#: ppdc/ppdc-source.cxx:2905
 #, c-format
 msgid "ppdc: Expected driver type keyword following DriverType on line %d of %s."
 msgstr ""
@@ -6388,7 +6253,7 @@ msgstr ""
 msgid "ppdc: Expected encoding after Font on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1688
+#: ppdc/ppdc-source.cxx:1689
 #, c-format
 msgid "ppdc: Expected filename after #po %s on line %d of %s."
 msgstr ""
@@ -6398,17 +6263,17 @@ msgstr ""
 msgid "ppdc: Expected group name/text on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2618
+#: ppdc/ppdc-source.cxx:2619
 #, c-format
 msgid "ppdc: Expected include filename on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1501
+#: ppdc/ppdc-source.cxx:1502
 #, c-format
 msgid "ppdc: Expected integer on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1680
+#: ppdc/ppdc-source.cxx:1681
 #, c-format
 msgid "ppdc: Expected locale after #po on line %d of %s."
 msgstr ""
@@ -6418,7 +6283,7 @@ msgstr ""
 msgid "ppdc: Expected name after %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3276
+#: ppdc/ppdc-source.cxx:3277
 #, c-format
 msgid "ppdc: Expected name after FileName on line %d of %s."
 msgstr ""
@@ -6428,22 +6293,22 @@ msgstr ""
 msgid "ppdc: Expected name after Font on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3107
+#: ppdc/ppdc-source.cxx:3108
 #, c-format
 msgid "ppdc: Expected name after Manufacturer on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3140
+#: ppdc/ppdc-source.cxx:3141
 #, c-format
 msgid "ppdc: Expected name after MediaSize on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3230
+#: ppdc/ppdc-source.cxx:3231
 #, c-format
 msgid "ppdc: Expected name after ModelName on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3293
+#: ppdc/ppdc-source.cxx:3294
 #, c-format
 msgid "ppdc: Expected name after PCFileName on line %d of %s."
 msgstr ""
@@ -6458,7 +6323,7 @@ msgstr ""
 msgid "ppdc: Expected name/text after Installable on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1781
+#: ppdc/ppdc-source.cxx:1782
 #, c-format
 msgid "ppdc: Expected name/text after Resolution on line %d of %s."
 msgstr ""
@@ -6468,22 +6333,22 @@ msgstr ""
 msgid "ppdc: Expected name/text combination for ColorModel on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1573
+#: ppdc/ppdc-source.cxx:1574
 #, c-format
 msgid "ppdc: Expected option name/text on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1607
+#: ppdc/ppdc-source.cxx:1608
 #, c-format
 msgid "ppdc: Expected option section on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1585
+#: ppdc/ppdc-source.cxx:1586
 #, c-format
 msgid "ppdc: Expected option type on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1764
+#: ppdc/ppdc-source.cxx:1765
 #, c-format
 msgid "ppdc: Expected override field after Resolution on line %d of %s."
 msgstr ""
@@ -6503,7 +6368,7 @@ msgstr ""
 msgid "ppdc: Expected resolution/mediatype following ColorProfile on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1862
+#: ppdc/ppdc-source.cxx:1863
 #, c-format
 msgid "ppdc: Expected resolution/mediatype following SimpleColorProfile on line %d of %s."
 msgstr ""
@@ -6518,12 +6383,12 @@ msgstr ""
 msgid "ppdc: Expected status after Font on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2793
+#: ppdc/ppdc-source.cxx:2794
 #, c-format
 msgid "ppdc: Expected string after Copyright on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3396
+#: ppdc/ppdc-source.cxx:3397
 #, c-format
 msgid "ppdc: Expected string after Version on line %d of %s."
 msgstr ""
@@ -6563,12 +6428,12 @@ msgstr ""
 msgid "ppdc: Invalid empty program name for filter on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1627
+#: ppdc/ppdc-source.cxx:1628
 #, c-format
 msgid "ppdc: Invalid option section \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1599
+#: ppdc/ppdc-source.cxx:1600
 #, c-format
 msgid "ppdc: Invalid option type \"%s\" on line %d of %s."
 msgstr ""
@@ -6588,13 +6453,13 @@ msgstr ""
 msgid "ppdc: Loading messages from \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2411 ppdc/ppdc-source.cxx:2643
+#: 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:2512 ppdc/ppdc-source.cxx:2547
-#: ppdc/ppdc-source.cxx:2577
+#: 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 ""
@@ -6609,14 +6474,14 @@ msgstr ""
 msgid "ppdc: No message catalog provided for locale %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1650 ppdc/ppdc-source.cxx:2881
-#: ppdc/ppdc-source.cxx:2967 ppdc/ppdc-source.cxx:3060
-#: ppdc/ppdc-source.cxx:3193 ppdc/ppdc-source.cxx:3326
+#: 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:1643
+#: ppdc/ppdc-source.cxx:1644
 #, c-format
 msgid "ppdc: Option %s redefined with a different type on line %d of %s."
 msgstr ""
@@ -6626,7 +6491,7 @@ msgstr ""
 msgid "ppdc: Option constraint must *name on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2494
+#: ppdc/ppdc-source.cxx:2495
 #, c-format
 msgid "ppdc: Too many nested #if's on line %d of %s."
 msgstr ""
@@ -6651,12 +6516,12 @@ msgstr ""
 msgid "ppdc: Unable to execute cupstestppd: %s"
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1729
+#: 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:2650
+#: ppdc/ppdc-source.cxx:2651
 #, c-format
 msgid "ppdc: Unable to find include file \"%s\" on line %d of %s."
 msgstr ""
@@ -6676,7 +6541,7 @@ msgstr ""
 msgid "ppdc: Unable to open %s: %s"
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2053
+#: ppdc/ppdc-source.cxx:2054
 #, c-format
 msgid "ppdc: Undefined variable (%s) on line %d of %s."
 msgstr ""
@@ -6686,7 +6551,7 @@ msgstr ""
 msgid "ppdc: Unexpected text on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2923
+#: ppdc/ppdc-source.cxx:2924
 #, c-format
 msgid "ppdc: Unknown driver type %s on line %d of %s."
 msgstr ""
@@ -6696,7 +6561,7 @@ msgstr ""
 msgid "ppdc: Unknown duplex type \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3153
+#: ppdc/ppdc-source.cxx:3154
 #, c-format
 msgid "ppdc: Unknown media size \"%s\" on line %d of %s."
 msgstr ""
@@ -6706,7 +6571,7 @@ msgstr ""
 msgid "ppdc: Unknown message catalog format for \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3407
+#: ppdc/ppdc-source.cxx:3408
 #, c-format
 msgid "ppdc: Unknown token \"%s\" seen on line %d of %s."
 msgstr ""
@@ -6716,7 +6581,7 @@ msgstr ""
 msgid "ppdc: Unknown trailing characters in real number \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2163
+#: ppdc/ppdc-source.cxx:2164
 #, c-format
 msgid "ppdc: Unterminated string starting with %c on line %d of %s."
 msgstr ""

diff --git a/locale/cups.strings b/locale/cups.strings
index f754f3e7dde075cbb48e65e948929bf39703df39..ddcf127f4d5c410cc960cd95de27d3c9f15ae31b 100644 (file)
--- a/locale/cups.strings
+++ b/locale/cups.strings
@@ -117,28 +117,27 @@
 "      %s  cupsICCProfile %s hash value collides with %s." = "      %s  cupsICCProfile %s hash value collides with %s.";
 "      %s  cupsUIResolver %s causes a loop." = "      %s  cupsUIResolver %s causes a loop.";
 "      %s  cupsUIResolver %s does not list at least two different options." = "      %s  cupsUIResolver %s does not list at least two different options.";
-"      **FAIL**  %s choice names %s and %s differ only by case." = "      **FAIL**  %s choice names %s and %s differ only by case.";
 "      **FAIL**  %s must be 1284DeviceID\n                REF: Page 72, section 5.5" = "      **FAIL**  %s must be 1284DeviceID\n                REF: Page 72, section 5.5";
-"      **FAIL**  BAD Default%s %s\n                REF: Page 40, section 4.5." = "      **FAIL**  BAD Default%s %s\n                REF: Page 40, section 4.5.";
-"      **FAIL**  BAD DefaultImageableArea %s\n                REF: Page 102, section 5.15." = "      **FAIL**  BAD DefaultImageableArea %s\n                REF: Page 102, section 5.15.";
-"      **FAIL**  BAD DefaultPaperDimension %s\n                REF: Page 103, section 5.15." = "      **FAIL**  BAD DefaultPaperDimension %s\n                REF: Page 103, section 5.15.";
-"      **FAIL**  BAD JobPatchFile attribute in file\n                REF: Page 24, section 3.4." = "      **FAIL**  BAD JobPatchFile attribute in file\n                REF: Page 24, section 3.4.";
-"      **FAIL**  BAD Manufacturer (should be \"HP\")\n                REF: Page 211, table D.1." = "      **FAIL**  BAD Manufacturer (should be \"HP\")\n                REF: Page 211, table D.1.";
-"      **FAIL**  BAD Manufacturer (should be \"Oki\")\n                REF: Page 211, table D.1." = "      **FAIL**  BAD Manufacturer (should be \"Oki\")\n                REF: Page 211, table D.1.";
-"      **FAIL**  BAD ModelName - \"%c\" not allowed in string.\n                REF: Pages 59-60, section 5.3." = "      **FAIL**  BAD ModelName - \"%c\" not allowed in string.\n                REF: Pages 59-60, section 5.3.";
-"      **FAIL**  BAD PSVersion - not \"(string) int\".\n                REF: Pages 62-64, section 5.3." = "      **FAIL**  BAD PSVersion - not \"(string) int\".\n                REF: Pages 62-64, section 5.3.";
-"      **FAIL**  BAD Product - not \"(string)\".\n                REF: Page 62, section 5.3." = "      **FAIL**  BAD Product - not \"(string)\".\n                REF: Page 62, section 5.3.";
-"      **FAIL**  BAD ShortNickName - longer than 31 chars.\n                REF: Pages 64-65, section 5.3." = "      **FAIL**  BAD ShortNickName - longer than 31 chars.\n                REF: Pages 64-65, section 5.3.";
-"      **FAIL**  Bad %s choice %s\n                REF: Page 84, section 5.9" = "      **FAIL**  Bad %s choice %s\n                REF: Page 84, section 5.9";
+"      **FAIL**  Bad Default%s %s\n                REF: Page 40, section 4.5." = "      **FAIL**  Bad Default%s %s\n                REF: Page 40, section 4.5.";
+"      **FAIL**  Bad DefaultImageableArea %s\n                REF: Page 102, section 5.15." = "      **FAIL**  Bad DefaultImageableArea %s\n                REF: Page 102, section 5.15.";
+"      **FAIL**  Bad DefaultPaperDimension %s\n                REF: Page 103, section 5.15." = "      **FAIL**  Bad DefaultPaperDimension %s\n                REF: Page 103, section 5.15.";
 "      **FAIL**  Bad FileVersion \"%s\"\n                REF: Page 56, section 5.3." = "      **FAIL**  Bad FileVersion \"%s\"\n                REF: Page 56, section 5.3.";
 "      **FAIL**  Bad FormatVersion \"%s\"\n                REF: Page 56, section 5.3." = "      **FAIL**  Bad FormatVersion \"%s\"\n                REF: Page 56, section 5.3.";
+"      **FAIL**  Bad JobPatchFile attribute in file\n                REF: Page 24, section 3.4." = "      **FAIL**  Bad JobPatchFile attribute in file\n                REF: Page 24, section 3.4.";
 "      **FAIL**  Bad LanguageEncoding %s - must be ISOLatin1." = "      **FAIL**  Bad LanguageEncoding %s - must be ISOLatin1.";
 "      **FAIL**  Bad LanguageVersion %s - must be English." = "      **FAIL**  Bad LanguageVersion %s - must be English.";
+"      **FAIL**  Bad Manufacturer (should be \"%s\")\n                REF: Page 211, table D.1." = "      **FAIL**  Bad Manufacturer (should be \"%s\")\n                REF: Page 211, table D.1.";
+"      **FAIL**  Bad ModelName - \"%c\" not allowed in string.\n                REF: Pages 59-60, section 5.3." = "      **FAIL**  Bad ModelName - \"%c\" not allowed in string.\n                REF: Pages 59-60, section 5.3.";
+"      **FAIL**  Bad PSVersion - not \"(string) int\".\n                REF: Pages 62-64, section 5.3." = "      **FAIL**  Bad PSVersion - not \"(string) int\".\n                REF: Pages 62-64, section 5.3.";
+"      **FAIL**  Bad Product - not \"(string)\".\n                REF: Page 62, section 5.3." = "      **FAIL**  Bad Product - not \"(string)\".\n                REF: Page 62, section 5.3.";
+"      **FAIL**  Bad ShortNickName - longer than 31 chars.\n                REF: Pages 64-65, section 5.3." = "      **FAIL**  Bad ShortNickName - longer than 31 chars.\n                REF: Pages 64-65, section 5.3.";
+"      **FAIL**  Bad option %s choice %s\n                REF: Page 84, section 5.9" = "      **FAIL**  Bad option %s choice %s\n                REF: Page 84, section 5.9";
 "      **FAIL**  Default option code cannot be interpreted: %s" = "      **FAIL**  Default option code cannot be interpreted: %s";
 "      **FAIL**  Default translation string for option %s choice %s contains 8-bit characters." = "      **FAIL**  Default translation string for option %s choice %s contains 8-bit characters.";
 "      **FAIL**  Default translation string for option %s contains 8-bit characters." = "      **FAIL**  Default translation string for option %s contains 8-bit characters.";
 "      **FAIL**  Group names %s and %s differ only by case." = "      **FAIL**  Group names %s and %s differ only by case.";
-"      **FAIL**  Multiple occurrences of %s choice name %s." = "      **FAIL**  Multiple occurrences of %s choice name %s.";
+"      **FAIL**  Multiple occurrences of option %s choice name %s." = "      **FAIL**  Multiple occurrences of option %s choice name %s.";
+"      **FAIL**  Option %s choice names %s and %s differ only by case." = "      **FAIL**  Option %s choice names %s and %s differ only by case.";
 "      **FAIL**  Option names %s and %s differ only by case." = "      **FAIL**  Option names %s and %s differ only by case.";
 "      **FAIL**  REQUIRED Default%s\n                REF: Page 40, section 4.5." = "      **FAIL**  REQUIRED Default%s\n                REF: Page 40, section 4.5.";
 "      **FAIL**  REQUIRED DefaultImageableArea\n                REF: Page 102, section 5.15." = "      **FAIL**  REQUIRED DefaultImageableArea\n                REF: Page 102, section 5.15.";
@@ -159,7 +158,6 @@
 "      **FAIL**  REQUIRED PaperDimension for PageSize %s\n                REF: Page 41, section 5.\n                REF: Page 103, section 5.15." = "      **FAIL**  REQUIRED PaperDimension for PageSize %s\n                REF: Page 41, section 5.\n                REF: Page 103, section 5.15.";
 "      **FAIL**  REQUIRED Product\n                REF: Page 62, section 5.3." = "      **FAIL**  REQUIRED Product\n                REF: Page 62, section 5.3.";
 "      **FAIL**  REQUIRED ShortNickName\n                REF: Page 64-65, section 5.3." = "      **FAIL**  REQUIRED ShortNickName\n                REF: Page 64-65, section 5.3.";
-"      **FAIL**  Unable to open PPD file - %s" = "      **FAIL**  Unable to open PPD file - %s";
 "      **FAIL**  Unable to open PPD file - %s on line %d." = "      **FAIL**  Unable to open PPD file - %s on line %d.";
 "    %d ERRORS FOUND" = "    %d ERRORS FOUND";
 "    -h       Show program usage" = "    -h       Show program usage";
@@ -186,37 +184,30 @@
 "  --[no-]user-cancel-any  Allow/prevent users to cancel any job." = "  --[no-]user-cancel-any  Allow/prevent users to cancel any job.";
 "  --cr                    End lines with CR (Mac OS 9)." = "  --cr                    End lines with CR (Mac OS 9).";
 "  --crlf                  End lines with CR + LF (Windows)." = "  --crlf                  End lines with CR + LF (Windows).";
-"  --lf                    End lines with LF (UNIX/Linux/Mac OS X)." = "  --lf                    End lines with LF (UNIX/Linux/Mac OS X).";
+"  --lf                    End lines with LF (UNIX/Linux/OS X)." = "  --lf                    End lines with LF (UNIX/Linux/OS X).";
 "  -4                      Connect using IPv4." = "  -4                      Connect using IPv4.";
 "  -6                      Connect using IPv6." = "  -6                      Connect using IPv6.";
 "  -C                      Send requests using chunking (default)." = "  -C                      Send requests using chunking (default).";
 "  -D                      Remove the input file when finished." = "  -D                      Remove the input file when finished.";
 "  -D name=value           Set named variable to value." = "  -D name=value           Set named variable to value.";
-"  -E                      Enable encryption." = "  -E                      Enable encryption.";
-"  -E                      Encrypt the connection to the server." = "  -E                      Encrypt the connection to the server.";
-"  -E                      Test with TLS encryption." = "  -E                      Test with TLS encryption.";
+"  -E                      Encrypt the connection." = "  -E                      Encrypt the connection.";
+"  -E                      Test with HTTP Upgrade to TLS." = "  -E                      Test with HTTP Upgrade to TLS.";
 "  -F                      Run in the foreground but detach from console." = "  -F                      Run in the foreground but detach from console.";
 "  -H samba-server         Use the named SAMBA server." = "  -H samba-server         Use the named SAMBA server.";
 "  -I                      Ignore errors." = "  -I                      Ignore errors.";
 "  -I include-dir          Add include directory to search path." = "  -I include-dir          Add include directory to search path.";
 "  -I {filename,filters,none,profiles}" = "  -I {filename,filters,none,profiles}";
-"  -J title                Set title." = "  -J title                Set title.";
 "  -L                      Send requests using content-length." = "  -L                      Send requests using content-length.";
 "  -P filename.ppd         Set PPD file." = "  -P filename.ppd         Set PPD file.";
 "  -R root-directory       Set alternate root." = "  -R root-directory       Set alternate root.";
 "  -S                      Test with SSL encryption." = "  -S                      Test with SSL encryption.";
 "  -T seconds              Set the receive/send timeout in seconds." = "  -T seconds              Set the receive/send timeout in seconds.";
-"  -U samba-user           Authenticate using the named SAMBA user." = "  -U samba-user           Authenticate using the named SAMBA user.";
-"  -U username             Set username for job." = "  -U username             Set username for job.";
 "  -U username             Specify username." = "  -U username             Specify username.";
 "  -V version              Set default IPP version." = "  -V version              Set default IPP version.";
 "  -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,translations}" = "  -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,translations}";
 "  -X                      Produce XML plist instead of plain text." = "  -X                      Produce XML plist instead of plain text.";
 "  -a                      Export all printers." = "  -a                      Export all printers.";
-"  -a 'name=value ...'     Set option(s)." = "  -a 'name=value ...'     Set option(s).";
 "  -c catalog.po           Load the specified message catalog." = "  -c catalog.po           Load the specified message catalog.";
-"  -c config-file          Load alternate configuration file." = "  -c config-file          Load alternate configuration file.";
-"  -c copies               Set number of copies." = "  -c copies               Set number of copies.";
 "  -c cupsd.conf           Set cupsd.conf file to use." = "  -c cupsd.conf           Set cupsd.conf file to use.";
 "  -d name=value           Set named variable to value." = "  -d name=value           Set named variable to value.";
 "  -d output-dir           Specify the output directory." = "  -d output-dir           Specify the output directory.";
@@ -224,26 +215,21 @@
 "  -e                      Use every filter from the PPD file." = "  -e                      Use every filter from the PPD file.";
 "  -f                      Run in the foreground." = "  -f                      Run in the foreground.";
 "  -f filename             Set default request filename." = "  -f filename             Set default request filename.";
-"  -f filename             Set file to be converted (otherwise stdin)." = "  -f filename             Set file to be converted (otherwise stdin).";
 "  -h                      Show this usage message." = "  -h                      Show this usage message.";
-"  -h cups-server          Use the named CUPS server." = "  -h cups-server          Use the named CUPS server.";
 "  -h server[:port]        Specify server address." = "  -h server[:port]        Specify server address.";
 "  -i mime/type            Set input MIME type (otherwise auto-typed)." = "  -i mime/type            Set input MIME type (otherwise auto-typed).";
 "  -i seconds              Repeat the last file with the given time interval." = "  -i seconds              Repeat the last file with the given time interval.";
 "  -j job-id[,N]           Filter file N from the specified job (default is file 1)." = "  -j job-id[,N]           Filter file N from the specified job (default is file 1).";
-"  -j mime/type            Set output MIME type (otherwise application/pdf)." = "  -j mime/type            Set output MIME type (otherwise application/pdf).";
 "  -l                      Run cupsd from launchd(8)." = "  -l                      Run cupsd from launchd(8).";
 "  -l lang[,lang,...]      Specify the output language(s) (locale)." = "  -l lang[,lang,...]      Specify the output language(s) (locale).";
 "  -m                      Use the ModelName value as the filename." = "  -m                      Use the ModelName value as the filename.";
 "  -m mime/type            Set output MIME type (otherwise application/pdf)." = "  -m mime/type            Set output MIME type (otherwise application/pdf).";
 "  -n copies               Set number of copies." = "  -n copies               Set number of copies.";
 "  -n count                Repeat the last file the given number of times." = "  -n count                Repeat the last file the given number of times.";
-"  -o filename             Set file to be generated (otherwise stdout)." = "  -o filename             Set file to be generated (otherwise stdout).";
 "  -o filename.drv         Set driver information file (otherwise ppdi.drv)." = "  -o filename.drv         Set driver information file (otherwise ppdi.drv).";
 "  -o filename.ppd[.gz]    Set output file (otherwise stdout)." = "  -o filename.ppd[.gz]    Set output file (otherwise stdout).";
 "  -o name=value           Set option(s)." = "  -o name=value           Set option(s).";
 "  -p filename.ppd         Set PPD file." = "  -p filename.ppd         Set PPD file.";
-"  -q                      Be quiet - no output except errors." = "  -q                      Be quiet - no output except errors.";
 "  -q                      Run silently." = "  -q                      Run silently.";
 "  -r                      Use 'relaxed' open mode." = "  -r                      Use 'relaxed' open mode.";
 "  -t                      Produce a test report." = "  -t                      Produce a test report.";
@@ -251,10 +237,7 @@
 "  -t                      Test the configuration file." = "  -t                      Test the configuration file.";
 "  -t title                Set title." = "  -t title                Set title.";
 "  -u                      Remove the PPD file when finished." = "  -u                      Remove the PPD file when finished.";
-"  -v                      Be slightly verbose." = "  -v                      Be slightly verbose.";
-"  -v                      Be verbose (more v's for more verbosity)." = "  -v                      Be verbose (more v's for more verbosity).";
-"  -v                      Be verbose (show commands)." = "  -v                      Be verbose (show commands).";
-"  -v                      Show all attributes sent and received." = "  -v                      Show all attributes sent and received.";
+"  -v                      Be verbose." = "  -v                      Be verbose.";
 "  -vv                     Be very verbose." = "  -vv                     Be very verbose.";
 "  -z                      Compress PPD files using GNU zip." = "  -z                      Compress PPD files using GNU zip.";
 " FAIL" = " FAIL";
@@ -465,7 +448,6 @@
 "3.25x7.83\"" = "3.25x7.83\"";
 "3.5 x 5" = "3.5 x 5";
 "3.5\" Disk" = "3.5\" Disk";
-"3.5\" Disk - 2 1/8 x 2 3/4\"" = "3.5\" Disk - 2 1/8 x 2 3/4\"";
 "3.50x1.00\"" = "3.50x1.00\"";
 "30" = "30";
 "30 mm/sec." = "30 mm/sec.";
@@ -579,7 +561,6 @@
 "Add Printer" = "Add Printer";
 "Add RSS Subscription" = "Add RSS Subscription";
 "Address" = "Address";
-"Address - 1 1/8 x 3 1/2\"" = "Address - 1 1/8 x 3 1/2\"";
 "Administration" = "Administration";
 "Always" = "Always";
 "AppSocket/HP JetDirect" = "AppSocket/HP JetDirect";
@@ -769,8 +750,7 @@
 "File \"%s\" is a directory." = "File \"%s\" is a directory.";
 "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 Folder - 9/16 x 3 7/16\"" = "File Folder - 9/16 x 3 7/16\"";
+"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\".";
 "Finished page %d." = "Finished page %d.";
 "Folio" = "Folio";
@@ -783,7 +763,7 @@
 "Grayscale" = "Grayscale";
 "HP" = "HP";
 "Hanging Folder" = "Hanging Folder";
-"Hanging Folder - 9/16 x 2\"" = "Hanging Folder - 9/16 x 2\"";
+"Help file not in index." = "Help file not in index.";
 "IPP 1setOf attribute with incompatible value tags." = "IPP 1setOf attribute with incompatible value tags.";
 "IPP attribute has no name." = "IPP attribute has no name.";
 "IPP attribute is not a member of the message." = "IPP attribute is not a member of the message.";
@@ -816,9 +796,7 @@
 "Internal Server Error" = "Internal Server Error";
 "Internal error" = "Internal error";
 "Internet Postage 2-Part" = "Internet Postage 2-Part";
-"Internet Postage 2-Part - 2 1/4 x 7 1/2\"" = "Internet Postage 2-Part - 2 1/4 x 7 1/2\"";
 "Internet Postage 3-Part" = "Internet Postage 3-Part";
-"Internet Postage 3-Part - 2 1/4 x 7\"" = "Internet Postage 3-Part - 2 1/4 x 7\"";
 "Internet Printing Protocol" = "Internet Printing Protocol";
 "Invalid media size." = "Invalid media size.";
 "Invalid printer command \"%s\"." = "Invalid printer command \"%s\".";
@@ -851,7 +829,7 @@
 "Job Options Changed" = "Job Options Changed";
 "Job Stopped" = "Job Stopped";
 "Job is completed and cannot be changed." = "Job is completed and cannot be changed.";
-"Job operation failed:" = "Job operation failed:";
+"Job operation failed" = "Job operation failed";
 "Job state cannot be changed." = "Job state cannot be changed.";
 "Job subscriptions cannot be renewed." = "Job subscriptions cannot be renewed.";
 "Jobs" = "Jobs";
@@ -860,7 +838,6 @@
 "Label Top" = "Label Top";
 "Language \"%s\" not supported." = "Language \"%s\" not supported.";
 "Large Address" = "Large Address";
-"Large Address - 1 4/10 x 3 1/2\"" = "Large Address - 1 4/10 x 3 1/2\"";
 "LaserJet Series PCL 4/5" = "LaserJet Series PCL 4/5";
 "Letter Oversize" = "Letter Oversize";
 "Letter Oversize Long Edge" = "Letter Oversize Long Edge";
@@ -1002,6 +979,7 @@
 "Print file accepted - job ID unknown." = "Print file accepted - job ID unknown.";
 "Print file sent." = "Print file sent.";
 "Print file was not accepted." = "Print file was not accepted.";
+"Print job canceled at printer." = "Print job canceled at printer.";
 "Print job too large." = "Print job too large.";
 "Printer Added" = "Printer Added";
 "Printer Default" = "Printer Default";
@@ -1009,15 +987,6 @@
 "Printer Modified" = "Printer Modified";
 "Printer Paused" = "Printer Paused";
 "Printer Settings" = "Printer Settings";
-"Printer busy, will retry in 10 seconds." = "Printer busy, will retry in 10 seconds.";
-"Printer did not respond." = "Printer did not respond.";
-"Printer does not support IPP/%d.%d, trying IPP/%s." = "Printer does not support IPP/%d.%d, trying IPP/%s.";
-"Printer is busy, will retry in 5 seconds." = "Printer is busy, will retry in 5 seconds.";
-"Printer is not currently connected." = "Printer is not currently connected.";
-"Printer is now connected." = "Printer is now connected.";
-"Printer is now online." = "Printer is now online.";
-"Printer is offline." = "Printer is offline.";
-"Printer not connected, will retry in 30 seconds." = "Printer not connected, will retry in 30 seconds.";
 "Printer:" = "Printer:";
 "Printers" = "Printers";
 "Printing page %d, %d%% complete." = "Printing page %d, %d%% complete.";
@@ -1027,7 +996,6 @@
 "Rank    Owner   Job     File(s)                         Total Size" = "Rank    Owner   Job     File(s)                         Total Size";
 // TRANSLATORS: Pri is job priority.
 "Rank   Owner      Pri  Job        Files                       Total Size" = "Rank   Owner      Pri  Job        Files                       Total Size";
-"Ready to print." = "Ready to print.";
 "Reject Jobs" = "Reject Jobs";
 "Remote host did not accept control file (%d)." = "Remote host did not accept control file (%d).";
 "Remote host did not accept data file (%d)." = "Remote host did not accept data file (%d).";
@@ -1037,7 +1005,6 @@
 "Resume Class" = "Resume Class";
 "Resume Printer" = "Resume Printer";
 "Return Address" = "Return Address";
-"Return Address - 3/4 x 2\"" = "Return Address - 3/4 x 2\"";
 "Rewind" = "Rewind";
 "Running command: %s %s -N -A %s -c '%s'" = "Running command: %s %s -N -A %s -c '%s'";
 "SEQUENCE uses indefinite length" = "SEQUENCE uses indefinite length";
@@ -1055,7 +1022,6 @@
 "Set Printer Options" = "Set Printer Options";
 "Set Publishing" = "Set Publishing";
 "Shipping Address" = "Shipping Address";
-"Shipping Address - 2 5/16 x 4\"" = "Shipping Address - 2 5/16 x 4\"";
 "Short-Edge (Landscape)" = "Short-Edge (Landscape)";
 "Special Paper" = "Special Paper";
 "Spooling job, %.0f%% complete." = "Spooling job, %.0f%% complete.";
@@ -1098,9 +1064,14 @@
 "The paper tray is missing." = "The paper tray is missing.";
 "The paper tray needs to be filled." = "The paper tray needs to be filled.";
 "The printer URI is incorrect or no longer exists." = "The printer URI is incorrect or no longer exists.";
-"The printer is busy." = "The printer is busy.";
+"The printer did not respond." = "The printer did not respond.";
+"The printer does not support IPP/%d.%d, trying IPP/%s." = "The printer does not support IPP/%d.%d, trying IPP/%s.";
+"The printer is in use." = "The printer is in use.";
 "The printer is not connected." = "The printer is not connected.";
 "The printer is not responding." = "The printer is not responding.";
+"The printer is now connected." = "The printer is now connected.";
+"The printer is now online." = "The printer is now online.";
+"The printer is offline." = "The printer is offline.";
 "The printer is running low on ink." = "The printer is running low on ink.";
 "The printer is running low on toner." = "The printer is running low on toner.";
 "The printer is unreachable at this time." = "The printer is unreachable at this time.";
@@ -1144,20 +1115,21 @@
 "US Letter Oversize" = "US Letter Oversize";
 "US Letter Oversize Long Edge" = "US Letter Oversize Long Edge";
 "US Letter Small" = "US Letter Small";
-"Unable to access cupsd.conf file:" = "Unable to access cupsd.conf file:";
-"Unable to add RSS subscription:" = "Unable to add RSS subscription:";
-"Unable to add class:" = "Unable to add class:";
+"Unable to access cupsd.conf file" = "Unable to access cupsd.conf file";
+"Unable to access help file." = "Unable to access help file.";
+"Unable to add RSS subscription" = "Unable to add RSS subscription";
+"Unable to add class" = "Unable to add class";
 "Unable to add document to print job." = "Unable to add document to print job.";
 "Unable to add job for destination \"%s\"." = "Unable to add job for destination \"%s\".";
-"Unable to add printer:" = "Unable to add printer:";
+"Unable to add printer" = "Unable to add printer";
 "Unable to allocate memory for file types." = "Unable to allocate memory for file types.";
 "Unable to allocate memory for page info" = "Unable to allocate memory for page info";
 "Unable to allocate memory for pages array" = "Unable to allocate memory for pages array";
-"Unable to cancel RSS subscription:" = "Unable to cancel RSS subscription:";
+"Unable to cancel RSS subscription" = "Unable to cancel RSS subscription";
 "Unable to cancel print job." = "Unable to cancel print job.";
-"Unable to change printer-is-shared attribute:" = "Unable to change printer-is-shared attribute:";
-"Unable to change printer:" = "Unable to change printer:";
-"Unable to change server settings:" = "Unable to change server settings:";
+"Unable to change printer" = "Unable to change printer";
+"Unable to change printer-is-shared attribute" = "Unable to change printer-is-shared attribute";
+"Unable to change server settings" = "Unable to change server settings";
 "Unable to configure printer options." = "Unable to configure printer options.";
 "Unable to connect to host." = "Unable to connect to host.";
 "Unable to contact printer, queuing on next printer in class." = "Unable to contact printer, queuing on next printer in class.";
@@ -1172,10 +1144,9 @@
 "Unable to create compressed print file" = "Unable to create compressed print file";
 "Unable to create printer-uri" = "Unable to create printer-uri";
 "Unable to create temporary file" = "Unable to create temporary file";
-"Unable to create temporary file:" = "Unable to create temporary file:";
-"Unable to delete class:" = "Unable to delete class:";
-"Unable to delete printer:" = "Unable to delete printer:";
-"Unable to do maintenance command:" = "Unable to do maintenance command:";
+"Unable to delete class" = "Unable to delete class";
+"Unable to delete printer" = "Unable to delete printer";
+"Unable to do maintenance command" = "Unable to do maintenance command";
 "Unable to edit cupsd.conf files larger than 1MB" = "Unable to edit cupsd.conf files larger than 1MB";
 "Unable to establish a secure connection to host (certificate chain invalid)." = "Unable to establish a secure connection to host (certificate chain invalid).";
 "Unable to establish a secure connection to host (certificate not yet valid)." = "Unable to establish a secure connection to host (certificate not yet valid).";
@@ -1189,31 +1160,31 @@
 "Unable to find printer." = "Unable to find printer.";
 "Unable to generate compressed print file" = "Unable to generate compressed print file";
 "Unable to get backend exit status." = "Unable to get backend exit status.";
-"Unable to get class list:" = "Unable to get class list:";
-"Unable to get class status:" = "Unable to get class status:";
-"Unable to get list of printer drivers:" = "Unable to get list of printer drivers:";
-"Unable to get printer attributes:" = "Unable to get printer attributes:";
-"Unable to get printer list:" = "Unable to get printer list:";
+"Unable to get class list" = "Unable to get class list";
+"Unable to get class status" = "Unable to get class status";
+"Unable to get list of printer drivers" = "Unable to get list of printer drivers";
+"Unable to get printer attributes" = "Unable to get printer attributes";
+"Unable to get printer list" = "Unable to get printer list";
+"Unable to get printer status" = "Unable to get printer status";
 "Unable to get printer status." = "Unable to get printer status.";
-"Unable to get printer status:" = "Unable to get printer status:";
 "Unable to install Windows 2000 printer driver files (%d)." = "Unable to install Windows 2000 printer driver files (%d).";
 "Unable to install Windows 9x printer driver files (%d)." = "Unable to install Windows 9x printer driver files (%d).";
+"Unable to load help index." = "Unable to load help index.";
 "Unable to locate printer \"%s\"." = "Unable to locate printer \"%s\".";
 "Unable to locate printer." = "Unable to locate printer.";
-"Unable to modify class:" = "Unable to modify class:";
-"Unable to modify printer:" = "Unable to modify printer:";
+"Unable to modify class" = "Unable to modify class";
+"Unable to modify printer" = "Unable to modify printer";
 "Unable to move job" = "Unable to move job";
 "Unable to move jobs" = "Unable to move jobs";
 "Unable to open PPD file" = "Unable to open PPD file";
-"Unable to open PPD file:" = "Unable to open PPD file:";
 "Unable to open compressed print file" = "Unable to open compressed print file";
 "Unable to open cupsd.conf file:" = "Unable to open cupsd.conf file:";
 "Unable to open device file" = "Unable to open device file";
 "Unable to open document #%d in job #%d." = "Unable to open document #%d in job #%d.";
+"Unable to open help file." = "Unable to open help file.";
 "Unable to open print file" = "Unable to open print file";
 "Unable to open raster file" = "Unable to open raster file";
-"Unable to print test page:" = "Unable to print test page:";
-"Unable to read print data" = "Unable to read print data";
+"Unable to print test page" = "Unable to print test page";
 "Unable to read print data." = "Unable to read print data.";
 "Unable to resolve printer URI." = "Unable to resolve printer URI.";
 "Unable to run \"%s\": %s" = "Unable to run \"%s\": %s";
@@ -1221,10 +1192,10 @@
 "Unable to send command to printer driver" = "Unable to send command to printer driver";
 "Unable to send data to printer." = "Unable to send data to printer.";
 "Unable to set Windows printer driver (%d)." = "Unable to set Windows printer driver (%d).";
-"Unable to set options:" = "Unable to set options:";
-"Unable to set server default:" = "Unable to set server default:";
+"Unable to set options" = "Unable to set options";
+"Unable to set server default" = "Unable to set server default";
 "Unable to start backend process." = "Unable to start backend process.";
-"Unable to upload cupsd.conf file:" = "Unable to upload cupsd.conf file:";
+"Unable to upload cupsd.conf file" = "Unable to upload cupsd.conf file";
 "Unable to use legacy USB class driver." = "Unable to use legacy USB class driver.";
 "Unable to write print data" = "Unable to write print data";
 "Unable to write uncompressed print data: %s" = "Unable to write uncompressed print data: %s";
@@ -1258,8 +1229,6 @@
 "Upgrade Required" = "Upgrade Required";
 "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]" = "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]";
 "Usage: %s job-id user title copies options [file]" = "Usage: %s job-id user title copies options [file]";
-"Usage: %s job-id user title copies options file" = "Usage: %s job-id user title copies options file";
-"Usage: convert [ options ]" = "Usage: convert [ options ]";
 "Usage: cupsaddsmb [options] printer1 ... printerN" = "Usage: cupsaddsmb [options] printer1 ... printerN";
 "Usage: cupsctl [options] [param=value ... paramN=valueN]" = "Usage: cupsctl [options] [param=value ... paramN=valueN]";
 "Usage: cupsd [options]" = "Usage: cupsd [options]";
@@ -1294,7 +1263,6 @@
 "aborted" = "aborted";
 "canceled" = "canceled";
 "completed" = "completed";
-"convert: Use the -f option to specify a file to convert." = "convert: Use the -f option to specify a file to convert.";
 "cups-deviced failed to execute." = "cups-deviced failed to execute.";
 "cups-driverd failed to execute." = "cups-driverd failed to execute.";
 "cupsaddsmb: No PPD file for printer \"%s\" - %s" = "cupsaddsmb: No PPD file for printer \"%s\" - %s";
@@ -1321,8 +1289,6 @@
 "help\t\tGet help on commands." = "help\t\tGet help on commands.";
 "idle" = "idle";
 "ipptool: \"-i\" and \"-n\" are incompatible with -X\"." = "ipptool: \"-i\" and \"-n\" are incompatible with -X\".";
-"ipptool: \"-i\" is incompatible with \"-X\"." = "ipptool: \"-i\" is incompatible with \"-X\".";
-"ipptool: \"-n\" is incompatible with \"-X\"." = "ipptool: \"-n\" is incompatible with \"-X\".";
 "ipptool: Bad URI - %s." = "ipptool: Bad URI - %s.";
 "ipptool: Bad version %s for \"-V\"." = "ipptool: Bad version %s for \"-V\".";
 "ipptool: Invalid seconds for \"-i\"." = "ipptool: Invalid seconds for \"-i\".";

diff --git a/ppdc/ppdc.cxx b/ppdc/ppdc.cxx
index abd035efadd3303b8677f0ea1e12a7b77fea3920..b302c8acae99a130262e7318c69e356d9d5cf691 100644 (file)
--- a/ppdc/ppdc.cxx
+++ b/ppdc/ppdc.cxx
@@ -449,8 +449,7 @@ usage(void)
                           "as the filename."));
   _cupsLangPuts(stdout, _("  -t                      Test PPDs instead of "
                           "generating them."));
-  _cupsLangPuts(stdout, _("  -v                      Be verbose (more v's for "
-                          "more verbosity)."));
+  _cupsLangPuts(stdout, _("  -v                      Be verbose."));
   _cupsLangPuts(stdout, _("  -z                      Compress PPD files using "
                           "GNU zip."));
   _cupsLangPuts(stdout, _("  --cr                    End lines with CR (Mac "

diff --git a/ppdc/ppdpo.cxx b/ppdc/ppdpo.cxx
index bdf0f7c0529a11424c9e87f8dd8834aacb4d4738..01513fd55f83ed621228136dfb8ee81e54a4ddff 100644 (file)
--- a/ppdc/ppdpo.cxx
+++ b/ppdc/ppdpo.cxx
@@ -3,7 +3,7 @@
 //
 //   PPD file message catalog program for the CUPS PPD Compiler.
 //
-//   Copyright 2007-2011 by Apple Inc.
+//   Copyright 2007-2012 by Apple Inc.
 //   Copyright 2002-2005 by Easy Software Products.
 //
 //   These coded instructions, statements, and computer programs are the
@@ -256,8 +256,7 @@ usage(void)
                           "value."));
   _cupsLangPuts(stdout, _("  -I include-dir          Add include directory to "
                           "search path."));
-  _cupsLangPuts(stdout, _("  -v                      Be verbose (more v's for "
-                          "more verbosity)."));
+  _cupsLangPuts(stdout, _("  -v                      Be verbose."));
 
   exit(1);
 }

diff --git a/ppdc/sample.drv b/ppdc/sample.drv
index 1af2a68474b25beee83f5d1eac4cf8cd07c26547..2b7e02afb8c2d3477e41660a6c2b5a833b4801c5 100644 (file)
--- a/ppdc/sample.drv
+++ b/ppdc/sample.drv
@@ -44,15 +44,6 @@
 //#po zh_TW ""
 
 // MediaSize sizes used by label drivers...
-#media "w81h252/Address - 1 1/8 x 3 1/2\"" 81 252
-#media "w101h252/Large Address - 1 4/10 x 3 1/2\"" 101 252
-#media "w54h144/Return Address - 3/4 x 2\"" 54 144
-#media "w167h288/Shipping Address - 2 5/16 x 4\"" 167 288
-#media "w162h540/Internet Postage 2-Part - 2 1/4 x 7 1/2\"" 162 540
-#media "w162h504/Internet Postage 3-Part - 2 1/4 x 7\"" 162 504
-#media "w41h248/File Folder - 9/16 x 3 7/16\"" 41 248
-#media "w41h144/Hanging Folder - 9/16 x 2\"" 41 144
-#media "w153h198/3.5\" Disk - 2 1/8 x 2 3/4\"" 153 198
 #media "w90h18/1.25x0.25\"" 90 18
 #media "w90h162/1.25x2.25\"" 90 162
 #media "w108h18/1.50x0.25\"" 108 18
@@ -117,7 +108,7 @@ Attribute "FileSystem" "" "False"
 Attribute "LandscapeOrientation" "" "Plus90"
 Attribute "TTRasterizer" "" "Type42"
 
-Copyright "Copyright 2007-2011 by Apple Inc."
+Copyright "Copyright 2007-2012 by Apple Inc."
 Copyright "Copyright 1997-2007 by Easy Software Products."
 Copyright ""
 Copyright "These coded instructions, statements, and computer programs are the"

diff --git a/scheduler/cupsfilter.c b/scheduler/cupsfilter.c
index c9692b7ef16110b3ee39e4f4af6aceec0f234565..a7280a35754fb6131676d29c072b3263f368b627 100644 (file)
--- a/scheduler/cupsfilter.c
+++ b/scheduler/cupsfilter.c
@@ -3,7 +3,7 @@
  *
  *   Filtering program for CUPS.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -102,8 +102,7 @@ static int          open_pipe(int *fds);
 static int             read_cupsd_conf(const char *filename);
 static void            set_string(char **s, const char *val);
 static void            sighandler(int sig);
-static void            usage(const char *command, const char *opt)
-                       __attribute__((noreturn));
+static void            usage(const char *opt) __attribute__((noreturn));
 
 
 /*
@@ -193,7 +192,7 @@ main(int  argc,                             /* I - Number of command-line args */
              if (i < argc && !infile)
                infile = argv[i];
              else
-               usage(command, opt);
+               usage(opt);
              break;
 
           case 'a' : /* Specify option... */
@@ -201,7 +200,7 @@ main(int  argc,                             /* I - Number of command-line args */
              if (i < argc)
                num_options = cupsParseOptions(argv[i], num_options, &options);
              else
-               usage(command, opt);
+               usage(opt);
              break;
 
           case 'c' : /* Specify cupsd.conf file location... */
@@ -215,7 +214,7 @@ main(int  argc,                             /* I - Number of command-line args */
                  strlcpy(cupsdconf, argv[i], sizeof(cupsdconf));
              }
              else
-               usage(command, opt);
+               usage(opt);
              break;
 
           case 'd' : /* Specify the real printer name */
@@ -223,7 +222,7 @@ main(int  argc,                             /* I - Number of command-line args */
              if (i < argc)
                printer = argv[i];
              else
-               usage(command, opt);
+               usage(opt);
              break;
 
          case 'D' : /* Delete input file after conversion */
@@ -239,7 +238,7 @@ main(int  argc,                             /* I - Number of command-line args */
              if (i < argc && !infile)
                infile = argv[i];
              else
-               usage(command, opt);
+               usage(opt);
              break;
 
           case 'i' : /* Specify source MIME type... */
@@ -247,12 +246,12 @@ main(int  argc,                           /* I - Number of command-line args */
              if (i < argc)
              {
                if (sscanf(argv[i], "%15[^/]/%255s", super, type) != 2)
-                 usage(command, opt);
+                 usage(opt);
 
                 srctype = argv[i];
              }
              else
-               usage(command, opt);
+               usage(opt);
              break;
 
           case 'j' : /* Get job file or specify destination MIME type... */
@@ -265,7 +264,7 @@ main(int  argc,                             /* I - Number of command-line args */
                  infile = TempFile;
                }
                else
-                 usage(command, opt);
+                 usage(opt);
 
                 break;
              }
@@ -275,12 +274,12 @@ main(int  argc,                           /* I - Number of command-line args */
              if (i < argc)
              {
                if (sscanf(argv[i], "%15[^/]/%255s", super, type) != 2)
-                 usage(command, opt);
+                 usage(opt);
 
                 dsttype = argv[i];
              }
              else
-               usage(command, opt);
+               usage(opt);
              break;
 
           case 'n' : /* Specify number of copies... */
@@ -289,7 +288,7 @@ main(int  argc,                             /* I - Number of command-line args */
                num_options = cupsAddOption("copies", argv[i], num_options,
                                            &options);
              else
-               usage(command, opt);
+               usage(opt);
              break;
 
           case 'o' : /* Specify option(s) or output filename */
@@ -299,7 +298,7 @@ main(int  argc,                             /* I - Number of command-line args */
                if (!strcmp(command, "convert"))
                {
                  if (outfile)
-                   usage(command, NULL);
+                   usage(NULL);
                  else
                    outfile = argv[i];
                }
@@ -308,7 +307,7 @@ main(int  argc,                             /* I - Number of command-line args */
                                                 &options);
              }
              else
-               usage(command, opt);
+               usage(opt);
              break;
 
           case 'p' : /* Specify PPD file... */
@@ -317,7 +316,7 @@ main(int  argc,                             /* I - Number of command-line args */
              if (i < argc)
                ppdfile = argv[i];
              else
-               usage(command, opt);
+               usage(opt);
              break;
 
           case 't' : /* Specify title... */
@@ -326,7 +325,7 @@ main(int  argc,                             /* I - Number of command-line args */
              if (i < argc)
                title = argv[i];
              else
-               usage(command, opt);
+               usage(opt);
              break;
 
          case 'u' : /* Delete PPD file after conversion */
@@ -338,11 +337,11 @@ main(int  argc,                           /* I - Number of command-line args */
              if (i < argc)
                user = argv[i];
              else
-               usage(command, opt);
+               usage(opt);
              break;
 
          default : /* Something we don't understand... */
-             usage(command, opt);
+             usage(opt);
              break;
        }
     }
@@ -351,22 +350,17 @@ main(int  argc,                           /* I - Number of command-line args */
       if (strcmp(command, "convert"))
        infile = argv[i];
       else
-      {
-       _cupsLangPuts(stderr,
-                     _("convert: Use the -f option to specify a file to "
-                       "convert."));
-       usage(command, NULL);
-      }
+       usage(NULL);
     }
     else
     {
       _cupsLangPuts(stderr,
                     _("cupsfilter: Only one filename can be specified."));
-      usage(command, NULL);
+      usage(NULL);
     }
 
   if (!infile && !srctype)
-    usage(command, NULL);
+    usage(NULL);
 
   if (!title)
   {
@@ -1432,59 +1426,30 @@ usage(const char *command,              /* I - Command name */
   if (opt)
     _cupsLangPrintf(stderr, _("%s: Unknown option \"%c\"."), command, *opt);
 
-  if (!strcmp(command, "cupsfilter"))
-  {
-    _cupsLangPuts(stdout, _("Usage: cupsfilter [ options ] filename"));
-    _cupsLangPuts(stdout, _("Options:"));
-    _cupsLangPuts(stdout, _("  -D                      Remove the input file "
-                            "when finished."));
-    _cupsLangPuts(stdout, _("  -P filename.ppd         Set PPD file."));
-    _cupsLangPuts(stdout, _("  -U username             Set username for job."));
-    _cupsLangPuts(stdout, _("  -c cupsd.conf           Set cupsd.conf file to "
-                            "use."));
-    _cupsLangPuts(stdout, _("  -d printer              Use the named "
-                            "printer."));
-    _cupsLangPuts(stdout, _("  -e                      Use every filter from "
-                            "the PPD file."));
-    _cupsLangPuts(stdout, _("  -i mime/type            Set input MIME type "
-                            "(otherwise auto-typed)."));
-    _cupsLangPuts(stdout, _("  -j job-id[,N]           Filter file N from the "
-                            "specified job (default is file 1)."));
-    _cupsLangPuts(stdout, _("  -m mime/type            Set output MIME type "
-                           "(otherwise application/pdf)."));
-    _cupsLangPuts(stdout, _("  -n copies               Set number of copies."));
-    _cupsLangPuts(stdout, _("  -o name=value           Set option(s)."));
-    _cupsLangPuts(stdout, _("  -p filename.ppd         Set PPD file."));
-    _cupsLangPuts(stdout, _("  -t title                Set title."));
-    _cupsLangPuts(stdout, _("  -u                      Remove the PPD file "
-                            "when finished."));
-  }
-  else
-  {
-    _cupsLangPuts(stdout, _("Usage: convert [ options ]"));
-    _cupsLangPuts(stdout, _("Options:"));
-    _cupsLangPuts(stdout, _("  -D                      Remove the input file "
-                            "when finished."));
-    _cupsLangPuts(stdout, _("  -J title                Set title."));
-    _cupsLangPuts(stdout, _("  -P filename.ppd         Set PPD file."));
-    _cupsLangPuts(stdout, _("  -U username             Set username for job."));
-    _cupsLangPuts(stdout, _("  -a 'name=value ...'     Set option(s)."));
-    _cupsLangPuts(stdout, _("  -c copies               Set number of copies."));
-    _cupsLangPuts(stdout, _("  -d printer              Use the named "
-                            "printer."));
-    _cupsLangPuts(stdout, _("  -e                      Use every filter from "
-                            "the PPD file."));
-    _cupsLangPuts(stdout, _("  -f filename             Set file to be "
-                            "converted (otherwise stdin)."));
-    _cupsLangPuts(stdout, _("  -i mime/type            Set input MIME type "
-                            "(otherwise auto-typed)."));
-    _cupsLangPuts(stdout, _("  -j mime/type            Set output MIME type "
-                           "(otherwise application/pdf)."));
-    _cupsLangPuts(stdout, _("  -o filename             Set file to be "
-                            "generated (otherwise stdout)."));
-    _cupsLangPuts(stdout, _("  -u                      Remove the PPD file "
-                            "when finished."));
-  }
+  _cupsLangPuts(stdout, _("Usage: cupsfilter [ options ] filename"));
+  _cupsLangPuts(stdout, _("Options:"));
+  _cupsLangPuts(stdout, _("  -D                      Remove the input file "
+                         "when finished."));
+  _cupsLangPuts(stdout, _("  -P filename.ppd         Set PPD file."));
+  _cupsLangPuts(stdout, _("  -U username             Specify username."));
+  _cupsLangPuts(stdout, _("  -c cupsd.conf           Set cupsd.conf file to "
+                         "use."));
+  _cupsLangPuts(stdout, _("  -d printer              Use the named "
+                         "printer."));
+  _cupsLangPuts(stdout, _("  -e                      Use every filter from "
+                         "the PPD file."));
+  _cupsLangPuts(stdout, _("  -i mime/type            Set input MIME type "
+                         "(otherwise auto-typed)."));
+  _cupsLangPuts(stdout, _("  -j job-id[,N]           Filter file N from the "
+                         "specified job (default is file 1)."));
+  _cupsLangPuts(stdout, _("  -m mime/type            Set output MIME type "
+                         "(otherwise application/pdf)."));
+  _cupsLangPuts(stdout, _("  -n copies               Set number of copies."));
+  _cupsLangPuts(stdout, _("  -o name=value           Set option(s)."));
+  _cupsLangPuts(stdout, _("  -p filename.ppd         Set PPD file."));
+  _cupsLangPuts(stdout, _("  -t title                Set title."));
+  _cupsLangPuts(stdout, _("  -u                      Remove the PPD file "
+                         "when finished."));
 
   exit(1);
 }

diff --git a/scheduler/main.c b/scheduler/main.c
index 50d60dbb300e044844997028b4f508bd043eb6b7..1c6df547b3eb1666af6c9ad7cbc1662bc169aad2 100644 (file)
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -2016,8 +2016,7 @@ usage(int status)                 /* O - Exit status */
 
   _cupsLangPuts(fp, _("Usage: cupsd [options]"));
   _cupsLangPuts(fp, _("Options:"));
-  _cupsLangPuts(fp, _("  -c config-file          Load alternate configuration "
-                      "file."));
+  _cupsLangPuts(fp, _("  -c cupsd.conf           Set cupsd.conf file to use."));
   _cupsLangPuts(fp, _("  -f                      Run in the foreground."));
   _cupsLangPuts(fp, _("  -F                      Run in the foreground but "
                       "detach from console."));

diff --git a/systemv/cupsaddsmb.c b/systemv/cupsaddsmb.c
index 0f0431d39bee22a101342f2b91ca6d9d646fa0c4..dfce0022f7b00430f23301d64c52faa36bea8475 100644 (file)
--- a/systemv/cupsaddsmb.c
+++ b/systemv/cupsaddsmb.c
@@ -3,7 +3,7 @@
  *
  *   "cupsaddsmb" command for CUPS.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 2001-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -282,17 +282,13 @@ usage(void)
   _cupsLangPuts(stdout, _("       cupsaddsmb [options] -a"));
   _cupsLangPuts(stdout, "");
   _cupsLangPuts(stdout, _("Options:"));
-  _cupsLangPuts(stdout, _("  -E                      Encrypt the connection to "
-                          "the server."));
+  _cupsLangPuts(stdout, _("  -E                      Encrypt the connection."));
   _cupsLangPuts(stdout, _("  -H samba-server         Use the named SAMBA "
                           "server."));
-  _cupsLangPuts(stdout, _("  -U samba-user           Authenticate using the "
-                          "named SAMBA user."));
+  _cupsLangPuts(stdout, _("  -U username             Specify username."));
   _cupsLangPuts(stdout, _("  -a                      Export all printers."));
-  _cupsLangPuts(stdout, _("  -h cups-server          Use the named CUPS "
-                          "server."));
-  _cupsLangPuts(stdout, _("  -v                      Be verbose (show "
-                          "commands)."));
+  _cupsLangPuts(stdout, _("  -h server[:port]        Specify server address."));
+  _cupsLangPuts(stdout, _("  -v                      Be verbose."));
 
   exit(1);
 }

diff --git a/systemv/cupsctl.c b/systemv/cupsctl.c
index e65a4f77b092bad44d5351fa84b9cc4d35f5c49a..0cd2a59d787cc4926c6dddce9015928ceb5f4263 100644 (file)
--- a/systemv/cupsctl.c
+++ b/systemv/cupsctl.c
@@ -3,7 +3,7 @@
  *
  *   Scheduler control program for CUPS.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 2006-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -202,7 +202,7 @@ usage(const char *opt)                      /* I - Option character/string */
   _cupsLangPuts(stdout, "");
   _cupsLangPuts(stdout, _("Options:"));
   _cupsLangPuts(stdout, "");
-  _cupsLangPuts(stdout, _("  -E                      Enable encryption."));
+  _cupsLangPuts(stdout, _("  -E                      Encrypt the connection."));
   _cupsLangPuts(stdout, _("  -U username             Specify username."));
   _cupsLangPuts(stdout, _("  -h server[:port]        Specify server "
                           "address."));

diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c
index d42755c220c8b9c7da3b69ccba427ee0e56343e5..04412ce16451f0cc735b27aad7a6bda30ea41b32 100644 (file)
--- a/systemv/cupstestppd.c
+++ b/systemv/cupstestppd.c
@@ -331,8 +331,8 @@ main(int  argc,                             /* I - Number of command-line args */
           {
             _cupsLangPuts(stdout, _(" FAIL"));
             _cupsLangPrintf(stdout,
-                           _("      **FAIL**  Unable to open PPD file - %s"),
-                           strerror(errno));
+                           _("      **FAIL**  Unable to open PPD file - %s on "
+                             "line %d."), strerror(errno), 0);
            continue;
           }
         }
@@ -350,8 +350,8 @@ main(int  argc,                             /* I - Number of command-line args */
           {
             _cupsLangPuts(stdout, _(" FAIL"));
             _cupsLangPrintf(stdout,
-                           _("      **FAIL**  Unable to open PPD file - %s"),
-                           strerror(errno));
+                           _("      **FAIL**  Unable to open PPD file - %s on "
+                             "line %d."), strerror(errno), 0);
           }
        }
        else
@@ -511,7 +511,7 @@ main(int  argc,                             /* I - Number of command-line args */
            _cupsLangPuts(stdout, _(" FAIL"));
 
          _cupsLangPrintf(stdout,
-                         _("      **FAIL**  BAD DefaultImageableArea %s\n"
+                         _("      **FAIL**  Bad DefaultImageableArea %s\n"
                            "                REF: Page 102, section 5.15."),
                          attr->value);
        }
@@ -547,7 +547,7 @@ main(int  argc,                             /* I - Number of command-line args */
            _cupsLangPuts(stdout, _(" FAIL"));
 
          _cupsLangPrintf(stdout,
-                         _("      **FAIL**  BAD DefaultPaperDimension %s\n"
+                         _("      **FAIL**  Bad DefaultPaperDimension %s\n"
                            "                REF: Page 103, section 5.15."),
                          attr->value);
        }
@@ -577,7 +577,7 @@ main(int  argc,                             /* I - Number of command-line args */
                  _cupsLangPuts(stdout, _(" FAIL"));
 
                _cupsLangPrintf(stdout,
-                               _("      **FAIL**  BAD Default%s %s\n"
+                               _("      **FAIL**  Bad Default%s %s\n"
                                  "                REF: Page 40, section 4.5."),
                                option->keyword, option->defchoice);
              }
@@ -739,10 +739,11 @@ main(int  argc,                           /* I - Number of command-line args */
            if (!errors && !verbose)
              _cupsLangPuts(stdout, _(" FAIL"));
 
-           _cupsLangPuts(stdout,
-                         _("      **FAIL**  BAD Manufacturer (should be "
-                           "\"HP\")\n"
-                           "                REF: Page 211, table D.1."));
+           _cupsLangPrintf(stdout,
+                           _("      **FAIL**  Bad Manufacturer (should be "
+                             "\"%s\")\n"
+                             "                REF: Page 211, table D.1."),
+                           "HP");
           }
 
          errors ++;
@@ -755,10 +756,11 @@ main(int  argc,                           /* I - Number of command-line args */
            if (!errors && !verbose)
              _cupsLangPuts(stdout, _(" FAIL"));
 
-           _cupsLangPuts(stdout,
-                         _("      **FAIL**  BAD Manufacturer (should be "
-                           "\"Oki\")\n"
-                           "                REF: Page 211, table D.1."));
+           _cupsLangPrintf(stdout,
+                           _("      **FAIL**  Bad Manufacturer (should be "
+                             "\"%s\")\n"
+                             "                REF: Page 211, table D.1."),
+                           "Oki");
           }
 
          errors ++;
@@ -795,7 +797,7 @@ main(int  argc,                             /* I - Number of command-line args */
              _cupsLangPuts(stdout, _(" FAIL"));
 
            _cupsLangPrintf(stdout,
-                           _("      **FAIL**  BAD ModelName - \"%c\" not "
+                           _("      **FAIL**  Bad ModelName - \"%c\" not "
                              "allowed in string.\n"
                              "                REF: Pages 59-60, section 5.3."),
                            *ptr);
@@ -912,7 +914,7 @@ main(int  argc,                             /* I - Number of command-line args */
              _cupsLangPuts(stdout, _(" FAIL"));
 
            _cupsLangPuts(stdout,
-                         _("      **FAIL**  BAD Product - not \"(string)\".\n"
+                         _("      **FAIL**  Bad Product - not \"(string)\".\n"
                            "                REF: Page 62, section 5.3."));
           }
 
@@ -951,7 +953,7 @@ main(int  argc,                             /* I - Number of command-line args */
              _cupsLangPuts(stdout, _(" FAIL"));
 
            _cupsLangPuts(stdout,
-                         _("      **FAIL**  BAD PSVersion - not \"(string) "
+                         _("      **FAIL**  Bad PSVersion - not \"(string) "
                            "int\".\n"
                            "                REF: Pages 62-64, section 5.3."));
           }
@@ -986,7 +988,7 @@ main(int  argc,                             /* I - Number of command-line args */
              _cupsLangPuts(stdout, _(" FAIL"));
 
            _cupsLangPuts(stdout,
-                         _("      **FAIL**  BAD ShortNickName - longer "
+                         _("      **FAIL**  Bad ShortNickName - longer "
                            "than 31 chars.\n"
                            "                REF: Pages 64-65, section 5.3."));
           }
@@ -1020,7 +1022,7 @@ main(int  argc,                           /* I - Number of command-line args */
            _cupsLangPuts(stdout, _(" FAIL"));
 
          _cupsLangPuts(stdout,
-                       _("      **FAIL**  BAD JobPatchFile attribute in file\n"
+                       _("      **FAIL**  Bad JobPatchFile attribute in file\n"
                          "                REF: Page 24, section 3.4."));
         }
 
@@ -1144,7 +1146,7 @@ main(int  argc,                           /* I - Number of command-line args */
                _cupsLangPuts(stdout, _(" FAIL"));
 
              _cupsLangPrintf(stdout,
-                             _("      **FAIL**  Bad %s choice %s\n"
+                             _("      **FAIL**  Bad option %s choice %s\n"
                                "                REF: Page 84, section 5.9"),
                              option->keyword, choice->choice);
             }
@@ -2141,8 +2143,8 @@ check_case(ppd_file_t *ppd,               /* I - PPD file */
 
          if (verbose >= 0)
            _cupsLangPrintf(stdout,
-                           _("      **FAIL**  Multiple occurrences of %s "
-                             "choice name %s."),
+                           _("      **FAIL**  Multiple occurrences of "
+                             "option %s choice name %s."),
                            optiona->keyword, choicea->choice);
 
          errors ++;
@@ -2158,8 +2160,8 @@ check_case(ppd_file_t *ppd,               /* I - PPD file */
 
          if (verbose >= 0)
            _cupsLangPrintf(stdout,
-                           _("      **FAIL**  %s choice names %s and %s "
-                             "differ only by case."),
+                           _("      **FAIL**  Option %s choice names %s and "
+                             "%s differ only by case."),
                            optiona->keyword, choicea->choice, choiceb->choice);
 
          errors ++;
@@ -3231,7 +3233,7 @@ check_sizes(ppd_file_t *ppd,              /* I - PPD file */
           else
             snprintf(buf, sizeof(buf), "%sRotated", pwg_media->ppd);
         }
-        
+
         if (size->left == 0 && size->bottom == 0 &&
            size->right == size->width && size->top == size->length)
         {
@@ -3277,7 +3279,7 @@ check_sizes(ppd_file_t *ppd,              /* I - PPD file */
          * Check for EnvSizeName as well...
          */
 
-      if (strncmp(pwg_media->ppd, "Env", 3) && 
+      if (strncmp(pwg_media->ppd, "Env", 3) &&
           !strncmp(size->name, "Env", 3))
             snprintf(buf, sizeof(buf), "Env%s", pwg_media->ppd);
 
@@ -3803,7 +3805,7 @@ usage(void)
                           "errors."));
   _cupsLangPuts(stdout, _("  -q                      Run silently."));
   _cupsLangPuts(stdout, _("  -r                      Use 'relaxed' open mode."));
-  _cupsLangPuts(stdout, _("  -v                      Be slightly verbose."));
+  _cupsLangPuts(stdout, _("  -v                      Be verbose."));
   _cupsLangPuts(stdout, _("  -vv                     Be very verbose."));
 
   exit(ERROR_USAGE);

diff --git a/templates/error.tmpl b/templates/error.tmpl
index ff30a4c6c3ffe262eceb392eca1fe6708f2b4f01..86235732e10964a9d202cf38d847fbc3d04feb93 100644 (file)
--- a/templates/error.tmpl
+++ b/templates/error.tmpl
@@ -2,7 +2,7 @@
 
 <H2 CLASS="title">{?title} {?printer_name} Error</H2>
 
-<P>{?message?{message}:Error:}</P>
+<P>{?message?{message}:Error}:</P>
 
 <BLOCKQUOTE>{error}</BLOCKQUOTE>
 

diff --git a/test/ipptool.c b/test/ipptool.c
index 5c1dd26f2b1dfef548e2e6ad893c4ed843aff0d2..1663da770fb3def1f6db44f60ca0ce923f5bcedb 100644 (file)
--- a/test/ipptool.c
+++ b/test/ipptool.c
@@ -507,8 +507,8 @@ main(int  argc,                             /* I - Number of command-line args */
 
               if (Output == _CUPS_OUTPUT_PLIST && interval)
              {
-               _cupsLangPuts(stderr, _("ipptool: \"-i\" is incompatible with "
-                                       "\"-X\"."));
+               _cupsLangPuts(stderr, _("ipptool: \"-i\" and \"-n\" are "
+                                       "incompatible with -X\"."));
                usage();
              }
              break;
@@ -531,8 +531,8 @@ main(int  argc,                             /* I - Number of command-line args */
 
               if (Output == _CUPS_OUTPUT_PLIST && repeat)
              {
-               _cupsLangPuts(stderr, _("ipptool: \"-n\" is incompatible with "
-                                       "\"-X\"."));
+               _cupsLangPuts(stderr, _("ipptool: \"-i\" and \"-n\" are "
+                                       "incompatible with -X\"."));
                usage();
              }
              break;
@@ -4338,8 +4338,8 @@ usage(void)
   _cupsLangPuts(stderr, _("  -6                      Connect using IPv6."));
   _cupsLangPuts(stderr, _("  -C                      Send requests using "
                           "chunking (default)."));
-  _cupsLangPuts(stderr, _("  -E                      Test with TLS "
-                          "encryption."));
+  _cupsLangPuts(stdout, _("  -E                      Test with HTTP Upgrade to "
+                          "TLS."));
   _cupsLangPuts(stderr, _("  -I                      Ignore errors."));
   _cupsLangPuts(stderr, _("  -L                      Send requests using "
                           "content-length."));
@@ -4359,11 +4359,9 @@ usage(void)
                           "the given time interval."));
   _cupsLangPuts(stderr, _("  -n count                Repeat the last file the "
                           "given number of times."));
-  _cupsLangPuts(stderr, _("  -q                      Be quiet - no output "
-                          "except errors."));
+  _cupsLangPuts(stderr, _("  -q                      Run silently."));
   _cupsLangPuts(stderr, _("  -t                      Produce a test report."));
-  _cupsLangPuts(stderr, _("  -v                      Show all attributes sent "
-                          "and received."));
+  _cupsLangPuts(stderr, _("  -v                      Be verbose."));
 
   exit(1);
 }