Last of the media improvements (Issue #5167)

cups/dest-localization.c:
- Use "other tray" and "other media" for unknown media sources and types.

cups/dest-options.c:
- media-key is king for size matching.
- Synthesize a media-key value using the size name unless we can't get one.

cups/language-private.h:
- Add _CUPS_MESSAGE_PO constant.

cups/pwg-media.c:
- Allow PWG names with a trailing "_foo" qualifier (so media-key still works
  if an application just adds the _cups_size_t.media value as the "media"
  option.

locale/*.{po,pot,strings}:
- Update localization strings.

locale/cups.footer:
- Add common HP and Canon media types.

locale/checkpo.c:
- Fix \ validation.

diff --git a/cups/dest-localization.c b/cups/dest-localization.c
index d6fc8b955ab2222747e95737c718d516609bd6fc..de272e1e7b581d400cd720d928ee959051715fa3 100644 (file)
--- a/cups/dest-localization.c
+++ b/cups/dest-localization.c
@@ -162,8 +162,10 @@ cupsLocalizeDestMedia(
   {
     DEBUG_printf(("1cupsLocalizeDestMedia: MATCH mdb%p [key=\"%s\" size_name=\"%s\" source=\"%s\" type=\"%s\" width=%d length=%d B%d L%d R%d T%d]", (void *)mdb, mdb->key, mdb->size_name, mdb->source, mdb->type, mdb->width, mdb->length, mdb->bottom, mdb->left, mdb->right, mdb->top));
 
-    lsource = cupsLocalizeDestValue(http, dest, dinfo, "media-source", mdb->source);
-    ltype   = cupsLocalizeDestValue(http, dest, dinfo, "media-type", mdb->type);
+    if ((lsource = cupsLocalizeDestValue(http, dest, dinfo, "media-source", mdb->source)) == mdb->source && mdb->source)
+      lsource = _cupsLangString(lang, _("Other Tray"));
+    if ((ltype = cupsLocalizeDestValue(http, dest, dinfo, "media-type", mdb->type)) == mdb->type && mdb->type)
+      ltype = _cupsLangString(lang, _("Other Media"));
   }
   else
   {

diff --git a/cups/dest-options.c b/cups/dest-options.c
index a2830cc1436e0451fa527944210d7acc44a5ea65..ea1067408fca8da3e42dc681e0d5a91a747a7f34 100644 (file)
--- a/cups/dest-options.c
+++ b/cups/dest-options.c
@@ -1030,10 +1030,10 @@ cupsGetDestMediaByIndex(
     return (0);
   }
 
-  if (nsize->size_name)
-    strlcpy(size->media, nsize->size_name, sizeof(size->media));
-  else if (nsize->key)
+  if (nsize->key)
     strlcpy(size->media, nsize->key, sizeof(size->media));
+  else if (nsize->size_name)
+    strlcpy(size->media, nsize->size_name, sizeof(size->media));
   else if ((pwg = pwgMediaForSize(nsize->width, nsize->length)) != NULL)
     strlcpy(size->media, pwg->pwg, sizeof(size->media));
   else
@@ -1605,7 +1605,7 @@ cups_create_media_db(
   pwg_media_t          *pwg;           /* PWG media info */
   cups_array_t         *db;            /* New media database array */
   _cups_media_db_t     mdb;            /* Media entry */
-  char                 media_key[255]; /* Synthesized media-key value */
+  char                 media_key[256]; /* Synthesized media-key value */
 
 
   db = cupsArrayNew3((cups_array_func_t)cups_compare_media_db,
@@ -1706,71 +1706,92 @@ cups_create_media_db(
        }
       }
 
-      if ((media_attr = ippFindAttribute(val->collection, "media-color",
-                                         IPP_TAG_ZERO)) != NULL &&
-          (media_attr->value_tag == IPP_TAG_NAME ||
-           media_attr->value_tag == IPP_TAG_NAMELANG ||
-           media_attr->value_tag == IPP_TAG_KEYWORD))
+      if ((media_attr = ippFindAttribute(val->collection, "media-color", IPP_TAG_ZERO)) != NULL && (media_attr->value_tag == IPP_TAG_NAME || media_attr->value_tag == IPP_TAG_NAMELANG || media_attr->value_tag == IPP_TAG_KEYWORD))
         mdb.color = media_attr->values[0].string.text;
 
-      if ((media_attr = ippFindAttribute(val->collection, "media-info",
-                                         IPP_TAG_TEXT)) != NULL)
+      if ((media_attr = ippFindAttribute(val->collection, "media-info", IPP_TAG_TEXT)) != NULL)
         mdb.info = media_attr->values[0].string.text;
 
-      if ((media_attr = ippFindAttribute(val->collection, "media-key",
-                                         IPP_TAG_ZERO)) != NULL &&
-          (media_attr->value_tag == IPP_TAG_NAME ||
-           media_attr->value_tag == IPP_TAG_NAMELANG ||
-           media_attr->value_tag == IPP_TAG_KEYWORD))
+      if ((media_attr = ippFindAttribute(val->collection, "media-key", IPP_TAG_ZERO)) != NULL && (media_attr->value_tag == IPP_TAG_NAME || media_attr->value_tag == IPP_TAG_NAMELANG || media_attr->value_tag == IPP_TAG_KEYWORD))
         mdb.key = media_attr->values[0].string.text;
 
-      if ((media_attr = ippFindAttribute(val->collection, "media-size-name",
-                                         IPP_TAG_ZERO)) != NULL &&
-          (media_attr->value_tag == IPP_TAG_NAME ||
-           media_attr->value_tag == IPP_TAG_NAMELANG ||
-           media_attr->value_tag == IPP_TAG_KEYWORD))
+      if ((media_attr = ippFindAttribute(val->collection, "media-size-name", IPP_TAG_ZERO)) != NULL && (media_attr->value_tag == IPP_TAG_NAME || media_attr->value_tag == IPP_TAG_NAMELANG || media_attr->value_tag == IPP_TAG_KEYWORD))
         mdb.size_name = media_attr->values[0].string.text;
 
-      if ((media_attr = ippFindAttribute(val->collection, "media-source",
-                                         IPP_TAG_ZERO)) != NULL &&
-          (media_attr->value_tag == IPP_TAG_NAME ||
-           media_attr->value_tag == IPP_TAG_NAMELANG ||
-           media_attr->value_tag == IPP_TAG_KEYWORD))
+      if ((media_attr = ippFindAttribute(val->collection, "media-source", IPP_TAG_ZERO)) != NULL && (media_attr->value_tag == IPP_TAG_NAME || media_attr->value_tag == IPP_TAG_NAMELANG || media_attr->value_tag == IPP_TAG_KEYWORD))
         mdb.source = media_attr->values[0].string.text;
 
-      if ((media_attr = ippFindAttribute(val->collection, "media-type",
-                                         IPP_TAG_ZERO)) != NULL &&
-          (media_attr->value_tag == IPP_TAG_NAME ||
-           media_attr->value_tag == IPP_TAG_NAMELANG ||
-           media_attr->value_tag == IPP_TAG_KEYWORD))
+      if ((media_attr = ippFindAttribute(val->collection, "media-type", IPP_TAG_ZERO)) != NULL && (media_attr->value_tag == IPP_TAG_NAME || media_attr->value_tag == IPP_TAG_NAMELANG || media_attr->value_tag == IPP_TAG_KEYWORD))
         mdb.type = media_attr->values[0].string.text;
 
-      if ((media_attr = ippFindAttribute(val->collection, "media-bottom-margin",
-                                         IPP_TAG_INTEGER)) != NULL)
+      if ((media_attr = ippFindAttribute(val->collection, "media-bottom-margin", IPP_TAG_INTEGER)) != NULL)
         mdb.bottom = media_attr->values[0].integer;
 
-      if ((media_attr = ippFindAttribute(val->collection, "media-left-margin",
-                                         IPP_TAG_INTEGER)) != NULL)
+      if ((media_attr = ippFindAttribute(val->collection, "media-left-margin", IPP_TAG_INTEGER)) != NULL)
         mdb.left = media_attr->values[0].integer;
 
-      if ((media_attr = ippFindAttribute(val->collection, "media-right-margin",
-                                         IPP_TAG_INTEGER)) != NULL)
+      if ((media_attr = ippFindAttribute(val->collection, "media-right-margin", IPP_TAG_INTEGER)) != NULL)
         mdb.right = media_attr->values[0].integer;
 
-      if ((media_attr = ippFindAttribute(val->collection, "media-top-margin",
-                                         IPP_TAG_INTEGER)) != NULL)
+      if ((media_attr = ippFindAttribute(val->collection, "media-top-margin", IPP_TAG_INTEGER)) != NULL)
         mdb.top = media_attr->values[0].integer;
 
       if (!mdb.key)
       {
-        if (flags & CUPS_MEDIA_FLAGS_READY)
-          snprintf(media_key, sizeof(media_key), "cups-media-ready-%d", i + 1);
-       else
-          snprintf(media_key, sizeof(media_key), "cups-media-%d", i + 1);
+        if (!mdb.size_name && (pwg = pwgMediaForSize(mdb.width, mdb.length)) != NULL)
+         mdb.size_name = (char *)pwg->pwg;
+
+        if (!mdb.size_name)
+        {
+         /*
+          * Use a CUPS-specific identifier if we don't have a size name...
+          */
+
+         if (flags & CUPS_MEDIA_FLAGS_READY)
+           snprintf(media_key, sizeof(media_key), "cups-media-ready-%d", i + 1);
+         else
+           snprintf(media_key, sizeof(media_key), "cups-media-%d", i + 1);
+        }
+        else if (mdb.source)
+        {
+         /*
+          * Generate key using size name, source, and type (if set)...
+          */
+
+          if (mdb.type)
+            snprintf(media_key, sizeof(media_key), "%s_%s_%s", mdb.size_name, mdb.source, mdb.type);
+         else
+            snprintf(media_key, sizeof(media_key), "%s_%s", mdb.size_name, mdb.source);
+        }
+        else if (mdb.type)
+        {
+         /*
+          * Generate key using size name and type...
+          */
+
+         snprintf(media_key, sizeof(media_key), "%s_%s", mdb.size_name, mdb.type);
+        }
+        else
+        {
+         /*
+          * Key is just the size name...
+          */
+
+          strlcpy(media_key, mdb.size_name, sizeof(media_key));
+        }
+
+       /*
+        * Append "_borderless" for borderless media...
+        */
+
+        if (!mdb.bottom && !mdb.left && !mdb.right && !mdb.top)
+          strlcat(media_key, "_borderless", sizeof(media_key));
 
         mdb.key = media_key;
       }
 
+      DEBUG_printf(("1cups_create_media_db: Adding media: key=\"%s\", width=%d, length=%d, source=\"%s\", type=\"%s\".", mdb.key, mdb.width, mdb.length, mdb.source, mdb.type));
+
       cupsArrayAdd(db, &mdb);
     }
 

diff --git a/cups/language-private.h b/cups/language-private.h
index ca6a9cb4e5c672c186bce634cbbe590fe45bd205..1f69c4edb1b24ee845900fa0529276e3e810a3cb 100644 (file)
--- a/cups/language-private.h
+++ b/cups/language-private.h
@@ -36,6 +36,7 @@ extern "C" {
  * Constants...
  */
 
+#  define _CUPS_MESSAGE_PO     0       /* Message file is in GNU .po format */
 #  define _CUPS_MESSAGE_UNQUOTE        1       /* Unescape \foo in strings? */
 #  define _CUPS_MESSAGE_STRINGS        2       /* Message file is in Apple .strings format */
 

diff --git a/cups/pwg-media.c b/cups/pwg-media.c
index 26fc78d8fca74b74e684505aa2f3dc7f29d150bd..61671efe8b311dfa1179df8f116902319ba17cf7 100644 (file)
--- a/cups/pwg-media.c
+++ b/cups/pwg-media.c
@@ -838,18 +838,22 @@ pwgMediaForPWG(const char *pwg)           /* I - PWG size name */
    /*
     * Try decoding the self-describing name of the form:
     *
-    * class_name_WWWxHHHin
-    * class_name_WWWxHHHmm
+    * class_name_WWWxHHHin[_something]
+    * class_name_WWWxHHHmm[_something]
     */
 
     int                w, l;                   /* Width and length of page */
     int                numer;                  /* Scale factor for units */
-    const char *units = ptr + strlen(ptr) - 2;
-                                       /* Units from size */
+    const char *units;                 /* Units from size */
 
-    ptr ++;
+     if ((units = strchr(ptr + 1, '_')) != NULL)
+       units -= 2;
+     else
+       units = ptr + strlen(ptr) - 2;
 
-    if (units >= ptr && !strcmp(units, "in"))
+     ptr ++;
+
+    if (units >= ptr && (!strcmp(units, "in") || !strncmp(units, "in_", 3)))
       numer = 2540;
     else
       numer = 100;

diff --git a/locale/checkpo.c b/locale/checkpo.c
index 75d9255dad06113826c002d1fb7f39d997e8fd3f..4e6052b8e452dac5e45c719ee462c43150786dbe 100644 (file)
--- a/locale/checkpo.c
+++ b/locale/checkpo.c
@@ -68,9 +68,9 @@ main(int  argc,                               /* I - Number of command-line args */
     */
 
     if (strstr(argv[i], ".strings"))
-      po = _cupsMessageLoad(argv[i], _CUPS_MESSAGE_STRINGS | _CUPS_MESSAGE_UNQUOTE);
+      po = _cupsMessageLoad(argv[i], _CUPS_MESSAGE_STRINGS);
     else
-      po = _cupsMessageLoad(argv[i], _CUPS_MESSAGE_UNQUOTE);
+      po = _cupsMessageLoad(argv[i], _CUPS_MESSAGE_PO);
 
     if (!po)
     {
@@ -232,22 +232,27 @@ main(int  argc,                           /* I - Number of command-line args */
       */
 
       for (strfmt = msg->str; *strfmt; strfmt ++)
-        if (*strfmt == '\\' &&
-           strfmt[1] != '\\' && strfmt[1] != 'n' && strfmt[1] != 'r' &&
-           strfmt[1] != 't' && strfmt[1] != '\"' && !isdigit(strfmt[1] & 255))
-       {
-         if (pass)
+      {
+        if (*strfmt == '\\')
+        {
+          strfmt ++;
+
+          if (*strfmt != '\\' && *strfmt != 'n' && *strfmt != 'r' && *strfmt != 't' && *strfmt != '\"' && !isdigit(*strfmt & 255))
          {
-           pass = 0;
-           puts("FAIL");
+           if (pass)
+           {
+             pass = 0;
+             puts("FAIL");
+           }
+
+           printf("    Bad escape \\%c in filter message \"%s\"\n"
+                  "      for \"%s\"\n", strfmt[1],
+                  abbreviate(msg->str, strbuf, sizeof(strbuf)),
+                  abbreviate(msg->msg, idbuf, sizeof(idbuf)));
+           break;
          }
-
-         printf("    Bad escape \\%c in filter message \"%s\"\n"
-                "      for \"%s\"\n", strfmt[1],
-                abbreviate(msg->str, strbuf, sizeof(strbuf)),
-                abbreviate(msg->msg, idbuf, sizeof(idbuf)));
-          break;
-        }
+       }
+      }
     }
 
     if (pass)

diff --git a/locale/cups.footer b/locale/cups.footer
index c94fa63b22811ca40d27d3712ce1998c02bb1cb3..681fa44d572d47457958847215049553528279b6 100644 (file)
--- a/locale/cups.footer
+++ b/locale/cups.footer
@@ -1465,41 +1465,41 @@ msgstr "Media Name"
 msgid "media-source"
 msgstr "Media Source"
 msgid "media-source.alternate"
-msgstr "Alternate"
+msgstr "Alternate Tray"
 msgid "media-source.alternate-roll"
 msgstr "Alternate Roll"
 msgid "media-source.auto"
-msgstr "Automatic"
+msgstr "Automatic Tray"
 msgid "media-source.bottom"
-msgstr "Bottom"
+msgstr "Bottom Tray"
 msgid "media-source.by-pass-tray"
 msgstr "By-pass Tray"
 msgid "media-source.center"
-msgstr "Center"
+msgstr "Center Tray"
 msgid "media-source.disc"
-msgstr "Disc"
+msgstr "Disc Feed"
 msgid "media-source.envelope"
-msgstr "Envelope"
+msgstr "Envelope Feed"
 msgid "media-source.hagaki"
-msgstr "Hagaki"
+msgstr "Hagaki Feed"
 msgid "media-source.large-capacity"
-msgstr "Large Capacity"
+msgstr "Large Capacity Tray"
 msgid "media-source.left"
-msgstr "Left"
+msgstr "Left Tray"
 msgid "media-source.main"
-msgstr "Main"
+msgstr "Main Tray"
 msgid "media-source.main-roll"
 msgstr "Main Roll"
 msgid "media-source.manual"
-msgstr "Manual"
+msgstr "Manual Feed"
 msgid "media-source.middle"
-msgstr "Middle"
+msgstr "Middle Tray"
 msgid "media-source.photo"
-msgstr "Photo"
+msgstr "Photo Tray"
 msgid "media-source.rear"
-msgstr "Rear"
+msgstr "Rear Tray"
 msgid "media-source.right"
-msgstr "Right"
+msgstr "Right Tray"
 msgid "media-source.roll-1"
 msgstr "Roll 1"
 msgid "media-source.roll-10"
@@ -1604,6 +1604,32 @@ msgid "media-type.cardstock"
 msgstr "Cardstock"
 msgid "media-type.cd"
 msgstr "CD"
+msgid "media-type.com.hp.advanced-photo"
+msgstr "Advanced Photo Paper"
+msgid "media-type.com.hp.brochure-glossy"
+msgstr "Glossy Brochure Paper"
+msgid "media-type.com.hp.brochure-matte"
+msgstr "Matte Brochure Paper"
+msgid "media-type.com.hp.cover-matte"
+msgstr "Matte Cover Paper"
+msgid "media-type.com.hp.ecosmart-lite"
+msgstr "Office Recycled Paper"
+msgid "media-type.com.hp.everyday-glossy"
+msgstr "Everyday Glossy Photo Paper"
+msgid "media-type.com.hp.everyday-matte"
+msgstr "Everyday Matte Paper"
+msgid "media-type.com.hp.extra-heavy"
+msgstr "Extra Heavyweight Paper"
+msgid "media-type.com.hp.intermediate"
+msgstr "Multipurpose Paper"
+msgid "media-type.com.hp.mid-weight"
+msgstr "Mid-Weight Paper"
+msgid "media-type.com.hp.premium-inkjet"
+msgstr "Premium Inkjet Paper"
+msgid "media-type.com.hp.premium-photo"
+msgstr "Premium Photo Glossy Paper"
+msgid "media-type.com.hp.premium-presentation-matte"
+msgstr "Premium Presentation Matte Paper"
 msgid "media-type.continuous"
 msgstr "Continuous"
 msgid "media-type.continuous-long"
@@ -1700,6 +1726,14 @@ msgid "media-type.image-setter-paper"
 msgstr "Image Setter Paper"
 msgid "media-type.imaging-cylinder"
 msgstr "Imaging Cylinder"
+msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii"
+msgstr "Photo Paper Plus Glossy II"
+msgid "media-type.jp.co.canon_photo-paper-pro-platinum"
+msgstr "Photo Paper Pro Platinum"
+msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii"
+msgstr "Photo Paper Plus Glossy II"
+msgid "media-type.jp.co.canon-photo-paper-pro-platinum"
+msgstr "Photo Paper Pro Platinum"
 msgid "media-type.labels"
 msgstr "Labels"
 msgid "media-type.labels-colored"

diff --git a/locale/cups.pot b/locale/cups.pot
index af80109c957324312933634c929808355530d3b3..9624875ba001743f5a24a2911dd2affb61caaf85 100644 (file)
--- a/locale/cups.pot
+++ b/locale/cups.pot
@@ -28,7 +28,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.2.6\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-10-23 17:48-0400\n"
+"POT-Creation-Date: 2017-11-30 11:38-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,741 +37,741 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: systemv/lpstat.c:1896 systemv/lpstat.c:2015
+#: systemv/lpstat.c:1888 systemv/lpstat.c:2007
 msgid "\t\t(all)"
 msgstr ""
 
-#: systemv/lpstat.c:1899 systemv/lpstat.c:1902 systemv/lpstat.c:2018
-#: systemv/lpstat.c:2021
+#: systemv/lpstat.c:1891 systemv/lpstat.c:1894 systemv/lpstat.c:2010
+#: systemv/lpstat.c:2013
 msgid "\t\t(none)"
 msgstr ""
 
-#: berkeley/lpc.c:424
+#: berkeley/lpc.c:420
 #, c-format
 msgid "\t%d entries"
 msgstr ""
 
-#: systemv/lpstat.c:816 systemv/lpstat.c:832
+#: systemv/lpstat.c:812 systemv/lpstat.c:828
 #, c-format
 msgid "\t%s"
 msgstr ""
 
-#: systemv/lpstat.c:1877 systemv/lpstat.c:1996
+#: systemv/lpstat.c:1869 systemv/lpstat.c:1988
 msgid "\tAfter fault: continue"
 msgstr ""
 
-#: systemv/lpstat.c:1504 systemv/lpstat.c:1850 systemv/lpstat.c:1970
+#: systemv/lpstat.c:1500 systemv/lpstat.c:1842 systemv/lpstat.c:1962
 #, c-format
 msgid "\tAlerts: %s"
 msgstr ""
 
-#: systemv/lpstat.c:1900 systemv/lpstat.c:2019
+#: systemv/lpstat.c:1892 systemv/lpstat.c:2011
 msgid "\tBanner required"
 msgstr ""
 
-#: systemv/lpstat.c:1901 systemv/lpstat.c:2020
+#: systemv/lpstat.c:1893 systemv/lpstat.c:2012
 msgid "\tCharset sets:"
 msgstr ""
 
-#: systemv/lpstat.c:1869 systemv/lpstat.c:1988
+#: systemv/lpstat.c:1861 systemv/lpstat.c:1980
 msgid "\tConnection: direct"
 msgstr ""
 
-#: systemv/lpstat.c:1860 systemv/lpstat.c:1980
+#: systemv/lpstat.c:1852 systemv/lpstat.c:1972
 msgid "\tConnection: remote"
 msgstr ""
 
-#: systemv/lpstat.c:1826 systemv/lpstat.c:1946
+#: systemv/lpstat.c:1818 systemv/lpstat.c:1938
 msgid "\tContent types: any"
 msgstr ""
 
-#: systemv/lpstat.c:1904 systemv/lpstat.c:2023
+#: systemv/lpstat.c:1896 systemv/lpstat.c:2015
 msgid "\tDefault page size:"
 msgstr ""
 
-#: systemv/lpstat.c:1903 systemv/lpstat.c:2022
+#: systemv/lpstat.c:1895 systemv/lpstat.c:2014
 msgid "\tDefault pitch:"
 msgstr ""
 
-#: systemv/lpstat.c:1905 systemv/lpstat.c:2024
+#: systemv/lpstat.c:1897 systemv/lpstat.c:2016
 msgid "\tDefault port settings:"
 msgstr ""
 
-#: systemv/lpstat.c:1832 systemv/lpstat.c:1952
+#: systemv/lpstat.c:1824 systemv/lpstat.c:1944
 #, c-format
 msgid "\tDescription: %s"
 msgstr ""
 
-#: systemv/lpstat.c:1825 systemv/lpstat.c:1945
+#: systemv/lpstat.c:1817 systemv/lpstat.c:1937
 msgid "\tForm mounted:"
 msgstr ""
 
-#: systemv/lpstat.c:1898 systemv/lpstat.c:2017
+#: systemv/lpstat.c:1890 systemv/lpstat.c:2009
 msgid "\tForms allowed:"
 msgstr ""
 
-#: systemv/lpstat.c:1864 systemv/lpstat.c:1984
+#: systemv/lpstat.c:1856 systemv/lpstat.c:1976
 #, c-format
 msgid "\tInterface: %s.ppd"
 msgstr ""
 
-#: systemv/lpstat.c:1873 systemv/lpstat.c:1992
+#: systemv/lpstat.c:1865 systemv/lpstat.c:1984
 #, c-format
 msgid "\tInterface: %s/ppd/%s.ppd"
 msgstr ""
 
-#: systemv/lpstat.c:1855 systemv/lpstat.c:1975
+#: systemv/lpstat.c:1847 systemv/lpstat.c:1967
 #, c-format
 msgid "\tLocation: %s"
 msgstr ""
 
-#: systemv/lpstat.c:1876 systemv/lpstat.c:1995
+#: systemv/lpstat.c:1868 systemv/lpstat.c:1987
 msgid "\tOn fault: no alert"
 msgstr ""
 
-#: systemv/lpstat.c:1827 systemv/lpstat.c:1947
+#: systemv/lpstat.c:1819 systemv/lpstat.c:1939
 msgid "\tPrinter types: unknown"
 msgstr ""
 
-#: systemv/lpstat.c:1487
+#: systemv/lpstat.c:1483
 #, c-format
 msgid "\tStatus: %s"
 msgstr ""
 
-#: systemv/lpstat.c:1881 systemv/lpstat.c:1895 systemv/lpstat.c:2000
-#: systemv/lpstat.c:2014
+#: systemv/lpstat.c:1873 systemv/lpstat.c:1887 systemv/lpstat.c:1992
+#: systemv/lpstat.c:2006
 msgid "\tUsers allowed:"
 msgstr ""
 
-#: systemv/lpstat.c:1888 systemv/lpstat.c:2007
+#: systemv/lpstat.c:1880 systemv/lpstat.c:1999
 msgid "\tUsers denied:"
 msgstr ""
 
-#: berkeley/lpc.c:426
+#: berkeley/lpc.c:422
 msgid "\tdaemon present"
 msgstr ""
 
-#: berkeley/lpc.c:422
+#: berkeley/lpc.c:418
 msgid "\tno entries"
 msgstr ""
 
-#: berkeley/lpc.c:394 berkeley/lpc.c:406
+#: berkeley/lpc.c:390 berkeley/lpc.c:402
 #, c-format
 msgid "\tprinter is on device '%s' speed -1"
 msgstr ""
 
-#: berkeley/lpc.c:419
+#: berkeley/lpc.c:415
 msgid "\tprinting is disabled"
 msgstr ""
 
-#: berkeley/lpc.c:417
+#: berkeley/lpc.c:413
 msgid "\tprinting is enabled"
 msgstr ""
 
-#: systemv/lpstat.c:1507
+#: systemv/lpstat.c:1503
 #, c-format
 msgid "\tqueued for %s"
 msgstr ""
 
-#: berkeley/lpc.c:414
+#: berkeley/lpc.c:410
 msgid "\tqueuing is disabled"
 msgstr ""
 
-#: berkeley/lpc.c:412
+#: berkeley/lpc.c:408
 msgid "\tqueuing is enabled"
 msgstr ""
 
-#: systemv/lpstat.c:1818 systemv/lpstat.c:1938
+#: systemv/lpstat.c:1810 systemv/lpstat.c:1930
 msgid "\treason unknown"
 msgstr ""
 
-#: systemv/cupstestppd.c:432
+#: systemv/cupstestppd.c:426
 msgid ""
 "\n"
 "    DETAILED CONFORMANCE TEST RESULTS"
 msgstr ""
 
-#: systemv/cupstestppd.c:3862
+#: systemv/cupstestppd.c:3856
 msgid "                          Ignore specific warnings."
 msgstr ""
 
-#: systemv/cupstestppd.c:3866
+#: systemv/cupstestppd.c:3860
 msgid "                          Issue warnings instead of errors."
 msgstr ""
 
-#: systemv/cupstestppd.c:388 systemv/cupstestppd.c:393
+#: systemv/cupstestppd.c:382 systemv/cupstestppd.c:387
 msgid "                REF: Page 15, section 3.1."
 msgstr ""
 
-#: systemv/cupstestppd.c:383
+#: systemv/cupstestppd.c:377
 msgid "                REF: Page 15, section 3.2."
 msgstr ""
 
-#: systemv/cupstestppd.c:403
+#: systemv/cupstestppd.c:397
 msgid "                REF: Page 19, section 3.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:356
+#: systemv/cupstestppd.c:350
 msgid "                REF: Page 20, section 3.4."
 msgstr ""
 
-#: systemv/cupstestppd.c:408
+#: systemv/cupstestppd.c:402
 msgid "                REF: Page 27, section 3.5."
 msgstr ""
 
-#: systemv/cupstestppd.c:351
+#: systemv/cupstestppd.c:345
 msgid "                REF: Page 42, section 5.2."
 msgstr ""
 
-#: systemv/cupstestppd.c:398
+#: systemv/cupstestppd.c:392
 msgid "                REF: Pages 16-17, section 3.2."
 msgstr ""
 
-#: systemv/cupstestppd.c:368
+#: systemv/cupstestppd.c:362
 msgid "                REF: Pages 42-45, section 5.2."
 msgstr ""
 
-#: systemv/cupstestppd.c:362
+#: systemv/cupstestppd.c:356
 msgid "                REF: Pages 45-46, section 5.2."
 msgstr ""
 
-#: systemv/cupstestppd.c:373
+#: systemv/cupstestppd.c:367
 msgid "                REF: Pages 48-49, section 5.2."
 msgstr ""
 
-#: systemv/cupstestppd.c:378
+#: systemv/cupstestppd.c:372
 msgid "                REF: Pages 52-54, section 5.2."
 msgstr ""
 
-#: berkeley/lpq.c:537
+#: berkeley/lpq.c:533
 #, c-format
 msgid "        %-39.39s %.0f bytes"
 msgstr ""
 
-#: systemv/cupstestppd.c:567
+#: systemv/cupstestppd.c:561
 #, c-format
 msgid "        PASS    Default%s"
 msgstr ""
 
-#: systemv/cupstestppd.c:502
+#: systemv/cupstestppd.c:496
 msgid "        PASS    DefaultImageableArea"
 msgstr ""
 
-#: systemv/cupstestppd.c:536
+#: systemv/cupstestppd.c:530
 msgid "        PASS    DefaultPaperDimension"
 msgstr ""
 
-#: systemv/cupstestppd.c:609
+#: systemv/cupstestppd.c:603
 msgid "        PASS    FileVersion"
 msgstr ""
 
-#: systemv/cupstestppd.c:653
+#: systemv/cupstestppd.c:647
 msgid "        PASS    FormatVersion"
 msgstr ""
 
-#: systemv/cupstestppd.c:673
+#: systemv/cupstestppd.c:667
 msgid "        PASS    LanguageEncoding"
 msgstr ""
 
-#: systemv/cupstestppd.c:693
+#: systemv/cupstestppd.c:687
 msgid "        PASS    LanguageVersion"
 msgstr ""
 
-#: systemv/cupstestppd.c:747
+#: systemv/cupstestppd.c:741
 msgid "        PASS    Manufacturer"
 msgstr ""
 
-#: systemv/cupstestppd.c:787
+#: systemv/cupstestppd.c:781
 msgid "        PASS    ModelName"
 msgstr ""
 
-#: systemv/cupstestppd.c:807
+#: systemv/cupstestppd.c:801
 msgid "        PASS    NickName"
 msgstr ""
 
-#: systemv/cupstestppd.c:867
+#: systemv/cupstestppd.c:861
 msgid "        PASS    PCFileName"
 msgstr ""
 
-#: systemv/cupstestppd.c:942
+#: systemv/cupstestppd.c:936
 msgid "        PASS    PSVersion"
 msgstr ""
 
-#: systemv/cupstestppd.c:847
+#: systemv/cupstestppd.c:841
 msgid "        PASS    PageRegion"
 msgstr ""
 
-#: systemv/cupstestppd.c:827
+#: systemv/cupstestppd.c:821
 msgid "        PASS    PageSize"
 msgstr ""
 
-#: systemv/cupstestppd.c:902
+#: systemv/cupstestppd.c:896
 msgid "        PASS    Product"
 msgstr ""
 
-#: systemv/cupstestppd.c:977
+#: systemv/cupstestppd.c:971
 msgid "        PASS    ShortNickName"
 msgstr ""
 
-#: systemv/cupstestppd.c:1352
+#: systemv/cupstestppd.c:1346
 #, c-format
 msgid "        WARN    %s has no corresponding options."
 msgstr ""
 
-#: systemv/cupstestppd.c:1464
+#: systemv/cupstestppd.c:1458
 #, c-format
 msgid ""
 "        WARN    %s shares a common prefix with %s\n"
 "                REF: Page 15, section 3.2."
 msgstr ""
 
-#: systemv/cupstestppd.c:1323
+#: systemv/cupstestppd.c:1317
 #, 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:1722
+#: systemv/cupstestppd.c:1716
 msgid "        WARN    File contains a mix of CR, LF, and CR LF line endings."
 msgstr ""
 
-#: systemv/cupstestppd.c:1368
+#: systemv/cupstestppd.c:1362
 msgid ""
 "        WARN    LanguageEncoding required by PPD 4.3 spec.\n"
 "                REF: Pages 56-57, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1704
+#: systemv/cupstestppd.c:1698
 #, c-format
 msgid "        WARN    Line %d only contains whitespace."
 msgstr ""
 
-#: systemv/cupstestppd.c:1376
+#: systemv/cupstestppd.c:1370
 msgid ""
 "        WARN    Manufacturer required by PPD 4.3 spec.\n"
 "                REF: Pages 58-59, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1727
+#: systemv/cupstestppd.c:1721
 msgid "        WARN    Non-Windows PPD files should use lines ending with only LF, not CR LF."
 msgstr ""
 
-#: systemv/cupstestppd.c:1360
+#: systemv/cupstestppd.c:1354
 #, c-format
 msgid ""
 "        WARN    Obsolete PPD version %.1f.\n"
 "                REF: Page 42, section 5.2."
 msgstr ""
 
-#: systemv/cupstestppd.c:1391
+#: systemv/cupstestppd.c:1385
 msgid ""
 "        WARN    PCFileName longer than 8.3 in violation of PPD spec.\n"
 "                REF: Pages 61-62, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1399
+#: systemv/cupstestppd.c:1393
 msgid ""
 "        WARN    PCFileName should contain a unique filename.\n"
 "                REF: Pages 61-62, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1434
+#: systemv/cupstestppd.c:1428
 msgid ""
 "        WARN    Protocols contains PJL but JCL attributes are not set.\n"
 "                REF: Pages 78-79, section 5.7."
 msgstr ""
 
-#: systemv/cupstestppd.c:1425
+#: systemv/cupstestppd.c:1419
 msgid ""
 "        WARN    Protocols contains both PJL and BCP; expected TBCP.\n"
 "                REF: Pages 78-79, section 5.7."
 msgstr ""
 
-#: systemv/cupstestppd.c:1408
+#: systemv/cupstestppd.c:1402
 msgid ""
 "        WARN    ShortNickName required by PPD 4.3 spec.\n"
 "                REF: Pages 64-65, section 5.3."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:274
+#: systemv/cupsaddsmb.c:270
 msgid "       cupsaddsmb [options] -a"
 msgstr ""
 
-#: systemv/cupstestdsc.c:419
+#: systemv/cupstestdsc.c:413
 msgid "       cupstestdsc [options] -"
 msgstr ""
 
-#: systemv/cupstestppd.c:3857
+#: systemv/cupstestppd.c:3851
 msgid "       program | cupstestppd [options] -"
 msgstr ""
 
-#: systemv/cupstestppd.c:3789
+#: systemv/cupstestppd.c:3783
 #, c-format
 msgid ""
 "      %s  \"%s %s\" conflicts with \"%s %s\"\n"
 "                (constraint=\"%s %s %s %s\")."
 msgstr ""
 
-#: systemv/cupstestppd.c:2226
+#: systemv/cupstestppd.c:2220
 #, c-format
 msgid "      %s  %s %s does not exist."
 msgstr ""
 
-#: systemv/cupstestppd.c:3946
+#: systemv/cupstestppd.c:3940
 #, c-format
 msgid "      %s  %s file \"%s\" has the wrong capitalization."
 msgstr ""
 
-#: systemv/cupstestppd.c:2296
+#: systemv/cupstestppd.c:2290
 #, c-format
 msgid ""
 "      %s  Bad %s choice %s.\n"
 "                REF: Page 122, section 5.17"
 msgstr ""
 
-#: systemv/cupstestppd.c:3549 systemv/cupstestppd.c:3598
-#: systemv/cupstestppd.c:3637
+#: systemv/cupstestppd.c:3543 systemv/cupstestppd.c:3592
+#: systemv/cupstestppd.c:3631
 #, c-format
 msgid "      %s  Bad UTF-8 \"%s\" translation string for option %s, choice %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:3503
+#: systemv/cupstestppd.c:3497
 #, c-format
 msgid "      %s  Bad UTF-8 \"%s\" translation string for option %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:2367 systemv/cupstestppd.c:2389
+#: systemv/cupstestppd.c:2361 systemv/cupstestppd.c:2383
 #, c-format
 msgid "      %s  Bad cupsFilter value \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:2485 systemv/cupstestppd.c:2507
+#: systemv/cupstestppd.c:2479 systemv/cupstestppd.c:2501
 #, c-format
 msgid "      %s  Bad cupsFilter2 value \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:3006
+#: systemv/cupstestppd.c:3000
 #, c-format
 msgid "      %s  Bad cupsICCProfile %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:2613
+#: systemv/cupstestppd.c:2607
 #, c-format
 msgid "      %s  Bad cupsPreFilter value \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:1800
+#: systemv/cupstestppd.c:1794
 #, c-format
 msgid "      %s  Bad cupsUIConstraints %s: \"%s\""
 msgstr ""
 
-#: systemv/cupstestppd.c:3453
+#: systemv/cupstestppd.c:3447
 #, c-format
 msgid "      %s  Bad language \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:2443 systemv/cupstestppd.c:2571
-#: systemv/cupstestppd.c:2657 systemv/cupstestppd.c:2715
-#: systemv/cupstestppd.c:2770 systemv/cupstestppd.c:2825
-#: systemv/cupstestppd.c:2880 systemv/cupstestppd.c:2933
-#: systemv/cupstestppd.c:3055
+#: systemv/cupstestppd.c:2437 systemv/cupstestppd.c:2565
+#: systemv/cupstestppd.c:2651 systemv/cupstestppd.c:2709
+#: systemv/cupstestppd.c:2764 systemv/cupstestppd.c:2819
+#: systemv/cupstestppd.c:2874 systemv/cupstestppd.c:2927
+#: systemv/cupstestppd.c:3049
 #, c-format
 msgid "      %s  Bad permissions on %s file \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:2351 systemv/cupstestppd.c:2469
-#: systemv/cupstestppd.c:2597 systemv/cupstestppd.c:2684
-#: systemv/cupstestppd.c:2739 systemv/cupstestppd.c:2794
-#: systemv/cupstestppd.c:2849 systemv/cupstestppd.c:2904
+#: systemv/cupstestppd.c:2345 systemv/cupstestppd.c:2463
+#: systemv/cupstestppd.c:2591 systemv/cupstestppd.c:2678
+#: systemv/cupstestppd.c:2733 systemv/cupstestppd.c:2788
+#: systemv/cupstestppd.c:2843 systemv/cupstestppd.c:2898
 #, c-format
 msgid "      %s  Bad spelling of %s - should be %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:2949
+#: systemv/cupstestppd.c:2943
 #, c-format
 msgid "      %s  Cannot provide both APScanAppPath and APScanAppBundleID."
 msgstr ""
 
-#: systemv/cupstestppd.c:2183
+#: systemv/cupstestppd.c:2177
 #, c-format
 msgid "      %s  Default choices conflicting."
 msgstr ""
 
-#: systemv/cupstestppd.c:1781
+#: systemv/cupstestppd.c:1775
 #, c-format
 msgid "      %s  Empty cupsUIConstraints %s"
 msgstr ""
 
-#: systemv/cupstestppd.c:3581 systemv/cupstestppd.c:3621
+#: systemv/cupstestppd.c:3575 systemv/cupstestppd.c:3615
 #, c-format
 msgid "      %s  Missing \"%s\" translation string for option %s, choice %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:3489
+#: systemv/cupstestppd.c:3483
 #, c-format
 msgid "      %s  Missing \"%s\" translation string for option %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:2428 systemv/cupstestppd.c:2556
-#: systemv/cupstestppd.c:2642 systemv/cupstestppd.c:2700
-#: systemv/cupstestppd.c:2755 systemv/cupstestppd.c:2810
-#: systemv/cupstestppd.c:2865 systemv/cupstestppd.c:2917
-#: systemv/cupstestppd.c:3040
+#: systemv/cupstestppd.c:2422 systemv/cupstestppd.c:2550
+#: systemv/cupstestppd.c:2636 systemv/cupstestppd.c:2694
+#: systemv/cupstestppd.c:2749 systemv/cupstestppd.c:2804
+#: systemv/cupstestppd.c:2859 systemv/cupstestppd.c:2911
+#: systemv/cupstestppd.c:3034
 #, c-format
 msgid "      %s  Missing %s file \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:3163
+#: systemv/cupstestppd.c:3157
 #, c-format
 msgid ""
 "      %s  Missing REQUIRED PageRegion option.\n"
 "                REF: Page 100, section 5.14."
 msgstr ""
 
-#: systemv/cupstestppd.c:3148
+#: systemv/cupstestppd.c:3142
 #, c-format
 msgid ""
 "      %s  Missing REQUIRED PageSize option.\n"
 "                REF: Page 99, section 5.14."
 msgstr ""
 
-#: systemv/cupstestppd.c:1991 systemv/cupstestppd.c:2032
+#: systemv/cupstestppd.c:1985 systemv/cupstestppd.c:2026
 #, c-format
 msgid "      %s  Missing choice *%s %s in UIConstraints \"*%s %s *%s %s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:1886
+#: systemv/cupstestppd.c:1880
 #, c-format
 msgid "      %s  Missing choice *%s %s in cupsUIConstraints %s: \"%s\""
 msgstr ""
 
-#: systemv/cupstestppd.c:1818
+#: systemv/cupstestppd.c:1812
 #, c-format
 msgid "      %s  Missing cupsUIResolver %s"
 msgstr ""
 
-#: systemv/cupstestppd.c:1977 systemv/cupstestppd.c:2018
+#: systemv/cupstestppd.c:1971 systemv/cupstestppd.c:2012
 #, c-format
 msgid "      %s  Missing option %s in UIConstraints \"*%s %s *%s %s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:1870
+#: systemv/cupstestppd.c:1864
 #, c-format
 msgid "      %s  Missing option %s in cupsUIConstraints %s: \"%s\""
 msgstr ""
 
-#: systemv/cupstestppd.c:3675
+#: systemv/cupstestppd.c:3669
 #, c-format
 msgid "      %s  No base translation \"%s\" is included in file."
 msgstr ""
 
-#: systemv/cupstestppd.c:2272
+#: systemv/cupstestppd.c:2266
 #, c-format
 msgid ""
 "      %s  REQUIRED %s does not define choice None.\n"
 "                REF: Page 122, section 5.17"
 msgstr ""
 
-#: systemv/cupstestppd.c:3222 systemv/cupstestppd.c:3236
+#: systemv/cupstestppd.c:3216 systemv/cupstestppd.c:3230
 #, c-format
 msgid "      %s  Size \"%s\" defined for %s but not for %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:3202
+#: systemv/cupstestppd.c:3196
 #, c-format
 msgid "      %s  Size \"%s\" has unexpected dimensions (%gx%g)."
 msgstr ""
 
-#: systemv/cupstestppd.c:3393
+#: systemv/cupstestppd.c:3387
 #, c-format
 msgid "      %s  Size \"%s\" should be \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:3342
+#: systemv/cupstestppd.c:3336
 #, c-format
 msgid "      %s  Size \"%s\" should be the Adobe standard name \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:3083
+#: systemv/cupstestppd.c:3077
 #, c-format
 msgid "      %s  cupsICCProfile %s hash value collides with %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:1941
+#: systemv/cupstestppd.c:1935
 #, c-format
 msgid "      %s  cupsUIResolver %s causes a loop."
 msgstr ""
 
-#: systemv/cupstestppd.c:1923
+#: systemv/cupstestppd.c:1917
 #, c-format
 msgid "      %s  cupsUIResolver %s does not list at least two different options."
 msgstr ""
 
-#: systemv/cupstestppd.c:1146
+#: systemv/cupstestppd.c:1140
 #, c-format
 msgid ""
 "      **FAIL**  %s must be 1284DeviceID\n"
 "                REF: Page 72, section 5.5"
 msgstr ""
 
-#: systemv/cupstestppd.c:558
+#: systemv/cupstestppd.c:552
 #, c-format
 msgid ""
 "      **FAIL**  Bad Default%s %s\n"
 "                REF: Page 40, section 4.5."
 msgstr ""
 
-#: systemv/cupstestppd.c:492
+#: systemv/cupstestppd.c:486
 #, c-format
 msgid ""
 "      **FAIL**  Bad DefaultImageableArea %s\n"
 "                REF: Page 102, section 5.15."
 msgstr ""
 
-#: systemv/cupstestppd.c:528
+#: systemv/cupstestppd.c:522
 #, c-format
 msgid ""
 "      **FAIL**  Bad DefaultPaperDimension %s\n"
 "                REF: Page 103, section 5.15."
 msgstr ""
 
-#: systemv/cupstestppd.c:601
+#: systemv/cupstestppd.c:595
 #, c-format
 msgid ""
 "      **FAIL**  Bad FileVersion \"%s\"\n"
 "                REF: Page 56, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:645
+#: systemv/cupstestppd.c:639
 #, c-format
 msgid ""
 "      **FAIL**  Bad FormatVersion \"%s\"\n"
 "                REF: Page 56, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1003
+#: systemv/cupstestppd.c:997
 msgid ""
 "      **FAIL**  Bad JobPatchFile attribute in file\n"
 "                REF: Page 24, section 3.4."
 msgstr ""
 
-#: systemv/cupstestppd.c:1191
+#: systemv/cupstestppd.c:1185
 #, c-format
 msgid "      **FAIL**  Bad LanguageEncoding %s - must be ISOLatin1."
 msgstr ""
 
-#: systemv/cupstestppd.c:1205
+#: systemv/cupstestppd.c:1199
 #, c-format
 msgid "      **FAIL**  Bad LanguageVersion %s - must be English."
 msgstr ""
 
-#: systemv/cupstestppd.c:721 systemv/cupstestppd.c:738
+#: systemv/cupstestppd.c:715 systemv/cupstestppd.c:732
 #, c-format
 msgid ""
 "      **FAIL**  Bad Manufacturer (should be \"%s\")\n"
 "                REF: Page 211, table D.1."
 msgstr ""
 
-#: systemv/cupstestppd.c:778
+#: systemv/cupstestppd.c:772
 #, c-format
 msgid ""
 "      **FAIL**  Bad ModelName - \"%c\" not allowed in string.\n"
 "                REF: Pages 59-60, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:934
+#: systemv/cupstestppd.c:928
 msgid ""
 "      **FAIL**  Bad PSVersion - not \"(string) int\".\n"
 "                REF: Pages 62-64, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:895
+#: systemv/cupstestppd.c:889
 msgid ""
 "      **FAIL**  Bad Product - not \"(string)\".\n"
 "                REF: Page 62, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:969
+#: systemv/cupstestppd.c:963
 msgid ""
 "      **FAIL**  Bad ShortNickName - longer than 31 chars.\n"
 "                REF: Pages 64-65, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1127
+#: systemv/cupstestppd.c:1121
 #, c-format
 msgid ""
 "      **FAIL**  Bad option %s choice %s\n"
 "                REF: Page 84, section 5.9"
 msgstr ""
 
-#: systemv/cupstestppd.c:3816 systemv/cupstestppd.c:3838
+#: systemv/cupstestppd.c:3810 systemv/cupstestppd.c:3832
 #, c-format
 msgid "      **FAIL**  Default option code cannot be interpreted: %s"
 msgstr ""
 
-#: systemv/cupstestppd.c:1264
+#: systemv/cupstestppd.c:1258
 #, c-format
 msgid "      **FAIL**  Default translation string for option %s choice %s contains 8-bit characters."
 msgstr ""
 
-#: systemv/cupstestppd.c:1237
+#: systemv/cupstestppd.c:1231
 #, c-format
 msgid "      **FAIL**  Default translation string for option %s contains 8-bit characters."
 msgstr ""
 
-#: systemv/cupstestppd.c:2079
+#: systemv/cupstestppd.c:2073
 #, c-format
 msgid "      **FAIL**  Group names %s and %s differ only by case."
 msgstr ""
 
-#: systemv/cupstestppd.c:2124
+#: systemv/cupstestppd.c:2118
 #, c-format
 msgid "      **FAIL**  Multiple occurrences of option %s choice name %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:2141
+#: systemv/cupstestppd.c:2135
 #, c-format
 msgid "      **FAIL**  Option %s choice names %s and %s differ only by case."
 msgstr ""
 
-#: systemv/cupstestppd.c:2101
+#: systemv/cupstestppd.c:2095
 #, c-format
 msgid "      **FAIL**  Option names %s and %s differ only by case."
 msgstr ""
 
-#: systemv/cupstestppd.c:578
+#: systemv/cupstestppd.c:572
 #, c-format
 msgid ""
 "      **FAIL**  REQUIRED Default%s\n"
 "                REF: Page 40, section 4.5."
 msgstr ""
 
-#: systemv/cupstestppd.c:477
+#: systemv/cupstestppd.c:471
 msgid ""
 "      **FAIL**  REQUIRED DefaultImageableArea\n"
 "                REF: Page 102, section 5.15."
 msgstr ""
 
-#: systemv/cupstestppd.c:513
+#: systemv/cupstestppd.c:507
 msgid ""
 "      **FAIL**  REQUIRED DefaultPaperDimension\n"
 "                REF: Page 103, section 5.15."
 msgstr ""
 
-#: systemv/cupstestppd.c:619
+#: systemv/cupstestppd.c:613
 msgid ""
 "      **FAIL**  REQUIRED FileVersion\n"
 "                REF: Page 56, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:663
+#: systemv/cupstestppd.c:657
 msgid ""
 "      **FAIL**  REQUIRED FormatVersion\n"
 "                REF: Page 56, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1054
+#: systemv/cupstestppd.c:1048
 #, c-format
 msgid ""
 "      **FAIL**  REQUIRED ImageableArea for PageSize %s\n"
@@ -779,68 +779,68 @@ msgid ""
 "                REF: Page 102, section 5.15."
 msgstr ""
 
-#: systemv/cupstestppd.c:683
+#: systemv/cupstestppd.c:677
 msgid ""
 "      **FAIL**  REQUIRED LanguageEncoding\n"
 "                REF: Pages 56-57, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:703
+#: systemv/cupstestppd.c:697
 msgid ""
 "      **FAIL**  REQUIRED LanguageVersion\n"
 "                REF: Pages 57-58, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:757
+#: systemv/cupstestppd.c:751
 msgid ""
 "      **FAIL**  REQUIRED Manufacturer\n"
 "                REF: Pages 58-59, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:797
+#: systemv/cupstestppd.c:791
 msgid ""
 "      **FAIL**  REQUIRED ModelName\n"
 "                REF: Pages 59-60, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:817
+#: systemv/cupstestppd.c:811
 msgid ""
 "      **FAIL**  REQUIRED NickName\n"
 "                REF: Page 60, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:877
+#: systemv/cupstestppd.c:871
 msgid ""
 "      **FAIL**  REQUIRED PCFileName\n"
 "                REF: Pages 61-62, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:952
+#: systemv/cupstestppd.c:946
 msgid ""
 "      **FAIL**  REQUIRED PSVersion\n"
 "                REF: Pages 62-64, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:857
+#: systemv/cupstestppd.c:851
 msgid ""
 "      **FAIL**  REQUIRED PageRegion\n"
 "                REF: Page 100, section 5.14."
 msgstr ""
 
-#: systemv/cupstestppd.c:1023
+#: systemv/cupstestppd.c:1017
 msgid ""
 "      **FAIL**  REQUIRED PageSize\n"
 "                REF: Page 41, section 5.\n"
 "                REF: Page 99, section 5.14."
 msgstr ""
 
-#: systemv/cupstestppd.c:837
+#: systemv/cupstestppd.c:831
 msgid ""
 "      **FAIL**  REQUIRED PageSize\n"
 "                REF: Pages 99-100, section 5.14."
 msgstr ""
 
-#: systemv/cupstestppd.c:1076
+#: systemv/cupstestppd.c:1070
 #, c-format
 msgid ""
 "      **FAIL**  REQUIRED PaperDimension for PageSize %s\n"
@@ -848,1368 +848,1377 @@ msgid ""
 "                REF: Page 103, section 5.15."
 msgstr ""
 
-#: systemv/cupstestppd.c:912
+#: systemv/cupstestppd.c:906
 msgid ""
 "      **FAIL**  REQUIRED Product\n"
 "                REF: Page 62, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:987
+#: systemv/cupstestppd.c:981
 msgid ""
 "      **FAIL**  REQUIRED ShortNickName\n"
 "                REF: Page 64-65, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:312 systemv/cupstestppd.c:331
-#: systemv/cupstestppd.c:343
+#: systemv/cupstestppd.c:306 systemv/cupstestppd.c:325
+#: systemv/cupstestppd.c:337
 #, c-format
 msgid "      **FAIL**  Unable to open PPD file - %s on line %d."
 msgstr ""
 
-#: systemv/cupstestppd.c:1476
+#: systemv/cupstestppd.c:1470
 #, c-format
 msgid "    %d ERRORS FOUND"
 msgstr ""
 
-#: systemv/cupstestdsc.c:423
+#: systemv/cupstestdsc.c:417
 msgid "    -h       Show program usage"
 msgstr ""
 
-#: systemv/cupstestdsc.c:226 systemv/cupstestdsc.c:268
+#: systemv/cupstestdsc.c:220 systemv/cupstestdsc.c:262
 #, c-format
 msgid ""
 "    Bad %%%%BoundingBox: on line %d.\n"
 "        REF: Page 39, %%%%BoundingBox:"
 msgstr ""
 
-#: systemv/cupstestdsc.c:297
+#: systemv/cupstestdsc.c:291
 #, c-format
 msgid ""
 "    Bad %%%%Page: on line %d.\n"
 "        REF: Page 53, %%%%Page:"
 msgstr ""
 
-#: systemv/cupstestdsc.c:210 systemv/cupstestdsc.c:250
+#: systemv/cupstestdsc.c:204 systemv/cupstestdsc.c:244
 #, c-format
 msgid ""
 "    Bad %%%%Pages: on line %d.\n"
 "        REF: Page 43, %%%%Pages:"
 msgstr ""
 
-#: systemv/cupstestdsc.c:168
+#: systemv/cupstestdsc.c:162
 #, c-format
 msgid ""
 "    Line %d is longer than 255 characters (%d).\n"
 "        REF: Page 25, Line Length"
 msgstr ""
 
-#: systemv/cupstestdsc.c:184
+#: systemv/cupstestdsc.c:178
 msgid ""
 "    Missing %!PS-Adobe-3.0 on first line.\n"
 "        REF: Page 17, 3.1 Conforming Documents"
 msgstr ""
 
-#: systemv/cupstestdsc.c:354
+#: systemv/cupstestdsc.c:348
 #, c-format
 msgid "    Missing %%EndComments comment.        REF: Page 41, %%EndComments"
 msgstr ""
 
-#: systemv/cupstestdsc.c:334
+#: systemv/cupstestdsc.c:328
 #, c-format
 msgid ""
 "    Missing or bad %%BoundingBox: comment.\n"
 "        REF: Page 39, %%BoundingBox:"
 msgstr ""
 
-#: systemv/cupstestdsc.c:364
+#: systemv/cupstestdsc.c:358
 #, c-format
 msgid ""
 "    Missing or bad %%Page: comments.\n"
 "        REF: Page 53, %%Page:"
 msgstr ""
 
-#: systemv/cupstestdsc.c:344
+#: systemv/cupstestdsc.c:338
 #, c-format
 msgid ""
 "    Missing or bad %%Pages: comment.\n"
 "        REF: Page 43, %%Pages:"
 msgstr ""
 
-#: systemv/cupstestppd.c:1478
+#: systemv/cupstestppd.c:1472
 msgid "    NO ERRORS FOUND"
 msgstr ""
 
-#: systemv/cupstestdsc.c:387
+#: systemv/cupstestdsc.c:381
 #, c-format
 msgid "    Saw %d lines that exceeded 255 characters."
 msgstr ""
 
-#: systemv/cupstestdsc.c:382
+#: systemv/cupstestdsc.c:376
 #, c-format
 msgid "    Too many %%BeginDocument comments."
 msgstr ""
 
-#: systemv/cupstestdsc.c:374
+#: systemv/cupstestdsc.c:368
 #, c-format
 msgid "    Too many %%EndDocument comments."
 msgstr ""
 
-#: systemv/cupstestdsc.c:394
+#: systemv/cupstestdsc.c:388
 msgid "    Warning: file contains binary data."
 msgstr ""
 
-#: systemv/cupstestdsc.c:402
+#: systemv/cupstestdsc.c:396
 #, c-format
 msgid "    Warning: no %%EndComments comment in file."
 msgstr ""
 
-#: systemv/cupstestdsc.c:398
+#: systemv/cupstestdsc.c:392
 #, c-format
 msgid "    Warning: obsolete DSC version %.1f in file."
 msgstr ""
 
-#: test/ippfind.c:2794
+#: test/ippfind.c:2800
 msgid "  ! expression            Unary NOT of expression."
 msgstr ""
 
-#: test/ippfind.c:2793
+#: test/ippfind.c:2799
 msgid "  ( expressions )         Group expressions."
 msgstr ""
 
-#: systemv/cupsctl.c:203
+#: systemv/cupsctl.c:197
 msgid "  --[no-]debug-logging    Turn debug logging on/off."
 msgstr ""
 
-#: systemv/cupsctl.c:205
+#: systemv/cupsctl.c:199
 msgid "  --[no-]remote-admin     Turn remote administration on/off."
 msgstr ""
 
-#: systemv/cupsctl.c:207
+#: systemv/cupsctl.c:201
 msgid "  --[no-]remote-any       Allow/prevent access from the Internet."
 msgstr ""
 
-#: systemv/cupsctl.c:209
+#: systemv/cupsctl.c:203
 msgid "  --[no-]share-printers   Turn printer sharing on/off."
 msgstr ""
 
-#: systemv/cupsctl.c:211
+#: systemv/cupsctl.c:205
 msgid "  --[no-]user-cancel-any  Allow/prevent users to cancel any job."
 msgstr ""
 
-#: ppdc/ppdc.cxx:448
+#: ppdc/ppdc.cxx:444
 msgid "  --cr                    End lines with CR (Mac OS 9)."
 msgstr ""
 
-#: ppdc/ppdc.cxx:450
+#: ppdc/ppdc.cxx:446
 msgid "  --crlf                  End lines with CR + LF (Windows)."
 msgstr ""
 
-#: test/ippfind.c:2775
+#: test/ippfind.c:2781
 msgid "  --domain regex          Match domain to regular expression."
 msgstr ""
 
-#: test/ippfind.c:2776
+#: test/ippfind.c:2782
 msgid ""
 "  --exec utility [argument ...] ;\n"
 "                          Execute program if true."
 msgstr ""
 
-#: test/ippfind.c:2796
+#: test/ippfind.c:2802
 msgid "  --false                 Always false."
 msgstr ""
 
-#: test/ipptool.c:5064
+#: test/ipptool.c:5227
 msgid "  --help                  Show help."
 msgstr ""
 
-#: test/ippfind.c:2758
+#: test/ippfind.c:2764
 msgid "  --help                  Show this help."
 msgstr ""
 
-#: test/ippfind.c:2778
+#: test/ippfind.c:2784
 msgid "  --host regex            Match hostname to regular expression."
 msgstr ""
 
-#: ppdc/ppdc.cxx:452
+#: test/ipptool.c:5228
+msgid "  --ippserver filename    Produce ippserver attribute file."
+msgstr ""
+
+#: ppdc/ppdc.cxx:448
 msgid "  --lf                    End lines with LF (UNIX/Linux/macOS)."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1481
+#: scheduler/cupsfilter.c:1477
 msgid "  --list-filters          List filters that will be used."
 msgstr ""
 
-#: test/ippfind.c:2780
+#: test/ippfind.c:2786
 msgid "  --local                 True if service is local."
 msgstr ""
 
-#: test/ippfind.c:2779
+#: test/ippfind.c:2785
 msgid "  --ls                    List attributes."
 msgstr ""
 
-#: test/ippfind.c:2781
+#: test/ippfind.c:2787
 msgid "  --name regex            Match service name to regular expression."
 msgstr ""
 
-#: test/ippfind.c:2795
+#: test/ippfind.c:2801
 msgid "  --not expression        Unary NOT of expression."
 msgstr ""
 
-#: test/ippfind.c:2782
+#: test/ippfind.c:2788
 msgid "  --path regex            Match resource path to regular expression."
 msgstr ""
 
-#: test/ippfind.c:2783
+#: test/ippfind.c:2789
 msgid "  --port number[-number]  Match port to number or range."
 msgstr ""
 
-#: test/ippfind.c:2784
+#: test/ippfind.c:2790
 msgid "  --print                 Print URI if true."
 msgstr ""
 
-#: test/ippfind.c:2785
+#: test/ippfind.c:2791
 msgid "  --print-name            Print service name if true."
 msgstr ""
 
-#: test/ippfind.c:2786
+#: test/ippfind.c:2792
 msgid "  --quiet                 Quietly report match via exit code."
 msgstr ""
 
-#: test/ippfind.c:2787
+#: test/ippfind.c:2793
 msgid "  --remote                True if service is remote."
 msgstr ""
 
-#: test/ipptool.c:5065
+#: test/ipptool.c:5229
 msgid ""
 "  --stop-after-include-error\n"
 "                          Stop tests after a failed INCLUDE."
 msgstr ""
 
-#: test/ippfind.c:2797
+#: test/ippfind.c:2803
 msgid "  --true                  Always true."
 msgstr ""
 
-#: test/ippfind.c:2788
+#: test/ippfind.c:2794
 msgid "  --txt key               True if the TXT record contains the key."
 msgstr ""
 
-#: test/ippfind.c:2789
+#: test/ippfind.c:2795
 msgid "  --txt-* regex           Match TXT record key to regular expression."
 msgstr ""
 
-#: test/ippfind.c:2790
+#: test/ippfind.c:2796
 msgid "  --uri regex             Match URI to regular expression."
 msgstr ""
 
-#: test/ippfind.c:2759
+#: test/ippfind.c:2765
 msgid "  --version               Show program version."
 msgstr ""
 
-#: test/ipptool.c:5067
+#: test/ipptool.c:5231
 msgid "  --version               Show version."
 msgstr ""
 
-#: test/ippfind.c:2752 test/ipptool.c:5068
+#: test/ippfind.c:2758 test/ipptool.c:5232
 msgid "  -4                      Connect using IPv4."
 msgstr ""
 
-#: test/ippfind.c:2753 test/ipptool.c:5069
+#: test/ippfind.c:2759 test/ipptool.c:5233
 msgid "  -6                      Connect using IPv6."
 msgstr ""
 
-#: test/ipptool.c:5070
+#: test/ipptool.c:5234
 msgid "  -C                      Send requests using chunking (default)."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1482
+#: scheduler/cupsfilter.c:1478
 msgid "  -D                      Remove the input file when finished."
 msgstr ""
 
-#: ppdc/ppdc.cxx:431 ppdc/ppdhtml.cxx:178 ppdc/ppdpo.cxx:248
+#: ppdc/ppdc.cxx:427 ppdc/ppdhtml.cxx:174 ppdc/ppdpo.cxx:244
 msgid "  -D name=value           Set named variable to value."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:277 systemv/cupsctl.c:198
+#: systemv/cupsaddsmb.c:273 systemv/cupsctl.c:192
 msgid "  -E                      Encrypt the connection."
 msgstr ""
 
-#: test/ipptool.c:5072
+#: test/ipptool.c:5236
 msgid "  -E                      Test with encryption using HTTP Upgrade to TLS."
 msgstr ""
 
-#: scheduler/main.c:2104
+#: scheduler/main.c:2101
 msgid "  -F                      Run in the foreground but detach from console."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:278
+#: systemv/cupsaddsmb.c:274
 msgid "  -H samba-server         Use the named SAMBA server."
 msgstr ""
 
-#: test/ipptool.c:5073
+#: test/ipptool.c:5237
 msgid "  -I                      Ignore errors."
 msgstr ""
 
-#: ppdc/ppdc.cxx:433 ppdc/ppdhtml.cxx:180 ppdc/ppdi.cxx:124 ppdc/ppdpo.cxx:250
+#: ppdc/ppdc.cxx:429 ppdc/ppdhtml.cxx:176 ppdc/ppdi.cxx:120 ppdc/ppdpo.cxx:246
 msgid "  -I include-dir          Add include directory to search path."
 msgstr ""
 
-#: systemv/cupstestppd.c:3861
+#: systemv/cupstestppd.c:3855
 msgid "  -I {filename,filters,none,profiles}"
 msgstr ""
 
-#: test/ipptool.c:5074
+#: test/ipptool.c:5238
 msgid "  -L                      Send requests using content-length."
 msgstr ""
 
-#: test/ipptool.c:5075
+#: test/ipptool.c:5239
 msgid "  -P filename.plist       Produce XML plist to a file and test report to standard output."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1483
+#: scheduler/cupsfilter.c:1479
 msgid "  -P filename.ppd         Set PPD file."
 msgstr ""
 
-#: test/ippfind.c:2762
+#: test/ippfind.c:2768
 msgid "  -P number[-number]      Match port to number or range."
 msgstr ""
 
-#: systemv/cupstestppd.c:3863
+#: systemv/cupstestppd.c:3857
 msgid "  -R root-directory       Set alternate root."
 msgstr ""
 
-#: test/ipptool.c:5076
+#: test/ipptool.c:5240
 msgid "  -S                      Test with encryption using HTTPS."
 msgstr ""
 
-#: test/ippfind.c:2754
+#: test/ippfind.c:2760
 msgid "  -T seconds              Set the browse timeout in seconds."
 msgstr ""
 
-#: test/ipptool.c:5077
+#: test/ipptool.c:5241
 msgid "  -T seconds              Set the receive/send timeout in seconds."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1484 systemv/cupsaddsmb.c:280 systemv/cupsctl.c:199
+#: scheduler/cupsfilter.c:1480 systemv/cupsaddsmb.c:276 systemv/cupsctl.c:193
 msgid "  -U username             Specify username."
 msgstr ""
 
-#: test/ippfind.c:2756 test/ipptool.c:5078
+#: test/ippfind.c:2762 test/ipptool.c:5242
 msgid "  -V version              Set default IPP version."
 msgstr ""
 
-#: systemv/cupstestppd.c:3864
+#: systemv/cupstestppd.c:3858
 msgid "  -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,translations}"
 msgstr ""
 
-#: test/ipptool.c:5079
+#: test/ipptool.c:5243
 msgid "  -X                      Produce XML plist instead of plain text."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:281
+#: systemv/cupsaddsmb.c:277
 msgid "  -a                      Export all printers."
 msgstr ""
 
-#: test/ipptool.c:5080
+#: test/ipptool.c:5244
 msgid "  -c                      Produce CSV output."
 msgstr ""
 
-#: ppdc/ppdc.cxx:435
+#: ppdc/ppdc.cxx:431
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1485
+#: scheduler/cupsfilter.c:1481
 msgid "  -c cups-files.conf      Set cups-files.conf file to use."
 msgstr ""
 
-#: scheduler/main.c:2102
+#: scheduler/main.c:2099
 msgid "  -c cupsd.conf           Set cupsd.conf file to use."
 msgstr ""
 
-#: test/ipptool.c:5081
+#: test/ipptool.c:5245
 msgid "  -d name=value           Set named variable to value."
 msgstr ""
 
-#: ppdc/ppdc.cxx:437
+#: ppdc/ppdc.cxx:433
 msgid "  -d output-dir           Specify the output directory."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1486
+#: scheduler/cupsfilter.c:1482
 msgid "  -d printer              Use the named printer."
 msgstr ""
 
-#: test/ippfind.c:2763
+#: test/ippfind.c:2769
 msgid "  -d regex                Match domain to regular expression."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1487
+#: scheduler/cupsfilter.c:1483
 msgid "  -e                      Use every filter from the PPD file."
 msgstr ""
 
-#: scheduler/main.c:2103
+#: scheduler/main.c:2100
 msgid "  -f                      Run in the foreground."
 msgstr ""
 
-#: test/ipptool.c:5082
+#: test/ipptool.c:5246
 msgid "  -f filename             Set default request filename."
 msgstr ""
 
-#: scheduler/main.c:2105
+#: scheduler/main.c:2102
 msgid "  -h                      Show this usage message."
 msgstr ""
 
-#: test/ipptool.c:5083
+#: test/ipptool.c:5247
 msgid "  -h                      Validate HTTP response headers."
 msgstr ""
 
-#: test/ippfind.c:2764
+#: test/ippfind.c:2770
 msgid "  -h regex                Match hostname to regular expression."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:282 systemv/cupsctl.c:200
+#: systemv/cupsaddsmb.c:278 systemv/cupsctl.c:194
 msgid "  -h server[:port]        Specify server address."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1488
+#: scheduler/cupsfilter.c:1484
 msgid "  -i mime/type            Set input MIME type (otherwise auto-typed)."
 msgstr ""
 
-#: test/ipptool.c:5084
+#: test/ipptool.c:5248
 msgid "  -i seconds              Repeat the last file with the given time interval."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1489
+#: scheduler/cupsfilter.c:1485
 msgid "  -j job-id[,N]           Filter file N from the specified job (default is file 1)."
 msgstr ""
 
-#: test/ippfind.c:2765
+#: test/ippfind.c:2771
 msgid "  -l                      List attributes."
 msgstr ""
 
-#: test/ipptool.c:5085
+#: test/ipptool.c:5249
 msgid "  -l                      Produce plain text output."
 msgstr ""
 
-#: scheduler/main.c:2107
+#: scheduler/main.c:2104
 msgid "  -l                      Run cupsd on demand."
 msgstr ""
 
-#: ppdc/ppdc.cxx:439
+#: ppdc/ppdc.cxx:435
 msgid "  -l lang[,lang,...]      Specify the output language(s) (locale)."
 msgstr ""
 
-#: ppdc/ppdc.cxx:441
+#: ppdc/ppdc.cxx:437
 msgid "  -m                      Use the ModelName value as the filename."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1490
+#: scheduler/cupsfilter.c:1486
 msgid "  -m mime/type            Set output MIME type (otherwise application/pdf)."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1491
+#: scheduler/cupsfilter.c:1487
 msgid "  -n copies               Set number of copies."
 msgstr ""
 
-#: test/ipptool.c:5086
+#: test/ipptool.c:5250
 msgid "  -n count                Repeat the last file the given number of times."
 msgstr ""
 
-#: test/ippfind.c:2766
+#: test/ippfind.c:2772
 msgid "  -n regex                Match service name to regular expression."
 msgstr ""
 
-#: ppdc/ppdi.cxx:126
+#: ppdc/ppdi.cxx:122
 msgid "  -o filename.drv         Set driver information file (otherwise ppdi.drv)."
 msgstr ""
 
-#: ppdc/ppdmerge.cxx:362
+#: ppdc/ppdmerge.cxx:358
 msgid "  -o filename.ppd[.gz]    Set output file (otherwise stdout)."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1492
+#: scheduler/cupsfilter.c:1488
 msgid "  -o name=value           Set option(s)."
 msgstr ""
 
-#: test/ippfind.c:2767
+#: test/ippfind.c:2773
 msgid "  -p                      Print URI if true."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1493
+#: scheduler/cupsfilter.c:1489
 msgid "  -p filename.ppd         Set PPD file."
 msgstr ""
 
-#: test/ippfind.c:2768
+#: test/ippfind.c:2774
 msgid "  -q                      Quietly report match via exit code."
 msgstr ""
 
-#: systemv/cupstestppd.c:3868 test/ipptool.c:5087
+#: systemv/cupstestppd.c:3862 test/ipptool.c:5251
 msgid "  -q                      Run silently."
 msgstr ""
 
-#: test/ippfind.c:2769
+#: test/ippfind.c:2775
 msgid "  -r                      True if service is remote."
 msgstr ""
 
-#: systemv/cupstestppd.c:3869
+#: systemv/cupstestppd.c:3863
 msgid "  -r                      Use 'relaxed' open mode."
 msgstr ""
 
-#: test/ippfind.c:2770
+#: test/ippfind.c:2776
 msgid "  -s                      Print service name if true."
 msgstr ""
 
-#: scheduler/main.c:2109
+#: scheduler/main.c:2106
 msgid "  -s cups-files.conf      Set cups-files.conf file to use."
 msgstr ""
 
-#: test/ipptool.c:5088
+#: test/ipptool.c:5252
 msgid "  -t                      Produce a test report."
 msgstr ""
 
-#: ppdc/ppdc.cxx:443
+#: ppdc/ppdc.cxx:439
 msgid "  -t                      Test PPDs instead of generating them."
 msgstr ""
 
-#: scheduler/main.c:2110
+#: scheduler/main.c:2107
 msgid "  -t                      Test the configuration file."
 msgstr ""
 
-#: test/ippfind.c:2771
+#: test/ippfind.c:2777
 msgid "  -t key                  True if the TXT record contains the key."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1494
+#: scheduler/cupsfilter.c:1490
 msgid "  -t title                Set title."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1495
+#: scheduler/cupsfilter.c:1491
 msgid "  -u                      Remove the PPD file when finished."
 msgstr ""
 
-#: test/ippfind.c:2772
+#: test/ippfind.c:2778
 msgid "  -u regex                Match URI to regular expression."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:283 systemv/cupstestppd.c:3870 test/ipptool.c:5089
-#: ppdc/ppdc.cxx:445 ppdc/ppdpo.cxx:252
+#: systemv/cupsaddsmb.c:279 systemv/cupstestppd.c:3864 test/ipptool.c:5253
+#: ppdc/ppdc.cxx:441 ppdc/ppdpo.cxx:248
 msgid "  -v                      Be verbose."
 msgstr ""
 
-#: systemv/cupstestppd.c:3871
+#: systemv/cupstestppd.c:3865
 msgid "  -vv                     Be very verbose."
 msgstr ""
 
-#: test/ippfind.c:2773
+#: test/ippfind.c:2779
 msgid ""
 "  -x utility [argument ...] ;\n"
 "                          Execute program if true."
 msgstr ""
 
-#: ppdc/ppdc.cxx:446
+#: ppdc/ppdc.cxx:442
 msgid "  -z                      Compress PPD files using GNU zip."
 msgstr ""
 
-#: test/ippfind.c:2816
+#: test/ippfind.c:2822
 msgid "  IPPFIND_SERVICE_DOMAIN  Domain name"
 msgstr ""
 
-#: test/ippfind.c:2817
+#: test/ippfind.c:2823
 msgid ""
 "  IPPFIND_SERVICE_HOSTNAME\n"
 "                          Fully-qualified domain name"
 msgstr ""
 
-#: test/ippfind.c:2819
+#: test/ippfind.c:2825
 msgid "  IPPFIND_SERVICE_NAME    Service instance name"
 msgstr ""
 
-#: test/ippfind.c:2820
+#: test/ippfind.c:2826
 msgid "  IPPFIND_SERVICE_PORT    Port number"
 msgstr ""
 
-#: test/ippfind.c:2821
+#: test/ippfind.c:2827
 msgid "  IPPFIND_SERVICE_REGTYPE DNS-SD registration type"
 msgstr ""
 
-#: test/ippfind.c:2822
+#: test/ippfind.c:2828
 msgid "  IPPFIND_SERVICE_SCHEME  URI scheme"
 msgstr ""
 
-#: test/ippfind.c:2823
+#: test/ippfind.c:2829
 msgid "  IPPFIND_SERVICE_URI     URI"
 msgstr ""
 
-#: test/ippfind.c:2824
+#: test/ippfind.c:2830
 msgid "  IPPFIND_TXT_*           Value of TXT record key"
 msgstr ""
 
-#: test/ippfind.c:2799
+#: test/ippfind.c:2805
 msgid ""
 "  expression --and expression\n"
 "                          Logical AND."
 msgstr ""
 
-#: test/ippfind.c:2801
+#: test/ippfind.c:2807
 msgid ""
 "  expression --or expression\n"
 "                          Logical OR."
 msgstr ""
 
-#: test/ippfind.c:2798
+#: test/ippfind.c:2804
 msgid "  expression expression   Logical AND."
 msgstr ""
 
-#: test/ippfind.c:2806
+#: test/ippfind.c:2812
 msgid "  {service_domain}        Domain name"
 msgstr ""
 
-#: test/ippfind.c:2807
+#: test/ippfind.c:2813
 msgid "  {service_hostname}      Fully-qualified domain name"
 msgstr ""
 
-#: test/ippfind.c:2808
+#: test/ippfind.c:2814
 msgid "  {service_name}          Service instance name"
 msgstr ""
 
-#: test/ippfind.c:2809
+#: test/ippfind.c:2815
 msgid "  {service_port}          Port number"
 msgstr ""
 
-#: test/ippfind.c:2810
+#: test/ippfind.c:2816
 msgid "  {service_regtype}       DNS-SD registration type"
 msgstr ""
 
-#: test/ippfind.c:2811
+#: test/ippfind.c:2817
 msgid "  {service_scheme}        URI scheme"
 msgstr ""
 
-#: test/ippfind.c:2812
+#: test/ippfind.c:2818
 msgid "  {service_uri}           URI"
 msgstr ""
 
-#: test/ippfind.c:2813
+#: test/ippfind.c:2819
 msgid "  {txt_*}                 Value of TXT record key"
 msgstr ""
 
-#: test/ippfind.c:2805
+#: test/ippfind.c:2811
 msgid "  {}                      URI"
 msgstr ""
 
-#: systemv/cupstestppd.c:310 systemv/cupstestppd.c:329
-#: systemv/cupstestppd.c:341 systemv/cupstestppd.c:474
-#: systemv/cupstestppd.c:489 systemv/cupstestppd.c:510
-#: systemv/cupstestppd.c:525 systemv/cupstestppd.c:555
-#: systemv/cupstestppd.c:575 systemv/cupstestppd.c:598
-#: systemv/cupstestppd.c:616 systemv/cupstestppd.c:642
-#: systemv/cupstestppd.c:660 systemv/cupstestppd.c:680
-#: systemv/cupstestppd.c:700 systemv/cupstestppd.c:718
-#: systemv/cupstestppd.c:735 systemv/cupstestppd.c:754
-#: systemv/cupstestppd.c:775 systemv/cupstestppd.c:794
-#: systemv/cupstestppd.c:814 systemv/cupstestppd.c:834
-#: systemv/cupstestppd.c:854 systemv/cupstestppd.c:874
-#: systemv/cupstestppd.c:892 systemv/cupstestppd.c:909
-#: systemv/cupstestppd.c:931 systemv/cupstestppd.c:949
-#: systemv/cupstestppd.c:966 systemv/cupstestppd.c:984
-#: systemv/cupstestppd.c:1000 systemv/cupstestppd.c:1020
-#: systemv/cupstestppd.c:1051 systemv/cupstestppd.c:1073
-#: systemv/cupstestppd.c:1124 systemv/cupstestppd.c:1143
-#: systemv/cupstestppd.c:1187 systemv/cupstestppd.c:1201
-#: systemv/cupstestppd.c:1233 systemv/cupstestppd.c:1260
-#: systemv/cupstestppd.c:1778 systemv/cupstestppd.c:1797
-#: systemv/cupstestppd.c:1815 systemv/cupstestppd.c:1867
-#: systemv/cupstestppd.c:1883 systemv/cupstestppd.c:1920
-#: systemv/cupstestppd.c:1938 systemv/cupstestppd.c:1974
-#: systemv/cupstestppd.c:1988 systemv/cupstestppd.c:2015
-#: systemv/cupstestppd.c:2029 systemv/cupstestppd.c:2075
-#: systemv/cupstestppd.c:2097 systemv/cupstestppd.c:2120
-#: systemv/cupstestppd.c:2137 systemv/cupstestppd.c:2179
-#: systemv/cupstestppd.c:2222 systemv/cupstestppd.c:2269
-#: systemv/cupstestppd.c:2293 systemv/cupstestppd.c:2347
-#: systemv/cupstestppd.c:2363 systemv/cupstestppd.c:2385
-#: systemv/cupstestppd.c:2425 systemv/cupstestppd.c:2439
-#: systemv/cupstestppd.c:2465 systemv/cupstestppd.c:2481
-#: systemv/cupstestppd.c:2503 systemv/cupstestppd.c:2553
-#: systemv/cupstestppd.c:2567 systemv/cupstestppd.c:2593
-#: systemv/cupstestppd.c:2609 systemv/cupstestppd.c:2639
-#: systemv/cupstestppd.c:2653 systemv/cupstestppd.c:2680
-#: systemv/cupstestppd.c:2697 systemv/cupstestppd.c:2711
-#: systemv/cupstestppd.c:2735 systemv/cupstestppd.c:2752
-#: systemv/cupstestppd.c:2766 systemv/cupstestppd.c:2790
-#: systemv/cupstestppd.c:2807 systemv/cupstestppd.c:2821
-#: systemv/cupstestppd.c:2845 systemv/cupstestppd.c:2862
-#: systemv/cupstestppd.c:2876 systemv/cupstestppd.c:2900
-#: systemv/cupstestppd.c:2914 systemv/cupstestppd.c:2929
-#: systemv/cupstestppd.c:2946 systemv/cupstestppd.c:3002
-#: systemv/cupstestppd.c:3037 systemv/cupstestppd.c:3051
-#: systemv/cupstestppd.c:3079 systemv/cupstestppd.c:3144
-#: systemv/cupstestppd.c:3159 systemv/cupstestppd.c:3198
-#: systemv/cupstestppd.c:3218 systemv/cupstestppd.c:3232
-#: systemv/cupstestppd.c:3449 systemv/cupstestppd.c:3485
-#: systemv/cupstestppd.c:3499 systemv/cupstestppd.c:3545
-#: systemv/cupstestppd.c:3577 systemv/cupstestppd.c:3594
-#: systemv/cupstestppd.c:3617 systemv/cupstestppd.c:3633
-#: systemv/cupstestppd.c:3671 systemv/cupstestppd.c:3812
-#: systemv/cupstestppd.c:3834 systemv/cupstestppd.c:3942
+#: systemv/cupstestppd.c:304 systemv/cupstestppd.c:323
+#: systemv/cupstestppd.c:335 systemv/cupstestppd.c:468
+#: systemv/cupstestppd.c:483 systemv/cupstestppd.c:504
+#: systemv/cupstestppd.c:519 systemv/cupstestppd.c:549
+#: systemv/cupstestppd.c:569 systemv/cupstestppd.c:592
+#: systemv/cupstestppd.c:610 systemv/cupstestppd.c:636
+#: systemv/cupstestppd.c:654 systemv/cupstestppd.c:674
+#: systemv/cupstestppd.c:694 systemv/cupstestppd.c:712
+#: systemv/cupstestppd.c:729 systemv/cupstestppd.c:748
+#: systemv/cupstestppd.c:769 systemv/cupstestppd.c:788
+#: systemv/cupstestppd.c:808 systemv/cupstestppd.c:828
+#: systemv/cupstestppd.c:848 systemv/cupstestppd.c:868
+#: systemv/cupstestppd.c:886 systemv/cupstestppd.c:903
+#: systemv/cupstestppd.c:925 systemv/cupstestppd.c:943
+#: systemv/cupstestppd.c:960 systemv/cupstestppd.c:978
+#: systemv/cupstestppd.c:994 systemv/cupstestppd.c:1014
+#: systemv/cupstestppd.c:1045 systemv/cupstestppd.c:1067
+#: systemv/cupstestppd.c:1118 systemv/cupstestppd.c:1137
+#: systemv/cupstestppd.c:1181 systemv/cupstestppd.c:1195
+#: systemv/cupstestppd.c:1227 systemv/cupstestppd.c:1254
+#: systemv/cupstestppd.c:1772 systemv/cupstestppd.c:1791
+#: systemv/cupstestppd.c:1809 systemv/cupstestppd.c:1861
+#: systemv/cupstestppd.c:1877 systemv/cupstestppd.c:1914
+#: systemv/cupstestppd.c:1932 systemv/cupstestppd.c:1968
+#: systemv/cupstestppd.c:1982 systemv/cupstestppd.c:2009
+#: systemv/cupstestppd.c:2023 systemv/cupstestppd.c:2069
+#: systemv/cupstestppd.c:2091 systemv/cupstestppd.c:2114
+#: systemv/cupstestppd.c:2131 systemv/cupstestppd.c:2173
+#: systemv/cupstestppd.c:2216 systemv/cupstestppd.c:2263
+#: systemv/cupstestppd.c:2287 systemv/cupstestppd.c:2341
+#: systemv/cupstestppd.c:2357 systemv/cupstestppd.c:2379
+#: systemv/cupstestppd.c:2419 systemv/cupstestppd.c:2433
+#: systemv/cupstestppd.c:2459 systemv/cupstestppd.c:2475
+#: systemv/cupstestppd.c:2497 systemv/cupstestppd.c:2547
+#: systemv/cupstestppd.c:2561 systemv/cupstestppd.c:2587
+#: systemv/cupstestppd.c:2603 systemv/cupstestppd.c:2633
+#: systemv/cupstestppd.c:2647 systemv/cupstestppd.c:2674
+#: systemv/cupstestppd.c:2691 systemv/cupstestppd.c:2705
+#: systemv/cupstestppd.c:2729 systemv/cupstestppd.c:2746
+#: systemv/cupstestppd.c:2760 systemv/cupstestppd.c:2784
+#: systemv/cupstestppd.c:2801 systemv/cupstestppd.c:2815
+#: systemv/cupstestppd.c:2839 systemv/cupstestppd.c:2856
+#: systemv/cupstestppd.c:2870 systemv/cupstestppd.c:2894
+#: systemv/cupstestppd.c:2908 systemv/cupstestppd.c:2923
+#: systemv/cupstestppd.c:2940 systemv/cupstestppd.c:2996
+#: systemv/cupstestppd.c:3031 systemv/cupstestppd.c:3045
+#: systemv/cupstestppd.c:3073 systemv/cupstestppd.c:3138
+#: systemv/cupstestppd.c:3153 systemv/cupstestppd.c:3192
+#: systemv/cupstestppd.c:3212 systemv/cupstestppd.c:3226
+#: systemv/cupstestppd.c:3443 systemv/cupstestppd.c:3479
+#: systemv/cupstestppd.c:3493 systemv/cupstestppd.c:3539
+#: systemv/cupstestppd.c:3571 systemv/cupstestppd.c:3588
+#: systemv/cupstestppd.c:3611 systemv/cupstestppd.c:3627
+#: systemv/cupstestppd.c:3665 systemv/cupstestppd.c:3806
+#: systemv/cupstestppd.c:3828 systemv/cupstestppd.c:3936
 msgid " FAIL"
 msgstr ""
 
-#: systemv/cupstestppd.c:1284
+#: systemv/cupstestppd.c:1278
 msgid " PASS"
 msgstr ""
 
-#: cups/ipp.c:5223
+#: cups/ipp.c:5217
 #, c-format
 msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 8011 section 5.1.6)."
 msgstr ""
 
-#: cups/ipp.c:5234
+#: cups/ipp.c:5228
 #, c-format
 msgid "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 8011 section 5.1.6)."
 msgstr ""
 
-#: cups/ipp.c:4854
+#: cups/ipp.c:4848
 #, c-format
 msgid "\"%s\": Bad attribute name - bad length %d (RFC 8011 section 5.1.4)."
 msgstr ""
 
-#: cups/ipp.c:4846
+#: cups/ipp.c:4840
 #, c-format
 msgid "\"%s\": Bad attribute name - invalid character (RFC 8011 section 5.1.4)."
 msgstr ""
 
-#: cups/ipp.c:4872
+#: cups/ipp.c:4866
 #, c-format
 msgid "\"%s\": Bad boolen value %d (RFC 8011 section 5.1.21)."
 msgstr ""
 
-#: cups/ipp.c:5286
+#: cups/ipp.c:5280
 #, c-format
 msgid "\"%s\": Bad charset value \"%s\" - bad characters (RFC 8011 section 5.1.8)."
 msgstr ""
 
-#: cups/ipp.c:5295
+#: cups/ipp.c:5289
 #, c-format
 msgid "\"%s\": Bad charset value \"%s\" - bad length %d (RFC 8011 section 5.1.8)."
 msgstr ""
 
-#: cups/ipp.c:4972
+#: cups/ipp.c:4966
 #, c-format
 msgid "\"%s\": Bad dateTime UTC hours %u (RFC 8011 section 5.1.15)."
 msgstr ""
 
-#: cups/ipp.c:4980
+#: cups/ipp.c:4974
 #, c-format
 msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 8011 section 5.1.15)."
 msgstr ""
 
-#: cups/ipp.c:4964
+#: cups/ipp.c:4958
 #, c-format
 msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 8011 section 5.1.15)."
 msgstr ""
 
-#: cups/ipp.c:4924
+#: cups/ipp.c:4918
 #, c-format
 msgid "\"%s\": Bad dateTime day %u (RFC 8011 section 5.1.15)."
 msgstr ""
 
-#: cups/ipp.c:4956
+#: cups/ipp.c:4950
 #, c-format
 msgid "\"%s\": Bad dateTime deciseconds %u (RFC 8011 section 5.1.15)."
 msgstr ""
 
-#: cups/ipp.c:4932
+#: cups/ipp.c:4926
 #, c-format
 msgid "\"%s\": Bad dateTime hours %u (RFC 8011 section 5.1.15)."
 msgstr ""
 
-#: cups/ipp.c:4940
+#: cups/ipp.c:4934
 #, c-format
 msgid "\"%s\": Bad dateTime minutes %u (RFC 8011 section 5.1.15)."
 msgstr ""
 
-#: cups/ipp.c:4916
+#: cups/ipp.c:4910
 #, c-format
 msgid "\"%s\": Bad dateTime month %u (RFC 8011 section 5.1.15)."
 msgstr ""
 
-#: cups/ipp.c:4948
+#: cups/ipp.c:4942
 #, c-format
 msgid "\"%s\": Bad dateTime seconds %u (RFC 8011 section 5.1.15)."
 msgstr ""
 
-#: cups/ipp.c:4886
+#: cups/ipp.c:4880
 #, c-format
 msgid "\"%s\": Bad enum value %d - out of range (RFC 8011 section 5.1.5)."
 msgstr ""
 
-#: cups/ipp.c:5201
+#: cups/ipp.c:5195
 #, c-format
 msgid "\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 8011 section 5.1.4)."
 msgstr ""
 
-#: cups/ipp.c:5192
+#: cups/ipp.c:5186
 #, c-format
 msgid "\"%s\": Bad keyword value \"%s\" - invalid character (RFC 8011 section 5.1.4)."
 msgstr ""
 
-#: cups/ipp.c:5395
+#: cups/ipp.c:5389
 #, c-format
 msgid "\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 8011 section 5.1.10)."
 msgstr ""
 
-#: cups/ipp.c:5405
+#: cups/ipp.c:5399
 #, c-format
 msgid "\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 8011 section 5.1.10)."
 msgstr ""
 
-#: cups/ipp.c:5163
+#: cups/ipp.c:5157
 #, c-format
 msgid "\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."
 msgstr ""
 
-#: cups/ipp.c:5172
+#: cups/ipp.c:5166
 #, c-format
 msgid "\"%s\": Bad name value \"%s\" - bad length %d (RFC 8011 section 5.1.3)."
 msgstr ""
 
-#: cups/ipp.c:5341
+#: cups/ipp.c:5335
 #, c-format
 msgid "\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 8011 section 5.1.9)."
 msgstr ""
 
-#: cups/ipp.c:5351
+#: cups/ipp.c:5345
 #, c-format
 msgid "\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 8011 section 5.1.9)."
 msgstr ""
 
-#: cups/ipp.c:4900
+#: cups/ipp.c:4894
 #, c-format
 msgid "\"%s\": Bad octetString value - bad length %d (RFC 8011 section 5.1.20)."
 msgstr ""
 
-#: cups/ipp.c:5043
+#: cups/ipp.c:5037
 #, c-format
 msgid "\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 8011 section 5.1.14)."
 msgstr ""
 
-#: cups/ipp.c:5024
+#: cups/ipp.c:5018
 #, c-format
 msgid "\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 8011 section 5.1.16)."
 msgstr ""
 
-#: cups/ipp.c:4993
+#: cups/ipp.c:4987
 #, c-format
 msgid "\"%s\": Bad resolution value %dx%d%s - cross feed resolution must be positive (RFC 8011 section 5.1.16)."
 msgstr ""
 
-#: cups/ipp.c:5008
+#: cups/ipp.c:5002
 #, c-format
 msgid "\"%s\": Bad resolution value %dx%d%s - feed resolution must be positive (RFC 8011 section 5.1.16)."
 msgstr ""
 
-#: cups/ipp.c:5105
+#: cups/ipp.c:5099
 #, c-format
 msgid "\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."
 msgstr ""
 
-#: cups/ipp.c:5114
+#: cups/ipp.c:5108
 #, c-format
 msgid "\"%s\": Bad text value \"%s\" - bad length %d (RFC 8011 section 5.1.2)."
 msgstr ""
 
-#: cups/ipp.c:5257
+#: cups/ipp.c:5251
 #, c-format
 msgid "\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 8011 section 5.1.7)."
 msgstr ""
 
-#: cups/ipp.c:5266
+#: cups/ipp.c:5260
 #, c-format
 msgid "\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 8011 section 5.1.7)."
 msgstr ""
 
-#: berkeley/lpq.c:542
+#: berkeley/lpq.c:538
 #, c-format
 msgid "%-7s %-7.7s %-7d %-31.31s %.0f bytes"
 msgstr ""
 
-#: cups/dest-localization.c:126
+#: cups/dest-localization.c:155
 #, c-format
 msgid "%d x %d mm"
 msgstr ""
 
-#: cups/dest-localization.c:118
+#: cups/dest-localization.c:147
 #, c-format
 msgid "%g x %g \""
 msgstr ""
 
-#: cups/dest-localization.c:181 cups/dest-localization.c:188
+#: cups/dest-localization.c:188 cups/dest-localization.c:195
 #, c-format
 msgid "%s (%s)"
 msgstr ""
 
-#: cups/dest-localization.c:195
+#: cups/dest-localization.c:202
 #, c-format
 msgid "%s (%s, %s)"
 msgstr ""
 
-#: cups/dest-localization.c:172
+#: cups/dest-localization.c:179
 #, c-format
 msgid "%s (Borderless)"
 msgstr ""
 
-#: cups/dest-localization.c:179 cups/dest-localization.c:186
+#: cups/dest-localization.c:186 cups/dest-localization.c:193
 #, c-format
 msgid "%s (Borderless, %s)"
 msgstr ""
 
-#: cups/dest-localization.c:193
+#: cups/dest-localization.c:200
 #, c-format
 msgid "%s (Borderless, %s, %s)"
 msgstr ""
 
-#: systemv/lpstat.c:810
+#: systemv/lpstat.c:806
 #, c-format
 msgid "%s accepting requests since %s"
 msgstr ""
 
-#: scheduler/ipp.c:10332
+#: scheduler/ipp.c:10353
 #, c-format
 msgid "%s cannot be changed."
 msgstr ""
 
-#: berkeley/lpc.c:179
+#: berkeley/lpc.c:175
 #, c-format
 msgid "%s is not implemented by the CUPS version of lpc."
 msgstr ""
 
-#: berkeley/lpq.c:627
+#: berkeley/lpq.c:623
 #, c-format
 msgid "%s is not ready"
 msgstr ""
 
-#: berkeley/lpq.c:620
+#: berkeley/lpq.c:616
 #, c-format
 msgid "%s is ready"
 msgstr ""
 
-#: berkeley/lpq.c:623
+#: berkeley/lpq.c:619
 #, c-format
 msgid "%s is ready and printing"
 msgstr ""
 
-#: filter/rastertoepson.c:1004 filter/rastertohp.c:674
-#: filter/rastertolabel.c:1118
+#: filter/rastertoepson.c:998 filter/rastertohp.c:668
+#: filter/rastertolabel.c:1112
 #, c-format
 msgid "%s job-id user title copies options [file]"
 msgstr ""
 
-#: systemv/lpstat.c:814
+#: systemv/lpstat.c:810
 #, c-format
 msgid "%s not accepting requests since %s -"
 msgstr ""
 
-#: scheduler/ipp.c:640
+#: scheduler/ipp.c:636
 #, c-format
 msgid "%s not supported."
 msgstr ""
 
-#: systemv/lpstat.c:825
+#: systemv/lpstat.c:821
 #, c-format
 msgid "%s/%s accepting requests since %s"
 msgstr ""
 
-#: systemv/lpstat.c:830
+#: systemv/lpstat.c:826
 #, c-format
 msgid "%s/%s not accepting requests since %s -"
 msgstr ""
 
-#: berkeley/lpq.c:535
+#: berkeley/lpq.c:531
 #, c-format
 msgid "%s: %-33.33s [job %d localhost]"
 msgstr ""
 
 #. TRANSLATORS: Message is "subject: error"
-#: cups/langprintf.c:75 scheduler/cupsfilter.c:724 systemv/lpadmin.c:772
-#: systemv/lpadmin.c:823 systemv/lpadmin.c:873 systemv/lpadmin.c:929
-#: systemv/lpadmin.c:1027 systemv/lpadmin.c:1079 systemv/lpadmin.c:1135
-#: systemv/lpadmin.c:1550
+#: cups/langprintf.c:69 scheduler/cupsfilter.c:720 systemv/lpadmin.c:786
+#: systemv/lpadmin.c:837 systemv/lpadmin.c:887 systemv/lpadmin.c:943
+#: systemv/lpadmin.c:1041 systemv/lpadmin.c:1093 systemv/lpadmin.c:1149
+#: systemv/lpadmin.c:1564
 #, c-format
 msgid "%s: %s"
 msgstr ""
 
-#: systemv/cancel.c:304 systemv/cancel.c:368
+#: systemv/cancel.c:300 systemv/cancel.c:364
 #, c-format
 msgid "%s: %s failed: %s"
 msgstr ""
 
-#: systemv/lpadmin.c:1185
+#: systemv/lpadmin.c:1199
 #, c-format
 msgid "%s: Bad printer URI \"%s\"."
 msgstr ""
 
-#: test/ippfind.c:775 test/ipptool.c:372
+#: test/ippfind.c:770 test/ipptool.c:390
 #, c-format
 msgid "%s: Bad version %s for \"-V\"."
 msgstr ""
 
-#: systemv/cupsaccept.c:63
+#: systemv/cupsaccept.c:59
 #, c-format
 msgid "%s: Don't know what to do."
 msgstr ""
 
-#: berkeley/lpq.c:234 berkeley/lpr.c:365 systemv/lp.c:606
+#: berkeley/lpr.c:344 systemv/lp.c:586
+#, c-format
+msgid "%s: Error - %s"
+msgstr ""
+
+#: berkeley/lpq.c:230
 #, c-format
 msgid "%s: Error - %s environment variable names non-existent destination \"%s\"."
 msgstr ""
 
-#: berkeley/lpq.c:139 berkeley/lpq.c:212 berkeley/lpr.c:229 berkeley/lpr.c:340
-#: systemv/lp.c:161 systemv/lp.c:581 systemv/lp.c:701 systemv/lp.c:750
-#: systemv/lpstat.c:190 systemv/lpstat.c:235 systemv/lpstat.c:368
-#: systemv/lpstat.c:395 systemv/lpstat.c:417 systemv/lpstat.c:477
-#: systemv/lpstat.c:543 systemv/lpstat.c:604 systemv/lpstat.c:729
-#: systemv/lpstat.c:913 systemv/lpstat.c:1174 systemv/lpstat.c:1372
-#: systemv/lpstat.c:1612
+#: berkeley/lpq.c:135 berkeley/lpq.c:208 berkeley/lpr.c:224 berkeley/lpr.c:335
+#: systemv/lp.c:157 systemv/lp.c:577 systemv/lp.c:674 systemv/lp.c:723
+#: systemv/lpstat.c:186 systemv/lpstat.c:231 systemv/lpstat.c:364
+#: systemv/lpstat.c:391 systemv/lpstat.c:413 systemv/lpstat.c:473
+#: systemv/lpstat.c:539 systemv/lpstat.c:600 systemv/lpstat.c:725
+#: systemv/lpstat.c:909 systemv/lpstat.c:1170 systemv/lpstat.c:1368
+#: systemv/lpstat.c:1608
 #, c-format
 msgid "%s: Error - add '/version=1.1' to server name."
 msgstr ""
 
-#: systemv/lp.c:238
+#: systemv/lp.c:234
 #, c-format
 msgid "%s: Error - bad job ID."
 msgstr ""
 
-#: systemv/lp.c:227
+#: systemv/lp.c:223
 #, c-format
 msgid "%s: Error - cannot print files and alter jobs simultaneously."
 msgstr ""
 
-#: systemv/lp.c:518
+#: systemv/lp.c:514
 #, c-format
 msgid "%s: Error - cannot print from stdin if files or a job ID are provided."
 msgstr ""
 
-#: berkeley/lpr.c:254 systemv/lp.c:280
+#: berkeley/lpr.c:249 systemv/lp.c:276
 #, c-format
 msgid "%s: Error - copies must be 1 or more."
 msgstr ""
 
-#: systemv/lp.c:470
+#: systemv/lp.c:466
 #, c-format
 msgid "%s: Error - expected character set after \"-S\" option."
 msgstr ""
 
-#: systemv/lp.c:489
+#: systemv/lp.c:485
 #, c-format
 msgid "%s: Error - expected content type after \"-T\" option."
 msgstr ""
 
-#: berkeley/lpr.c:245
+#: berkeley/lpr.c:240
 #, c-format
 msgid "%s: Error - expected copies after \"-#\" option."
 msgstr ""
 
-#: systemv/lp.c:271
+#: systemv/lp.c:267
 #, c-format
 msgid "%s: Error - expected copies after \"-n\" option."
 msgstr ""
 
-#: berkeley/lpr.c:207
+#: berkeley/lpr.c:202
 #, c-format
 msgid "%s: Error - expected destination after \"-P\" option."
 msgstr ""
 
-#: systemv/lp.c:137
+#: systemv/lp.c:133
 #, c-format
 msgid "%s: Error - expected destination after \"-d\" option."
 msgstr ""
 
-#: systemv/lp.c:178
+#: systemv/lp.c:174
 #, c-format
 msgid "%s: Error - expected form after \"-f\" option."
 msgstr ""
 
-#: systemv/lp.c:406
+#: systemv/lp.c:402
 #, c-format
 msgid "%s: Error - expected hold name after \"-H\" option."
 msgstr ""
 
-#: berkeley/lpr.c:104
+#: berkeley/lpr.c:99
 #, c-format
 msgid "%s: Error - expected hostname after \"-H\" option."
 msgstr ""
 
-#: berkeley/lpq.c:173 berkeley/lprm.c:124 systemv/cancel.c:124
-#: systemv/cupsaccept.c:127 systemv/lp.c:198 systemv/lpstat.c:304
+#: berkeley/lpq.c:169 berkeley/lprm.c:120 systemv/cancel.c:120
+#: systemv/cupsaccept.c:123 systemv/lp.c:194 systemv/lpstat.c:300
 #, c-format
 msgid "%s: Error - expected hostname after \"-h\" option."
 msgstr ""
 
-#: systemv/lp.c:386
+#: systemv/lp.c:382
 #, c-format
 msgid "%s: Error - expected mode list after \"-y\" option."
 msgstr ""
 
-#: berkeley/lpr.c:275
+#: berkeley/lpr.c:270
 #, c-format
 msgid "%s: Error - expected name after \"-%c\" option."
 msgstr ""
 
-#: berkeley/lpr.c:156 systemv/lp.c:301
+#: berkeley/lpr.c:151 systemv/lp.c:297
 #, c-format
 msgid "%s: Error - expected option=value after \"-o\" option."
 msgstr ""
 
-#: systemv/lp.c:449
+#: systemv/lp.c:445
 #, c-format
 msgid "%s: Error - expected page list after \"-P\" option."
 msgstr ""
 
-#: systemv/lp.c:322
+#: systemv/lp.c:318
 #, c-format
 msgid "%s: Error - expected priority after \"-%c\" option."
 msgstr ""
 
-#: systemv/cupsaccept.c:146
+#: systemv/cupsaccept.c:142
 #, c-format
 msgid "%s: Error - expected reason text after \"-r\" option."
 msgstr ""
 
-#: systemv/lp.c:367
+#: systemv/lp.c:363
 #, c-format
 msgid "%s: Error - expected title after \"-t\" option."
 msgstr ""
 
-#: berkeley/lpq.c:102 berkeley/lpr.c:84 berkeley/lprm.c:104
-#: systemv/cancel.c:94 systemv/cupsaccept.c:104 systemv/lp.c:114
-#: systemv/lpadmin.c:423 systemv/lpstat.c:129
+#: berkeley/lpq.c:98 berkeley/lpr.c:79 berkeley/lprm.c:100 systemv/cancel.c:90
+#: systemv/cupsaccept.c:100 systemv/lp.c:110 systemv/lpadmin.c:438
+#: systemv/lpstat.c:125
 #, c-format
 msgid "%s: Error - expected username after \"-U\" option."
 msgstr ""
 
-#: systemv/cancel.c:146
+#: systemv/cancel.c:142
 #, c-format
 msgid "%s: Error - expected username after \"-u\" option."
 msgstr ""
 
-#: berkeley/lpr.c:129
+#: berkeley/lpr.c:124
 #, c-format
 msgid "%s: Error - expected value after \"-%c\" option."
 msgstr ""
 
-#: systemv/lpstat.c:149 systemv/lpstat.c:158
+#: systemv/lpstat.c:145 systemv/lpstat.c:154
 #, c-format
 msgid "%s: Error - need \"completed\", \"not-completed\", or \"all\" after \"-W\" option."
 msgstr ""
 
-#: berkeley/lpq.c:239 berkeley/lpr.c:370 systemv/lp.c:611
+#: berkeley/lpq.c:235
 #, c-format
 msgid "%s: Error - no default destination available."
 msgstr ""
 
-#: systemv/lp.c:342
+#: systemv/lp.c:338
 #, c-format
 msgid "%s: Error - priority must be between 1 and 100."
 msgstr ""
 
-#: berkeley/lpr.c:373 systemv/lp.c:614
+#: berkeley/lpr.c:346 systemv/lp.c:588
 #, c-format
 msgid "%s: Error - scheduler not responding."
 msgstr ""
 
-#: berkeley/lpr.c:316 systemv/lp.c:550
+#: berkeley/lpr.c:311 systemv/lp.c:546
 #, c-format
 msgid "%s: Error - too many files - \"%s\"."
 msgstr ""
 
-#: berkeley/lpr.c:298 systemv/lp.c:533
+#: berkeley/lpr.c:293 systemv/lp.c:529
 #, c-format
 msgid "%s: Error - unable to access \"%s\" - %s"
 msgstr ""
 
-#: berkeley/lpr.c:416 systemv/lp.c:645
+#: berkeley/lpr.c:388 systemv/lp.c:618
 #, c-format
 msgid "%s: Error - unable to queue from stdin - %s."
 msgstr ""
 
-#: berkeley/lprm.c:86 berkeley/lprm.c:173 systemv/cancel.c:221
+#: berkeley/lprm.c:82 berkeley/lprm.c:169 systemv/cancel.c:217
 #, c-format
 msgid "%s: Error - unknown destination \"%s\"."
 msgstr ""
 
-#: berkeley/lpq.c:141
+#: berkeley/lpq.c:137
 #, c-format
 msgid "%s: Error - unknown destination \"%s/%s\"."
 msgstr ""
 
-#: berkeley/lpr.c:284 berkeley/lprm.c:139 systemv/cancel.c:162
-#: systemv/cupsaccept.c:155 systemv/lp.c:508 systemv/lpstat.c:487
+#: berkeley/lpr.c:279 berkeley/lprm.c:135 systemv/cancel.c:158
+#: systemv/cupsaccept.c:151 systemv/lp.c:504 systemv/lpstat.c:483
 #, c-format
 msgid "%s: Error - unknown option \"%c\"."
 msgstr ""
 
-#: systemv/lp.c:500
+#: systemv/lp.c:496
 #, c-format
 msgid "%s: Error - unknown option \"%s\"."
 msgstr ""
 
-#: systemv/lp.c:218
+#: systemv/lp.c:214
 #, c-format
 msgid "%s: Expected job ID after \"-i\" option."
 msgstr ""
 
-#: systemv/lpstat.c:547 systemv/lpstat.c:587
+#: systemv/lpstat.c:543 systemv/lpstat.c:583
 #, c-format
 msgid "%s: Invalid destination name in list \"%s\"."
 msgstr ""
 
-#: scheduler/cupsfilter.c:577
+#: scheduler/cupsfilter.c:573
 #, c-format
 msgid "%s: Invalid filter string \"%s\"."
 msgstr ""
 
-#: test/ipptool.c:303
+#: test/ipptool.c:321
 #, c-format
 msgid "%s: Missing filename for \"-P\"."
 msgstr ""
 
-#: test/ippfind.c:747 test/ipptool.c:340
+#: test/ippfind.c:742 test/ipptool.c:358
 #, c-format
 msgid "%s: Missing timeout for \"-T\"."
 msgstr ""
 
-#: test/ippfind.c:760 test/ipptool.c:354
+#: test/ippfind.c:755 test/ipptool.c:372
 #, c-format
 msgid "%s: Missing version for \"-V\"."
 msgstr ""
 
-#: systemv/lp.c:426
+#: systemv/lp.c:422
 #, c-format
 msgid "%s: Need job ID (\"-i jobid\") before \"-H restart\"."
 msgstr ""
 
-#: scheduler/cupsfilter.c:449
+#: scheduler/cupsfilter.c:445
 #, c-format
 msgid "%s: No filter to convert from %s/%s to %s/%s."
 msgstr ""
 
-#: systemv/cupsaccept.c:189
+#: systemv/cupsaccept.c:185
 #, c-format
 msgid "%s: Operation failed: %s"
 msgstr ""
 
-#: berkeley/lpq.c:87 berkeley/lpr.c:69 berkeley/lprm.c:65 systemv/cancel.c:79
-#: systemv/cupsaccept.c:89 systemv/cupsaddsmb.c:78 systemv/lp.c:99
-#: systemv/lpadmin.c:232 systemv/lpinfo.c:192 systemv/lpmove.c:70
-#: systemv/lpstat.c:91 test/ipptool.c:285 test/ipptool.c:329
+#: berkeley/lpq.c:83 berkeley/lpr.c:64 berkeley/lprm.c:61 systemv/cancel.c:75
+#: systemv/cupsaccept.c:85 systemv/cupsaddsmb.c:74 systemv/lp.c:95
+#: systemv/lpadmin.c:247 systemv/lpinfo.c:188 systemv/lpmove.c:66
+#: systemv/lpstat.c:87 test/ipptool.c:303 test/ipptool.c:347
 #, c-format
 msgid "%s: Sorry, no encryption support."
 msgstr ""
 
-#: systemv/lpadmin.c:1192
+#: systemv/lpadmin.c:1206
 #, c-format
 msgid "%s: Unable to connect to \"%s:%d\": %s"
 msgstr ""
 
-#: berkeley/lpq.c:293 scheduler/cupsfilter.c:1273 systemv/cancel.c:244
-#: systemv/cupsaddsmb.c:136 systemv/cupsaddsmb.c:163
+#: berkeley/lpq.c:289 scheduler/cupsfilter.c:1269 systemv/cancel.c:240
+#: systemv/cupsaddsmb.c:132 systemv/cupsaddsmb.c:159
 #, c-format
 msgid "%s: Unable to connect to server."
 msgstr ""
 
-#: systemv/cancel.c:328
+#: systemv/cancel.c:324
 #, c-format
 msgid "%s: Unable to contact server."
 msgstr ""
 
-#: systemv/lpadmin.c:1205
+#: systemv/lpadmin.c:1219
 #, c-format
 msgid "%s: Unable to create PPD file: %s"
 msgstr ""
 
-#: scheduler/cupsfilter.c:414
+#: scheduler/cupsfilter.c:410
 #, c-format
 msgid "%s: Unable to determine MIME type of \"%s\"."
 msgstr ""
 
-#: test/ipptool.c:312
+#: test/ipptool.c:264 test/ipptool.c:330
 #, c-format
 msgid "%s: Unable to open \"%s\": %s"
 msgstr ""
 
-#: ppdc/ppdmerge.cxx:88
+#: ppdc/ppdmerge.cxx:84
 #, c-format
 msgid "%s: Unable to open %s: %s"
 msgstr ""
 
-#: scheduler/cupsfilter.c:672 ppdc/ppdmerge.cxx:104
+#: scheduler/cupsfilter.c:668 ppdc/ppdmerge.cxx:100
 #, c-format
 msgid "%s: Unable to open PPD file: %s on line %d."
 msgstr ""
 
-#: scheduler/cupsfilter.c:381
+#: scheduler/cupsfilter.c:377
 #, c-format
 msgid "%s: Unable to read MIME database from \"%s\" or \"%s\"."
 msgstr ""
 
-#: systemv/lpadmin.c:1176
+#: systemv/lpadmin.c:1190
 #, c-format
 msgid "%s: Unable to resolve \"%s\"."
 msgstr ""
 
-#: systemv/lpinfo.c:238
+#: systemv/lpinfo.c:234
 #, c-format
 msgid "%s: Unknown argument \"%s\"."
 msgstr ""
 
-#: berkeley/lpq.c:143 systemv/lpstat.c:608
+#: berkeley/lpq.c:139 systemv/lpstat.c:604
 #, c-format
 msgid "%s: Unknown destination \"%s\"."
 msgstr ""
 
-#: scheduler/cupsfilter.c:426
+#: scheduler/cupsfilter.c:422
 #, c-format
 msgid "%s: Unknown destination MIME type %s/%s."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1477 systemv/lpinfo.c:231 systemv/lpmove.c:95
+#: scheduler/cupsfilter.c:1473 systemv/lpinfo.c:227 systemv/lpmove.c:91
 #, c-format
 msgid "%s: Unknown option \"%c\"."
 msgstr ""
 
-#: test/ippfind.c:646
+#: test/ippfind.c:641
 #, c-format
 msgid "%s: Unknown option \"%s\"."
 msgstr ""
 
-#: test/ippfind.c:926
+#: test/ippfind.c:921
 #, c-format
 msgid "%s: Unknown option \"-%c\"."
 msgstr ""
 
-#: scheduler/cupsfilter.c:406
+#: scheduler/cupsfilter.c:402
 #, c-format
 msgid "%s: Unknown source MIME type %s/%s."
 msgstr ""
 
-#: berkeley/lpr.c:142
+#: berkeley/lpr.c:137
 #, c-format
 msgid "%s: Warning - \"%c\" format modifier not supported - output may not be correct."
 msgstr ""
 
-#: systemv/lp.c:475
+#: systemv/lp.c:471
 #, c-format
 msgid "%s: Warning - character set option ignored."
 msgstr ""
 
-#: systemv/lp.c:494
+#: systemv/lp.c:490
 #, c-format
 msgid "%s: Warning - content type option ignored."
 msgstr ""
 
-#: systemv/lp.c:183
+#: systemv/lp.c:179
 #, c-format
 msgid "%s: Warning - form option ignored."
 msgstr ""
 
-#: systemv/lp.c:391
+#: systemv/lp.c:387
 #, c-format
 msgid "%s: Warning - mode option ignored."
 msgstr ""
@@ -2358,6 +2367,10 @@ msgstr ""
 msgid "-95"
 msgstr ""
 
+#: cups/dest.c:1956
+msgid "/etc/cups/lpoptions file names default destination that does not exist."
+msgstr ""
+
 #: ppdc/sample.c:306
 msgid "0"
 msgstr ""
@@ -2534,23 +2547,23 @@ msgstr ""
 msgid "2 inches/sec."
 msgstr ""
 
-#: cups/ppd-cache.c:3012
+#: cups/ppd-cache.c:3077
 msgid "2-Hole Punch (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3013
+#: cups/ppd-cache.c:3078
 msgid "2-Hole Punch (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3011
+#: cups/ppd-cache.c:3076
 msgid "2-Hole Punch (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3010
+#: cups/ppd-cache.c:3075
 msgid "2-Hole Punch (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3682 ppdc/sample.c:262
+#: cups/ppd-cache.c:3964 ppdc/sample.c:262
 msgid "2-Sided Printing"
 msgstr ""
 
@@ -2702,19 +2715,19 @@ msgstr ""
 msgid "3 x 5"
 msgstr ""
 
-#: cups/ppd-cache.c:3023
+#: cups/ppd-cache.c:3088
 msgid "3-Hole Punch (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3021
+#: cups/ppd-cache.c:3086
 msgid "3-Hole Punch (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3020
+#: cups/ppd-cache.c:3085
 msgid "3-Hole Punch (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3022
+#: cups/ppd-cache.c:3087
 msgid "3-Hole Punch (Reverse Portrait)"
 msgstr ""
 
@@ -2806,19 +2819,19 @@ msgstr ""
 msgid "4 inches/sec."
 msgstr ""
 
-#: cups/ppd-cache.c:3017
+#: cups/ppd-cache.c:3082
 msgid "4-Hole Punch (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3015
+#: cups/ppd-cache.c:3080
 msgid "4-Hole Punch (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3014
+#: cups/ppd-cache.c:3079
 msgid "4-Hole Punch (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3016
+#: cups/ppd-cache.c:3081
 msgid "4-Hole Punch (Reverse Portrait)"
 msgstr ""
 
@@ -3050,24 +3063,24 @@ msgstr ""
 msgid "95"
 msgstr ""
 
-#: berkeley/lpc.c:203
+#: berkeley/lpc.c:199
 msgid "?Invalid help command unknown."
 msgstr ""
 
-#: cgi-bin/admin.c:2352
+#: cgi-bin/admin.c:2061
 msgid "A Samba password is required to export printer drivers"
 msgstr ""
 
-#: cgi-bin/admin.c:2348
+#: cgi-bin/admin.c:2057
 msgid "A Samba username is required to export printer drivers"
 msgstr ""
 
-#: scheduler/ipp.c:2327
+#: scheduler/ipp.c:2325
 #, c-format
 msgid "A class named \"%s\" already exists."
 msgstr ""
 
-#: scheduler/ipp.c:938
+#: scheduler/ipp.c:934
 #, c-format
 msgid "A printer named \"%s\" already exists."
 msgstr ""
@@ -3208,52 +3221,47 @@ msgstr ""
 msgid "ARCH E Long Edge"
 msgstr ""
 
-#: cgi-bin/classes.c:159 cgi-bin/printers.c:162
+#: cgi-bin/classes.c:155 cgi-bin/printers.c:158
 msgid "Accept Jobs"
 msgstr ""
 
-#: cups/http-support.c:1355
+#: cups/http-support.c:1346
 msgid "Accepted"
 msgstr ""
 
-#: cups/ppd-cache.c:2993
+#: cups/ppd-cache.c:3058
 msgid "Accordian Fold"
 msgstr ""
 
-#: cgi-bin/admin.c:544
+#: cgi-bin/admin.c:338
 msgid "Add Class"
 msgstr ""
 
-#: cgi-bin/admin.c:857
+#: cgi-bin/admin.c:651
 msgid "Add Printer"
 msgstr ""
 
-#: cgi-bin/admin.c:418 cgi-bin/admin.c:451 cgi-bin/admin.c:499
-#: cgi-bin/admin.c:509
-msgid "Add RSS Subscription"
-msgstr ""
-
 #: ppdc/sample.c:163
 msgid "Address"
 msgstr ""
 
-#: cgi-bin/admin.c:184 cgi-bin/admin.c:258 cgi-bin/admin.c:2729
+#: cgi-bin/admin.c:174 cgi-bin/admin.c:248 cgi-bin/admin.c:2438
 msgid "Administration"
 msgstr ""
 
-#: cups/ppd-cache.c:3443
+#: cups/ppd-cache.c:3716
 msgid "Advanced Photo Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3357
+#: cups/ppd-cache.c:3630
 msgid "Alternate"
 msgstr ""
 
-#: cups/ppd-cache.c:3365
+#: cups/ppd-cache.c:3638
 msgid "Alternate Roll"
 msgstr ""
 
-#: cups/ppd-cache.c:3437
+#: cups/ppd-cache.c:3710
 msgid "Aluminum"
 msgstr ""
 
@@ -3261,7 +3269,7 @@ msgstr ""
 msgid "Always"
 msgstr ""
 
-#: backend/socket.c:118
+#: backend/socket.c:116
 msgid "AppSocket/HP JetDirect"
 msgstr ""
 
@@ -3269,43 +3277,43 @@ msgstr ""
 msgid "Applicator"
 msgstr ""
 
-#: cups/ppd-cache.c:3471
+#: cups/ppd-cache.c:3744
 msgid "Archival Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3483
+#: cups/ppd-cache.c:3756
 msgid "Archival Fabric"
 msgstr ""
 
-#: cups/ppd-cache.c:3560
+#: cups/ppd-cache.c:3833
 msgid "Archival Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3532
+#: cups/ppd-cache.c:3805
 msgid "Archival Photo Paper"
 msgstr ""
 
-#: scheduler/ipp.c:1033
+#: scheduler/ipp.c:1031
 #, c-format
 msgid "Attempt to set %s printer-state to bad value %d."
 msgstr ""
 
-#: scheduler/ipp.c:5460 scheduler/ipp.c:5486
+#: scheduler/ipp.c:5466 scheduler/ipp.c:5492
 #, c-format
 msgid "Attribute \"%s\" is in the wrong group."
 msgstr ""
 
-#: scheduler/ipp.c:5462 scheduler/ipp.c:5488
+#: scheduler/ipp.c:5468 scheduler/ipp.c:5494
 #, c-format
 msgid "Attribute \"%s\" is the wrong value type."
 msgstr ""
 
-#: scheduler/ipp.c:258
+#: scheduler/ipp.c:254
 #, c-format
 msgid "Attribute groups are out of order (%x < %x)."
 msgstr ""
 
-#: cups/ppd-cache.c:3355 cups/ppd-cache.c:3438 cups/ppd-cache.c:3742
+#: cups/ppd-cache.c:3628 cups/ppd-cache.c:3711 cups/ppd-cache.c:4024
 msgid "Automatic"
 msgstr ""
 
@@ -3357,41 +3365,46 @@ msgstr ""
 msgid "B9"
 msgstr ""
 
-#: cups/ppd-cache.c:3439
+#: cups/ppd-cache.c:3712
 msgid "Back Print Film"
 msgstr ""
 
-#: scheduler/ipp.c:11279
+#: scheduler/ipp.c:7529
+#, c-format
+msgid "Bad \"printer-id\" value %d."
+msgstr ""
+
+#: scheduler/ipp.c:11300
 #, c-format
 msgid "Bad 'document-format' value \"%s\"."
 msgstr ""
 
-#: cups/dest.c:1654
+#: cups/dest.c:1648
 msgid "Bad NULL dests pointer"
 msgstr ""
 
-#: cups/ppd.c:320
+#: cups/ppd.c:308
 msgid "Bad OpenGroup"
 msgstr ""
 
-#: cups/ppd.c:322
+#: cups/ppd.c:310
 msgid "Bad OpenUI/JCLOpenUI"
 msgstr ""
 
-#: cups/ppd.c:324
+#: cups/ppd.c:312
 msgid "Bad OrderDependency"
 msgstr ""
 
-#: cups/ppd-cache.c:458 cups/ppd-cache.c:505 cups/ppd-cache.c:543
-#: cups/ppd-cache.c:549 cups/ppd-cache.c:565 cups/ppd-cache.c:581
-#: cups/ppd-cache.c:590 cups/ppd-cache.c:598 cups/ppd-cache.c:615
-#: cups/ppd-cache.c:623 cups/ppd-cache.c:638 cups/ppd-cache.c:646
-#: cups/ppd-cache.c:667 cups/ppd-cache.c:679 cups/ppd-cache.c:694
-#: cups/ppd-cache.c:706 cups/ppd-cache.c:728 cups/ppd-cache.c:736
-#: cups/ppd-cache.c:754 cups/ppd-cache.c:762 cups/ppd-cache.c:777
-#: cups/ppd-cache.c:785 cups/ppd-cache.c:803 cups/ppd-cache.c:811
-#: cups/ppd-cache.c:838 cups/ppd-cache.c:908 cups/ppd-cache.c:916
-#: cups/ppd-cache.c:924
+#: cups/ppd-cache.c:480 cups/ppd-cache.c:527 cups/ppd-cache.c:565
+#: cups/ppd-cache.c:571 cups/ppd-cache.c:587 cups/ppd-cache.c:603
+#: cups/ppd-cache.c:612 cups/ppd-cache.c:620 cups/ppd-cache.c:637
+#: cups/ppd-cache.c:645 cups/ppd-cache.c:660 cups/ppd-cache.c:668
+#: cups/ppd-cache.c:689 cups/ppd-cache.c:701 cups/ppd-cache.c:716
+#: cups/ppd-cache.c:728 cups/ppd-cache.c:750 cups/ppd-cache.c:758
+#: cups/ppd-cache.c:776 cups/ppd-cache.c:784 cups/ppd-cache.c:799
+#: cups/ppd-cache.c:807 cups/ppd-cache.c:825 cups/ppd-cache.c:833
+#: cups/ppd-cache.c:860 cups/ppd-cache.c:939 cups/ppd-cache.c:947
+#: cups/ppd-cache.c:955
 msgid "Bad PPD cache file."
 msgstr ""
 
@@ -3399,32 +3412,32 @@ msgstr ""
 msgid "Bad PPD file."
 msgstr ""
 
-#: cups/http-support.c:1370
+#: cups/http-support.c:1361
 msgid "Bad Request"
 msgstr ""
 
-#: cups/snmp.c:956
+#: cups/snmp.c:954
 msgid "Bad SNMP version number"
 msgstr ""
 
-#: cups/ppd.c:325
+#: cups/ppd.c:313
 msgid "Bad UIConstraints"
 msgstr ""
 
-#: cups/hash.c:51 cups/http-support.c:1464
+#: cups/hash.c:47 cups/http-support.c:1455
 msgid "Bad arguments to function"
 msgstr ""
 
-#: scheduler/ipp.c:1418
+#: scheduler/ipp.c:1416
 #, c-format
 msgid "Bad copies value %d."
 msgstr ""
 
-#: cups/ppd.c:333
+#: cups/ppd.c:321
 msgid "Bad custom parameter"
 msgstr ""
 
-#: cups/http-support.c:1604 scheduler/ipp.c:2407
+#: cups/http-support.c:1595 scheduler/ipp.c:2407
 #, c-format
 msgid "Bad device-uri \"%s\"."
 msgstr ""
@@ -3434,84 +3447,84 @@ msgstr ""
 msgid "Bad device-uri scheme \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:8487 scheduler/ipp.c:8505 scheduler/ipp.c:9733
+#: scheduler/ipp.c:8508 scheduler/ipp.c:8526 scheduler/ipp.c:9754
 #, c-format
 msgid "Bad document-format \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:9751
+#: scheduler/ipp.c:9772
 #, c-format
 msgid "Bad document-format-default \"%s\"."
 msgstr ""
 
-#: cups/ppd-util.c:170
+#: cups/ppd-util.c:165
 msgid "Bad filename buffer"
 msgstr ""
 
-#: cups/http-support.c:1473
+#: cups/http-support.c:1464
 msgid "Bad hostname/address in URI"
 msgstr ""
 
-#: scheduler/ipp.c:1593
+#: scheduler/ipp.c:1591
 #, c-format
 msgid "Bad job-name value: %s"
 msgstr ""
 
-#: scheduler/ipp.c:1586
+#: scheduler/ipp.c:1584
 msgid "Bad job-name value: Wrong type or count."
 msgstr ""
 
-#: scheduler/ipp.c:10347
+#: scheduler/ipp.c:10368
 msgid "Bad job-priority value."
 msgstr ""
 
-#: scheduler/ipp.c:1448
+#: scheduler/ipp.c:1446
 #, c-format
 msgid "Bad job-sheets value \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:1432
+#: scheduler/ipp.c:1430
 msgid "Bad job-sheets value type."
 msgstr ""
 
-#: scheduler/ipp.c:10377
+#: scheduler/ipp.c:10398
 msgid "Bad job-state value."
 msgstr ""
 
-#: scheduler/ipp.c:3043 scheduler/ipp.c:3505 scheduler/ipp.c:6272
-#: scheduler/ipp.c:6419 scheduler/ipp.c:7916 scheduler/ipp.c:8185
-#: scheduler/ipp.c:9051 scheduler/ipp.c:9275 scheduler/ipp.c:9627
-#: scheduler/ipp.c:10240
+#: scheduler/ipp.c:3049 scheduler/ipp.c:3511 scheduler/ipp.c:6278
+#: scheduler/ipp.c:6425 scheduler/ipp.c:7937 scheduler/ipp.c:8206
+#: scheduler/ipp.c:9072 scheduler/ipp.c:9296 scheduler/ipp.c:9648
+#: scheduler/ipp.c:10261
 #, c-format
 msgid "Bad job-uri \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:2093 scheduler/ipp.c:5811
+#: scheduler/ipp.c:2091 scheduler/ipp.c:5817
 #, c-format
 msgid "Bad notify-pull-method \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:2057 scheduler/ipp.c:5775
+#: scheduler/ipp.c:2055 scheduler/ipp.c:5781
 #, c-format
 msgid "Bad notify-recipient-uri \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:1464
+#: scheduler/ipp.c:1462
 #, c-format
 msgid "Bad number-up value %d."
 msgstr ""
 
-#: cups/adminutil.c:280
+#: cups/adminutil.c:274
 #, c-format
 msgid "Bad option + choice on line %d."
 msgstr ""
 
-#: scheduler/ipp.c:1481
+#: scheduler/ipp.c:1479
 #, c-format
 msgid "Bad page-ranges values %d-%d."
 msgstr ""
 
-#: cups/http-support.c:1470
+#: cups/http-support.c:1461
 msgid "Bad port number in URI"
 msgstr ""
 
@@ -3525,78 +3538,74 @@ msgstr ""
 msgid "Bad printer-state value %d."
 msgstr ""
 
-#: cups/dest.c:687 cups/dest.c:1183 cups/dest.c:1234
+#: cups/dest.c:681 cups/dest.c:1177 cups/dest.c:1228
 msgid "Bad printer-uri."
 msgstr ""
 
-#: scheduler/ipp.c:226
+#: scheduler/ipp.c:222
 #, c-format
 msgid "Bad request ID %d."
 msgstr ""
 
-#: scheduler/ipp.c:211
+#: scheduler/ipp.c:207
 #, c-format
 msgid "Bad request version number %d.%d."
 msgstr ""
 
-#: scheduler/ipp.c:1604
+#: scheduler/ipp.c:1602
 #, c-format
 msgid "Bad requesting-user-name value: %s"
 msgstr ""
 
-#: cups/http-support.c:1467
+#: cups/http-support.c:1458
 msgid "Bad resource in URI"
 msgstr ""
 
-#: cups/http-support.c:1479
+#: cups/http-support.c:1470
 msgid "Bad scheme in URI"
 msgstr ""
 
-#: cgi-bin/admin.c:1468
-msgid "Bad subscription ID"
-msgstr ""
-
-#: cups/http-support.c:1476
+#: cups/http-support.c:1467
 msgid "Bad username in URI"
 msgstr ""
 
-#: cups/ppd.c:335
+#: cups/ppd.c:323
 msgid "Bad value string"
 msgstr ""
 
-#: cups/http-support.c:1482
+#: cups/http-support.c:1473
 msgid "Bad/empty URI"
 msgstr ""
 
-#: cups/ppd-cache.c:2978
+#: cups/ppd-cache.c:3043
 msgid "Bale"
 msgstr ""
 
-#: cgi-bin/admin.c:3274 cgi-bin/admin.c:3520
+#: cgi-bin/admin.c:2983 cgi-bin/admin.c:3229
 msgid "Banners"
 msgstr ""
 
-#: cups/ppd-cache.c:2979
+#: cups/ppd-cache.c:3044
 msgid "Bind"
 msgstr ""
 
-#: cups/ppd-cache.c:2983
+#: cups/ppd-cache.c:3048
 msgid "Bind (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:2981
+#: cups/ppd-cache.c:3046
 msgid "Bind (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:2980
+#: cups/ppd-cache.c:3045
 msgid "Bind (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:2982
+#: cups/ppd-cache.c:3047
 msgid "Bind (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3472
+#: cups/ppd-cache.c:3745
 msgid "Bond Envelope"
 msgstr ""
 
@@ -3604,11 +3613,11 @@ msgstr ""
 msgid "Bond Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3967
+#: cups/ppd-cache.c:4253
 msgid "Booklet"
 msgstr ""
 
-#: cups/ppd-cache.c:2984
+#: cups/ppd-cache.c:3049
 msgid "Booklet Maker"
 msgstr ""
 
@@ -3617,19 +3626,19 @@ msgstr ""
 msgid "Boolean expected for waiteof option \"%s\"."
 msgstr ""
 
-#: cups/ppd-cache.c:3368
+#: cups/ppd-cache.c:3641
 msgid "Bottom"
 msgstr ""
 
-#: cups/ppd-cache.c:3743
+#: cups/ppd-cache.c:4025
 msgid "Bottom Tray"
 msgstr ""
 
-#: filter/pstops.c:2032
+#: filter/pstops.c:2026
 msgid "Buffer overflow detected, aborting."
 msgstr ""
 
-#: cups/ppd-cache.c:3442
+#: cups/ppd-cache.c:3715
 msgid "CD"
 msgstr ""
 
@@ -3641,19 +3650,15 @@ msgstr ""
 msgid "CPCL Label Printer"
 msgstr ""
 
-#: cgi-bin/classes.c:163 cgi-bin/printers.c:166
+#: cgi-bin/classes.c:159 cgi-bin/printers.c:162
 msgid "Cancel Jobs"
 msgstr ""
 
-#: cgi-bin/admin.c:1469 cgi-bin/admin.c:1508 cgi-bin/admin.c:1518
-msgid "Cancel RSS Subscription"
-msgstr ""
-
-#: backend/ipp.c:2261
+#: backend/ipp.c:2259
 msgid "Canceling print job."
 msgstr ""
 
-#: scheduler/ipp.c:1009 scheduler/ipp.c:2554
+#: scheduler/ipp.c:1007 scheduler/ipp.c:2554
 msgid "Cannot change printer-is-shared for remote queues."
 msgstr ""
 
@@ -3661,11 +3666,11 @@ msgstr ""
 msgid "Cannot share a remote Kerberized printer."
 msgstr ""
 
-#: cups/ppd-cache.c:3440
+#: cups/ppd-cache.c:3713
 msgid "Cardboard"
 msgstr ""
 
-#: cups/ppd-cache.c:3441
+#: cups/ppd-cache.c:3714
 msgid "Cardstock"
 msgstr ""
 
@@ -3673,129 +3678,129 @@ msgstr ""
 msgid "Cassette"
 msgstr ""
 
-#: cups/ppd-cache.c:3372
+#: cups/ppd-cache.c:3645
 msgid "Center"
 msgstr ""
 
-#: cups/ppd-cache.c:3744
+#: cups/ppd-cache.c:4026
 msgid "Center Tray"
 msgstr ""
 
-#: cgi-bin/admin.c:1639 cgi-bin/admin.c:1781 cgi-bin/admin.c:1794
-#: cgi-bin/admin.c:1805
+#: cgi-bin/admin.c:1348 cgi-bin/admin.c:1490 cgi-bin/admin.c:1503
+#: cgi-bin/admin.c:1514
 msgid "Change Settings"
 msgstr ""
 
-#: scheduler/ipp.c:2105 scheduler/ipp.c:5823
+#: scheduler/ipp.c:2103 scheduler/ipp.c:5829
 #, c-format
 msgid "Character set \"%s\" not supported."
 msgstr ""
 
-#: cgi-bin/classes.c:185 cgi-bin/classes.c:311
+#: cgi-bin/classes.c:181 cgi-bin/classes.c:307
 msgid "Classes"
 msgstr ""
 
-#: cgi-bin/printers.c:172
+#: cgi-bin/printers.c:168
 msgid "Clean Print Heads"
 msgstr ""
 
-#: scheduler/ipp.c:3957
+#: scheduler/ipp.c:3963
 msgid "Close-Job doesn't support the job-uri attribute."
 msgstr ""
 
-#: cups/ppd-cache.c:2985
+#: cups/ppd-cache.c:3050
 msgid "Coat"
 msgstr ""
 
-#: cups/ppd-cache.c:3473
+#: cups/ppd-cache.c:3746
 msgid "Coated Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3561
+#: cups/ppd-cache.c:3834
 msgid "Coated Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3646 ppdc/sample.c:276
+#: cups/ppd-cache.c:3928 ppdc/sample.c:276
 msgid "Color"
 msgstr ""
 
-#: cups/ppd-cache.c:3622 cups/ppd-cache.c:3633 cups/ppd-cache.c:3644
-#: cups/ppd-cache.c:3654 ppdc/sample.c:274
+#: cups/ppd-cache.c:3904 cups/ppd-cache.c:3915 cups/ppd-cache.c:3926
+#: cups/ppd-cache.c:3936 ppdc/sample.c:274
 msgid "Color Mode"
 msgstr ""
 
-#: cups/ppd-cache.c:3508
+#: cups/ppd-cache.c:3781
 msgid "Colored Labels"
 msgstr ""
 
-#: berkeley/lpc.c:194
+#: berkeley/lpc.c:190
 msgid ""
 "Commands may be abbreviated.  Commands are:\n"
 "\n"
 "exit    help    quit    status  ?"
 msgstr ""
 
-#: cups/snmp.c:960
+#: cups/snmp.c:958
 msgid "Community name uses indefinite length"
 msgstr ""
 
-#: backend/ipp.c:872 backend/lpd.c:939 backend/socket.c:380
+#: backend/ipp.c:870 backend/lpd.c:937 backend/socket.c:378
 msgid "Connected to printer."
 msgstr ""
 
-#: backend/ipp.c:708 backend/lpd.c:763 backend/socket.c:300
+#: backend/ipp.c:706 backend/lpd.c:761 backend/socket.c:298
 msgid "Connecting to printer."
 msgstr ""
 
-#: cups/http-support.c:1343
+#: cups/http-support.c:1334
 msgid "Continue"
 msgstr ""
 
-#: cups/ppd-cache.c:3456 ppdc/sample.c:360
+#: cups/ppd-cache.c:3729 ppdc/sample.c:360
 msgid "Continuous"
 msgstr ""
 
-#: cups/ppd-cache.c:3457
+#: cups/ppd-cache.c:3730
 msgid "Continuous Long"
 msgstr ""
 
-#: cups/ppd-cache.c:3458
+#: cups/ppd-cache.c:3731
 msgid "Continuous Short"
 msgstr ""
 
-#: backend/lpd.c:1088 backend/lpd.c:1220
+#: backend/lpd.c:1086 backend/lpd.c:1218
 msgid "Control file sent successfully."
 msgstr ""
 
-#: backend/ipp.c:1396 backend/lpd.c:455
+#: backend/ipp.c:1394 backend/lpd.c:453
 msgid "Copying print data."
 msgstr ""
 
-#: cups/ppd-cache.c:3474
+#: cups/ppd-cache.c:3747
 msgid "Cotton Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3562
+#: cups/ppd-cache.c:3835
 msgid "Cotton Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:2986
+#: cups/ppd-cache.c:3051
 msgid "Cover"
 msgstr ""
 
-#: cups/http-support.c:1352
+#: cups/http-support.c:1343
 msgid "Created"
 msgstr ""
 
-#: cups/tls-darwin.c:728 cups/tls-gnutls.c:560
+#: cups/tls-darwin.c:724 cups/tls-gnutls.c:556
 msgid "Credentials do not validate against site CA certificate."
 msgstr ""
 
-#: cups/tls-darwin.c:739 cups/tls-gnutls.c:577
+#: cups/tls-darwin.c:735 cups/tls-gnutls.c:573
 msgid "Credentials have expired."
 msgstr ""
 
-#: cups/ppd.c:1152 cups/ppd.c:1192 cups/ppd.c:1437 cups/ppd.c:1540
+#: cups/ppd.c:1140 cups/ppd.c:1180 cups/ppd.c:1425 cups/ppd.c:1528
 msgid "Custom"
 msgstr ""
 
@@ -3811,7 +3816,7 @@ msgstr ""
 msgid "Cut"
 msgstr ""
 
-#: cups/ppd-cache.c:3042
+#: cups/ppd-cache.c:3107
 msgid "Cut Media"
 msgstr ""
 
@@ -3819,7 +3824,7 @@ msgstr ""
 msgid "Cutter"
 msgstr ""
 
-#: cups/ppd-cache.c:3467
+#: cups/ppd-cache.c:3740
 msgid "DVD"
 msgstr ""
 
@@ -3831,19 +3836,19 @@ msgstr ""
 msgid "Darkness"
 msgstr ""
 
-#: backend/lpd.c:1173
+#: backend/lpd.c:1171
 msgid "Data file sent successfully."
 msgstr ""
 
-#: cups/ppd-cache.c:3656
+#: cups/ppd-cache.c:3938
 msgid "Deep Color"
 msgstr ""
 
-#: cgi-bin/admin.c:2078 cgi-bin/admin.c:2089 cgi-bin/admin.c:2134
+#: cgi-bin/admin.c:1787 cgi-bin/admin.c:1798 cgi-bin/admin.c:1843
 msgid "Delete Class"
 msgstr ""
 
-#: cgi-bin/admin.c:2163 cgi-bin/admin.c:2174 cgi-bin/admin.c:2219
+#: cgi-bin/admin.c:1872 cgi-bin/admin.c:1883 cgi-bin/admin.c:1928
 msgid "Delete Printer"
 msgstr ""
 
@@ -3851,12 +3856,12 @@ msgstr ""
 msgid "DeskJet Series"
 msgstr ""
 
-#: scheduler/ipp.c:1347
+#: scheduler/ipp.c:1345
 #, c-format
 msgid "Destination \"%s\" is not accepting jobs."
 msgstr ""
 
-#: systemv/lpinfo.c:273
+#: systemv/lpinfo.c:269
 #, c-format
 msgid ""
 "Device: uri = %s\n"
@@ -3871,27 +3876,27 @@ msgstr ""
 msgid "Direct Thermal Media"
 msgstr ""
 
-#: cups/file.c:256
+#: cups/file.c:250
 #, c-format
 msgid "Directory \"%s\" contains a relative path."
 msgstr ""
 
-#: cups/file.c:228
+#: cups/file.c:222
 #, c-format
 msgid "Directory \"%s\" has insecure permissions (0%o/uid=%d/gid=%d)."
 msgstr ""
 
-#: cups/file.c:245
+#: cups/file.c:239
 #, c-format
 msgid "Directory \"%s\" is a file."
 msgstr ""
 
-#: cups/file.c:216
+#: cups/file.c:210
 #, c-format
 msgid "Directory \"%s\" not available: %s"
 msgstr ""
 
-#: cups/file.c:201
+#: cups/file.c:195
 #, c-format
 msgid "Directory \"%s\" permissions OK (0%o/uid=%d/gid=%d)."
 msgstr ""
@@ -3900,45 +3905,45 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: cups/ppd-cache.c:3361
+#: cups/ppd-cache.c:3634
 msgid "Disc"
 msgstr ""
 
-#: scheduler/ipp.c:6321
+#: scheduler/ipp.c:6327
 #, c-format
 msgid "Document #%d does not exist in job #%d."
 msgstr ""
 
-#: cups/ppd-cache.c:2994
+#: cups/ppd-cache.c:3059
 msgid "Double Gate Fold"
 msgstr ""
 
-#: cups/ppd-cache.c:3035
+#: cups/ppd-cache.c:3100
 msgid "Double Staple (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3033
+#: cups/ppd-cache.c:3098
 msgid "Double Staple (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3032
+#: cups/ppd-cache.c:3097
 msgid "Double Staple (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3034
+#: cups/ppd-cache.c:3099
 msgid "Double Staple (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3465
+#: cups/ppd-cache.c:3738
 msgid "Double Wall Cardboard"
 msgstr ""
 
-#: cups/ppd-cache.c:4025 cups/ppd-cache.c:4027 cups/ppd-cache.c:4085
-#: cups/ppd-cache.c:4117
+#: cups/ppd-cache.c:4382 cups/ppd-cache.c:4384 cups/ppd-cache.c:4443
+#: cups/ppd-cache.c:4475
 msgid "Draft"
 msgstr ""
 
-#: cups/ppd-cache.c:3466
+#: cups/ppd-cache.c:3739
 msgid "Dry Film"
 msgstr ""
 
@@ -3958,34 +3963,34 @@ msgstr ""
 msgid "EPL2 Label Printer"
 msgstr ""
 
-#: cgi-bin/admin.c:1833 cgi-bin/admin.c:1845 cgi-bin/admin.c:1899
-#: cgi-bin/admin.c:1906 cgi-bin/admin.c:1941 cgi-bin/admin.c:1954
-#: cgi-bin/admin.c:1978 cgi-bin/admin.c:2051
+#: cgi-bin/admin.c:1542 cgi-bin/admin.c:1554 cgi-bin/admin.c:1608
+#: cgi-bin/admin.c:1615 cgi-bin/admin.c:1650 cgi-bin/admin.c:1663
+#: cgi-bin/admin.c:1687 cgi-bin/admin.c:1760
 msgid "Edit Configuration File"
 msgstr ""
 
-#: cups/ppd-cache.c:3468
+#: cups/ppd-cache.c:3741
 msgid "Embossing Foil"
 msgstr ""
 
-#: cups/adminutil.c:325
+#: cups/adminutil.c:319
 msgid "Empty PPD file."
 msgstr ""
 
-#: cups/http.c:4620
+#: cups/http.c:4653
 msgid "Encryption is not supported."
 msgstr ""
 
-#: cups/ppd-cache.c:3469
+#: cups/ppd-cache.c:3742
 msgid "End Board"
 msgstr ""
 
 #. TRANSLATORS: Banner/cover sheet after the print job.
-#: cgi-bin/admin.c:3545
+#: cgi-bin/admin.c:3254
 msgid "Ending Banner"
 msgstr ""
 
-#: cups/ppd-cache.c:2995
+#: cups/ppd-cache.c:3060
 msgid "Engineering Z Fold"
 msgstr ""
 
@@ -3993,11 +3998,11 @@ msgstr ""
 msgid "English"
 msgstr ""
 
-#: scheduler/client.c:2226
+#: scheduler/client.c:2222
 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 ""
 
-#: cups/ppd-cache.c:3360 cups/ppd-cache.c:3470
+#: cups/ppd-cache.c:3633 cups/ppd-cache.c:3743
 msgid "Envelope"
 msgstr ""
 
@@ -4213,7 +4218,7 @@ msgstr ""
 msgid "Envelope You4 Long Edge"
 msgstr ""
 
-#: test/ippfind.c:2815
+#: test/ippfind.c:2821
 msgid "Environment Variables:"
 msgstr ""
 
@@ -4221,20 +4226,20 @@ msgstr ""
 msgid "Epson"
 msgstr ""
 
-#: cgi-bin/admin.c:3588
+#: cgi-bin/admin.c:3297
 msgid "Error Policy"
 msgstr ""
 
-#: filter/rastertopwg.c:457
+#: filter/rastertopwg.c:455
 msgid "Error reading raster data."
 msgstr ""
 
-#: filter/rastertopwg.c:426 filter/rastertopwg.c:447 filter/rastertopwg.c:465
-#: filter/rastertopwg.c:476
+#: filter/rastertopwg.c:424 filter/rastertopwg.c:445 filter/rastertopwg.c:463
+#: filter/rastertopwg.c:474
 msgid "Error sending raster data."
 msgstr ""
 
-#: systemv/lpinfo.c:208 systemv/lpmove.c:86
+#: systemv/lpinfo.c:204 systemv/lpmove.c:82
 msgid "Error: need hostname after \"-h\" option."
 msgstr ""
 
@@ -4286,11 +4291,11 @@ msgstr ""
 msgid "Every Label"
 msgstr ""
 
-#: cups/ppd-cache.c:3448
+#: cups/ppd-cache.c:3721
 msgid "Everyday Glossy Photo Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3449
+#: cups/ppd-cache.c:3722
 msgid "Everyday Matte Paper"
 msgstr ""
 
@@ -4298,69 +4303,69 @@ msgstr ""
 msgid "Executive"
 msgstr ""
 
-#: cups/http-support.c:1398
+#: cups/http-support.c:1389
 msgid "Expectation Failed"
 msgstr ""
 
-#: cgi-bin/admin.c:2340 cgi-bin/admin.c:2359
+#: cgi-bin/admin.c:2049 cgi-bin/admin.c:2068
 msgid "Export Printers to Samba"
 msgstr ""
 
-#: test/ippfind.c:2761
+#: test/ippfind.c:2767
 msgid "Expressions:"
 msgstr ""
 
-#: cups/ppd-cache.c:3450
+#: cups/ppd-cache.c:3723
 msgid "Extra Heavyweight Paper"
 msgstr ""
 
-#: systemv/cupstestdsc.c:164 systemv/cupstestdsc.c:181
-#: systemv/cupstestdsc.c:206 systemv/cupstestdsc.c:223
-#: systemv/cupstestdsc.c:247 systemv/cupstestdsc.c:265
-#: systemv/cupstestdsc.c:294 systemv/cupstestdsc.c:331
-#: systemv/cupstestdsc.c:341 systemv/cupstestdsc.c:351
-#: systemv/cupstestdsc.c:361 systemv/cupstestdsc.c:371
-#: systemv/cupstestdsc.c:379
+#: systemv/cupstestdsc.c:158 systemv/cupstestdsc.c:175
+#: systemv/cupstestdsc.c:200 systemv/cupstestdsc.c:217
+#: systemv/cupstestdsc.c:241 systemv/cupstestdsc.c:259
+#: systemv/cupstestdsc.c:288 systemv/cupstestdsc.c:325
+#: systemv/cupstestdsc.c:335 systemv/cupstestdsc.c:345
+#: systemv/cupstestdsc.c:355 systemv/cupstestdsc.c:365
+#: systemv/cupstestdsc.c:373
 msgid "FAIL"
 msgstr ""
 
-#: cups/ppd-cache.c:3482
+#: cups/ppd-cache.c:3755
 msgid "Fabric"
 msgstr ""
 
-#: cups/ppd-cache.c:3745
+#: cups/ppd-cache.c:4027
 msgid "Face Down"
 msgstr ""
 
-#: cups/ppd-cache.c:3746
+#: cups/ppd-cache.c:4028
 msgid "Face Up"
 msgstr ""
 
-#: cups/ppd-cache.c:3624
+#: cups/ppd-cache.c:3906
 msgid "Fast Grayscale"
 msgstr ""
 
-#: cups/file.c:260
+#: cups/file.c:254
 #, c-format
 msgid "File \"%s\" contains a relative path."
 msgstr ""
 
-#: cups/file.c:235
+#: cups/file.c:229
 #, c-format
 msgid "File \"%s\" has insecure permissions (0%o/uid=%d/gid=%d)."
 msgstr ""
 
-#: cups/file.c:249
+#: cups/file.c:243
 #, c-format
 msgid "File \"%s\" is a directory."
 msgstr ""
 
-#: cups/file.c:221
+#: cups/file.c:215
 #, c-format
 msgid "File \"%s\" not available: %s"
 msgstr ""
 
-#: cups/file.c:207
+#: cups/file.c:201
 #, c-format
 msgid "File \"%s\" permissions OK (0%o/uid=%d/gid=%d)."
 msgstr ""
@@ -4374,37 +4379,41 @@ msgstr ""
 msgid "File device URIs have been disabled. To enable, see the FileDevice directive in \"%s/cups-files.conf\"."
 msgstr ""
 
-#: cups/ppd-cache.c:3489
+#: cups/ppd-cache.c:3762
 msgid "Film"
 msgstr ""
 
-#: cups/ppd-cache.c:3475
+#: cups/ppd-cache.c:3748
 msgid "Fine Envelope"
 msgstr ""
 
-#: filter/rastertoepson.c:1136 filter/rastertohp.c:808
-#: filter/rastertolabel.c:1257
+#: filter/rastertoepson.c:1130 filter/rastertohp.c:802
+#: filter/rastertolabel.c:1251
 #, c-format
 msgid "Finished page %d."
 msgstr ""
 
-#: cups/ppd-cache.c:3490
+#: cups/ppd-cache.c:4272
+msgid "Finishing Preset"
+msgstr ""
+
+#: cups/ppd-cache.c:3763
 msgid "Flexo Base"
 msgstr ""
 
-#: cups/ppd-cache.c:3491
+#: cups/ppd-cache.c:3764
 msgid "Flexo Photo Polymer"
 msgstr ""
 
-#: cups/ppd-cache.c:3492
+#: cups/ppd-cache.c:3765
 msgid "Flute"
 msgstr ""
 
-#: cups/ppd-cache.c:3493
+#: cups/ppd-cache.c:3766
 msgid "Foil"
 msgstr ""
 
-#: cups/ppd-cache.c:2992 cups/ppd-cache.c:3882
+#: cups/ppd-cache.c:3057 cups/ppd-cache.c:4164
 msgid "Fold"
 msgstr ""
 
@@ -4412,19 +4421,19 @@ msgstr ""
 msgid "Folio"
 msgstr ""
 
-#: cups/http-support.c:1377
+#: cups/http-support.c:1368
 msgid "Forbidden"
 msgstr ""
 
-#: cups/ppd-cache.c:3494
+#: cups/ppd-cache.c:3767
 msgid "Full Cut Tabs"
 msgstr ""
 
-#: cups/ppd-cache.c:2996
+#: cups/ppd-cache.c:3061
 msgid "Gate Fold"
 msgstr ""
 
-#: cups/ppd.c:783 cups/ppd.c:1341
+#: cups/ppd.c:771 cups/ppd.c:1329
 msgid "General"
 msgstr ""
 
@@ -4432,43 +4441,43 @@ msgstr ""
 msgid "Generic"
 msgstr ""
 
-#: cups/snmp.c:970
+#: cups/snmp.c:968
 msgid "Get-Response-PDU uses indefinite length"
 msgstr ""
 
-#: cups/ppd-cache.c:3495
+#: cups/ppd-cache.c:3768
 msgid "Glass"
 msgstr ""
 
-#: cups/ppd-cache.c:3496
+#: cups/ppd-cache.c:3769
 msgid "Glass Colored"
 msgstr ""
 
-#: cups/ppd-cache.c:3497
+#: cups/ppd-cache.c:3770
 msgid "Glass Opaque"
 msgstr ""
 
-#: cups/ppd-cache.c:3498
+#: cups/ppd-cache.c:3771
 msgid "Glass Surfaced"
 msgstr ""
 
-#: cups/ppd-cache.c:3499
+#: cups/ppd-cache.c:3772
 msgid "Glass Textured"
 msgstr ""
 
-#: cups/ppd-cache.c:3444
+#: cups/ppd-cache.c:3717
 msgid "Glossy Brochure Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3484
+#: cups/ppd-cache.c:3757
 msgid "Glossy Fabric"
 msgstr ""
 
-#: cups/ppd-cache.c:3509
+#: cups/ppd-cache.c:3782
 msgid "Glossy Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3460
+#: cups/ppd-cache.c:3733
 msgid "Glossy Optical Disc"
 msgstr ""
 
@@ -4476,22 +4485,22 @@ msgstr ""
 msgid "Glossy Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3534
+#: cups/ppd-cache.c:3807
 msgid "Glossy Photo Paper"
 msgstr ""
 
-#: scheduler/ipp.c:3021 scheduler/ipp.c:3431 scheduler/ipp.c:3969
-#: scheduler/ipp.c:6250 scheduler/ipp.c:6397 scheduler/ipp.c:7893
-#: scheduler/ipp.c:9029 scheduler/ipp.c:9253 scheduler/ipp.c:9605
-#: scheduler/ipp.c:10218
+#: scheduler/ipp.c:3027 scheduler/ipp.c:3437 scheduler/ipp.c:3975
+#: scheduler/ipp.c:6256 scheduler/ipp.c:6403 scheduler/ipp.c:7914
+#: scheduler/ipp.c:9050 scheduler/ipp.c:9274 scheduler/ipp.c:9626
+#: scheduler/ipp.c:10239
 msgid "Got a printer-uri attribute but no job-id."
 msgstr ""
 
-#: cups/ppd-cache.c:3500
+#: cups/ppd-cache.c:3773
 msgid "Gravure Cylinder"
 msgstr ""
 
-#: cups/ppd-cache.c:3635 ppdc/sample.c:275
+#: cups/ppd-cache.c:3917 ppdc/sample.c:275
 msgid "Grayscale"
 msgstr ""
 
@@ -4499,15 +4508,15 @@ msgstr ""
 msgid "HP"
 msgstr ""
 
-#: cups/ppd-cache.c:3363
+#: cups/ppd-cache.c:3636
 msgid "Hagaki"
 msgstr ""
 
-#: cups/ppd-cache.c:2997
+#: cups/ppd-cache.c:3062
 msgid "Half Fold"
 msgstr ""
 
-#: cups/ppd-cache.c:2998
+#: cups/ppd-cache.c:3063
 msgid "Half Z Fold"
 msgstr ""
 
@@ -4515,135 +4524,135 @@ msgstr ""
 msgid "Hanging Folder"
 msgstr ""
 
-#: cups/hash.c:243
+#: cups/hash.c:268
 msgid "Hash buffer too small."
 msgstr ""
 
-#: cups/ppd-cache.c:3565
+#: cups/ppd-cache.c:3838
 msgid "Heavyweight Coated Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3476
+#: cups/ppd-cache.c:3749
 msgid "Heavyweight Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3564
+#: cups/ppd-cache.c:3837
 msgid "Heavyweight Paper"
 msgstr ""
 
-#: cgi-bin/help.c:137
+#: cgi-bin/help.c:133
 msgid "Help file not in index."
 msgstr ""
 
-#: cups/ppd-cache.c:4030 cups/ppd-cache.c:4092 cups/ppd-cache.c:4120
+#: cups/ppd-cache.c:4387 cups/ppd-cache.c:4450 cups/ppd-cache.c:4478
 msgid "High"
 msgstr ""
 
-#: cups/ppd-cache.c:3485
+#: cups/ppd-cache.c:3758
 msgid "High Gloss Fabric"
 msgstr ""
 
-#: cups/ppd-cache.c:3510
+#: cups/ppd-cache.c:3783
 msgid "High Gloss Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3461
+#: cups/ppd-cache.c:3734
 msgid "High Gloss Optical Disc"
 msgstr ""
 
-#: cups/ppd-cache.c:3535
+#: cups/ppd-cache.c:3808
 msgid "High Gloss Photo Paper"
 msgstr ""
 
-#: cups/ipp.c:3181 cups/ipp.c:3208 cups/ipp.c:3231
+#: cups/ipp.c:3175 cups/ipp.c:3202 cups/ipp.c:3225
 msgid "IPP 1setOf attribute with incompatible value tags."
 msgstr ""
 
-#: cups/ipp.c:3144
+#: cups/ipp.c:3138
 msgid "IPP attribute has no name."
 msgstr ""
 
-#: cups/ipp.c:7013
+#: cups/ipp.c:7007
 msgid "IPP attribute is not a member of the message."
 msgstr ""
 
-#: cups/ipp.c:3590
+#: cups/ipp.c:3584
 msgid "IPP begCollection value not 0 bytes."
 msgstr ""
 
-#: cups/ipp.c:3372
+#: cups/ipp.c:3366
 msgid "IPP boolean value not 1 byte."
 msgstr ""
 
-#: cups/ipp.c:3433
+#: cups/ipp.c:3427
 msgid "IPP date value not 11 bytes."
 msgstr ""
 
-#: cups/ipp.c:3611
+#: cups/ipp.c:3605
 msgid "IPP endCollection value not 0 bytes."
 msgstr ""
 
-#: cups/ipp.c:3347
+#: cups/ipp.c:3341
 msgid "IPP enum value not 4 bytes."
 msgstr ""
 
-#: cups/ipp.c:3074
+#: cups/ipp.c:3068
 msgid "IPP extension tag larger than 0x7FFFFFFF."
 msgstr ""
 
-#: cups/ipp.c:3344
+#: cups/ipp.c:3338
 msgid "IPP integer value not 4 bytes."
 msgstr ""
 
-#: cups/ipp.c:3543
+#: cups/ipp.c:3537
 msgid "IPP language length overflows value."
 msgstr ""
 
-#: cups/ipp.c:3552
+#: cups/ipp.c:3546
 msgid "IPP language length too large."
 msgstr ""
 
-#: cups/ipp.c:3258
+#: cups/ipp.c:3252
 msgid "IPP member name is not empty."
 msgstr ""
 
-#: cups/ipp.c:3637
+#: cups/ipp.c:3631
 msgid "IPP memberName value is empty."
 msgstr ""
 
-#: cups/ipp.c:3629
+#: cups/ipp.c:3623
 msgid "IPP memberName with no attribute."
 msgstr ""
 
-#: cups/ipp.c:3127
+#: cups/ipp.c:3121
 msgid "IPP name larger than 32767 bytes."
 msgstr ""
 
-#: cups/ipp.c:3510
+#: cups/ipp.c:3504
 msgid "IPP nameWithLanguage value less than minimum 4 bytes."
 msgstr ""
 
-#: cups/ipp.c:3667
+#: cups/ipp.c:3661
 msgid "IPP octetString length too large."
 msgstr ""
 
-#: cups/ipp.c:3478
+#: cups/ipp.c:3472
 msgid "IPP rangeOfInteger value not 8 bytes."
 msgstr ""
 
-#: cups/ipp.c:3451
+#: cups/ipp.c:3445
 msgid "IPP resolution value not 9 bytes."
 msgstr ""
 
-#: cups/ipp.c:3570
+#: cups/ipp.c:3564
 msgid "IPP string length overflows value."
 msgstr ""
 
-#: cups/ipp.c:3506
+#: cups/ipp.c:3500
 msgid "IPP textWithLanguage value less than minimum 4 bytes."
 msgstr ""
 
-#: cups/ipp.c:3330
+#: cups/ipp.c:3324
 msgid "IPP value larger than 32767 bytes."
 msgstr ""
 
@@ -4651,43 +4660,43 @@ msgstr ""
 msgid "ISOLatin1"
 msgstr ""
 
-#: cups/ppd.c:328
+#: cups/ppd.c:316
 msgid "Illegal control character"
 msgstr ""
 
-#: cups/ppd.c:329
+#: cups/ppd.c:317
 msgid "Illegal main keyword string"
 msgstr ""
 
-#: cups/ppd.c:330
+#: cups/ppd.c:318
 msgid "Illegal option keyword string"
 msgstr ""
 
-#: cups/ppd.c:331
+#: cups/ppd.c:319
 msgid "Illegal translation string"
 msgstr ""
 
-#: cups/ppd.c:332
+#: cups/ppd.c:320
 msgid "Illegal whitespace character"
 msgstr ""
 
-#: cups/ppd-cache.c:3501
+#: cups/ppd-cache.c:3774
 msgid "Image Setter Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3502
+#: cups/ppd-cache.c:3775
 msgid "Imaging Cylinder"
 msgstr ""
 
-#: cups/ppd-cache.c:3477
+#: cups/ppd-cache.c:3750
 msgid "Inkjet Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3511
+#: cups/ppd-cache.c:3784
 msgid "Inkjet Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3566
+#: cups/ppd-cache.c:3839
 msgid "Inkjet Paper"
 msgstr ""
 
@@ -4707,11 +4716,11 @@ msgstr ""
 msgid "Intellitech"
 msgstr ""
 
-#: cups/http-support.c:1404
+#: cups/http-support.c:1395
 msgid "Internal Server Error"
 msgstr ""
 
-#: cups/ppd.c:319
+#: cups/ppd.c:307
 msgid "Internal error"
 msgstr ""
 
@@ -4723,28 +4732,28 @@ msgstr ""
 msgid "Internet Postage 3-Part"
 msgstr ""
 
-#: backend/ipp.c:325
+#: backend/ipp.c:323
 msgid "Internet Printing Protocol"
 msgstr ""
 
-#: cups/pwg-media.c:291 cups/pwg-media.c:310
+#: cups/pwg-media.c:285 cups/pwg-media.c:304
 msgid "Invalid media name arguments."
 msgstr ""
 
-#: cups/dest-options.c:1099
+#: cups/dest-options.c:1191
 msgid "Invalid media size."
 msgstr ""
 
-#: scheduler/ipp.c:2748 scheduler/ipp.c:7064
+#: scheduler/ipp.c:2748 scheduler/ipp.c:7070
 msgid "Invalid ppd-name value."
 msgstr ""
 
-#: filter/commandtops.c:112
+#: filter/commandtops.c:108
 #, c-format
 msgid "Invalid printer command \"%s\"."
 msgstr ""
 
-#: cups/ppd.c:1459
+#: cups/ppd.c:1447
 msgid "JCL"
 msgstr ""
 
@@ -4804,100 +4813,104 @@ msgstr ""
 msgid "JIS B9"
 msgstr ""
 
-#: scheduler/ipp.c:9325
+#: scheduler/ipp.c:9346
 #, c-format
 msgid "Job #%d cannot be restarted - no files."
 msgstr ""
 
-#: scheduler/ipp.c:3061 scheduler/ipp.c:3295 scheduler/ipp.c:3354
-#: scheduler/ipp.c:3533 scheduler/ipp.c:3979 scheduler/ipp.c:5909
-#: scheduler/ipp.c:6290 scheduler/ipp.c:6437 scheduler/ipp.c:6774
-#: scheduler/ipp.c:7734 scheduler/ipp.c:7756 scheduler/ipp.c:7934
-#: scheduler/ipp.c:8159 scheduler/ipp.c:8202 scheduler/ipp.c:9069
-#: scheduler/ipp.c:9293 scheduler/ipp.c:9645 scheduler/ipp.c:10258
+#: scheduler/ipp.c:3067 scheduler/ipp.c:3301 scheduler/ipp.c:3360
+#: scheduler/ipp.c:3539 scheduler/ipp.c:3985 scheduler/ipp.c:5915
+#: scheduler/ipp.c:6296 scheduler/ipp.c:6443 scheduler/ipp.c:6780
+#: scheduler/ipp.c:7755 scheduler/ipp.c:7777 scheduler/ipp.c:7955
+#: scheduler/ipp.c:8180 scheduler/ipp.c:8223 scheduler/ipp.c:9090
+#: scheduler/ipp.c:9314 scheduler/ipp.c:9666 scheduler/ipp.c:10279
 #, c-format
 msgid "Job #%d does not exist."
 msgstr ""
 
-#: scheduler/ipp.c:3565
+#: scheduler/ipp.c:3571
 #, c-format
 msgid "Job #%d is already aborted - can't cancel."
 msgstr ""
 
-#: scheduler/ipp.c:3559
+#: scheduler/ipp.c:3565
 #, c-format
 msgid "Job #%d is already canceled - can't cancel."
 msgstr ""
 
-#: scheduler/ipp.c:3571
+#: scheduler/ipp.c:3577
 #, c-format
 msgid "Job #%d is already completed - can't cancel."
 msgstr ""
 
-#: scheduler/ipp.c:7960 scheduler/ipp.c:8244 scheduler/ipp.c:10273
+#: scheduler/ipp.c:7981 scheduler/ipp.c:8265 scheduler/ipp.c:10294
 #, c-format
 msgid "Job #%d is finished and cannot be altered."
 msgstr ""
 
-#: scheduler/ipp.c:9307
+#: scheduler/ipp.c:9328
 #, c-format
 msgid "Job #%d is not complete."
 msgstr ""
 
-#: scheduler/ipp.c:3076
+#: scheduler/ipp.c:3082
 #, c-format
 msgid "Job #%d is not held for authentication."
 msgstr ""
 
-#: scheduler/ipp.c:9083
+#: scheduler/ipp.c:9104
 #, c-format
 msgid "Job #%d is not held."
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1036
+#: cgi-bin/ipp-var.c:1032
 msgid "Job Completed"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1034
+#: cgi-bin/ipp-var.c:1030
 msgid "Job Created"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1040
+#: cgi-bin/ipp-var.c:1036
 msgid "Job Options Changed"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1038
+#: cgi-bin/ipp-var.c:1034
 msgid "Job Stopped"
 msgstr ""
 
-#: scheduler/ipp.c:10355
+#: scheduler/ipp.c:10376
 msgid "Job is completed and cannot be changed."
 msgstr ""
 
-#: cgi-bin/jobs.c:190
+#: cgi-bin/jobs.c:186
 msgid "Job operation failed"
 msgstr ""
 
-#: scheduler/ipp.c:10391 scheduler/ipp.c:10408 scheduler/ipp.c:10419
+#: scheduler/ipp.c:10412 scheduler/ipp.c:10429 scheduler/ipp.c:10440
 msgid "Job state cannot be changed."
 msgstr ""
 
-#: scheduler/ipp.c:9173
+#: scheduler/ipp.c:9194
 msgid "Job subscriptions cannot be renewed."
 msgstr ""
 
-#: cgi-bin/jobs.c:95 cgi-bin/jobs.c:106 cgi-bin/jobs.c:187
+#: cgi-bin/jobs.c:91 cgi-bin/jobs.c:102 cgi-bin/jobs.c:183
 msgid "Jobs"
 msgstr ""
 
-#: cups/ppd-cache.c:3005
+#: cups/ppd-cache.c:3070
 msgid "Jog"
 msgstr ""
 
-#: backend/lpd.c:172
+#: backend/lpd.c:170
 msgid "LPD/LPR Host or Printer"
 msgstr ""
 
+#: cups/dest.c:1944
+msgid "LPDEST environment variable names default destination that does not exist."
+msgstr ""
+
 #: ppdc/sample.c:230
 msgid "Label Printer"
 msgstr ""
@@ -4906,19 +4919,19 @@ msgstr ""
 msgid "Label Top"
 msgstr ""
 
-#: cups/ppd-cache.c:3507
+#: cups/ppd-cache.c:3780
 msgid "Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3006
+#: cups/ppd-cache.c:3071
 msgid "Laminate"
 msgstr ""
 
-#: cups/ppd-cache.c:3517
+#: cups/ppd-cache.c:3790
 msgid "Laminating Foil"
 msgstr ""
 
-#: scheduler/ipp.c:2114 scheduler/ipp.c:5832
+#: scheduler/ipp.c:2112 scheduler/ipp.c:5838
 #, c-format
 msgid "Language \"%s\" not supported."
 msgstr ""
@@ -4927,11 +4940,11 @@ msgstr ""
 msgid "Large Address"
 msgstr ""
 
-#: cups/ppd-cache.c:3358
+#: cups/ppd-cache.c:3631
 msgid "Large Capacity"
 msgstr ""
 
-#: cups/ppd-cache.c:3747
+#: cups/ppd-cache.c:4029
 msgid "Large Capacity Tray"
 msgstr ""
 
@@ -4939,19 +4952,19 @@ msgstr ""
 msgid "LaserJet Series PCL 4/5"
 msgstr ""
 
-#: cups/ppd-cache.c:3370
+#: cups/ppd-cache.c:3643
 msgid "Left"
 msgstr ""
 
-#: cups/ppd-cache.c:2999
+#: cups/ppd-cache.c:3064
 msgid "Left Gate Fold"
 msgstr ""
 
-#: cups/ppd-cache.c:3748
+#: cups/ppd-cache.c:4030
 msgid "Left Tray"
 msgstr ""
 
-#: cups/ppd-cache.c:3000
+#: cups/ppd-cache.c:3065
 msgid "Letter Fold"
 msgstr ""
 
@@ -4963,7 +4976,7 @@ msgstr ""
 msgid "Letter Oversize Long Edge"
 msgstr ""
 
-#: cups/ppd-cache.c:3518 cups/ppd-cache.c:3567
+#: cups/ppd-cache.c:3791 cups/ppd-cache.c:3840
 msgid "Letterhead"
 msgstr ""
 
@@ -4971,87 +4984,87 @@ msgstr ""
 msgid "Light"
 msgstr ""
 
-#: cups/ppd-cache.c:3478
+#: cups/ppd-cache.c:3751
 msgid "Lightweight Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3568
+#: cups/ppd-cache.c:3841
 msgid "Lightweight Paper"
 msgstr ""
 
-#: cups/ppd.c:327
+#: cups/ppd.c:315
 msgid "Line longer than the maximum allowed (255 characters)"
 msgstr ""
 
-#: cgi-bin/admin.c:2377
+#: cgi-bin/admin.c:2086
 msgid "List Available Printers"
 msgstr ""
 
-#: cups/ppd-localize.c:289
+#: cups/ppd-localize.c:277
 msgid "Load paper."
 msgstr ""
 
-#: scheduler/ipp.c:5541
+#: scheduler/ipp.c:5547
 msgid "Local printer created."
 msgstr ""
 
-#: cups/ppd-cache.c:3682 ppdc/sample.c:264
+#: cups/ppd-cache.c:3964 ppdc/sample.c:264
 msgid "Long-Edge (Portrait)"
 msgstr ""
 
-#: cups/http-support.c:1731
+#: cups/http-support.c:1722
 msgid "Looking for printer."
 msgstr ""
 
-#: cups/ppd-cache.c:3749
+#: cups/ppd-cache.c:4031
 msgid "Mailbox 1"
 msgstr ""
 
-#: cups/ppd-cache.c:3758
+#: cups/ppd-cache.c:4040
 msgid "Mailbox 10"
 msgstr ""
 
-#: cups/ppd-cache.c:3750
+#: cups/ppd-cache.c:4032
 msgid "Mailbox 2"
 msgstr ""
 
-#: cups/ppd-cache.c:3751
+#: cups/ppd-cache.c:4033
 msgid "Mailbox 3"
 msgstr ""
 
-#: cups/ppd-cache.c:3752
+#: cups/ppd-cache.c:4034
 msgid "Mailbox 4"
 msgstr ""
 
-#: cups/ppd-cache.c:3753
+#: cups/ppd-cache.c:4035
 msgid "Mailbox 5"
 msgstr ""
 
-#: cups/ppd-cache.c:3754
+#: cups/ppd-cache.c:4036
 msgid "Mailbox 6"
 msgstr ""
 
-#: cups/ppd-cache.c:3755
+#: cups/ppd-cache.c:4037
 msgid "Mailbox 7"
 msgstr ""
 
-#: cups/ppd-cache.c:3756
+#: cups/ppd-cache.c:4038
 msgid "Mailbox 8"
 msgstr ""
 
-#: cups/ppd-cache.c:3757
+#: cups/ppd-cache.c:4039
 msgid "Mailbox 9"
 msgstr ""
 
-#: cups/ppd-cache.c:3356
+#: cups/ppd-cache.c:3629
 msgid "Main"
 msgstr ""
 
-#: cups/ppd-cache.c:3364
+#: cups/ppd-cache.c:3637
 msgid "Main Roll"
 msgstr ""
 
-#: cups/ppd-cache.c:3359
+#: cups/ppd-cache.c:3632
 msgid "Manual"
 msgstr ""
 
@@ -5059,35 +5072,35 @@ msgstr ""
 msgid "Manual Feed"
 msgstr ""
 
-#: cups/ppd-cache.c:3445
+#: cups/ppd-cache.c:3718
 msgid "Matte Brochure Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3446
+#: cups/ppd-cache.c:3719
 msgid "Matte Cover Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3486
+#: cups/ppd-cache.c:3759
 msgid "Matte Fabric"
 msgstr ""
 
-#: cups/ppd-cache.c:3512
+#: cups/ppd-cache.c:3785
 msgid "Matte Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3462
+#: cups/ppd-cache.c:3735
 msgid "Matte Optical Disc"
 msgstr ""
 
-#: cups/ppd-cache.c:3536
+#: cups/ppd-cache.c:3809
 msgid "Matte Photo Paper"
 msgstr ""
 
-#: cups/ppd.c:830 cups/ppd.c:1396
+#: cups/ppd.c:818 cups/ppd.c:1384
 msgid "Media Size"
 msgstr ""
 
-#: cups/ppd.c:834 cups/ppd.c:1400 ppdc/sample.c:254
+#: cups/ppd.c:822 cups/ppd.c:1388 ppdc/sample.c:254
 msgid "Media Source"
 msgstr ""
 
@@ -5095,7 +5108,7 @@ msgstr ""
 msgid "Media Tracking"
 msgstr ""
 
-#: cups/ppd.c:832 cups/ppd.c:1398 ppdc/sample.c:280
+#: cups/ppd.c:820 cups/ppd.c:1386 ppdc/sample.c:280
 msgid "Media Type"
 msgstr ""
 
@@ -5103,128 +5116,128 @@ msgstr ""
 msgid "Medium"
 msgstr ""
 
-#: cups/ppd.c:316
+#: cups/ppd.c:304
 msgid "Memory allocation error"
 msgstr ""
 
-#: cups/ppd-cache.c:3519
+#: cups/ppd-cache.c:3792
 msgid "Metal"
 msgstr ""
 
-#: cups/ppd-cache.c:3520
+#: cups/ppd-cache.c:3793
 msgid "Metal Glossy"
 msgstr ""
 
-#: cups/ppd-cache.c:3521
+#: cups/ppd-cache.c:3794
 msgid "Metal High Gloss"
 msgstr ""
 
-#: cups/ppd-cache.c:3522
+#: cups/ppd-cache.c:3795
 msgid "Metal Matte"
 msgstr ""
 
-#: cups/ppd-cache.c:3523
+#: cups/ppd-cache.c:3796
 msgid "Metal Satin"
 msgstr ""
 
-#: cups/ppd-cache.c:3524
+#: cups/ppd-cache.c:3797
 msgid "Metal Semi Gloss"
 msgstr ""
 
-#: cups/ppd-cache.c:3452
+#: cups/ppd-cache.c:3725
 msgid "Mid-Weight Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3367 cups/ppd-cache.c:3759
+#: cups/ppd-cache.c:3640 cups/ppd-cache.c:4041
 msgid "Middle"
 msgstr ""
 
-#: cups/ppd.c:336
+#: cups/ppd.c:324
 msgid "Missing CloseGroup"
 msgstr ""
 
-#: cups/ppd.c:317
+#: cups/ppd.c:305
 msgid "Missing PPD-Adobe-4.x header"
 msgstr ""
 
-#: cups/ppd.c:326
+#: cups/ppd.c:314
 msgid "Missing asterisk in column 1"
 msgstr ""
 
-#: scheduler/ipp.c:6313
+#: scheduler/ipp.c:6319
 msgid "Missing document-number attribute."
 msgstr ""
 
-#: cups/adminutil.c:261
+#: cups/adminutil.c:255
 #, c-format
 msgid "Missing double quote on line %d."
 msgstr ""
 
-#: cgi-bin/admin.c:710 cgi-bin/admin.c:2090 cgi-bin/admin.c:2175
-#: cgi-bin/admin.c:2769 cgi-bin/admin.c:3023 cgi-bin/admin.c:3134
-#: cgi-bin/admin.c:3844
+#: cgi-bin/admin.c:504 cgi-bin/admin.c:1799 cgi-bin/admin.c:1884
+#: cgi-bin/admin.c:2478 cgi-bin/admin.c:2732 cgi-bin/admin.c:2843
+#: cgi-bin/admin.c:3553
 msgid "Missing form variable"
 msgstr ""
 
-#: scheduler/ipp.c:9699
+#: scheduler/ipp.c:9720
 msgid "Missing last-document attribute in request."
 msgstr ""
 
-#: cups/pwg-media.c:550
+#: cups/pwg-media.c:544
 msgid "Missing media or media-col."
 msgstr ""
 
-#: cups/pwg-media.c:469
+#: cups/pwg-media.c:463
 msgid "Missing media-size in media-col."
 msgstr ""
 
-#: scheduler/ipp.c:6914
+#: scheduler/ipp.c:6920
 msgid "Missing notify-subscription-ids attribute."
 msgstr ""
 
-#: cups/ppd.c:334
+#: cups/ppd.c:322
 msgid "Missing option keyword"
 msgstr ""
 
-#: scheduler/ipp.c:3202 scheduler/ipp.c:3227
+#: scheduler/ipp.c:3208 scheduler/ipp.c:3233
 msgid "Missing requesting-user-name attribute."
 msgstr ""
 
-#: scheduler/ipp.c:5458 scheduler/ipp.c:5484
+#: scheduler/ipp.c:5464 scheduler/ipp.c:5490
 #, c-format
 msgid "Missing required attribute \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:407
+#: scheduler/ipp.c:403
 msgid "Missing required attributes."
 msgstr ""
 
-#: cups/http-support.c:1494
+#: cups/http-support.c:1485
 msgid "Missing resource in URI"
 msgstr ""
 
-#: cups/http-support.c:1488
+#: cups/http-support.c:1479
 msgid "Missing scheme in URI"
 msgstr ""
 
-#: cups/adminutil.c:242
+#: cups/adminutil.c:236
 #, c-format
 msgid "Missing value on line %d."
 msgstr ""
 
-#: cups/ppd.c:318
+#: cups/ppd.c:306
 msgid "Missing value string"
 msgstr ""
 
-#: cups/pwg-media.c:457
+#: cups/pwg-media.c:451
 msgid "Missing x-dimension in media-size."
 msgstr ""
 
-#: cups/pwg-media.c:463
+#: cups/pwg-media.c:457
 msgid "Missing y-dimension in media-size."
 msgstr ""
 
-#: systemv/lpinfo.c:443
+#: systemv/lpinfo.c:439
 #, c-format
 msgid ""
 "Model:  name = %s\n"
@@ -5233,79 +5246,79 @@ msgid ""
 "        device-id = %s"
 msgstr ""
 
-#: test/ippfind.c:2792
+#: test/ippfind.c:2798
 msgid "Modifiers:"
 msgstr ""
 
-#: cgi-bin/admin.c:544
+#: cgi-bin/admin.c:338
 msgid "Modify Class"
 msgstr ""
 
-#: cgi-bin/admin.c:857
+#: cgi-bin/admin.c:651
 msgid "Modify Printer"
 msgstr ""
 
-#: cups/ppd-cache.c:3525
+#: cups/ppd-cache.c:3798
 msgid "Mounting Tape"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:411 cgi-bin/ipp-var.c:502
+#: cgi-bin/ipp-var.c:407 cgi-bin/ipp-var.c:498
 msgid "Move All Jobs"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:350 cgi-bin/ipp-var.c:409 cgi-bin/ipp-var.c:500
+#: cgi-bin/ipp-var.c:346 cgi-bin/ipp-var.c:405 cgi-bin/ipp-var.c:496
 msgid "Move Job"
 msgstr ""
 
-#: cups/http-support.c:1361
+#: cups/http-support.c:1352
 msgid "Moved Permanently"
 msgstr ""
 
-#: cups/ppd-cache.c:3526
+#: cups/ppd-cache.c:3799
 msgid "Multi Layer"
 msgstr ""
 
-#: cups/ppd-cache.c:3527
+#: cups/ppd-cache.c:3800
 msgid "Multi Part Form"
 msgstr ""
 
-#: cups/ppd-cache.c:3027
+#: cups/ppd-cache.c:3092
 msgid "Multi-Hole Punch (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3025
+#: cups/ppd-cache.c:3090
 msgid "Multi-Hole Punch (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3024
+#: cups/ppd-cache.c:3089
 msgid "Multi-Hole Punch (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3026
+#: cups/ppd-cache.c:3091
 msgid "Multi-Hole Punch (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3374
+#: cups/ppd-cache.c:3647
 msgid "Multipurpose"
 msgstr ""
 
-#: cups/ppd-cache.c:3451
+#: cups/ppd-cache.c:3724
 msgid "Multipurpose Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3760
+#: cups/ppd-cache.c:4042
 msgid "My Mailbox"
 msgstr ""
 
-#: cups/ppd.c:315
+#: cups/ppd.c:303
 msgid "NULL PPD file pointer"
 msgstr ""
 
-#: cups/snmp.c:1007
+#: cups/snmp.c:1005
 msgid "Name OID uses indefinite length"
 msgstr ""
 
-#: scheduler/ipp.c:1102
+#: scheduler/ipp.c:1100
 msgid "Nested classes are not allowed."
 msgstr ""
 
@@ -5313,153 +5326,157 @@ msgstr ""
 msgid "Never"
 msgstr ""
 
-#: cups/tls-darwin.c:670 cups/tls-gnutls.c:502
+#: cups/tls-darwin.c:666 cups/tls-gnutls.c:498
 msgid "New credentials are not valid for name."
 msgstr ""
 
-#: cups/tls-darwin.c:660 cups/tls-gnutls.c:492
+#: cups/tls-darwin.c:656 cups/tls-gnutls.c:488
 msgid "New credentials are older than stored credentials."
 msgstr ""
 
-#: cups/ppd.c:1987
+#: cups/ppd.c:1975
 msgid "No"
 msgstr ""
 
-#: cups/http-support.c:1358
+#: cups/http-support.c:1349
 msgid "No Content"
 msgstr ""
 
-#: cups/ppd-cache.c:3061
+#: cups/ppd-cache.c:3126
 msgid "No IPP attributes."
 msgstr ""
 
-#: cups/ppd-util.c:451
+#: cups/ppd-util.c:446
 msgid "No PPD name"
 msgstr ""
 
-#: cups/snmp.c:1001
+#: cups/snmp.c:999
 msgid "No VarBind SEQUENCE"
 msgstr ""
 
-#: cups/adminutil.c:776
+#: cups/adminutil.c:770
 msgid "No Windows printer drivers are installed."
 msgstr ""
 
-#: cups/request.c:519 cups/request.c:879
+#: cups/request.c:547 cups/request.c:907
 msgid "No active connection"
 msgstr ""
 
-#: cups/request.c:300
+#: cups/request.c:328
 msgid "No active connection."
 msgstr ""
 
-#: scheduler/ipp.c:3482
+#: scheduler/ipp.c:3488
 #, c-format
 msgid "No active jobs on %s."
 msgstr ""
 
-#: scheduler/ipp.c:235
+#: scheduler/ipp.c:231
 msgid "No attributes in request."
 msgstr ""
 
-#: scheduler/ipp.c:3103
+#: scheduler/ipp.c:3109
 msgid "No authentication information provided."
 msgstr ""
 
-#: cups/tls-darwin.c:610 cups/tls-gnutls.c:439
+#: cups/tls-darwin.c:606 cups/tls-gnutls.c:435
 msgid "No common name specified."
 msgstr ""
 
-#: cups/snmp.c:958
+#: cups/snmp.c:956
 msgid "No community name"
 msgstr ""
 
-#: scheduler/ipp.c:6113
+#: cups/dest.c:1948 cups/dest.c:1960
+msgid "No default destination."
+msgstr ""
+
+#: scheduler/ipp.c:6119
 msgid "No default printer."
 msgstr ""
 
-#: cgi-bin/ipp-var.c:422 scheduler/ipp.c:7494
+#: cgi-bin/ipp-var.c:418 scheduler/ipp.c:7501
 msgid "No destinations added."
 msgstr ""
 
-#: backend/usb.c:192
+#: backend/usb.c:190
 msgid "No device URI found in argv[0] or in DEVICE_URI environment variable."
 msgstr ""
 
-#: cups/snmp.c:988
+#: cups/snmp.c:986
 msgid "No error-index"
 msgstr ""
 
-#: cups/snmp.c:980
+#: cups/snmp.c:978
 msgid "No error-status"
 msgstr ""
 
-#: scheduler/ipp.c:8449 scheduler/ipp.c:9713
+#: scheduler/ipp.c:8470 scheduler/ipp.c:9734
 msgid "No file in print request."
 msgstr ""
 
-#: cups/ppd-util.c:164
+#: cups/ppd-util.c:159
 msgid "No modification time"
 msgstr ""
 
-#: cups/snmp.c:1005
+#: cups/snmp.c:1003
 msgid "No name OID"
 msgstr ""
 
-#: filter/rastertoepson.c:1166 filter/rastertohp.c:839
-#: filter/rastertolabel.c:1286
+#: filter/rastertoepson.c:1160 filter/rastertohp.c:833
+#: filter/rastertolabel.c:1280
 msgid "No pages were found."
 msgstr ""
 
-#: cups/ppd-util.c:158
+#: cups/ppd-util.c:153
 msgid "No printer name"
 msgstr ""
 
-#: cups/ppd-util.c:709
+#: cups/ppd-util.c:704
 msgid "No printer-uri found"
 msgstr ""
 
-#: cups/ppd-util.c:693
+#: cups/ppd-util.c:688
 msgid "No printer-uri found for class"
 msgstr ""
 
-#: scheduler/ipp.c:6520
+#: scheduler/ipp.c:6526
 msgid "No printer-uri in request."
 msgstr ""
 
-#: cups/http.c:2243
+#: cups/http.c:2258
 msgid "No request URI."
 msgstr ""
 
-#: cups/http.c:2260
+#: cups/http.c:2275
 msgid "No request protocol version."
 msgstr ""
 
-#: cups/request.c:308
+#: cups/request.c:336
 msgid "No request sent."
 msgstr ""
 
-#: cups/snmp.c:972
+#: cups/snmp.c:970
 msgid "No request-id"
 msgstr ""
 
-#: cups/tls-darwin.c:690 cups/tls-gnutls.c:522
+#: cups/tls-darwin.c:686 cups/tls-gnutls.c:518
 msgid "No stored credentials, not valid for name."
 msgstr ""
 
-#: scheduler/ipp.c:5717
+#: scheduler/ipp.c:5723
 msgid "No subscription attributes in request."
 msgstr ""
 
-#: scheduler/ipp.c:7833
+#: scheduler/ipp.c:7854
 msgid "No subscriptions found."
 msgstr ""
 
-#: cups/snmp.c:996
+#: cups/snmp.c:994
 msgid "No variable-bindings SEQUENCE"
 msgstr ""
 
-#: cups/snmp.c:951
+#: cups/snmp.c:949
 msgid "No version number"
 msgstr ""
 
@@ -5471,20 +5488,21 @@ msgstr ""
 msgid "Non-continuous (Web sensing)"
 msgstr ""
 
-#: cups/ppd-cache.c:3838 cups/ppd-cache.c:3885 cups/ppd-cache.c:3932
+#: cups/ppd-cache.c:4118 cups/ppd-cache.c:4167 cups/ppd-cache.c:4216
+#: cups/ppd-cache.c:4275
 msgid "None"
 msgstr ""
 
-#: cups/ppd-cache.c:4028 cups/ppd-cache.c:4088 cups/ppd-cache.c:4118
+#: cups/ppd-cache.c:4385 cups/ppd-cache.c:4446 cups/ppd-cache.c:4476
 #: ppdc/sample.c:238
 msgid "Normal"
 msgstr ""
 
-#: cups/http-support.c:1380
+#: cups/http-support.c:1371
 msgid "Not Found"
 msgstr ""
 
-#: cups/http-support.c:1392
+#: cups/http-support.c:1383
 msgid "Not Implemented"
 msgstr ""
 
@@ -5492,15 +5510,15 @@ msgstr ""
 msgid "Not Installed"
 msgstr ""
 
-#: cups/http-support.c:1367
+#: cups/http-support.c:1358
 msgid "Not Modified"
 msgstr ""
 
-#: cups/http-support.c:1395
+#: cups/http-support.c:1386
 msgid "Not Supported"
 msgstr ""
 
-#: scheduler/ipp.c:1556 scheduler/ipp.c:10974
+#: scheduler/ipp.c:1554 scheduler/ipp.c:10995
 msgid "Not allowed to print."
 msgstr ""
 
@@ -5508,19 +5526,19 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
-#: systemv/cupstestdsc.c:425
+#: systemv/cupstestdsc.c:419
 msgid "Note: this program only validates the DSC comments, not the PostScript itself."
 msgstr ""
 
-#: cups/http-support.c:1349 cups/http-support.c:1485 cups/ppd.c:313
+#: cups/http-support.c:1340 cups/http-support.c:1476 cups/ppd.c:301
 msgid "OK"
 msgstr ""
 
-#: cups/ppd-cache.c:3682 ppdc/sample.c:263
+#: cups/ppd-cache.c:3964 ppdc/sample.c:263
 msgid "Off (1-Sided)"
 msgstr ""
 
-#: cups/ppd-cache.c:3447
+#: cups/ppd-cache.c:3720
 msgid "Office Recycled Paper"
 msgstr ""
 
@@ -5528,81 +5546,89 @@ msgstr ""
 msgid "Oki"
 msgstr ""
 
-#: cgi-bin/help.c:85 cgi-bin/help.c:126 cgi-bin/help.c:136 cgi-bin/help.c:166
+#: cgi-bin/help.c:81 cgi-bin/help.c:122 cgi-bin/help.c:132 cgi-bin/help.c:162
 msgid "Online Help"
 msgstr ""
 
-#: scheduler/ipp.c:5437
+#: scheduler/ipp.c:5443
 msgid "Only local users can create a local printer."
 msgstr ""
 
-#: cups/adminutil.c:943
+#: cups/adminutil.c:937
 #, c-format
 msgid "Open of %s failed: %s"
 msgstr ""
 
-#: cups/ppd.c:321
+#: cups/ppd.c:309
 msgid "OpenGroup without a CloseGroup first"
 msgstr ""
 
-#: cups/ppd.c:323
+#: cups/ppd.c:311
 msgid "OpenUI/JCLOpenUI without a CloseUI/JCLCloseUI first"
 msgstr ""
 
-#: cgi-bin/admin.c:3615
+#: cgi-bin/admin.c:3324
 msgid "Operation Policy"
 msgstr ""
 
-#: cups/ppd-cache.c:3459
+#: cups/ppd-cache.c:3732
 msgid "Optical Disc"
 msgstr ""
 
-#: filter/pstops.c:2180
+#: filter/pstops.c:2174
 #, c-format
 msgid "Option \"%s\" cannot be included via %%%%IncludeFeature."
 msgstr ""
 
-#: cgi-bin/admin.c:3265 cgi-bin/admin.c:3349
+#: cgi-bin/admin.c:2974 cgi-bin/admin.c:3058
 msgid "Options Installed"
 msgstr ""
 
-#: scheduler/cupsfilter.c:1480 scheduler/main.c:2101 systemv/cupsaddsmb.c:276
-#: systemv/cupsctl.c:196 systemv/cupstestdsc.c:421 systemv/cupstestppd.c:3859
-#: test/ippfind.c:2751 test/ipptool.c:5063 ppdc/ppdc.cxx:430
-#: ppdc/ppdhtml.cxx:177 ppdc/ppdi.cxx:123 ppdc/ppdmerge.cxx:361
-#: ppdc/ppdpo.cxx:247
+#: scheduler/cupsfilter.c:1476 scheduler/main.c:2098 systemv/cupsaddsmb.c:272
+#: systemv/cupsctl.c:190 systemv/cupstestdsc.c:415 systemv/cupstestppd.c:3853
+#: test/ippfind.c:2757 test/ipptool.c:5226 ppdc/ppdc.cxx:426
+#: ppdc/ppdhtml.cxx:173 ppdc/ppdi.cxx:119 ppdc/ppdmerge.cxx:357
+#: ppdc/ppdpo.cxx:243
 msgid "Options:"
 msgstr ""
 
-#: cups/ppd-cache.c:3528
+#: cups/ppd-cache.c:3801
 msgid "Other"
 msgstr ""
 
-#: cups/ppd-cache.c:466
+#: cups/dest-localization.c:168
+msgid "Other Media"
+msgstr ""
+
+#: cups/dest-localization.c:166
+msgid "Other Tray"
+msgstr ""
+
+#: cups/ppd-cache.c:488
 msgid "Out of date PPD cache file."
 msgstr ""
 
-#: cups/ppd-cache.c:1863
+#: cups/ppd-cache.c:1908
 msgid "Out of memory."
 msgstr ""
 
-#: cups/ppd.c:836 cups/ppd.c:1402
+#: cups/ppd.c:824 cups/ppd.c:1390
 msgid "Output Mode"
 msgstr ""
 
-#: cups/ppd-localize.c:314
+#: cups/ppd-localize.c:302
 msgid "Output bin is almost full."
 msgstr ""
 
-#: cups/ppd-localize.c:316
+#: cups/ppd-localize.c:304
 msgid "Output bin is full."
 msgstr ""
 
-#: cups/ppd-localize.c:312
+#: cups/ppd-localize.c:300
 msgid "Output bin is missing."
 msgstr ""
 
-#: systemv/cupstestdsc.c:391
+#: systemv/cupstestdsc.c:385
 msgid "PASS"
 msgstr ""
 
@@ -5634,35 +5660,39 @@ msgstr ""
 msgid "PRC32K Oversize Long Edge"
 msgstr ""
 
-#: cups/snmp.c:968
+#: cups/dest.c:1946
+msgid "PRINTER environment variable names default destination that does not exist."
+msgstr ""
+
+#: cups/snmp.c:966
 msgid "Packet does not contain a Get-Response-PDU"
 msgstr ""
 
-#: cups/snmp.c:947
+#: cups/snmp.c:945
 msgid "Packet does not start with SEQUENCE"
 msgstr ""
 
-#: cups/ppd-cache.c:3529
+#: cups/ppd-cache.c:3802
 msgid "Paper"
 msgstr ""
 
-#: cups/ppd-localize.c:291
+#: cups/ppd-localize.c:279
 msgid "Paper jam."
 msgstr ""
 
-#: cups/ppd-localize.c:308
+#: cups/ppd-localize.c:296
 msgid "Paper tray is almost empty."
 msgstr ""
 
-#: cups/ppd-localize.c:310
+#: cups/ppd-localize.c:298
 msgid "Paper tray is empty."
 msgstr ""
 
-#: cups/ppd-localize.c:306
+#: cups/ppd-localize.c:294
 msgid "Paper tray is missing."
 msgstr ""
 
-#: cups/ppd-cache.c:3001
+#: cups/ppd-cache.c:3066
 msgid "Parallel Fold"
 msgstr ""
 
@@ -5674,21 +5704,21 @@ msgstr ""
 msgid "ParamCustominTearInterval"
 msgstr ""
 
-#: cups/auth.c:192 cups/auth.c:359
+#: cups/auth.c:218 cups/auth.c:474
 #, c-format
 msgid "Password for %s on %s? "
 msgstr ""
 
-#: systemv/cupsaddsmb.c:244
+#: systemv/cupsaddsmb.c:240
 #, c-format
 msgid "Password for %s required to access %s via SAMBA: "
 msgstr ""
 
-#: cgi-bin/classes.c:157
+#: cgi-bin/classes.c:153
 msgid "Pause Class"
 msgstr ""
 
-#: cgi-bin/printers.c:160
+#: cgi-bin/printers.c:156
 msgid "Pause Printer"
 msgstr ""
 
@@ -5696,15 +5726,15 @@ msgstr ""
 msgid "Peel-Off"
 msgstr ""
 
-#: cups/ppd-cache.c:3513
+#: cups/ppd-cache.c:3786
 msgid "Permanent Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3362 ppdc/sample.c:160
+#: cups/ppd-cache.c:3635 ppdc/sample.c:160
 msgid "Photo"
 msgstr ""
 
-#: cups/ppd-cache.c:3533
+#: cups/ppd-cache.c:3806
 msgid "Photo Film"
 msgstr ""
 
@@ -5712,71 +5742,71 @@ msgstr ""
 msgid "Photo Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3530 cups/ppd-cache.c:3531
+#: cups/ppd-cache.c:3803 cups/ppd-cache.c:3804
 msgid "Photo Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3503 cups/ppd-cache.c:3505
+#: cups/ppd-cache.c:3776 cups/ppd-cache.c:3778
 msgid "Photo Paper Plus Glossy II"
 msgstr ""
 
-#: cups/ppd-cache.c:3504 cups/ppd-cache.c:3506
+#: cups/ppd-cache.c:3777 cups/ppd-cache.c:3779
 msgid "Photo Paper Pro Platinum"
 msgstr ""
 
-#: cups/ppd-cache.c:3479
+#: cups/ppd-cache.c:3752
 msgid "Plain Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3559 ppdc/sample.c:281
+#: cups/ppd-cache.c:3832 ppdc/sample.c:281
 msgid "Plain Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3539
+#: cups/ppd-cache.c:3812
 msgid "Plastic"
 msgstr ""
 
-#: cups/ppd-cache.c:3540
+#: cups/ppd-cache.c:3813
 msgid "Plastic Archival"
 msgstr ""
 
-#: cups/ppd-cache.c:3541
+#: cups/ppd-cache.c:3814
 msgid "Plastic Colored"
 msgstr ""
 
-#: cups/ppd-cache.c:3542
+#: cups/ppd-cache.c:3815
 msgid "Plastic Glossy"
 msgstr ""
 
-#: cups/ppd-cache.c:3543
+#: cups/ppd-cache.c:3816
 msgid "Plastic High Gloss"
 msgstr ""
 
-#: cups/ppd-cache.c:3544
+#: cups/ppd-cache.c:3817
 msgid "Plastic Matte"
 msgstr ""
 
-#: cups/ppd-cache.c:3545
+#: cups/ppd-cache.c:3818
 msgid "Plastic Satin"
 msgstr ""
 
-#: cups/ppd-cache.c:3546
+#: cups/ppd-cache.c:3819
 msgid "Plastic Semi Gloss"
 msgstr ""
 
-#: cups/ppd-cache.c:3547
+#: cups/ppd-cache.c:3820
 msgid "Plate"
 msgstr ""
 
-#: cgi-bin/admin.c:3283 cgi-bin/admin.c:3564
+#: cgi-bin/admin.c:2992 cgi-bin/admin.c:3273
 msgid "Policies"
 msgstr ""
 
-#: cups/ppd-cache.c:3548
+#: cups/ppd-cache.c:3821
 msgid "Polyester"
 msgstr ""
 
-#: cgi-bin/admin.c:3290 cgi-bin/admin.c:3633 cgi-bin/admin.c:3646
+#: cgi-bin/admin.c:2999 cgi-bin/admin.c:3342 cgi-bin/admin.c:3355
 msgid "Port Monitor"
 msgstr ""
 
@@ -5800,35 +5830,35 @@ msgstr ""
 msgid "Postcard Long Edge"
 msgstr ""
 
-#: cups/ppd-cache.c:3002
+#: cups/ppd-cache.c:3067
 msgid "Poster Fold"
 msgstr ""
 
-#: cups/ppd-cache.c:3549
+#: cups/ppd-cache.c:3822
 msgid "Pre Cut Tabs"
 msgstr ""
 
-#: cups/ppd-cache.c:3453
+#: cups/ppd-cache.c:3726
 msgid "Premium Inkjet Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3454
+#: cups/ppd-cache.c:3727
 msgid "Premium Photo Glossy Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3455
+#: cups/ppd-cache.c:3728
 msgid "Premium Presentation Matte Paper"
 msgstr ""
 
-#: backend/ipp.c:980 backend/ipp.c:988
+#: backend/ipp.c:978 backend/ipp.c:986
 msgid "Preparing to print."
 msgstr ""
 
-#: cups/ppd-cache.c:3480
+#: cups/ppd-cache.c:3753
 msgid "Preprinted Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3569
+#: cups/ppd-cache.c:3842
 msgid "Preprinted Paper"
 msgstr ""
 
@@ -5836,7 +5866,7 @@ msgstr ""
 msgid "Print Density"
 msgstr ""
 
-#: cups/notify.c:74
+#: cups/notify.c:68
 msgid "Print Job:"
 msgstr ""
 
@@ -5844,7 +5874,7 @@ msgstr ""
 msgid "Print Mode"
 msgstr ""
 
-#: cups/ppd-cache.c:4023 cups/ppd-cache.c:4081 cups/ppd-cache.c:4115
+#: cups/ppd-cache.c:4380 cups/ppd-cache.c:4439 cups/ppd-cache.c:4473
 msgid "Print Quality"
 msgstr ""
 
@@ -5852,7 +5882,7 @@ msgstr ""
 msgid "Print Rate"
 msgstr ""
 
-#: cgi-bin/printers.c:169
+#: cgi-bin/printers.c:165
 msgid "Print Self-Test Page"
 msgstr ""
 
@@ -5860,7 +5890,7 @@ msgstr ""
 msgid "Print Speed"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:778
+#: cgi-bin/ipp-var.c:774
 msgid "Print Test Page"
 msgstr ""
 
@@ -5872,28 +5902,28 @@ msgstr ""
 msgid "Print and Tear"
 msgstr ""
 
-#: backend/socket.c:409 backend/usb-unix.c:182
+#: backend/socket.c:407 backend/usb-unix.c:180
 msgid "Print file sent."
 msgstr ""
 
-#: backend/ipp.c:2235
+#: backend/ipp.c:2233
 msgid "Print job canceled at printer."
 msgstr ""
 
-#: backend/ipp.c:2227
+#: backend/ipp.c:2225
 msgid "Print job too large."
 msgstr ""
 
-#: backend/ipp.c:1696
+#: backend/ipp.c:1694
 msgid "Print job was not accepted."
 msgstr ""
 
-#: scheduler/ipp.c:5503
+#: scheduler/ipp.c:5509
 #, c-format
 msgid "Printer \"%s\" already exists."
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1028
+#: cgi-bin/ipp-var.c:1024
 msgid "Printer Added"
 msgstr ""
 
@@ -5901,15 +5931,15 @@ msgstr ""
 msgid "Printer Default"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1032
+#: cgi-bin/ipp-var.c:1028
 msgid "Printer Deleted"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1030
+#: cgi-bin/ipp-var.c:1026
 msgid "Printer Modified"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1026
+#: cgi-bin/ipp-var.c:1022
 msgid "Printer Paused"
 msgstr ""
 
@@ -5917,37 +5947,37 @@ msgstr ""
 msgid "Printer Settings"
 msgstr ""
 
-#: backend/ipp.c:2230
+#: backend/ipp.c:2228
 msgid "Printer cannot print supplied content."
 msgstr ""
 
-#: backend/ipp.c:2233
+#: backend/ipp.c:2231
 msgid "Printer cannot print with supplied options."
 msgstr ""
 
-#: cups/ppd-cache.c:4142
+#: cups/ppd-cache.c:4500
 msgid "Printer does not support required IPP attributes or document formats."
 msgstr ""
 
-#: cups/notify.c:118
+#: cups/notify.c:112
 msgid "Printer:"
 msgstr ""
 
-#: cgi-bin/printers.c:194 cgi-bin/printers.c:321
+#: cgi-bin/printers.c:190 cgi-bin/printers.c:317
 msgid "Printers"
 msgstr ""
 
-#: filter/rastertoepson.c:1112 filter/rastertohp.c:780
-#: filter/rastertolabel.c:1233
+#: filter/rastertoepson.c:1106 filter/rastertohp.c:774
+#: filter/rastertolabel.c:1227
 #, c-format
 msgid "Printing page %d, %u%% complete."
 msgstr ""
 
-#: cups/ppd-cache.c:3007 cups/ppd-cache.c:3929
+#: cups/ppd-cache.c:3072 cups/ppd-cache.c:4213
 msgid "Punch"
 msgstr ""
 
-#: cups/ppd-cache.c:3570
+#: cups/ppd-cache.c:3843
 msgid "Punched Paper"
 msgstr ""
 
@@ -5955,32 +5985,32 @@ msgstr ""
 msgid "Quarto"
 msgstr ""
 
-#: scheduler/ipp.c:1551 scheduler/ipp.c:10969
+#: scheduler/ipp.c:1549 scheduler/ipp.c:10990
 msgid "Quota limit reached."
 msgstr ""
 
-#: berkeley/lpq.c:499
+#: berkeley/lpq.c:495
 msgid "Rank    Owner   Job     File(s)                         Total Size"
 msgstr ""
 
-#: cups/ppd-cache.c:3373
+#: cups/ppd-cache.c:3646
 msgid "Rear"
 msgstr ""
 
-#: cups/ppd-cache.c:3761
+#: cups/ppd-cache.c:4043
 msgid "Rear Tray"
 msgstr ""
 
-#: cgi-bin/classes.c:161 cgi-bin/printers.c:164
+#: cgi-bin/classes.c:157 cgi-bin/printers.c:160
 msgid "Reject Jobs"
 msgstr ""
 
-#: backend/lpd.c:1084 backend/lpd.c:1216
+#: backend/lpd.c:1082 backend/lpd.c:1214
 #, c-format
 msgid "Remote host did not accept control file (%d)."
 msgstr ""
 
-#: backend/lpd.c:1169
+#: backend/lpd.c:1167
 #, c-format
 msgid "Remote host did not accept data file (%d)."
 msgstr ""
@@ -5989,19 +6019,19 @@ msgstr ""
 msgid "Reprint After Error"
 msgstr ""
 
-#: cups/http-support.c:1383
+#: cups/http-support.c:1374
 msgid "Request Entity Too Large"
 msgstr ""
 
-#: cups/ppd.c:838 cups/ppd.c:1404 ppdc/sample.c:231
+#: cups/ppd.c:826 cups/ppd.c:1392 ppdc/sample.c:231
 msgid "Resolution"
 msgstr ""
 
-#: cgi-bin/classes.c:155
+#: cgi-bin/classes.c:151
 msgid "Resume Class"
 msgstr ""
 
-#: cgi-bin/printers.c:157
+#: cgi-bin/printers.c:153
 msgid "Resume Printer"
 msgstr ""
 
@@ -6013,185 +6043,185 @@ msgstr ""
 msgid "Rewind"
 msgstr ""
 
-#: cups/ppd-cache.c:3371
+#: cups/ppd-cache.c:3644
 msgid "Right"
 msgstr ""
 
-#: cups/ppd-cache.c:3003
+#: cups/ppd-cache.c:3068
 msgid "Right Gate Fold"
 msgstr ""
 
-#: cups/ppd-cache.c:3762
+#: cups/ppd-cache.c:4044
 msgid "Right Tray"
 msgstr ""
 
-#: cups/ppd-cache.c:3550
+#: cups/ppd-cache.c:3823
 msgid "Roll"
 msgstr ""
 
-#: cups/ppd-cache.c:3395
+#: cups/ppd-cache.c:3668
 msgid "Roll 1"
 msgstr ""
 
-#: cups/ppd-cache.c:3404
+#: cups/ppd-cache.c:3677
 msgid "Roll 10"
 msgstr ""
 
-#: cups/ppd-cache.c:3396
+#: cups/ppd-cache.c:3669
 msgid "Roll 2"
 msgstr ""
 
-#: cups/ppd-cache.c:3397
+#: cups/ppd-cache.c:3670
 msgid "Roll 3"
 msgstr ""
 
-#: cups/ppd-cache.c:3398
+#: cups/ppd-cache.c:3671
 msgid "Roll 4"
 msgstr ""
 
-#: cups/ppd-cache.c:3399
+#: cups/ppd-cache.c:3672
 msgid "Roll 5"
 msgstr ""
 
-#: cups/ppd-cache.c:3400
+#: cups/ppd-cache.c:3673
 msgid "Roll 6"
 msgstr ""
 
-#: cups/ppd-cache.c:3401
+#: cups/ppd-cache.c:3674
 msgid "Roll 7"
 msgstr ""
 
-#: cups/ppd-cache.c:3402
+#: cups/ppd-cache.c:3675
 msgid "Roll 8"
 msgstr ""
 
-#: cups/ppd-cache.c:3403
+#: cups/ppd-cache.c:3676
 msgid "Roll 9"
 msgstr ""
 
-#: cups/adminutil.c:2100
+#: cups/adminutil.c:2094
 #, c-format
 msgid "Running command: %s %s -N -A %s -c '%s'"
 msgstr ""
 
-#: cups/snmp.c:949
+#: cups/snmp.c:947
 msgid "SEQUENCE uses indefinite length"
 msgstr ""
 
-#: cups/http-support.c:1407
+#: cups/http-support.c:1398
 msgid "SSL/TLS Negotiation Error"
 msgstr ""
 
-#: cups/ppd-cache.c:3028
+#: cups/ppd-cache.c:3093
 msgid "Saddle Stitch"
 msgstr ""
 
-#: cups/ppd-cache.c:3514
+#: cups/ppd-cache.c:3787
 msgid "Satin Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3463
+#: cups/ppd-cache.c:3736
 msgid "Satin Optical Disc"
 msgstr ""
 
-#: cups/ppd-cache.c:3537
+#: cups/ppd-cache.c:3810
 msgid "Satin Photo Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3551
+#: cups/ppd-cache.c:3824
 msgid "Screen"
 msgstr ""
 
-#: cups/ppd-cache.c:3552
+#: cups/ppd-cache.c:3825
 msgid "Screen Paged"
 msgstr ""
 
-#: cups/ppd-cache.c:3515
+#: cups/ppd-cache.c:3788
 msgid "Security Labels"
 msgstr ""
 
-#: cups/http-support.c:1364
+#: cups/http-support.c:1355
 msgid "See Other"
 msgstr ""
 
-#: scheduler/ipp.c:7118 scheduler/ipp.c:7137
+#: scheduler/ipp.c:7124 scheduler/ipp.c:7143
 msgid "See remote printer."
 msgstr ""
 
-#: cups/ppd-cache.c:3553
+#: cups/ppd-cache.c:3826
 msgid "Self Adhesive"
 msgstr ""
 
-#: cups/ppd-cache.c:3554
+#: cups/ppd-cache.c:3827
 msgid "Self Adhesive Film"
 msgstr ""
 
-#: cups/tls-darwin.c:745 cups/tls-gnutls.c:584
+#: cups/tls-darwin.c:741 cups/tls-gnutls.c:580
 msgid "Self-signed credentials are blocked."
 msgstr ""
 
-#: cups/ppd-cache.c:3487
+#: cups/ppd-cache.c:3760
 msgid "Semi-Gloss Fabric"
 msgstr ""
 
-#: cups/ppd-cache.c:3516
+#: cups/ppd-cache.c:3789
 msgid "Semi-Gloss Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3464
+#: cups/ppd-cache.c:3737
 msgid "Semi-Gloss Optical Disc"
 msgstr ""
 
-#: cups/ppd-cache.c:3538
+#: cups/ppd-cache.c:3811
 msgid "Semi-Gloss Photo Paper"
 msgstr ""
 
-#: backend/usb-darwin.c:566 backend/usb-libusb.c:346
+#: backend/usb-darwin.c:566 backend/usb-libusb.c:342
 msgid "Sending data to printer."
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1042
+#: cgi-bin/ipp-var.c:1038
 msgid "Server Restarted"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1048
+#: cgi-bin/ipp-var.c:1044
 msgid "Server Security Auditing"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1044
+#: cgi-bin/ipp-var.c:1040
 msgid "Server Started"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1046
+#: cgi-bin/ipp-var.c:1042
 msgid "Server Stopped"
 msgstr ""
 
-#: cups/tls-darwin.c:1186 cups/tls-gnutls.c:1264
+#: cups/tls-darwin.c:1185 cups/tls-gnutls.c:1271
 msgid "Server credentials not set."
 msgstr ""
 
-#: cups/http-support.c:1401
+#: cups/http-support.c:1392
 msgid "Service Unavailable"
 msgstr ""
 
-#: cgi-bin/admin.c:2770 cgi-bin/admin.c:2816 cgi-bin/admin.c:2973
-#: cgi-bin/admin.c:2992
+#: cgi-bin/admin.c:2479 cgi-bin/admin.c:2525 cgi-bin/admin.c:2682
+#: cgi-bin/admin.c:2701
 msgid "Set Allowed Users"
 msgstr ""
 
-#: cgi-bin/admin.c:3019
+#: cgi-bin/admin.c:2728
 msgid "Set As Server Default"
 msgstr ""
 
-#: cgi-bin/admin.c:3119
+#: cgi-bin/admin.c:2828
 msgid "Set Class Options"
 msgstr ""
 
-#: cgi-bin/admin.c:3119 cgi-bin/admin.c:3293 cgi-bin/admin.c:3675
+#: cgi-bin/admin.c:2828 cgi-bin/admin.c:3002 cgi-bin/admin.c:3384
 msgid "Set Printer Options"
 msgstr ""
 
-#: cgi-bin/admin.c:3845 cgi-bin/admin.c:3889 cgi-bin/admin.c:3907
+#: cgi-bin/admin.c:3554 cgi-bin/admin.c:3598 cgi-bin/admin.c:3616
 msgid "Set Publishing"
 msgstr ""
 
@@ -6199,63 +6229,63 @@ msgstr ""
 msgid "Shipping Address"
 msgstr ""
 
-#: cups/ppd-cache.c:3682 ppdc/sample.c:265
+#: cups/ppd-cache.c:3964 ppdc/sample.c:265
 msgid "Short-Edge (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3555
+#: cups/ppd-cache.c:3828
 msgid "Shrink Foil"
 msgstr ""
 
-#: cups/ppd-cache.c:3369
+#: cups/ppd-cache.c:3642
 msgid "Side"
 msgstr ""
 
-#: cups/ppd-cache.c:3763
+#: cups/ppd-cache.c:4045
 msgid "Side Tray"
 msgstr ""
 
-#: cups/ppd-cache.c:3556
+#: cups/ppd-cache.c:3829
 msgid "Single Face"
 msgstr ""
 
-#: cups/ppd-cache.c:3019
+#: cups/ppd-cache.c:3084
 msgid "Single Punch (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3018
+#: cups/ppd-cache.c:3083
 msgid "Single Punch (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3008
+#: cups/ppd-cache.c:3073
 msgid "Single Punch (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3009
+#: cups/ppd-cache.c:3074
 msgid "Single Punch (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3037
+#: cups/ppd-cache.c:3102
 msgid "Single Staple (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3036
+#: cups/ppd-cache.c:3101
 msgid "Single Staple (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3030
+#: cups/ppd-cache.c:3095
 msgid "Single Staple (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3031
+#: cups/ppd-cache.c:3096
 msgid "Single Staple (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3557
+#: cups/ppd-cache.c:3830
 msgid "Single Wall Cardboard"
 msgstr ""
 
-#: cups/ppd-cache.c:3558
+#: cups/ppd-cache.c:3831
 msgid "Sleeve"
 msgstr ""
 
@@ -6263,48 +6293,48 @@ msgstr ""
 msgid "Special Paper"
 msgstr ""
 
-#: backend/lpd.c:1125
+#: backend/lpd.c:1123
 #, c-format
 msgid "Spooling job, %.0f%% complete."
 msgstr ""
 
-#: cups/ppd-cache.c:3764
+#: cups/ppd-cache.c:4046
 msgid "Stacker 1"
 msgstr ""
 
-#: cups/ppd-cache.c:3773
+#: cups/ppd-cache.c:4055
 msgid "Stacker 10"
 msgstr ""
 
-#: cups/ppd-cache.c:3765
+#: cups/ppd-cache.c:4047
 msgid "Stacker 2"
 msgstr ""
 
-#: cups/ppd-cache.c:3766
+#: cups/ppd-cache.c:4048
 msgid "Stacker 3"
 msgstr ""
 
-#: cups/ppd-cache.c:3767
+#: cups/ppd-cache.c:4049
 msgid "Stacker 4"
 msgstr ""
 
-#: cups/ppd-cache.c:3768
+#: cups/ppd-cache.c:4050
 msgid "Stacker 5"
 msgstr ""
 
-#: cups/ppd-cache.c:3769
+#: cups/ppd-cache.c:4051
 msgid "Stacker 6"
 msgstr ""
 
-#: cups/ppd-cache.c:3770
+#: cups/ppd-cache.c:4052
 msgid "Stacker 7"
 msgstr ""
 
-#: cups/ppd-cache.c:3771
+#: cups/ppd-cache.c:4053
 msgid "Stacker 8"
 msgstr ""
 
-#: cups/ppd-cache.c:3772
+#: cups/ppd-cache.c:4054
 msgid "Stacker 9"
 msgstr ""
 
@@ -6312,37 +6342,37 @@ msgstr ""
 msgid "Standard"
 msgstr ""
 
-#: cups/ppd-cache.c:3029 cups/ppd-cache.c:3835
+#: cups/ppd-cache.c:3094 cups/ppd-cache.c:4115
 msgid "Staple"
 msgstr ""
 
-#: cups/ppd-cache.c:2987
+#: cups/ppd-cache.c:3052
 msgid "Staple Edge"
 msgstr ""
 
-#: cups/ppd-cache.c:2991
+#: cups/ppd-cache.c:3056
 msgid "Staple Edge (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:2989
+#: cups/ppd-cache.c:3054
 msgid "Staple Edge (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:2988
+#: cups/ppd-cache.c:3053
 msgid "Staple Edge (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:2990
+#: cups/ppd-cache.c:3055
 msgid "Staple Edge (Reverse Portrait)"
 msgstr ""
 
 #. TRANSLATORS: Banner/cover sheet before the print job.
-#: cgi-bin/admin.c:3536
+#: cgi-bin/admin.c:3245
 msgid "Starting Banner"
 msgstr ""
 
-#: filter/rastertoepson.c:1088 filter/rastertohp.c:756
-#: filter/rastertolabel.c:1209
+#: filter/rastertoepson.c:1082 filter/rastertohp.c:750
+#: filter/rastertolabel.c:1203
 #, c-format
 msgid "Starting page %d."
 msgstr ""
@@ -6351,13 +6381,13 @@ msgstr ""
 msgid "Statement"
 msgstr ""
 
-#: scheduler/ipp.c:3628 scheduler/ipp.c:6930 scheduler/ipp.c:7640
-#: scheduler/ipp.c:9161
+#: scheduler/ipp.c:3634 scheduler/ipp.c:6936 scheduler/ipp.c:7661
+#: scheduler/ipp.c:9182
 #, c-format
 msgid "Subscription #%d does not exist."
 msgstr ""
 
-#: test/ippfind.c:2804
+#: test/ippfind.c:2810
 msgid "Substitutions:"
 msgstr ""
 
@@ -6373,11 +6403,11 @@ msgstr ""
 msgid "Super B/A3"
 msgstr ""
 
-#: cups/http-support.c:1346
+#: cups/http-support.c:1337
 msgid "Switching Protocols"
 msgstr ""
 
-#: cups/ppd-cache.c:3571
+#: cups/ppd-cache.c:3844
 msgid "Tab Stock"
 msgstr ""
 
@@ -6405,111 +6435,111 @@ msgstr ""
 msgid "Tear-Off Adjust Position"
 msgstr ""
 
-#: scheduler/ipp.c:1387
+#: scheduler/ipp.c:1385
 #, c-format
 msgid "The \"%s\" attribute is required for print jobs."
 msgstr ""
 
-#: scheduler/ipp.c:6591 scheduler/ipp.c:6671 scheduler/ipp.c:6684
-#: scheduler/ipp.c:6696 scheduler/ipp.c:6711
+#: scheduler/ipp.c:6597 scheduler/ipp.c:6677 scheduler/ipp.c:6690
+#: scheduler/ipp.c:6702 scheduler/ipp.c:6717
 #, c-format
 msgid "The %s attribute cannot be provided with job-ids."
 msgstr ""
 
-#: scheduler/ipp.c:1366
+#: scheduler/ipp.c:1364
 #, c-format
 msgid "The '%s' Job Status attribute cannot be supplied in a job creation request."
 msgstr ""
 
-#: scheduler/ipp.c:5265
+#: scheduler/ipp.c:5271
 #, c-format
 msgid "The '%s' operation attribute cannot be supplied in a Create-Job request."
 msgstr ""
 
-#: scheduler/ipp.c:7160
+#: scheduler/ipp.c:7166
 #, c-format
 msgid "The PPD file \"%s\" could not be found."
 msgstr ""
 
-#: scheduler/ipp.c:7149
+#: scheduler/ipp.c:7155
 #, c-format
 msgid "The PPD file \"%s\" could not be opened: %s"
 msgstr ""
 
-#: filter/rastertoepson.c:1057 filter/rastertohp.c:727
-#: filter/rastertolabel.c:1173
+#: filter/rastertoepson.c:1051 filter/rastertohp.c:721
+#: filter/rastertolabel.c:1167
 msgid "The PPD file could not be opened."
 msgstr ""
 
-#: cgi-bin/admin.c:723
+#: cgi-bin/admin.c:517
 msgid "The class name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#)."
 msgstr ""
 
-#: cups/ppd-localize.c:336
+#: cups/ppd-localize.c:324
 msgid "The developer unit needs to be replaced."
 msgstr ""
 
-#: cups/ppd-localize.c:334
+#: cups/ppd-localize.c:322
 msgid "The developer unit will need to be replaced soon."
 msgstr ""
 
-#: cups/ppd-localize.c:326
+#: cups/ppd-localize.c:314
 msgid "The fuser's temperature is high."
 msgstr ""
 
-#: cups/ppd-localize.c:328
+#: cups/ppd-localize.c:316
 msgid "The fuser's temperature is low."
 msgstr ""
 
-#: scheduler/ipp.c:2141
+#: scheduler/ipp.c:2139
 msgid "The notify-lease-duration attribute cannot be used with job subscriptions."
 msgstr ""
 
-#: scheduler/ipp.c:2124 scheduler/ipp.c:5842
+#: scheduler/ipp.c:2122 scheduler/ipp.c:5848
 #, c-format
 msgid "The notify-user-data value is too large (%d > 63 octets)."
 msgstr ""
 
-#: cups/ppd-localize.c:332
+#: cups/ppd-localize.c:320
 msgid "The optical photoconductor needs to be replaced."
 msgstr ""
 
-#: cups/ppd-localize.c:330
+#: cups/ppd-localize.c:318
 msgid "The optical photoconductor will need to be replaced soon."
 msgstr ""
 
-#: backend/ipp.c:1000
+#: backend/ipp.c:998
 msgid "The printer configuration is incorrect or the printer no longer exists."
 msgstr ""
 
-#: backend/lpd.c:688 backend/lpd.c:1077 backend/lpd.c:1159 backend/lpd.c:1209
+#: backend/lpd.c:686 backend/lpd.c:1075 backend/lpd.c:1157 backend/lpd.c:1207
 msgid "The printer did not respond."
 msgstr ""
 
-#: backend/ipp.c:773 backend/ipp.c:963 backend/ipp.c:1077 backend/ipp.c:1498
-#: backend/ipp.c:1668 backend/lpd.c:896 backend/socket.c:359
-#: backend/usb-unix.c:122 backend/usb-unix.c:412 backend/usb-unix.c:495
+#: backend/ipp.c:771 backend/ipp.c:961 backend/ipp.c:1075 backend/ipp.c:1496
+#: backend/ipp.c:1666 backend/lpd.c:894 backend/socket.c:357
+#: backend/usb-unix.c:120 backend/usb-unix.c:410 backend/usb-unix.c:493
 msgid "The printer is in use."
 msgstr ""
 
-#: cups/ppd-localize.c:318
+#: cups/ppd-localize.c:306
 msgid "The printer is low on ink."
 msgstr ""
 
-#: cups/ppd-localize.c:296
+#: cups/ppd-localize.c:284
 msgid "The printer is low on toner."
 msgstr ""
 
-#: backend/runloop.c:241 backend/runloop.c:361 cups/ppd-localize.c:294
+#: backend/runloop.c:239 backend/runloop.c:359 cups/ppd-localize.c:282
 msgid "The printer is not connected."
 msgstr ""
 
-#: backend/ipp.c:751 backend/ipp.c:784 backend/ipp.c:959 backend/lpd.c:875
-#: backend/lpd.c:916 backend/socket.c:338 backend/socket.c:371
+#: backend/ipp.c:749 backend/ipp.c:782 backend/ipp.c:957 backend/lpd.c:873
+#: backend/lpd.c:914 backend/socket.c:336 backend/socket.c:369
 msgid "The printer is not responding."
 msgstr ""
 
-#: backend/runloop.c:383
+#: backend/runloop.c:381
 msgid "The printer is now connected."
 msgstr ""
 
@@ -6521,97 +6551,93 @@ msgstr ""
 msgid "The printer is offline."
 msgstr ""
 
-#: backend/ipp.c:767 backend/lpd.c:890 backend/socket.c:353
+#: backend/ipp.c:765 backend/lpd.c:888 backend/socket.c:351
 msgid "The printer is unreachable at this time."
 msgstr ""
 
-#: cups/ppd-localize.c:320
+#: cups/ppd-localize.c:308
 msgid "The printer may be out of ink."
 msgstr ""
 
-#: cups/ppd-localize.c:298
+#: cups/ppd-localize.c:286
 msgid "The printer may be out of toner."
 msgstr ""
 
-#: backend/ipp.c:760 backend/lpd.c:883 backend/socket.c:346
+#: backend/ipp.c:758 backend/lpd.c:881 backend/socket.c:344
 msgid "The printer may not exist or is unavailable at this time."
 msgstr ""
 
-#: cgi-bin/admin.c:906
-msgid "The printer name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#)."
+#: cgi-bin/admin.c:700
+msgid "The printer name may only contain up to 127 printable characters and may not contain spaces, slashes (/ \\), quotes (' \"), question mark (?), or the pound sign (#)."
 msgstr ""
 
-#: scheduler/ipp.c:810 scheduler/ipp.c:1093 scheduler/ipp.c:3267
-#: scheduler/ipp.c:3448 scheduler/ipp.c:5248 scheduler/ipp.c:5676
-#: scheduler/ipp.c:5991 scheduler/ipp.c:6557 scheduler/ipp.c:7364
-#: scheduler/ipp.c:7420 scheduler/ipp.c:7746 scheduler/ipp.c:8018
-#: scheduler/ipp.c:8107 scheduler/ipp.c:8140 scheduler/ipp.c:8464
-#: scheduler/ipp.c:8871 scheduler/ipp.c:8953 scheduler/ipp.c:10127
-#: scheduler/ipp.c:10579 scheduler/ipp.c:10932 scheduler/ipp.c:11014
-#: scheduler/ipp.c:11389
+#: scheduler/ipp.c:806 scheduler/ipp.c:1091 scheduler/ipp.c:3273
+#: scheduler/ipp.c:3454 scheduler/ipp.c:5254 scheduler/ipp.c:5682
+#: scheduler/ipp.c:5997 scheduler/ipp.c:6563 scheduler/ipp.c:7370
+#: scheduler/ipp.c:7426 scheduler/ipp.c:7767 scheduler/ipp.c:8039
+#: scheduler/ipp.c:8128 scheduler/ipp.c:8161 scheduler/ipp.c:8485
+#: scheduler/ipp.c:8892 scheduler/ipp.c:8974 scheduler/ipp.c:10148
+#: scheduler/ipp.c:10600 scheduler/ipp.c:10953 scheduler/ipp.c:11035
+#: scheduler/ipp.c:11410
 msgid "The printer or class does not exist."
 msgstr ""
 
-#: scheduler/ipp.c:1305
+#: scheduler/ipp.c:1303
 msgid "The printer or class is not shared."
 msgstr ""
 
-#: cups/ppd-localize.c:300
+#: cups/ppd-localize.c:288
 msgid "The printer's cover is open."
 msgstr ""
 
-#: cups/ppd-localize.c:304
+#: cups/ppd-localize.c:292
 msgid "The printer's door is open."
 msgstr ""
 
-#: cups/ppd-localize.c:302
+#: cups/ppd-localize.c:290
 msgid "The printer's interlock is open."
 msgstr ""
 
-#: cups/ppd-localize.c:322
+#: cups/ppd-localize.c:310
 msgid "The printer's waste bin is almost full."
 msgstr ""
 
-#: cups/ppd-localize.c:324
+#: cups/ppd-localize.c:312
 msgid "The printer's waste bin is full."
 msgstr ""
 
-#: scheduler/ipp.c:916 scheduler/ipp.c:2305
+#: scheduler/ipp.c:912 scheduler/ipp.c:2303
 #, c-format
 msgid "The printer-uri \"%s\" contains invalid characters."
 msgstr ""
 
-#: scheduler/ipp.c:3244
+#: scheduler/ipp.c:3250
 msgid "The printer-uri attribute is required."
 msgstr ""
 
-#: scheduler/ipp.c:900
+#: scheduler/ipp.c:896
 msgid "The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"."
 msgstr ""
 
-#: scheduler/ipp.c:2289
+#: scheduler/ipp.c:2287
 msgid "The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"."
 msgstr ""
 
-#: cgi-bin/admin.c:448
-msgid "The subscription name may not contain spaces, slashes (/), question marks (?), or the pound sign (#)."
-msgstr ""
-
-#: scheduler/client.c:2249
+#: scheduler/client.c:2245
 msgid "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to enable it."
 msgstr ""
 
-#: scheduler/ipp.c:6655
+#: scheduler/ipp.c:6661
 #, c-format
 msgid "The which-jobs value \"%s\" is not supported."
 msgstr ""
 
-#: scheduler/ipp.c:5920
+#: scheduler/ipp.c:5926
 msgid "There are too many subscriptions."
 msgstr ""
 
 #: backend/usb-darwin.c:398 backend/usb-darwin.c:464 backend/usb-darwin.c:528
-#: backend/usb-darwin.c:549 backend/usb-libusb.c:271 backend/usb-libusb.c:325
+#: backend/usb-darwin.c:549 backend/usb-libusb.c:267 backend/usb-libusb.c:321
 msgid "There was an unrecoverable USB error."
 msgstr ""
 
@@ -6619,11 +6645,11 @@ msgstr ""
 msgid "Thermal Transfer Media"
 msgstr ""
 
-#: scheduler/ipp.c:1545
+#: scheduler/ipp.c:1543
 msgid "Too many active jobs."
 msgstr ""
 
-#: scheduler/ipp.c:1439
+#: scheduler/ipp.c:1437
 #, c-format
 msgid "Too many job-sheets values (%d > 2)."
 msgstr ""
@@ -6633,23 +6659,23 @@ msgstr ""
 msgid "Too many printer-state-reasons values (%d > %d)."
 msgstr ""
 
-#: cups/ppd-cache.c:3366
+#: cups/ppd-cache.c:3639
 msgid "Top"
 msgstr ""
 
-#: cups/ppd-cache.c:3774
+#: cups/ppd-cache.c:4056
 msgid "Top Tray"
 msgstr ""
 
-#: cups/ppd-cache.c:3572
+#: cups/ppd-cache.c:3845
 msgid "Tractor"
 msgstr ""
 
-#: cups/ppd-cache.c:3573
+#: cups/ppd-cache.c:3846
 msgid "Transfer"
 msgstr ""
 
-#: cups/ppd-cache.c:3574 ppdc/sample.c:284
+#: cups/ppd-cache.c:3847 ppdc/sample.c:284
 msgid "Transparency"
 msgstr ""
 
@@ -6657,116 +6683,116 @@ msgstr ""
 msgid "Tray"
 msgstr ""
 
-#: cups/ppd-cache.c:3375 cups/ppd-cache.c:3775 ppdc/sample.c:256
+#: cups/ppd-cache.c:3648 cups/ppd-cache.c:4057 ppdc/sample.c:256
 msgid "Tray 1"
 msgstr ""
 
-#: cups/ppd-cache.c:3384 cups/ppd-cache.c:3784
+#: cups/ppd-cache.c:3657 cups/ppd-cache.c:4066
 msgid "Tray 10"
 msgstr ""
 
-#: cups/ppd-cache.c:3385
+#: cups/ppd-cache.c:3658
 msgid "Tray 11"
 msgstr ""
 
-#: cups/ppd-cache.c:3386
+#: cups/ppd-cache.c:3659
 msgid "Tray 12"
 msgstr ""
 
-#: cups/ppd-cache.c:3387
+#: cups/ppd-cache.c:3660
 msgid "Tray 13"
 msgstr ""
 
-#: cups/ppd-cache.c:3388
+#: cups/ppd-cache.c:3661
 msgid "Tray 14"
 msgstr ""
 
-#: cups/ppd-cache.c:3389
+#: cups/ppd-cache.c:3662
 msgid "Tray 15"
 msgstr ""
 
-#: cups/ppd-cache.c:3390
+#: cups/ppd-cache.c:3663
 msgid "Tray 16"
 msgstr ""
 
-#: cups/ppd-cache.c:3391
+#: cups/ppd-cache.c:3664
 msgid "Tray 17"
 msgstr ""
 
-#: cups/ppd-cache.c:3392
+#: cups/ppd-cache.c:3665
 msgid "Tray 18"
 msgstr ""
 
-#: cups/ppd-cache.c:3393
+#: cups/ppd-cache.c:3666
 msgid "Tray 19"
 msgstr ""
 
-#: cups/ppd-cache.c:3376 cups/ppd-cache.c:3776 ppdc/sample.c:257
+#: cups/ppd-cache.c:3649 cups/ppd-cache.c:4058 ppdc/sample.c:257
 msgid "Tray 2"
 msgstr ""
 
-#: cups/ppd-cache.c:3394
+#: cups/ppd-cache.c:3667
 msgid "Tray 20"
 msgstr ""
 
-#: cups/ppd-cache.c:3377 cups/ppd-cache.c:3777 ppdc/sample.c:258
+#: cups/ppd-cache.c:3650 cups/ppd-cache.c:4059 ppdc/sample.c:258
 msgid "Tray 3"
 msgstr ""
 
-#: cups/ppd-cache.c:3378 cups/ppd-cache.c:3778 ppdc/sample.c:259
+#: cups/ppd-cache.c:3651 cups/ppd-cache.c:4060 ppdc/sample.c:259
 msgid "Tray 4"
 msgstr ""
 
-#: cups/ppd-cache.c:3379 cups/ppd-cache.c:3779
+#: cups/ppd-cache.c:3652 cups/ppd-cache.c:4061
 msgid "Tray 5"
 msgstr ""
 
-#: cups/ppd-cache.c:3380 cups/ppd-cache.c:3780
+#: cups/ppd-cache.c:3653 cups/ppd-cache.c:4062
 msgid "Tray 6"
 msgstr ""
 
-#: cups/ppd-cache.c:3381 cups/ppd-cache.c:3781
+#: cups/ppd-cache.c:3654 cups/ppd-cache.c:4063
 msgid "Tray 7"
 msgstr ""
 
-#: cups/ppd-cache.c:3382 cups/ppd-cache.c:3782
+#: cups/ppd-cache.c:3655 cups/ppd-cache.c:4064
 msgid "Tray 8"
 msgstr ""
 
-#: cups/ppd-cache.c:3383 cups/ppd-cache.c:3783
+#: cups/ppd-cache.c:3656 cups/ppd-cache.c:4065
 msgid "Tray 9"
 msgstr ""
 
-#: cups/ppd-cache.c:3041
+#: cups/ppd-cache.c:3106
 msgid "Triple Staple (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3039
+#: cups/ppd-cache.c:3104
 msgid "Triple Staple (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3038
+#: cups/ppd-cache.c:3103
 msgid "Triple Staple (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3040
+#: cups/ppd-cache.c:3105
 msgid "Triple Staple (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3575
+#: cups/ppd-cache.c:3848
 msgid "Triple Wall Cardboard"
 msgstr ""
 
-#: cups/tls-darwin.c:650 cups/tls-darwin.c:732 cups/tls-gnutls.c:482
-#: cups/tls-gnutls.c:564
+#: cups/tls-darwin.c:646 cups/tls-darwin.c:728 cups/tls-gnutls.c:478
+#: cups/tls-gnutls.c:560
 msgid "Trust on first use is disabled."
 msgstr ""
 
-#: cups/http-support.c:1386
+#: cups/http-support.c:1377
 msgid "URI Too Long"
 msgstr ""
 
-#: cups/http-support.c:1461
+#: cups/http-support.c:1452
 msgid "URI too large"
 msgstr ""
 
@@ -6806,101 +6832,93 @@ msgstr ""
 msgid "US Letter Small"
 msgstr ""
 
-#: cgi-bin/admin.c:1943 cgi-bin/admin.c:1956 cgi-bin/admin.c:1980
+#: cgi-bin/admin.c:1652 cgi-bin/admin.c:1665 cgi-bin/admin.c:1689
 msgid "Unable to access cupsd.conf file"
 msgstr ""
 
-#: cgi-bin/help.c:127
+#: cgi-bin/help.c:123
 msgid "Unable to access help file."
 msgstr ""
 
-#: cgi-bin/admin.c:500
-msgid "Unable to add RSS subscription"
-msgstr ""
-
-#: cgi-bin/admin.c:788
+#: cgi-bin/admin.c:582
 msgid "Unable to add class"
 msgstr ""
 
-#: backend/ipp.c:1855
+#: backend/ipp.c:1853
 msgid "Unable to add document to print job."
 msgstr ""
 
-#: scheduler/ipp.c:1613
+#: scheduler/ipp.c:1611
 #, c-format
 msgid "Unable to add job for destination \"%s\"."
 msgstr ""
 
-#: cgi-bin/admin.c:1034 cgi-bin/admin.c:1403
+#: cgi-bin/admin.c:825 cgi-bin/admin.c:1194
 msgid "Unable to add printer"
 msgstr ""
 
-#: scheduler/ipp.c:1223
+#: scheduler/ipp.c:1221
 msgid "Unable to allocate memory for file types."
 msgstr ""
 
-#: filter/pstops.c:421
+#: filter/pstops.c:415
 msgid "Unable to allocate memory for page info"
 msgstr ""
 
-#: filter/pstops.c:415
+#: filter/pstops.c:409
 msgid "Unable to allocate memory for pages array"
 msgstr ""
 
-#: cgi-bin/admin.c:1509
-msgid "Unable to cancel RSS subscription"
-msgstr ""
-
-#: backend/ipp.c:2140 backend/ipp.c:2650
+#: backend/ipp.c:2138 backend/ipp.c:2648
 msgid "Unable to cancel print job."
 msgstr ""
 
-#: cgi-bin/admin.c:2974
+#: cgi-bin/admin.c:2683
 msgid "Unable to change printer"
 msgstr ""
 
-#: cgi-bin/admin.c:3890
+#: cgi-bin/admin.c:3599
 msgid "Unable to change printer-is-shared attribute"
 msgstr ""
 
-#: cgi-bin/admin.c:1641 cgi-bin/admin.c:1783
+#: cgi-bin/admin.c:1350 cgi-bin/admin.c:1492
 msgid "Unable to change server settings"
 msgstr ""
 
-#: cups/ipp.c:5385
+#: cups/ipp.c:5379
 #, c-format
 msgid "Unable to compile mimeMediaType regular expression: %s."
 msgstr ""
 
-#: cups/ipp.c:5331
+#: cups/ipp.c:5325
 #, c-format
 msgid "Unable to compile naturalLanguage regular expression: %s."
 msgstr ""
 
-#: filter/commandtops.c:405
+#: filter/commandtops.c:401
 msgid "Unable to configure printer options."
 msgstr ""
 
-#: cups/adminutil.c:899 cups/request.c:1016
+#: cups/adminutil.c:893 cups/request.c:1044
 msgid "Unable to connect to host."
 msgstr ""
 
-#: backend/ipp.c:730 backend/ipp.c:1275 backend/lpd.c:856 backend/socket.c:319
-#: backend/usb-unix.c:108
+#: backend/ipp.c:728 backend/ipp.c:1273 backend/lpd.c:854 backend/socket.c:317
+#: backend/usb-unix.c:106
 msgid "Unable to contact printer, queuing on next printer in class."
 msgstr ""
 
-#: cups/adminutil.c:714
+#: cups/adminutil.c:708
 #, c-format
 msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
 msgstr ""
 
-#: cups/adminutil.c:679
+#: cups/adminutil.c:673
 #, c-format
 msgid "Unable to copy 64-bit Windows printer driver files (%d)."
 msgstr ""
 
-#: cups/adminutil.c:510
+#: cups/adminutil.c:504
 #, c-format
 msgid "Unable to copy CUPS printer driver files (%d)."
 msgstr ""
@@ -6914,49 +6932,49 @@ msgstr ""
 msgid "Unable to copy PPD file."
 msgstr ""
 
-#: cups/adminutil.c:475
+#: cups/adminutil.c:469
 #, c-format
 msgid "Unable to copy Windows 2000 printer driver files (%d)."
 msgstr ""
 
-#: cups/adminutil.c:598
+#: cups/adminutil.c:592
 #, c-format
 msgid "Unable to copy Windows 9x printer driver files (%d)."
 msgstr ""
 
-#: cups/tls-darwin.c:616 cups/tls-gnutls.c:445
+#: cups/tls-darwin.c:612 cups/tls-gnutls.c:441
 msgid "Unable to create credentials from array."
 msgstr ""
 
-#: cups/ppd-util.c:542 cups/util.c:500
+#: cups/ppd-util.c:537 cups/util.c:494
 msgid "Unable to create printer-uri"
 msgstr ""
 
-#: scheduler/ipp.c:5513
+#: scheduler/ipp.c:5519
 msgid "Unable to create printer."
 msgstr ""
 
-#: cups/tls-darwin.c:1476 cups/tls-gnutls.c:1476
+#: cups/tls-darwin.c:1476 cups/tls-gnutls.c:1483
 msgid "Unable to create server credentials."
 msgstr ""
 
-#: cgi-bin/admin.c:1834 cgi-bin/admin.c:1846 scheduler/cupsfilter.c:1288
+#: cgi-bin/admin.c:1543 cgi-bin/admin.c:1555 scheduler/cupsfilter.c:1284
 msgid "Unable to create temporary file"
 msgstr ""
 
-#: cgi-bin/admin.c:2137
+#: cgi-bin/admin.c:1846
 msgid "Unable to delete class"
 msgstr ""
 
-#: cgi-bin/admin.c:2222
+#: cgi-bin/admin.c:1931
 msgid "Unable to delete printer"
 msgstr ""
 
-#: cgi-bin/classes.c:250 cgi-bin/printers.c:259
+#: cgi-bin/classes.c:246 cgi-bin/printers.c:255
 msgid "Unable to do maintenance command"
 msgstr ""
 
-#: cgi-bin/admin.c:1958
+#: cgi-bin/admin.c:1667
 msgid "Unable to edit cupsd.conf files larger than 1MB"
 msgstr ""
 
@@ -6988,15 +7006,15 @@ msgstr ""
 msgid "Unable to establish a secure connection to host (untrusted certificate)."
 msgstr ""
 
-#: cups/tls-darwin.c:1675 cups/tls-sspi.c:1278 cups/tls-sspi.c:1295
+#: cups/tls-darwin.c:1675 cups/tls-sspi.c:1275 cups/tls-sspi.c:1292
 msgid "Unable to establish a secure connection to host."
 msgstr ""
 
-#: cgi-bin/ipp-var.c:351
+#: cgi-bin/ipp-var.c:347
 msgid "Unable to find destination for job"
 msgstr ""
 
-#: cups/http-support.c:1955
+#: cups/http-support.c:1946
 msgid "Unable to find printer."
 msgstr ""
 
@@ -7004,162 +7022,162 @@ msgstr ""
 msgid "Unable to find server credentials."
 msgstr ""
 
-#: backend/ipp.c:3311
+#: backend/ipp.c:3309
 msgid "Unable to get backend exit status."
 msgstr ""
 
-#: cgi-bin/classes.c:430
+#: cgi-bin/classes.c:426
 msgid "Unable to get class list"
 msgstr ""
 
-#: cgi-bin/classes.c:529
+#: cgi-bin/classes.c:525
 msgid "Unable to get class status"
 msgstr ""
 
-#: cgi-bin/admin.c:1297
+#: cgi-bin/admin.c:1088
 msgid "Unable to get list of printer drivers"
 msgstr ""
 
-#: cgi-bin/admin.c:2824
+#: cgi-bin/admin.c:2533
 msgid "Unable to get printer attributes"
 msgstr ""
 
-#: cgi-bin/printers.c:447
+#: cgi-bin/printers.c:443
 msgid "Unable to get printer list"
 msgstr ""
 
-#: cgi-bin/printers.c:549
+#: cgi-bin/printers.c:545
 msgid "Unable to get printer status"
 msgstr ""
 
-#: backend/ipp.c:1024
+#: backend/ipp.c:1022
 msgid "Unable to get printer status."
 msgstr ""
 
-#: cups/adminutil.c:553 cups/adminutil.c:757
+#: cups/adminutil.c:547 cups/adminutil.c:751
 #, c-format
 msgid "Unable to install Windows 2000 printer driver files (%d)."
 msgstr ""
 
-#: cups/adminutil.c:627
+#: cups/adminutil.c:621
 #, c-format
 msgid "Unable to install Windows 9x printer driver files (%d)."
 msgstr ""
 
-#: cgi-bin/help.c:86
+#: cgi-bin/help.c:82
 msgid "Unable to load help index."
 msgstr ""
 
-#: backend/network.c:74
+#: backend/network.c:72
 #, c-format
 msgid "Unable to locate printer \"%s\"."
 msgstr ""
 
-#: backend/dnssd.c:785 backend/ipp.c:342 backend/lpd.c:191
-#: backend/socket.c:160
+#: backend/dnssd.c:783 backend/ipp.c:340 backend/lpd.c:189
+#: backend/socket.c:158
 msgid "Unable to locate printer."
 msgstr ""
 
-#: cgi-bin/admin.c:787
+#: cgi-bin/admin.c:581
 msgid "Unable to modify class"
 msgstr ""
 
-#: cgi-bin/admin.c:1033 cgi-bin/admin.c:1402
+#: cgi-bin/admin.c:824 cgi-bin/admin.c:1193
 msgid "Unable to modify printer"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:418 cgi-bin/ipp-var.c:507
+#: cgi-bin/ipp-var.c:414 cgi-bin/ipp-var.c:503
 msgid "Unable to move job"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:420 cgi-bin/ipp-var.c:509
+#: cgi-bin/ipp-var.c:416 cgi-bin/ipp-var.c:505
 msgid "Unable to move jobs"
 msgstr ""
 
-#: cgi-bin/admin.c:3170 cups/ppd.c:314
+#: cgi-bin/admin.c:2879 cups/ppd.c:302
 msgid "Unable to open PPD file"
 msgstr ""
 
-#: cgi-bin/admin.c:2592
+#: cgi-bin/admin.c:2301
 msgid "Unable to open cupsd.conf file:"
 msgstr ""
 
-#: backend/usb-unix.c:132
+#: backend/usb-unix.c:130
 msgid "Unable to open device file"
 msgstr ""
 
-#: scheduler/ipp.c:6334
+#: scheduler/ipp.c:6340
 #, c-format
 msgid "Unable to open document #%d in job #%d."
 msgstr ""
 
-#: cgi-bin/help.c:358
+#: cgi-bin/help.c:354
 msgid "Unable to open help file."
 msgstr ""
 
-#: backend/ipp.c:384 backend/ipp.c:1595 backend/ipp.c:1808 backend/lpd.c:479
-#: backend/socket.c:147 backend/usb.c:229 filter/gziptoany.c:71
-#: filter/pstops.c:268
+#: backend/ipp.c:382 backend/ipp.c:1593 backend/ipp.c:1806 backend/lpd.c:477
+#: backend/socket.c:145 backend/usb.c:227 filter/gziptoany.c:65
+#: filter/pstops.c:262
 msgid "Unable to open print file"
 msgstr ""
 
-#: filter/rastertoepson.c:1017 filter/rastertohp.c:687
-#: filter/rastertolabel.c:1131
+#: filter/rastertoepson.c:1011 filter/rastertohp.c:681
+#: filter/rastertolabel.c:1125
 msgid "Unable to open raster file"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:781
+#: cgi-bin/ipp-var.c:777
 msgid "Unable to print test page"
 msgstr ""
 
-#: backend/runloop.c:83 backend/runloop.c:312 backend/usb-darwin.c:636
-#: backend/usb-darwin.c:680 backend/usb-libusb.c:416 backend/usb-libusb.c:451
+#: backend/runloop.c:81 backend/runloop.c:310 backend/usb-darwin.c:636
+#: backend/usb-darwin.c:680 backend/usb-libusb.c:412 backend/usb-libusb.c:447
 msgid "Unable to read print data."
 msgstr ""
 
-#: scheduler/ipp.c:8623 scheduler/ipp.c:9866
+#: scheduler/ipp.c:8644 scheduler/ipp.c:9887
 msgid "Unable to rename job document file."
 msgstr ""
 
-#: cups/dest.c:3419
+#: cups/dest.c:3449
 msgid "Unable to resolve printer-uri."
 msgstr ""
 
-#: cups/adminutil.c:2136
+#: cups/adminutil.c:2130
 #, c-format
 msgid "Unable to run \"%s\": %s"
 msgstr ""
 
-#: filter/pstops.c:533
+#: filter/pstops.c:527
 msgid "Unable to see in file"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:584 cgi-bin/ipp-var.c:604
+#: cgi-bin/ipp-var.c:580 cgi-bin/ipp-var.c:600
 msgid "Unable to send command to printer driver"
 msgstr ""
 
-#: backend/usb-darwin.c:758 backend/usb-libusb.c:527
+#: backend/usb-darwin.c:758 backend/usb-libusb.c:523
 msgid "Unable to send data to printer."
 msgstr ""
 
-#: cups/adminutil.c:809
+#: cups/adminutil.c:803
 #, c-format
 msgid "Unable to set Windows printer driver (%d)."
 msgstr ""
 
-#: cgi-bin/admin.c:3791
+#: cgi-bin/admin.c:3500
 msgid "Unable to set options"
 msgstr ""
 
-#: cgi-bin/admin.c:3061
+#: cgi-bin/admin.c:2770
 msgid "Unable to set server default"
 msgstr ""
 
-#: backend/ipp.c:3170 backend/ipp.c:3247 backend/ipp.c:3255
+#: backend/ipp.c:3168 backend/ipp.c:3245 backend/ipp.c:3253
 msgid "Unable to start backend process."
 msgstr ""
 
-#: cgi-bin/admin.c:1896
+#: cgi-bin/admin.c:1605
 msgid "Unable to upload cupsd.conf file"
 msgstr ""
 
@@ -7167,177 +7185,177 @@ msgstr ""
 msgid "Unable to use legacy USB class driver."
 msgstr ""
 
-#: backend/runloop.c:112 backend/runloop.c:367
+#: backend/runloop.c:110 backend/runloop.c:365
 msgid "Unable to write print data"
 msgstr ""
 
-#: filter/gziptoany.c:90
+#: filter/gziptoany.c:84
 #, c-format
 msgid "Unable to write uncompressed print data: %s"
 msgstr ""
 
-#: cups/http-support.c:1374
+#: cups/http-support.c:1365
 msgid "Unauthorized"
 msgstr ""
 
-#: cgi-bin/admin.c:3487
+#: cgi-bin/admin.c:3196
 msgid "Units"
 msgstr ""
 
-#: cups/http-support.c:1414 cups/http-support.c:1498 cups/ppd.c:341
+#: cups/http-support.c:1405 cups/http-support.c:1489 cups/ppd.c:329
 msgid "Unknown"
 msgstr ""
 
-#: filter/pstops.c:2188
+#: filter/pstops.c:2182
 #, c-format
 msgid "Unknown choice \"%s\" for option \"%s\"."
 msgstr ""
 
-#: backend/ipp.c:526
+#: backend/ipp.c:524
 #, c-format
 msgid "Unknown encryption option value: \"%s\"."
 msgstr ""
 
-#: backend/lpd.c:337
+#: backend/lpd.c:335
 #, c-format
 msgid "Unknown file order: \"%s\"."
 msgstr ""
 
-#: backend/lpd.c:308
+#: backend/lpd.c:306
 #, c-format
 msgid "Unknown format character: \"%c\"."
 msgstr ""
 
-#: cups/hash.c:233
+#: cups/hash.c:258
 msgid "Unknown hash algorithm."
 msgstr ""
 
-#: cups/dest-options.c:1024
+#: cups/dest-options.c:1116
 msgid "Unknown media size name."
 msgstr ""
 
-#: backend/ipp.c:590
+#: backend/ipp.c:588
 #, c-format
 msgid "Unknown option \"%s\" with value \"%s\"."
 msgstr ""
 
-#: filter/pstops.c:2171
+#: filter/pstops.c:2165
 #, c-format
 msgid "Unknown option \"%s\"."
 msgstr ""
 
-#: backend/lpd.c:323
+#: backend/lpd.c:321
 #, c-format
 msgid "Unknown print mode: \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:10801
+#: scheduler/ipp.c:10822
 #, c-format
 msgid "Unknown printer-error-policy \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:10784
+#: scheduler/ipp.c:10805
 #, c-format
 msgid "Unknown printer-op-policy \"%s\"."
 msgstr ""
 
-#: cups/http.c:2292
+#: cups/http.c:2307
 msgid "Unknown request method."
 msgstr ""
 
-#: cups/http.c:2312
+#: cups/http.c:2327
 msgid "Unknown request version."
 msgstr ""
 
-#: cups/http-support.c:1491
+#: cups/http-support.c:1482
 msgid "Unknown scheme in URI"
 msgstr ""
 
-#: cups/http-addrlist.c:821
+#: cups/http-addrlist.c:815
 msgid "Unknown service name."
 msgstr ""
 
-#: backend/ipp.c:555
+#: backend/ipp.c:553
 #, c-format
 msgid "Unknown version option value: \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:11260
+#: scheduler/ipp.c:11281
 #, c-format
 msgid "Unsupported 'compression' value \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:11290
+#: scheduler/ipp.c:11311
 #, c-format
 msgid "Unsupported 'document-format' value \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:11365
+#: scheduler/ipp.c:11386
 msgid "Unsupported 'job-name' value."
 msgstr ""
 
-#: scheduler/ipp.c:348
+#: scheduler/ipp.c:344
 #, c-format
 msgid "Unsupported character set \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:8430 scheduler/ipp.c:9678
+#: scheduler/ipp.c:8451 scheduler/ipp.c:9699
 #, c-format
 msgid "Unsupported compression \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:8566 scheduler/ipp.c:9831
+#: scheduler/ipp.c:8587 scheduler/ipp.c:9852
 #, c-format
 msgid "Unsupported document-format \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:9814
+#: scheduler/ipp.c:9835
 #, c-format
 msgid "Unsupported document-format \"%s/%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:1405
+#: scheduler/ipp.c:1403
 #, c-format
 msgid "Unsupported format \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:1503
+#: scheduler/ipp.c:1501
 msgid "Unsupported margins."
 msgstr ""
 
-#: cups/pwg-media.c:544
+#: cups/pwg-media.c:538
 msgid "Unsupported media value."
 msgstr ""
 
-#: filter/pstops.c:2453
+#: filter/pstops.c:2447
 #, c-format
 msgid "Unsupported number-up value %d, using number-up=1."
 msgstr ""
 
-#: filter/pstops.c:2487
+#: filter/pstops.c:2481
 #, c-format
 msgid "Unsupported number-up-layout value %s, using number-up-layout=lrtb."
 msgstr ""
 
-#: filter/pstops.c:2538
+#: filter/pstops.c:2532
 #, c-format
 msgid "Unsupported page-border value %s, using page-border=none."
 msgstr ""
 
-#: filter/rastertopwg.c:137 filter/rastertopwg.c:173 filter/rastertopwg.c:181
-#: filter/rastertopwg.c:190
+#: filter/rastertopwg.c:135 filter/rastertopwg.c:171 filter/rastertopwg.c:179
+#: filter/rastertopwg.c:188
 msgid "Unsupported raster data."
 msgstr ""
 
-#: cups/snmp.c:1066
+#: cups/snmp.c:1064
 msgid "Unsupported value type"
 msgstr ""
 
-#: cups/http-support.c:1389
+#: cups/http-support.c:1380
 msgid "Upgrade Required"
 msgstr ""
 
-#: systemv/lpadmin.c:635
+#: systemv/lpadmin.c:649
 msgid ""
 "Usage:\n"
 "\n"
@@ -7349,39 +7367,39 @@ msgid ""
 "                       [-u allow:user,user] [-u deny:user,user]"
 msgstr ""
 
-#: backend/dnssd.c:225 backend/ipp.c:331 backend/lpd.c:178
-#: backend/socket.c:124 backend/usb.c:175 filter/commandtops.c:61
-#: filter/gziptoany.c:44 filter/pstops.c:229 monitor/bcp.c:54
-#: monitor/tbcp.c:53
+#: backend/dnssd.c:223 backend/ipp.c:329 backend/lpd.c:176
+#: backend/socket.c:122 backend/usb.c:173 filter/commandtops.c:57
+#: filter/gziptoany.c:38 filter/pstops.c:223 monitor/bcp.c:48
+#: monitor/tbcp.c:47
 #, c-format
 msgid "Usage: %s job-id user title copies options [file]"
 msgstr ""
 
-#: systemv/cupsaddsmb.c:273
+#: systemv/cupsaddsmb.c:269
 msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
 msgstr ""
 
-#: systemv/cupsctl.c:193
+#: systemv/cupsctl.c:187
 msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
 msgstr ""
 
-#: scheduler/main.c:2100
+#: scheduler/main.c:2097
 msgid "Usage: cupsd [options]"
 msgstr ""
 
-#: scheduler/cupsfilter.c:1479
+#: scheduler/cupsfilter.c:1475
 msgid "Usage: cupsfilter [ options ] [ -- ] filename"
 msgstr ""
 
-#: systemv/cupstestdsc.c:417
+#: systemv/cupstestdsc.c:411
 msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
 msgstr ""
 
-#: systemv/cupstestppd.c:3855
+#: systemv/cupstestppd.c:3849
 msgid "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]"
 msgstr ""
 
-#: test/ippfind.c:2744
+#: test/ippfind.c:2750
 msgid ""
 "Usage: ippfind [options] regtype[,subtype][.domain.] ... [expression]\n"
 "       ippfind [options] name[.regtype[.domain.]] ... [expression]\n"
@@ -7389,15 +7407,15 @@ msgid ""
 "       ippfind --version"
 msgstr ""
 
-#: test/ipptool.c:5062
+#: test/ipptool.c:5225
 msgid "Usage: ipptool [options] URI filename [ ... filenameN ]"
 msgstr ""
 
-#: systemv/lpmove.c:125
+#: systemv/lpmove.c:121
 msgid "Usage: lpmove job/src dest"
 msgstr ""
 
-#: systemv/lpoptions.c:523
+#: systemv/lpoptions.c:519
 msgid ""
 "Usage: lpoptions [-h server] [-E] -d printer\n"
 "       lpoptions [-h server] [-E] [-p printer] -l\n"
@@ -7405,92 +7423,92 @@ msgid ""
 "       lpoptions [-h server] [-E] -x printer"
 msgstr ""
 
-#: berkeley/lpq.c:646
+#: berkeley/lpq.c:642
 msgid "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]"
 msgstr ""
 
-#: ppdc/ppdc.cxx:428
+#: ppdc/ppdc.cxx:424
 msgid "Usage: ppdc [options] filename.drv [ ... filenameN.drv ]"
 msgstr ""
 
-#: ppdc/ppdhtml.cxx:175
+#: ppdc/ppdhtml.cxx:171
 msgid "Usage: ppdhtml [options] filename.drv >filename.html"
 msgstr ""
 
-#: ppdc/ppdi.cxx:121
+#: ppdc/ppdi.cxx:117
 msgid "Usage: ppdi [options] filename.ppd [ ... filenameN.ppd ]"
 msgstr ""
 
-#: ppdc/ppdmerge.cxx:359
+#: ppdc/ppdmerge.cxx:355
 msgid "Usage: ppdmerge [options] filename.ppd [ ... filenameN.ppd ]"
 msgstr ""
 
-#: ppdc/ppdpo.cxx:245
+#: ppdc/ppdpo.cxx:241
 msgid "Usage: ppdpo [options] -o filename.po filename.drv [ ... filenameN.drv ]"
 msgstr ""
 
-#: backend/snmp.c:190
+#: backend/snmp.c:188
 msgid "Usage: snmp [host-or-ip-address]"
 msgstr ""
 
-#: cups/snmp.c:1018
+#: cups/snmp.c:1016
 msgid "Value uses indefinite length"
 msgstr ""
 
-#: cups/snmp.c:1003
+#: cups/snmp.c:1001
 msgid "VarBind uses indefinite length"
 msgstr ""
 
-#: cups/ppd-cache.c:3563
+#: cups/ppd-cache.c:3836
 msgid "Vellum Paper"
 msgstr ""
 
-#: cups/snmp.c:953
+#: cups/snmp.c:951
 msgid "Version uses indefinite length"
 msgstr ""
 
-#: backend/ipp.c:1975
+#: backend/ipp.c:1973
 msgid "Waiting for job to complete."
 msgstr ""
 
-#: backend/usb-darwin.c:429 backend/usb-darwin.c:483 backend/usb-libusb.c:223
+#: backend/usb-darwin.c:429 backend/usb-darwin.c:483 backend/usb-libusb.c:219
 msgid "Waiting for printer to become available."
 msgstr ""
 
-#: backend/socket.c:420
+#: backend/socket.c:418
 msgid "Waiting for printer to finish."
 msgstr ""
 
-#: cups/adminutil.c:781
+#: cups/adminutil.c:775
 msgid "Warning, no Windows 2000 printer drivers are installed."
 msgstr ""
 
-#: cups/ppd-cache.c:3488
+#: cups/ppd-cache.c:3761
 msgid "Waterproof Fabric"
 msgstr ""
 
-#: cups/http-support.c:1410
+#: cups/http-support.c:1401
 msgid "Web Interface is Disabled"
 msgstr ""
 
-#: cups/ppd-cache.c:3576
+#: cups/ppd-cache.c:3849
 msgid "Wet Film"
 msgstr ""
 
-#: cups/ppd-cache.c:3481
+#: cups/ppd-cache.c:3754
 msgid "Windowed Envelope"
 msgstr ""
 
-#: cups/ppd.c:1985
+#: cups/ppd.c:1973
 msgid "Yes"
 msgstr ""
 
-#: scheduler/client.c:2236
+#: scheduler/client.c:2232
 #, c-format
 msgid "You must access this page using the URL <A HREF=\"https://%s:%d%s\">https://%s:%d%s</A>."
 msgstr ""
 
-#: cups/ppd-cache.c:3004
+#: cups/ppd-cache.c:3069
 msgid "Z Fold"
 msgstr ""
 
@@ -7502,1092 +7520,1113 @@ msgstr ""
 msgid "Zebra"
 msgstr ""
 
-#: cups/notify.c:94
+#: cups/notify.c:88
 msgid "aborted"
 msgstr ""
 
-#: cups/notify.c:91
+#: cups/notify.c:85
 msgid "canceled"
 msgstr ""
 
-#: cups/notify.c:97
+#: cups/notify.c:91
 msgid "completed"
 msgstr ""
 
-#: scheduler/ipp.c:6206
+#: scheduler/ipp.c:6212
 msgid "cups-deviced failed to execute."
 msgstr ""
 
-#: scheduler/ipp.c:7092 scheduler/ipp.c:7331
+#: scheduler/ipp.c:7098 scheduler/ipp.c:7337
 msgid "cups-driverd failed to execute."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:225
+#: systemv/cupsaddsmb.c:221
 #, c-format
 msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
 msgstr ""
 
-#: systemv/cupsctl.c:134
+#: systemv/cupsctl.c:128
 msgid "cupsctl: Cannot set Listen or Port directly."
 msgstr ""
 
-#: systemv/cupsctl.c:145
+#: systemv/cupsctl.c:139
 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
 msgstr ""
 
-#: systemv/cupsctl.c:188
+#: systemv/cupsctl.c:182
 #, c-format
 msgid "cupsctl: Unknown option \"%s\""
 msgstr ""
 
-#: systemv/cupsctl.c:190
+#: systemv/cupsctl.c:184
 #, c-format
 msgid "cupsctl: Unknown option \"-%c\""
 msgstr ""
 
-#: scheduler/main.c:178
+#: scheduler/main.c:175
 msgid "cupsd: Expected config filename after \"-c\" option."
 msgstr ""
 
-#: scheduler/main.c:274
+#: scheduler/main.c:271
 msgid "cupsd: Expected cups-files.conf filename after \"-s\" option."
 msgstr ""
 
-#: scheduler/main.c:248
+#: scheduler/main.c:245
 msgid "cupsd: On-demand support not compiled in, running in normal mode."
 msgstr ""
 
-#: scheduler/main.c:285
+#: scheduler/main.c:282
 msgid "cupsd: Relative cups-files.conf filename not allowed."
 msgstr ""
 
-#: scheduler/main.c:209 scheduler/main.c:216
+#: scheduler/main.c:206 scheduler/main.c:213
 msgid "cupsd: Unable to get current directory."
 msgstr ""
 
-#: scheduler/main.c:341 scheduler/main.c:350
+#: scheduler/main.c:338 scheduler/main.c:347
 msgid "cupsd: Unable to get path to cups-files.conf file."
 msgstr ""
 
-#: scheduler/main.c:323
+#: scheduler/main.c:320
 #, c-format
 msgid "cupsd: Unknown argument \"%s\" - aborting."
 msgstr ""
 
-#: scheduler/main.c:316
+#: scheduler/main.c:313
 #, c-format
 msgid "cupsd: Unknown option \"%c\" - aborting."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1261
+#: scheduler/cupsfilter.c:1257
 #, c-format
 msgid "cupsfilter: Invalid document number %d."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1255
+#: scheduler/cupsfilter.c:1251
 #, c-format
 msgid "cupsfilter: Invalid job ID %d."
 msgstr ""
 
-#: scheduler/cupsfilter.c:346
+#: scheduler/cupsfilter.c:342
 msgid "cupsfilter: Only one filename can be specified."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1303
+#: scheduler/cupsfilter.c:1299
 #, c-format
 msgid "cupsfilter: Unable to get job file - %s"
 msgstr ""
 
-#: systemv/cupstestppd.c:239
+#: systemv/cupstestppd.c:233
 msgid "cupstestppd: The -q option is incompatible with the -v option."
 msgstr ""
 
-#: systemv/cupstestppd.c:255
+#: systemv/cupstestppd.c:249
 msgid "cupstestppd: The -v option is incompatible with the -q option."
 msgstr ""
 
-#: systemv/lpstat.c:1265 systemv/lpstat.c:1268 systemv/lpstat.c:1271
+#: systemv/lpstat.c:1261 systemv/lpstat.c:1264 systemv/lpstat.c:1267
 #, c-format
 msgid "device for %s/%s: %s"
 msgstr ""
 
-#: systemv/lpstat.c:1251 systemv/lpstat.c:1254 systemv/lpstat.c:1257
+#: systemv/lpstat.c:1247 systemv/lpstat.c:1250 systemv/lpstat.c:1253
 #, c-format
 msgid "device for %s: %s"
 msgstr ""
 
-#: cups/snmp.c:990
+#: cups/snmp.c:988
 msgid "error-index uses indefinite length"
 msgstr ""
 
-#: cups/snmp.c:982
+#: cups/snmp.c:980
 msgid "error-status uses indefinite length"
 msgstr ""
 
-#: cups/notify.c:82
+#: cups/notify.c:76
 msgid "held"
 msgstr ""
 
-#: berkeley/lpc.c:199
+#: berkeley/lpc.c:195
 msgid "help\t\tGet help on commands."
 msgstr ""
 
-#: cups/notify.c:123
+#: cups/notify.c:117
 msgid "idle"
 msgstr ""
 
-#: test/ippfind.c:2463
+#: test/ippfind.c:2469
 #, c-format
 msgid "ippfind: Bad regular expression: %s"
 msgstr ""
 
-#: test/ippfind.c:326
+#: test/ippfind.c:321
 msgid "ippfind: Cannot use --and after --or."
 msgstr ""
 
-#: test/ippfind.c:599
+#: test/ippfind.c:594
 #, c-format
 msgid "ippfind: Expected key name after %s."
 msgstr ""
 
-#: test/ippfind.c:549 test/ippfind.c:732
+#: test/ippfind.c:544 test/ippfind.c:727
 #, c-format
 msgid "ippfind: Expected port range after %s."
 msgstr ""
 
-#: test/ippfind.c:359
+#: test/ippfind.c:354
 #, c-format
 msgid "ippfind: Expected program after %s."
 msgstr ""
 
-#: test/ippfind.c:376
+#: test/ippfind.c:371
 #, c-format
 msgid "ippfind: Expected semi-colon after %s."
 msgstr ""
 
-#: test/ippfind.c:1963
+#: test/ippfind.c:1969
 msgid "ippfind: Missing close brace in substitution."
 msgstr ""
 
-#: test/ippfind.c:1051
+#: test/ippfind.c:1046
 msgid "ippfind: Missing close parenthesis."
 msgstr ""
 
-#: test/ippfind.c:333
+#: test/ippfind.c:328
 msgid "ippfind: Missing expression before \"--and\"."
 msgstr ""
 
-#: test/ippfind.c:446
+#: test/ippfind.c:441
 msgid "ippfind: Missing expression before \"--or\"."
 msgstr ""
 
-#: test/ippfind.c:869
+#: test/ippfind.c:864
 #, c-format
 msgid "ippfind: Missing key name after %s."
 msgstr ""
 
-#: test/ippfind.c:1022
+#: test/ippfind.c:1017
 msgid "ippfind: Missing open parenthesis."
 msgstr ""
 
-#: test/ippfind.c:899
+#: test/ippfind.c:894
 #, c-format
 msgid "ippfind: Missing program after %s."
 msgstr ""
 
-#: test/ippfind.c:345 test/ippfind.c:399 test/ippfind.c:428 test/ippfind.c:534
-#: test/ippfind.c:616 test/ippfind.c:631 test/ippfind.c:786 test/ippfind.c:801
-#: test/ippfind.c:824 test/ippfind.c:884
+#: test/ippfind.c:340 test/ippfind.c:394 test/ippfind.c:423 test/ippfind.c:529
+#: test/ippfind.c:611 test/ippfind.c:626 test/ippfind.c:781 test/ippfind.c:796
+#: test/ippfind.c:819 test/ippfind.c:879
 #, c-format
 msgid "ippfind: Missing regular expression after %s."
 msgstr ""
 
-#: test/ippfind.c:917
+#: test/ippfind.c:912
 #, c-format
 msgid "ippfind: Missing semi-colon after %s."
 msgstr ""
 
-#: test/ippfind.c:1910 test/ippfind.c:1935
+#: test/ippfind.c:1916 test/ippfind.c:1941
 msgid "ippfind: Out of memory."
 msgstr ""
 
-#: test/ippfind.c:995
+#: test/ippfind.c:990
 msgid "ippfind: Too many parenthesis."
 msgstr ""
 
-#: test/ippfind.c:1264 test/ippfind.c:1400 test/ippfind.c:2555
+#: test/ippfind.c:1278 test/ippfind.c:1406 test/ippfind.c:2561
 #, c-format
 msgid "ippfind: Unable to browse or resolve: %s"
 msgstr ""
 
-#: test/ippfind.c:2033 test/ippfind.c:2060
+#: test/ippfind.c:2039 test/ippfind.c:2066
 #, c-format
 msgid "ippfind: Unable to execute \"%s\": %s"
 msgstr ""
 
-#: test/ippfind.c:1141 test/ippfind.c:1149 test/ippfind.c:1160
+#: test/ippfind.c:1136 test/ippfind.c:1144 test/ippfind.c:1155
 #, c-format
 msgid "ippfind: Unable to use Bonjour: %s"
 msgstr ""
 
-#: test/ippfind.c:1992
+#: test/ippfind.c:1998
 #, c-format
 msgid "ippfind: Unknown variable \"{%s}\"."
 msgstr ""
 
-#: test/ipptool.c:320 test/ipptool.c:383 test/ipptool.c:542 test/ipptool.c:565
+#: test/ipptool.c:560 test/ipptool.c:583
+msgid "ipptool: \"-i\" and \"-n\" are incompatible with \"--ippserver\", \"-P\", and \"-X\"."
+msgstr ""
+
+#: test/ipptool.c:338 test/ipptool.c:401
 msgid "ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."
 msgstr ""
 
-#: test/ipptool.c:621
+#: test/ipptool.c:639
 #, c-format
 msgid "ipptool: Bad URI - %s."
 msgstr ""
 
-#: test/ipptool.c:535
+#: test/ipptool.c:553
 msgid "ipptool: Invalid seconds for \"-i\"."
 msgstr ""
 
-#: test/ipptool.c:602
+#: test/ipptool.c:620
 msgid "ipptool: May only specify a single URI."
 msgstr ""
 
-#: test/ipptool.c:557
+#: test/ipptool.c:575
 msgid "ipptool: Missing count for \"-n\"."
 msgstr ""
 
-#: test/ipptool.c:417
+#: test/ipptool.c:255
+msgid "ipptool: Missing filename for \"--ippserver\"."
+msgstr ""
+
+#: test/ipptool.c:435
 msgid "ipptool: Missing filename for \"-f\"."
 msgstr ""
 
-#: test/ipptool.c:398
+#: test/ipptool.c:416
 msgid "ipptool: Missing name=value for \"-d\"."
 msgstr ""
 
-#: test/ipptool.c:525
+#: test/ipptool.c:543
 msgid "ipptool: Missing seconds for \"-i\"."
 msgstr ""
 
-#: test/ipptool.c:647
+#: test/ipptool.c:665
 msgid "ipptool: URI required before test file."
 msgstr ""
 
-#: test/ipptool.c:583
+#: test/ipptool.c:601
 #, c-format
 msgid "ipptool: Unknown option \"-%c\"."
 msgstr ""
 
-#: scheduler/ipp.c:8096
+#: scheduler/ipp.c:8117
 msgid "job-printer-uri attribute missing."
 msgstr ""
 
-#: systemv/lpadmin.c:125 systemv/lpadmin.c:362
+#: systemv/lpadmin.c:121 systemv/lpadmin.c:377
 msgid "lpadmin: Class name can only contain printable characters."
 msgstr ""
 
-#: systemv/lpadmin.c:215
+#: systemv/lpadmin.c:211
 #, c-format
 msgid "lpadmin: Expected PPD after \"-%c\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:443
+#: systemv/lpadmin.c:458
 msgid "lpadmin: Expected allow/deny:userlist after \"-u\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:353
+#: systemv/lpadmin.c:368
 msgid "lpadmin: Expected class after \"-r\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:115
+#: systemv/lpadmin.c:111
 msgid "lpadmin: Expected class name after \"-c\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:537
+#: systemv/lpadmin.c:552
 msgid "lpadmin: Expected description after \"-D\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:473
+#: systemv/lpadmin.c:488
 msgid "lpadmin: Expected device URI after \"-v\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:550
+#: systemv/lpadmin.c:565
 msgid "lpadmin: Expected file type(s) after \"-I\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:194
+#: systemv/lpadmin.c:190
 msgid "lpadmin: Expected hostname after \"-h\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:569
+#: systemv/lpadmin.c:584
 msgid "lpadmin: Expected location after \"-L\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:266
+#: systemv/lpadmin.c:281
 msgid "lpadmin: Expected model after \"-m\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:401
+#: systemv/lpadmin.c:416
 msgid "lpadmin: Expected name after \"-R\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:286
+#: systemv/lpadmin.c:301
 msgid "lpadmin: Expected name=value after \"-o\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:306
+#: systemv/lpadmin.c:321
 msgid "lpadmin: Expected printer after \"-p\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:157
+#: systemv/lpadmin.c:153
 msgid "lpadmin: Expected printer name after \"-d\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:506
+#: systemv/lpadmin.c:521
 msgid "lpadmin: Expected printer or class after \"-x\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:942
+#: systemv/lpadmin.c:956
 msgid "lpadmin: No member names were seen."
 msgstr ""
 
-#: systemv/lpadmin.c:729
+#: systemv/lpadmin.c:743
 #, c-format
 msgid "lpadmin: Printer %s is already a member of class %s."
 msgstr ""
 
-#: systemv/lpadmin.c:956
+#: systemv/lpadmin.c:970
 #, c-format
 msgid "lpadmin: Printer %s is not a member of class %s."
 msgstr ""
 
-#: systemv/lpadmin.c:166 systemv/lpadmin.c:315 systemv/lpadmin.c:515
+#: systemv/lpadmin.c:162 systemv/lpadmin.c:330 systemv/lpadmin.c:530
 msgid "lpadmin: Printer name can only contain printable characters."
 msgstr ""
 
-#: systemv/lpadmin.c:99
+#: systemv/lpadmin.c:229
+msgid "lpadmin: System V interface scripts are no longer supported for security reasons."
+msgstr ""
+
+#: systemv/lpadmin.c:95
 msgid ""
 "lpadmin: Unable to add a printer to the class:\n"
 "         You must specify a printer name first."
 msgstr ""
 
-#: systemv/lpadmin.c:91 systemv/lpadmin.c:141 systemv/lpadmin.c:244
-#: systemv/lpadmin.c:328 systemv/lpadmin.c:377 systemv/lpadmin.c:489
-#: systemv/lpadmin.c:611
+#: systemv/lpadmin.c:87 systemv/lpadmin.c:137 systemv/lpadmin.c:259
+#: systemv/lpadmin.c:343 systemv/lpadmin.c:392 systemv/lpadmin.c:504
+#: systemv/lpadmin.c:633
 #, c-format
 msgid "lpadmin: Unable to connect to server: %s"
 msgstr ""
 
-#: systemv/lpadmin.c:1396
+#: systemv/lpadmin.c:1410
 msgid "lpadmin: Unable to create temporary file"
 msgstr ""
 
-#: systemv/lpadmin.c:385
+#: systemv/lpadmin.c:400
 msgid ""
 "lpadmin: Unable to delete option:\n"
 "         You must specify a printer name first."
 msgstr ""
 
-#: systemv/lpadmin.c:1388
+#: systemv/lpadmin.c:1402
 #, c-format
 msgid "lpadmin: Unable to open PPD \"%s\": %s on line %d."
 msgstr ""
 
-#: systemv/lpadmin.c:1408
+#: systemv/lpadmin.c:1422
 #, c-format
 msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 msgstr ""
 
-#: systemv/lpadmin.c:337
+#: systemv/lpadmin.c:352
 msgid ""
 "lpadmin: Unable to remove a printer from the class:\n"
 "         You must specify a printer name first."
 msgstr ""
 
-#: systemv/lpadmin.c:620
+#: systemv/lpadmin.c:622
 msgid ""
 "lpadmin: Unable to set the printer options:\n"
 "         You must specify a printer name first."
 msgstr ""
 
-#: systemv/lpadmin.c:456
+#: systemv/lpadmin.c:471
 #, c-format
 msgid "lpadmin: Unknown allow/deny option \"%s\"."
 msgstr ""
 
-#: systemv/lpadmin.c:585
+#: systemv/lpadmin.c:600
 #, c-format
 msgid "lpadmin: Unknown argument \"%s\"."
 msgstr ""
 
-#: systemv/lpadmin.c:578
+#: systemv/lpadmin.c:593
 #, c-format
 msgid "lpadmin: Unknown option \"%c\"."
 msgstr ""
 
-#: systemv/lpadmin.c:554
+#: systemv/lpadmin.c:569
 msgid "lpadmin: Warning - content type list ignored."
 msgstr ""
 
-#: berkeley/lpc.c:66 berkeley/lpc.c:94 berkeley/lpc.c:130
+#: berkeley/lpc.c:62 berkeley/lpc.c:90 berkeley/lpc.c:126
 msgid "lpc> "
 msgstr ""
 
-#: systemv/lpinfo.c:82
+#: systemv/lpinfo.c:78
 msgid "lpinfo: Expected 1284 device ID string after \"--device-id\"."
 msgstr ""
 
-#: systemv/lpinfo.c:129
+#: systemv/lpinfo.c:125
 msgid "lpinfo: Expected language after \"--language\"."
 msgstr ""
 
-#: systemv/lpinfo.c:144
+#: systemv/lpinfo.c:140
 msgid "lpinfo: Expected make and model after \"--make-and-model\"."
 msgstr ""
 
-#: systemv/lpinfo.c:159
+#: systemv/lpinfo.c:155
 msgid "lpinfo: Expected product string after \"--product\"."
 msgstr ""
 
-#: systemv/lpinfo.c:98
+#: systemv/lpinfo.c:94
 msgid "lpinfo: Expected scheme list after \"--exclude-schemes\"."
 msgstr ""
 
-#: systemv/lpinfo.c:114
+#: systemv/lpinfo.c:110
 msgid "lpinfo: Expected scheme list after \"--include-schemes\"."
 msgstr ""
 
-#: systemv/lpinfo.c:174
+#: systemv/lpinfo.c:170
 msgid "lpinfo: Expected timeout after \"--timeout\"."
 msgstr ""
 
-#: systemv/lpmove.c:133
+#: systemv/lpmove.c:129
 #, c-format
 msgid "lpmove: Unable to connect to server: %s"
 msgstr ""
 
-#: systemv/lpmove.c:118
+#: systemv/lpmove.c:114
 #, c-format
 msgid "lpmove: Unknown argument \"%s\"."
 msgstr ""
 
-#: systemv/lpoptions.c:150 systemv/lpoptions.c:168 systemv/lpoptions.c:247
+#: systemv/lpoptions.c:146 systemv/lpoptions.c:164 systemv/lpoptions.c:243
 msgid "lpoptions: No printers."
 msgstr ""
 
-#: systemv/lpoptions.c:224
+#: systemv/lpoptions.c:220
 #, c-format
 msgid "lpoptions: Unable to add printer or instance: %s"
 msgstr ""
 
-#: systemv/lpoptions.c:491
+#: systemv/lpoptions.c:487
 #, c-format
 msgid "lpoptions: Unable to get PPD file for %s: %s"
 msgstr ""
 
-#: systemv/lpoptions.c:499
+#: systemv/lpoptions.c:495
 #, c-format
 msgid "lpoptions: Unable to open PPD file for %s."
 msgstr ""
 
-#: systemv/lpoptions.c:96
+#: systemv/lpoptions.c:92
 msgid "lpoptions: Unknown printer or class."
 msgstr ""
 
-#: systemv/lpstat.c:1107
+#: systemv/lpstat.c:1103
 #, c-format
 msgid "lpstat: error - %s environment variable names non-existent destination \"%s\"."
 msgstr ""
 
-#: systemv/lpstat.c:1043
+#: systemv/lpstat.c:1039
 #, c-format
 msgid "members of class %s:"
 msgstr ""
 
-#: berkeley/lpq.c:558
+#: berkeley/lpq.c:554
 msgid "no entries"
 msgstr ""
 
-#: systemv/lpstat.c:1111
+#: systemv/lpstat.c:1107
 msgid "no system default destination"
 msgstr ""
 
-#: scheduler/ipp.c:5891
+#: scheduler/ipp.c:5897
 msgid "notify-events not specified."
 msgstr ""
 
-#: scheduler/ipp.c:2078 scheduler/ipp.c:5796
+#: scheduler/ipp.c:2076 scheduler/ipp.c:5802
 #, c-format
 msgid "notify-recipient-uri URI \"%s\" is already used."
 msgstr ""
 
-#: scheduler/ipp.c:2068 scheduler/ipp.c:5786
+#: scheduler/ipp.c:2066 scheduler/ipp.c:5792
 #, c-format
 msgid "notify-recipient-uri URI \"%s\" uses unknown scheme."
 msgstr ""
 
-#: cups/notify.c:79
+#: cups/notify.c:73
 msgid "pending"
 msgstr ""
 
-#: ppdc/ppdc.cxx:106 ppdc/ppdpo.cxx:85
+#: ppdc/ppdc.cxx:102 ppdc/ppdpo.cxx:81
 #, c-format
 msgid "ppdc: Adding include directory \"%s\"."
 msgstr ""
 
-#: ppdc/ppdpo.cxx:128
+#: ppdc/ppdpo.cxx:124
 #, c-format
 msgid "ppdc: Adding/updating UI text from %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:365
+#: ppdc/ppdc-source.cxx:361
 #, c-format
 msgid "ppdc: Bad boolean value (%s) on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-import.cxx:257
+#: ppdc/ppdc-import.cxx:253
 #, c-format
 msgid "ppdc: Bad font attribute: %s"
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1751
+#: ppdc/ppdc-source.cxx:1747
 #, c-format
 msgid "ppdc: Bad resolution name \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1068
+#: ppdc/ppdc-source.cxx:1064
 #, c-format
 msgid "ppdc: Bad status keyword %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1988
+#: ppdc/ppdc-source.cxx:1984
 #, c-format
 msgid "ppdc: Bad variable substitution ($%c) on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2673
+#: ppdc/ppdc-source.cxx:2669
 #, c-format
 msgid "ppdc: Choice found on line %d of %s with no Option."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1653
+#: ppdc/ppdc-source.cxx:1649
 #, c-format
 msgid "ppdc: Duplicate #po for locale %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:887
+#: ppdc/ppdc-source.cxx:883
 #, c-format
 msgid "ppdc: Expected a filter definition on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:910
+#: ppdc/ppdc-source.cxx:906
 #, c-format
 msgid "ppdc: Expected a program name on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:349
+#: ppdc/ppdc-source.cxx:345
 #, c-format
 msgid "ppdc: Expected boolean value on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1048
+#: ppdc/ppdc-source.cxx:1044
 #, c-format
 msgid "ppdc: Expected charset after Font on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:402
+#: ppdc/ppdc-source.cxx:398
 #, c-format
 msgid "ppdc: Expected choice code on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:390
+#: ppdc/ppdc-source.cxx:386
 #, c-format
 msgid "ppdc: Expected choice name/text on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:458
+#: ppdc/ppdc-source.cxx:454
 #, c-format
 msgid "ppdc: Expected color order for ColorModel on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:447
+#: ppdc/ppdc-source.cxx:443
 #, c-format
 msgid "ppdc: Expected colorspace for ColorModel on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:469
+#: ppdc/ppdc-source.cxx:465
 #, c-format
 msgid "ppdc: Expected compression for ColorModel on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:650
+#: ppdc/ppdc-source.cxx:646
 #, c-format
 msgid "ppdc: Expected constraints string for UIConstraints on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2859
+#: ppdc/ppdc-source.cxx:2855
 #, c-format
 msgid "ppdc: Expected driver type keyword following DriverType on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:781
+#: ppdc/ppdc-source.cxx:777
 #, c-format
 msgid "ppdc: Expected duplex type after Duplex on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1032
+#: ppdc/ppdc-source.cxx:1028
 #, c-format
 msgid "ppdc: Expected encoding after Font on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1644
+#: ppdc/ppdc-source.cxx:1640
 #, c-format
 msgid "ppdc: Expected filename after #po %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1160
+#: ppdc/ppdc-source.cxx:1156
 #, c-format
 msgid "ppdc: Expected group name/text on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2573
+#: ppdc/ppdc-source.cxx:2569
 #, c-format
 msgid "ppdc: Expected include filename on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1457
+#: ppdc/ppdc-source.cxx:1453
 #, c-format
 msgid "ppdc: Expected integer on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1636
+#: ppdc/ppdc-source.cxx:1632
 #, c-format
 msgid "ppdc: Expected locale after #po on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:308
+#: ppdc/ppdc-source.cxx:304
 #, c-format
 msgid "ppdc: Expected name after %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3231
+#: ppdc/ppdc-source.cxx:3227
 #, c-format
 msgid "ppdc: Expected name after FileName on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1013
+#: ppdc/ppdc-source.cxx:1009
 #, c-format
 msgid "ppdc: Expected name after Font on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3062
+#: ppdc/ppdc-source.cxx:3058
 #, c-format
 msgid "ppdc: Expected name after Manufacturer on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3095
+#: ppdc/ppdc-source.cxx:3091
 #, c-format
 msgid "ppdc: Expected name after MediaSize on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3185
+#: ppdc/ppdc-source.cxx:3181
 #, c-format
 msgid "ppdc: Expected name after ModelName on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3248
+#: ppdc/ppdc-source.cxx:3244
 #, c-format
 msgid "ppdc: Expected name after PCFileName on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1111
+#: ppdc/ppdc-source.cxx:1107
 #, c-format
 msgid "ppdc: Expected name/text after %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1200
+#: ppdc/ppdc-source.cxx:1196
 #, c-format
 msgid "ppdc: Expected name/text after Installable on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1737
+#: ppdc/ppdc-source.cxx:1733
 #, c-format
 msgid "ppdc: Expected name/text after Resolution on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:434
+#: ppdc/ppdc-source.cxx:430
 #, c-format
 msgid "ppdc: Expected name/text combination for ColorModel on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1529
+#: ppdc/ppdc-source.cxx:1525
 #, c-format
 msgid "ppdc: Expected option name/text on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1563
+#: ppdc/ppdc-source.cxx:1559
 #, c-format
 msgid "ppdc: Expected option section on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1541
+#: ppdc/ppdc-source.cxx:1537
 #, c-format
 msgid "ppdc: Expected option type on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1720
+#: ppdc/ppdc-source.cxx:1716
 #, c-format
 msgid "ppdc: Expected override field after Resolution on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-catalog.cxx:389 ppdc/ppdc-catalog.cxx:401
+#: ppdc/ppdc-catalog.cxx:385 ppdc/ppdc-catalog.cxx:397
 #, c-format
 msgid "ppdc: Expected quoted string on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:959
+#: ppdc/ppdc-source.cxx:955
 #, c-format
 msgid "ppdc: Expected real number on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:527
+#: ppdc/ppdc-source.cxx:523
 #, c-format
 msgid "ppdc: Expected resolution/mediatype following ColorProfile on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1818
+#: ppdc/ppdc-source.cxx:1814
 #, c-format
 msgid "ppdc: Expected resolution/mediatype following SimpleColorProfile on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:316
+#: ppdc/ppdc-source.cxx:312
 #, c-format
 msgid "ppdc: Expected selector after %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1056
+#: ppdc/ppdc-source.cxx:1052
 #, c-format
 msgid "ppdc: Expected status after Font on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2748
+#: ppdc/ppdc-source.cxx:2744
 #, c-format
 msgid "ppdc: Expected string after Copyright on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3351
+#: ppdc/ppdc-source.cxx:3347
 #, c-format
 msgid "ppdc: Expected string after Version on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:683
+#: ppdc/ppdc-source.cxx:679
 #, c-format
 msgid "ppdc: Expected two option names on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:327
+#: ppdc/ppdc-source.cxx:323
 #, c-format
 msgid "ppdc: Expected value after %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1040
+#: ppdc/ppdc-source.cxx:1036
 #, c-format
 msgid "ppdc: Expected version after Font on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:182
+#: ppdc/ppdc-source.cxx:178
 #, c-format
 msgid "ppdc: Invalid #include/#po filename \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:927
+#: ppdc/ppdc-source.cxx:923
 #, c-format
 msgid "ppdc: Invalid cost for filter on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:919
+#: ppdc/ppdc-source.cxx:915
 #, c-format
 msgid "ppdc: Invalid empty MIME type for filter on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:935
+#: ppdc/ppdc-source.cxx:931
 #, c-format
 msgid "ppdc: Invalid empty program name for filter on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1583
+#: ppdc/ppdc-source.cxx:1579
 #, c-format
 msgid "ppdc: Invalid option section \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1555
+#: ppdc/ppdc-source.cxx:1551
 #, c-format
 msgid "ppdc: Invalid option type \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc.cxx:244 ppdc/ppdpo.cxx:115
+#: ppdc/ppdc.cxx:240 ppdc/ppdpo.cxx:111
 #, c-format
 msgid "ppdc: Loading driver information file \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc.cxx:180
+#: ppdc/ppdc.cxx:176
 #, c-format
 msgid "ppdc: Loading messages for locale \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc.cxx:119
+#: ppdc/ppdc.cxx:115
 #, c-format
 msgid "ppdc: Loading messages from \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2366 ppdc/ppdc-source.cxx:2598
+#: ppdc/ppdc-source.cxx:2362 ppdc/ppdc-source.cxx:2594
 #, c-format
 msgid "ppdc: Missing #endif at end of \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2467 ppdc/ppdc-source.cxx:2502
-#: ppdc/ppdc-source.cxx:2532
+#: ppdc/ppdc-source.cxx:2463 ppdc/ppdc-source.cxx:2498
+#: ppdc/ppdc-source.cxx:2528
 #, c-format
 msgid "ppdc: Missing #if on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-catalog.cxx:466
+#: ppdc/ppdc-catalog.cxx:462
 #, c-format
 msgid "ppdc: Need a msgid line before any translation strings on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-driver.cxx:710
+#: ppdc/ppdc-driver.cxx:706
 #, c-format
 msgid "ppdc: No message catalog provided for locale %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1606 ppdc/ppdc-source.cxx:2836
-#: ppdc/ppdc-source.cxx:2922 ppdc/ppdc-source.cxx:3015
-#: ppdc/ppdc-source.cxx:3148 ppdc/ppdc-source.cxx:3281
+#: ppdc/ppdc-source.cxx:1602 ppdc/ppdc-source.cxx:2832
+#: ppdc/ppdc-source.cxx:2918 ppdc/ppdc-source.cxx:3011
+#: ppdc/ppdc-source.cxx:3144 ppdc/ppdc-source.cxx:3277
 #, c-format
 msgid "ppdc: Option %s defined in two different groups on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1599
+#: ppdc/ppdc-source.cxx:1595
 #, c-format
 msgid "ppdc: Option %s redefined with a different type on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:660
+#: ppdc/ppdc-source.cxx:656
 #, c-format
 msgid "ppdc: Option constraint must *name on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2449
+#: ppdc/ppdc-source.cxx:2445
 #, c-format
 msgid "ppdc: Too many nested #if's on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc.cxx:367
+#: ppdc/ppdc.cxx:363
 #, c-format
 msgid "ppdc: Unable to create PPD file \"%s\" - %s."
 msgstr ""
 
-#: ppdc/ppdc.cxx:259
+#: ppdc/ppdc.cxx:255
 #, c-format
 msgid "ppdc: Unable to create output directory %s: %s"
 msgstr ""
 
-#: ppdc/ppdc.cxx:280
+#: ppdc/ppdc.cxx:276
 #, c-format
 msgid "ppdc: Unable to create output pipes: %s"
 msgstr ""
 
-#: ppdc/ppdc.cxx:296 ppdc/ppdc.cxx:302
+#: ppdc/ppdc.cxx:292 ppdc/ppdc.cxx:298
 #, c-format
 msgid "ppdc: Unable to execute cupstestppd: %s"
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1685
+#: ppdc/ppdc-source.cxx:1681
 #, c-format
 msgid "ppdc: Unable to find #po file %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2605
+#: ppdc/ppdc-source.cxx:2601
 #, c-format
 msgid "ppdc: Unable to find include file \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc.cxx:191
+#: ppdc/ppdc.cxx:187
 #, c-format
 msgid "ppdc: Unable to find localization for \"%s\" - %s"
 msgstr ""
 
-#: ppdc/ppdc.cxx:128
+#: ppdc/ppdc.cxx:124
 #, c-format
 msgid "ppdc: Unable to load localization file \"%s\" - %s"
 msgstr ""
 
-#: ppdc/ppdc-file.cxx:41
+#: ppdc/ppdc-file.cxx:37
 #, c-format
 msgid "ppdc: Unable to open %s: %s"
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2009
+#: ppdc/ppdc-source.cxx:2005
 #, c-format
 msgid "ppdc: Undefined variable (%s) on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-catalog.cxx:483
+#: ppdc/ppdc-catalog.cxx:479
 #, c-format
 msgid "ppdc: Unexpected text on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2878
+#: ppdc/ppdc-source.cxx:2874
 #, c-format
 msgid "ppdc: Unknown driver type %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:861
+#: ppdc/ppdc-source.cxx:857
 #, c-format
 msgid "ppdc: Unknown duplex type \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3108
+#: ppdc/ppdc-source.cxx:3104
 #, c-format
 msgid "ppdc: Unknown media size \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-catalog.cxx:511
+#: ppdc/ppdc-catalog.cxx:507
 #, c-format
 msgid "ppdc: Unknown message catalog format for \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3362
+#: ppdc/ppdc-source.cxx:3358
 #, c-format
 msgid "ppdc: Unknown token \"%s\" seen on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:969
+#: ppdc/ppdc-source.cxx:965
 #, c-format
 msgid "ppdc: Unknown trailing characters in real number \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2119
+#: ppdc/ppdc-source.cxx:2115
 #, c-format
 msgid "ppdc: Unterminated string starting with %c on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc.cxx:358
+#: ppdc/ppdc.cxx:354
 #, c-format
 msgid "ppdc: Warning - overlapping filename \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc.cxx:373
+#: ppdc/ppdc.cxx:369
 #, c-format
 msgid "ppdc: Writing %s."
 msgstr ""
 
-#: ppdc/ppdc.cxx:141
+#: ppdc/ppdc.cxx:137
 #, c-format
 msgid "ppdc: Writing PPD files to directory \"%s\"."
 msgstr ""
 
-#: ppdc/ppdmerge.cxx:128
+#: ppdc/ppdmerge.cxx:124
 #, c-format
 msgid "ppdmerge: Bad LanguageVersion \"%s\" in %s."
 msgstr ""
 
-#: ppdc/ppdmerge.cxx:168
+#: ppdc/ppdmerge.cxx:164
 #, c-format
 msgid "ppdmerge: Ignoring PPD file %s."
 msgstr ""
 
-#: ppdc/ppdmerge.cxx:152
+#: ppdc/ppdmerge.cxx:148
 #, c-format
 msgid "ppdmerge: Unable to backup %s to %s - %s"
 msgstr ""
 
-#: systemv/lpstat.c:1810
+#: systemv/lpstat.c:1803
 #, c-format
 msgid "printer %s disabled since %s -"
 msgstr ""
 
-#: systemv/lpstat.c:1799
+#: systemv/lpstat.c:1795
+#, c-format
+msgid "printer %s is holding new jobs.  enabled since %s"
+msgstr ""
+
+#: systemv/lpstat.c:1797
 #, c-format
 msgid "printer %s is idle.  enabled since %s"
 msgstr ""
 
-#: systemv/lpstat.c:1804
+#: systemv/lpstat.c:1800
 #, c-format
 msgid "printer %s now printing %s-%d.  enabled since %s"
 msgstr ""
 
-#: systemv/lpstat.c:1929
+#: systemv/lpstat.c:1921
 #, c-format
 msgid "printer %s/%s disabled since %s -"
 msgstr ""
 
-#: systemv/lpstat.c:1915
+#: systemv/lpstat.c:1907
 #, c-format
 msgid "printer %s/%s is idle.  enabled since %s"
 msgstr ""
 
-#: systemv/lpstat.c:1922
+#: systemv/lpstat.c:1914
 #, c-format
 msgid "printer %s/%s now printing %s-%d.  enabled since %s"
 msgstr ""
 
-#: cups/notify.c:85 cups/notify.c:126
+#: cups/notify.c:79 cups/notify.c:120
 msgid "processing"
 msgstr ""
 
-#: systemv/lp.c:666
+#: systemv/lp.c:639
 #, c-format
 msgid "request id is %s-%d (%d file(s))"
 msgstr ""
 
-#: cups/snmp.c:974
+#: cups/snmp.c:972
 msgid "request-id uses indefinite length"
 msgstr ""
 
-#: systemv/lpstat.c:2057
+#: systemv/lpstat.c:2049
 msgid "scheduler is not running"
 msgstr ""
 
-#: systemv/lpstat.c:2053
+#: systemv/lpstat.c:2045
 msgid "scheduler is running"
 msgstr ""
 
-#: cups/adminutil.c:2207
+#: cups/adminutil.c:2201
 #, c-format
 msgid "stat of %s failed: %s"
 msgstr ""
 
-#: berkeley/lpc.c:201
+#: berkeley/lpc.c:197
 msgid "status\t\tShow status of daemon and queue."
 msgstr ""
 
-#: cups/notify.c:88 cups/notify.c:129
+#: cups/notify.c:82 cups/notify.c:123
 msgid "stopped"
 msgstr ""
 
-#: systemv/lpstat.c:1085
+#: systemv/lpstat.c:1081
 #, c-format
 msgid "system default destination: %s"
 msgstr ""
 
-#: systemv/lpstat.c:1082
+#: systemv/lpstat.c:1078
 #, c-format
 msgid "system default destination: %s/%s"
 msgstr ""
 
-#: cups/notify.c:100 cups/notify.c:132
+#: cups/notify.c:94 cups/notify.c:126
 msgid "unknown"
 msgstr ""
 
-#: cups/notify.c:109
+#: cups/notify.c:103
 msgid "untitled"
 msgstr ""
 
-#: cups/snmp.c:999
+#: cups/snmp.c:997
 msgid "variable-bindings uses indefinite length"
 msgstr ""
+
+#: cups/dest.c:1952
+msgid "~/.cups/lpoptions file names default destination that does not exist."
+msgstr ""
 msgid "accuracy-units"
 msgstr "Accuracy Units"
 msgid "accuracy-units.mm"
@@ -10055,41 +10094,41 @@ msgstr "Media Name"
 msgid "media-source"
 msgstr "Media Source"
 msgid "media-source.alternate"
-msgstr "Alternate"
+msgstr "Alternate Tray"
 msgid "media-source.alternate-roll"
 msgstr "Alternate Roll"
 msgid "media-source.auto"
-msgstr "Automatic"
+msgstr "Automatic Tray"
 msgid "media-source.bottom"
-msgstr "Bottom"
+msgstr "Bottom Tray"
 msgid "media-source.by-pass-tray"
 msgstr "By-pass Tray"
 msgid "media-source.center"
-msgstr "Center"
+msgstr "Center Tray"
 msgid "media-source.disc"
-msgstr "Disc"
+msgstr "Disc Feed"
 msgid "media-source.envelope"
-msgstr "Envelope"
+msgstr "Envelope Feed"
 msgid "media-source.hagaki"
-msgstr "Hagaki"
+msgstr "Hagaki Feed"
 msgid "media-source.large-capacity"
-msgstr "Large Capacity"
+msgstr "Large Capacity Tray"
 msgid "media-source.left"
-msgstr "Left"
+msgstr "Left Tray"
 msgid "media-source.main"
-msgstr "Main"
+msgstr "Main Tray"
 msgid "media-source.main-roll"
 msgstr "Main Roll"
 msgid "media-source.manual"
-msgstr "Manual"
+msgstr "Manual Feed"
 msgid "media-source.middle"
-msgstr "Middle"
+msgstr "Middle Tray"
 msgid "media-source.photo"
-msgstr "Photo"
+msgstr "Photo Tray"
 msgid "media-source.rear"
-msgstr "Rear"
+msgstr "Rear Tray"
 msgid "media-source.right"
-msgstr "Right"
+msgstr "Right Tray"
 msgid "media-source.roll-1"
 msgstr "Roll 1"
 msgid "media-source.roll-10"
@@ -10194,6 +10233,32 @@ msgid "media-type.cardstock"
 msgstr "Cardstock"
 msgid "media-type.cd"
 msgstr "CD"
+msgid "media-type.com.hp.advanced-photo"
+msgstr "Advanced Photo Paper"
+msgid "media-type.com.hp.brochure-glossy"
+msgstr "Glossy Brochure Paper"
+msgid "media-type.com.hp.brochure-matte"
+msgstr "Matte Brochure Paper"
+msgid "media-type.com.hp.cover-matte"
+msgstr "Matte Cover Paper"
+msgid "media-type.com.hp.ecosmart-lite"
+msgstr "Office Recycled Paper"
+msgid "media-type.com.hp.everyday-glossy"
+msgstr "Everyday Glossy Photo Paper"
+msgid "media-type.com.hp.everyday-matte"
+msgstr "Everyday Matte Paper"
+msgid "media-type.com.hp.extra-heavy"
+msgstr "Extra Heavyweight Paper"
+msgid "media-type.com.hp.intermediate"
+msgstr "Multipurpose Paper"
+msgid "media-type.com.hp.mid-weight"
+msgstr "Mid-Weight Paper"
+msgid "media-type.com.hp.premium-inkjet"
+msgstr "Premium Inkjet Paper"
+msgid "media-type.com.hp.premium-photo"
+msgstr "Premium Photo Glossy Paper"
+msgid "media-type.com.hp.premium-presentation-matte"
+msgstr "Premium Presentation Matte Paper"
 msgid "media-type.continuous"
 msgstr "Continuous"
 msgid "media-type.continuous-long"
@@ -10290,6 +10355,14 @@ msgid "media-type.image-setter-paper"
 msgstr "Image Setter Paper"
 msgid "media-type.imaging-cylinder"
 msgstr "Imaging Cylinder"
+msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii"
+msgstr "Photo Paper Plus Glossy II"
+msgid "media-type.jp.co.canon_photo-paper-pro-platinum"
+msgstr "Photo Paper Pro Platinum"
+msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii"
+msgstr "Photo Paper Plus Glossy II"
+msgid "media-type.jp.co.canon-photo-paper-pro-platinum"
+msgstr "Photo Paper Pro Platinum"
 msgid "media-type.labels"
 msgstr "Labels"
 msgid "media-type.labels-colored"

diff --git a/locale/cups.strings b/locale/cups.strings
index bd94a3d32bbedf32b1d4aa9a8ddbe722a00626cb..503e11eb3ad04f9c0e5b0b3d968708922a97c1e5 100644 (file)
--- a/locale/cups.strings
+++ b/locale/cups.strings
@@ -191,6 +191,7 @@
 "  --help                  Show help." = "  --help                  Show help.";
 "  --help                  Show this help." = "  --help                  Show this help.";
 "  --host regex            Match hostname to regular expression." = "  --host regex            Match hostname to regular expression.";
+"  --ippserver filename    Produce ippserver attribute file." = "  --ippserver filename    Produce ippserver attribute file.";
 "  --lf                    End lines with LF (UNIX/Linux/macOS)." = "  --lf                    End lines with LF (UNIX/Linux/macOS).";
 "  --list-filters          List filters that will be used." = "  --list-filters          List filters that will be used.";
 "  --local                 True if service is local." = "  --local                 True if service is local.";
@@ -366,6 +367,7 @@
 "%s: Bad printer URI \"%s\"." = "%s: Bad printer URI “%s”.";
 "%s: Bad version %s for \"-V\"." = "%s: Bad version %s for “-V”.";
 "%s: Don't know what to do." = "%s: Don’t know what to do.";
+"%s: Error - %s" = "%s: Error - %s";
 "%s: Error - %s environment variable names non-existent destination \"%s\"." = "%s: Error - %s environment variable names non-existent destination “%s”.";
 "%s: Error - add '/version=1.1' to server name." = "%s: Error - add ‘/version=1.1’ to server name.";
 "%s: Error - bad job ID." = "%s: Error - bad job ID.";
@@ -471,6 +473,7 @@
 "-9" = "-9";
 "-90" = "-90";
 "-95" = "-95";
+"/etc/cups/lpoptions file names default destination that does not exist." = "/etc/cups/lpoptions file names default destination that does not exist.";
 "0" = "0";
 "1" = "1";
 "1 inch/sec." = "1 inch/sec.";
@@ -688,7 +691,6 @@
 "Accordian Fold" = "Accordian Fold";
 "Add Class" = "Add Class";
 "Add Printer" = "Add Printer";
-"Add RSS Subscription" = "Add RSS Subscription";
 "Address" = "Address";
 "Administration" = "Administration";
 "Advanced Photo Paper" = "Advanced Photo Paper";
@@ -720,6 +722,7 @@
 "B8" = "B8";
 "B9" = "B9";
 "Back Print Film" = "Back Print Film";
+"Bad \"printer-id\" value %d." = "Bad “printer-id” value %d.";
 "Bad 'document-format' value \"%s\"." = "Bad ‘document-format’ value “%s”.";
 "Bad NULL dests pointer" = "Bad NULL dests pointer";
 "Bad OpenGroup" = "Bad OpenGroup";
@@ -760,7 +763,6 @@
 "Bad requesting-user-name value: %s" = "Bad requesting-user-name value: %s";
 "Bad resource in URI" = "Bad resource in URI";
 "Bad scheme in URI" = "Bad scheme in URI";
-"Bad subscription ID" = "Bad subscription ID";
 "Bad username in URI" = "Bad username in URI";
 "Bad value string" = "Bad value string";
 "Bad/empty URI" = "Bad/empty URI";
@@ -783,7 +785,6 @@
 "CMYK" = "CMYK";
 "CPCL Label Printer" = "CPCL Label Printer";
 "Cancel Jobs" = "Cancel Jobs";
-"Cancel RSS Subscription" = "Cancel RSS Subscription";
 "Canceling print job." = "Canceling print job.";
 "Cannot change printer-is-shared for remote queues." = "Cannot change printer-is-shared for remote queues.";
 "Cannot share a remote Kerberized printer." = "Cannot share a remote Kerberized printer.";
@@ -960,6 +961,7 @@
 "Film" = "Film";
 "Fine Envelope" = "Fine Envelope";
 "Finished page %d." = "Finished page %d.";
+"Finishing Preset" = "Finishing Preset";
 "Flexo Base" = "Flexo Base";
 "Flexo Photo Polymer" = "Flexo Photo Polymer";
 "Flute" = "Flute";
@@ -1083,6 +1085,7 @@
 "Jobs" = "Jobs";
 "Jog" = "Jog";
 "LPD/LPR Host or Printer" = "LPD/LPR Host or Printer";
+"LPDEST environment variable names default destination that does not exist." = "LPDEST environment variable names default destination that does not exist.";
 "Label Printer" = "Label Printer";
 "Label Top" = "Label Top";
 "Labels" = "Labels";
@@ -1199,6 +1202,7 @@
 "No authentication information provided." = "No authentication information provided.";
 "No common name specified." = "No common name specified.";
 "No community name" = "No community name";
+"No default destination." = "No default destination.";
 "No default printer." = "No default printer.";
 "No destinations added." = "No destinations added.";
 "No device URI found in argv[0] or in DEVICE_URI environment variable." = "No device URI found in argv[0] or in DEVICE_URI environment variable.";
@@ -1248,6 +1252,8 @@
 "Options Installed" = "Options Installed";
 "Options:" = "Options:";
 "Other" = "Other";
+"Other Media" = "Other Media";
+"Other Tray" = "Other Tray";
 "Out of date PPD cache file." = "Out of date PPD cache file.";
 "Out of memory." = "Out of memory.";
 "Output Mode" = "Output Mode";
@@ -1262,6 +1268,7 @@
 "PRC32K Long Edge" = "PRC32K Long Edge";
 "PRC32K Oversize" = "PRC32K Oversize";
 "PRC32K Oversize Long Edge" = "PRC32K Oversize Long Edge";
+"PRINTER environment variable names default destination that does not exist." = "PRINTER environment variable names default destination that does not exist.";
 "Packet does not contain a Get-Response-PDU" = "Packet does not contain a Get-Response-PDU";
 "Packet does not start with SEQUENCE" = "Packet does not start with SEQUENCE";
 "Paper" = "Paper";
@@ -1482,7 +1489,7 @@
 "The printer may be out of ink." = "The printer may be out of ink.";
 "The printer may be out of toner." = "The printer may be out of toner.";
 "The printer may not exist or is unavailable at this time." = "The printer may not exist or is unavailable at this time.";
-"The printer name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#)." = "The printer name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#).";
+"The printer name may only contain up to 127 printable characters and may not contain spaces, slashes (/ \\), quotes (' \"), question mark (?), or the pound sign (#)." = "The printer name may only contain up to 127 printable characters and may not contain spaces, slashes (/ \\), quotes (’ ″), question mark (?), or the pound sign (#).";
 "The printer or class does not exist." = "The printer or class does not exist.";
 "The printer or class is not shared." = "The printer or class is not shared.";
 "The printer's cover is open." = "The printer’s cover is open.";
@@ -1494,7 +1501,6 @@
 "The printer-uri attribute is required." = "The printer-uri attribute is required.";
 "The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"." = "The printer-uri must be of the form “ipp://HOSTNAME/classes/CLASSNAME”.";
 "The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"." = "The printer-uri must be of the form “ipp://HOSTNAME/printers/PRINTERNAME”.";
-"The subscription name may not contain spaces, slashes (/), question marks (?), or the pound sign (#)." = "The subscription name may not contain spaces, slashes (/), question marks (?), or the pound sign (#).";
 "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to enable it." = "The web interface is currently disabled. Run “cupsctl WebInterface=yes” to enable it.";
 "The which-jobs value \"%s\" is not supported." = "The which-jobs value “%s” is not supported.";
 "There are too many subscriptions." = "There are too many subscriptions.";
@@ -1548,7 +1554,6 @@
 "US Letter Small" = "US Letter Small";
 "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”.";
@@ -1556,7 +1561,6 @@
 "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 print job." = "Unable to cancel print job.";
 "Unable to change printer" = "Unable to change printer";
 "Unable to change printer-is-shared attribute" = "Unable to change printer-is-shared attribute";
@@ -1756,11 +1760,13 @@
 "ippfind: Unable to execute \"%s\": %s" = "ippfind: Unable to execute “%s”: %s";
 "ippfind: Unable to use Bonjour: %s" = "ippfind: Unable to use Bonjour: %s";
 "ippfind: Unknown variable \"{%s}\"." = "ippfind: Unknown variable “{%s}”.";
+"ipptool: \"-i\" and \"-n\" are incompatible with \"--ippserver\", \"-P\", and \"-X\"." = "ipptool: “-i” and “-n” are incompatible with “--ippserver”, “-P”, and “-X”.";
 "ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"." = "ipptool: “-i” and “-n” are incompatible with “-P” and “-X”.";
 "ipptool: Bad URI - %s." = "ipptool: Bad URI - %s.";
 "ipptool: Invalid seconds for \"-i\"." = "ipptool: Invalid seconds for “-i”.";
 "ipptool: May only specify a single URI." = "ipptool: May only specify a single URI.";
 "ipptool: Missing count for \"-n\"." = "ipptool: Missing count for “-n”.";
+"ipptool: Missing filename for \"--ippserver\"." = "ipptool: Missing filename for “--ippserver”.";
 "ipptool: Missing filename for \"-f\"." = "ipptool: Missing filename for “-f”.";
 "ipptool: Missing name=value for \"-d\"." = "ipptool: Missing name=value for “-d”.";
 "ipptool: Missing seconds for \"-i\"." = "ipptool: Missing seconds for “-i”.";
@@ -1787,6 +1793,7 @@
 "lpadmin: Printer %s is already a member of class %s." = "lpadmin: Printer %s is already a member of class %s.";
 "lpadmin: Printer %s is not a member of class %s." = "lpadmin: Printer %s is not a member of class %s.";
 "lpadmin: Printer name can only contain printable characters." = "lpadmin: Printer name can only contain printable characters.";
+"lpadmin: System V interface scripts are no longer supported for security reasons." = "lpadmin: System V interface scripts are no longer supported for security reasons.";
 "lpadmin: Unable to add a printer to the class:\n         You must specify a printer name first." = "lpadmin: Unable to add a printer to the class:\n         You must specify a printer name first.";
 "lpadmin: Unable to connect to server: %s" = "lpadmin: Unable to connect to server: %s";
 "lpadmin: Unable to create temporary file" = "lpadmin: Unable to create temporary file";
@@ -1917,6 +1924,7 @@
 "ppdmerge: Ignoring PPD file %s." = "ppdmerge: Ignoring PPD file %s.";
 "ppdmerge: Unable to backup %s to %s - %s" = "ppdmerge: Unable to backup %s to %s - %s";
 "printer %s disabled since %s -" = "printer %s disabled since %s -";
+"printer %s is holding new jobs.  enabled since %s" = "printer %s is holding new jobs.  enabled since %s";
 "printer %s is idle.  enabled since %s" = "printer %s is idle.  enabled since %s";
 "printer %s now printing %s-%d.  enabled since %s" = "printer %s now printing %s-%d.  enabled since %s";
 "printer %s/%s disabled since %s -" = "printer %s/%s disabled since %s -";
@@ -1935,6 +1943,7 @@
 "unknown" = "unknown";
 "untitled" = "untitled";
 "variable-bindings uses indefinite length" = "variable-bindings uses indefinite length";
+"~/.cups/lpoptions file names default destination that does not exist." = "~/.cups/lpoptions file names default destination that does not exist.";
 "accuracy-units" = "Accuracy Units";
 "accuracy-units.mm" = "Millimeters";
 "accuracy-units.nm" = "Nanometers";
@@ -2668,24 +2677,24 @@
 "media-size" = "Media Dimensions";
 "media-size-name" = "Media Name";
 "media-source" = "Media Source";
-"media-source.alternate" = "Alternate";
+"media-source.alternate" = "Alternate Tray";
 "media-source.alternate-roll" = "Alternate Roll";
-"media-source.auto" = "Automatic";
-"media-source.bottom" = "Bottom";
+"media-source.auto" = "Automatic Tray";
+"media-source.bottom" = "Bottom Tray";
 "media-source.by-pass-tray" = "By-pass Tray";
-"media-source.center" = "Center";
-"media-source.disc" = "Disc";
-"media-source.envelope" = "Envelope";
-"media-source.hagaki" = "Hagaki";
-"media-source.large-capacity" = "Large Capacity";
-"media-source.left" = "Left";
-"media-source.main" = "Main";
+"media-source.center" = "Center Tray";
+"media-source.disc" = "Disc Feed";
+"media-source.envelope" = "Envelope Feed";
+"media-source.hagaki" = "Hagaki Feed";
+"media-source.large-capacity" = "Large Capacity Tray";
+"media-source.left" = "Left Tray";
+"media-source.main" = "Main Tray";
 "media-source.main-roll" = "Main Roll";
-"media-source.manual" = "Manual";
-"media-source.middle" = "Middle";
-"media-source.photo" = "Photo";
-"media-source.rear" = "Rear";
-"media-source.right" = "Right";
+"media-source.manual" = "Manual Feed";
+"media-source.middle" = "Middle Tray";
+"media-source.photo" = "Photo Tray";
+"media-source.rear" = "Rear Tray";
+"media-source.right" = "Right Tray";
 "media-source.roll-1" = "Roll 1";
 "media-source.roll-10" = "Roll 10";
 "media-source.roll-2" = "Roll 2";
@@ -2738,6 +2747,19 @@
 "media-type.cardboard" = "Cardboard";
 "media-type.cardstock" = "Cardstock";
 "media-type.cd" = "CD";
+"media-type.com.hp.advanced-photo" = "Advanced Photo Paper";
+"media-type.com.hp.brochure-glossy" = "Glossy Brochure Paper";
+"media-type.com.hp.brochure-matte" = "Matte Brochure Paper";
+"media-type.com.hp.cover-matte" = "Matte Cover Paper";
+"media-type.com.hp.ecosmart-lite" = "Office Recycled Paper";
+"media-type.com.hp.everyday-glossy" = "Everyday Glossy Photo Paper";
+"media-type.com.hp.everyday-matte" = "Everyday Matte Paper";
+"media-type.com.hp.extra-heavy" = "Extra Heavyweight Paper";
+"media-type.com.hp.intermediate" = "Multipurpose Paper";
+"media-type.com.hp.mid-weight" = "Mid-Weight Paper";
+"media-type.com.hp.premium-inkjet" = "Premium Inkjet Paper";
+"media-type.com.hp.premium-photo" = "Premium Photo Glossy Paper";
+"media-type.com.hp.premium-presentation-matte" = "Premium Presentation Matte Paper";
 "media-type.continuous" = "Continuous";
 "media-type.continuous-long" = "Continuous Long";
 "media-type.continuous-short" = "Continuous Short";
@@ -2786,6 +2808,10 @@
 "media-type.gravure-cylinder" = "Gravure Cylinder";
 "media-type.image-setter-paper" = "Image Setter Paper";
 "media-type.imaging-cylinder" = "Imaging Cylinder";
+"media-type.jp.co.canon_photo-paper-plus-glossy-ii" = "Photo Paper Plus Glossy II";
+"media-type.jp.co.canon_photo-paper-pro-platinum" = "Photo Paper Pro Platinum";
+"media-type.jp.co.canon-photo-paper-plus-glossy-ii" = "Photo Paper Plus Glossy II";
+"media-type.jp.co.canon-photo-paper-pro-platinum" = "Photo Paper Pro Platinum";
 "media-type.labels" = "Labels";
 "media-type.labels-colored" = "Colored Labels";
 "media-type.labels-glossy" = "Glossy Labels";

diff --git a/locale/cups_ca.po b/locale/cups_ca.po
index cedbf3a62dadef373d3d13846341aedd090451b4..9e3eb1dad2611a0645bec0db3e49a4ef5b13b6cb 100644 (file)
--- a/locale/cups_ca.po
+++ b/locale/cups_ca.po
@@ -32,7 +32,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.4.6\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-10-23 17:48-0400\n"
+"POT-Creation-Date: 2017-11-30 11:38-0500\n"
 "PO-Revision-Date: 2012-09-29 11:21+0200\n"
 "Last-Translator: Àngel Mompó <mecatxis@gmail.com>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -978,6 +978,9 @@ msgstr ""
 msgid "  --host regex            Match hostname to regular expression."
 msgstr ""
 
+msgid "  --ippserver filename    Produce ippserver attribute file."
+msgstr ""
+
 msgid "  --lf                    End lines with LF (UNIX/Linux/macOS)."
 msgstr ""
 
@@ -1639,6 +1642,10 @@ msgstr ""
 msgid "%s: Don't know what to do."
 msgstr "%s: no sé que fer."
 
+#, c-format
+msgid "%s: Error - %s"
+msgstr ""
+
 #, c-format
 msgid ""
 "%s: Error - %s environment variable names non-existent destination \"%s\"."
@@ -2038,6 +2045,9 @@ msgstr "-90"
 msgid "-95"
 msgstr "-95"
 
+msgid "/etc/cups/lpoptions file names default destination that does not exist."
+msgstr ""
+
 msgid "0"
 msgstr "0"
 
@@ -2695,9 +2705,6 @@ msgstr "Afegeix una classe"
 msgid "Add Printer"
 msgstr "Afegeix una impressora"
 
-msgid "Add RSS Subscription"
-msgstr "Afegeix una subscripció RSS"
-
 msgid "Address"
 msgstr "Adreça"
 
@@ -2796,6 +2803,10 @@ msgstr "B9"
 msgid "Back Print Film"
 msgstr ""
 
+#, c-format
+msgid "Bad \"printer-id\" value %d."
+msgstr ""
+
 #, c-format
 msgid "Bad 'document-format' value \"%s\"."
 msgstr ""
@@ -2935,9 +2946,6 @@ msgstr ""
 msgid "Bad scheme in URI"
 msgstr ""
 
-msgid "Bad subscription ID"
-msgstr "L'identificador de la subscripció és incorrecte."
-
 msgid "Bad username in URI"
 msgstr ""
 
@@ -3005,9 +3013,6 @@ msgstr "Impressora d'etiquetes CPCL"
 msgid "Cancel Jobs"
 msgstr ""
 
-msgid "Cancel RSS Subscription"
-msgstr "Cancel·la la subscripció RSS"
-
 msgid "Canceling print job."
 msgstr "Es cancel·la feina."
 
@@ -3577,6 +3582,9 @@ msgstr ""
 msgid "Finished page %d."
 msgstr "S'ha acabat la pàgina %d."
 
+msgid "Finishing Preset"
+msgstr ""
+
 msgid "Flexo Base"
 msgstr ""
 
@@ -3959,6 +3967,10 @@ msgstr ""
 msgid "LPD/LPR Host or Printer"
 msgstr "Amfitrió o impressora LPD/LPR"
 
+msgid ""
+"LPDEST environment variable names default destination that does not exist."
+msgstr ""
+
 msgid "Label Printer"
 msgstr "Impressora d'etiquetes"
 
@@ -4321,6 +4333,9 @@ msgstr ""
 msgid "No community name"
 msgstr "Ho hi na cap nom de comunitat"
 
+msgid "No default destination."
+msgstr ""
+
 msgid "No default printer."
 msgstr "No hi ha cap impressora per defecte."
 
@@ -4475,6 +4490,12 @@ msgstr "Opcions:"
 msgid "Other"
 msgstr ""
 
+msgid "Other Media"
+msgstr ""
+
+msgid "Other Tray"
+msgstr ""
+
 msgid "Out of date PPD cache file."
 msgstr "El fitxer de memòria cau del PPD no està actualitzat."
 
@@ -4517,6 +4538,10 @@ msgstr "PRC32K gran"
 msgid "PRC32K Oversize Long Edge"
 msgstr "PRC32K gran costat llarg"
 
+msgid ""
+"PRINTER environment variable names default destination that does not exist."
+msgstr ""
+
 msgid "Packet does not contain a Get-Response-PDU"
 msgstr "El paquet no conté cap Get-Response-PDU"
 
@@ -5208,10 +5233,9 @@ msgstr ""
 
 msgid ""
 "The printer name may only contain up to 127 printable characters and may not "
-"contain spaces, slashes (/), or the pound sign (#)."
+"contain spaces, slashes (/ \\), quotes (' \"), question mark (?), or the "
+"pound sign (#)."
 msgstr ""
-"El nom de la impressora només pot tenir fins a 127 caràcters imprimibles i "
-"no pot contenir espais, barres (/) o el símbol coixinet (#)."
 
 msgid "The printer or class does not exist."
 msgstr "La impressora o la classe no existeix."
@@ -5252,13 +5276,6 @@ msgstr ""
 "El printer-uri ha de tenir la forma «ipp://NOMAMFITRIÓ/printers/"
 "NOMIMPRESSORA»."
 
-msgid ""
-"The subscription name may not contain spaces, slashes (/), question marks "
-"(?), or the pound sign (#)."
-msgstr ""
-"La subscripció no pot contenir espais, barres (/), interrogacions (?), o el "
-"símbol coixinet (#)."
-
 msgid ""
 "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to "
 "enable it."
@@ -5425,9 +5442,6 @@ msgstr "No es pot accedir al fitxer cups.conf"
 msgid "Unable to access help file."
 msgstr "No es pot accedir al fitxer d'ajuda."
 
-msgid "Unable to add RSS subscription"
-msgstr "No es pot afegir la subscripció RSS"
-
 msgid "Unable to add class"
 msgstr "No es pot afegir la classe"
 
@@ -5450,9 +5464,6 @@ msgstr "No s'ha pogut assignar memòria per la pàgina d'informació"
 msgid "Unable to allocate memory for pages array"
 msgstr "No s'ha pogut assignar memòria per la matriu de pàgines"
 
-msgid "Unable to cancel RSS subscription"
-msgstr "No es pot cancel·lar la subscripció RSS"
-
 msgid "Unable to cancel print job."
 msgstr "No es pot cancel·lar la feina d'impressió."
 
@@ -7432,6 +7443,11 @@ msgstr ""
 msgid "ippfind: Unknown variable \"{%s}\"."
 msgstr ""
 
+msgid ""
+"ipptool: \"-i\" and \"-n\" are incompatible with \"--ippserver\", \"-P\", "
+"and \"-X\"."
+msgstr ""
+
 msgid "ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."
 msgstr ""
 
@@ -7448,6 +7464,9 @@ msgstr "ipptool: heu d'especificar només un URI."
 msgid "ipptool: Missing count for \"-n\"."
 msgstr "ipptool: falta el comptador de «-n»."
 
+msgid "ipptool: Missing filename for \"--ippserver\"."
+msgstr ""
+
 msgid "ipptool: Missing filename for \"-f\"."
 msgstr "ipptool: falta el nom del fitxer a «-f»."
 
@@ -8011,6 +8030,11 @@ msgid "lpadmin: Printer name can only contain printable characters."
 msgstr ""
 "lpadmin: el nom de la impressora només pot contenir caràcters imprimibles."
 
+msgid ""
+"lpadmin: System V interface scripts are no longer supported for security "
+"reasons."
+msgstr ""
+
 msgid ""
 "lpadmin: Unable to add a printer to the class:\n"
 "         You must specify a printer name first."
@@ -8817,6 +8841,45 @@ msgstr "Cardstock"
 msgid "media-type.cd"
 msgstr "CD"
 
+msgid "media-type.com.hp.advanced-photo"
+msgstr "Advanced Photo Paper"
+
+msgid "media-type.com.hp.brochure-glossy"
+msgstr "Glossy Brochure Paper"
+
+msgid "media-type.com.hp.brochure-matte"
+msgstr "Matte Brochure Paper"
+
+msgid "media-type.com.hp.cover-matte"
+msgstr "Matte Cover Paper"
+
+msgid "media-type.com.hp.ecosmart-lite"
+msgstr "Office Recycled Paper"
+
+msgid "media-type.com.hp.everyday-glossy"
+msgstr "Everyday Glossy Photo Paper"
+
+msgid "media-type.com.hp.everyday-matte"
+msgstr "Everyday Matte Paper"
+
+msgid "media-type.com.hp.extra-heavy"
+msgstr "Extra Heavyweight Paper"
+
+msgid "media-type.com.hp.intermediate"
+msgstr "Multipurpose Paper"
+
+msgid "media-type.com.hp.mid-weight"
+msgstr "Mid-Weight Paper"
+
+msgid "media-type.com.hp.premium-inkjet"
+msgstr "Premium Inkjet Paper"
+
+msgid "media-type.com.hp.premium-photo"
+msgstr "Premium Photo Glossy Paper"
+
+msgid "media-type.com.hp.premium-presentation-matte"
+msgstr "Premium Presentation Matte Paper"
+
 msgid "media-type.continuous"
 msgstr "Continuous"
 
@@ -8961,6 +9024,18 @@ msgstr "Image Setter Paper"
 msgid "media-type.imaging-cylinder"
 msgstr "Imaging Cylinder"
 
+msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii"
+msgstr "Photo Paper Plus Glossy II"
+
+msgid "media-type.jp.co.canon-photo-paper-pro-platinum"
+msgstr "Photo Paper Pro Platinum"
+
+msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii"
+msgstr "Photo Paper Plus Glossy II"
+
+msgid "media-type.jp.co.canon_photo-paper-pro-platinum"
+msgstr "Photo Paper Pro Platinum"
+
 msgid "media-type.labels"
 msgstr "Labels"
 
@@ -10711,6 +10786,10 @@ msgstr "Standard"
 msgid "printer %s disabled since %s -"
 msgstr "la impressora %s està deshabilitada des de %s -"
 
+#, c-format
+msgid "printer %s is holding new jobs.  enabled since %s"
+msgstr ""
+
 #, c-format
 msgid "printer %s is idle.  enabled since %s"
 msgstr "la impressora %s està inactiva. Està activada des de %s"
@@ -13306,6 +13385,9 @@ msgstr "Z Dimension"
 msgid "z-offset"
 msgstr "Z Offset"
 
+msgid "~/.cups/lpoptions file names default destination that does not exist."
+msgstr ""
+
 #~ msgid "\tInterface: %s/interfaces/%s"
 #~ msgstr "\tInterfície: %s/interfícies/%s"
 
@@ -13410,12 +13492,21 @@ msgstr "Z Offset"
 #~ msgid "720dpi"
 #~ msgstr "720ppp"
 
+#~ msgid "Add RSS Subscription"
+#~ msgstr "Afegeix una subscripció RSS"
+
 #~ msgid "Address - 1 1/8 x 3 1/2\""
 #~ msgstr "Adreça - 1 1/8 x 3 1/2\""
 
 #~ msgid "Bad printer URI."
 #~ msgstr "L'URI de la impressora és incorrecte."
 
+#~ msgid "Bad subscription ID"
+#~ msgstr "L'identificador de la subscripció és incorrecte."
+
+#~ msgid "Cancel RSS Subscription"
+#~ msgstr "Cancel·la la subscripció RSS"
+
 #~ msgid "Enter old password:"
 #~ msgstr "Introduïu la contrasenya antiga:"
 
@@ -13582,9 +13673,29 @@ msgstr "Z Offset"
 #~ msgid "The printer is running low on toner."
 #~ msgstr "S'està acabant el tòner de la impressora."
 
+#~ msgid ""
+#~ "The printer name may only contain up to 127 printable characters and may "
+#~ "not contain spaces, slashes (/), or the pound sign (#)."
+#~ msgstr ""
+#~ "El nom de la impressora només pot tenir fins a 127 caràcters imprimibles "
+#~ "i no pot contenir espais, barres (/) o el símbol coixinet (#)."
+
+#~ msgid ""
+#~ "The subscription name may not contain spaces, slashes (/), question marks "
+#~ "(?), or the pound sign (#)."
+#~ msgstr ""
+#~ "La subscripció no pot contenir espais, barres (/), interrogacions (?), o "
+#~ "el símbol coixinet (#)."
+
 #~ msgid "There is a paper jam."
 #~ msgstr "S'ha encallat el paper."
 
+#~ msgid "Unable to add RSS subscription"
+#~ msgstr "No es pot afegir la subscripció RSS"
+
+#~ msgid "Unable to cancel RSS subscription"
+#~ msgstr "No es pot cancel·lar la subscripció RSS"
+
 #~ msgid "Unable to copy interface script - %s"
 #~ msgstr "No es pot copiar l'script de la interfície - %s"
 

diff --git a/locale/cups_cs.po b/locale/cups_cs.po
index 0f534146616e277efc850dfe362dd43f72578551..2601cb5ba929e32c9cdee25432014c796feddb30 100644 (file)
--- a/locale/cups_cs.po
+++ b/locale/cups_cs.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-10-23 17:48-0400\n"
+"POT-Creation-Date: 2017-11-30 11:38-0500\n"
 "PO-Revision-Date: 2012-09-14 10:26+0100\n"
 "Last-Translator: Jan Bartos <jan.bartos@madeta.cz>\n"
 "Language-Team: Czech\n"
@@ -831,6 +831,9 @@ msgstr ""
 msgid "  --host regex            Match hostname to regular expression."
 msgstr ""
 
+msgid "  --ippserver filename    Produce ippserver attribute file."
+msgstr ""
+
 msgid "  --lf                    End lines with LF (UNIX/Linux/macOS)."
 msgstr ""
 
@@ -1462,6 +1465,10 @@ msgstr ""
 msgid "%s: Don't know what to do."
 msgstr ""
 
+#, c-format
+msgid "%s: Error - %s"
+msgstr ""
+
 #, c-format
 msgid ""
 "%s: Error - %s environment variable names non-existent destination \"%s\"."
@@ -1851,6 +1858,9 @@ msgstr "-90"
 msgid "-95"
 msgstr "-95"
 
+msgid "/etc/cups/lpoptions file names default destination that does not exist."
+msgstr ""
+
 msgid "0"
 msgstr "0"
 
@@ -2504,9 +2514,6 @@ msgstr "Přidat třídu"
 msgid "Add Printer"
 msgstr "Přidat tiskárnu"
 
-msgid "Add RSS Subscription"
-msgstr "Přidat RSS předplatné"
-
 msgid "Address"
 msgstr "Adresa"
 
@@ -2604,6 +2611,10 @@ msgstr "B9"
 msgid "Back Print Film"
 msgstr ""
 
+#, c-format
+msgid "Bad \"printer-id\" value %d."
+msgstr ""
+
 #, c-format
 msgid "Bad 'document-format' value \"%s\"."
 msgstr ""
@@ -2743,9 +2754,6 @@ msgstr ""
 msgid "Bad scheme in URI"
 msgstr ""
 
-msgid "Bad subscription ID"
-msgstr ""
-
 msgid "Bad username in URI"
 msgstr ""
 
@@ -2813,9 +2821,6 @@ msgstr "Tiskárna štítků CPCL"
 msgid "Cancel Jobs"
 msgstr ""
 
-msgid "Cancel RSS Subscription"
-msgstr "Zrušit RSS předplatné"
-
 msgid "Canceling print job."
 msgstr ""
 
@@ -3375,6 +3380,9 @@ msgstr ""
 msgid "Finished page %d."
 msgstr ""
 
+msgid "Finishing Preset"
+msgstr ""
+
 msgid "Flexo Base"
 msgstr ""
 
@@ -3754,6 +3762,10 @@ msgstr ""
 msgid "LPD/LPR Host or Printer"
 msgstr "LPD/LPR hostitel nebo tiskárna"
 
+msgid ""
+"LPDEST environment variable names default destination that does not exist."
+msgstr ""
+
 msgid "Label Printer"
 msgstr "Tiskárna štítků"
 
@@ -4112,6 +4124,9 @@ msgstr ""
 msgid "No community name"
 msgstr "Žádný název komunity"
 
+msgid "No default destination."
+msgstr ""
+
 msgid "No default printer."
 msgstr ""
 
@@ -4263,6 +4278,12 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
+msgid "Other Media"
+msgstr ""
+
+msgid "Other Tray"
+msgstr ""
+
 msgid "Out of date PPD cache file."
 msgstr ""
 
@@ -4305,6 +4326,10 @@ msgstr ""
 msgid "PRC32K Oversize Long Edge"
 msgstr ""
 
+msgid ""
+"PRINTER environment variable names default destination that does not exist."
+msgstr ""
+
 msgid "Packet does not contain a Get-Response-PDU"
 msgstr "Packet neobsahuje \"Get-Response-PDU\""
 
@@ -4989,10 +5014,9 @@ msgstr ""
 
 msgid ""
 "The printer name may only contain up to 127 printable characters and may not "
-"contain spaces, slashes (/), or the pound sign (#)."
+"contain spaces, slashes (/ \\), quotes (' \"), question mark (?), or the "
+"pound sign (#)."
 msgstr ""
-"Název tiskárny může obsahovat až 127 tisknutelných znaků a nesmí obsahovat "
-"mezery, lomítka (/), nebo křížek (#)."
 
 msgid "The printer or class does not exist."
 msgstr ""
@@ -5031,13 +5055,6 @@ msgid ""
 msgstr ""
 "Tiskárna-URI musí být ve tvaru \"ipp://HOSTNAME/printers/PRINTERNAME\"."
 
-msgid ""
-"The subscription name may not contain spaces, slashes (/), question marks "
-"(?), or the pound sign (#)."
-msgstr ""
-"Název předplatného nesmí obsahovat mezery, lomítka (/), otazník (?), nebo "
-"křížek (#)."
-
 msgid ""
 "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to "
 "enable it."
@@ -5202,9 +5219,6 @@ msgstr "Nelze získat přístup k souboru \"cupsd.conf\""
 msgid "Unable to access help file."
 msgstr ""
 
-msgid "Unable to add RSS subscription"
-msgstr "Nelze přidat RSS předplatné"
-
 msgid "Unable to add class"
 msgstr "Nelze přidat třídu"
 
@@ -5227,9 +5241,6 @@ msgstr ""
 msgid "Unable to allocate memory for pages array"
 msgstr ""
 
-msgid "Unable to cancel RSS subscription"
-msgstr "Nelze zrušit RSS předplatné"
-
 msgid "Unable to cancel print job."
 msgstr ""
 
@@ -7162,6 +7173,11 @@ msgstr ""
 msgid "ippfind: Unknown variable \"{%s}\"."
 msgstr ""
 
+msgid ""
+"ipptool: \"-i\" and \"-n\" are incompatible with \"--ippserver\", \"-P\", "
+"and \"-X\"."
+msgstr ""
+
 msgid "ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."
 msgstr ""
 
@@ -7178,6 +7194,9 @@ msgstr ""
 msgid "ipptool: Missing count for \"-n\"."
 msgstr ""
 
+msgid "ipptool: Missing filename for \"--ippserver\"."
+msgstr ""
+
 msgid "ipptool: Missing filename for \"-f\"."
 msgstr ""
 
@@ -7740,6 +7759,11 @@ msgstr ""
 msgid "lpadmin: Printer name can only contain printable characters."
 msgstr ""
 
+msgid ""
+"lpadmin: System V interface scripts are no longer supported for security "
+"reasons."
+msgstr ""
+
 msgid ""
 "lpadmin: Unable to add a printer to the class:\n"
 "         You must specify a printer name first."
@@ -8530,6 +8554,45 @@ msgstr "Cardstock"
 msgid "media-type.cd"
 msgstr "CD"
 
+msgid "media-type.com.hp.advanced-photo"
+msgstr "Advanced Photo Paper"
+
+msgid "media-type.com.hp.brochure-glossy"
+msgstr "Glossy Brochure Paper"
+
+msgid "media-type.com.hp.brochure-matte"
+msgstr "Matte Brochure Paper"
+
+msgid "media-type.com.hp.cover-matte"
+msgstr "Matte Cover Paper"
+
+msgid "media-type.com.hp.ecosmart-lite"
+msgstr "Office Recycled Paper"
+
+msgid "media-type.com.hp.everyday-glossy"
+msgstr "Everyday Glossy Photo Paper"
+
+msgid "media-type.com.hp.everyday-matte"
+msgstr "Everyday Matte Paper"
+
+msgid "media-type.com.hp.extra-heavy"
+msgstr "Extra Heavyweight Paper"
+
+msgid "media-type.com.hp.intermediate"
+msgstr "Multipurpose Paper"
+
+msgid "media-type.com.hp.mid-weight"
+msgstr "Mid-Weight Paper"
+
+msgid "media-type.com.hp.premium-inkjet"
+msgstr "Premium Inkjet Paper"
+
+msgid "media-type.com.hp.premium-photo"
+msgstr "Premium Photo Glossy Paper"
+
+msgid "media-type.com.hp.premium-presentation-matte"
+msgstr "Premium Presentation Matte Paper"
+
 msgid "media-type.continuous"
 msgstr "Continuous"
 
@@ -8674,6 +8737,18 @@ msgstr "Image Setter Paper"
 msgid "media-type.imaging-cylinder"
 msgstr "Imaging Cylinder"
 
+msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii"
+msgstr "Photo Paper Plus Glossy II"
+
+msgid "media-type.jp.co.canon-photo-paper-pro-platinum"
+msgstr "Photo Paper Pro Platinum"
+
+msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii"
+msgstr "Photo Paper Plus Glossy II"
+
+msgid "media-type.jp.co.canon_photo-paper-pro-platinum"
+msgstr "Photo Paper Pro Platinum"
+
 msgid "media-type.labels"
 msgstr "Labels"
 
@@ -10395,6 +10470,10 @@ msgstr "Standard"
 msgid "printer %s disabled since %s -"
 msgstr ""
 
+#, c-format
+msgid "printer %s is holding new jobs.  enabled since %s"
+msgstr ""
+
 #, c-format
 msgid "printer %s is idle.  enabled since %s"
 msgstr ""
@@ -12990,9 +13069,18 @@ msgstr "Z Dimension"
 msgid "z-offset"
 msgstr "Z Offset"
 
+msgid "~/.cups/lpoptions file names default destination that does not exist."
+msgstr ""
+
 #~ msgid "720dpi"
 #~ msgstr "720 dpi"
 
+#~ msgid "Add RSS Subscription"
+#~ msgstr "Přidat RSS předplatné"
+
+#~ msgid "Cancel RSS Subscription"
+#~ msgstr "Zrušit RSS předplatné"
+
 #~ msgid "Enter old password:"
 #~ msgstr "Zadejte původní heslo:"
 
@@ -13020,6 +13108,26 @@ msgstr "Z Offset"
 #~ msgid "Stylus Photo Series"
 #~ msgstr "Stylus Photo Series"
 
+#~ msgid ""
+#~ "The printer name may only contain up to 127 printable characters and may "
+#~ "not contain spaces, slashes (/), or the pound sign (#)."
+#~ msgstr ""
+#~ "Název tiskárny může obsahovat až 127 tisknutelných znaků a nesmí "
+#~ "obsahovat mezery, lomítka (/), nebo křížek (#)."
+
+#~ msgid ""
+#~ "The subscription name may not contain spaces, slashes (/), question marks "
+#~ "(?), or the pound sign (#)."
+#~ msgstr ""
+#~ "Název předplatného nesmí obsahovat mezery, lomítka (/), otazník (?), nebo "
+#~ "křížek (#)."
+
+#~ msgid "Unable to add RSS subscription"
+#~ msgstr "Nelze přidat RSS předplatné"
+
+#~ msgid "Unable to cancel RSS subscription"
+#~ msgstr "Nelze zrušit RSS předplatné"
+
 #~ msgid "compression"
 #~ msgstr "Compression"
 

diff --git a/locale/cups_de.po b/locale/cups_de.po
index 322c936c237e929fe582b7ed6d1327bfdd5def72..358ddf77e0258502fc4b4577bb4414fb34d70155 100644 (file)
--- a/locale/cups_de.po
+++ b/locale/cups_de.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-10-23 17:48-0400\n"
+"POT-Creation-Date: 2017-11-30 11:38-0500\n"
 "PO-Revision-Date: 2017-10-25 14:57+0200\n"
 "Last-Translator: Michael Weghorn <m.weghorn@posteo.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -852,6 +852,9 @@ msgstr ""
 "  --host regex            Prüfe den Hostnamen auf Übereinstimmung mit "
 "Regulärem Audruck"
 
+msgid "  --ippserver filename    Produce ippserver attribute file."
+msgstr ""
+
 msgid "  --lf                    End lines with LF (UNIX/Linux/macOS)."
 msgstr "  --lf                    Zeilenenden mit LF (UNIX/Linux/macOS)."
 
@@ -1526,6 +1529,10 @@ msgstr "%s: Ungültige Version %s für \"-V\"."
 msgid "%s: Don't know what to do."
 msgstr "%s: Unklar was zu tun ist."
 
+#, c-format
+msgid "%s: Error - %s"
+msgstr ""
+
 #, c-format
 msgid ""
 "%s: Error - %s environment variable names non-existent destination \"%s\"."
@@ -1921,6 +1928,9 @@ msgstr "-90"
 msgid "-95"
 msgstr "-95"
 
+msgid "/etc/cups/lpoptions file names default destination that does not exist."
+msgstr ""
+
 msgid "0"
 msgstr "0"
 
@@ -2580,9 +2590,6 @@ msgstr "Klasse hinzufügen"
 msgid "Add Printer"
 msgstr "Drucker hinzufügen"
 
-msgid "Add RSS Subscription"
-msgstr "RSS-Abo hinzufügen"
-
 msgid "Address"
 msgstr "Adresse"
 
@@ -2680,6 +2687,10 @@ msgstr "DIN B9"
 msgid "Back Print Film"
 msgstr ""
 
+#, c-format
+msgid "Bad \"printer-id\" value %d."
+msgstr ""
+
 #, c-format
 msgid "Bad 'document-format' value \"%s\"."
 msgstr "Fehlerhafter 'document-format' Wert \"%s\"."
@@ -2819,9 +2830,6 @@ msgstr "Ungültige Resource in URI"
 msgid "Bad scheme in URI"
 msgstr "Ungültiges Scheman in URI"
 
-msgid "Bad subscription ID"
-msgstr "Ungültige Subskriptions-ID"
-
 msgid "Bad username in URI"
 msgstr "Ungültiger Benutzername in URI"
 
@@ -2889,9 +2897,6 @@ msgstr "CPCL Etikettendrucker"
 msgid "Cancel Jobs"
 msgstr "Druckaufträge abbrechen"
 
-msgid "Cancel RSS Subscription"
-msgstr "RSS-Abo widerrufen"
-
 msgid "Canceling print job."
 msgstr "Auftrag wird abgebrochen."
 
@@ -3455,6 +3460,9 @@ msgstr ""
 msgid "Finished page %d."
 msgstr "Seite %d fertiggestellt."
 
+msgid "Finishing Preset"
+msgstr ""
+
 msgid "Flexo Base"
 msgstr ""
 
@@ -3835,6 +3843,10 @@ msgstr ""
 msgid "LPD/LPR Host or Printer"
 msgstr "LPD/LPR-Host oder -Drucker"
 
+msgid ""
+"LPDEST environment variable names default destination that does not exist."
+msgstr ""
+
 msgid "Label Printer"
 msgstr "Etikettendrucker"
 
@@ -4193,6 +4205,9 @@ msgstr ""
 msgid "No community name"
 msgstr "Kein Community-Name"
 
+msgid "No default destination."
+msgstr ""
+
 msgid "No default printer."
 msgstr "Kein voreingestelltes Druckziel"
 
@@ -4347,6 +4362,12 @@ msgstr "Optionen:"
 msgid "Other"
 msgstr ""
 
+msgid "Other Media"
+msgstr ""
+
+msgid "Other Tray"
+msgstr ""
+
 msgid "Out of date PPD cache file."
 msgstr "Veraltete PPD Cache-Datei."
 
@@ -4389,6 +4410,10 @@ msgstr "PRCK32K Übergrösse"
 msgid "PRC32K Oversize Long Edge"
 msgstr "PRCK32K Übergrösse lange Kante"
 
+msgid ""
+"PRINTER environment variable names default destination that does not exist."
+msgstr ""
+
 msgid "Packet does not contain a Get-Response-PDU"
 msgstr "Paket enthält kein Get-Response-PDU"
 
@@ -5081,10 +5106,9 @@ msgstr "Der Drucker existiert nicht oder ist zur Zeit nicht verfügbar."
 
 msgid ""
 "The printer name may only contain up to 127 printable characters and may not "
-"contain spaces, slashes (/), or the pound sign (#)."
+"contain spaces, slashes (/ \\), quotes (' \"), question mark (?), or the "
+"pound sign (#)."
 msgstr ""
-"Der Druckername darf maximal 127 druckbare Zeichen haben und darf keine "
-"Leerzeichen, Schrägstriche (/) oder Rautezeichen (#) enthalten."
 
 msgid "The printer or class does not exist."
 msgstr "Der Drucker oder die Klasse existiert nicht."
@@ -5126,13 +5150,6 @@ msgstr ""
 "Die Drucker-URI muss in der folgenden Form vorliegen: ipp://HOSTNAME/"
 "printers/PRINTERNAME"
 
-msgid ""
-"The subscription name may not contain spaces, slashes (/), question marks "
-"(?), or the pound sign (#)."
-msgstr ""
-"Der Subkriptionsname darf keine Leerzeichen, Schrägstriche (/), Fragezeichen "
-"(?) oder Rautezeichen (#) enthalten."
-
 msgid ""
 "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to "
 "enable it."
@@ -5299,9 +5316,6 @@ msgstr "Kein Zugriff auf die Datei cupsd.conf"
 msgid "Unable to access help file."
 msgstr "Kein Zugriff auf die Hilfe-Datei."
 
-msgid "Unable to add RSS subscription"
-msgstr "RSS-Abo konnte nicht hinzugefügt werden:"
-
 msgid "Unable to add class"
 msgstr "Klasse konnte nicht hinzugefügt werden:"
 
@@ -5324,9 +5338,6 @@ msgstr "Speicher für Seiteninformation kann nicht belegt werden"
 msgid "Unable to allocate memory for pages array"
 msgstr "Speicher für Seitenmatrix kann nicht belegt werden"
 
-msgid "Unable to cancel RSS subscription"
-msgstr "RSS-Abo konnte nicht widerrufen werden:"
-
 msgid "Unable to cancel print job."
 msgstr "Druckauftrag kann nicht abgebrochen werden."
 
@@ -7293,6 +7304,11 @@ msgstr ""
 msgid "ippfind: Unknown variable \"{%s}\"."
 msgstr ""
 
+msgid ""
+"ipptool: \"-i\" and \"-n\" are incompatible with \"--ippserver\", \"-P\", "
+"and \"-X\"."
+msgstr ""
+
 msgid "ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."
 msgstr ""
 
@@ -7309,6 +7325,9 @@ msgstr ""
 msgid "ipptool: Missing count for \"-n\"."
 msgstr ""
 
+msgid "ipptool: Missing filename for \"--ippserver\"."
+msgstr ""
+
 msgid "ipptool: Missing filename for \"-f\"."
 msgstr ""
 
@@ -7872,6 +7891,11 @@ msgstr "lpadmin: Drucker %s ist kein Mitglied der Klasse %s."
 msgid "lpadmin: Printer name can only contain printable characters."
 msgstr "lpadmin: Druckername darf nur druckbare Zeichen enthalten."
 
+msgid ""
+"lpadmin: System V interface scripts are no longer supported for security "
+"reasons."
+msgstr ""
+
 msgid ""
 "lpadmin: Unable to add a printer to the class:\n"
 "         You must specify a printer name first."
@@ -8668,6 +8692,45 @@ msgstr "Cardstock"
 msgid "media-type.cd"
 msgstr "CD"
 
+msgid "media-type.com.hp.advanced-photo"
+msgstr "Advanced Photo Paper"
+
+msgid "media-type.com.hp.brochure-glossy"
+msgstr "Glossy Brochure Paper"
+
+msgid "media-type.com.hp.brochure-matte"
+msgstr "Matte Brochure Paper"
+
+msgid "media-type.com.hp.cover-matte"
+msgstr "Matte Cover Paper"
+
+msgid "media-type.com.hp.ecosmart-lite"
+msgstr "Office Recycled Paper"
+
+msgid "media-type.com.hp.everyday-glossy"
+msgstr "Everyday Glossy Photo Paper"
+
+msgid "media-type.com.hp.everyday-matte"
+msgstr "Everyday Matte Paper"
+
+msgid "media-type.com.hp.extra-heavy"
+msgstr "Extra Heavyweight Paper"
+
+msgid "media-type.com.hp.intermediate"
+msgstr "Multipurpose Paper"
+
+msgid "media-type.com.hp.mid-weight"
+msgstr "Mid-Weight Paper"
+
+msgid "media-type.com.hp.premium-inkjet"
+msgstr "Premium Inkjet Paper"
+
+msgid "media-type.com.hp.premium-photo"
+msgstr "Premium Photo Glossy Paper"
+
+msgid "media-type.com.hp.premium-presentation-matte"
+msgstr "Premium Presentation Matte Paper"
+
 msgid "media-type.continuous"
 msgstr "Continuous"
 
@@ -8812,6 +8875,18 @@ msgstr "Image Setter Paper"
 msgid "media-type.imaging-cylinder"
 msgstr "Imaging Cylinder"
 
+msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii"
+msgstr "Photo Paper Plus Glossy II"
+
+msgid "media-type.jp.co.canon-photo-paper-pro-platinum"
+msgstr "Photo Paper Pro Platinum"
+
+msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii"
+msgstr "Photo Paper Plus Glossy II"
+
+msgid "media-type.jp.co.canon_photo-paper-pro-platinum"
+msgstr "Photo Paper Pro Platinum"
+
 msgid "media-type.labels"
 msgstr "Labels"
 
@@ -10533,6 +10608,10 @@ msgstr "Standard"
 msgid "printer %s disabled since %s -"
 msgstr "Drucker %s ist deaktiviert seit %s"
 
+#, c-format
+msgid "printer %s is holding new jobs.  enabled since %s"
+msgstr ""
+
 #, c-format
 msgid "printer %s is idle.  enabled since %s"
 msgstr "Drucker %s ist im Leerlauf.  Aktiviert seit %s"
@@ -13128,6 +13207,9 @@ msgstr "Z Dimension"
 msgid "z-offset"
 msgstr "Z Offset"
 
+msgid "~/.cups/lpoptions file names default destination that does not exist."
+msgstr ""
+
 #~ msgid "\tInterface: %s/interfaces/%s"
 #~ msgstr "\tSchnittstelle: %s/interfaces/%s"
 
@@ -13153,6 +13235,15 @@ msgstr "Z Offset"
 #~ msgid "720dpi"
 #~ msgstr "720 dpi"
 
+#~ msgid "Add RSS Subscription"
+#~ msgstr "RSS-Abo hinzufügen"
+
+#~ msgid "Bad subscription ID"
+#~ msgstr "Ungültige Subskriptions-ID"
+
+#~ msgid "Cancel RSS Subscription"
+#~ msgstr "RSS-Abo widerrufen"
+
 #~ msgid "Enter old password:"
 #~ msgstr "Altes Passwort eingeben :"
 
@@ -13192,6 +13283,26 @@ msgstr "Z Offset"
 #~ msgid "Stylus Photo Series"
 #~ msgstr "Stylus Photo Serie"
 
+#~ msgid ""
+#~ "The printer name may only contain up to 127 printable characters and may "
+#~ "not contain spaces, slashes (/), or the pound sign (#)."
+#~ msgstr ""
+#~ "Der Druckername darf maximal 127 druckbare Zeichen haben und darf keine "
+#~ "Leerzeichen, Schrägstriche (/) oder Rautezeichen (#) enthalten."
+
+#~ msgid ""
+#~ "The subscription name may not contain spaces, slashes (/), question marks "
+#~ "(?), or the pound sign (#)."
+#~ msgstr ""
+#~ "Der Subkriptionsname darf keine Leerzeichen, Schrägstriche (/), "
+#~ "Fragezeichen (?) oder Rautezeichen (#) enthalten."
+
+#~ msgid "Unable to add RSS subscription"
+#~ msgstr "RSS-Abo konnte nicht hinzugefügt werden:"
+
+#~ msgid "Unable to cancel RSS subscription"
+#~ msgstr "RSS-Abo konnte nicht widerrufen werden:"
+
 #~ msgid "Unable to copy interface script - %s"
 #~ msgstr "Schnittstellenskript kann nicht kopiert werden - %s."
 

diff --git a/locale/cups_es.po b/locale/cups_es.po
index ef2c2d65f8fdb56bfd8fc7994d0456815e34e168..fd434749dcc81377ce4b697bfea3daffd7e4db76 100644 (file)
--- a/locale/cups_es.po
+++ b/locale/cups_es.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.2\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-10-23 17:48-0400\n"
+"POT-Creation-Date: 2017-11-30 11:38-0500\n"
 "PO-Revision-Date: 2016-06-26 21:17+0100\n"
 "Last-Translator: Juan Pablo González Riopedre <jpgriopedre@yahoo.es>\n"
 "Language-Team: Spanish\n"
@@ -977,6 +977,9 @@ msgstr ""
 "  --host regex            Hacer coincidir el nombre del equipo con la "
 "expresión regular."
 
+msgid "  --ippserver filename    Produce ippserver attribute file."
+msgstr ""
+
 msgid "  --lf                    End lines with LF (UNIX/Linux/macOS)."
 msgstr "  --lf                    Finalizar líneas con LF (UNIX/Linux/macOS)."
 
@@ -1669,6 +1672,10 @@ msgstr "%s: Versión %s incorrecta para \"-V\"."
 msgid "%s: Don't know what to do."
 msgstr "%s: No sé que hay que hacer."
 
+#, c-format
+msgid "%s: Error - %s"
+msgstr ""
+
 #, c-format
 msgid ""
 "%s: Error - %s environment variable names non-existent destination \"%s\"."
@@ -2068,6 +2075,9 @@ msgstr "-90"
 msgid "-95"
 msgstr "-95"
 
+msgid "/etc/cups/lpoptions file names default destination that does not exist."
+msgstr ""
+
 msgid "0"
 msgstr "0"
 
@@ -2724,9 +2734,6 @@ msgstr "Añadir clase"
 msgid "Add Printer"
 msgstr "Añadir impresora"
 
-msgid "Add RSS Subscription"
-msgstr "Añadir subscripción RSS"
-
 msgid "Address"
 msgstr "Dirección"
 
@@ -2826,6 +2833,10 @@ msgstr "B9"
 msgid "Back Print Film"
 msgstr ""
 
+#, c-format
+msgid "Bad \"printer-id\" value %d."
+msgstr ""
+
 #, c-format
 msgid "Bad 'document-format' value \"%s\"."
 msgstr "Valor 'document-format' \"%s\" incorrecto."
@@ -2965,9 +2976,6 @@ msgstr "Recurso incorrecto en URI"
 msgid "Bad scheme in URI"
 msgstr "Esquema incorrecto en URI"
 
-msgid "Bad subscription ID"
-msgstr "ID de subscripción incorrecto"
-
 msgid "Bad username in URI"
 msgstr "Nombre de usuario incorrecto en URI"
 
@@ -3035,9 +3043,6 @@ msgstr "Impresora de etiquetas CPCL"
 msgid "Cancel Jobs"
 msgstr "Cancelar trabajos"
 
-msgid "Cancel RSS Subscription"
-msgstr "Cancelar subscripción RSS"
-
 msgid "Canceling print job."
 msgstr "Cancelando trabajo de impresión."
 
@@ -3607,6 +3612,9 @@ msgstr ""
 msgid "Finished page %d."
 msgstr "Acabada la página %d."
 
+msgid "Finishing Preset"
+msgstr ""
+
 msgid "Flexo Base"
 msgstr ""
 
@@ -3986,6 +3994,10 @@ msgstr "Jog"
 msgid "LPD/LPR Host or Printer"
 msgstr "Equipo o impresora LPD/LPR"
 
+msgid ""
+"LPDEST environment variable names default destination that does not exist."
+msgstr ""
+
 msgid "Label Printer"
 msgstr "Impresora de etiquetas"
 
@@ -4348,6 +4360,9 @@ msgstr ""
 msgid "No community name"
 msgstr "No hay nombre de comunidad"
 
+msgid "No default destination."
+msgstr ""
+
 msgid "No default printer."
 msgstr "No hay impresora predeterminada."
 
@@ -4502,6 +4517,12 @@ msgstr "Opciones:"
 msgid "Other"
 msgstr "Otro"
 
+msgid "Other Media"
+msgstr ""
+
+msgid "Other Tray"
+msgstr ""
+
 msgid "Out of date PPD cache file."
 msgstr "Archivo de caché PPD obsoleto."
 
@@ -4544,6 +4565,10 @@ msgstr "PRC32K Extragrande"
 msgid "PRC32K Oversize Long Edge"
 msgstr "PRC32K Extragrande lado largo"
 
+msgid ""
+"PRINTER environment variable names default destination that does not exist."
+msgstr ""
+
 msgid "Packet does not contain a Get-Response-PDU"
 msgstr "El paquete no contiene un Get-Response-PDU"
 
@@ -5235,10 +5260,9 @@ msgstr "La impresora puede no existir o no estar disponible en este momento."
 
 msgid ""
 "The printer name may only contain up to 127 printable characters and may not "
-"contain spaces, slashes (/), or the pound sign (#)."
+"contain spaces, slashes (/ \\), quotes (' \"), question mark (?), or the "
+"pound sign (#)."
 msgstr ""
-"El nombre de la impresora sólo puede contener hasta 127 caracteres "
-"imprimibles y no puede contener espacios, barras (/), o la almohadilla (#)."
 
 msgid "The printer or class does not exist."
 msgstr "La impresora o clase no existe."
@@ -5280,13 +5304,6 @@ msgstr ""
 "El printer-uri debe ser de la forma \"ipp://NOMBRE_EQUIPO/printers/"
 "NOMBRE_IMPRESORA\"."
 
-msgid ""
-"The subscription name may not contain spaces, slashes (/), question marks "
-"(?), or the pound sign (#)."
-msgstr ""
-"El nombre de la subscripción no puede contener espacios, barras (/), signos "
-"de interrogación (?), o la almohadilla (#)."
-
 msgid ""
 "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to "
 "enable it."
@@ -5453,9 +5470,6 @@ msgstr "No se ha podido acceder al archivo cupsd.conf"
 msgid "Unable to access help file."
 msgstr "No se ha podido acceder al archivo de ayuda."
 
-msgid "Unable to add RSS subscription"
-msgstr "No se ha podido añadir la subscripción RSS"
-
 msgid "Unable to add class"
 msgstr "No se ha podido añadir la clase"
 
@@ -5478,9 +5492,6 @@ msgstr "No se ha podido reservar memoria para la información de página."
 msgid "Unable to allocate memory for pages array"
 msgstr "No se ha podido reservar memoria para la secuencia de páginas"
 
-msgid "Unable to cancel RSS subscription"
-msgstr "No se ha podido cancelar la subscripción RSS"
-
 msgid "Unable to cancel print job."
 msgstr "No se ha podido cancelar el trabajo de impresión."
 
@@ -7480,6 +7491,11 @@ msgstr "ippfind: No se ha podido usar Bonjour: %s"
 msgid "ippfind: Unknown variable \"{%s}\"."
 msgstr "ippfind: Variable desconocida \"{%s}\"."
 
+msgid ""
+"ipptool: \"-i\" and \"-n\" are incompatible with \"--ippserver\", \"-P\", "
+"and \"-X\"."
+msgstr ""
+
 msgid "ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."
 msgstr "ipptool: \"-i\" y \"-n\" no son compatibles con \"-P\" y \"-X\"."
 
@@ -7496,6 +7512,9 @@ msgstr "ipptool: Sólo se puede especificar un URI."
 msgid "ipptool: Missing count for \"-n\"."
 msgstr "ipptool: Falta el contador para \"-n\"."
 
+msgid "ipptool: Missing filename for \"--ippserver\"."
+msgstr ""
+
 msgid "ipptool: Missing filename for \"-f\"."
 msgstr "ipptool: Falta el nombre del archivo para \"-f\"."
 
@@ -8061,6 +8080,11 @@ msgstr ""
 "lpadmin: El nombre de la impresora sólo puede contener caracteres "
 "imprimibles."
 
+msgid ""
+"lpadmin: System V interface scripts are no longer supported for security "
+"reasons."
+msgstr ""
+
 msgid ""
 "lpadmin: Unable to add a printer to the class:\n"
 "         You must specify a printer name first."
@@ -8863,6 +8887,45 @@ msgstr "Cardstock"
 msgid "media-type.cd"
 msgstr "CD"
 
+msgid "media-type.com.hp.advanced-photo"
+msgstr "Advanced Photo Paper"
+
+msgid "media-type.com.hp.brochure-glossy"
+msgstr "Glossy Brochure Paper"
+
+msgid "media-type.com.hp.brochure-matte"
+msgstr "Matte Brochure Paper"
+
+msgid "media-type.com.hp.cover-matte"
+msgstr "Matte Cover Paper"
+
+msgid "media-type.com.hp.ecosmart-lite"
+msgstr "Office Recycled Paper"
+
+msgid "media-type.com.hp.everyday-glossy"
+msgstr "Everyday Glossy Photo Paper"
+
+msgid "media-type.com.hp.everyday-matte"
+msgstr "Everyday Matte Paper"
+
+msgid "media-type.com.hp.extra-heavy"
+msgstr "Extra Heavyweight Paper"
+
+msgid "media-type.com.hp.intermediate"
+msgstr "Multipurpose Paper"
+
+msgid "media-type.com.hp.mid-weight"
+msgstr "Mid-Weight Paper"
+
+msgid "media-type.com.hp.premium-inkjet"
+msgstr "Premium Inkjet Paper"
+
+msgid "media-type.com.hp.premium-photo"
+msgstr "Premium Photo Glossy Paper"
+
+msgid "media-type.com.hp.premium-presentation-matte"
+msgstr "Premium Presentation Matte Paper"
+
 msgid "media-type.continuous"
 msgstr "Continuous"
 
@@ -9007,6 +9070,18 @@ msgstr "Image Setter Paper"
 msgid "media-type.imaging-cylinder"
 msgstr "Imaging Cylinder"
 
+msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii"
+msgstr "Photo Paper Plus Glossy II"
+
+msgid "media-type.jp.co.canon-photo-paper-pro-platinum"
+msgstr "Photo Paper Pro Platinum"
+
+msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii"
+msgstr "Photo Paper Plus Glossy II"
+
+msgid "media-type.jp.co.canon_photo-paper-pro-platinum"
+msgstr "Photo Paper Pro Platinum"
+
 msgid "media-type.labels"
 msgstr "Labels"
 
@@ -10754,6 +10829,10 @@ msgstr "Standard"
 msgid "printer %s disabled since %s -"
 msgstr "la impresora %s está deshabilitada desde %s -"
 
+#, c-format
+msgid "printer %s is holding new jobs.  enabled since %s"
+msgstr ""
+
 #, c-format
 msgid "printer %s is idle.  enabled since %s"
 msgstr "la impresora %s está inactiva.  activada desde %s"
@@ -13349,6 +13428,9 @@ msgstr "Z Dimension"
 msgid "z-offset"
 msgstr "Z Offset"
 
+msgid "~/.cups/lpoptions file names default destination that does not exist."
+msgstr ""
+
 #~ msgid "  -E                      Test with HTTP Upgrade to TLS."
 #~ msgstr "  -E                      Prueba con actualización HTTP a TLS."
 
@@ -13545,9 +13627,18 @@ msgstr "Z Offset"
 #~ msgid "%g x %g"
 #~ msgstr "%g x %g"
 
+#~ msgid "Add RSS Subscription"
+#~ msgstr "Añadir subscripción RSS"
+
+#~ msgid "Bad subscription ID"
+#~ msgstr "ID de subscripción incorrecto"
+
 #~ msgid "CD/DVD/Bluray"
 #~ msgstr "CD/DVD/Bluray"
 
+#~ msgid "Cancel RSS Subscription"
+#~ msgstr "Cancelar subscripción RSS"
+
 #~ msgid "FanFold German"
 #~ msgstr "FanFold alemán"
 
@@ -13584,6 +13675,27 @@ msgstr "Z Offset"
 #~ msgid "Semi-Gloss Photo"
 #~ msgstr "Foto semi brillante"
 
+#~ msgid ""
+#~ "The printer name may only contain up to 127 printable characters and may "
+#~ "not contain spaces, slashes (/), or the pound sign (#)."
+#~ msgstr ""
+#~ "El nombre de la impresora sólo puede contener hasta 127 caracteres "
+#~ "imprimibles y no puede contener espacios, barras (/), o la almohadilla "
+#~ "(#)."
+
+#~ msgid ""
+#~ "The subscription name may not contain spaces, slashes (/), question marks "
+#~ "(?), or the pound sign (#)."
+#~ msgstr ""
+#~ "El nombre de la subscripción no puede contener espacios, barras (/), "
+#~ "signos de interrogación (?), o la almohadilla (#)."
+
+#~ msgid "Unable to add RSS subscription"
+#~ msgstr "No se ha podido añadir la subscripción RSS"
+
+#~ msgid "Unable to cancel RSS subscription"
+#~ msgstr "No se ha podido cancelar la subscripción RSS"
+
 #~ msgid "compression"
 #~ msgstr "Compression"
 

diff --git a/locale/cups_fr.po b/locale/cups_fr.po
index e551e8cf33762f5869920a9236bc74e4548bcb1d..3147ab9b58b88bfa8b0bb580c98bed6017b969ec 100644 (file)
--- a/locale/cups_fr.po
+++ b/locale/cups_fr.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-10-23 17:48-0400\n"
+"POT-Creation-Date: 2017-11-30 11:38-0500\n"
 "PO-Revision-Date: 2012-12-12 11:12+0100\n"
 "Last-Translator: Stéphane Blondon <stephane.blondon@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -840,6 +840,9 @@ msgstr ""
 "  --host regex            Correspondance du nom d'hôte avec une expression "
 "rationnelle."
 
+msgid "  --ippserver filename    Produce ippserver attribute file."
+msgstr ""
+
 msgid "  --lf                    End lines with LF (UNIX/Linux/macOS)."
 msgstr "  --lf                    Fin de ligne avec LF (UNIX/Linux/macOS)."
 
@@ -1522,6 +1525,10 @@ msgstr "%s : Mauvaise version %s for « -V »."
 msgid "%s: Don't know what to do."
 msgstr "%s : ne sait pas quoi faire."
 
+#, c-format
+msgid "%s: Error - %s"
+msgstr ""
+
 #, c-format
 msgid ""
 "%s: Error - %s environment variable names non-existent destination \"%s\"."
@@ -1911,6 +1918,9 @@ msgstr "-90"
 msgid "-95"
 msgstr "-95"
 
+msgid "/etc/cups/lpoptions file names default destination that does not exist."
+msgstr ""
+
 msgid "0"
 msgstr "0"
 
@@ -2564,9 +2574,6 @@ msgstr "Ajouter une classe"
 msgid "Add Printer"
 msgstr "Ajouter une imprimante"
 
-msgid "Add RSS Subscription"
-msgstr "Ajouter abonnement RSS"
-
 msgid "Address"
 msgstr "Adresse"
 
@@ -2664,6 +2671,10 @@ msgstr "B9"
 msgid "Back Print Film"
 msgstr ""
 
+#, c-format
+msgid "Bad \"printer-id\" value %d."
+msgstr ""
+
 #, c-format
 msgid "Bad 'document-format' value \"%s\"."
 msgstr ""
@@ -2803,9 +2814,6 @@ msgstr ""
 msgid "Bad scheme in URI"
 msgstr ""
 
-msgid "Bad subscription ID"
-msgstr ""
-
 msgid "Bad username in URI"
 msgstr ""
 
@@ -2873,9 +2881,6 @@ msgstr "Imprimante pour étiquettes CPCL"
 msgid "Cancel Jobs"
 msgstr "Annuler les tâches"
 
-msgid "Cancel RSS Subscription"
-msgstr "Annuler abonnement RSS"
-
 msgid "Canceling print job."
 msgstr "Annulation de la tâche d'impression."
 
@@ -3437,6 +3442,9 @@ msgstr ""
 msgid "Finished page %d."
 msgstr ""
 
+msgid "Finishing Preset"
+msgstr ""
+
 msgid "Flexo Base"
 msgstr ""
 
@@ -3816,6 +3824,10 @@ msgstr ""
 msgid "LPD/LPR Host or Printer"
 msgstr "Hôte ou imprimante LPD/LPR"
 
+msgid ""
+"LPDEST environment variable names default destination that does not exist."
+msgstr ""
+
 msgid "Label Printer"
 msgstr "Imprimante pour étiquettes"
 
@@ -4174,6 +4186,9 @@ msgstr ""
 msgid "No community name"
 msgstr "Aucun nom de communauté"
 
+msgid "No default destination."
+msgstr ""
+
 msgid "No default printer."
 msgstr "Aucune imprimante par défaut."
 
@@ -4325,6 +4340,12 @@ msgstr "Options"
 msgid "Other"
 msgstr ""
 
+msgid "Other Media"
+msgstr ""
+
+msgid "Other Tray"
+msgstr ""
+
 msgid "Out of date PPD cache file."
 msgstr ""
 
@@ -4367,6 +4388,10 @@ msgstr ""
 msgid "PRC32K Oversize Long Edge"
 msgstr ""
 
+msgid ""
+"PRINTER environment variable names default destination that does not exist."
+msgstr ""
+
 msgid "Packet does not contain a Get-Response-PDU"
 msgstr "Le paquet ne contient aucun paramètre Get-Response-PDU"
 
@@ -5053,10 +5078,9 @@ msgstr ""
 
 msgid ""
 "The printer name may only contain up to 127 printable characters and may not "
-"contain spaces, slashes (/), or the pound sign (#)."
+"contain spaces, slashes (/ \\), quotes (' \"), question mark (?), or the "
+"pound sign (#)."
 msgstr ""
-"Le nom d’imprimante doit comporter au plus 127 caractères, tous imprimables, "
-"sans espace, « / » et « # »."
 
 msgid "The printer or class does not exist."
 msgstr ""
@@ -5098,13 +5122,6 @@ msgstr ""
 "L’attribut « printer-uri » doit se présenter sous la forme « ipp://HOSTNAME/"
 "printers/PRINTERNAME »."
 
-msgid ""
-"The subscription name may not contain spaces, slashes (/), question marks "
-"(?), or the pound sign (#)."
-msgstr ""
-"Le nom de l’abonnement ne doit pas contenir d’espace ni aucun des symboles "
-"« / », « ? » et « # »."
-
 msgid ""
 "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to "
 "enable it."
@@ -5269,9 +5286,6 @@ msgstr "Impossible d’accéder au fichier cupsd.conf :"
 msgid "Unable to access help file."
 msgstr "Impossible d’accéder au fichier d’aide :"
 
-msgid "Unable to add RSS subscription"
-msgstr "Impossible d’ajouter d’abonnement RSS :"
-
 msgid "Unable to add class"
 msgstr "Impossible d’ajouter la classe :"
 
@@ -5294,9 +5308,6 @@ msgstr ""
 msgid "Unable to allocate memory for pages array"
 msgstr ""
 
-msgid "Unable to cancel RSS subscription"
-msgstr "Impossible d’annuler l’abonnement RSS :"
-
 msgid "Unable to cancel print job."
 msgstr "Impossible d’annuler la tâche d'impression."
 
@@ -7229,6 +7240,11 @@ msgstr ""
 msgid "ippfind: Unknown variable \"{%s}\"."
 msgstr ""
 
+msgid ""
+"ipptool: \"-i\" and \"-n\" are incompatible with \"--ippserver\", \"-P\", "
+"and \"-X\"."
+msgstr ""
+
 msgid "ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."
 msgstr ""
 
@@ -7245,6 +7261,9 @@ msgstr ""
 msgid "ipptool: Missing count for \"-n\"."
 msgstr ""
 
+msgid "ipptool: Missing filename for \"--ippserver\"."
+msgstr ""
+
 msgid "ipptool: Missing filename for \"-f\"."
 msgstr ""
 
@@ -7807,6 +7826,11 @@ msgstr ""
 msgid "lpadmin: Printer name can only contain printable characters."
 msgstr ""
 
+msgid ""
+"lpadmin: System V interface scripts are no longer supported for security "
+"reasons."
+msgstr ""
+
 msgid ""
 "lpadmin: Unable to add a printer to the class:\n"
 "         You must specify a printer name first."
@@ -8597,6 +8621,45 @@ msgstr "Cardstock"
 msgid "media-type.cd"
 msgstr "CD"
 
+msgid "media-type.com.hp.advanced-photo"
+msgstr "Advanced Photo Paper"
+
+msgid "media-type.com.hp.brochure-glossy"
+msgstr "Glossy Brochure Paper"
+
+msgid "media-type.com.hp.brochure-matte"
+msgstr "Matte Brochure Paper"
+
+msgid "media-type.com.hp.cover-matte"
+msgstr "Matte Cover Paper"
+
+msgid "media-type.com.hp.ecosmart-lite"
+msgstr "Office Recycled Paper"
+
+msgid "media-type.com.hp.everyday-glossy"
+msgstr "Everyday Glossy Photo Paper"
+
+msgid "media-type.com.hp.everyday-matte"
+msgstr "Everyday Matte Paper"
+
+msgid "media-type.com.hp.extra-heavy"
+msgstr "Extra Heavyweight Paper"
+
+msgid "media-type.com.hp.intermediate"
+msgstr "Multipurpose Paper"
+
+msgid "media-type.com.hp.mid-weight"
+msgstr "Mid-Weight Paper"
+
+msgid "media-type.com.hp.premium-inkjet"
+msgstr "Premium Inkjet Paper"
+
+msgid "media-type.com.hp.premium-photo"
+msgstr "Premium Photo Glossy Paper"
+
+msgid "media-type.com.hp.premium-presentation-matte"
+msgstr "Premium Presentation Matte Paper"
+
 msgid "media-type.continuous"
 msgstr "Continuous"
 
@@ -8741,6 +8804,18 @@ msgstr "Image Setter Paper"
 msgid "media-type.imaging-cylinder"
 msgstr "Imaging Cylinder"
 
+msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii"
+msgstr "Photo Paper Plus Glossy II"
+
+msgid "media-type.jp.co.canon-photo-paper-pro-platinum"
+msgstr "Photo Paper Pro Platinum"
+
+msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii"
+msgstr "Photo Paper Plus Glossy II"
+
+msgid "media-type.jp.co.canon_photo-paper-pro-platinum"
+msgstr "Photo Paper Pro Platinum"
+
 msgid "media-type.labels"
 msgstr "Labels"
 
@@ -10462,6 +10537,10 @@ msgstr "Standard"
 msgid "printer %s disabled since %s -"
 msgstr ""
 
+#, c-format
+msgid "printer %s is holding new jobs.  enabled since %s"
+msgstr ""
+
 #, c-format
 msgid "printer %s is idle.  enabled since %s"
 msgstr ""
@@ -13057,9 +13136,18 @@ msgstr "Z Dimension"
 msgid "z-offset"
 msgstr "Z Offset"
 
+msgid "~/.cups/lpoptions file names default destination that does not exist."
+msgstr ""
+
 #~ msgid "720dpi"
 #~ msgstr "720 ppp"
 
+#~ msgid "Add RSS Subscription"
+#~ msgstr "Ajouter abonnement RSS"
+
+#~ msgid "Cancel RSS Subscription"
+#~ msgstr "Annuler abonnement RSS"
+
 #~ msgid "Enter old password:"
 #~ msgstr "Ancien mot de passe :"
 
@@ -13084,6 +13172,26 @@ msgstr "Z Offset"
 #~ msgid "Stylus Photo Series"
 #~ msgstr "Série Stylus Photo"
 
+#~ msgid ""
+#~ "The printer name may only contain up to 127 printable characters and may "
+#~ "not contain spaces, slashes (/), or the pound sign (#)."
+#~ msgstr ""
+#~ "Le nom d’imprimante doit comporter au plus 127 caractères, tous "
+#~ "imprimables, sans espace, « / » et « # »."
+
+#~ msgid ""
+#~ "The subscription name may not contain spaces, slashes (/), question marks "
+#~ "(?), or the pound sign (#)."
+#~ msgstr ""
+#~ "Le nom de l’abonnement ne doit pas contenir d’espace ni aucun des "
+#~ "symboles « / », « ? » et « # »."
+
+#~ msgid "Unable to add RSS subscription"
+#~ msgstr "Impossible d’ajouter d’abonnement RSS :"
+
+#~ msgid "Unable to cancel RSS subscription"
+#~ msgstr "Impossible d’annuler l’abonnement RSS :"
+
 #~ msgid "compression"
 #~ msgstr "Compression"
 

diff --git a/locale/cups_it.po b/locale/cups_it.po
index 2a5453204279295fbc5d00881cf120e8452977b7..d49750ae02b8a58a1353078b55d72310830da051 100644 (file)
--- a/locale/cups_it.po
+++ b/locale/cups_it.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-10-23 17:48-0400\n"
+"POT-Creation-Date: 2017-11-30 11:38-0500\n"
 "PO-Revision-Date: 2013-07-14 12:00+0200\n"
 "Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
 "Language-Team: Arch Linux Italian Team <giovanni@archlinux.org>\n"
@@ -981,6 +981,9 @@ msgstr ""
 "  --host regex            Corrispondenza dell'hostname con l'espressione "
 "regolare."
 
+msgid "  --ippserver filename    Produce ippserver attribute file."
+msgstr ""
+
 msgid "  --lf                    End lines with LF (UNIX/Linux/macOS)."
 msgstr ""
 
@@ -1664,6 +1667,10 @@ msgstr "%s: la versione %s non è valida per \"-V\"."
 msgid "%s: Don't know what to do."
 msgstr "%s: non so cosa fare."
 
+#, c-format
+msgid "%s: Error - %s"
+msgstr ""
+
 #, c-format
 msgid ""
 "%s: Error - %s environment variable names non-existent destination \"%s\"."
@@ -2067,6 +2074,9 @@ msgstr "-90"
 msgid "-95"
 msgstr "-95"
 
+msgid "/etc/cups/lpoptions file names default destination that does not exist."
+msgstr ""
+
 msgid "0"
 msgstr "0"
 
@@ -2722,9 +2732,6 @@ msgstr "Aggiungi una classe"
 msgid "Add Printer"
 msgstr "Aggiungi una stampante"
 
-msgid "Add RSS Subscription"
-msgstr "Aggiungere l'abbonamento RSS"
-
 msgid "Address"
 msgstr "Indirizzo"
 
@@ -2822,6 +2829,10 @@ msgstr "B9"
 msgid "Back Print Film"
 msgstr ""
 
+#, c-format
+msgid "Bad \"printer-id\" value %d."
+msgstr ""
+
 #, c-format
 msgid "Bad 'document-format' value \"%s\"."
 msgstr "Il valore di 'document-format' non è valido \"%s\"."
@@ -2961,9 +2972,6 @@ msgstr ""
 msgid "Bad scheme in URI"
 msgstr ""
 
-msgid "Bad subscription ID"
-msgstr "L'ID della sottoscrizione non è valido"
-
 msgid "Bad username in URI"
 msgstr ""
 
@@ -3031,9 +3039,6 @@ msgstr "CPCL Label Printer"
 msgid "Cancel Jobs"
 msgstr ""
 
-msgid "Cancel RSS Subscription"
-msgstr "Eliminare l'abbonamento RSS"
-
 msgid "Canceling print job."
 msgstr "Eliminazione del processo di stampa in corso."
 
@@ -3605,6 +3610,9 @@ msgstr ""
 msgid "Finished page %d."
 msgstr "Finito pagina %d."
 
+msgid "Finishing Preset"
+msgstr ""
+
 msgid "Flexo Base"
 msgstr ""
 
@@ -3984,6 +3992,10 @@ msgstr ""
 msgid "LPD/LPR Host or Printer"
 msgstr "LPD/LPR Host o stampante"
 
+msgid ""
+"LPDEST environment variable names default destination that does not exist."
+msgstr ""
+
 msgid "Label Printer"
 msgstr "Label Printer"
 
@@ -4346,6 +4358,9 @@ msgstr ""
 msgid "No community name"
 msgstr "Nessun nome della comunità"
 
+msgid "No default destination."
+msgstr ""
+
 msgid "No default printer."
 msgstr "Nessuna stampante predefinita."
 
@@ -4501,6 +4516,12 @@ msgstr "Opzioni:"
 msgid "Other"
 msgstr ""
 
+msgid "Other Media"
+msgstr ""
+
+msgid "Other Tray"
+msgstr ""
+
 msgid "Out of date PPD cache file."
 msgstr "Il file della cache del PPD non è aggiornato."
 
@@ -4543,6 +4564,10 @@ msgstr "PRC32K Oversize"
 msgid "PRC32K Oversize Long Edge"
 msgstr "PRC32K Oversize Long Edge"
 
+msgid ""
+"PRINTER environment variable names default destination that does not exist."
+msgstr ""
+
 msgid "Packet does not contain a Get-Response-PDU"
 msgstr "Il pacchetto non contiene un Get-Response-PDU"
 
@@ -5235,11 +5260,9 @@ msgstr ""
 
 msgid ""
 "The printer name may only contain up to 127 printable characters and may not "
-"contain spaces, slashes (/), or the pound sign (#)."
+"contain spaces, slashes (/ \\), quotes (' \"), question mark (?), or the "
+"pound sign (#)."
 msgstr ""
-"Il nome della stampante può contenere solo un massimo di 127 caratteri "
-"stampabili e non può contenere spazi, barre (/) oppure il simbolo del "
-"cancelletto (#)."
 
 msgid "The printer or class does not exist."
 msgstr "Non esiste la stampante o la classe."
@@ -5280,13 +5303,6 @@ msgstr ""
 "Il printer-uri deve essere del formato \"ipp://HOSTNAME/printers/PRINTERNAME"
 "\"."
 
-msgid ""
-"The subscription name may not contain spaces, slashes (/), question marks "
-"(?), or the pound sign (#)."
-msgstr ""
-"Il nome della sottoscrizione non può contenere spazi, barre (/), punti "
-"interrogativi (?) o cancelletto (#)."
-
 msgid ""
 "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to "
 "enable it."
@@ -5453,9 +5469,6 @@ msgstr "Non è possibile accedere al file cupsd.conf"
 msgid "Unable to access help file."
 msgstr "Non è possibile accedere al file help."
 
-msgid "Unable to add RSS subscription"
-msgstr "Non è possibile aggiungere l'abbonamento RSS"
-
 msgid "Unable to add class"
 msgstr "Non è possibile aggiungere la classe"
 
@@ -5478,9 +5491,6 @@ msgstr "Non è possibile allocare la memoria per le info della pagina"
 msgid "Unable to allocate memory for pages array"
 msgstr "Non è possibile allocare memoria per array di pagine"
 
-msgid "Unable to cancel RSS subscription"
-msgstr "Non è possibile eliminare l'abbonamento RSS"
-
 msgid "Unable to cancel print job."
 msgstr "Non è possibile eliminare il processo di stampa."
 
@@ -7454,6 +7464,11 @@ msgstr "ippfind: non è possibile utilizzare Bonjour: %s"
 msgid "ippfind: Unknown variable \"{%s}\"."
 msgstr "ippfind: variabile sconosciuta \"{%s}\"."
 
+msgid ""
+"ipptool: \"-i\" and \"-n\" are incompatible with \"--ippserver\", \"-P\", "
+"and \"-X\"."
+msgstr ""
+
 msgid "ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."
 msgstr ""
 
@@ -7470,6 +7485,9 @@ msgstr "ipptool: può specificare solo un singolo URI."
 msgid "ipptool: Missing count for \"-n\"."
 msgstr "ipptool: conteggio mancante per \"-n\"."
 
+msgid "ipptool: Missing filename for \"--ippserver\"."
+msgstr ""
+
 msgid "ipptool: Missing filename for \"-f\"."
 msgstr "ipptool: manca il file per \"-f\"."
 
@@ -8033,6 +8051,11 @@ msgid "lpadmin: Printer name can only contain printable characters."
 msgstr ""
 "lpadmin: il nome della stampante può contenere solo caratteri stampabili."
 
+msgid ""
+"lpadmin: System V interface scripts are no longer supported for security "
+"reasons."
+msgstr ""
+
 msgid ""
 "lpadmin: Unable to add a printer to the class:\n"
 "         You must specify a printer name first."
@@ -8834,6 +8857,45 @@ msgstr "Cardstock"
 msgid "media-type.cd"
 msgstr "CD"
 
+msgid "media-type.com.hp.advanced-photo"
+msgstr "Advanced Photo Paper"
+
+msgid "media-type.com.hp.brochure-glossy"
+msgstr "Glossy Brochure Paper"
+
+msgid "media-type.com.hp.brochure-matte"
+msgstr "Matte Brochure Paper"
+
+msgid "media-type.com.hp.cover-matte"
+msgstr "Matte Cover Paper"
+
+msgid "media-type.com.hp.ecosmart-lite"
+msgstr "Office Recycled Paper"
+
+msgid "media-type.com.hp.everyday-glossy"
+msgstr "Everyday Glossy Photo Paper"
+
+msgid "media-type.com.hp.everyday-matte"
+msgstr "Everyday Matte Paper"
+
+msgid "media-type.com.hp.extra-heavy"
+msgstr "Extra Heavyweight Paper"
+
+msgid "media-type.com.hp.intermediate"
+msgstr "Multipurpose Paper"
+
+msgid "media-type.com.hp.mid-weight"
+msgstr "Mid-Weight Paper"
+
+msgid "media-type.com.hp.premium-inkjet"
+msgstr "Premium Inkjet Paper"
+
+msgid "media-type.com.hp.premium-photo"
+msgstr "Premium Photo Glossy Paper"
+
+msgid "media-type.com.hp.premium-presentation-matte"
+msgstr "Premium Presentation Matte Paper"
+
 msgid "media-type.continuous"
 msgstr "Continuous"
 
@@ -8978,6 +9040,18 @@ msgstr "Image Setter Paper"
 msgid "media-type.imaging-cylinder"
 msgstr "Imaging Cylinder"
 
+msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii"
+msgstr "Photo Paper Plus Glossy II"
+
+msgid "media-type.jp.co.canon-photo-paper-pro-platinum"
+msgstr "Photo Paper Pro Platinum"
+
+msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii"
+msgstr "Photo Paper Plus Glossy II"
+
+msgid "media-type.jp.co.canon_photo-paper-pro-platinum"
+msgstr "Photo Paper Pro Platinum"
+
 msgid "media-type.labels"
 msgstr "Labels"
 
@@ -10724,6 +10798,10 @@ msgstr "Standard"
 msgid "printer %s disabled since %s -"
 msgstr "la stampante %s è stata disabilitata da %s"
 
+#, c-format
+msgid "printer %s is holding new jobs.  enabled since %s"
+msgstr ""
+
 #, c-format
 msgid "printer %s is idle.  enabled since %s"
 msgstr "la stampante %s è inattiva.  è stata abilitata da %s"
@@ -13319,6 +13397,9 @@ msgstr "Z Dimension"
 msgid "z-offset"
 msgstr "Z Offset"
 
+msgid "~/.cups/lpoptions file names default destination that does not exist."
+msgstr ""
+
 #~ msgid "\tInterface: %s/interfaces/%s"
 #~ msgstr "\tInterfaccia: %s/interfacce/%s"
 
@@ -13545,9 +13626,18 @@ msgstr "Z Offset"
 #~ msgid "720dpi"
 #~ msgstr "720dpi"
 
+#~ msgid "Add RSS Subscription"
+#~ msgstr "Aggiungere l'abbonamento RSS"
+
 #~ msgid "Bad printer URI."
 #~ msgstr "L'URI della stampante non è valido."
 
+#~ msgid "Bad subscription ID"
+#~ msgstr "L'ID della sottoscrizione non è valido"
+
+#~ msgid "Cancel RSS Subscription"
+#~ msgstr "Eliminare l'abbonamento RSS"
+
 #~ msgid "Enter old password:"
 #~ msgstr "Digitare la vecchia password:"
 
@@ -13650,9 +13740,30 @@ msgstr "Z Offset"
 #~ msgid "The printer is running low on toner."
 #~ msgstr "Il toner della stampante sta per esaurirsi."
 
+#~ msgid ""
+#~ "The printer name may only contain up to 127 printable characters and may "
+#~ "not contain spaces, slashes (/), or the pound sign (#)."
+#~ msgstr ""
+#~ "Il nome della stampante può contenere solo un massimo di 127 caratteri "
+#~ "stampabili e non può contenere spazi, barre (/) oppure il simbolo del "
+#~ "cancelletto (#)."
+
+#~ msgid ""
+#~ "The subscription name may not contain spaces, slashes (/), question marks "
+#~ "(?), or the pound sign (#)."
+#~ msgstr ""
+#~ "Il nome della sottoscrizione non può contenere spazi, barre (/), punti "
+#~ "interrogativi (?) o cancelletto (#)."
+
 #~ msgid "There is a paper jam."
 #~ msgstr "Vi è un inceppamento della carta."
 
+#~ msgid "Unable to add RSS subscription"
+#~ msgstr "Non è possibile aggiungere l'abbonamento RSS"
+
+#~ msgid "Unable to cancel RSS subscription"
+#~ msgstr "Non è possibile eliminare l'abbonamento RSS"
+
 #~ msgid "Unable to copy interface script - %s"
 #~ msgstr "Non è possibile copiare lo script dell'interfaccia - %s"
 

diff --git a/locale/cups_ja.po b/locale/cups_ja.po
index 935ccfb7774344e16bc9c5019fd65467a867d0de..5b4d52a99100f5b46ef6fa0434124a43e9c32033 100644 (file)
--- a/locale/cups_ja.po
+++ b/locale/cups_ja.po
@@ -28,7 +28,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-10-23 17:48-0400\n"
+"POT-Creation-Date: 2017-11-30 11:38-0500\n"
 "PO-Revision-Date: 2014-11-15 19:27+0900\n"
 "Last-Translator: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"
 "Language-Team: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"
@@ -977,6 +977,9 @@ msgstr "  --help                  このヘルプを表示する。"
 msgid "  --host regex            Match hostname to regular expression."
 msgstr "  --host <正規表現>       ホスト名が正規表現にマッチするか。"
 
+msgid "  --ippserver filename    Produce ippserver attribute file."
+msgstr ""
+
 msgid "  --lf                    End lines with LF (UNIX/Linux/macOS)."
 msgstr ""
 
@@ -1640,6 +1643,10 @@ msgstr "%s: -V オプションにおいて %s は不正なバージョンです
 msgid "%s: Don't know what to do."
 msgstr "%s: 何が起きているか不明です。"
 
+#, c-format
+msgid "%s: Error - %s"
+msgstr ""
+
 #, c-format
 msgid ""
 "%s: Error - %s environment variable names non-existent destination \"%s\"."
@@ -2037,6 +2044,9 @@ msgstr "-90"
 msgid "-95"
 msgstr "-95"
 
+msgid "/etc/cups/lpoptions file names default destination that does not exist."
+msgstr ""
+
 msgid "0"
 msgstr "0"
 
@@ -2692,9 +2702,6 @@ msgstr "クラスの追加"
 msgid "Add Printer"
 msgstr "プリンターの追加"
 
-msgid "Add RSS Subscription"
-msgstr "RSS 購読を追加"
-
 msgid "Address"
 msgstr "アドレス"
 
@@ -2792,6 +2799,10 @@ msgstr "B9"
 msgid "Back Print Film"
 msgstr ""
 
+#, c-format
+msgid "Bad \"printer-id\" value %d."
+msgstr ""
+
 #, c-format
 msgid "Bad 'document-format' value \"%s\"."
 msgstr "誤った 'document-format' の値です \"%s\"。"
@@ -2931,9 +2942,6 @@ msgstr "URI のリソースが不正"
 msgid "Bad scheme in URI"
 msgstr "URI のスキームが不正"
 
-msgid "Bad subscription ID"
-msgstr "不正なサブスクリプション ID"
-
 msgid "Bad username in URI"
 msgstr "URI のユーザー名が不正"
 
@@ -3001,9 +3009,6 @@ msgstr "CPCL ラベルプリンター"
 msgid "Cancel Jobs"
 msgstr "ジョブをキャンセル"
 
-msgid "Cancel RSS Subscription"
-msgstr "RSS 購読をキャンセル"
-
 msgid "Canceling print job."
 msgstr "プリントジョブをキャンセルしています。"
 
@@ -3579,6 +3584,9 @@ msgstr ""
 msgid "Finished page %d."
 msgstr "ページ %d を終了。"
 
+msgid "Finishing Preset"
+msgstr ""
+
 msgid "Flexo Base"
 msgstr ""
 
@@ -3958,6 +3966,10 @@ msgstr ""
 msgid "LPD/LPR Host or Printer"
 msgstr "LPD/LPR ホストまたはプリンター"
 
+msgid ""
+"LPDEST environment variable names default destination that does not exist."
+msgstr ""
+
 msgid "Label Printer"
 msgstr "ラベルプリンター"
 
@@ -4320,6 +4332,9 @@ msgstr ""
 msgid "No community name"
 msgstr "コミュニティ名がありません"
 
+msgid "No default destination."
+msgstr ""
+
 msgid "No default printer."
 msgstr "デフォルトのプリンターはありません。"
 
@@ -4473,6 +4488,12 @@ msgstr "オプション:"
 msgid "Other"
 msgstr ""
 
+msgid "Other Media"
+msgstr ""
+
+msgid "Other Tray"
+msgstr ""
+
 msgid "Out of date PPD cache file."
 msgstr "PPD キャッシュファイルが古すぎます。"
 
@@ -4515,6 +4536,10 @@ msgstr "PRC32K (特大)"
 msgid "PRC32K Oversize Long Edge"
 msgstr "PRC32K (特大) 長辺送り"
 
+msgid ""
+"PRINTER environment variable names default destination that does not exist."
+msgstr ""
+
 msgid "Packet does not contain a Get-Response-PDU"
 msgstr "パケットが Get-Response-PDU を含んでいません"
 
@@ -5201,10 +5226,9 @@ msgstr "プリンターは現在存在しないか、使用できないようで
 
 msgid ""
 "The printer name may only contain up to 127 printable characters and may not "
-"contain spaces, slashes (/), or the pound sign (#)."
+"contain spaces, slashes (/ \\), quotes (' \"), question mark (?), or the "
+"pound sign (#)."
 msgstr ""
-"プリンター名は 127 文字以内の表示可能文字から成り、空白、スラッシュ (/)、ハッ"
-"シュ (#) を含んではなりません。"
 
 msgid "The printer or class does not exist."
 msgstr "プリンターまたはクラスは存在しません。"
@@ -5246,13 +5270,6 @@ msgstr ""
 "printer-uri は \"ipp://ホスト名/printers/プリンター名\" 形式でなければなりま"
 "せん。"
 
-msgid ""
-"The subscription name may not contain spaces, slashes (/), question marks "
-"(?), or the pound sign (#)."
-msgstr ""
-"サブスクリプション名には、スペース、スラッシュ (/)、疑問府 (?)、ハッシュ (#) "
-"を使用しないでください。"
-
 msgid ""
 "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to "
 "enable it."
@@ -5419,9 +5436,6 @@ msgstr "cupsd.conf ファイルにアクセスできません"
 msgid "Unable to access help file."
 msgstr "ヘルプファイルにアクセスできません。"
 
-msgid "Unable to add RSS subscription"
-msgstr "RSS 購読を追加できません"
-
 msgid "Unable to add class"
 msgstr "クラスを追加できません"
 
@@ -5444,9 +5458,6 @@ msgstr "ページ情報のメモリー割り当てができません"
 msgid "Unable to allocate memory for pages array"
 msgstr "ページアレイのメモリー割り当てができません"
 
-msgid "Unable to cancel RSS subscription"
-msgstr "RSS 購読をキャンセルできません"
-
 msgid "Unable to cancel print job."
 msgstr "プリンターを変更できません。"
 
@@ -7414,6 +7425,11 @@ msgstr "ippfind: Bonjour を利用できません: %s"
 msgid "ippfind: Unknown variable \"{%s}\"."
 msgstr "ippfind: \"{%s}\" は不明な変数です。"
 
+msgid ""
+"ipptool: \"-i\" and \"-n\" are incompatible with \"--ippserver\", \"-P\", "
+"and \"-X\"."
+msgstr ""
+
 msgid "ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."
 msgstr ""
 "ipptool: \"-i\" および \"-n\" は \"-P\"、\"-X\" と一緒に指定できません。"
@@ -7431,6 +7447,9 @@ msgstr "ipptool: URI は 1 つだけ指定できます。"
 msgid "ipptool: Missing count for \"-n\"."
 msgstr "ipptool: \"-n\" に回数の指定がありません。"
 
+msgid "ipptool: Missing filename for \"--ippserver\"."
+msgstr ""
+
 msgid "ipptool: Missing filename for \"-f\"."
 msgstr "ipptool: \"-f\" にファイル名の指定がありません。"
 
@@ -7995,6 +8014,11 @@ msgstr "lpadmin: プリンター %s はクラス %s のメンバーではあり
 msgid "lpadmin: Printer name can only contain printable characters."
 msgstr "lpadmin: プリンター名には表示可能文字だけが使用できます。"
 
+msgid ""
+"lpadmin: System V interface scripts are no longer supported for security "
+"reasons."
+msgstr ""
+
 msgid ""
 "lpadmin: Unable to add a printer to the class:\n"
 "         You must specify a printer name first."
@@ -8803,6 +8827,45 @@ msgstr "Cardstock"
 msgid "media-type.cd"
 msgstr "CD"
 
+msgid "media-type.com.hp.advanced-photo"
+msgstr "Advanced Photo Paper"
+
+msgid "media-type.com.hp.brochure-glossy"
+msgstr "Glossy Brochure Paper"
+
+msgid "media-type.com.hp.brochure-matte"
+msgstr "Matte Brochure Paper"
+
+msgid "media-type.com.hp.cover-matte"
+msgstr "Matte Cover Paper"
+
+msgid "media-type.com.hp.ecosmart-lite"
+msgstr "Office Recycled Paper"
+
+msgid "media-type.com.hp.everyday-glossy"
+msgstr "Everyday Glossy Photo Paper"
+
+msgid "media-type.com.hp.everyday-matte"
+msgstr "Everyday Matte Paper"
+
+msgid "media-type.com.hp.extra-heavy"
+msgstr "Extra Heavyweight Paper"
+
+msgid "media-type.com.hp.intermediate"
+msgstr "Multipurpose Paper"
+
+msgid "media-type.com.hp.mid-weight"
+msgstr "Mid-Weight Paper"
+
+msgid "media-type.com.hp.premium-inkjet"
+msgstr "Premium Inkjet Paper"
+
+msgid "media-type.com.hp.premium-photo"
+msgstr "Premium Photo Glossy Paper"
+
+msgid "media-type.com.hp.premium-presentation-matte"
+msgstr "Premium Presentation Matte Paper"
+
 msgid "media-type.continuous"
 msgstr "Continuous"
 
@@ -8947,6 +9010,18 @@ msgstr "Image Setter Paper"
 msgid "media-type.imaging-cylinder"
 msgstr "Imaging Cylinder"
 
+msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii"
+msgstr "Photo Paper Plus Glossy II"
+
+msgid "media-type.jp.co.canon-photo-paper-pro-platinum"
+msgstr "Photo Paper Pro Platinum"
+
+msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii"
+msgstr "Photo Paper Plus Glossy II"
+
+msgid "media-type.jp.co.canon_photo-paper-pro-platinum"
+msgstr "Photo Paper Pro Platinum"
+
 msgid "media-type.labels"
 msgstr "Labels"
 
@@ -10719,6 +10794,10 @@ msgstr "Standard"
 msgid "printer %s disabled since %s -"
 msgstr "プリンター %s は %s から無効です -"
 
+#, c-format
+msgid "printer %s is holding new jobs.  enabled since %s"
+msgstr ""
+
 #, c-format
 msgid "printer %s is idle.  enabled since %s"
 msgstr "プリンター %s は待機中です。%s 以来有効です"
@@ -13314,6 +13393,9 @@ msgstr "Z Dimension"
 msgid "z-offset"
 msgstr "Z Offset"
 
+msgid "~/.cups/lpoptions file names default destination that does not exist."
+msgstr ""
+
 #~ msgid "\tInterface: %s/interfaces/%s"
 #~ msgstr "\tインターフェイス: %s/interfaces/%s"
 
@@ -13545,9 +13627,18 @@ msgstr "Z Offset"
 #~ msgid "720dpi"
 #~ msgstr "720dpi"
 
+#~ msgid "Add RSS Subscription"
+#~ msgstr "RSS 購読を追加"
+
 #~ msgid "Bad printer URI."
 #~ msgstr "不正なプリンター URI です。"
 
+#~ msgid "Bad subscription ID"
+#~ msgstr "不正なサブスクリプション ID"
+
+#~ msgid "Cancel RSS Subscription"
+#~ msgstr "RSS 購読をキャンセル"
+
 #~ msgid "Enter old password:"
 #~ msgstr "古いパスワードを入力:"
 
@@ -13661,9 +13752,29 @@ msgstr "Z Offset"
 #~ msgid "The printer is running low on toner."
 #~ msgstr "プリンターのトナーがもうすぐなくなります。"
 
+#~ msgid ""
+#~ "The printer name may only contain up to 127 printable characters and may "
+#~ "not contain spaces, slashes (/), or the pound sign (#)."
+#~ msgstr ""
+#~ "プリンター名は 127 文字以内の表示可能文字から成り、空白、スラッシュ (/)、"
+#~ "ハッシュ (#) を含んではなりません。"
+
+#~ msgid ""
+#~ "The subscription name may not contain spaces, slashes (/), question marks "
+#~ "(?), or the pound sign (#)."
+#~ msgstr ""
+#~ "サブスクリプション名には、スペース、スラッシュ (/)、疑問府 (?)、ハッシュ "
+#~ "(#) を使用しないでください。"
+
 #~ msgid "There is a paper jam."
 #~ msgstr "用紙づまりが発生しています。"
 
+#~ msgid "Unable to add RSS subscription"
+#~ msgstr "RSS 購読を追加できません"
+
+#~ msgid "Unable to cancel RSS subscription"
+#~ msgstr "RSS 購読をキャンセルできません"
+
 #~ msgid "Unable to copy interface script - %s"
 #~ msgstr "インターフェイススクリプトをコピーできません - %s"
 

diff --git a/locale/cups_pt_BR.po b/locale/cups_pt_BR.po
index b463fee7116ce05d8e792243f34053b48742e485..a3477fa82797463dabf3b6e2f03a58e49c72a797 100644 (file)
--- a/locale/cups_pt_BR.po
+++ b/locale/cups_pt_BR.po
@@ -40,7 +40,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-10-23 17:48-0400\n"
+"POT-Creation-Date: 2017-11-30 11:38-0500\n"
 "PO-Revision-Date: 2016-01-31 16:45-0200\n"
 "Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <traducao-cups-pt-br@googlegroups.com>\n"
@@ -991,6 +991,9 @@ msgid "  --host regex            Match hostname to regular expression."
 msgstr ""
 "  --host regex            Corresponde o nome da máquina à expressão regular."
 
+msgid "  --ippserver filename    Produce ippserver attribute file."
+msgstr ""
+
 msgid "  --lf                    End lines with LF (UNIX/Linux/macOS)."
 msgstr ""
 
@@ -1673,6 +1676,10 @@ msgstr "%s: Versão inválida %s para \"-V\"."
 msgid "%s: Don't know what to do."
 msgstr "%s: Não sei o que fazer."
 
+#, c-format
+msgid "%s: Error - %s"
+msgstr ""
+
 #, c-format
 msgid ""
 "%s: Error - %s environment variable names non-existent destination \"%s\"."
@@ -2071,6 +2078,9 @@ msgstr "-90"
 msgid "-95"
 msgstr "-95"
 
+msgid "/etc/cups/lpoptions file names default destination that does not exist."
+msgstr ""
+
 msgid "0"
 msgstr "0"
 
@@ -2725,9 +2735,6 @@ msgstr "Adicionar classe"
 msgid "Add Printer"
 msgstr "Adicionar impressora"
 
-msgid "Add RSS Subscription"
-msgstr "Adicionar inscrição RSS"
-
 msgid "Address"
 msgstr "Endereço"
 
@@ -2826,6 +2833,10 @@ msgstr "B9"
 msgid "Back Print Film"
 msgstr ""
 
+#, c-format
+msgid "Bad \"printer-id\" value %d."
+msgstr ""
+
 #, c-format
 msgid "Bad 'document-format' value \"%s\"."
 msgstr "Valor de \"document-format\" inválido \"%s\"."
@@ -2965,9 +2976,6 @@ msgstr "Recurso inválido na URI"
 msgid "Bad scheme in URI"
 msgstr "Esquema inválido na URI"
 
-msgid "Bad subscription ID"
-msgstr "ID de inscrição inválido"
-
 msgid "Bad username in URI"
 msgstr "Usuário inválido na URI"
 
@@ -3035,9 +3043,6 @@ msgstr "Impressora de etiqueta CPCL"
 msgid "Cancel Jobs"
 msgstr "Cancelar trabalhos"
 
-msgid "Cancel RSS Subscription"
-msgstr "Cancelar inscrição RSS"
-
 msgid "Canceling print job."
 msgstr "Cancelando trabalho de impressão."
 
@@ -3608,6 +3613,9 @@ msgstr ""
 msgid "Finished page %d."
 msgstr "Terminou página %d."
 
+msgid "Finishing Preset"
+msgstr ""
+
 msgid "Flexo Base"
 msgstr ""
 
@@ -3987,6 +3995,10 @@ msgstr ""
 msgid "LPD/LPR Host or Printer"
 msgstr "Impressora ou máquina LPD/LPR"
 
+msgid ""
+"LPDEST environment variable names default destination that does not exist."
+msgstr ""
+
 msgid "Label Printer"
 msgstr "Impressora de etiqueta"
 
@@ -4349,6 +4361,9 @@ msgstr ""
 msgid "No community name"
 msgstr "Nenhum nome de comunidade"
 
+msgid "No default destination."
+msgstr ""
+
 msgid "No default printer."
 msgstr "Nenhuma impressora padrão."
 
@@ -4503,6 +4518,12 @@ msgstr "Opções:"
 msgid "Other"
 msgstr ""
 
+msgid "Other Media"
+msgstr ""
+
+msgid "Other Tray"
+msgstr ""
+
 msgid "Out of date PPD cache file."
 msgstr "Cache de arquivo PPD está desatualizado."
 
@@ -4545,6 +4566,10 @@ msgstr "PRC32K grande"
 msgid "PRC32K Oversize Long Edge"
 msgstr "PRC32K borda muito maior"
 
+msgid ""
+"PRINTER environment variable names default destination that does not exist."
+msgstr ""
+
 msgid "Packet does not contain a Get-Response-PDU"
 msgstr "Pacote não contém um Get-Response-PDU"
 
@@ -5237,10 +5262,9 @@ msgstr "A impressora pode não existir ou está indisponível neste momento."
 
 msgid ""
 "The printer name may only contain up to 127 printable characters and may not "
-"contain spaces, slashes (/), or the pound sign (#)."
+"contain spaces, slashes (/ \\), quotes (' \"), question mark (?), or the "
+"pound sign (#)."
 msgstr ""
-"O nome da impressora pode conter somente até 127 caracteres imprimíveis e "
-"não pode conter espaços, barras (/), ou sinal de tralha (#)."
 
 msgid "The printer or class does not exist."
 msgstr "A impressora ou classe não existe."
@@ -5281,13 +5305,6 @@ msgstr ""
 "O printer-uri deve estar no formato \"ipp://MAQUINA/printers/NOMEIMPRESSORA"
 "\"."
 
-msgid ""
-"The subscription name may not contain spaces, slashes (/), question marks "
-"(?), or the pound sign (#)."
-msgstr ""
-"O nome da inscrição não pode conter espaços, barras (/), sinais de "
-"interrogação (?), ou sinal de tralha (#)."
-
 msgid ""
 "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to "
 "enable it."
@@ -5454,9 +5471,6 @@ msgstr "Não foi possível acessar o arquivo cupsd.conf"
 msgid "Unable to access help file."
 msgstr "Não foi possível acessar o arquivo de ajuda."
 
-msgid "Unable to add RSS subscription"
-msgstr "Não foi possível adicionar inscrição RSS"
-
 msgid "Unable to add class"
 msgstr "Não foi possível adicionar classe"
 
@@ -5479,9 +5493,6 @@ msgstr "Não foi possível alocar memória para informação de página"
 msgid "Unable to allocate memory for pages array"
 msgstr "Não foi possível alocar memória para vetor de páginas"
 
-msgid "Unable to cancel RSS subscription"
-msgstr "Não foi possível cancelar inscrição RSS"
-
 msgid "Unable to cancel print job."
 msgstr "Não foi possível cancelar trabalho de impressão."
 
@@ -7459,6 +7470,11 @@ msgstr "ippfind: Não foi possível usar Bonjour: %s"
 msgid "ippfind: Unknown variable \"{%s}\"."
 msgstr "ippfind: Argumento desconhecido \"{%s}\"."
 
+msgid ""
+"ipptool: \"-i\" and \"-n\" are incompatible with \"--ippserver\", \"-P\", "
+"and \"-X\"."
+msgstr ""
+
 msgid "ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."
 msgstr "ipptool: \"-i\" e \"-n\" são incompatíveis com \"-P\" e \"-X\"."
 
@@ -7475,6 +7491,9 @@ msgstr "ipptool: Só é possível especificar uma única URI."
 msgid "ipptool: Missing count for \"-n\"."
 msgstr "ipptool: Contagem faltando para \"-n\"."
 
+msgid "ipptool: Missing filename for \"--ippserver\"."
+msgstr ""
+
 msgid "ipptool: Missing filename for \"-f\"."
 msgstr "ipptool: Faltando nome de arquivo para \"-f\"."
 
@@ -8038,6 +8057,11 @@ msgstr "lpadmin: Impressora %s não é membro da classe %s."
 msgid "lpadmin: Printer name can only contain printable characters."
 msgstr "lpadmin: Nome da impressora só pode conter caracteres imprimíveis."
 
+msgid ""
+"lpadmin: System V interface scripts are no longer supported for security "
+"reasons."
+msgstr ""
+
 msgid ""
 "lpadmin: Unable to add a printer to the class:\n"
 "         You must specify a printer name first."
@@ -8838,6 +8862,45 @@ msgstr "Cardstock"
 msgid "media-type.cd"
 msgstr "CD"
 
+msgid "media-type.com.hp.advanced-photo"
+msgstr "Advanced Photo Paper"
+
+msgid "media-type.com.hp.brochure-glossy"
+msgstr "Glossy Brochure Paper"
+
+msgid "media-type.com.hp.brochure-matte"
+msgstr "Matte Brochure Paper"
+
+msgid "media-type.com.hp.cover-matte"
+msgstr "Matte Cover Paper"
+
+msgid "media-type.com.hp.ecosmart-lite"
+msgstr "Office Recycled Paper"
+
+msgid "media-type.com.hp.everyday-glossy"
+msgstr "Everyday Glossy Photo Paper"
+
+msgid "media-type.com.hp.everyday-matte"
+msgstr "Everyday Matte Paper"
+
+msgid "media-type.com.hp.extra-heavy"
+msgstr "Extra Heavyweight Paper"
+
+msgid "media-type.com.hp.intermediate"
+msgstr "Multipurpose Paper"
+
+msgid "media-type.com.hp.mid-weight"
+msgstr "Mid-Weight Paper"
+
+msgid "media-type.com.hp.premium-inkjet"
+msgstr "Premium Inkjet Paper"
+
+msgid "media-type.com.hp.premium-photo"
+msgstr "Premium Photo Glossy Paper"
+
+msgid "media-type.com.hp.premium-presentation-matte"
+msgstr "Premium Presentation Matte Paper"
+
 msgid "media-type.continuous"
 msgstr "Continuous"
 
@@ -8982,6 +9045,18 @@ msgstr "Image Setter Paper"
 msgid "media-type.imaging-cylinder"
 msgstr "Imaging Cylinder"
 
+msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii"
+msgstr "Photo Paper Plus Glossy II"
+
+msgid "media-type.jp.co.canon-photo-paper-pro-platinum"
+msgstr "Photo Paper Pro Platinum"
+
+msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii"
+msgstr "Photo Paper Plus Glossy II"
+
+msgid "media-type.jp.co.canon_photo-paper-pro-platinum"
+msgstr "Photo Paper Pro Platinum"
+
 msgid "media-type.labels"
 msgstr "Labels"
 
@@ -10716,6 +10791,10 @@ msgstr "Standard"
 msgid "printer %s disabled since %s -"
 msgstr "impressora %s desabilitada desde %s -"
 
+#, c-format
+msgid "printer %s is holding new jobs.  enabled since %s"
+msgstr ""
+
 #, c-format
 msgid "printer %s is idle.  enabled since %s"
 msgstr "impressora %s está inativa; habilitada desde %s"
@@ -13311,6 +13390,9 @@ msgstr "Z Dimension"
 msgid "z-offset"
 msgstr "Z Offset"
 
+msgid "~/.cups/lpoptions file names default destination that does not exist."
+msgstr ""
+
 #~ msgid "\tInterface: %s/interfaces/%s"
 #~ msgstr "\tInterface: %s/interfaces/%s"
 
@@ -13535,9 +13617,18 @@ msgstr "Z Offset"
 #~ msgid "720dpi"
 #~ msgstr "720dpi"
 
+#~ msgid "Add RSS Subscription"
+#~ msgstr "Adicionar inscrição RSS"
+
 #~ msgid "Bad printer URI."
 #~ msgstr "URI de impressora inválido."
 
+#~ msgid "Bad subscription ID"
+#~ msgstr "ID de inscrição inválido"
+
+#~ msgid "Cancel RSS Subscription"
+#~ msgstr "Cancelar inscrição RSS"
+
 #~ msgid "Enter old password:"
 #~ msgstr "Digite a senha antiga:"
 
@@ -13641,9 +13732,29 @@ msgstr "Z Offset"
 #~ msgid "The printer is running low on toner."
 #~ msgstr "A impressora está ficando sem toner."
 
+#~ msgid ""
+#~ "The printer name may only contain up to 127 printable characters and may "
+#~ "not contain spaces, slashes (/), or the pound sign (#)."
+#~ msgstr ""
+#~ "O nome da impressora pode conter somente até 127 caracteres imprimíveis e "
+#~ "não pode conter espaços, barras (/), ou sinal de tralha (#)."
+
+#~ msgid ""
+#~ "The subscription name may not contain spaces, slashes (/), question marks "
+#~ "(?), or the pound sign (#)."
+#~ msgstr ""
+#~ "O nome da inscrição não pode conter espaços, barras (/), sinais de "
+#~ "interrogação (?), ou sinal de tralha (#)."
+
 #~ msgid "There is a paper jam."
 #~ msgstr "Ocorreu um atolamento de papel."
 
+#~ msgid "Unable to add RSS subscription"
+#~ msgstr "Não foi possível adicionar inscrição RSS"
+
+#~ msgid "Unable to cancel RSS subscription"
+#~ msgstr "Não foi possível cancelar inscrição RSS"
+
 #~ msgid "Unable to copy interface script - %s"
 #~ msgstr "Não foi possível copiar script de interface - %s"
 

diff --git a/locale/cups_ru.po b/locale/cups_ru.po
index 5eef074409b7a954e4a9dbd63b077e78d244a977..077b8ccab176e9c05e3fcfbd8fb011333f57d845 100644 (file)
--- a/locale/cups_ru.po
+++ b/locale/cups_ru.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-10-23 17:48-0400\n"
+"POT-Creation-Date: 2017-11-30 11:38-0500\n"
 "PO-Revision-Date: 2015-01-28 12:00-0800\n"
 "Last-Translator: Aleksandr Proklov\n"
 "Language-Team: PuppyRus Linux Team\n"
@@ -933,6 +933,9 @@ msgstr "  --help                  Показать эту справку."
 msgid "  --host regex            Match hostname to regular expression."
 msgstr "  --host regex            Найти hostname по регулярному выражению."
 
+msgid "  --ippserver filename    Produce ippserver attribute file."
+msgstr ""
+
 msgid "  --lf                    End lines with LF (UNIX/Linux/macOS)."
 msgstr ""
 
@@ -1601,6 +1604,10 @@ msgstr "%s: Неверная версия %s для \"-V\"."
 msgid "%s: Don't know what to do."
 msgstr "%s: Дальнейшие действия неизвестны."
 
+#, c-format
+msgid "%s: Error - %s"
+msgstr ""
+
 #, c-format
 msgid ""
 "%s: Error - %s environment variable names non-existent destination \"%s\"."
@@ -2007,6 +2014,9 @@ msgstr "-90"
 msgid "-95"
 msgstr "-95"
 
+msgid "/etc/cups/lpoptions file names default destination that does not exist."
+msgstr ""
+
 msgid "0"
 msgstr "0"
 
@@ -2660,9 +2670,6 @@ msgstr "Добавить группу"
 msgid "Add Printer"
 msgstr "Добавить принтер"
 
-msgid "Add RSS Subscription"
-msgstr "Добавить подписку на RSS"
-
 msgid "Address"
 msgstr "Адрес"
 
@@ -2760,6 +2767,10 @@ msgstr "B9"
 msgid "Back Print Film"
 msgstr ""
 
+#, c-format
+msgid "Bad \"printer-id\" value %d."
+msgstr ""
+
 #, c-format
 msgid "Bad 'document-format' value \"%s\"."
 msgstr ""
@@ -2899,9 +2910,6 @@ msgstr ""
 msgid "Bad scheme in URI"
 msgstr ""
 
-msgid "Bad subscription ID"
-msgstr "Неверный ID подписки"
-
 msgid "Bad username in URI"
 msgstr "Неверное имя пользователя в URI"
 
@@ -2969,9 +2977,6 @@ msgstr "Принтер для печати этикеток CPCL"
 msgid "Cancel Jobs"
 msgstr "Отменить задания"
 
-msgid "Cancel RSS Subscription"
-msgstr "Отменить подписку на RSS"
-
 msgid "Canceling print job."
 msgstr "Отмена задания печати."
 
@@ -3536,6 +3541,9 @@ msgstr ""
 msgid "Finished page %d."
 msgstr "Последняя страница %d."
 
+msgid "Finishing Preset"
+msgstr ""
+
 msgid "Flexo Base"
 msgstr ""
 
@@ -3915,6 +3923,10 @@ msgstr ""
 msgid "LPD/LPR Host or Printer"
 msgstr "Хост или принтер LPD/LPR"
 
+msgid ""
+"LPDEST environment variable names default destination that does not exist."
+msgstr ""
+
 msgid "Label Printer"
 msgstr "Принтер для печати этикеток"
 
@@ -4277,6 +4289,9 @@ msgstr ""
 msgid "No community name"
 msgstr "Нет имени сообщества"
 
+msgid "No default destination."
+msgstr ""
+
 msgid "No default printer."
 msgstr "Нет принтера по умолчанию."
 
@@ -4431,6 +4446,12 @@ msgstr "Параметры:"
 msgid "Other"
 msgstr ""
 
+msgid "Other Media"
+msgstr ""
+
+msgid "Other Tray"
+msgstr ""
+
 msgid "Out of date PPD cache file."
 msgstr "Устаревший файл кеша PPD"
 
@@ -4473,6 +4494,10 @@ msgstr ""
 msgid "PRC32K Oversize Long Edge"
 msgstr ""
 
+msgid ""
+"PRINTER environment variable names default destination that does not exist."
+msgstr ""
+
 msgid "Packet does not contain a Get-Response-PDU"
 msgstr "В пакете нет Get-Response-PDU"
 
@@ -5160,10 +5185,9 @@ msgstr "Возможно принтер недоступен в настояще
 
 msgid ""
 "The printer name may only contain up to 127 printable characters and may not "
-"contain spaces, slashes (/), or the pound sign (#)."
+"contain spaces, slashes (/ \\), quotes (' \"), question mark (?), or the "
+"pound sign (#)."
 msgstr ""
-"Имя принтера может содержать максимально 127 печатных символов и не может "
-"содержать пробелы, дроби (/) или знак \"решетки\" (#)."
 
 msgid "The printer or class does not exist."
 msgstr "Принтер или группа не существует."
@@ -5201,13 +5225,6 @@ msgid ""
 "The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"."
 msgstr "printer-uri должен иметь форму «ipp://HOSTNAME/printers/PRINTERNAME»."
 
-msgid ""
-"The subscription name may not contain spaces, slashes (/), question marks "
-"(?), or the pound sign (#)."
-msgstr ""
-"Имя подписки не может содержать пробелы, дроби (/), вопросительные знаки (?) "
-"или знак \"решетки\" (#)."
-
 msgid ""
 "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to "
 "enable it."
@@ -5374,9 +5391,6 @@ msgstr "Не удается получить доступ к файлу \"cupsd.
 msgid "Unable to access help file."
 msgstr "Не удается получить доступ к файлу помощи."
 
-msgid "Unable to add RSS subscription"
-msgstr "Не удается добавить подписку RSS."
-
 msgid "Unable to add class"
 msgstr "Не удается добавить группу"
 
@@ -5399,9 +5413,6 @@ msgstr "Не удается выделить память для страниц
 msgid "Unable to allocate memory for pages array"
 msgstr "Не удается выделить память для страниц"
 
-msgid "Unable to cancel RSS subscription"
-msgstr "Не удается отменить подписку RSS"
-
 msgid "Unable to cancel print job."
 msgstr "Не удается отменить задание печати."
 
@@ -7370,6 +7381,11 @@ msgstr "ippfind: Не удается использовать Bonjour: %s"
 msgid "ippfind: Unknown variable \"{%s}\"."
 msgstr "ippfind: Неизвестная переменная \"{%s}\"."
 
+msgid ""
+"ipptool: \"-i\" and \"-n\" are incompatible with \"--ippserver\", \"-P\", "
+"and \"-X\"."
+msgstr ""
+
 msgid "ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."
 msgstr "ipptool: Параметры \"-i\" и \"-n\" несовместимы с \"-P\" и \"-X\"."
 
@@ -7386,6 +7402,9 @@ msgstr "ipptool: Может быть определен лишь один URI."
 msgid "ipptool: Missing count for \"-n\"."
 msgstr "ipptool: Отсутствует count для \"-n\"."
 
+msgid "ipptool: Missing filename for \"--ippserver\"."
+msgstr ""
+
 msgid "ipptool: Missing filename for \"-f\"."
 msgstr "ipptool: Отсутствует имя файла для \"-f\"."
 
@@ -7948,6 +7967,11 @@ msgstr "lpadmin: Принтер %s не находится в группе %s."
 msgid "lpadmin: Printer name can only contain printable characters."
 msgstr "lpadmin: Имя принтера может содержать только печатаемые символы."
 
+msgid ""
+"lpadmin: System V interface scripts are no longer supported for security "
+"reasons."
+msgstr ""
+
 msgid ""
 "lpadmin: Unable to add a printer to the class:\n"
 "         You must specify a printer name first."
@@ -8748,6 +8772,45 @@ msgstr "Cardstock"
 msgid "media-type.cd"
 msgstr "CD"
 
+msgid "media-type.com.hp.advanced-photo"
+msgstr "Advanced Photo Paper"
+
+msgid "media-type.com.hp.brochure-glossy"
+msgstr "Glossy Brochure Paper"
+
+msgid "media-type.com.hp.brochure-matte"
+msgstr "Matte Brochure Paper"
+
+msgid "media-type.com.hp.cover-matte"
+msgstr "Matte Cover Paper"
+
+msgid "media-type.com.hp.ecosmart-lite"
+msgstr "Office Recycled Paper"
+
+msgid "media-type.com.hp.everyday-glossy"
+msgstr "Everyday Glossy Photo Paper"
+
+msgid "media-type.com.hp.everyday-matte"
+msgstr "Everyday Matte Paper"
+
+msgid "media-type.com.hp.extra-heavy"
+msgstr "Extra Heavyweight Paper"
+
+msgid "media-type.com.hp.intermediate"
+msgstr "Multipurpose Paper"
+
+msgid "media-type.com.hp.mid-weight"
+msgstr "Mid-Weight Paper"
+
+msgid "media-type.com.hp.premium-inkjet"
+msgstr "Premium Inkjet Paper"
+
+msgid "media-type.com.hp.premium-photo"
+msgstr "Premium Photo Glossy Paper"
+
+msgid "media-type.com.hp.premium-presentation-matte"
+msgstr "Premium Presentation Matte Paper"
+
 msgid "media-type.continuous"
 msgstr "Continuous"
 
@@ -8892,6 +8955,18 @@ msgstr "Image Setter Paper"
 msgid "media-type.imaging-cylinder"
 msgstr "Imaging Cylinder"
 
+msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii"
+msgstr "Photo Paper Plus Glossy II"
+
+msgid "media-type.jp.co.canon-photo-paper-pro-platinum"
+msgstr "Photo Paper Pro Platinum"
+
+msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii"
+msgstr "Photo Paper Plus Glossy II"
+
+msgid "media-type.jp.co.canon_photo-paper-pro-platinum"
+msgstr "Photo Paper Pro Platinum"
+
 msgid "media-type.labels"
 msgstr "Labels"
 
@@ -10630,6 +10705,10 @@ msgstr "Standard"
 msgid "printer %s disabled since %s -"
 msgstr "принтер %s отключен с момента %s -"
 
+#, c-format
+msgid "printer %s is holding new jobs.  enabled since %s"
+msgstr ""
+
 #, c-format
 msgid "printer %s is idle.  enabled since %s"
 msgstr "принтер %s свободен. Включен с момента %s"
@@ -13225,6 +13304,9 @@ msgstr "Z Dimension"
 msgid "z-offset"
 msgstr "Z Offset"
 
+msgid "~/.cups/lpoptions file names default destination that does not exist."
+msgstr ""
+
 #~ msgid "\tInterface: %s/interfaces/%s"
 #~ msgstr "\tИнтерфейс: %s/интерфейсы/%s"
 
@@ -13447,6 +13529,15 @@ msgstr "Z Offset"
 #~ msgid "%g x %g"
 #~ msgstr "%g x %g"
 
+#~ msgid "Add RSS Subscription"
+#~ msgstr "Добавить подписку на RSS"
+
+#~ msgid "Bad subscription ID"
+#~ msgstr "Неверный ID подписки"
+
+#~ msgid "Cancel RSS Subscription"
+#~ msgstr "Отменить подписку на RSS"
+
 #~ msgid "File Folder "
 #~ msgstr "Каталог файла "
 
@@ -13459,6 +13550,26 @@ msgstr "Z Offset"
 #~ msgstr ""
 #~ "Атрибут '%s' Job Description не может быть подставлен при созданиизадания"
 
+#~ msgid ""
+#~ "The printer name may only contain up to 127 printable characters and may "
+#~ "not contain spaces, slashes (/), or the pound sign (#)."
+#~ msgstr ""
+#~ "Имя принтера может содержать максимально 127 печатных символов и не может "
+#~ "содержать пробелы, дроби (/) или знак \"решетки\" (#)."
+
+#~ msgid ""
+#~ "The subscription name may not contain spaces, slashes (/), question marks "
+#~ "(?), or the pound sign (#)."
+#~ msgstr ""
+#~ "Имя подписки не может содержать пробелы, дроби (/), вопросительные знаки "
+#~ "(?) или знак \"решетки\" (#)."
+
+#~ msgid "Unable to add RSS subscription"
+#~ msgstr "Не удается добавить подписку RSS."
+
+#~ msgid "Unable to cancel RSS subscription"
+#~ msgstr "Не удается отменить подписку RSS"
+
 #~ msgid "Unable to copy interface script - %s"
 #~ msgstr "Не удается копировать скрипт интерфейса - %s"
 

diff --git a/locale/cups_zh_CN.po b/locale/cups_zh_CN.po
index 7110146312e50a3cdb87e0f6aaa75a8dd95120ca..7b218f53712f539d53e1d420f6ce414094860197 100644 (file)
--- a/locale/cups_zh_CN.po
+++ b/locale/cups_zh_CN.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-10-23 17:48-0400\n"
+"POT-Creation-Date: 2017-11-30 11:38-0500\n"
 "PO-Revision-Date: 2017-06-11 12:38+0800\n"
 "Last-Translator: Mingcong Bai <jeffbai@aosc.xyz>\n"
 "Language-Team: \n"
@@ -952,6 +952,9 @@ msgstr "  --help                  显示此帮助信息。"
 msgid "  --host regex            Match hostname to regular expression."
 msgstr "  --host 正则表达式      使用正则表达式匹配主机名。"
 
+msgid "  --ippserver filename    Produce ippserver attribute file."
+msgstr ""
+
 msgid "  --lf                    End lines with LF (UNIX/Linux/macOS)."
 msgstr "  --lf                    使用 LF 行末（UNIX/Linux/macOS）。"
 
@@ -1595,6 +1598,10 @@ msgstr "%s：用于“-V”的版本 %s 无效。"
 msgid "%s: Don't know what to do."
 msgstr "%s：不知如何处理。"
 
+#, c-format
+msgid "%s: Error - %s"
+msgstr ""
+
 #, c-format
 msgid ""
 "%s: Error - %s environment variable names non-existent destination \"%s\"."
@@ -1984,6 +1991,9 @@ msgstr "-90"
 msgid "-95"
 msgstr "-95"
 
+msgid "/etc/cups/lpoptions file names default destination that does not exist."
+msgstr ""
+
 msgid "0"
 msgstr "0"
 
@@ -2637,9 +2647,6 @@ msgstr "添加类"
 msgid "Add Printer"
 msgstr "添加打印机"
 
-msgid "Add RSS Subscription"
-msgstr "添加 RSS 订阅"
-
 msgid "Address"
 msgstr "地址"
 
@@ -2737,6 +2744,10 @@ msgstr "B9"
 msgid "Back Print Film"
 msgstr "印片用胶片"
 
+#, c-format
+msgid "Bad \"printer-id\" value %d."
+msgstr ""
+
 #, c-format
 msgid "Bad 'document-format' value \"%s\"."
 msgstr "无效的“document-format”值“%s”。"
@@ -2876,9 +2887,6 @@ msgstr "URI 中的资源无效"
 msgid "Bad scheme in URI"
 msgstr "URI 中的方案无效"
 
-msgid "Bad subscription ID"
-msgstr "无效的订阅 ID"
-
 msgid "Bad username in URI"
 msgstr "URI 中的用户名无效"
 
@@ -2946,9 +2954,6 @@ msgstr "CPCL 标签打印机"
 msgid "Cancel Jobs"
 msgstr "取消任务"
 
-msgid "Cancel RSS Subscription"
-msgstr "取消 RSS 订阅"
-
 msgid "Canceling print job."
 msgstr "正在取消打印任务"
 
@@ -3518,6 +3523,9 @@ msgstr "精致信封"
 msgid "Finished page %d."
 msgstr "已完成第 %d 页。"
 
+msgid "Finishing Preset"
+msgstr ""
+
 msgid "Flexo Base"
 msgstr "柔性版基"
 
@@ -3897,6 +3905,10 @@ msgstr "垛齐"
 msgid "LPD/LPR Host or Printer"
 msgstr "LPD/LPR 主机或打印机"
 
+msgid ""
+"LPDEST environment variable names default destination that does not exist."
+msgstr ""
+
 msgid "Label Printer"
 msgstr "标签打印机"
 
@@ -4259,6 +4271,9 @@ msgstr "未指定通用名称。"
 msgid "No community name"
 msgstr "无社群名称"
 
+msgid "No default destination."
+msgstr ""
+
 msgid "No default printer."
 msgstr "无默认打印机。"
 
@@ -4410,6 +4425,12 @@ msgstr "选项："
 msgid "Other"
 msgstr "其他"
 
+msgid "Other Media"
+msgstr ""
+
+msgid "Other Tray"
+msgstr ""
+
 msgid "Out of date PPD cache file."
 msgstr "过时的 PPD 缓存文件。"
 
@@ -4452,6 +4473,10 @@ msgstr "超大 32 开"
 msgid "PRC32K Oversize Long Edge"
 msgstr "超大长边缘 32 开"
 
+msgid ""
+"PRINTER environment variable names default destination that does not exist."
+msgstr ""
+
 msgid "Packet does not contain a Get-Response-PDU"
 msgstr "包裹中未包含 Get-Response-PDU"
 
@@ -5137,9 +5162,9 @@ msgstr "打印机暂时不存在或不可用。"
 
 msgid ""
 "The printer name may only contain up to 127 printable characters and may not "
-"contain spaces, slashes (/), or the pound sign (#)."
+"contain spaces, slashes (/ \\), quotes (' \"), question mark (?), or the "
+"pound sign (#)."
 msgstr ""
-"打印机名称最多可包含 127 可打印字符，不能包含空格、斜杠（/）或井号（#）。"
 
 msgid "The printer or class does not exist."
 msgstr "打印机或类不存在。"
@@ -5177,11 +5202,6 @@ msgid ""
 "The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"."
 msgstr "printer-uri 必须使用如下格式：“ipp://HOSTNAME/printers/PRINTERNAME”。"
 
-msgid ""
-"The subscription name may not contain spaces, slashes (/), question marks "
-"(?), or the pound sign (#)."
-msgstr "订阅名称不得包含空格，斜杠（/），问号（?）或井号（#）。"
-
 msgid ""
 "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to "
 "enable it."
@@ -5346,9 +5366,6 @@ msgstr "无法访问 cupsd.conf 文件。"
 msgid "Unable to access help file."
 msgstr "无法访问帮助文件。"
 
-msgid "Unable to add RSS subscription"
-msgstr "无法添加 RSS 订阅"
-
 msgid "Unable to add class"
 msgstr "无法添加类"
 
@@ -5371,9 +5388,6 @@ msgstr "无法为页面信息分配内存"
 msgid "Unable to allocate memory for pages array"
 msgstr "无法为页面组分配内存"
 
-msgid "Unable to cancel RSS subscription"
-msgstr "无法取消 RSS 订阅"
-
 msgid "Unable to cancel print job."
 msgstr "无法取消打印任务。"
 
@@ -7325,6 +7339,11 @@ msgstr "ippfind：无法使用 Bonjour：%s"
 msgid "ippfind: Unknown variable \"{%s}\"."
 msgstr "ippfind：未知变量“{%s}”。"
 
+msgid ""
+"ipptool: \"-i\" and \"-n\" are incompatible with \"--ippserver\", \"-P\", "
+"and \"-X\"."
+msgstr ""
+
 msgid "ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."
 msgstr "ipptool：“-i”和“-n”不能与“-P”和“-X”混用。"
 
@@ -7341,6 +7360,9 @@ msgstr "ipptool：只能指定一个 URI。"
 msgid "ipptool: Missing count for \"-n\"."
 msgstr "ipptool：“-n”选项后缺少数量。"
 
+msgid "ipptool: Missing filename for \"--ippserver\"."
+msgstr ""
+
 msgid "ipptool: Missing filename for \"-f\"."
 msgstr "ipptool：“-f”选项后缺少文件名。"
 
@@ -7903,6 +7925,11 @@ msgstr "lpadmin：打印机 %s 不是类 %s 中的成员。"
 msgid "lpadmin: Printer name can only contain printable characters."
 msgstr "lpadmin：打印机名称中只能包含可打印字符。"
 
+msgid ""
+"lpadmin: System V interface scripts are no longer supported for security "
+"reasons."
+msgstr ""
+
 msgid ""
 "lpadmin: Unable to add a printer to the class:\n"
 "         You must specify a printer name first."
@@ -8701,6 +8728,45 @@ msgstr "Cardstock"
 msgid "media-type.cd"
 msgstr "CD"
 
+msgid "media-type.com.hp.advanced-photo"
+msgstr "Advanced Photo Paper"
+
+msgid "media-type.com.hp.brochure-glossy"
+msgstr "Glossy Brochure Paper"
+
+msgid "media-type.com.hp.brochure-matte"
+msgstr "Matte Brochure Paper"
+
+msgid "media-type.com.hp.cover-matte"
+msgstr "Matte Cover Paper"
+
+msgid "media-type.com.hp.ecosmart-lite"
+msgstr "Office Recycled Paper"
+
+msgid "media-type.com.hp.everyday-glossy"
+msgstr "Everyday Glossy Photo Paper"
+
+msgid "media-type.com.hp.everyday-matte"
+msgstr "Everyday Matte Paper"
+
+msgid "media-type.com.hp.extra-heavy"
+msgstr "Extra Heavyweight Paper"
+
+msgid "media-type.com.hp.intermediate"
+msgstr "Multipurpose Paper"
+
+msgid "media-type.com.hp.mid-weight"
+msgstr "Mid-Weight Paper"
+
+msgid "media-type.com.hp.premium-inkjet"
+msgstr "Premium Inkjet Paper"
+
+msgid "media-type.com.hp.premium-photo"
+msgstr "Premium Photo Glossy Paper"
+
+msgid "media-type.com.hp.premium-presentation-matte"
+msgstr "Premium Presentation Matte Paper"
+
 msgid "media-type.continuous"
 msgstr "Continuous"
 
@@ -8845,6 +8911,18 @@ msgstr "Image Setter Paper"
 msgid "media-type.imaging-cylinder"
 msgstr "Imaging Cylinder"
 
+msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii"
+msgstr "Photo Paper Plus Glossy II"
+
+msgid "media-type.jp.co.canon-photo-paper-pro-platinum"
+msgstr "Photo Paper Pro Platinum"
+
+msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii"
+msgstr "Photo Paper Plus Glossy II"
+
+msgid "media-type.jp.co.canon_photo-paper-pro-platinum"
+msgstr "Photo Paper Pro Platinum"
+
 msgid "media-type.labels"
 msgstr "Labels"
 
@@ -10571,6 +10649,10 @@ msgstr "Standard"
 msgid "printer %s disabled since %s -"
 msgstr "打印机 %s 从 %s 开始被禁用 -"
 
+#, c-format
+msgid "printer %s is holding new jobs.  enabled since %s"
+msgstr ""
+
 #, c-format
 msgid "printer %s is idle.  enabled since %s"
 msgstr "打印机 %s 目前空闲。从 %s 开始启用"
@@ -13166,6 +13248,9 @@ msgstr "Z Dimension"
 msgid "z-offset"
 msgstr "Z Offset"
 
+msgid "~/.cups/lpoptions file names default destination that does not exist."
+msgstr ""
+
 #~ msgid "  --lf                    End lines with LF (UNIX/Linux/OS X)."
 #~ msgstr "  --lf                    使用 LF 行末 (UNIX/Linux/OS X)。"
 
@@ -13341,6 +13426,15 @@ msgstr "Z Offset"
 #~ msgid "%g x %g"
 #~ msgstr "%g x %g"
 
+#~ msgid "Add RSS Subscription"
+#~ msgstr "添加 RSS 订阅"
+
+#~ msgid "Bad subscription ID"
+#~ msgstr "无效的订阅 ID"
+
+#~ msgid "Cancel RSS Subscription"
+#~ msgstr "取消 RSS 订阅"
+
 #~ msgid "Envelope #10 "
 #~ msgstr "10 号信封 "
 
@@ -13363,6 +13457,23 @@ msgstr "Z Offset"
 #~ msgid "Postcard Double "
 #~ msgstr "双面明信片 "
 
+#~ msgid ""
+#~ "The printer name may only contain up to 127 printable characters and may "
+#~ "not contain spaces, slashes (/), or the pound sign (#)."
+#~ msgstr ""
+#~ "打印机名称最多可包含 127 可打印字符，不能包含空格、斜杠（/）或井号（#）。"
+
+#~ msgid ""
+#~ "The subscription name may not contain spaces, slashes (/), question marks "
+#~ "(?), or the pound sign (#)."
+#~ msgstr "订阅名称不得包含空格，斜杠（/），问号（?）或井号（#）。"
+
+#~ msgid "Unable to add RSS subscription"
+#~ msgstr "无法添加 RSS 订阅"
+
+#~ msgid "Unable to cancel RSS subscription"
+#~ msgstr "无法取消 RSS 订阅"
+
 #~ msgid ""
 #~ "Usage: ippdiscover [options] -a\n"
 #~ "       ippdiscover [options] \"service name\"\n"

diff --git a/locale/locale.txt b/locale/locale.txt
deleted file mode 100644 (file)
index f9abe72..0000000
--- a/locale/locale.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-This directory contains the message strings used by CUPS for various
-languages.  Each subdirectory corresponds to a different locale, and
-the cups_xx and cups_xx_YY files contain the messages for the locales
-named "xx" or "xx_YY".
-
-Each message file starts with a character set identifier, which can be
-one of the following:
-
-    us-ascii
-    iso-8859-1
-    iso-8859-2
-    iso-8859-3
-    iso-8859-4
-    iso-8859-5
-    iso-8859-6
-    iso-8859-7
-    iso-8859-8
-    iso-8859-9
-    utf-8
-
-After that, all non-blank lines are treated as messages, with any
-leading whitespace removed.  If a line starts with a number then the
-message index is updated to the number.  Otherwise, the next message
-number is used.
-
-The message indices are defined in the include file <cups/language.h>.
-The HTTP status messages use the status codes defined in <cups/http.h>.
-
-If you would like to contribute a new message file for your locale, or
-have corrections to the current ones, please send them to:
-
-    cups-support@cups.org