Fix localization of media type values, add a few common vendor-specific types.

[thirdparty/cups.git] / locale / cups.pot

diff --git a/locale/cups.pot b/locale/cups.pot
index c655987518cd99f8b5599cf560d5d87cac2f1fc1..56ca590999e67b0a1cdd42653277d3971ea3005f 100644 (file)
--- a/locale/cups.pot
+++ b/locale/cups.pot
@@ -1,9 +1,7 @@
 #
-# "$Id$"
-#
 # Message catalog template for CUPS.
 #
-# Copyright 2007-2014 by Apple Inc.
+# Copyright 2007-2016 by Apple Inc.
 # Copyright 2005-2007 by Easy Software Products.
 #
 # These coded instructions, statements, and computer programs are the
@@ -30,7 +28,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2014-03-17 07:47-0400\n"
+"POT-Creation-Date: 2017-03-09 15:19-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"
@@ -39,746 +37,741 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: systemv/lpstat.c:1887 systemv/lpstat.c:2010
+#: systemv/lpstat.c:1861 systemv/lpstat.c:1980
 msgid "\t\t(all)"
 msgstr ""
 
-#: systemv/lpstat.c:1890 systemv/lpstat.c:1893 systemv/lpstat.c:2013
-#: systemv/lpstat.c:2016
+#: systemv/lpstat.c:1864 systemv/lpstat.c:1867 systemv/lpstat.c:1983
+#: systemv/lpstat.c:1986
 msgid "\t\t(none)"
 msgstr ""
 
-#: berkeley/lpc.c:426
+#: berkeley/lpc.c:424
 #, c-format
 msgid "\t%d entries"
 msgstr ""
 
-#: systemv/lpstat.c:785 systemv/lpstat.c:801
+#: systemv/lpstat.c:781 systemv/lpstat.c:797
 #, c-format
 msgid "\t%s"
 msgstr ""
 
-#: systemv/lpstat.c:1868 systemv/lpstat.c:1991
+#: systemv/lpstat.c:1842 systemv/lpstat.c:1961
 msgid "\tAfter fault: continue"
 msgstr ""
 
-#: systemv/lpstat.c:1488 systemv/lpstat.c:1837 systemv/lpstat.c:1961
+#: systemv/lpstat.c:1469 systemv/lpstat.c:1815 systemv/lpstat.c:1935
 #, c-format
 msgid "\tAlerts: %s"
 msgstr ""
 
-#: systemv/lpstat.c:1891 systemv/lpstat.c:2014
+#: systemv/lpstat.c:1865 systemv/lpstat.c:1984
 msgid "\tBanner required"
 msgstr ""
 
-#: systemv/lpstat.c:1892 systemv/lpstat.c:2015
+#: systemv/lpstat.c:1866 systemv/lpstat.c:1985
 msgid "\tCharset sets:"
 msgstr ""
 
-#: systemv/lpstat.c:1856 systemv/lpstat.c:1979
+#: systemv/lpstat.c:1834 systemv/lpstat.c:1953
 msgid "\tConnection: direct"
 msgstr ""
 
-#: systemv/lpstat.c:1847 systemv/lpstat.c:1971
+#: systemv/lpstat.c:1825 systemv/lpstat.c:1945
 msgid "\tConnection: remote"
 msgstr ""
 
-#: systemv/lpstat.c:1813 systemv/lpstat.c:1937
+#: systemv/lpstat.c:1791 systemv/lpstat.c:1911
 msgid "\tContent types: any"
 msgstr ""
 
-#: systemv/lpstat.c:1895 systemv/lpstat.c:2018
+#: systemv/lpstat.c:1869 systemv/lpstat.c:1988
 msgid "\tDefault page size:"
 msgstr ""
 
-#: systemv/lpstat.c:1894 systemv/lpstat.c:2017
+#: systemv/lpstat.c:1868 systemv/lpstat.c:1987
 msgid "\tDefault pitch:"
 msgstr ""
 
-#: systemv/lpstat.c:1896 systemv/lpstat.c:2019
+#: systemv/lpstat.c:1870 systemv/lpstat.c:1989
 msgid "\tDefault port settings:"
 msgstr ""
 
-#: systemv/lpstat.c:1819 systemv/lpstat.c:1943
+#: systemv/lpstat.c:1797 systemv/lpstat.c:1917
 #, c-format
 msgid "\tDescription: %s"
 msgstr ""
 
-#: systemv/lpstat.c:1812 systemv/lpstat.c:1936
+#: systemv/lpstat.c:1790 systemv/lpstat.c:1910
 msgid "\tForm mounted:"
 msgstr ""
 
-#: systemv/lpstat.c:1889 systemv/lpstat.c:2012
+#: systemv/lpstat.c:1863 systemv/lpstat.c:1982
 msgid "\tForms allowed:"
 msgstr ""
 
-#: systemv/lpstat.c:1851 systemv/lpstat.c:1975
+#: systemv/lpstat.c:1829 systemv/lpstat.c:1949
 #, c-format
 msgid "\tInterface: %s.ppd"
 msgstr ""
 
-#: systemv/lpstat.c:1860 systemv/lpstat.c:1983
-#, c-format
-msgid "\tInterface: %s/interfaces/%s"
-msgstr ""
-
-#: systemv/lpstat.c:1864 systemv/lpstat.c:1987
+#: systemv/lpstat.c:1838 systemv/lpstat.c:1957
 #, c-format
 msgid "\tInterface: %s/ppd/%s.ppd"
 msgstr ""
 
-#: systemv/lpstat.c:1842 systemv/lpstat.c:1966
+#: systemv/lpstat.c:1820 systemv/lpstat.c:1940
 #, c-format
 msgid "\tLocation: %s"
 msgstr ""
 
-#: systemv/lpstat.c:1867 systemv/lpstat.c:1990
+#: systemv/lpstat.c:1841 systemv/lpstat.c:1960
 msgid "\tOn fault: no alert"
 msgstr ""
 
-#: systemv/lpstat.c:1814 systemv/lpstat.c:1938
+#: systemv/lpstat.c:1792 systemv/lpstat.c:1912
 msgid "\tPrinter types: unknown"
 msgstr ""
 
-#: systemv/lpstat.c:1471
+#: systemv/lpstat.c:1452
 #, c-format
 msgid "\tStatus: %s"
 msgstr ""
 
-#: systemv/lpstat.c:1872 systemv/lpstat.c:1886 systemv/lpstat.c:1995
-#: systemv/lpstat.c:2009
+#: systemv/lpstat.c:1846 systemv/lpstat.c:1860 systemv/lpstat.c:1965
+#: systemv/lpstat.c:1979
 msgid "\tUsers allowed:"
 msgstr ""
 
-#: systemv/lpstat.c:1879 systemv/lpstat.c:2002
+#: systemv/lpstat.c:1853 systemv/lpstat.c:1972
 msgid "\tUsers denied:"
 msgstr ""
 
-#: berkeley/lpc.c:428
+#: berkeley/lpc.c:426
 msgid "\tdaemon present"
 msgstr ""
 
-#: berkeley/lpc.c:424
+#: berkeley/lpc.c:422
 msgid "\tno entries"
 msgstr ""
 
-#: berkeley/lpc.c:396 berkeley/lpc.c:408
+#: berkeley/lpc.c:394 berkeley/lpc.c:406
 #, c-format
 msgid "\tprinter is on device '%s' speed -1"
 msgstr ""
 
-#: berkeley/lpc.c:421
+#: berkeley/lpc.c:419
 msgid "\tprinting is disabled"
 msgstr ""
 
-#: berkeley/lpc.c:419
+#: berkeley/lpc.c:417
 msgid "\tprinting is enabled"
 msgstr ""
 
-#: systemv/lpstat.c:1491
+#: systemv/lpstat.c:1472
 #, c-format
 msgid "\tqueued for %s"
 msgstr ""
 
-#: berkeley/lpc.c:416
+#: berkeley/lpc.c:414
 msgid "\tqueuing is disabled"
 msgstr ""
 
-#: berkeley/lpc.c:414
+#: berkeley/lpc.c:412
 msgid "\tqueuing is enabled"
 msgstr ""
 
-#: systemv/lpstat.c:1805 systemv/lpstat.c:1929
+#: systemv/lpstat.c:1783 systemv/lpstat.c:1903
 msgid "\treason unknown"
 msgstr ""
 
-#: systemv/cupstestppd.c:454
+#: systemv/cupstestppd.c:432
 msgid ""
 "\n"
 "    DETAILED CONFORMANCE TEST RESULTS"
 msgstr ""
 
-#: systemv/cupstestppd.c:3820
+#: systemv/cupstestppd.c:3862
 msgid "                          Ignore specific warnings."
 msgstr ""
 
-#: systemv/cupstestppd.c:3824
+#: systemv/cupstestppd.c:3866
 msgid "                          Issue warnings instead of errors."
 msgstr ""
 
-#: systemv/cupstestppd.c:410 systemv/cupstestppd.c:415
+#: systemv/cupstestppd.c:388 systemv/cupstestppd.c:393
 msgid "                REF: Page 15, section 3.1."
 msgstr ""
 
-#: systemv/cupstestppd.c:405
+#: systemv/cupstestppd.c:383
 msgid "                REF: Page 15, section 3.2."
 msgstr ""
 
-#: systemv/cupstestppd.c:425
+#: systemv/cupstestppd.c:403
 msgid "                REF: Page 19, section 3.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:378
+#: systemv/cupstestppd.c:356
 msgid "                REF: Page 20, section 3.4."
 msgstr ""
 
-#: systemv/cupstestppd.c:430
+#: systemv/cupstestppd.c:408
 msgid "                REF: Page 27, section 3.5."
 msgstr ""
 
-#: systemv/cupstestppd.c:373
+#: systemv/cupstestppd.c:351
 msgid "                REF: Page 42, section 5.2."
 msgstr ""
 
-#: systemv/cupstestppd.c:420
+#: systemv/cupstestppd.c:398
 msgid "                REF: Pages 16-17, section 3.2."
 msgstr ""
 
-#: systemv/cupstestppd.c:390
+#: systemv/cupstestppd.c:368
 msgid "                REF: Pages 42-45, section 5.2."
 msgstr ""
 
-#: systemv/cupstestppd.c:384
+#: systemv/cupstestppd.c:362
 msgid "                REF: Pages 45-46, section 5.2."
 msgstr ""
 
-#: systemv/cupstestppd.c:395
+#: systemv/cupstestppd.c:373
 msgid "                REF: Pages 48-49, section 5.2."
 msgstr ""
 
-#: systemv/cupstestppd.c:400
+#: systemv/cupstestppd.c:378
 msgid "                REF: Pages 52-54, section 5.2."
 msgstr ""
 
-#: berkeley/lpq.c:528
+#: berkeley/lpq.c:537
 #, c-format
 msgid "        %-39.39s %.0f bytes"
 msgstr ""
 
-#: systemv/cupstestppd.c:589
+#: systemv/cupstestppd.c:567
 #, c-format
 msgid "        PASS    Default%s"
 msgstr ""
 
-#: systemv/cupstestppd.c:524
+#: systemv/cupstestppd.c:502
 msgid "        PASS    DefaultImageableArea"
 msgstr ""
 
-#: systemv/cupstestppd.c:558
+#: systemv/cupstestppd.c:536
 msgid "        PASS    DefaultPaperDimension"
 msgstr ""
 
-#: systemv/cupstestppd.c:631
+#: systemv/cupstestppd.c:609
 msgid "        PASS    FileVersion"
 msgstr ""
 
-#: systemv/cupstestppd.c:675
+#: systemv/cupstestppd.c:653
 msgid "        PASS    FormatVersion"
 msgstr ""
 
-#: systemv/cupstestppd.c:695
+#: systemv/cupstestppd.c:673
 msgid "        PASS    LanguageEncoding"
 msgstr ""
 
-#: systemv/cupstestppd.c:715
+#: systemv/cupstestppd.c:693
 msgid "        PASS    LanguageVersion"
 msgstr ""
 
-#: systemv/cupstestppd.c:769
+#: systemv/cupstestppd.c:747
 msgid "        PASS    Manufacturer"
 msgstr ""
 
-#: systemv/cupstestppd.c:809
+#: systemv/cupstestppd.c:787
 msgid "        PASS    ModelName"
 msgstr ""
 
-#: systemv/cupstestppd.c:829
+#: systemv/cupstestppd.c:807
 msgid "        PASS    NickName"
 msgstr ""
 
-#: systemv/cupstestppd.c:889
+#: systemv/cupstestppd.c:867
 msgid "        PASS    PCFileName"
 msgstr ""
 
-#: systemv/cupstestppd.c:964
+#: systemv/cupstestppd.c:942
 msgid "        PASS    PSVersion"
 msgstr ""
 
-#: systemv/cupstestppd.c:869
+#: systemv/cupstestppd.c:847
 msgid "        PASS    PageRegion"
 msgstr ""
 
-#: systemv/cupstestppd.c:849
+#: systemv/cupstestppd.c:827
 msgid "        PASS    PageSize"
 msgstr ""
 
-#: systemv/cupstestppd.c:924
+#: systemv/cupstestppd.c:902
 msgid "        PASS    Product"
 msgstr ""
 
-#: systemv/cupstestppd.c:999
+#: systemv/cupstestppd.c:977
 msgid "        PASS    ShortNickName"
 msgstr ""
 
-#: systemv/cupstestppd.c:1374
+#: systemv/cupstestppd.c:1352
 #, c-format
 msgid "        WARN    %s has no corresponding options."
 msgstr ""
 
-#: systemv/cupstestppd.c:1486
+#: systemv/cupstestppd.c:1464
 #, c-format
 msgid ""
 "        WARN    %s shares a common prefix with %s\n"
 "                REF: Page 15, section 3.2."
 msgstr ""
 
-#: systemv/cupstestppd.c:1345
+#: systemv/cupstestppd.c:1323
 #, c-format
 msgid ""
 "        WARN    Duplex option keyword %s may not work as expected and should be named Duplex.\n"
 "                REF: Page 122, section 5.17"
 msgstr ""
 
-#: systemv/cupstestppd.c:1744
+#: systemv/cupstestppd.c:1722
 msgid "        WARN    File contains a mix of CR, LF, and CR LF line endings."
 msgstr ""
 
-#: systemv/cupstestppd.c:1390
+#: systemv/cupstestppd.c:1368
 msgid ""
 "        WARN    LanguageEncoding required by PPD 4.3 spec.\n"
 "                REF: Pages 56-57, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1726
+#: systemv/cupstestppd.c:1704
 #, c-format
 msgid "        WARN    Line %d only contains whitespace."
 msgstr ""
 
-#: systemv/cupstestppd.c:1398
+#: systemv/cupstestppd.c:1376
 msgid ""
 "        WARN    Manufacturer required by PPD 4.3 spec.\n"
 "                REF: Pages 58-59, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1749
+#: systemv/cupstestppd.c:1727
 msgid "        WARN    Non-Windows PPD files should use lines ending with only LF, not CR LF."
 msgstr ""
 
-#: systemv/cupstestppd.c:1382
+#: systemv/cupstestppd.c:1360
 #, c-format
 msgid ""
 "        WARN    Obsolete PPD version %.1f.\n"
 "                REF: Page 42, section 5.2."
 msgstr ""
 
-#: systemv/cupstestppd.c:1413
+#: systemv/cupstestppd.c:1391
 msgid ""
 "        WARN    PCFileName longer than 8.3 in violation of PPD spec.\n"
 "                REF: Pages 61-62, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1421
+#: systemv/cupstestppd.c:1399
 msgid ""
 "        WARN    PCFileName should contain a unique filename.\n"
 "                REF: Pages 61-62, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1456
+#: systemv/cupstestppd.c:1434
 msgid ""
 "        WARN    Protocols contains PJL but JCL attributes are not set.\n"
 "                REF: Pages 78-79, section 5.7."
 msgstr ""
 
-#: systemv/cupstestppd.c:1447
+#: systemv/cupstestppd.c:1425
 msgid ""
 "        WARN    Protocols contains both PJL and BCP; expected TBCP.\n"
 "                REF: Pages 78-79, section 5.7."
 msgstr ""
 
-#: systemv/cupstestppd.c:1430
+#: systemv/cupstestppd.c:1408
 msgid ""
 "        WARN    ShortNickName required by PPD 4.3 spec.\n"
 "                REF: Pages 64-65, section 5.3."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:282
+#: systemv/cupsaddsmb.c:274
 msgid "       cupsaddsmb [options] -a"
 msgstr ""
 
-#: systemv/cupstestdsc.c:427
+#: systemv/cupstestdsc.c:419
 msgid "       cupstestdsc [options] -"
 msgstr ""
 
-#: systemv/cupstestppd.c:3815
+#: systemv/cupstestppd.c:3857
 msgid "       program | cupstestppd [options] -"
 msgstr ""
 
-#: systemv/cupstestppd.c:3747
+#: systemv/cupstestppd.c:3789
 #, c-format
 msgid ""
 "      %s  \"%s %s\" conflicts with \"%s %s\"\n"
 "                (constraint=\"%s %s %s %s\")."
 msgstr ""
 
-#: systemv/cupstestppd.c:2248
+#: systemv/cupstestppd.c:2226
 #, c-format
 msgid "      %s  %s %s does not exist."
 msgstr ""
 
-#: systemv/cupstestppd.c:3904
+#: systemv/cupstestppd.c:3946
 #, c-format
 msgid "      %s  %s file \"%s\" has the wrong capitalization."
 msgstr ""
 
-#: systemv/cupstestppd.c:2318
+#: systemv/cupstestppd.c:2296
 #, c-format
 msgid ""
 "      %s  Bad %s choice %s.\n"
 "                REF: Page 122, section 5.17"
 msgstr ""
 
-#: systemv/cupstestppd.c:3507 systemv/cupstestppd.c:3556
-#: systemv/cupstestppd.c:3595
+#: systemv/cupstestppd.c:3549 systemv/cupstestppd.c:3598
+#: systemv/cupstestppd.c:3637
 #, c-format
 msgid "      %s  Bad UTF-8 \"%s\" translation string for option %s, choice %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:3461
+#: systemv/cupstestppd.c:3503
 #, c-format
 msgid "      %s  Bad UTF-8 \"%s\" translation string for option %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:2389
+#: systemv/cupstestppd.c:2367 systemv/cupstestppd.c:2389
 #, c-format
 msgid "      %s  Bad cupsFilter value \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:2475
+#: systemv/cupstestppd.c:2485 systemv/cupstestppd.c:2507
 #, c-format
 msgid "      %s  Bad cupsFilter2 value \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:2964
+#: systemv/cupstestppd.c:3006
 #, c-format
 msgid "      %s  Bad cupsICCProfile %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:2571
+#: systemv/cupstestppd.c:2613
 #, c-format
 msgid "      %s  Bad cupsPreFilter value \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:1822
+#: systemv/cupstestppd.c:1800
 #, c-format
 msgid "      %s  Bad cupsUIConstraints %s: \"%s\""
 msgstr ""
 
-#: systemv/cupstestppd.c:3411
+#: systemv/cupstestppd.c:3453
 #, c-format
 msgid "      %s  Bad language \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:2433 systemv/cupstestppd.c:2529
-#: systemv/cupstestppd.c:2615 systemv/cupstestppd.c:2673
-#: systemv/cupstestppd.c:2728 systemv/cupstestppd.c:2783
-#: systemv/cupstestppd.c:2838 systemv/cupstestppd.c:2891
-#: systemv/cupstestppd.c:3013
+#: 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
 #, c-format
 msgid "      %s  Bad permissions on %s file \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:2373 systemv/cupstestppd.c:2459
-#: systemv/cupstestppd.c:2555 systemv/cupstestppd.c:2642
-#: systemv/cupstestppd.c:2697 systemv/cupstestppd.c:2752
-#: systemv/cupstestppd.c:2807 systemv/cupstestppd.c:2862
+#: 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
 #, c-format
 msgid "      %s  Bad spelling of %s - should be %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:2907
+#: systemv/cupstestppd.c:2949
 #, c-format
 msgid "      %s  Cannot provide both APScanAppPath and APScanAppBundleID."
 msgstr ""
 
-#: systemv/cupstestppd.c:2205
+#: systemv/cupstestppd.c:2183
 #, c-format
 msgid "      %s  Default choices conflicting."
 msgstr ""
 
-#: systemv/cupstestppd.c:1803
+#: systemv/cupstestppd.c:1781
 #, c-format
 msgid "      %s  Empty cupsUIConstraints %s"
 msgstr ""
 
-#: systemv/cupstestppd.c:3539 systemv/cupstestppd.c:3579
+#: systemv/cupstestppd.c:3581 systemv/cupstestppd.c:3621
 #, c-format
 msgid "      %s  Missing \"%s\" translation string for option %s, choice %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:3447
+#: systemv/cupstestppd.c:3489
 #, c-format
 msgid "      %s  Missing \"%s\" translation string for option %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:2418 systemv/cupstestppd.c:2514
-#: systemv/cupstestppd.c:2600 systemv/cupstestppd.c:2658
-#: systemv/cupstestppd.c:2713 systemv/cupstestppd.c:2768
-#: systemv/cupstestppd.c:2823 systemv/cupstestppd.c:2875
-#: systemv/cupstestppd.c:2998
+#: 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
 #, c-format
 msgid "      %s  Missing %s file \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:3121
+#: systemv/cupstestppd.c:3163
 #, c-format
 msgid ""
 "      %s  Missing REQUIRED PageRegion option.\n"
 "                REF: Page 100, section 5.14."
 msgstr ""
 
-#: systemv/cupstestppd.c:3106
+#: systemv/cupstestppd.c:3148
 #, c-format
 msgid ""
 "      %s  Missing REQUIRED PageSize option.\n"
 "                REF: Page 99, section 5.14."
 msgstr ""
 
-#: systemv/cupstestppd.c:2013 systemv/cupstestppd.c:2054
+#: systemv/cupstestppd.c:1991 systemv/cupstestppd.c:2032
 #, c-format
 msgid "      %s  Missing choice *%s %s in UIConstraints \"*%s %s *%s %s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:1908
+#: systemv/cupstestppd.c:1886
 #, c-format
 msgid "      %s  Missing choice *%s %s in cupsUIConstraints %s: \"%s\""
 msgstr ""
 
-#: systemv/cupstestppd.c:1840
+#: systemv/cupstestppd.c:1818
 #, c-format
 msgid "      %s  Missing cupsUIResolver %s"
 msgstr ""
 
-#: systemv/cupstestppd.c:1999 systemv/cupstestppd.c:2040
+#: systemv/cupstestppd.c:1977 systemv/cupstestppd.c:2018
 #, c-format
 msgid "      %s  Missing option %s in UIConstraints \"*%s %s *%s %s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:1892
+#: systemv/cupstestppd.c:1870
 #, c-format
 msgid "      %s  Missing option %s in cupsUIConstraints %s: \"%s\""
 msgstr ""
 
-#: systemv/cupstestppd.c:3633
+#: systemv/cupstestppd.c:3675
 #, c-format
 msgid "      %s  No base translation \"%s\" is included in file."
 msgstr ""
 
-#: systemv/cupstestppd.c:2294
+#: systemv/cupstestppd.c:2272
 #, c-format
 msgid ""
 "      %s  REQUIRED %s does not define choice None.\n"
 "                REF: Page 122, section 5.17"
 msgstr ""
 
-#: systemv/cupstestppd.c:3180 systemv/cupstestppd.c:3194
+#: systemv/cupstestppd.c:3222 systemv/cupstestppd.c:3236
 #, c-format
 msgid "      %s  Size \"%s\" defined for %s but not for %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:3160
+#: systemv/cupstestppd.c:3202
 #, c-format
 msgid "      %s  Size \"%s\" has unexpected dimensions (%gx%g)."
 msgstr ""
 
-#: systemv/cupstestppd.c:3351
+#: systemv/cupstestppd.c:3393
 #, c-format
 msgid "      %s  Size \"%s\" should be \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:3300
+#: systemv/cupstestppd.c:3342
 #, c-format
 msgid "      %s  Size \"%s\" should be the Adobe standard name \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:3041
+#: systemv/cupstestppd.c:3083
 #, c-format
 msgid "      %s  cupsICCProfile %s hash value collides with %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:1963
+#: systemv/cupstestppd.c:1941
 #, c-format
 msgid "      %s  cupsUIResolver %s causes a loop."
 msgstr ""
 
-#: systemv/cupstestppd.c:1945
+#: systemv/cupstestppd.c:1923
 #, c-format
 msgid "      %s  cupsUIResolver %s does not list at least two different options."
 msgstr ""
 
-#: systemv/cupstestppd.c:1168
+#: systemv/cupstestppd.c:1146
 #, c-format
 msgid ""
 "      **FAIL**  %s must be 1284DeviceID\n"
 "                REF: Page 72, section 5.5"
 msgstr ""
 
-#: systemv/cupstestppd.c:580
+#: systemv/cupstestppd.c:558
 #, c-format
 msgid ""
 "      **FAIL**  Bad Default%s %s\n"
 "                REF: Page 40, section 4.5."
 msgstr ""
 
-#: systemv/cupstestppd.c:514
+#: systemv/cupstestppd.c:492
 #, c-format
 msgid ""
 "      **FAIL**  Bad DefaultImageableArea %s\n"
 "                REF: Page 102, section 5.15."
 msgstr ""
 
-#: systemv/cupstestppd.c:550
+#: systemv/cupstestppd.c:528
 #, c-format
 msgid ""
 "      **FAIL**  Bad DefaultPaperDimension %s\n"
 "                REF: Page 103, section 5.15."
 msgstr ""
 
-#: systemv/cupstestppd.c:623
+#: systemv/cupstestppd.c:601
 #, c-format
 msgid ""
 "      **FAIL**  Bad FileVersion \"%s\"\n"
 "                REF: Page 56, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:667
+#: systemv/cupstestppd.c:645
 #, c-format
 msgid ""
 "      **FAIL**  Bad FormatVersion \"%s\"\n"
 "                REF: Page 56, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1025
+#: systemv/cupstestppd.c:1003
 msgid ""
 "      **FAIL**  Bad JobPatchFile attribute in file\n"
 "                REF: Page 24, section 3.4."
 msgstr ""
 
-#: systemv/cupstestppd.c:1213
+#: systemv/cupstestppd.c:1191
 #, c-format
 msgid "      **FAIL**  Bad LanguageEncoding %s - must be ISOLatin1."
 msgstr ""
 
-#: systemv/cupstestppd.c:1227
+#: systemv/cupstestppd.c:1205
 #, c-format
 msgid "      **FAIL**  Bad LanguageVersion %s - must be English."
 msgstr ""
 
-#: systemv/cupstestppd.c:743 systemv/cupstestppd.c:760
+#: systemv/cupstestppd.c:721 systemv/cupstestppd.c:738
 #, c-format
 msgid ""
 "      **FAIL**  Bad Manufacturer (should be \"%s\")\n"
 "                REF: Page 211, table D.1."
 msgstr ""
 
-#: systemv/cupstestppd.c:800
+#: systemv/cupstestppd.c:778
 #, c-format
 msgid ""
 "      **FAIL**  Bad ModelName - \"%c\" not allowed in string.\n"
 "                REF: Pages 59-60, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:956
+#: systemv/cupstestppd.c:934
 msgid ""
 "      **FAIL**  Bad PSVersion - not \"(string) int\".\n"
 "                REF: Pages 62-64, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:917
+#: systemv/cupstestppd.c:895
 msgid ""
 "      **FAIL**  Bad Product - not \"(string)\".\n"
 "                REF: Page 62, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:991
+#: systemv/cupstestppd.c:969
 msgid ""
 "      **FAIL**  Bad ShortNickName - longer than 31 chars.\n"
 "                REF: Pages 64-65, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1149
+#: systemv/cupstestppd.c:1127
 #, c-format
 msgid ""
 "      **FAIL**  Bad option %s choice %s\n"
 "                REF: Page 84, section 5.9"
 msgstr ""
 
-#: systemv/cupstestppd.c:3774 systemv/cupstestppd.c:3796
+#: systemv/cupstestppd.c:3816 systemv/cupstestppd.c:3838
 #, c-format
 msgid "      **FAIL**  Default option code cannot be interpreted: %s"
 msgstr ""
 
-#: systemv/cupstestppd.c:1286
+#: systemv/cupstestppd.c:1264
 #, c-format
 msgid "      **FAIL**  Default translation string for option %s choice %s contains 8-bit characters."
 msgstr ""
 
-#: systemv/cupstestppd.c:1259
+#: systemv/cupstestppd.c:1237
 #, c-format
 msgid "      **FAIL**  Default translation string for option %s contains 8-bit characters."
 msgstr ""
 
-#: systemv/cupstestppd.c:2101
+#: systemv/cupstestppd.c:2079
 #, c-format
 msgid "      **FAIL**  Group names %s and %s differ only by case."
 msgstr ""
 
-#: systemv/cupstestppd.c:2146
+#: systemv/cupstestppd.c:2124
 #, c-format
 msgid "      **FAIL**  Multiple occurrences of option %s choice name %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:2163
+#: systemv/cupstestppd.c:2141
 #, c-format
 msgid "      **FAIL**  Option %s choice names %s and %s differ only by case."
 msgstr ""
 
-#: systemv/cupstestppd.c:2123
+#: systemv/cupstestppd.c:2101
 #, c-format
 msgid "      **FAIL**  Option names %s and %s differ only by case."
 msgstr ""
 
-#: systemv/cupstestppd.c:600
+#: systemv/cupstestppd.c:578
 #, c-format
 msgid ""
 "      **FAIL**  REQUIRED Default%s\n"
 "                REF: Page 40, section 4.5."
 msgstr ""
 
-#: systemv/cupstestppd.c:499
+#: systemv/cupstestppd.c:477
 msgid ""
 "      **FAIL**  REQUIRED DefaultImageableArea\n"
 "                REF: Page 102, section 5.15."
 msgstr ""
 
-#: systemv/cupstestppd.c:535
+#: systemv/cupstestppd.c:513
 msgid ""
 "      **FAIL**  REQUIRED DefaultPaperDimension\n"
 "                REF: Page 103, section 5.15."
 msgstr ""
 
-#: systemv/cupstestppd.c:641
+#: systemv/cupstestppd.c:619
 msgid ""
 "      **FAIL**  REQUIRED FileVersion\n"
 "                REF: Page 56, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:685
+#: systemv/cupstestppd.c:663
 msgid ""
 "      **FAIL**  REQUIRED FormatVersion\n"
 "                REF: Page 56, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1076
+#: systemv/cupstestppd.c:1054
 #, c-format
 msgid ""
 "      **FAIL**  REQUIRED ImageableArea for PageSize %s\n"
@@ -786,68 +779,68 @@ msgid ""
 "                REF: Page 102, section 5.15."
 msgstr ""
 
-#: systemv/cupstestppd.c:705
+#: systemv/cupstestppd.c:683
 msgid ""
 "      **FAIL**  REQUIRED LanguageEncoding\n"
 "                REF: Pages 56-57, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:725
+#: systemv/cupstestppd.c:703
 msgid ""
 "      **FAIL**  REQUIRED LanguageVersion\n"
 "                REF: Pages 57-58, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:779
+#: systemv/cupstestppd.c:757
 msgid ""
 "      **FAIL**  REQUIRED Manufacturer\n"
 "                REF: Pages 58-59, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:819
+#: systemv/cupstestppd.c:797
 msgid ""
 "      **FAIL**  REQUIRED ModelName\n"
 "                REF: Pages 59-60, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:839
+#: systemv/cupstestppd.c:817
 msgid ""
 "      **FAIL**  REQUIRED NickName\n"
 "                REF: Page 60, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:899
+#: systemv/cupstestppd.c:877
 msgid ""
 "      **FAIL**  REQUIRED PCFileName\n"
 "                REF: Pages 61-62, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:974
+#: systemv/cupstestppd.c:952
 msgid ""
 "      **FAIL**  REQUIRED PSVersion\n"
 "                REF: Pages 62-64, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:879
+#: systemv/cupstestppd.c:857
 msgid ""
 "      **FAIL**  REQUIRED PageRegion\n"
 "                REF: Page 100, section 5.14."
 msgstr ""
 
-#: systemv/cupstestppd.c:1045
+#: systemv/cupstestppd.c:1023
 msgid ""
 "      **FAIL**  REQUIRED PageSize\n"
 "                REF: Page 41, section 5.\n"
 "                REF: Page 99, section 5.14."
 msgstr ""
 
-#: systemv/cupstestppd.c:859
+#: systemv/cupstestppd.c:837
 msgid ""
 "      **FAIL**  REQUIRED PageSize\n"
 "                REF: Pages 99-100, section 5.14."
 msgstr ""
 
-#: systemv/cupstestppd.c:1098
+#: systemv/cupstestppd.c:1076
 #, c-format
 msgid ""
 "      **FAIL**  REQUIRED PaperDimension for PageSize %s\n"
@@ -855,983 +848,1051 @@ msgid ""
 "                REF: Page 103, section 5.15."
 msgstr ""
 
-#: systemv/cupstestppd.c:934
+#: systemv/cupstestppd.c:912
 msgid ""
 "      **FAIL**  REQUIRED Product\n"
 "                REF: Page 62, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1009
+#: systemv/cupstestppd.c:987
 msgid ""
 "      **FAIL**  REQUIRED ShortNickName\n"
 "                REF: Page 64-65, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:334 systemv/cupstestppd.c:353
-#: systemv/cupstestppd.c:365
+#: systemv/cupstestppd.c:312 systemv/cupstestppd.c:331
+#: systemv/cupstestppd.c:343
 #, c-format
 msgid "      **FAIL**  Unable to open PPD file - %s on line %d."
 msgstr ""
 
-#: systemv/cupstestppd.c:1498
+#: systemv/cupstestppd.c:1476
 #, c-format
 msgid "    %d ERRORS FOUND"
 msgstr ""
 
-#: systemv/cupstestdsc.c:431
+#: systemv/cupstestdsc.c:423
 msgid "    -h       Show program usage"
 msgstr ""
 
-#: systemv/cupstestdsc.c:234 systemv/cupstestdsc.c:276
+#: systemv/cupstestdsc.c:226 systemv/cupstestdsc.c:268
 #, c-format
 msgid ""
 "    Bad %%%%BoundingBox: on line %d.\n"
 "        REF: Page 39, %%%%BoundingBox:"
 msgstr ""
 
-#: systemv/cupstestdsc.c:305
+#: systemv/cupstestdsc.c:297
 #, c-format
 msgid ""
 "    Bad %%%%Page: on line %d.\n"
 "        REF: Page 53, %%%%Page:"
 msgstr ""
 
-#: systemv/cupstestdsc.c:218 systemv/cupstestdsc.c:258
+#: systemv/cupstestdsc.c:210 systemv/cupstestdsc.c:250
 #, c-format
 msgid ""
 "    Bad %%%%Pages: on line %d.\n"
 "        REF: Page 43, %%%%Pages:"
 msgstr ""
 
-#: systemv/cupstestdsc.c:176
+#: systemv/cupstestdsc.c:168
 #, c-format
 msgid ""
 "    Line %d is longer than 255 characters (%d).\n"
 "        REF: Page 25, Line Length"
 msgstr ""
 
-#: systemv/cupstestdsc.c:192
+#: systemv/cupstestdsc.c:184
 msgid ""
 "    Missing %!PS-Adobe-3.0 on first line.\n"
 "        REF: Page 17, 3.1 Conforming Documents"
 msgstr ""
 
-#: systemv/cupstestdsc.c:362
+#: systemv/cupstestdsc.c:354
 #, c-format
 msgid "    Missing %%EndComments comment.        REF: Page 41, %%EndComments"
 msgstr ""
 
-#: systemv/cupstestdsc.c:342
+#: systemv/cupstestdsc.c:334
 #, c-format
 msgid ""
 "    Missing or bad %%BoundingBox: comment.\n"
 "        REF: Page 39, %%BoundingBox:"
 msgstr ""
 
-#: systemv/cupstestdsc.c:372
+#: systemv/cupstestdsc.c:364
 #, c-format
 msgid ""
 "    Missing or bad %%Page: comments.\n"
 "        REF: Page 53, %%Page:"
 msgstr ""
 
-#: systemv/cupstestdsc.c:352
+#: systemv/cupstestdsc.c:344
 #, c-format
 msgid ""
 "    Missing or bad %%Pages: comment.\n"
 "        REF: Page 43, %%Pages:"
 msgstr ""
 
-#: systemv/cupstestppd.c:1500
+#: systemv/cupstestppd.c:1478
 msgid "    NO ERRORS FOUND"
 msgstr ""
 
-#: systemv/cupstestdsc.c:395
+#: systemv/cupstestdsc.c:387
 #, c-format
 msgid "    Saw %d lines that exceeded 255 characters."
 msgstr ""
 
-#: systemv/cupstestdsc.c:390
+#: systemv/cupstestdsc.c:382
 #, c-format
 msgid "    Too many %%BeginDocument comments."
 msgstr ""
 
-#: systemv/cupstestdsc.c:382
+#: systemv/cupstestdsc.c:374
 #, c-format
 msgid "    Too many %%EndDocument comments."
 msgstr ""
 
-#: systemv/cupstestdsc.c:402
+#: systemv/cupstestdsc.c:394
 msgid "    Warning: file contains binary data."
 msgstr ""
 
-#: systemv/cupstestdsc.c:410
+#: systemv/cupstestdsc.c:402
 #, c-format
 msgid "    Warning: no %%EndComments comment in file."
 msgstr ""
 
-#: systemv/cupstestdsc.c:406
+#: systemv/cupstestdsc.c:398
 #, c-format
 msgid "    Warning: obsolete DSC version %.1f in file."
 msgstr ""
 
-#: test/ippfind.c:2758
+#: test/ippfind.c:2794
 msgid "  ! expression            Unary NOT of expression."
 msgstr ""
 
-#: test/ippfind.c:2757
+#: test/ippfind.c:2793
 msgid "  ( expressions )         Group expressions."
 msgstr ""
 
-#: systemv/cupsctl.c:210
+#: systemv/cupsctl.c:203
 msgid "  --[no-]debug-logging    Turn debug logging on/off."
 msgstr ""
 
-#: systemv/cupsctl.c:212
+#: systemv/cupsctl.c:205
 msgid "  --[no-]remote-admin     Turn remote administration on/off."
 msgstr ""
 
-#: systemv/cupsctl.c:214
+#: systemv/cupsctl.c:207
 msgid "  --[no-]remote-any       Allow/prevent access from the Internet."
 msgstr ""
 
-#: systemv/cupsctl.c:216
+#: systemv/cupsctl.c:209
 msgid "  --[no-]share-printers   Turn printer sharing on/off."
 msgstr ""
 
-#: systemv/cupsctl.c:218
+#: systemv/cupsctl.c:211
 msgid "  --[no-]user-cancel-any  Allow/prevent users to cancel any job."
 msgstr ""
 
-#: ppdc/ppdc.cxx:455
+#: ppdc/ppdc.cxx:448
 msgid "  --cr                    End lines with CR (Mac OS 9)."
 msgstr ""
 
-#: ppdc/ppdc.cxx:457
+#: ppdc/ppdc.cxx:450
 msgid "  --crlf                  End lines with CR + LF (Windows)."
 msgstr ""
 
-#: test/ippfind.c:2739
+#: test/ippfind.c:2775
 msgid "  --domain regex          Match domain to regular expression."
 msgstr ""
 
-#: test/ippfind.c:2740
+#: test/ippfind.c:2776
 msgid ""
 "  --exec utility [argument ...] ;\n"
 "                          Execute program if true."
 msgstr ""
 
-#: test/ippfind.c:2760
+#: test/ippfind.c:2796
 msgid "  --false                 Always false."
 msgstr ""
 
-#: test/ippfind.c:2722
+#: test/ipptool.c:4931
+msgid "  --help                  Show help."
+msgstr ""
+
+#: test/ippfind.c:2758
 msgid "  --help                  Show this help."
 msgstr ""
 
-#: test/ippfind.c:2742
+#: test/ippfind.c:2778
 msgid "  --host regex            Match hostname to regular expression."
 msgstr ""
 
-#: ppdc/ppdc.cxx:459
-msgid "  --lf                    End lines with LF (UNIX/Linux/OS X)."
+#: ppdc/ppdc.cxx:452
+msgid "  --lf                    End lines with LF (UNIX/Linux/macOS)."
 msgstr ""
 
-#: test/ippfind.c:2744
+#: scheduler/cupsfilter.c:1481
+msgid "  --list-filters          List filters that will be used."
+msgstr ""
+
+#: test/ippfind.c:2780
 msgid "  --local                 True if service is local."
 msgstr ""
 
-#: test/ippfind.c:2743
+#: test/ippfind.c:2779
 msgid "  --ls                    List attributes."
 msgstr ""
 
-#: test/ippfind.c:2745
+#: test/ippfind.c:2781
 msgid "  --name regex            Match service name to regular expression."
 msgstr ""
 
-#: test/ippfind.c:2759
+#: test/ippfind.c:2795
 msgid "  --not expression        Unary NOT of expression."
 msgstr ""
 
-#: test/ippfind.c:2746
+#: test/ippfind.c:2782
 msgid "  --path regex            Match resource path to regular expression."
 msgstr ""
 
-#: test/ippfind.c:2747
+#: test/ippfind.c:2783
 msgid "  --port number[-number]  Match port to number or range."
 msgstr ""
 
-#: test/ippfind.c:2748
+#: test/ippfind.c:2784
 msgid "  --print                 Print URI if true."
 msgstr ""
 
-#: test/ippfind.c:2749
+#: test/ippfind.c:2785
 msgid "  --print-name            Print service name if true."
 msgstr ""
 
-#: test/ippfind.c:2750
+#: test/ippfind.c:2786
 msgid "  --quiet                 Quietly report match via exit code."
 msgstr ""
 
-#: test/ippfind.c:2751
+#: test/ippfind.c:2787
 msgid "  --remote                True if service is remote."
 msgstr ""
 
-#: test/ippfind.c:2761
+#: test/ipptool.c:4932
+msgid ""
+"  --stop-after-include-error\n"
+"                          Stop tests after a failed INCLUDE."
+msgstr ""
+
+#: test/ippfind.c:2797
 msgid "  --true                  Always true."
 msgstr ""
 
-#: test/ippfind.c:2752
+#: test/ippfind.c:2788
 msgid "  --txt key               True if the TXT record contains the key."
 msgstr ""
 
-#: test/ippfind.c:2753
+#: test/ippfind.c:2789
 msgid "  --txt-* regex           Match TXT record key to regular expression."
 msgstr ""
 
-#: test/ippfind.c:2754
+#: test/ippfind.c:2790
 msgid "  --uri regex             Match URI to regular expression."
 msgstr ""
 
-#: test/ippfind.c:2723
+#: test/ippfind.c:2759
 msgid "  --version               Show program version."
 msgstr ""
 
-#: test/ippfind.c:2716 test/ipptool.c:4664
+#: test/ipptool.c:4934
+msgid "  --version               Show version."
+msgstr ""
+
+#: test/ippfind.c:2752 test/ipptool.c:4935
 msgid "  -4                      Connect using IPv4."
 msgstr ""
 
-#: test/ippfind.c:2717 test/ipptool.c:4665
+#: test/ippfind.c:2753 test/ipptool.c:4936
 msgid "  -6                      Connect using IPv6."
 msgstr ""
 
-#: test/ipptool.c:4666
+#: test/ipptool.c:4937
 msgid "  -C                      Send requests using chunking (default)."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1457
+#: scheduler/cupsfilter.c:1482
 msgid "  -D                      Remove the input file when finished."
 msgstr ""
 
-#: ppdc/ppdc.cxx:438 ppdc/ppdhtml.cxx:175 ppdc/ppdpo.cxx:255
+#: ppdc/ppdc.cxx:431 ppdc/ppdhtml.cxx:178 ppdc/ppdpo.cxx:248
 msgid "  -D name=value           Set named variable to value."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:285 systemv/cupsctl.c:205
+#: systemv/cupsaddsmb.c:277 systemv/cupsctl.c:198
 msgid "  -E                      Encrypt the connection."
 msgstr ""
 
-#: test/ipptool.c:4668
+#: test/ipptool.c:4939
 msgid "  -E                      Test with HTTP Upgrade to TLS."
 msgstr ""
 
-#: scheduler/main.c:2080
+#: scheduler/main.c:2051
 msgid "  -F                      Run in the foreground but detach from console."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:286
+#: systemv/cupsaddsmb.c:278
 msgid "  -H samba-server         Use the named SAMBA server."
 msgstr ""
 
-#: test/ipptool.c:4670
+#: test/ipptool.c:4941
 msgid "  -I                      Ignore errors."
 msgstr ""
 
-#: ppdc/ppdc.cxx:440 ppdc/ppdhtml.cxx:177 ppdc/ppdi.cxx:131 ppdc/ppdpo.cxx:257
+#: ppdc/ppdc.cxx:433 ppdc/ppdhtml.cxx:180 ppdc/ppdi.cxx:124 ppdc/ppdpo.cxx:250
 msgid "  -I include-dir          Add include directory to search path."
 msgstr ""
 
-#: systemv/cupstestppd.c:3819
+#: systemv/cupstestppd.c:3861
 msgid "  -I {filename,filters,none,profiles}"
 msgstr ""
 
-#: test/ipptool.c:4671
+#: test/ipptool.c:4942
 msgid "  -L                      Send requests using content-length."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1459
+#: test/ipptool.c:4944
+msgid "  -P filename.plist       Produce XML plist to a file and test report to standard output."
+msgstr ""
+
+#: scheduler/cupsfilter.c:1483
 msgid "  -P filename.ppd         Set PPD file."
 msgstr ""
 
-#: test/ippfind.c:2726
+#: test/ippfind.c:2762
 msgid "  -P number[-number]      Match port to number or range."
 msgstr ""
 
-#: systemv/cupstestppd.c:3821
+#: systemv/cupstestppd.c:3863
 msgid "  -R root-directory       Set alternate root."
 msgstr ""
 
-#: test/ipptool.c:4673
+#: test/ipptool.c:4945
 msgid "  -S                      Test with SSL encryption."
 msgstr ""
 
-#: test/ippfind.c:2718
+#: test/ippfind.c:2754
 msgid "  -T seconds              Set the browse timeout in seconds."
 msgstr ""
 
-#: test/ipptool.c:4675
+#: test/ipptool.c:4947
 msgid "  -T seconds              Set the receive/send timeout in seconds."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1460 systemv/cupsaddsmb.c:288 systemv/cupsctl.c:206
+#: scheduler/cupsfilter.c:1484 systemv/cupsaddsmb.c:280 systemv/cupsctl.c:199
 msgid "  -U username             Specify username."
 msgstr ""
 
-#: test/ippfind.c:2720 test/ipptool.c:4677
+#: test/ippfind.c:2756 test/ipptool.c:4949
 msgid "  -V version              Set default IPP version."
 msgstr ""
 
-#: systemv/cupstestppd.c:3822
+#: systemv/cupstestppd.c:3864
 msgid "  -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,translations}"
 msgstr ""
 
-#: test/ipptool.c:4679
+#: test/ipptool.c:4951
 msgid "  -X                      Produce XML plist instead of plain text."
 msgstr ""
 
-#: test/ippdiscover.c:818
-msgid "  -a                      Browse for all services."
+#: systemv/cupsaddsmb.c:281
+msgid "  -a                      Export all printers."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:289
-msgid "  -a                      Export all printers."
+#: test/ipptool.c:4953
+msgid "  -c                      Produce CSV output."
 msgstr ""
 
-#: ppdc/ppdc.cxx:442
+#: ppdc/ppdc.cxx:435
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1461 scheduler/main.c:2078
-msgid "  -c cupsd.conf           Set cupsd.conf file to use."
+#: scheduler/cupsfilter.c:1485
+msgid "  -c cups-files.conf      Set cups-files.conf file to use."
 msgstr ""
 
-#: test/ippdiscover.c:819
-msgid "  -d domain               Browse/resolve in specified domain."
+#: scheduler/main.c:2049
+msgid "  -c cupsd.conf           Set cupsd.conf file to use."
 msgstr ""
 
-#: test/ipptool.c:4681
+#: test/ipptool.c:4954
 msgid "  -d name=value           Set named variable to value."
 msgstr ""
 
-#: ppdc/ppdc.cxx:444
+#: ppdc/ppdc.cxx:437
 msgid "  -d output-dir           Specify the output directory."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1463
+#: scheduler/cupsfilter.c:1486
 msgid "  -d printer              Use the named printer."
 msgstr ""
 
-#: test/ippfind.c:2727
+#: test/ippfind.c:2763
 msgid "  -d regex                Match domain to regular expression."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1465
+#: scheduler/cupsfilter.c:1487
 msgid "  -e                      Use every filter from the PPD file."
 msgstr ""
 
-#: scheduler/main.c:2079
+#: scheduler/main.c:2050
 msgid "  -f                      Run in the foreground."
 msgstr ""
 
-#: test/ipptool.c:4683
+#: test/ipptool.c:4956
 msgid "  -f filename             Set default request filename."
 msgstr ""
 
-#: scheduler/main.c:2082
+#: scheduler/main.c:2052
 msgid "  -h                      Show this usage message."
 msgstr ""
 
-#: test/ippfind.c:2728
+#: test/ippfind.c:2764
 msgid "  -h regex                Match hostname to regular expression."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:290 systemv/cupsctl.c:207
+#: systemv/cupsaddsmb.c:282 systemv/cupsctl.c:200
 msgid "  -h server[:port]        Specify server address."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1467
+#: scheduler/cupsfilter.c:1488
 msgid "  -i mime/type            Set input MIME type (otherwise auto-typed)."
 msgstr ""
 
-#: test/ipptool.c:4685
+#: test/ipptool.c:4958
 msgid "  -i seconds              Repeat the last file with the given time interval."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1469
+#: scheduler/cupsfilter.c:1489
 msgid "  -j job-id[,N]           Filter file N from the specified job (default is file 1)."
 msgstr ""
 
-#: test/ippfind.c:2729
+#: test/ippfind.c:2765
 msgid "  -l                      List attributes."
 msgstr ""
 
-#: scheduler/main.c:2083
-msgid "  -l                      Run cupsd from launchd(8)."
+#: test/ipptool.c:4960
+msgid "  -l                      Produce plain text output."
 msgstr ""
 
-#: ppdc/ppdc.cxx:446
+#: scheduler/main.c:2054
+msgid "  -l                      Run cupsd on demand."
+msgstr ""
+
+#: ppdc/ppdc.cxx:439
 msgid "  -l lang[,lang,...]      Specify the output language(s) (locale)."
 msgstr ""
 
-#: ppdc/ppdc.cxx:448
+#: ppdc/ppdc.cxx:441
 msgid "  -m                      Use the ModelName value as the filename."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1471
+#: scheduler/cupsfilter.c:1490
 msgid "  -m mime/type            Set output MIME type (otherwise application/pdf)."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1473
+#: scheduler/cupsfilter.c:1491
 msgid "  -n copies               Set number of copies."
 msgstr ""
 
-#: test/ipptool.c:4687
+#: test/ipptool.c:4961
 msgid "  -n count                Repeat the last file the given number of times."
 msgstr ""
 
-#: test/ippfind.c:2730
+#: test/ippfind.c:2766
 msgid "  -n regex                Match service name to regular expression."
 msgstr ""
 
-#: ppdc/ppdi.cxx:133
+#: ppdc/ppdi.cxx:126
 msgid "  -o filename.drv         Set driver information file (otherwise ppdi.drv)."
 msgstr ""
 
-#: ppdc/ppdmerge.cxx:364
+#: ppdc/ppdmerge.cxx:362
 msgid "  -o filename.ppd[.gz]    Set output file (otherwise stdout)."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1474
+#: scheduler/cupsfilter.c:1492
 msgid "  -o name=value           Set option(s)."
 msgstr ""
 
-#: test/ippfind.c:2731
+#: test/ippfind.c:2767
 msgid "  -p                      Print URI if true."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1475
+#: scheduler/cupsfilter.c:1493
 msgid "  -p filename.ppd         Set PPD file."
 msgstr ""
 
-#: test/ippdiscover.c:820
-msgid "  -p program              Run specified program for each service."
-msgstr ""
-
-#: test/ippfind.c:2732
+#: test/ippfind.c:2768
 msgid "  -q                      Quietly report match via exit code."
 msgstr ""
 
-#: systemv/cupstestppd.c:3826 test/ipptool.c:4689
+#: systemv/cupstestppd.c:3868 test/ipptool.c:4963
 msgid "  -q                      Run silently."
 msgstr ""
 
-#: test/ippfind.c:2733
+#: test/ippfind.c:2769
 msgid "  -r                      True if service is remote."
 msgstr ""
 
-#: systemv/cupstestppd.c:3827
+#: systemv/cupstestppd.c:3869
 msgid "  -r                      Use 'relaxed' open mode."
 msgstr ""
 
-#: test/ippfind.c:2734
+#: test/ippfind.c:2770
 msgid "  -s                      Print service name if true."
 msgstr ""
 
-#: test/ipptool.c:4690
+#: scheduler/main.c:2056
+msgid "  -s cups-files.conf      Set cups-files.conf file to use."
+msgstr ""
+
+#: test/ipptool.c:4964
 msgid "  -t                      Produce a test report."
 msgstr ""
 
-#: ppdc/ppdc.cxx:450
+#: ppdc/ppdc.cxx:443
 msgid "  -t                      Test PPDs instead of generating them."
 msgstr ""
 
-#: scheduler/main.c:2084
+#: scheduler/main.c:2057
 msgid "  -t                      Test the configuration file."
 msgstr ""
 
-#: test/ippfind.c:2735
+#: test/ippfind.c:2771
 msgid "  -t key                  True if the TXT record contains the key."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1476
+#: scheduler/cupsfilter.c:1494
 msgid "  -t title                Set title."
 msgstr ""
 
-#: test/ippdiscover.c:821
-msgid "  -t type                 Browse/resolve with specified type."
-msgstr ""
-
-#: scheduler/cupsfilter.c:1477
+#: scheduler/cupsfilter.c:1495
 msgid "  -u                      Remove the PPD file when finished."
 msgstr ""
 
-#: test/ippfind.c:2736
+#: test/ippfind.c:2772
 msgid "  -u regex                Match URI to regular expression."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:291 systemv/cupstestppd.c:3828 test/ipptool.c:4691
-#: ppdc/ppdc.cxx:452 ppdc/ppdpo.cxx:259
+#: systemv/cupsaddsmb.c:283 systemv/cupstestppd.c:3870 test/ipptool.c:4965
+#: ppdc/ppdc.cxx:445 ppdc/ppdpo.cxx:252
 msgid "  -v                      Be verbose."
 msgstr ""
 
-#: systemv/cupstestppd.c:3829
+#: systemv/cupstestppd.c:3871
 msgid "  -vv                     Be very verbose."
 msgstr ""
 
-#: test/ippfind.c:2737
+#: test/ippfind.c:2773
 msgid ""
 "  -x utility [argument ...] ;\n"
 "                          Execute program if true."
 msgstr ""
 
-#: ppdc/ppdc.cxx:453
+#: ppdc/ppdc.cxx:446
 msgid "  -z                      Compress PPD files using GNU zip."
 msgstr ""
 
-#: test/ippfind.c:2780
+#: test/ippfind.c:2816
 msgid "  IPPFIND_SERVICE_DOMAIN  Domain name"
 msgstr ""
 
-#: test/ippfind.c:2781
+#: test/ippfind.c:2817
 msgid ""
 "  IPPFIND_SERVICE_HOSTNAME\n"
 "                          Fully-qualified domain name"
 msgstr ""
 
-#: test/ippfind.c:2783
+#: test/ippfind.c:2819
 msgid "  IPPFIND_SERVICE_NAME    Service instance name"
 msgstr ""
 
-#: test/ippfind.c:2784
+#: test/ippfind.c:2820
 msgid "  IPPFIND_SERVICE_PORT    Port number"
 msgstr ""
 
-#: test/ippfind.c:2785
+#: test/ippfind.c:2821
 msgid "  IPPFIND_SERVICE_REGTYPE DNS-SD registration type"
 msgstr ""
 
-#: test/ippfind.c:2786
+#: test/ippfind.c:2822
 msgid "  IPPFIND_SERVICE_SCHEME  URI scheme"
 msgstr ""
 
-#: test/ippfind.c:2787
+#: test/ippfind.c:2823
 msgid "  IPPFIND_SERVICE_URI     URI"
 msgstr ""
 
-#: test/ippfind.c:2788
+#: test/ippfind.c:2824
 msgid "  IPPFIND_TXT_*           Value of TXT record key"
 msgstr ""
 
-#: test/ippfind.c:2763
+#: test/ippfind.c:2799
 msgid ""
 "  expression --and expression\n"
 "                          Logical AND."
 msgstr ""
 
-#: test/ippfind.c:2765
+#: test/ippfind.c:2801
 msgid ""
 "  expression --or expression\n"
 "                          Logical OR."
 msgstr ""
 
-#: test/ippfind.c:2762
+#: test/ippfind.c:2798
 msgid "  expression expression   Logical AND."
 msgstr ""
 
-#: test/ippfind.c:2770
+#: test/ippfind.c:2806
 msgid "  {service_domain}        Domain name"
 msgstr ""
 
-#: test/ippfind.c:2771
+#: test/ippfind.c:2807
 msgid "  {service_hostname}      Fully-qualified domain name"
 msgstr ""
 
-#: test/ippfind.c:2772
+#: test/ippfind.c:2808
 msgid "  {service_name}          Service instance name"
 msgstr ""
 
-#: test/ippfind.c:2773
+#: test/ippfind.c:2809
 msgid "  {service_port}          Port number"
 msgstr ""
 
-#: test/ippfind.c:2774
+#: test/ippfind.c:2810
 msgid "  {service_regtype}       DNS-SD registration type"
 msgstr ""
 
-#: test/ippfind.c:2775
+#: test/ippfind.c:2811
 msgid "  {service_scheme}        URI scheme"
 msgstr ""
 
-#: test/ippfind.c:2776
+#: test/ippfind.c:2812
 msgid "  {service_uri}           URI"
 msgstr ""
 
-#: test/ippfind.c:2777
+#: test/ippfind.c:2813
 msgid "  {txt_*}                 Value of TXT record key"
 msgstr ""
 
-#: test/ippfind.c:2769
+#: test/ippfind.c:2805
 msgid "  {}                      URI"
 msgstr ""
 
-#: systemv/cupstestppd.c:332 systemv/cupstestppd.c:351
-#: systemv/cupstestppd.c:363 systemv/cupstestppd.c:496
-#: systemv/cupstestppd.c:511 systemv/cupstestppd.c:532
-#: systemv/cupstestppd.c:547 systemv/cupstestppd.c:577
-#: systemv/cupstestppd.c:597 systemv/cupstestppd.c:620
-#: systemv/cupstestppd.c:638 systemv/cupstestppd.c:664
-#: systemv/cupstestppd.c:682 systemv/cupstestppd.c:702
-#: systemv/cupstestppd.c:722 systemv/cupstestppd.c:740
-#: systemv/cupstestppd.c:757 systemv/cupstestppd.c:776
-#: systemv/cupstestppd.c:797 systemv/cupstestppd.c:816
-#: systemv/cupstestppd.c:836 systemv/cupstestppd.c:856
-#: systemv/cupstestppd.c:876 systemv/cupstestppd.c:896
-#: systemv/cupstestppd.c:914 systemv/cupstestppd.c:931
-#: systemv/cupstestppd.c:953 systemv/cupstestppd.c:971
-#: systemv/cupstestppd.c:988 systemv/cupstestppd.c:1006
-#: systemv/cupstestppd.c:1022 systemv/cupstestppd.c:1042
-#: systemv/cupstestppd.c:1073 systemv/cupstestppd.c:1095
-#: systemv/cupstestppd.c:1146 systemv/cupstestppd.c:1165
-#: systemv/cupstestppd.c:1209 systemv/cupstestppd.c:1223
-#: systemv/cupstestppd.c:1255 systemv/cupstestppd.c:1282
-#: systemv/cupstestppd.c:1800 systemv/cupstestppd.c:1819
-#: systemv/cupstestppd.c:1837 systemv/cupstestppd.c:1889
-#: systemv/cupstestppd.c:1905 systemv/cupstestppd.c:1942
-#: systemv/cupstestppd.c:1960 systemv/cupstestppd.c:1996
-#: systemv/cupstestppd.c:2010 systemv/cupstestppd.c:2037
-#: systemv/cupstestppd.c:2051 systemv/cupstestppd.c:2097
-#: systemv/cupstestppd.c:2119 systemv/cupstestppd.c:2142
-#: systemv/cupstestppd.c:2159 systemv/cupstestppd.c:2201
-#: systemv/cupstestppd.c:2244 systemv/cupstestppd.c:2291
-#: systemv/cupstestppd.c:2315 systemv/cupstestppd.c:2369
-#: systemv/cupstestppd.c:2385 systemv/cupstestppd.c:2415
-#: systemv/cupstestppd.c:2429 systemv/cupstestppd.c:2455
-#: systemv/cupstestppd.c:2471 systemv/cupstestppd.c:2511
-#: systemv/cupstestppd.c:2525 systemv/cupstestppd.c:2551
-#: systemv/cupstestppd.c:2567 systemv/cupstestppd.c:2597
-#: systemv/cupstestppd.c:2611 systemv/cupstestppd.c:2638
-#: systemv/cupstestppd.c:2655 systemv/cupstestppd.c:2669
-#: systemv/cupstestppd.c:2693 systemv/cupstestppd.c:2710
-#: systemv/cupstestppd.c:2724 systemv/cupstestppd.c:2748
-#: systemv/cupstestppd.c:2765 systemv/cupstestppd.c:2779
-#: systemv/cupstestppd.c:2803 systemv/cupstestppd.c:2820
-#: systemv/cupstestppd.c:2834 systemv/cupstestppd.c:2858
-#: systemv/cupstestppd.c:2872 systemv/cupstestppd.c:2887
-#: systemv/cupstestppd.c:2904 systemv/cupstestppd.c:2960
-#: systemv/cupstestppd.c:2995 systemv/cupstestppd.c:3009
-#: systemv/cupstestppd.c:3037 systemv/cupstestppd.c:3102
-#: systemv/cupstestppd.c:3117 systemv/cupstestppd.c:3156
-#: systemv/cupstestppd.c:3176 systemv/cupstestppd.c:3190
-#: systemv/cupstestppd.c:3407 systemv/cupstestppd.c:3443
-#: systemv/cupstestppd.c:3457 systemv/cupstestppd.c:3503
-#: systemv/cupstestppd.c:3535 systemv/cupstestppd.c:3552
-#: systemv/cupstestppd.c:3575 systemv/cupstestppd.c:3591
-#: systemv/cupstestppd.c:3629 systemv/cupstestppd.c:3770
-#: systemv/cupstestppd.c:3792 systemv/cupstestppd.c:3900
+#: 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
 msgid " FAIL"
 msgstr ""
 
-#: systemv/cupstestppd.c:1306
+#: systemv/cupstestppd.c:1284
 msgid " PASS"
 msgstr ""
 
-#: cups/ipp.c:5139
+#: cups/ipp.c:5202
 #, c-format
 msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 2911 section 4.1.5)."
 msgstr ""
 
-#: cups/ipp.c:5150
+#: cups/ipp.c:5213
 #, c-format
 msgid "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 2911 section 4.1.5)."
 msgstr ""
 
-#: cups/ipp.c:4770
+#: cups/ipp.c:4833
 #, c-format
 msgid "\"%s\": Bad attribute name - bad length %d (RFC 2911 section 4.1.3)."
 msgstr ""
 
-#: cups/ipp.c:4762
+#: cups/ipp.c:4825
 #, c-format
 msgid "\"%s\": Bad attribute name - invalid character (RFC 2911 section 4.1.3)."
 msgstr ""
 
-#: cups/ipp.c:4788
+#: cups/ipp.c:4851
 #, c-format
 msgid "\"%s\": Bad boolen value %d (RFC 2911 section 4.1.11)."
 msgstr ""
 
-#: cups/ipp.c:5202
+#: cups/ipp.c:5265
 #, c-format
 msgid "\"%s\": Bad charset value \"%s\" - bad characters (RFC 2911 section 4.1.7)."
 msgstr ""
 
-#: cups/ipp.c:5211
+#: cups/ipp.c:5274
 #, c-format
 msgid "\"%s\": Bad charset value \"%s\" - bad length %d (RFC 2911 section 4.1.7)."
 msgstr ""
 
-#: cups/ipp.c:4888
+#: cups/ipp.c:4951
 #, c-format
 msgid "\"%s\": Bad dateTime UTC hours %u (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: cups/ipp.c:4896
+#: cups/ipp.c:4959
 #, c-format
 msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: cups/ipp.c:4880
+#: cups/ipp.c:4943
 #, c-format
 msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: cups/ipp.c:4840
+#: cups/ipp.c:4903
 #, c-format
 msgid "\"%s\": Bad dateTime day %u (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: cups/ipp.c:4872
+#: cups/ipp.c:4935
 #, c-format
 msgid "\"%s\": Bad dateTime deciseconds %u (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: cups/ipp.c:4848
+#: cups/ipp.c:4911
 #, c-format
 msgid "\"%s\": Bad dateTime hours %u (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: cups/ipp.c:4856
+#: cups/ipp.c:4919
 #, c-format
 msgid "\"%s\": Bad dateTime minutes %u (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: cups/ipp.c:4832
+#: cups/ipp.c:4895
 #, c-format
 msgid "\"%s\": Bad dateTime month %u (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: cups/ipp.c:4864
+#: cups/ipp.c:4927
 #, c-format
 msgid "\"%s\": Bad dateTime seconds %u (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: cups/ipp.c:4802
+#: cups/ipp.c:4865
 #, c-format
 msgid "\"%s\": Bad enum value %d - out of range (RFC 2911 section 4.1.4)."
 msgstr ""
 
-#: cups/ipp.c:5117
+#: cups/ipp.c:5180
 #, c-format
 msgid "\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 2911 section 4.1.3)."
 msgstr ""
 
-#: cups/ipp.c:5108
+#: cups/ipp.c:5171
 #, c-format
 msgid "\"%s\": Bad keyword value \"%s\" - invalid character (RFC 2911 section 4.1.3)."
 msgstr ""
 
-#: cups/ipp.c:5311
+#: cups/ipp.c:5374
 #, c-format
 msgid "\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 2911 section 4.1.9)."
 msgstr ""
 
-#: cups/ipp.c:5321
+#: cups/ipp.c:5384
 #, c-format
 msgid "\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 2911 section 4.1.9)."
 msgstr ""
 
-#: cups/ipp.c:5079
+#: cups/ipp.c:5142
 #, c-format
 msgid "\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.2)."
 msgstr ""
 
-#: cups/ipp.c:5088
+#: cups/ipp.c:5151
 #, c-format
 msgid "\"%s\": Bad name value \"%s\" - bad length %d (RFC 2911 section 4.1.2)."
 msgstr ""
 
-#: cups/ipp.c:5257
+#: cups/ipp.c:5320
 #, c-format
 msgid "\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 2911 section 4.1.8)."
 msgstr ""
 
-#: cups/ipp.c:5267
+#: cups/ipp.c:5330
 #, c-format
 msgid "\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 2911 section 4.1.8)."
 msgstr ""
 
-#: cups/ipp.c:4816
+#: cups/ipp.c:4879
 #, c-format
 msgid "\"%s\": Bad octetString value - bad length %d (RFC 2911 section 4.1.10)."
 msgstr ""
 
-#: cups/ipp.c:4959
+#: cups/ipp.c:5022
 #, c-format
 msgid "\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 2911 section 4.1.13)."
 msgstr ""
 
-#: cups/ipp.c:4940
+#: cups/ipp.c:5003
 #, c-format
 msgid "\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 2911 section 4.1.15)."
 msgstr ""
 
-#: cups/ipp.c:4909
+#: cups/ipp.c:4972
 #, c-format
 msgid "\"%s\": Bad resolution value %dx%d%s - cross feed resolution must be positive (RFC 2911 section 4.1.15)."
 msgstr ""
 
-#: cups/ipp.c:4924
+#: cups/ipp.c:4987
 #, c-format
 msgid "\"%s\": Bad resolution value %dx%d%s - feed resolution must be positive (RFC 2911 section 4.1.15)."
 msgstr ""
 
-#: cups/ipp.c:5021
+#: cups/ipp.c:5084
 #, c-format
 msgid "\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.1)."
 msgstr ""
 
-#: cups/ipp.c:5030
+#: cups/ipp.c:5093
 #, c-format
 msgid "\"%s\": Bad text value \"%s\" - bad length %d (RFC 2911 section 4.1.1)."
 msgstr ""
 
-#: cups/ipp.c:5173
+#: cups/ipp.c:5236
 #, c-format
 msgid "\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 2911 section 4.1.6)."
 msgstr ""
 
-#: cups/ipp.c:5182
+#: cups/ipp.c:5245
 #, c-format
 msgid "\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 2911 section 4.1.6)."
 msgstr ""
 
-#: berkeley/lpq.c:533
+#: berkeley/lpq.c:542
 #, c-format
 msgid "%-7s %-7.7s %-7d %-31.31s %.0f bytes"
 msgstr ""
 
-#: systemv/lpstat.c:779
+#: cups/dest-localization.c:112
+#, c-format
+msgid "%d x %d mm"
+msgstr ""
+
+#: cups/dest-localization.c:104
+#, c-format
+msgid "%g x %g"
+msgstr ""
+
+#: cups/dest-localization.c:167 cups/dest-localization.c:174
+#, c-format
+msgid "%s (%s)"
+msgstr ""
+
+#: cups/dest-localization.c:181
+#, c-format
+msgid "%s (%s, %s)"
+msgstr ""
+
+#: cups/dest-localization.c:158
+#, c-format
+msgid "%s (Borderless)"
+msgstr ""
+
+#: cups/dest-localization.c:165 cups/dest-localization.c:172
+#, c-format
+msgid "%s (Borderless, %s)"
+msgstr ""
+
+#: cups/dest-localization.c:179
+#, c-format
+msgid "%s (Borderless, %s, %s)"
+msgstr ""
+
+#: systemv/lpstat.c:775
 #, c-format
 msgid "%s accepting requests since %s"
 msgstr ""
 
-#: scheduler/ipp.c:9843
+#: scheduler/ipp.c:10294
 #, c-format
 msgid "%s cannot be changed."
 msgstr ""
 
-#: berkeley/lpc.c:181
+#: berkeley/lpc.c:179
 #, c-format
 msgid "%s is not implemented by the CUPS version of lpc."
 msgstr ""
 
-#: berkeley/lpq.c:618
+#: berkeley/lpq.c:627
 #, c-format
 msgid "%s is not ready"
 msgstr ""
 
-#: berkeley/lpq.c:611
+#: berkeley/lpq.c:620
 #, c-format
 msgid "%s is ready"
 msgstr ""
 
-#: berkeley/lpq.c:614
+#: berkeley/lpq.c:623
 #, c-format
 msgid "%s is ready and printing"
 msgstr ""
 
-#: filter/rastertoepson.c:970 filter/rastertohp.c:700
-#: filter/rastertolabel.c:1115
+#: filter/rastertoepson.c:1004 filter/rastertohp.c:674
+#: filter/rastertolabel.c:1118
 #, c-format
 msgid "%s job-id user title copies options [file]"
 msgstr ""
 
-#: systemv/lpstat.c:783
+#: systemv/lpstat.c:779
 #, c-format
 msgid "%s not accepting requests since %s -"
 msgstr ""
 
-#: scheduler/ipp.c:618
+#: scheduler/ipp.c:619
 #, c-format
 msgid "%s not supported."
 msgstr ""
 
-#: systemv/lpstat.c:794
+#: systemv/lpstat.c:790
 #, c-format
 msgid "%s/%s accepting requests since %s"
 msgstr ""
 
-#: systemv/lpstat.c:799
+#: systemv/lpstat.c:795
 #, c-format
 msgid "%s/%s not accepting requests since %s -"
 msgstr ""
 
-#: berkeley/lpq.c:526
+#: berkeley/lpq.c:535
 #, c-format
 msgid "%s: %-33.33s [job %d localhost]"
 msgstr ""
 
 #. TRANSLATORS: Message is "subject: error"
-#: cups/langprintf.c:77 scheduler/cupsfilter.c:698 systemv/lpadmin.c:791
-#: systemv/lpadmin.c:842 systemv/lpadmin.c:892 systemv/lpadmin.c:948
-#: systemv/lpadmin.c:1046 systemv/lpadmin.c:1098 systemv/lpadmin.c:1154
-#: systemv/lpadmin.c:1463
+#: 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
 #, c-format
 msgid "%s: %s"
 msgstr ""
 
-#: systemv/cancel.c:305 systemv/cancel.c:368
+#: systemv/cancel.c:304 systemv/cancel.c:368
 #, c-format
 msgid "%s: %s failed: %s"
 msgstr ""
 
-#: test/ippfind.c:773 test/ipptool.c:344
+#: systemv/lpadmin.c:1185
+#, c-format
+msgid "%s: Bad printer URI \"%s\"."
+msgstr ""
+
+#: test/ippfind.c:775 test/ipptool.c:369
 #, c-format
 msgid "%s: Bad version %s for \"-V\"."
 msgstr ""
 
-#: systemv/cupsaccept.c:68
+#: systemv/cupsaccept.c:63
 #, c-format
 msgid "%s: Don't know what to do."
 msgstr ""
 
-#: berkeley/lpq.c:225 berkeley/lpr.c:358 systemv/lp.c:602
+#: berkeley/lpq.c:234 berkeley/lpr.c:365 systemv/lp.c:606
 #, c-format
 msgid "%s: Error - %s environment variable names non-existent destination \"%s\"."
 msgstr ""
 
-#: berkeley/lpq.c:133 berkeley/lpq.c:203 berkeley/lpr.c:230 berkeley/lpr.c:333
-#: systemv/lp.c:157 systemv/lp.c:577 systemv/lp.c:697 systemv/lp.c:746
-#: systemv/lpstat.c:195 systemv/lpstat.c:241 systemv/lpstat.c:332
-#: systemv/lpstat.c:361 systemv/lpstat.c:385 systemv/lpstat.c:444
-#: systemv/lpstat.c:510 systemv/lpstat.c:571 systemv/lpstat.c:697
-#: systemv/lpstat.c:882 systemv/lpstat.c:1143 systemv/lpstat.c:1341
-#: systemv/lpstat.c:1598
+#: 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:333
+#: systemv/lpstat.c:360 systemv/lpstat.c:382 systemv/lpstat.c:442
+#: systemv/lpstat.c:508 systemv/lpstat.c:569 systemv/lpstat.c:694
+#: systemv/lpstat.c:878 systemv/lpstat.c:1139 systemv/lpstat.c:1337
+#: systemv/lpstat.c:1577
 #, c-format
 msgid "%s: Error - add '/version=1.1' to server name."
 msgstr ""
 
-#: systemv/lp.c:234
+#: systemv/lp.c:238
 #, c-format
 msgid "%s: Error - bad job ID."
 msgstr ""
 
-#: systemv/lp.c:222
+#: systemv/lp.c:227
 #, c-format
 msgid "%s: Error - cannot print files and alter jobs simultaneously."
 msgstr ""
 
-#: systemv/lp.c:515
+#: systemv/lp.c:518
 #, c-format
 msgid "%s: Error - cannot print from stdin if files or a job ID are provided."
 msgstr ""
 
-#: systemv/lp.c:464
+#: berkeley/lpr.c:254 systemv/lp.c:280
+#, c-format
+msgid "%s: Error - copies must be 1 or more."
+msgstr ""
+
+#: systemv/lp.c:470
 #, c-format
 msgid "%s: Error - expected character set after \"-S\" option."
 msgstr ""
 
-#: systemv/lp.c:483
+#: systemv/lp.c:489
 #, c-format
 msgid "%s: Error - expected content type after \"-T\" option."
 msgstr ""
@@ -1841,200 +1902,210 @@ msgstr ""
 msgid "%s: Error - expected copies after \"-#\" option."
 msgstr ""
 
-#: systemv/lp.c:267
+#: systemv/lp.c:271
 #, c-format
 msgid "%s: Error - expected copies after \"-n\" option."
 msgstr ""
 
-#: berkeley/lpr.c:206
+#: berkeley/lpr.c:207
 #, c-format
 msgid "%s: Error - expected destination after \"-P\" option."
 msgstr ""
 
-#: systemv/lp.c:132
+#: systemv/lp.c:137
 #, c-format
 msgid "%s: Error - expected destination after \"-d\" option."
 msgstr ""
 
-#: systemv/lp.c:171
+#: systemv/lp.c:178
 #, c-format
 msgid "%s: Error - expected form after \"-f\" option."
 msgstr ""
 
-#: systemv/lp.c:394
+#: systemv/lp.c:406
 #, c-format
 msgid "%s: Error - expected hold name after \"-H\" option."
 msgstr ""
 
-#: berkeley/lpr.c:100
+#: berkeley/lpr.c:104
 #, c-format
 msgid "%s: Error - expected hostname after \"-H\" option."
 msgstr ""
 
-#: berkeley/lpq.c:169 berkeley/lprm.c:123 systemv/cancel.c:124
-#: systemv/cupsaccept.c:123 systemv/lp.c:192 systemv/lpstat.c:266
+#: berkeley/lpq.c:173 berkeley/lprm.c:124 systemv/cancel.c:124
+#: systemv/cupsaccept.c:127 systemv/lp.c:198 systemv/lpstat.c:269
 #, c-format
 msgid "%s: Error - expected hostname after \"-h\" option."
 msgstr ""
 
-#: systemv/lp.c:374
+#: systemv/lp.c:386
 #, c-format
 msgid "%s: Error - expected mode list after \"-y\" option."
 msgstr ""
 
-#: berkeley/lpr.c:268
+#: berkeley/lpr.c:275
 #, c-format
 msgid "%s: Error - expected name after \"-%c\" option."
 msgstr ""
 
-#: berkeley/lpr.c:150 systemv/lp.c:291
+#: berkeley/lpr.c:156 systemv/lp.c:301
 #, c-format
 msgid "%s: Error - expected option=value after \"-o\" option."
 msgstr ""
 
-#: systemv/lp.c:444
+#: systemv/lp.c:449
 #, c-format
 msgid "%s: Error - expected page list after \"-P\" option."
 msgstr ""
 
-#: systemv/lp.c:311
+#: systemv/lp.c:322
 #, c-format
 msgid "%s: Error - expected priority after \"-%c\" option."
 msgstr ""
 
-#: systemv/cupsaccept.c:141
+#: systemv/cupsaccept.c:146
 #, c-format
 msgid "%s: Error - expected reason text after \"-r\" option."
 msgstr ""
 
-#: systemv/lp.c:357
+#: systemv/lp.c:367
 #, c-format
 msgid "%s: Error - expected title after \"-t\" option."
 msgstr ""
 
-#: berkeley/lpq.c:97 berkeley/lpr.c:81 berkeley/lprm.c:104 systemv/cancel.c:95
-#: systemv/cupsaccept.c:101 systemv/lp.c:110 systemv/lpadmin.c:424
-#: systemv/lpstat.c:124
+#: 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
 #, c-format
 msgid "%s: Error - expected username after \"-U\" option."
 msgstr ""
 
-#: systemv/cancel.c:145
+#: systemv/cancel.c:146
 #, c-format
 msgid "%s: Error - expected username after \"-u\" option."
 msgstr ""
 
-#: berkeley/lpr.c:122
+#: berkeley/lpr.c:129
 #, c-format
 msgid "%s: Error - expected value after \"-%c\" option."
 msgstr ""
 
-#: systemv/lpstat.c:144 systemv/lpstat.c:158
+#: systemv/lpstat.c:149 systemv/lpstat.c:158
 #, c-format
 msgid "%s: Error - need \"completed\", \"not-completed\", or \"all\" after \"-W\" option."
 msgstr ""
 
-#: berkeley/lpq.c:230 berkeley/lpr.c:363 systemv/lp.c:607
+#: berkeley/lpq.c:239 berkeley/lpr.c:370 systemv/lp.c:611
 #, c-format
 msgid "%s: Error - no default destination available."
 msgstr ""
 
-#: systemv/lp.c:333
+#: systemv/lp.c:342
 #, c-format
 msgid "%s: Error - priority must be between 1 and 100."
 msgstr ""
 
-#: berkeley/lpr.c:366 systemv/lp.c:610
+#: berkeley/lpr.c:373 systemv/lp.c:614
 #, c-format
 msgid "%s: Error - scheduler not responding."
 msgstr ""
 
-#: berkeley/lpr.c:311 systemv/lp.c:547
+#: berkeley/lpr.c:316 systemv/lp.c:550
 #, c-format
 msgid "%s: Error - too many files - \"%s\"."
 msgstr ""
 
-#: berkeley/lpr.c:293 systemv/lp.c:530
+#: berkeley/lpr.c:298 systemv/lp.c:533
 #, c-format
 msgid "%s: Error - unable to access \"%s\" - %s"
 msgstr ""
 
-#: berkeley/lpr.c:409 systemv/lp.c:641
+#: berkeley/lpr.c:416 systemv/lp.c:645
 #, c-format
 msgid "%s: Error - unable to queue from stdin - %s."
 msgstr ""
 
-#: berkeley/lprm.c:87 berkeley/lprm.c:172 systemv/cancel.c:222
+#: berkeley/lprm.c:86 berkeley/lprm.c:173 systemv/cancel.c:221
 #, c-format
 msgid "%s: Error - unknown destination \"%s\"."
 msgstr ""
 
-#: berkeley/lpq.c:137
+#: berkeley/lpq.c:141
 #, c-format
 msgid "%s: Error - unknown destination \"%s/%s\"."
 msgstr ""
 
-#: berkeley/lpr.c:279 berkeley/lprm.c:139 systemv/cancel.c:163
-#: systemv/cupsaccept.c:164 systemv/lp.c:506 systemv/lpstat.c:456
+#: berkeley/lpr.c:284 berkeley/lprm.c:139 systemv/cancel.c:162
+#: systemv/cupsaccept.c:155 systemv/lp.c:508 systemv/lpstat.c:452
 #, c-format
 msgid "%s: Error - unknown option \"%c\"."
 msgstr ""
 
-#: systemv/cupsaccept.c:157 systemv/lp.c:497
+#: systemv/lp.c:500
 #, c-format
 msgid "%s: Error - unknown option \"%s\"."
 msgstr ""
 
-#: systemv/lp.c:211
+#: systemv/lp.c:218
 #, c-format
 msgid "%s: Expected job ID after \"-i\" option."
 msgstr ""
 
-#: systemv/lpstat.c:514 systemv/lpstat.c:554
+#: systemv/lpstat.c:512 systemv/lpstat.c:552
 #, c-format
 msgid "%s: Invalid destination name in list \"%s\"."
 msgstr ""
 
-#: scheduler/cupsfilter.c:551
+#: scheduler/cupsfilter.c:577
 #, c-format
 msgid "%s: Invalid filter string \"%s\"."
 msgstr ""
 
-#: test/ippfind.c:745 test/ipptool.c:312
+#: test/ipptool.c:300
+#, c-format
+msgid "%s: Missing filename for \"-P\"."
+msgstr ""
+
+#: test/ippfind.c:747 test/ipptool.c:337
 #, c-format
 msgid "%s: Missing timeout for \"-T\"."
 msgstr ""
 
-#: test/ippfind.c:758 test/ipptool.c:326
+#: test/ippfind.c:760 test/ipptool.c:351
 #, c-format
 msgid "%s: Missing version for \"-V\"."
 msgstr ""
 
-#: systemv/lp.c:421
+#: systemv/lp.c:426
 #, c-format
 msgid "%s: Need job ID (\"-i jobid\") before \"-H restart\"."
 msgstr ""
 
-#: scheduler/cupsfilter.c:442
+#: scheduler/cupsfilter.c:449
 #, c-format
 msgid "%s: No filter to convert from %s/%s to %s/%s."
 msgstr ""
 
-#: systemv/cupsaccept.c:198
+#: systemv/cupsaccept.c:189
 #, c-format
 msgid "%s: Operation failed: %s"
 msgstr ""
 
-#: berkeley/lpq.c:83 berkeley/lpr.c:67 berkeley/lprm.c:67 systemv/cancel.c:82
-#: systemv/cupsaccept.c:88 systemv/cupsaddsmb.c:86 systemv/lp.c:96
-#: systemv/lpadmin.c:225 systemv/lpinfo.c:88 systemv/lpmove.c:73
-#: systemv/lpstat.c:88 test/ipptool.c:284 test/ipptool.c:301
+#: 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:282 test/ipptool.c:326
 #, c-format
 msgid "%s: Sorry, no encryption support."
 msgstr ""
 
-#: berkeley/lpq.c:284 scheduler/cupsfilter.c:1247 systemv/cancel.c:245
-#: systemv/cupsaddsmb.c:144 systemv/cupsaddsmb.c:171
+#: systemv/lpadmin.c:1192
+#, 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
 #, c-format
 msgid "%s: Unable to connect to server."
 msgstr ""
@@ -2044,234 +2115,254 @@ msgstr ""
 msgid "%s: Unable to contact server."
 msgstr ""
 
-#: scheduler/cupsfilter.c:407
+#: systemv/lpadmin.c:1205
+#, c-format
+msgid "%s: Unable to create PPD file: %s"
+msgstr ""
+
+#: scheduler/cupsfilter.c:414
 #, c-format
 msgid "%s: Unable to determine MIME type of \"%s\"."
 msgstr ""
 
-#: ppdc/ppdmerge.cxx:90
+#: test/ipptool.c:309
+#, c-format
+msgid "%s: Unable to open \"%s\": %s"
+msgstr ""
+
+#: ppdc/ppdmerge.cxx:88
 #, c-format
 msgid "%s: Unable to open %s: %s"
 msgstr ""
 
-#: scheduler/cupsfilter.c:646 ppdc/ppdmerge.cxx:106
+#: scheduler/cupsfilter.c:672 ppdc/ppdmerge.cxx:104
 #, c-format
 msgid "%s: Unable to open PPD file: %s on line %d."
 msgstr ""
 
-#: scheduler/cupsfilter.c:374
+#: scheduler/cupsfilter.c:381
 #, c-format
 msgid "%s: Unable to read MIME database from \"%s\" or \"%s\"."
 msgstr ""
 
-#: berkeley/lpq.c:140 systemv/lpstat.c:575
+#: systemv/lpadmin.c:1176
+#, c-format
+msgid "%s: Unable to resolve \"%s\"."
+msgstr ""
+
+#: systemv/lpinfo.c:238
+#, c-format
+msgid "%s: Unknown argument \"%s\"."
+msgstr ""
+
+#: berkeley/lpq.c:143 systemv/lpstat.c:573
 #, c-format
 msgid "%s: Unknown destination \"%s\"."
 msgstr ""
 
-#: scheduler/cupsfilter.c:419
+#: scheduler/cupsfilter.c:426
 #, c-format
 msgid "%s: Unknown destination MIME type %s/%s."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1452
+#: scheduler/cupsfilter.c:1477 systemv/lpinfo.c:231 systemv/lpmove.c:95
 #, c-format
 msgid "%s: Unknown option \"%c\"."
 msgstr ""
 
-#: test/ippfind.c:644
+#: test/ippfind.c:646
 #, c-format
 msgid "%s: Unknown option \"%s\"."
 msgstr ""
 
-#: test/ippfind.c:924
+#: test/ippfind.c:926
 #, c-format
 msgid "%s: Unknown option \"-%c\"."
 msgstr ""
 
-#: scheduler/cupsfilter.c:399
+#: scheduler/cupsfilter.c:406
 #, c-format
 msgid "%s: Unknown source MIME type %s/%s."
 msgstr ""
 
-#: berkeley/lpr.c:136
+#: berkeley/lpr.c:142
 #, c-format
 msgid "%s: Warning - \"%c\" format modifier not supported - output may not be correct."
 msgstr ""
 
-#: systemv/lp.c:471
+#: systemv/lp.c:475
 #, c-format
 msgid "%s: Warning - character set option ignored."
 msgstr ""
 
-#: systemv/lp.c:490
+#: systemv/lp.c:494
 #, c-format
 msgid "%s: Warning - content type option ignored."
 msgstr ""
 
-#: systemv/lp.c:178
+#: systemv/lp.c:183
 #, c-format
 msgid "%s: Warning - form option ignored."
 msgstr ""
 
-#: systemv/lp.c:381
+#: systemv/lp.c:391
 #, c-format
 msgid "%s: Warning - mode option ignored."
 msgstr ""
 
-#: ppdc/sample.c:310
+#: ppdc/sample.c:305
 msgid "-1"
 msgstr ""
 
-#: ppdc/sample.c:301
+#: ppdc/sample.c:296
 msgid "-10"
 msgstr ""
 
-#: ppdc/sample.c:393
+#: ppdc/sample.c:388
 msgid "-100"
 msgstr ""
 
-#: ppdc/sample.c:392
+#: ppdc/sample.c:387
 msgid "-105"
 msgstr ""
 
-#: ppdc/sample.c:300
+#: ppdc/sample.c:295
 msgid "-11"
 msgstr ""
 
-#: ppdc/sample.c:391
+#: ppdc/sample.c:386
 msgid "-110"
 msgstr ""
 
-#: ppdc/sample.c:390
+#: ppdc/sample.c:385
 msgid "-115"
 msgstr ""
 
-#: ppdc/sample.c:299
+#: ppdc/sample.c:294
 msgid "-12"
 msgstr ""
 
-#: ppdc/sample.c:389
+#: ppdc/sample.c:384
 msgid "-120"
 msgstr ""
 
-#: ppdc/sample.c:298
+#: ppdc/sample.c:293
 msgid "-13"
 msgstr ""
 
-#: ppdc/sample.c:297
+#: ppdc/sample.c:292
 msgid "-14"
 msgstr ""
 
-#: ppdc/sample.c:296
+#: ppdc/sample.c:291
 msgid "-15"
 msgstr ""
 
-#: ppdc/sample.c:309
+#: ppdc/sample.c:304
 msgid "-2"
 msgstr ""
 
-#: ppdc/sample.c:409
+#: ppdc/sample.c:404
 msgid "-20"
 msgstr ""
 
-#: ppdc/sample.c:408
+#: ppdc/sample.c:403
 msgid "-25"
 msgstr ""
 
-#: ppdc/sample.c:308
+#: ppdc/sample.c:303
 msgid "-3"
 msgstr ""
 
-#: ppdc/sample.c:407
+#: ppdc/sample.c:402
 msgid "-30"
 msgstr ""
 
-#: ppdc/sample.c:406
+#: ppdc/sample.c:401
 msgid "-35"
 msgstr ""
 
-#: ppdc/sample.c:307
+#: ppdc/sample.c:302
 msgid "-4"
 msgstr ""
 
-#: ppdc/sample.c:405
+#: ppdc/sample.c:400
 msgid "-40"
 msgstr ""
 
-#: ppdc/sample.c:404
+#: ppdc/sample.c:399
 msgid "-45"
 msgstr ""
 
-#: ppdc/sample.c:306
+#: ppdc/sample.c:301
 msgid "-5"
 msgstr ""
 
-#: ppdc/sample.c:403
+#: ppdc/sample.c:398
 msgid "-50"
 msgstr ""
 
-#: ppdc/sample.c:402
+#: ppdc/sample.c:397
 msgid "-55"
 msgstr ""
 
-#: ppdc/sample.c:305
+#: ppdc/sample.c:300
 msgid "-6"
 msgstr ""
 
-#: ppdc/sample.c:401
+#: ppdc/sample.c:396
 msgid "-60"
 msgstr ""
 
-#: ppdc/sample.c:400
+#: ppdc/sample.c:395
 msgid "-65"
 msgstr ""
 
-#: ppdc/sample.c:304
+#: ppdc/sample.c:299
 msgid "-7"
 msgstr ""
 
-#: ppdc/sample.c:399
+#: ppdc/sample.c:394
 msgid "-70"
 msgstr ""
 
-#: ppdc/sample.c:398
+#: ppdc/sample.c:393
 msgid "-75"
 msgstr ""
 
-#: ppdc/sample.c:303
+#: ppdc/sample.c:298
 msgid "-8"
 msgstr ""
 
-#: ppdc/sample.c:397
+#: ppdc/sample.c:392
 msgid "-80"
 msgstr ""
 
-#: ppdc/sample.c:396
+#: ppdc/sample.c:391
 msgid "-85"
 msgstr ""
 
-#: ppdc/sample.c:302
+#: ppdc/sample.c:297
 msgid "-9"
 msgstr ""
 
-#: ppdc/sample.c:395
+#: ppdc/sample.c:390
 msgid "-90"
 msgstr ""
 
-#: ppdc/sample.c:394
+#: ppdc/sample.c:389
 msgid "-95"
 msgstr ""
 
-#: ppdc/sample.c:311
+#: ppdc/sample.c:306
 msgid "0"
 msgstr ""
 
-#: ppdc/sample.c:312
+#: ppdc/sample.c:307
 msgid "1"
 msgstr ""
 
-#: ppdc/sample.c:384
+#: ppdc/sample.c:379
 msgid "1 inch/sec."
 msgstr ""
 
@@ -2283,7 +2374,7 @@ msgstr ""
 msgid "1.25x2.25\""
 msgstr ""
 
-#: ppdc/sample.c:432
+#: ppdc/sample.c:427
 msgid "1.5 inch/sec."
 msgstr ""
 
@@ -2303,11 +2394,11 @@ msgstr ""
 msgid "1.50x2.00\""
 msgstr ""
 
-#: ppdc/sample.c:321
+#: ppdc/sample.c:316
 msgid "10"
 msgstr ""
 
-#: ppdc/sample.c:443
+#: ppdc/sample.c:438
 msgid "10 inches/sec."
 msgstr ""
 
@@ -2323,39 +2414,39 @@ msgstr ""
 msgid "10 x 14"
 msgstr ""
 
-#: ppdc/sample.c:423
+#: ppdc/sample.c:418
 msgid "100"
 msgstr ""
 
-#: ppdc/sample.c:334
+#: ppdc/sample.c:329
 msgid "100 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:424
+#: ppdc/sample.c:419
 msgid "105"
 msgstr ""
 
-#: ppdc/sample.c:322
+#: ppdc/sample.c:317
 msgid "11"
 msgstr ""
 
-#: ppdc/sample.c:444
+#: ppdc/sample.c:439
 msgid "11 inches/sec."
 msgstr ""
 
-#: ppdc/sample.c:425
+#: ppdc/sample.c:420
 msgid "110"
 msgstr ""
 
-#: ppdc/sample.c:426
+#: ppdc/sample.c:421
 msgid "115"
 msgstr ""
 
-#: ppdc/sample.c:323
+#: ppdc/sample.c:318
 msgid "12"
 msgstr ""
 
-#: ppdc/sample.c:445
+#: ppdc/sample.c:440
 msgid "12 inches/sec."
 msgstr ""
 
@@ -2363,11 +2454,11 @@ msgstr ""
 msgid "12 x 11"
 msgstr ""
 
-#: ppdc/sample.c:427
+#: ppdc/sample.c:422
 msgid "120"
 msgstr ""
 
-#: ppdc/sample.c:335
+#: ppdc/sample.c:330
 msgid "120 mm/sec."
 msgstr ""
 
@@ -2379,7 +2470,7 @@ msgstr ""
 msgid "120x72dpi"
 msgstr ""
 
-#: ppdc/sample.c:324
+#: ppdc/sample.c:319
 msgid "13"
 msgstr ""
 
@@ -2387,15 +2478,15 @@ msgstr ""
 msgid "136dpi"
 msgstr ""
 
-#: ppdc/sample.c:325
+#: ppdc/sample.c:320
 msgid "14"
 msgstr ""
 
-#: ppdc/sample.c:326
+#: ppdc/sample.c:321
 msgid "15"
 msgstr ""
 
-#: ppdc/sample.c:328
+#: ppdc/sample.c:323
 msgid "15 mm/sec."
 msgstr ""
 
@@ -2403,23 +2494,23 @@ msgstr ""
 msgid "15 x 11"
 msgstr ""
 
-#: ppdc/sample.c:336
+#: ppdc/sample.c:331
 msgid "150 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:283
+#: ppdc/sample.c:278
 msgid "150dpi"
 msgstr ""
 
-#: ppdc/sample.c:368
+#: ppdc/sample.c:363
 msgid "16"
 msgstr ""
 
-#: ppdc/sample.c:369
+#: ppdc/sample.c:364
 msgid "17"
 msgstr ""
 
-#: ppdc/sample.c:370
+#: ppdc/sample.c:365
 msgid "18"
 msgstr ""
 
@@ -2427,19 +2518,35 @@ msgstr ""
 msgid "180dpi"
 msgstr ""
 
-#: ppdc/sample.c:371
+#: ppdc/sample.c:366
 msgid "19"
 msgstr ""
 
-#: ppdc/sample.c:313
+#: ppdc/sample.c:308
 msgid "2"
 msgstr ""
 
-#: ppdc/sample.c:385
+#: ppdc/sample.c:380
 msgid "2 inches/sec."
 msgstr ""
 
-#: ppdc/sample.c:270
+#: cups/ppd-cache.c:3109
+msgid "2-Hole Punch (Landscape)"
+msgstr ""
+
+#: cups/ppd-cache.c:3110
+msgid "2-Hole Punch (Portrait)"
+msgstr ""
+
+#: cups/ppd-cache.c:3108
+msgid "2-Hole Punch (Reverse Landscape)"
+msgstr ""
+
+#: cups/ppd-cache.c:3107
+msgid "2-Hole Punch (Reverse Portrait)"
+msgstr ""
+
+#: cups/ppd-cache.c:3762 ppdc/sample.c:262
 msgid "2-Sided Printing"
 msgstr ""
 
@@ -2495,7 +2602,7 @@ msgstr ""
 msgid "2.38x5.50\""
 msgstr ""
 
-#: ppdc/sample.c:433
+#: ppdc/sample.c:428
 msgid "2.5 inches/sec."
 msgstr ""
 
@@ -2515,15 +2622,15 @@ msgstr ""
 msgid "2.9 x 1\""
 msgstr ""
 
-#: ppdc/sample.c:372
+#: ppdc/sample.c:367
 msgid "20"
 msgstr ""
 
-#: ppdc/sample.c:329
+#: ppdc/sample.c:324
 msgid "20 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:337
+#: ppdc/sample.c:332
 msgid "200 mm/sec."
 msgstr ""
 
@@ -2531,19 +2638,19 @@ msgstr ""
 msgid "203dpi"
 msgstr ""
 
-#: ppdc/sample.c:373
+#: ppdc/sample.c:368
 msgid "21"
 msgstr ""
 
-#: ppdc/sample.c:374
+#: ppdc/sample.c:369
 msgid "22"
 msgstr ""
 
-#: ppdc/sample.c:375
+#: ppdc/sample.c:370
 msgid "23"
 msgstr ""
 
-#: ppdc/sample.c:376
+#: ppdc/sample.c:371
 msgid "24"
 msgstr ""
 
@@ -2555,35 +2662,35 @@ msgstr ""
 msgid "240x72dpi"
 msgstr ""
 
-#: ppdc/sample.c:377
+#: ppdc/sample.c:372
 msgid "25"
 msgstr ""
 
-#: ppdc/sample.c:338
+#: ppdc/sample.c:333
 msgid "250 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:378
+#: ppdc/sample.c:373
 msgid "26"
 msgstr ""
 
-#: ppdc/sample.c:379
+#: ppdc/sample.c:374
 msgid "27"
 msgstr ""
 
-#: ppdc/sample.c:380
+#: ppdc/sample.c:375
 msgid "28"
 msgstr ""
 
-#: ppdc/sample.c:381
+#: ppdc/sample.c:376
 msgid "29"
 msgstr ""
 
-#: ppdc/sample.c:314
+#: ppdc/sample.c:309
 msgid "3"
 msgstr ""
 
-#: ppdc/sample.c:386
+#: ppdc/sample.c:381
 msgid "3 inches/sec."
 msgstr ""
 
@@ -2591,6 +2698,22 @@ msgstr ""
 msgid "3 x 5"
 msgstr ""
 
+#: cups/ppd-cache.c:3120
+msgid "3-Hole Punch (Landscape)"
+msgstr ""
+
+#: cups/ppd-cache.c:3118
+msgid "3-Hole Punch (Portrait)"
+msgstr ""
+
+#: cups/ppd-cache.c:3117
+msgid "3-Hole Punch (Reverse Landscape)"
+msgstr ""
+
+#: cups/ppd-cache.c:3119
+msgid "3-Hole Punch (Reverse Portrait)"
+msgstr ""
+
 #: ppdc/sample.c:195
 msgid "3.00x1.00\""
 msgstr ""
@@ -2643,15 +2766,15 @@ msgstr ""
 msgid "3.50x1.00\""
 msgstr ""
 
-#: ppdc/sample.c:382
+#: ppdc/sample.c:377
 msgid "30"
 msgstr ""
 
-#: ppdc/sample.c:330
+#: ppdc/sample.c:325
 msgid "30 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:339
+#: ppdc/sample.c:334
 msgid "300 mm/sec."
 msgstr ""
 
@@ -2659,7 +2782,7 @@ msgstr ""
 msgid "300dpi"
 msgstr ""
 
-#: ppdc/sample.c:410
+#: ppdc/sample.c:405
 msgid "35"
 msgstr ""
 
@@ -2671,14 +2794,30 @@ msgstr ""
 msgid "360x180dpi"
 msgstr ""
 
-#: ppdc/sample.c:315
+#: ppdc/sample.c:310
 msgid "4"
 msgstr ""
 
-#: ppdc/sample.c:387
+#: ppdc/sample.c:382
 msgid "4 inches/sec."
 msgstr ""
 
+#: cups/ppd-cache.c:3114
+msgid "4-Hole Punch (Landscape)"
+msgstr ""
+
+#: cups/ppd-cache.c:3112
+msgid "4-Hole Punch (Portrait)"
+msgstr ""
+
+#: cups/ppd-cache.c:3111
+msgid "4-Hole Punch (Reverse Landscape)"
+msgstr ""
+
+#: cups/ppd-cache.c:3113
+msgid "4-Hole Punch (Reverse Portrait)"
+msgstr ""
+
 #: ppdc/sample.c:206
 msgid "4.00x1.00\""
 msgstr ""
@@ -2715,23 +2854,23 @@ msgstr ""
 msgid "4.00x6.50\""
 msgstr ""
 
-#: ppdc/sample.c:411
+#: ppdc/sample.c:406
 msgid "40"
 msgstr ""
 
-#: ppdc/sample.c:331
+#: ppdc/sample.c:326
 msgid "40 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:412
+#: ppdc/sample.c:407
 msgid "45"
 msgstr ""
 
-#: ppdc/sample.c:316
+#: ppdc/sample.c:311
 msgid "5"
 msgstr ""
 
-#: ppdc/sample.c:437
+#: ppdc/sample.c:432
 msgid "5 inches/sec."
 msgstr ""
 
@@ -2739,19 +2878,19 @@ msgstr ""
 msgid "5 x 7"
 msgstr ""
 
-#: ppdc/sample.c:413
+#: ppdc/sample.c:408
 msgid "50"
 msgstr ""
 
-#: ppdc/sample.c:414
+#: ppdc/sample.c:409
 msgid "55"
 msgstr ""
 
-#: ppdc/sample.c:317
+#: ppdc/sample.c:312
 msgid "6"
 msgstr ""
 
-#: ppdc/sample.c:438
+#: ppdc/sample.c:433
 msgid "6 inches/sec."
 msgstr ""
 
@@ -2783,15 +2922,15 @@ msgstr ""
 msgid "6.00x6.50\""
 msgstr ""
 
-#: ppdc/sample.c:415
+#: ppdc/sample.c:410
 msgid "60"
 msgstr ""
 
-#: ppdc/sample.c:332
+#: ppdc/sample.c:327
 msgid "60 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:261
+#: ppdc/sample.c:253
 msgid "600dpi"
 msgstr ""
 
@@ -2803,15 +2942,15 @@ msgstr ""
 msgid "60x72dpi"
 msgstr ""
 
-#: ppdc/sample.c:416
+#: ppdc/sample.c:411
 msgid "65"
 msgstr ""
 
-#: ppdc/sample.c:318
+#: ppdc/sample.c:313
 msgid "7"
 msgstr ""
 
-#: ppdc/sample.c:440
+#: ppdc/sample.c:435
 msgid "7 inches/sec."
 msgstr ""
 
@@ -2819,23 +2958,19 @@ msgstr ""
 msgid "7 x 9"
 msgstr ""
 
-#: ppdc/sample.c:417
+#: ppdc/sample.c:412
 msgid "70"
 msgstr ""
 
-#: ppdc/sample.c:252
-msgid "720dpi"
-msgstr ""
-
-#: ppdc/sample.c:418
+#: ppdc/sample.c:413
 msgid "75"
 msgstr ""
 
-#: ppdc/sample.c:319
+#: ppdc/sample.c:314
 msgid "8"
 msgstr ""
 
-#: ppdc/sample.c:441
+#: ppdc/sample.c:436
 msgid "8 inches/sec."
 msgstr ""
 
@@ -2871,23 +3006,23 @@ msgstr ""
 msgid "8.00x6.50\""
 msgstr ""
 
-#: ppdc/sample.c:419
+#: ppdc/sample.c:414
 msgid "80"
 msgstr ""
 
-#: ppdc/sample.c:333
+#: ppdc/sample.c:328
 msgid "80 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:420
+#: ppdc/sample.c:415
 msgid "85"
 msgstr ""
 
-#: ppdc/sample.c:320
+#: ppdc/sample.c:315
 msgid "9"
 msgstr ""
 
-#: ppdc/sample.c:442
+#: ppdc/sample.c:437
 msgid "9 inches/sec."
 msgstr ""
 
@@ -2903,32 +3038,32 @@ msgstr ""
 msgid "9-Pin Series"
 msgstr ""
 
-#: ppdc/sample.c:421
+#: ppdc/sample.c:416
 msgid "90"
 msgstr ""
 
-#: ppdc/sample.c:422
+#: ppdc/sample.c:417
 msgid "95"
 msgstr ""
 
-#: berkeley/lpc.c:205
+#: berkeley/lpc.c:203
 msgid "?Invalid help command unknown."
 msgstr ""
 
-#: cgi-bin/admin.c:2348
+#: cgi-bin/admin.c:2352
 msgid "A Samba password is required to export printer drivers"
 msgstr ""
 
-#: cgi-bin/admin.c:2344
+#: cgi-bin/admin.c:2348
 msgid "A Samba username is required to export printer drivers"
 msgstr ""
 
-#: scheduler/ipp.c:2273
+#: scheduler/ipp.c:2298
 #, c-format
 msgid "A class named \"%s\" already exists."
 msgstr ""
 
-#: scheduler/ipp.c:916
+#: scheduler/ipp.c:917
 #, c-format
 msgid "A printer named \"%s\" already exists."
 msgstr ""
@@ -3069,24 +3204,28 @@ msgstr ""
 msgid "ARCH E Long Edge"
 msgstr ""
 
-#: cgi-bin/classes.c:161 cgi-bin/printers.c:164
+#: cgi-bin/classes.c:159 cgi-bin/printers.c:162
 msgid "Accept Jobs"
 msgstr ""
 
-#: cups/http-support.c:1347
+#: cups/http-support.c:1351
 msgid "Accepted"
 msgstr ""
 
-#: cgi-bin/admin.c:548
+#: cups/ppd-cache.c:3090
+msgid "Accordian Fold"
+msgstr ""
+
+#: cgi-bin/admin.c:544
 msgid "Add Class"
 msgstr ""
 
-#: cgi-bin/admin.c:860
+#: cgi-bin/admin.c:857
 msgid "Add Printer"
 msgstr ""
 
-#: cgi-bin/admin.c:422 cgi-bin/admin.c:455 cgi-bin/admin.c:503
-#: cgi-bin/admin.c:513
+#: 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 ""
 
@@ -3094,32 +3233,66 @@ msgstr ""
 msgid "Address"
 msgstr ""
 
-#: cgi-bin/admin.c:188 cgi-bin/admin.c:262 cgi-bin/admin.c:2725
+#: cgi-bin/admin.c:184 cgi-bin/admin.c:258 cgi-bin/admin.c:2729
 msgid "Administration"
 msgstr ""
 
-#: ppdc/sample.c:429
+#: cups/ppd-cache.c:3454
+msgid "Alternate"
+msgstr ""
+
+#: cups/ppd-cache.c:3462
+msgid "Alternate Roll"
+msgstr ""
+
+#: cups/ppd-cache.c:3534
+msgid "Aluminum"
+msgstr ""
+
+#: ppdc/sample.c:424
 msgid "Always"
 msgstr ""
 
-#: backend/socket.c:121
+#: backend/socket.c:118
 msgid "AppSocket/HP JetDirect"
 msgstr ""
 
-#: ppdc/sample.c:450
+#: ppdc/sample.c:445
 msgid "Applicator"
 msgstr ""
 
-#: scheduler/ipp.c:991
+#: cups/ppd-cache.c:3555
+msgid "Archival Envelope"
+msgstr ""
+
+#: cups/ppd-cache.c:3567
+msgid "Archival Fabric"
+msgstr ""
+
+#: scheduler/ipp.c:1012
 #, c-format
 msgid "Attempt to set %s printer-state to bad value %d."
 msgstr ""
 
-#: scheduler/ipp.c:239
+#: scheduler/ipp.c:5425 scheduler/ipp.c:5451
+#, c-format
+msgid "Attribute \"%s\" is in the wrong group."
+msgstr ""
+
+#: scheduler/ipp.c:5427 scheduler/ipp.c:5453
+#, c-format
+msgid "Attribute \"%s\" is the wrong value type."
+msgstr ""
+
+#: scheduler/ipp.c:237
 #, c-format
 msgid "Attribute groups are out of order (%x < %x)."
 msgstr ""
 
+#: cups/ppd-cache.c:3452 cups/ppd-cache.c:3535 cups/ppd-cache.c:3822
+msgid "Automatic"
+msgstr ""
+
 #: ppdc/sample.c:126
 msgid "B0"
 msgstr ""
@@ -3168,334 +3341,459 @@ msgstr ""
 msgid "B9"
 msgstr ""
 
-#: scheduler/ipp.c:10766
+#: cups/ppd-cache.c:3536
+msgid "Back Print Film"
+msgstr ""
+
+#: scheduler/ipp.c:11241
 #, c-format
 msgid "Bad 'document-format' value \"%s\"."
 msgstr ""
 
-#: cups/dest.c:1642
+#: cups/dest.c:1846
 msgid "Bad NULL dests pointer"
 msgstr ""
 
-#: cups/ppd.c:303
+#: cups/ppd.c:320
 msgid "Bad OpenGroup"
 msgstr ""
 
-#: cups/ppd.c:305
+#: cups/ppd.c:322
 msgid "Bad OpenUI/JCLOpenUI"
 msgstr ""
 
-#: cups/ppd.c:307
+#: cups/ppd.c:324
 msgid "Bad OrderDependency"
 msgstr ""
 
-#: cups/ppd-cache.c:117 cups/ppd-cache.c:164 cups/ppd-cache.c:202
-#: cups/ppd-cache.c:208 cups/ppd-cache.c:224 cups/ppd-cache.c:240
-#: cups/ppd-cache.c:249 cups/ppd-cache.c:257 cups/ppd-cache.c:274
-#: cups/ppd-cache.c:282 cups/ppd-cache.c:297 cups/ppd-cache.c:305
-#: cups/ppd-cache.c:326 cups/ppd-cache.c:338 cups/ppd-cache.c:353
-#: cups/ppd-cache.c:365 cups/ppd-cache.c:387 cups/ppd-cache.c:395
-#: cups/ppd-cache.c:413 cups/ppd-cache.c:421 cups/ppd-cache.c:436
-#: cups/ppd-cache.c:444 cups/ppd-cache.c:462 cups/ppd-cache.c:470
-#: cups/ppd-cache.c:497 cups/ppd-cache.c:567 cups/ppd-cache.c:575
-#: cups/ppd-cache.c:583
+#: cups/ppd-cache.c:458 cups/ppd-cache.c:505 cups/ppd-cache.c:590
+#: cups/ppd-cache.c:596 cups/ppd-cache.c:612 cups/ppd-cache.c:628
+#: cups/ppd-cache.c:637 cups/ppd-cache.c:645 cups/ppd-cache.c:662
+#: cups/ppd-cache.c:670 cups/ppd-cache.c:685 cups/ppd-cache.c:693
+#: cups/ppd-cache.c:714 cups/ppd-cache.c:726 cups/ppd-cache.c:741
+#: cups/ppd-cache.c:753 cups/ppd-cache.c:775 cups/ppd-cache.c:783
+#: cups/ppd-cache.c:801 cups/ppd-cache.c:809 cups/ppd-cache.c:824
+#: cups/ppd-cache.c:832 cups/ppd-cache.c:850 cups/ppd-cache.c:858
+#: cups/ppd-cache.c:885 cups/ppd-cache.c:955 cups/ppd-cache.c:963
+#: cups/ppd-cache.c:971
 msgid "Bad PPD cache file."
 msgstr ""
 
-#: cups/http-support.c:1362
+#: scheduler/ipp.c:2673
+msgid "Bad PPD file."
+msgstr ""
+
+#: cups/http-support.c:1366
 msgid "Bad Request"
 msgstr ""
 
-#: cups/snmp.c:954
+#: cups/snmp.c:952
 msgid "Bad SNMP version number"
 msgstr ""
 
-#: cups/ppd.c:308
+#: cups/ppd.c:325
 msgid "Bad UIConstraints"
 msgstr ""
 
-#: cups/http-support.c:1456
+#: cups/hash.c:51 cups/http-support.c:1460
 msgid "Bad arguments to function"
 msgstr ""
 
-#: scheduler/ipp.c:1352
+#: scheduler/ipp.c:1397
 #, c-format
 msgid "Bad copies value %d."
 msgstr ""
 
-#: cups/ppd.c:316
+#: cups/ppd.c:333
 msgid "Bad custom parameter"
 msgstr ""
 
-#: cups/http-support.c:1598 scheduler/ipp.c:2359
+#: cups/http-support.c:1600 scheduler/ipp.c:2378
 #, c-format
 msgid "Bad device-uri \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:2398
+#: scheduler/ipp.c:2423
 #, c-format
 msgid "Bad device-uri scheme \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:8018 scheduler/ipp.c:8034 scheduler/ipp.c:9252
+#: scheduler/ipp.c:8449 scheduler/ipp.c:8467 scheduler/ipp.c:9695
 #, c-format
 msgid "Bad document-format \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:9268
+#: scheduler/ipp.c:9713
 #, c-format
 msgid "Bad document-format-default \"%s\"."
 msgstr ""
 
-#: cups/util.c:896
+#: cups/ppd-util.c:170
 msgid "Bad filename buffer"
 msgstr ""
 
-#: cups/http-support.c:1465
+#: cups/http-support.c:1469
 msgid "Bad hostname/address in URI"
 msgstr ""
 
-#: scheduler/ipp.c:1528
+#: scheduler/ipp.c:1572
 #, c-format
 msgid "Bad job-name value: %s"
 msgstr ""
 
-#: scheduler/ipp.c:1521
+#: scheduler/ipp.c:1565
 msgid "Bad job-name value: Wrong type or count."
 msgstr ""
 
-#: scheduler/ipp.c:9858
+#: scheduler/ipp.c:10309
 msgid "Bad job-priority value."
 msgstr ""
 
-#: scheduler/ipp.c:1382
+#: scheduler/ipp.c:1427
 #, c-format
 msgid "Bad job-sheets value \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:1366
+#: scheduler/ipp.c:1411
 msgid "Bad job-sheets value type."
 msgstr ""
 
-#: scheduler/ipp.c:9888
+#: scheduler/ipp.c:10339
 msgid "Bad job-state value."
 msgstr ""
 
-#: scheduler/ipp.c:2981 scheduler/ipp.c:3441 scheduler/ipp.c:5883
-#: scheduler/ipp.c:6030 scheduler/ipp.c:7452 scheduler/ipp.c:7721
-#: scheduler/ipp.c:8570 scheduler/ipp.c:8796 scheduler/ipp.c:9148
-#: scheduler/ipp.c:9751
+#: scheduler/ipp.c:3008 scheduler/ipp.c:3470 scheduler/ipp.c:6234
+#: scheduler/ipp.c:6381 scheduler/ipp.c:7878 scheduler/ipp.c:8147
+#: scheduler/ipp.c:9013 scheduler/ipp.c:9237 scheduler/ipp.c:9589
+#: scheduler/ipp.c:10202
 #, c-format
 msgid "Bad job-uri \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:2039 scheduler/ipp.c:5421
+#: scheduler/ipp.c:2064 scheduler/ipp.c:5773
 #, c-format
 msgid "Bad notify-pull-method \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:2003 scheduler/ipp.c:5385
+#: scheduler/ipp.c:2028 scheduler/ipp.c:5737
 #, c-format
 msgid "Bad notify-recipient-uri \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:1398
+#: scheduler/ipp.c:1443
 #, c-format
 msgid "Bad number-up value %d."
 msgstr ""
 
-#: cups/adminutil.c:281
+#: cups/adminutil.c:280
 #, c-format
 msgid "Bad option + choice on line %d."
 msgstr ""
 
-#: scheduler/ipp.c:1415
+#: scheduler/ipp.c:1460
 #, c-format
 msgid "Bad page-ranges values %d-%d."
 msgstr ""
 
-#: cups/http-support.c:1462
+#: cups/http-support.c:1466
 msgid "Bad port number in URI"
 msgstr ""
 
-#: scheduler/ipp.c:2441
+#: scheduler/ipp.c:2469
 #, c-format
 msgid "Bad port-monitor \"%s\"."
 msgstr ""
 
-#: cups/dest.c:610 cups/dest.c:1296
-msgid "Bad printer URI."
-msgstr ""
-
-#: scheduler/ipp.c:2502
+#: scheduler/ipp.c:2550
 #, c-format
 msgid "Bad printer-state value %d."
 msgstr ""
 
-#: scheduler/ipp.c:207
+#: cups/dest.c:649 cups/dest.c:1406 cups/dest.c:1453
+msgid "Bad printer-uri."
+msgstr ""
+
+#: scheduler/ipp.c:205
 #, c-format
 msgid "Bad request ID %d."
 msgstr ""
 
-#: scheduler/ipp.c:192
+#: scheduler/ipp.c:190
 #, c-format
 msgid "Bad request version number %d.%d."
 msgstr ""
 
-#: cups/http-support.c:1459
+#: cups/http-support.c:1463
 msgid "Bad resource in URI"
 msgstr ""
 
-#: cups/http-support.c:1471
+#: cups/http-support.c:1475
 msgid "Bad scheme in URI"
 msgstr ""
 
-#: cgi-bin/admin.c:1464
+#: cgi-bin/admin.c:1468
 msgid "Bad subscription ID"
 msgstr ""
 
-#: cups/http-support.c:1468
+#: cups/http-support.c:1472
 msgid "Bad username in URI"
 msgstr ""
 
-#: cups/ppd.c:318
+#: cups/ppd.c:335
 msgid "Bad value string"
 msgstr ""
 
-#: cups/http-support.c:1474
+#: cups/http-support.c:1478
 msgid "Bad/empty URI"
 msgstr ""
 
-#: cgi-bin/admin.c:3270 cgi-bin/admin.c:3516
+#: cups/ppd-cache.c:3075
+msgid "Bale"
+msgstr ""
+
+#: cgi-bin/admin.c:3274 cgi-bin/admin.c:3520
 msgid "Banners"
 msgstr ""
 
-#: ppdc/sample.c:287
+#: cups/ppd-cache.c:3076
+msgid "Bind"
+msgstr ""
+
+#: cups/ppd-cache.c:3080
+msgid "Bind (Landscape)"
+msgstr ""
+
+#: cups/ppd-cache.c:3078
+msgid "Bind (Portrait)"
+msgstr ""
+
+#: cups/ppd-cache.c:3077
+msgid "Bind (Reverse Landscape)"
+msgstr ""
+
+#: cups/ppd-cache.c:3079
+msgid "Bind (Reverse Portrait)"
+msgstr ""
+
+#: cups/ppd-cache.c:3556
+msgid "Bond Envelope"
+msgstr ""
+
+#: ppdc/sample.c:282
 msgid "Bond Paper"
 msgstr ""
 
-#: backend/usb-darwin.c:1874
+#: cups/ppd-cache.c:3081
+msgid "Booklet Maker"
+msgstr ""
+
+#: backend/usb-darwin.c:2008
 #, c-format
 msgid "Boolean expected for waiteof option \"%s\"."
 msgstr ""
 
-#: filter/pstops.c:2029
+#: cups/ppd-cache.c:3465
+msgid "Bottom"
+msgstr ""
+
+#: cups/ppd-cache.c:3823
+msgid "Bottom Tray"
+msgstr ""
+
+#: filter/pstops.c:2032
 msgid "Buffer overflow detected, aborting."
 msgstr ""
 
-#: ppdc/sample.c:254
+#: cups/ppd-cache.c:3539
+msgid "CD"
+msgstr ""
+
+#: ppdc/sample.c:277
 msgid "CMYK"
 msgstr ""
 
-#: ppdc/sample.c:363
+#: ppdc/sample.c:358
 msgid "CPCL Label Printer"
 msgstr ""
 
-#: cgi-bin/admin.c:1465 cgi-bin/admin.c:1504 cgi-bin/admin.c:1514
+#: cgi-bin/classes.c:163 cgi-bin/printers.c:166
+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:2156
+#: backend/ipp.c:2262
 msgid "Canceling print job."
 msgstr ""
 
-#: scheduler/ipp.c:2482
+#: scheduler/ipp.c:988 scheduler/ipp.c:2525
+msgid "Cannot change printer-is-shared for remote queues."
+msgstr ""
+
+#: scheduler/ipp.c:2512
 msgid "Cannot share a remote Kerberized printer."
 msgstr ""
 
-#: ppdc/sample.c:279
+#: cups/ppd-cache.c:3537
+msgid "Cardboard"
+msgstr ""
+
+#: cups/ppd-cache.c:3538
+msgid "Cardstock"
+msgstr ""
+
+#: ppdc/sample.c:271
 msgid "Cassette"
 msgstr ""
 
-#: cgi-bin/admin.c:1635 cgi-bin/admin.c:1777 cgi-bin/admin.c:1790
-#: cgi-bin/admin.c:1801
+#: cups/ppd-cache.c:3469
+msgid "Center"
+msgstr ""
+
+#: cups/ppd-cache.c:3824
+msgid "Center Tray"
+msgstr ""
+
+#: cgi-bin/admin.c:1639 cgi-bin/admin.c:1781 cgi-bin/admin.c:1794
+#: cgi-bin/admin.c:1805
 msgid "Change Settings"
 msgstr ""
 
-#: scheduler/ipp.c:2051 scheduler/ipp.c:5433
+#: scheduler/ipp.c:2076 scheduler/ipp.c:5785
 #, c-format
 msgid "Character set \"%s\" not supported."
 msgstr ""
 
-#: cgi-bin/classes.c:187 cgi-bin/classes.c:314
+#: cgi-bin/classes.c:185 cgi-bin/classes.c:311
 msgid "Classes"
 msgstr ""
 
-#: cgi-bin/printers.c:174
+#: cgi-bin/printers.c:172
 msgid "Clean Print Heads"
 msgstr ""
 
-#: scheduler/ipp.c:3893
+#: scheduler/ipp.c:3922
 msgid "Close-Job doesn't support the job-uri attribute."
 msgstr ""
 
-#: ppdc/sample.c:282
+#: cups/ppd-cache.c:3082
+msgid "Coat"
+msgstr ""
+
+#: cups/ppd-cache.c:3557
+msgid "Coated Envelope"
+msgstr ""
+
+#: cups/ppd-cache.c:3641
+msgid "Coated Paper"
+msgstr ""
+
+#: cups/ppd-cache.c:3726 ppdc/sample.c:276
 msgid "Color"
 msgstr ""
 
-#: ppdc/sample.c:253
+#: cups/ppd-cache.c:3702 cups/ppd-cache.c:3713 cups/ppd-cache.c:3724
+#: cups/ppd-cache.c:3734 ppdc/sample.c:274
 msgid "Color Mode"
 msgstr ""
 
-#: berkeley/lpc.c:196
+#: cups/ppd-cache.c:3588
+msgid "Colored Labels"
+msgstr ""
+
+#: berkeley/lpc.c:194
 msgid ""
 "Commands may be abbreviated.  Commands are:\n"
 "\n"
 "exit    help    quit    status  ?"
 msgstr ""
 
-#: cups/snmp.c:958
+#: cups/snmp.c:956
 msgid "Community name uses indefinite length"
 msgstr ""
 
-#: backend/ipp.c:813 backend/lpd.c:879 backend/socket.c:400
+#: backend/ipp.c:873 backend/lpd.c:940 backend/socket.c:381
 msgid "Connected to printer."
 msgstr ""
 
-#: backend/ipp.c:718 backend/lpd.c:702 backend/socket.c:319
+#: backend/ipp.c:708 backend/lpd.c:763 backend/socket.c:300
 msgid "Connecting to printer."
 msgstr ""
 
-#: cups/http-support.c:1335
+#: cups/http-support.c:1339
 msgid "Continue"
 msgstr ""
 
-#: ppdc/sample.c:365
+#: cups/ppd-cache.c:3540 ppdc/sample.c:360
 msgid "Continuous"
 msgstr ""
 
-#: backend/lpd.c:1028 backend/lpd.c:1160
+#: cups/ppd-cache.c:3541
+msgid "Continuous Long"
+msgstr ""
+
+#: cups/ppd-cache.c:3542
+msgid "Continuous Short"
+msgstr ""
+
+#: backend/lpd.c:1089 backend/lpd.c:1221
 msgid "Control file sent successfully."
 msgstr ""
 
-#: backend/ipp.c:1308 backend/lpd.c:472
+#: backend/ipp.c:1397 backend/lpd.c:455
 msgid "Copying print data."
 msgstr ""
 
-#: cups/http-support.c:1344
-msgid "Created"
+#: cups/ppd-cache.c:3558
+msgid "Cotton Envelope"
 msgstr ""
 
-#: cups/ppd.c:1069 cups/ppd.c:1109 cups/ppd.c:1354 cups/ppd.c:1457
+#: cups/ppd-cache.c:3083
+msgid "Cover"
+msgstr ""
+
+#: cups/http-support.c:1348
+msgid "Created"
+msgstr ""
+
+#: cups/tls-darwin.c:726 cups/tls-gnutls.c:560
+msgid "Credentials do not validate against site CA certificate."
+msgstr ""
+
+#: cups/tls-darwin.c:737 cups/tls-gnutls.c:577
+msgid "Credentials have expired."
+msgstr ""
+
+#: cups/ppd.c:1152 cups/ppd.c:1192 cups/ppd.c:1437 cups/ppd.c:1540
 msgid "Custom"
 msgstr ""
 
-#: ppdc/sample.c:359
+#: ppdc/sample.c:354
 msgid "CustominCutInterval"
 msgstr ""
 
-#: ppdc/sample.c:357
+#: ppdc/sample.c:352
 msgid "CustominTearInterval"
 msgstr ""
 
-#: ppdc/sample.c:343
+#: ppdc/sample.c:338
 msgid "Cut"
 msgstr ""
 
-#: ppdc/sample.c:451
+#: cups/ppd-cache.c:3139
+msgid "Cut Media"
+msgstr ""
+
+#: ppdc/sample.c:446
 msgid "Cutter"
 msgstr ""
 
+#: cups/ppd-cache.c:3551
+msgid "DVD"
+msgstr ""
+
 #: ppdc/sample.c:239
 msgid "Dark"
 msgstr ""
@@ -3504,28 +3802,32 @@ msgstr ""
 msgid "Darkness"
 msgstr ""
 
-#: backend/lpd.c:1113
+#: backend/lpd.c:1174
 msgid "Data file sent successfully."
 msgstr ""
 
-#: cgi-bin/admin.c:2074 cgi-bin/admin.c:2085 cgi-bin/admin.c:2130
+#: cups/ppd-cache.c:3736
+msgid "Deep Color"
+msgstr ""
+
+#: cgi-bin/admin.c:2078 cgi-bin/admin.c:2089 cgi-bin/admin.c:2134
 msgid "Delete Class"
 msgstr ""
 
-#: cgi-bin/admin.c:2159 cgi-bin/admin.c:2170 cgi-bin/admin.c:2215
+#: cgi-bin/admin.c:2163 cgi-bin/admin.c:2174 cgi-bin/admin.c:2219
 msgid "Delete Printer"
 msgstr ""
 
-#: ppdc/sample.c:281
+#: ppdc/sample.c:273
 msgid "DeskJet Series"
 msgstr ""
 
-#: scheduler/ipp.c:1276
+#: scheduler/ipp.c:1326
 #, c-format
 msgid "Destination \"%s\" is not accepting jobs."
 msgstr ""
 
-#: systemv/lpinfo.c:300
+#: systemv/lpinfo.c:273
 #, c-format
 msgid ""
 "Device: uri = %s\n"
@@ -3536,45 +3838,82 @@ msgid ""
 "        location = %s"
 msgstr ""
 
-#: ppdc/sample.c:436
+#: ppdc/sample.c:431
 msgid "Direct Thermal Media"
 msgstr ""
 
-#: cups/file.c:258
+#: cups/file.c:256
 #, c-format
 msgid "Directory \"%s\" contains a relative path."
 msgstr ""
 
-#: cups/file.c:230
+#: cups/file.c:228
 #, c-format
 msgid "Directory \"%s\" has insecure permissions (0%o/uid=%d/gid=%d)."
 msgstr ""
 
-#: cups/file.c:247
+#: cups/file.c:245
 #, c-format
 msgid "Directory \"%s\" is a file."
 msgstr ""
 
-#: cups/file.c:218
+#: cups/file.c:216
 #, c-format
 msgid "Directory \"%s\" not available: %s"
 msgstr ""
 
-#: cups/file.c:203
+#: cups/file.c:201
 #, c-format
 msgid "Directory \"%s\" permissions OK (0%o/uid=%d/gid=%d)."
 msgstr ""
 
-#: ppdc/sample.c:345
+#: ppdc/sample.c:340
 msgid "Disabled"
 msgstr ""
 
-#: scheduler/ipp.c:5932
+#: cups/ppd-cache.c:3458
+msgid "Disc"
+msgstr ""
+
+#: scheduler/ipp.c:6283
 #, c-format
 msgid "Document #%d does not exist in job #%d."
 msgstr ""
 
-#: ppdc/sample.c:275
+#: cups/ppd-cache.c:3091
+msgid "Double Gate Fold"
+msgstr ""
+
+#: cups/ppd-cache.c:3132
+msgid "Double Staple (Landscape)"
+msgstr ""
+
+#: cups/ppd-cache.c:3130
+msgid "Double Staple (Portrait)"
+msgstr ""
+
+#: cups/ppd-cache.c:3129
+msgid "Double Staple (Reverse Landscape)"
+msgstr ""
+
+#: cups/ppd-cache.c:3131
+msgid "Double Staple (Reverse Portrait)"
+msgstr ""
+
+#: cups/ppd-cache.c:3549
+msgid "Double Wall Cardboard"
+msgstr ""
+
+#: cups/ppd-cache.c:3987 cups/ppd-cache.c:4042 cups/ppd-cache.c:4044
+#: cups/ppd-cache.c:4071
+msgid "Draft"
+msgstr ""
+
+#: cups/ppd-cache.c:3550
+msgid "Dry Film"
+msgstr ""
+
+#: ppdc/sample.c:267
 msgid "Duplexer"
 msgstr ""
 
@@ -3582,51 +3921,59 @@ msgstr ""
 msgid "Dymo"
 msgstr ""
 
-#: ppdc/sample.c:431
+#: ppdc/sample.c:426
 msgid "EPL1 Label Printer"
 msgstr ""
 
-#: ppdc/sample.c:434
+#: ppdc/sample.c:429
 msgid "EPL2 Label Printer"
 msgstr ""
 
-#: cgi-bin/admin.c:1829 cgi-bin/admin.c:1841 cgi-bin/admin.c:1895
-#: cgi-bin/admin.c:1902 cgi-bin/admin.c:1937 cgi-bin/admin.c:1950
-#: cgi-bin/admin.c:1974 cgi-bin/admin.c:2047
+#: 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
 msgid "Edit Configuration File"
 msgstr ""
 
-#: cups/adminutil.c:326
+#: cups/ppd-cache.c:3552
+msgid "Embossing Foil"
+msgstr ""
+
+#: cups/adminutil.c:325
 msgid "Empty PPD file."
 msgstr ""
 
-#. TRANSLATORS: Banner/cover sheet after the print job.
-#: cgi-bin/admin.c:3541
-msgid "Ending Banner"
+#: cups/http.c:4617
+msgid "Encryption is not supported."
 msgstr ""
 
-#: ppdc/sample.c:2
-msgid "English"
+#: cups/ppd-cache.c:3553
+msgid "End Board"
 msgstr ""
 
-#: systemv/lppasswd.c:193
-msgid "Enter old password:"
+#. TRANSLATORS: Banner/cover sheet after the print job.
+#: cgi-bin/admin.c:3545
+msgid "Ending Banner"
 msgstr ""
 
-#: systemv/lppasswd.c:224
-msgid "Enter password again:"
+#: cups/ppd-cache.c:3092
+msgid "Engineering Z Fold"
 msgstr ""
 
-#: systemv/lppasswd.c:212
-msgid "Enter password:"
+#: ppdc/sample.c:2
+msgid "English"
 msgstr ""
 
-#: scheduler/client.c:2200
+#: scheduler/client.c:2224
 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:3457 cups/ppd-cache.c:3554
+msgid "Envelope"
+msgstr ""
+
 #: ppdc/sample.c:73
-msgid "Envelope #10 "
+msgid "Envelope #10"
 msgstr ""
 
 #: ppdc/sample.c:74
@@ -3713,7 +4060,7 @@ msgstr ""
 msgid "Envelope DL"
 msgstr ""
 
-#: ppdc/sample.c:269
+#: ppdc/sample.c:261
 msgid "Envelope Feed"
 msgstr ""
 
@@ -3746,7 +4093,7 @@ msgid "Envelope Monarch"
 msgstr ""
 
 #: ppdc/sample.c:99
-msgid "Envelope PRC1 "
+msgid "Envelope PRC1"
 msgstr ""
 
 #: ppdc/sample.c:100
@@ -3837,7 +4184,7 @@ msgstr ""
 msgid "Envelope You4 Long Edge"
 msgstr ""
 
-#: test/ippfind.c:2779
+#: test/ippfind.c:2815
 msgid "Environment Variables:"
 msgstr ""
 
@@ -3845,56 +4192,60 @@ msgstr ""
 msgid "Epson"
 msgstr ""
 
-#: cgi-bin/admin.c:3584
+#: cgi-bin/admin.c:3588
 msgid "Error Policy"
 msgstr ""
 
-#: filter/rastertopwg.c:395 filter/rastertopwg.c:410 filter/rastertopwg.c:421
-#: filter/rastertopwg.c:432
+#: filter/rastertopwg.c:457
+msgid "Error reading raster data."
+msgstr ""
+
+#: filter/rastertopwg.c:426 filter/rastertopwg.c:447 filter/rastertopwg.c:465
+#: filter/rastertopwg.c:476
 msgid "Error sending raster data."
 msgstr ""
 
-#: systemv/lpinfo.c:103 systemv/lpmove.c:88
+#: systemv/lpinfo.c:208 systemv/lpmove.c:86
 msgid "Error: need hostname after \"-h\" option."
 msgstr ""
 
-#: ppdc/sample.c:355
+#: ppdc/sample.c:350
 msgid "Every 10 Labels"
 msgstr ""
 
-#: ppdc/sample.c:347
+#: ppdc/sample.c:342
 msgid "Every 2 Labels"
 msgstr ""
 
-#: ppdc/sample.c:348
+#: ppdc/sample.c:343
 msgid "Every 3 Labels"
 msgstr ""
 
-#: ppdc/sample.c:349
+#: ppdc/sample.c:344
 msgid "Every 4 Labels"
 msgstr ""
 
-#: ppdc/sample.c:350
+#: ppdc/sample.c:345
 msgid "Every 5 Labels"
 msgstr ""
 
-#: ppdc/sample.c:351
+#: ppdc/sample.c:346
 msgid "Every 6 Labels"
 msgstr ""
 
-#: ppdc/sample.c:352
+#: ppdc/sample.c:347
 msgid "Every 7 Labels"
 msgstr ""
 
-#: ppdc/sample.c:353
+#: ppdc/sample.c:348
 msgid "Every 8 Labels"
 msgstr ""
 
-#: ppdc/sample.c:354
+#: ppdc/sample.c:349
 msgid "Every 9 Labels"
 msgstr ""
 
-#: ppdc/sample.c:346
+#: ppdc/sample.c:341
 msgid "Every Label"
 msgstr ""
 
@@ -3902,28 +4253,40 @@ msgstr ""
 msgid "Executive"
 msgstr ""
 
-#: cups/http-support.c:1390
+#: cups/http-support.c:1394
 msgid "Expectation Failed"
 msgstr ""
 
-#: cgi-bin/admin.c:2336 cgi-bin/admin.c:2355
+#: cgi-bin/admin.c:2340 cgi-bin/admin.c:2359
 msgid "Export Printers to Samba"
 msgstr ""
 
-#: test/ippfind.c:2725
+#: test/ippfind.c:2761
 msgid "Expressions:"
 msgstr ""
 
-#: systemv/cupstestdsc.c:172 systemv/cupstestdsc.c:189
-#: systemv/cupstestdsc.c:214 systemv/cupstestdsc.c:231
-#: systemv/cupstestdsc.c:255 systemv/cupstestdsc.c:273
-#: systemv/cupstestdsc.c:302 systemv/cupstestdsc.c:339
-#: systemv/cupstestdsc.c:349 systemv/cupstestdsc.c:359
-#: systemv/cupstestdsc.c:369 systemv/cupstestdsc.c:379
-#: systemv/cupstestdsc.c:387
+#: 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
 msgid "FAIL"
 msgstr ""
 
+#: cups/ppd-cache.c:3566
+msgid "Fabric"
+msgstr ""
+
+#: cups/ppd-cache.c:3825
+msgid "Face Down"
+msgstr ""
+
+#: cups/ppd-cache.c:3826
+msgid "Face Up"
+msgstr ""
+
 #: ppdc/sample.c:122
 msgid "FanFold German"
 msgstr ""
@@ -3936,182 +4299,310 @@ msgstr ""
 msgid "Fanfold US"
 msgstr ""
 
-#: cups/file.c:262
+#: cups/ppd-cache.c:3704
+msgid "Fast Grayscale"
+msgstr ""
+
+#: cups/file.c:260
 #, c-format
 msgid "File \"%s\" contains a relative path."
 msgstr ""
 
-#: cups/file.c:237
+#: cups/file.c:235
 #, c-format
 msgid "File \"%s\" has insecure permissions (0%o/uid=%d/gid=%d)."
 msgstr ""
 
-#: cups/file.c:251
+#: cups/file.c:249
 #, c-format
 msgid "File \"%s\" is a directory."
 msgstr ""
 
-#: cups/file.c:223
+#: cups/file.c:221
 #, c-format
 msgid "File \"%s\" not available: %s"
 msgstr ""
 
-#: cups/file.c:209
+#: cups/file.c:207
 #, c-format
 msgid "File \"%s\" permissions OK (0%o/uid=%d/gid=%d)."
 msgstr ""
 
 #: ppdc/sample.c:169
-msgid "File Folder "
+msgid "File Folder"
 msgstr ""
 
-#: scheduler/ipp.c:2377
+#: scheduler/ipp.c:2399
 #, c-format
 msgid "File device URIs have been disabled. To enable, see the FileDevice directive in \"%s/cups-files.conf\"."
 msgstr ""
 
-#: filter/rastertoepson.c:1102 filter/rastertohp.c:834
-#: filter/rastertolabel.c:1254
+#: cups/ppd-cache.c:3573
+msgid "Film"
+msgstr ""
+
+#: cups/ppd-cache.c:3559
+msgid "Fine Envelope"
+msgstr ""
+
+#: filter/rastertoepson.c:1136 filter/rastertohp.c:808
+#: filter/rastertolabel.c:1257
 #, c-format
 msgid "Finished page %d."
 msgstr ""
 
+#: cups/ppd-cache.c:3901 cups/ppd-cache.c:3946
+msgid "Finishing"
+msgstr ""
+
+#: cups/ppd-cache.c:3574
+msgid "Flexo Base"
+msgstr ""
+
+#: cups/ppd-cache.c:3575
+msgid "Flexo Photo Polymer"
+msgstr ""
+
+#: cups/ppd-cache.c:3576
+msgid "Flute"
+msgstr ""
+
+#: cups/ppd-cache.c:3577
+msgid "Foil"
+msgstr ""
+
+#: cups/ppd-cache.c:3089
+msgid "Fold"
+msgstr ""
+
 #: ppdc/sample.c:125
 msgid "Folio"
 msgstr ""
 
-#: cups/http-support.c:1369
+#: cups/http-support.c:1373
 msgid "Forbidden"
 msgstr ""
 
-#: cups/ppd.c:700 cups/ppd.c:1258
+#: cups/ppd-cache.c:3578
+msgid "Full Cut Tabs"
+msgstr ""
+
+#: cups/ppd-cache.c:3093
+msgid "Gate Fold"
+msgstr ""
+
+#: cups/ppd.c:783 cups/ppd.c:1341
 msgid "General"
 msgstr ""
 
-#: ppdc/sample.c:259
+#: ppdc/sample.c:251
 msgid "Generic"
 msgstr ""
 
-#: cups/snmp.c:968
+#: cups/snmp.c:966
 msgid "Get-Response-PDU uses indefinite length"
 msgstr ""
 
-#: ppdc/sample.c:290
+#: cups/ppd-cache.c:3579
+msgid "Glass"
+msgstr ""
+
+#: cups/ppd-cache.c:3580
+msgid "Glass Colored"
+msgstr ""
+
+#: cups/ppd-cache.c:3581
+msgid "Glass Opaque"
+msgstr ""
+
+#: cups/ppd-cache.c:3582
+msgid "Glass Surfaced"
+msgstr ""
+
+#: cups/ppd-cache.c:3583
+msgid "Glass Textured"
+msgstr ""
+
+#: cups/ppd-cache.c:3568
+msgid "Glossy Fabric"
+msgstr ""
+
+#: cups/ppd-cache.c:3589
+msgid "Glossy Labels"
+msgstr ""
+
+#: cups/ppd-cache.c:3544
+msgid "Glossy Optical Disc"
+msgstr ""
+
+#: ppdc/sample.c:285
 msgid "Glossy Paper"
 msgstr ""
 
-#: scheduler/ipp.c:2959 scheduler/ipp.c:3367 scheduler/ipp.c:3905
-#: scheduler/ipp.c:5861 scheduler/ipp.c:6008 scheduler/ipp.c:7429
-#: scheduler/ipp.c:8548 scheduler/ipp.c:8774 scheduler/ipp.c:9126
-#: scheduler/ipp.c:9729
+#: cups/ppd-cache.c:3614
+msgid "Glossy Photo Paper"
+msgstr ""
+
+#: scheduler/ipp.c:2986 scheduler/ipp.c:3396 scheduler/ipp.c:3934
+#: scheduler/ipp.c:6212 scheduler/ipp.c:6359 scheduler/ipp.c:7855
+#: scheduler/ipp.c:8991 scheduler/ipp.c:9215 scheduler/ipp.c:9567
+#: scheduler/ipp.c:10180
 msgid "Got a printer-uri attribute but no job-id."
 msgstr ""
 
-#: ppdc/sample.c:255
+#: cups/ppd-cache.c:3584
+msgid "Gravure Cylinder"
+msgstr ""
+
+#: cups/ppd-cache.c:3715 ppdc/sample.c:275
 msgid "Grayscale"
 msgstr ""
 
-#: ppdc/sample.c:280
+#: ppdc/sample.c:272
 msgid "HP"
 msgstr ""
 
+#: cups/ppd-cache.c:3460
+msgid "Hagaki"
+msgstr ""
+
+#: cups/ppd-cache.c:3094
+msgid "Half Fold"
+msgstr ""
+
+#: cups/ppd-cache.c:3095
+msgid "Half Z Fold"
+msgstr ""
+
 #: ppdc/sample.c:170
 msgid "Hanging Folder"
 msgstr ""
 
-#: cgi-bin/help.c:143
+#: cups/hash.c:243
+msgid "Hash buffer too small."
+msgstr ""
+
+#: cups/ppd-cache.c:3560
+msgid "Heavyweight Envelope"
+msgstr ""
+
+#: cups/ppd-cache.c:3644
+msgid "Heavyweight Paper"
+msgstr ""
+
+#: cgi-bin/help.c:137
 msgid "Help file not in index."
 msgstr ""
 
-#: cups/ipp.c:3095 cups/ipp.c:3122 cups/ipp.c:3145
+#: cups/ppd-cache.c:3997 cups/ppd-cache.c:4047 cups/ppd-cache.c:4074
+msgid "High"
+msgstr ""
+
+#: cups/ppd-cache.c:3569
+msgid "High Gloss Fabric"
+msgstr ""
+
+#: cups/ppd-cache.c:3590
+msgid "High Gloss Labels"
+msgstr ""
+
+#: cups/ppd-cache.c:3545
+msgid "High Gloss Optical Disc"
+msgstr ""
+
+#: cups/ppd-cache.c:3615
+msgid "High Gloss Photo Paper"
+msgstr ""
+
+#: cups/ipp.c:3160 cups/ipp.c:3187 cups/ipp.c:3210
 msgid "IPP 1setOf attribute with incompatible value tags."
 msgstr ""
 
-#: cups/ipp.c:3058
+#: cups/ipp.c:3123
 msgid "IPP attribute has no name."
 msgstr ""
 
-#: cups/ipp.c:6912
+#: cups/ipp.c:6987
 msgid "IPP attribute is not a member of the message."
 msgstr ""
 
-#: cups/ipp.c:3506
+#: cups/ipp.c:3569
 msgid "IPP begCollection value not 0 bytes."
 msgstr ""
 
-#: cups/ipp.c:3288
+#: cups/ipp.c:3351
 msgid "IPP boolean value not 1 byte."
 msgstr ""
 
-#: cups/ipp.c:3349
+#: cups/ipp.c:3412
 msgid "IPP date value not 11 bytes."
 msgstr ""
 
-#: cups/ipp.c:3527
+#: cups/ipp.c:3590
 msgid "IPP endCollection value not 0 bytes."
 msgstr ""
 
-#: cups/ipp.c:3263
+#: cups/ipp.c:3326
 msgid "IPP enum value not 4 bytes."
 msgstr ""
 
-#: cups/ipp.c:2987
+#: cups/ipp.c:3053
 msgid "IPP extension tag larger than 0x7FFFFFFF."
 msgstr ""
 
-#: cups/ipp.c:3260
+#: cups/ipp.c:3323
 msgid "IPP integer value not 4 bytes."
 msgstr ""
 
-#: cups/ipp.c:3459
+#: cups/ipp.c:3522
 msgid "IPP language length overflows value."
 msgstr ""
 
-#: cups/ipp.c:3468
+#: cups/ipp.c:3531
 msgid "IPP language length too large."
 msgstr ""
 
-#: cups/ipp.c:3172
+#: cups/ipp.c:3237
 msgid "IPP member name is not empty."
 msgstr ""
 
-#: cups/ipp.c:3553
+#: cups/ipp.c:3616
 msgid "IPP memberName value is empty."
 msgstr ""
 
-#: cups/ipp.c:3545
+#: cups/ipp.c:3608
 msgid "IPP memberName with no attribute."
 msgstr ""
 
-#: cups/ipp.c:3041
+#: cups/ipp.c:3106
 msgid "IPP name larger than 32767 bytes."
 msgstr ""
 
-#: cups/ipp.c:3426
+#: cups/ipp.c:3489
 msgid "IPP nameWithLanguage value less than minimum 4 bytes."
 msgstr ""
 
-#: cups/ipp.c:3583
+#: cups/ipp.c:3646
 msgid "IPP octetString length too large."
 msgstr ""
 
-#: cups/ipp.c:3394
+#: cups/ipp.c:3457
 msgid "IPP rangeOfInteger value not 8 bytes."
 msgstr ""
 
-#: cups/ipp.c:3367
+#: cups/ipp.c:3430
 msgid "IPP resolution value not 9 bytes."
 msgstr ""
 
-#: cups/ipp.c:3486
+#: cups/ipp.c:3549
 msgid "IPP string length overflows value."
 msgstr ""
 
-#: cups/ipp.c:3422
+#: cups/ipp.c:3485
 msgid "IPP textWithLanguage value less than minimum 4 bytes."
 msgstr ""
 
-#: cups/ipp.c:3246
+#: cups/ipp.c:3309
 msgid "IPP value larger than 32767 bytes."
 msgstr ""
 
@@ -4119,47 +4610,63 @@ msgstr ""
 msgid "ISOLatin1"
 msgstr ""
 
-#: cups/ppd.c:311
+#: cups/ppd.c:328
 msgid "Illegal control character"
 msgstr ""
 
-#: cups/ppd.c:312
+#: cups/ppd.c:329
 msgid "Illegal main keyword string"
 msgstr ""
 
-#: cups/ppd.c:313
+#: cups/ppd.c:330
 msgid "Illegal option keyword string"
 msgstr ""
 
-#: cups/ppd.c:314
+#: cups/ppd.c:331
 msgid "Illegal translation string"
 msgstr ""
 
-#: cups/ppd.c:315
+#: cups/ppd.c:332
 msgid "Illegal whitespace character"
 msgstr ""
 
-#: ppdc/sample.c:274
+#: cups/ppd-cache.c:3585
+msgid "Image Setter Paper"
+msgstr ""
+
+#: cups/ppd-cache.c:3586
+msgid "Imaging Cylinder"
+msgstr ""
+
+#: cups/ppd-cache.c:3561
+msgid "Inkjet Envelope"
+msgstr ""
+
+#: cups/ppd-cache.c:3591
+msgid "Inkjet Labels"
+msgstr ""
+
+#: ppdc/sample.c:266
 msgid "Installable Options"
 msgstr ""
 
-#: ppdc/sample.c:277
+#: ppdc/sample.c:269
 msgid "Installed"
 msgstr ""
 
-#: ppdc/sample.c:293
+#: ppdc/sample.c:288
 msgid "IntelliBar Label Printer"
 msgstr ""
 
-#: ppdc/sample.c:292
+#: ppdc/sample.c:287
 msgid "Intellitech"
 msgstr ""
 
-#: cups/http-support.c:1396
+#: cups/http-support.c:1400
 msgid "Internal Server Error"
 msgstr ""
 
-#: cups/ppd.c:302
+#: cups/ppd.c:319
 msgid "Internal error"
 msgstr ""
 
@@ -4171,24 +4678,28 @@ msgstr ""
 msgid "Internet Postage 3-Part"
 msgstr ""
 
-#: backend/ipp.c:317
+#: backend/ipp.c:325
 msgid "Internet Printing Protocol"
 msgstr ""
 
-#: cups/pwg-media.c:293 cups/pwg-media.c:312
+#: cups/pwg-media.c:290 cups/pwg-media.c:309
 msgid "Invalid media name arguments."
 msgstr ""
 
-#: cups/dest-options.c:1014
+#: cups/dest-options.c:1031
 msgid "Invalid media size."
 msgstr ""
 
-#: filter/commandtops.c:114
+#: scheduler/ipp.c:2719 scheduler/ipp.c:7026
+msgid "Invalid ppd-name value."
+msgstr ""
+
+#: filter/commandtops.c:112
 #, c-format
 msgid "Invalid printer command \"%s\"."
 msgstr ""
 
-#: cups/ppd.c:1376
+#: cups/ppd.c:1459
 msgid "JCL"
 msgstr ""
 
@@ -4248,52 +4759,52 @@ msgstr ""
 msgid "JIS B9"
 msgstr ""
 
-#: scheduler/ipp.c:8846
+#: scheduler/ipp.c:9287
 #, c-format
 msgid "Job #%d cannot be restarted - no files."
 msgstr ""
 
-#: scheduler/ipp.c:2999 scheduler/ipp.c:3233 scheduler/ipp.c:3292
-#: scheduler/ipp.c:3469 scheduler/ipp.c:3915 scheduler/ipp.c:5519
-#: scheduler/ipp.c:5901 scheduler/ipp.c:6048 scheduler/ipp.c:6337
-#: scheduler/ipp.c:7276 scheduler/ipp.c:7298 scheduler/ipp.c:7470
-#: scheduler/ipp.c:7695 scheduler/ipp.c:7738 scheduler/ipp.c:8588
-#: scheduler/ipp.c:8814 scheduler/ipp.c:9166 scheduler/ipp.c:9769
+#: scheduler/ipp.c:3026 scheduler/ipp.c:3260 scheduler/ipp.c:3319
+#: scheduler/ipp.c:3498 scheduler/ipp.c:3944 scheduler/ipp.c:5871
+#: scheduler/ipp.c:6252 scheduler/ipp.c:6399 scheduler/ipp.c:6736
+#: scheduler/ipp.c:7696 scheduler/ipp.c:7718 scheduler/ipp.c:7896
+#: scheduler/ipp.c:8121 scheduler/ipp.c:8164 scheduler/ipp.c:9031
+#: scheduler/ipp.c:9255 scheduler/ipp.c:9607 scheduler/ipp.c:10220
 #, c-format
 msgid "Job #%d does not exist."
 msgstr ""
 
-#: scheduler/ipp.c:3501
+#: scheduler/ipp.c:3530
 #, c-format
 msgid "Job #%d is already aborted - can't cancel."
 msgstr ""
 
-#: scheduler/ipp.c:3495
+#: scheduler/ipp.c:3524
 #, c-format
 msgid "Job #%d is already canceled - can't cancel."
 msgstr ""
 
-#: scheduler/ipp.c:3507
+#: scheduler/ipp.c:3536
 #, c-format
 msgid "Job #%d is already completed - can't cancel."
 msgstr ""
 
-#: scheduler/ipp.c:7496 scheduler/ipp.c:7780 scheduler/ipp.c:9784
+#: scheduler/ipp.c:7922 scheduler/ipp.c:8206 scheduler/ipp.c:10235
 #, c-format
 msgid "Job #%d is finished and cannot be altered."
 msgstr ""
 
-#: scheduler/ipp.c:8828
+#: scheduler/ipp.c:9269
 #, c-format
 msgid "Job #%d is not complete."
 msgstr ""
 
-#: scheduler/ipp.c:3014
+#: scheduler/ipp.c:3041
 #, c-format
 msgid "Job #%d is not held for authentication."
 msgstr ""
 
-#: scheduler/ipp.c:8602
+#: scheduler/ipp.c:9045
 #, c-format
 msgid "Job #%d is not held."
 msgstr ""
@@ -4314,27 +4825,31 @@ msgstr ""
 msgid "Job Stopped"
 msgstr ""
 
-#: scheduler/ipp.c:9866
+#: scheduler/ipp.c:10317
 msgid "Job is completed and cannot be changed."
 msgstr ""
 
-#: cgi-bin/jobs.c:192
+#: cgi-bin/jobs.c:190
 msgid "Job operation failed"
 msgstr ""
 
-#: scheduler/ipp.c:9902 scheduler/ipp.c:9919 scheduler/ipp.c:9930
+#: scheduler/ipp.c:10353 scheduler/ipp.c:10370 scheduler/ipp.c:10381
 msgid "Job state cannot be changed."
 msgstr ""
 
-#: scheduler/ipp.c:8694
+#: scheduler/ipp.c:9135
 msgid "Job subscriptions cannot be renewed."
 msgstr ""
 
-#: cgi-bin/jobs.c:97 cgi-bin/jobs.c:108 cgi-bin/jobs.c:189
+#: cgi-bin/jobs.c:95 cgi-bin/jobs.c:106 cgi-bin/jobs.c:187
 msgid "Jobs"
 msgstr ""
 
-#: backend/lpd.c:177
+#: cups/ppd-cache.c:3102
+msgid "Jog"
+msgstr ""
+
+#: backend/lpd.c:172
 msgid "LPD/LPR Host or Printer"
 msgstr ""
 
@@ -4342,11 +4857,23 @@ msgstr ""
 msgid "Label Printer"
 msgstr ""
 
-#: ppdc/sample.c:446
+#: ppdc/sample.c:441
 msgid "Label Top"
 msgstr ""
 
-#: scheduler/ipp.c:2060 scheduler/ipp.c:5442
+#: cups/ppd-cache.c:3587
+msgid "Labels"
+msgstr ""
+
+#: cups/ppd-cache.c:3103
+msgid "Laminate"
+msgstr ""
+
+#: cups/ppd-cache.c:3597
+msgid "Laminating Foil"
+msgstr ""
+
+#: scheduler/ipp.c:2085 scheduler/ipp.c:5794
 #, c-format
 msgid "Language \"%s\" not supported."
 msgstr ""
@@ -4355,10 +4882,34 @@ msgstr ""
 msgid "Large Address"
 msgstr ""
 
-#: ppdc/sample.c:291
+#: cups/ppd-cache.c:3455
+msgid "Large Capacity"
+msgstr ""
+
+#: cups/ppd-cache.c:3827
+msgid "Large Capacity Tray"
+msgstr ""
+
+#: ppdc/sample.c:286
 msgid "LaserJet Series PCL 4/5"
 msgstr ""
 
+#: cups/ppd-cache.c:3467
+msgid "Left"
+msgstr ""
+
+#: cups/ppd-cache.c:3096
+msgid "Left Gate Fold"
+msgstr ""
+
+#: cups/ppd-cache.c:3828
+msgid "Left Tray"
+msgstr ""
+
+#: cups/ppd-cache.c:3097
+msgid "Letter Fold"
+msgstr ""
+
 #: ppdc/sample.c:43
 msgid "Letter Oversize"
 msgstr ""
@@ -4367,139 +4918,256 @@ msgstr ""
 msgid "Letter Oversize Long Edge"
 msgstr ""
 
+#: cups/ppd-cache.c:3598 cups/ppd-cache.c:3647
+msgid "Letterhead"
+msgstr ""
+
 #: ppdc/sample.c:236
 msgid "Light"
 msgstr ""
 
-#: cups/ppd.c:310
+#: cups/ppd-cache.c:3562
+msgid "Lightweight Envelope"
+msgstr ""
+
+#: cups/ppd-cache.c:3648
+msgid "Lightweight Paper"
+msgstr ""
+
+#: cups/ppd.c:327
 msgid "Line longer than the maximum allowed (255 characters)"
 msgstr ""
 
-#: cgi-bin/admin.c:2373
+#: cgi-bin/admin.c:2377
 msgid "List Available Printers"
 msgstr ""
 
-#: cups/localize.c:291
+#: cups/ppd-localize.c:289
 msgid "Load paper."
 msgstr ""
 
-#: ppdc/sample.c:272
+#: scheduler/ipp.c:5503
+msgid "Local printer created."
+msgstr ""
+
+#: cups/ppd-cache.c:3762 ppdc/sample.c:264
 msgid "Long-Edge (Portrait)"
 msgstr ""
 
-#: cups/http-support.c:1723
+#: cups/http-support.c:1727
 msgid "Looking for printer."
 msgstr ""
 
-#: ppdc/sample.c:268
-msgid "Manual Feed"
+#: cups/ppd-cache.c:3829
+msgid "Mailbox 1"
 msgstr ""
 
-#: cups/ppd.c:747 cups/ppd.c:1313
-msgid "Media Size"
+#: cups/ppd-cache.c:3838
+msgid "Mailbox 10"
 msgstr ""
 
-#: cups/ppd.c:751 cups/ppd.c:1317 ppdc/sample.c:262
-msgid "Media Source"
+#: cups/ppd-cache.c:3830
+msgid "Mailbox 2"
 msgstr ""
 
-#: ppdc/sample.c:364
-msgid "Media Tracking"
+#: cups/ppd-cache.c:3831
+msgid "Mailbox 3"
 msgstr ""
 
-#: cups/ppd.c:749 cups/ppd.c:1315 ppdc/sample.c:285
-msgid "Media Type"
+#: cups/ppd-cache.c:3832
+msgid "Mailbox 4"
 msgstr ""
 
-#: ppdc/sample.c:237
-msgid "Medium"
+#: cups/ppd-cache.c:3833
+msgid "Mailbox 5"
 msgstr ""
 
-#: cups/ppd.c:299
-msgid "Memory allocation error"
+#: cups/ppd-cache.c:3834
+msgid "Mailbox 6"
 msgstr ""
 
-#: cups/ppd.c:319
-msgid "Missing CloseGroup"
+#: cups/ppd-cache.c:3835
+msgid "Mailbox 7"
 msgstr ""
 
-#: cups/ppd.c:300
-msgid "Missing PPD-Adobe-4.x header"
+#: cups/ppd-cache.c:3836
+msgid "Mailbox 8"
 msgstr ""
 
-#: cups/ppd.c:309
-msgid "Missing asterisk in column 1"
+#: cups/ppd-cache.c:3837
+msgid "Mailbox 9"
 msgstr ""
 
-#: scheduler/ipp.c:5924
-msgid "Missing document-number attribute."
+#: cups/ppd-cache.c:3453
+msgid "Main"
 msgstr ""
 
-#: cups/adminutil.c:262
-#, c-format
-msgid "Missing double quote on line %d."
+#: cups/ppd-cache.c:3461
+msgid "Main Roll"
 msgstr ""
 
-#: cgi-bin/admin.c:714 cgi-bin/admin.c:2086 cgi-bin/admin.c:2171
-#: cgi-bin/admin.c:2765 cgi-bin/admin.c:3019 cgi-bin/admin.c:3130
-#: cgi-bin/admin.c:3840
-msgid "Missing form variable"
+#: cups/ppd-cache.c:3456
+msgid "Manual"
 msgstr ""
 
-#: scheduler/ipp.c:9220
-msgid "Missing last-document attribute in request."
+#: ppdc/sample.c:260
+msgid "Manual Feed"
 msgstr ""
 
-#: cups/pwg-media.c:555
-msgid "Missing media or media-col."
+#: cups/ppd-cache.c:3570
+msgid "Matte Fabric"
 msgstr ""
 
-#: cups/pwg-media.c:474
-msgid "Missing media-size in media-col."
+#: cups/ppd-cache.c:3592
+msgid "Matte Labels"
 msgstr ""
 
-#: scheduler/ipp.c:6467
-msgid "Missing notify-subscription-ids attribute."
+#: cups/ppd-cache.c:3546
+msgid "Matte Optical Disc"
 msgstr ""
 
-#: cups/ppd.c:317
-msgid "Missing option keyword"
+#: cups/ppd-cache.c:3616
+msgid "Matte Photo Paper"
 msgstr ""
 
-#: scheduler/ipp.c:3140 scheduler/ipp.c:3165
-msgid "Missing requesting-user-name attribute."
+#: cups/ppd.c:830 cups/ppd.c:1396
+msgid "Media Size"
 msgstr ""
 
-#: scheduler/ipp.c:388
-msgid "Missing required attributes."
+#: cups/ppd.c:834 cups/ppd.c:1400 ppdc/sample.c:254
+msgid "Media Source"
 msgstr ""
 
-#: cups/http-support.c:1486
-msgid "Missing resource in URI"
+#: ppdc/sample.c:359
+msgid "Media Tracking"
 msgstr ""
 
-#: cups/http-support.c:1480
-msgid "Missing scheme in URI"
+#: cups/ppd.c:832 cups/ppd.c:1398 ppdc/sample.c:280
+msgid "Media Type"
 msgstr ""
 
-#: cups/adminutil.c:243
-#, c-format
-msgid "Missing value on line %d."
+#: ppdc/sample.c:237
+msgid "Medium"
 msgstr ""
 
-#: cups/ppd.c:301
+#: cups/ppd.c:316
+msgid "Memory allocation error"
+msgstr ""
+
+#: cups/ppd-cache.c:3599
+msgid "Metal"
+msgstr ""
+
+#: cups/ppd-cache.c:3600
+msgid "Metal Glossy"
+msgstr ""
+
+#: cups/ppd-cache.c:3601
+msgid "Metal High Gloss"
+msgstr ""
+
+#: cups/ppd-cache.c:3602
+msgid "Metal Matte"
+msgstr ""
+
+#: cups/ppd-cache.c:3603
+msgid "Metal Satin"
+msgstr ""
+
+#: cups/ppd-cache.c:3604
+msgid "Metal Semi Gloss"
+msgstr ""
+
+#: cups/ppd-cache.c:3464 cups/ppd-cache.c:3839
+msgid "Middle"
+msgstr ""
+
+#: cups/ppd.c:336
+msgid "Missing CloseGroup"
+msgstr ""
+
+#: cups/ppd.c:317
+msgid "Missing PPD-Adobe-4.x header"
+msgstr ""
+
+#: cups/ppd.c:326
+msgid "Missing asterisk in column 1"
+msgstr ""
+
+#: scheduler/ipp.c:6275
+msgid "Missing document-number attribute."
+msgstr ""
+
+#: cups/adminutil.c:261
+#, 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
+msgid "Missing form variable"
+msgstr ""
+
+#: scheduler/ipp.c:9661
+msgid "Missing last-document attribute in request."
+msgstr ""
+
+#: cups/pwg-media.c:549
+msgid "Missing media or media-col."
+msgstr ""
+
+#: cups/pwg-media.c:468
+msgid "Missing media-size in media-col."
+msgstr ""
+
+#: scheduler/ipp.c:6876
+msgid "Missing notify-subscription-ids attribute."
+msgstr ""
+
+#: cups/ppd.c:334
+msgid "Missing option keyword"
+msgstr ""
+
+#: scheduler/ipp.c:3167 scheduler/ipp.c:3192
+msgid "Missing requesting-user-name attribute."
+msgstr ""
+
+#: scheduler/ipp.c:5423 scheduler/ipp.c:5449
+#, c-format
+msgid "Missing required attribute \"%s\"."
+msgstr ""
+
+#: scheduler/ipp.c:386
+msgid "Missing required attributes."
+msgstr ""
+
+#: cups/http-support.c:1490
+msgid "Missing resource in URI"
+msgstr ""
+
+#: cups/http-support.c:1484
+msgid "Missing scheme in URI"
+msgstr ""
+
+#: cups/adminutil.c:242
+#, c-format
+msgid "Missing value on line %d."
+msgstr ""
+
+#: cups/ppd.c:318
 msgid "Missing value string"
 msgstr ""
 
-#: cups/pwg-media.c:462
+#: cups/pwg-media.c:456
 msgid "Missing x-dimension in media-size."
 msgstr ""
 
-#: cups/pwg-media.c:468
+#: cups/pwg-media.c:462
 msgid "Missing y-dimension in media-size."
 msgstr ""
 
-#: systemv/lpinfo.c:470
+#: systemv/lpinfo.c:443
 #, c-format
 msgid ""
 "Model:  name = %s\n"
@@ -4508,209 +5176,270 @@ msgid ""
 "        device-id = %s"
 msgstr ""
 
-#: test/ippfind.c:2756
+#: test/ippfind.c:2792
 msgid "Modifiers:"
 msgstr ""
 
-#: cgi-bin/admin.c:548
+#: cgi-bin/admin.c:544
 msgid "Modify Class"
 msgstr ""
 
-#: cgi-bin/admin.c:860
+#: cgi-bin/admin.c:857
 msgid "Modify Printer"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:410 cgi-bin/ipp-var.c:501
+#: cups/ppd-cache.c:3605
+msgid "Mounting Tape"
+msgstr ""
+
+#: cgi-bin/ipp-var.c:411 cgi-bin/ipp-var.c:502
 msgid "Move All Jobs"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:349 cgi-bin/ipp-var.c:408 cgi-bin/ipp-var.c:499
+#: cgi-bin/ipp-var.c:350 cgi-bin/ipp-var.c:409 cgi-bin/ipp-var.c:500
 msgid "Move Job"
 msgstr ""
 
-#: cups/http-support.c:1353
+#: cups/http-support.c:1357
 msgid "Moved Permanently"
 msgstr ""
 
-#: cups/ppd.c:298
+#: cups/ppd-cache.c:3606
+msgid "Multi Layer"
+msgstr ""
+
+#: cups/ppd-cache.c:3607
+msgid "Multi Part Form"
+msgstr ""
+
+#: cups/ppd-cache.c:3124
+msgid "Multi-Hole Punch (Landscape)"
+msgstr ""
+
+#: cups/ppd-cache.c:3122
+msgid "Multi-Hole Punch (Portrait)"
+msgstr ""
+
+#: cups/ppd-cache.c:3121
+msgid "Multi-Hole Punch (Reverse Landscape)"
+msgstr ""
+
+#: cups/ppd-cache.c:3123
+msgid "Multi-Hole Punch (Reverse Portrait)"
+msgstr ""
+
+#: cups/ppd-cache.c:3471
+msgid "Multipurpose"
+msgstr ""
+
+#: cups/ppd-cache.c:3840
+msgid "My Mailbox"
+msgstr ""
+
+#: cups/ppd.c:315
 msgid "NULL PPD file pointer"
 msgstr ""
 
-#: cups/snmp.c:1005
+#: cups/snmp.c:1003
 msgid "Name OID uses indefinite length"
 msgstr ""
 
-#: scheduler/ipp.c:1054
+#: scheduler/ipp.c:1081
 msgid "Nested classes are not allowed."
 msgstr ""
 
-#: ppdc/sample.c:430
+#: ppdc/sample.c:425
 msgid "Never"
 msgstr ""
 
-#: ppdc/sample.c:256
-msgid "New Stylus Color Series"
+#: cups/tls-darwin.c:668 cups/tls-gnutls.c:502
+msgid "New credentials are not valid for name."
 msgstr ""
 
-#: ppdc/sample.c:258
-msgid "New Stylus Photo Series"
+#: cups/tls-darwin.c:658 cups/tls-gnutls.c:492
+msgid "New credentials are older than stored credentials."
 msgstr ""
 
-#: cups/ppd.c:1904
+#: cups/ppd.c:1987
 msgid "No"
 msgstr ""
 
-#: cups/http-support.c:1350
+#: cups/http-support.c:1354
 msgid "No Content"
 msgstr ""
 
-#: cups/util.c:1271
+#: cups/ppd-cache.c:3901 cups/ppd-cache.c:3946
+msgid "No Finishing"
+msgstr ""
+
+#: cups/ppd-cache.c:3158
+msgid "No IPP attributes."
+msgstr ""
+
+#: cups/ppd-util.c:451
 msgid "No PPD name"
 msgstr ""
 
-#: cups/snmp.c:999
+#: cups/snmp.c:997
 msgid "No VarBind SEQUENCE"
 msgstr ""
 
-#: cups/adminutil.c:777
+#: cups/adminutil.c:776
 msgid "No Windows printer drivers are installed."
 msgstr ""
 
-#: cups/request.c:556 cups/request.c:905
+#: cups/request.c:558 cups/request.c:917
 msgid "No active connection"
 msgstr ""
 
-#: scheduler/ipp.c:3418
+#: cups/request.c:339
+msgid "No active connection."
+msgstr ""
+
+#: scheduler/ipp.c:3447
 #, c-format
 msgid "No active jobs on %s."
 msgstr ""
 
-#: scheduler/ipp.c:216
+#: scheduler/ipp.c:214
 msgid "No attributes in request."
 msgstr ""
 
-#: scheduler/ipp.c:3041
+#: scheduler/ipp.c:3068
 msgid "No authentication information provided."
 msgstr ""
 
-#: cups/snmp.c:956
+#: cups/tls-darwin.c:608 cups/tls-gnutls.c:439
+msgid "No common name specified."
+msgstr ""
+
+#: cups/snmp.c:954
 msgid "No community name"
 msgstr ""
 
-#: scheduler/ipp.c:5724
+#: scheduler/ipp.c:6075
 msgid "No default printer."
 msgstr ""
 
-#: cgi-bin/ipp-var.c:421 scheduler/ipp.c:7042
+#: cgi-bin/ipp-var.c:422 scheduler/ipp.c:7456
 msgid "No destinations added."
 msgstr ""
 
-#: backend/usb.c:200
+#: backend/usb.c:192
 msgid "No device URI found in argv[0] or in DEVICE_URI environment variable."
 msgstr ""
 
-#: cups/snmp.c:986
+#: cups/snmp.c:984
 msgid "No error-index"
 msgstr ""
 
-#: cups/snmp.c:978
+#: cups/snmp.c:976
 msgid "No error-status"
 msgstr ""
 
-#: scheduler/ipp.c:7984 scheduler/ipp.c:9234
+#: scheduler/ipp.c:8411 scheduler/ipp.c:9675
 msgid "No file in print request."
 msgstr ""
 
-#: cups/util.c:890
+#: cups/ppd-util.c:164
 msgid "No modification time"
 msgstr ""
 
-#: cups/snmp.c:1003
+#: cups/snmp.c:1001
 msgid "No name OID"
 msgstr ""
 
-#: filter/rastertoepson.c:1132 filter/rastertohp.c:865
-#: filter/rastertolabel.c:1283
+#: filter/rastertoepson.c:1166 filter/rastertohp.c:839
+#: filter/rastertolabel.c:1286
 msgid "No pages were found."
 msgstr ""
 
-#: cups/util.c:884
+#: cups/ppd-util.c:158
 msgid "No printer name"
 msgstr ""
 
-#: cups/util.c:1807
+#: cups/ppd-util.c:709
 msgid "No printer-uri found"
 msgstr ""
 
-#: cups/util.c:1792
+#: cups/ppd-util.c:693
 msgid "No printer-uri found for class"
 msgstr ""
 
-#: scheduler/ipp.c:6127
+#: scheduler/ipp.c:6482
 msgid "No printer-uri in request."
 msgstr ""
 
-#: cups/http.c:2273
+#: cups/http.c:2243
 msgid "No request URI."
 msgstr ""
 
-#: cups/http.c:2290
+#: cups/http.c:2260
 msgid "No request protocol version."
 msgstr ""
 
-#: cups/snmp.c:970
+#: cups/request.c:347
+msgid "No request sent."
+msgstr ""
+
+#: cups/snmp.c:968
 msgid "No request-id"
 msgstr ""
 
-#: scheduler/ipp.c:5327
+#: cups/tls-darwin.c:688 cups/tls-gnutls.c:522
+msgid "No stored credentials, not valid for name."
+msgstr ""
+
+#: scheduler/ipp.c:5679
 msgid "No subscription attributes in request."
 msgstr ""
 
-#: scheduler/ipp.c:7369
+#: scheduler/ipp.c:7795
 msgid "No subscriptions found."
 msgstr ""
 
-#: cups/snmp.c:994
+#: cups/snmp.c:992
 msgid "No variable-bindings SEQUENCE"
 msgstr ""
 
-#: cups/snmp.c:949
+#: cups/snmp.c:947
 msgid "No version number"
 msgstr ""
 
-#: ppdc/sample.c:367
+#: ppdc/sample.c:362
 msgid "Non-continuous (Mark sensing)"
 msgstr ""
 
-#: ppdc/sample.c:366
+#: ppdc/sample.c:361
 msgid "Non-continuous (Web sensing)"
 msgstr ""
 
+#: cups/ppd-cache.c:3990 cups/ppd-cache.c:4045 cups/ppd-cache.c:4072
 #: ppdc/sample.c:238
 msgid "Normal"
 msgstr ""
 
-#: cups/http-support.c:1372
+#: cups/http-support.c:1376
 msgid "Not Found"
 msgstr ""
 
-#: cups/http-support.c:1384
+#: cups/http-support.c:1388
 msgid "Not Implemented"
 msgstr ""
 
-#: ppdc/sample.c:276
+#: ppdc/sample.c:268
 msgid "Not Installed"
 msgstr ""
 
-#: cups/http-support.c:1359
+#: cups/http-support.c:1363
 msgid "Not Modified"
 msgstr ""
 
-#: cups/http-support.c:1387
+#: cups/http-support.c:1391
 msgid "Not Supported"
 msgstr ""
 
-#: scheduler/ipp.c:1490 scheduler/ipp.c:10463
+#: scheduler/ipp.c:1535 scheduler/ipp.c:10936
 msgid "Not allowed to print."
 msgstr ""
 
@@ -4718,89 +5447,101 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
-#: systemv/cupstestdsc.c:433
+#: systemv/cupstestdsc.c:425
 msgid "Note: this program only validates the DSC comments, not the PostScript itself."
 msgstr ""
 
-#: cups/http-support.c:1341 cups/http-support.c:1477 cups/ppd.c:296
+#: cups/http-support.c:1345 cups/http-support.c:1481 cups/ppd.c:313
 msgid "OK"
 msgstr ""
 
-#: ppdc/sample.c:271
+#: cups/ppd-cache.c:3762 ppdc/sample.c:263
 msgid "Off (1-Sided)"
 msgstr ""
 
-#: ppdc/sample.c:361
+#: ppdc/sample.c:356
 msgid "Oki"
 msgstr ""
 
-#: cgi-bin/help.c:91 cgi-bin/help.c:132 cgi-bin/help.c:142 cgi-bin/help.c:172
+#: cgi-bin/help.c:85 cgi-bin/help.c:126 cgi-bin/help.c:136 cgi-bin/help.c:166
 msgid "Online Help"
 msgstr ""
 
-#: cups/adminutil.c:944
+#: scheduler/ipp.c:5402
+msgid "Only local users can create a local printer."
+msgstr ""
+
+#: cups/adminutil.c:943
 #, c-format
 msgid "Open of %s failed: %s"
 msgstr ""
 
-#: cups/ppd.c:304
+#: cups/ppd.c:321
 msgid "OpenGroup without a CloseGroup first"
 msgstr ""
 
-#: cups/ppd.c:306
+#: cups/ppd.c:323
 msgid "OpenUI/JCLOpenUI without a CloseUI/JCLCloseUI first"
 msgstr ""
 
-#: cgi-bin/admin.c:3611
+#: cgi-bin/admin.c:3615
 msgid "Operation Policy"
 msgstr ""
 
-#: filter/pstops.c:2177
+#: cups/ppd-cache.c:3543
+msgid "Optical Disc"
+msgstr ""
+
+#: filter/pstops.c:2180
 #, c-format
 msgid "Option \"%s\" cannot be included via %%%%IncludeFeature."
 msgstr ""
 
-#: cgi-bin/admin.c:3261 cgi-bin/admin.c:3345
+#: cgi-bin/admin.c:3265 cgi-bin/admin.c:3349
 msgid "Options Installed"
 msgstr ""
 
-#: scheduler/cupsfilter.c:1456 scheduler/main.c:2077 systemv/cupsaddsmb.c:284
-#: systemv/cupsctl.c:203 systemv/cupstestdsc.c:429 systemv/cupstestppd.c:3817
-#: test/ippfind.c:2715 test/ipptool.c:4663 ppdc/ppdc.cxx:437
-#: ppdc/ppdhtml.cxx:174 ppdc/ppdi.cxx:130 ppdc/ppdmerge.cxx:363
-#: ppdc/ppdpo.cxx:254
+#: scheduler/cupsfilter.c:1480 scheduler/main.c:2048 systemv/cupsaddsmb.c:276
+#: systemv/cupsctl.c:196 systemv/cupstestdsc.c:421 systemv/cupstestppd.c:3859
+#: test/ippfind.c:2751 test/ipptool.c:4930 ppdc/ppdc.cxx:430
+#: ppdc/ppdhtml.cxx:177 ppdc/ppdi.cxx:123 ppdc/ppdmerge.cxx:361
+#: ppdc/ppdpo.cxx:247
 msgid "Options:"
 msgstr ""
 
-#: cups/ppd-cache.c:125
+#: cups/ppd-cache.c:3608
+msgid "Other"
+msgstr ""
+
+#: cups/ppd-cache.c:466
 msgid "Out of date PPD cache file."
 msgstr ""
 
-#: cups/ppd-cache.c:1409
+#: cups/ppd-cache.c:1946
 msgid "Out of memory."
 msgstr ""
 
-#: cups/ppd.c:753 cups/ppd.c:1319
+#: cups/ppd.c:836 cups/ppd.c:1402
 msgid "Output Mode"
 msgstr ""
 
-#: cups/localize.c:316
+#: cups/ppd-localize.c:314
 msgid "Output bin is almost full."
 msgstr ""
 
-#: cups/localize.c:318
+#: cups/ppd-localize.c:316
 msgid "Output bin is full."
 msgstr ""
 
-#: cups/localize.c:314
+#: cups/ppd-localize.c:312
 msgid "Output bin is missing."
 msgstr ""
 
-#: systemv/cupstestdsc.c:399
+#: systemv/cupstestdsc.c:391
 msgid "PASS"
 msgstr ""
 
-#: ppdc/sample.c:260
+#: ppdc/sample.c:252
 msgid "PCL Laser Printer"
 msgstr ""
 
@@ -4828,81 +5569,149 @@ msgstr ""
 msgid "PRC32K Oversize Long Edge"
 msgstr ""
 
-#: cups/snmp.c:966
+#: cups/snmp.c:964
 msgid "Packet does not contain a Get-Response-PDU"
 msgstr ""
 
-#: cups/snmp.c:945
+#: cups/snmp.c:943
 msgid "Packet does not start with SEQUENCE"
 msgstr ""
 
-#: cups/localize.c:293
+#: cups/ppd-cache.c:3609
+msgid "Paper"
+msgstr ""
+
+#: cups/ppd-localize.c:291
 msgid "Paper jam."
 msgstr ""
 
-#: cups/localize.c:310
+#: cups/ppd-localize.c:308
 msgid "Paper tray is almost empty."
 msgstr ""
 
-#: cups/localize.c:312
+#: cups/ppd-localize.c:310
 msgid "Paper tray is empty."
 msgstr ""
 
-#: cups/localize.c:308
+#: cups/ppd-localize.c:306
 msgid "Paper tray is missing."
 msgstr ""
 
-#: ppdc/sample.c:360
+#: cups/ppd-cache.c:3098
+msgid "Parallel Fold"
+msgstr ""
+
+#: ppdc/sample.c:355
 msgid "ParamCustominCutInterval"
 msgstr ""
 
-#: ppdc/sample.c:358
+#: ppdc/sample.c:353
 msgid "ParamCustominTearInterval"
 msgstr ""
 
-#: cups/auth.c:195 cups/auth.c:363
+#: cups/auth.c:192 cups/auth.c:359
 #, c-format
 msgid "Password for %s on %s? "
 msgstr ""
 
-#: systemv/cupsaddsmb.c:252
+#: systemv/cupsaddsmb.c:244
 #, c-format
 msgid "Password for %s required to access %s via SAMBA: "
 msgstr ""
 
-#: cgi-bin/classes.c:159
+#: cgi-bin/classes.c:157
 msgid "Pause Class"
 msgstr ""
 
-#: cgi-bin/printers.c:162
+#: cgi-bin/printers.c:160
 msgid "Pause Printer"
 msgstr ""
 
-#: ppdc/sample.c:448
+#: ppdc/sample.c:443
 msgid "Peel-Off"
 msgstr ""
 
-#: ppdc/sample.c:160
+#: cups/ppd-cache.c:3593
+msgid "Permanent Labels"
+msgstr ""
+
+#: cups/ppd-cache.c:3459 ppdc/sample.c:160
 msgid "Photo"
 msgstr ""
 
+#: cups/ppd-cache.c:3613
+msgid "Photo Film"
+msgstr ""
+
 #: ppdc/sample.c:161
 msgid "Photo Labels"
 msgstr ""
 
-#: ppdc/sample.c:286
+#: cups/ppd-cache.c:3610 cups/ppd-cache.c:3611
+msgid "Photo Paper"
+msgstr ""
+
+#: cups/ppd-cache.c:3612
+msgid "Photographic Archival"
+msgstr ""
+
+#: cups/ppd-cache.c:3563
+msgid "Plain Envelope"
+msgstr ""
+
+#: ppdc/sample.c:281
 msgid "Plain Paper"
 msgstr ""
 
-#: cgi-bin/admin.c:3279 cgi-bin/admin.c:3560
+#: cups/ppd-cache.c:3619
+msgid "Plastic"
+msgstr ""
+
+#: cups/ppd-cache.c:3620
+msgid "Plastic Archival"
+msgstr ""
+
+#: cups/ppd-cache.c:3621
+msgid "Plastic Colored"
+msgstr ""
+
+#: cups/ppd-cache.c:3622
+msgid "Plastic Glossy"
+msgstr ""
+
+#: cups/ppd-cache.c:3623
+msgid "Plastic High Gloss"
+msgstr ""
+
+#: cups/ppd-cache.c:3624
+msgid "Plastic Matte"
+msgstr ""
+
+#: cups/ppd-cache.c:3625
+msgid "Plastic Satin"
+msgstr ""
+
+#: cups/ppd-cache.c:3626
+msgid "Plastic Semi Gloss"
+msgstr ""
+
+#: cups/ppd-cache.c:3627
+msgid "Plate"
+msgstr ""
+
+#: cgi-bin/admin.c:3283 cgi-bin/admin.c:3564
 msgid "Policies"
 msgstr ""
 
-#: cgi-bin/admin.c:3286 cgi-bin/admin.c:3629 cgi-bin/admin.c:3642
+#: cups/ppd-cache.c:3628
+msgid "Polyester"
+msgstr ""
+
+#: cgi-bin/admin.c:3290 cgi-bin/admin.c:3633 cgi-bin/admin.c:3646
 msgid "Port Monitor"
 msgstr ""
 
-#: ppdc/sample.c:278
+#: ppdc/sample.c:270
 msgid "PostScript Printer"
 msgstr ""
 
@@ -4911,7 +5720,7 @@ msgid "Postcard"
 msgstr ""
 
 #: ppdc/sample.c:71
-msgid "Postcard Double "
+msgid "Postcard Double"
 msgstr ""
 
 #: ppdc/sample.c:72
@@ -4922,67 +5731,92 @@ msgstr ""
 msgid "Postcard Long Edge"
 msgstr ""
 
-#: backend/ipp.c:920 backend/ipp.c:928
+#: cups/ppd-cache.c:3099
+msgid "Poster Fold"
+msgstr ""
+
+#: cups/ppd-cache.c:3629
+msgid "Pre Cut Tabs"
+msgstr ""
+
+#: backend/ipp.c:981 backend/ipp.c:989
 msgid "Preparing to print."
 msgstr ""
 
-#: ppdc/sample.c:295
+#: cups/ppd-cache.c:3564
+msgid "Preprinted Envelope"
+msgstr ""
+
+#: cups/ppd-cache.c:3649
+msgid "Preprinted Paper"
+msgstr ""
+
+#: ppdc/sample.c:290
 msgid "Print Density"
 msgstr ""
 
-#: cups/notify.c:82
+#: cups/notify.c:74
 msgid "Print Job:"
 msgstr ""
 
-#: ppdc/sample.c:340
+#: ppdc/sample.c:335
 msgid "Print Mode"
 msgstr ""
 
-#: ppdc/sample.c:383
+#: cups/ppd-cache.c:3983 cups/ppd-cache.c:4040 cups/ppd-cache.c:4069
+msgid "Print Quality"
+msgstr ""
+
+#: ppdc/sample.c:378
 msgid "Print Rate"
 msgstr ""
 
-#: cgi-bin/printers.c:171
+#: cgi-bin/printers.c:169
 msgid "Print Self-Test Page"
 msgstr ""
 
-#: ppdc/sample.c:327
+#: ppdc/sample.c:322
 msgid "Print Speed"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:777
+#: cgi-bin/ipp-var.c:778
 msgid "Print Test Page"
 msgstr ""
 
-#: ppdc/sample.c:356
+#: ppdc/sample.c:351
 msgid "Print and Cut"
 msgstr ""
 
-#: ppdc/sample.c:344
+#: ppdc/sample.c:339
 msgid "Print and Tear"
 msgstr ""
 
-#: backend/socket.c:429 backend/usb-unix.c:184
+#: backend/socket.c:410 backend/usb-unix.c:182
 msgid "Print file sent."
 msgstr ""
 
-#: backend/ipp.c:2130
+#: backend/ipp.c:2236
 msgid "Print job canceled at printer."
 msgstr ""
 
-#: backend/ipp.c:2122
+#: backend/ipp.c:2228
 msgid "Print job too large."
 msgstr ""
 
-#: backend/ipp.c:1600
+#: backend/ipp.c:1697
 msgid "Print job was not accepted."
 msgstr ""
 
+#: scheduler/ipp.c:5468
+#, c-format
+msgid "Printer \"%s\" already exists."
+msgstr ""
+
 #: cgi-bin/ipp-var.c:1028
 msgid "Printer Added"
 msgstr ""
 
-#: ppdc/sample.c:263
+#: ppdc/sample.c:255
 msgid "Printer Default"
 msgstr ""
 
@@ -4990,192 +5824,444 @@ msgstr ""
 msgid "Printer Deleted"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1030
-msgid "Printer Modified"
+#: cgi-bin/ipp-var.c:1030
+msgid "Printer Modified"
+msgstr ""
+
+#: cgi-bin/ipp-var.c:1026
+msgid "Printer Paused"
+msgstr ""
+
+#: ppdc/sample.c:289
+msgid "Printer Settings"
+msgstr ""
+
+#: backend/ipp.c:2231
+msgid "Printer cannot print supplied content."
+msgstr ""
+
+#: backend/ipp.c:2234
+msgid "Printer cannot print with supplied options."
+msgstr ""
+
+#: cups/ppd-cache.c:4096
+msgid "Printer does not support required IPP attributes or document formats."
+msgstr ""
+
+#: cups/notify.c:118
+msgid "Printer:"
+msgstr ""
+
+#: cgi-bin/printers.c:194 cgi-bin/printers.c:321
+msgid "Printers"
+msgstr ""
+
+#: filter/rastertoepson.c:1112 filter/rastertohp.c:780
+#: filter/rastertolabel.c:1233
+#, c-format
+msgid "Printing page %d, %u%% complete."
+msgstr ""
+
+#: cups/ppd-cache.c:3104
+msgid "Punch"
+msgstr ""
+
+#: cups/ppd-cache.c:3650
+msgid "Punched Paper"
+msgstr ""
+
+#: ppdc/sample.c:155
+msgid "Quarto"
+msgstr ""
+
+#: scheduler/ipp.c:1530 scheduler/ipp.c:10931
+msgid "Quota limit reached."
+msgstr ""
+
+#: berkeley/lpq.c:499
+msgid "Rank    Owner   Job     File(s)                         Total Size"
+msgstr ""
+
+#: cups/ppd-cache.c:3470
+msgid "Rear"
+msgstr ""
+
+#: cups/ppd-cache.c:3841
+msgid "Rear Tray"
+msgstr ""
+
+#: cgi-bin/classes.c:161 cgi-bin/printers.c:164
+msgid "Reject Jobs"
+msgstr ""
+
+#: backend/lpd.c:1085 backend/lpd.c:1217
+#, c-format
+msgid "Remote host did not accept control file (%d)."
+msgstr ""
+
+#: backend/lpd.c:1170
+#, c-format
+msgid "Remote host did not accept data file (%d)."
+msgstr ""
+
+#: ppdc/sample.c:423
+msgid "Reprint After Error"
+msgstr ""
+
+#: cups/http-support.c:1379
+msgid "Request Entity Too Large"
+msgstr ""
+
+#: cups/ppd.c:838 cups/ppd.c:1404 ppdc/sample.c:231
+msgid "Resolution"
+msgstr ""
+
+#: cgi-bin/classes.c:155
+msgid "Resume Class"
+msgstr ""
+
+#: cgi-bin/printers.c:157
+msgid "Resume Printer"
+msgstr ""
+
+#: ppdc/sample.c:165
+msgid "Return Address"
+msgstr ""
+
+#: ppdc/sample.c:444
+msgid "Rewind"
+msgstr ""
+
+#: cups/ppd-cache.c:3468
+msgid "Right"
+msgstr ""
+
+#: cups/ppd-cache.c:3100
+msgid "Right Gate Fold"
+msgstr ""
+
+#: cups/ppd-cache.c:3842
+msgid "Right Tray"
+msgstr ""
+
+#: cups/ppd-cache.c:3630
+msgid "Roll"
+msgstr ""
+
+#: cups/ppd-cache.c:3492
+msgid "Roll 1"
+msgstr ""
+
+#: cups/ppd-cache.c:3501
+msgid "Roll 10"
+msgstr ""
+
+#: cups/ppd-cache.c:3493
+msgid "Roll 2"
+msgstr ""
+
+#: cups/ppd-cache.c:3494
+msgid "Roll 3"
+msgstr ""
+
+#: cups/ppd-cache.c:3495
+msgid "Roll 4"
+msgstr ""
+
+#: cups/ppd-cache.c:3496
+msgid "Roll 5"
+msgstr ""
+
+#: cups/ppd-cache.c:3497
+msgid "Roll 6"
+msgstr ""
+
+#: cups/ppd-cache.c:3498
+msgid "Roll 7"
+msgstr ""
+
+#: cups/ppd-cache.c:3499
+msgid "Roll 8"
+msgstr ""
+
+#: cups/ppd-cache.c:3500
+msgid "Roll 9"
+msgstr ""
+
+#: cups/adminutil.c:2100
+#, c-format
+msgid "Running command: %s %s -N -A %s -c '%s'"
+msgstr ""
+
+#: cups/snmp.c:945
+msgid "SEQUENCE uses indefinite length"
+msgstr ""
+
+#: cups/http-support.c:1403
+msgid "SSL/TLS Negotiation Error"
+msgstr ""
+
+#: cups/ppd-cache.c:3125
+msgid "Saddle Stitch"
+msgstr ""
+
+#: cups/ppd-cache.c:3594
+msgid "Satin Labels"
+msgstr ""
+
+#: cups/ppd-cache.c:3547
+msgid "Satin Optical Disc"
+msgstr ""
+
+#: cups/ppd-cache.c:3617
+msgid "Satin Photo Paper"
+msgstr ""
+
+#: cups/ppd-cache.c:3631
+msgid "Screen"
+msgstr ""
+
+#: cups/ppd-cache.c:3632
+msgid "Screen Paged"
+msgstr ""
+
+#: cups/ppd-cache.c:3595
+msgid "Security Labels"
+msgstr ""
+
+#: cups/http-support.c:1360
+msgid "See Other"
+msgstr ""
+
+#: scheduler/ipp.c:7080 scheduler/ipp.c:7099
+msgid "See remote printer."
+msgstr ""
+
+#: cups/ppd-cache.c:3633
+msgid "Self Adhesive"
+msgstr ""
+
+#: cups/ppd-cache.c:3634
+msgid "Self Adhesive Film"
+msgstr ""
+
+#: cups/tls-darwin.c:743 cups/tls-gnutls.c:584
+msgid "Self-signed credentials are blocked."
+msgstr ""
+
+#: cups/ppd-cache.c:3571
+msgid "Semi-Gloss Fabric"
+msgstr ""
+
+#: cups/ppd-cache.c:3596
+msgid "Semi-Gloss Labels"
+msgstr ""
+
+#: cups/ppd-cache.c:3548
+msgid "Semi-Gloss Optical Disc"
+msgstr ""
+
+#: cups/ppd-cache.c:3618
+msgid "Semi-Gloss Photo Paper"
+msgstr ""
+
+#: backend/usb-darwin.c:566 backend/usb-libusb.c:346
+msgid "Sending data to printer."
+msgstr ""
+
+#: cgi-bin/ipp-var.c:1042
+msgid "Server Restarted"
+msgstr ""
+
+#: cgi-bin/ipp-var.c:1048
+msgid "Server Security Auditing"
+msgstr ""
+
+#: cgi-bin/ipp-var.c:1044
+msgid "Server Started"
+msgstr ""
+
+#: cgi-bin/ipp-var.c:1046
+msgid "Server Stopped"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1026
-msgid "Printer Paused"
+#: cups/tls-darwin.c:1183 cups/tls-gnutls.c:1263
+msgid "Server credentials not set."
 msgstr ""
 
-#: ppdc/sample.c:294
-msgid "Printer Settings"
+#: cups/http-support.c:1397
+msgid "Service Unavailable"
 msgstr ""
 
-#: backend/ipp.c:2125
-msgid "Printer cannot print supplied content."
+#: cgi-bin/admin.c:2770 cgi-bin/admin.c:2816 cgi-bin/admin.c:2973
+#: cgi-bin/admin.c:2992
+msgid "Set Allowed Users"
 msgstr ""
 
-#: backend/ipp.c:2128
-msgid "Printer cannot print with supplied options."
+#: cgi-bin/admin.c:3019
+msgid "Set As Server Default"
 msgstr ""
 
-#: cups/notify.c:126
-msgid "Printer:"
+#: cgi-bin/admin.c:3119
+msgid "Set Class Options"
 msgstr ""
 
-#: cgi-bin/printers.c:196 cgi-bin/printers.c:324
-msgid "Printers"
+#: cgi-bin/admin.c:3119 cgi-bin/admin.c:3293 cgi-bin/admin.c:3675
+msgid "Set Printer Options"
 msgstr ""
 
-#: filter/rastertoepson.c:1078 filter/rastertohp.c:806
-#: filter/rastertolabel.c:1230
-#, c-format
-msgid "Printing page %d, %u%% complete."
+#: cgi-bin/admin.c:3845 cgi-bin/admin.c:3889 cgi-bin/admin.c:3907
+msgid "Set Publishing"
 msgstr ""
 
-#: cgi-bin/classes.c:165 cgi-bin/printers.c:168
-msgid "Purge Jobs"
+#: ppdc/sample.c:166
+msgid "Shipping Address"
 msgstr ""
 
-#: ppdc/sample.c:155
-msgid "Quarto"
+#: cups/ppd-cache.c:3762 ppdc/sample.c:265
+msgid "Short-Edge (Landscape)"
 msgstr ""
 
-#: scheduler/ipp.c:1485 scheduler/ipp.c:10458
-msgid "Quota limit reached."
+#: cups/ppd-cache.c:3635
+msgid "Shrink Foil"
 msgstr ""
 
-#: berkeley/lpq.c:490
-msgid "Rank    Owner   Job     File(s)                         Total Size"
+#: cups/ppd-cache.c:3466
+msgid "Side"
 msgstr ""
 
-#: cgi-bin/classes.c:163 cgi-bin/printers.c:166
-msgid "Reject Jobs"
+#: cups/ppd-cache.c:3843
+msgid "Side Tray"
 msgstr ""
 
-#: backend/lpd.c:1024 backend/lpd.c:1156
-#, c-format
-msgid "Remote host did not accept control file (%d)."
+#: cups/ppd-cache.c:3636
+msgid "Single Face"
 msgstr ""
 
-#: backend/lpd.c:1109
-#, c-format
-msgid "Remote host did not accept data file (%d)."
+#: cups/ppd-cache.c:3116
+msgid "Single Punch (Landscape)"
 msgstr ""
 
-#: ppdc/sample.c:428
-msgid "Reprint After Error"
+#: cups/ppd-cache.c:3115
+msgid "Single Punch (Portrait)"
 msgstr ""
 
-#: cups/http-support.c:1375
-msgid "Request Entity Too Large"
+#: cups/ppd-cache.c:3105
+msgid "Single Punch (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd.c:755 cups/ppd.c:1321 ppdc/sample.c:231
-msgid "Resolution"
+#: cups/ppd-cache.c:3106
+msgid "Single Punch (Reverse Portrait)"
 msgstr ""
 
-#: cgi-bin/classes.c:157
-msgid "Resume Class"
+#: cups/ppd-cache.c:3134
+msgid "Single Staple (Landscape)"
 msgstr ""
 
-#: cgi-bin/printers.c:159
-msgid "Resume Printer"
+#: cups/ppd-cache.c:3133
+msgid "Single Staple (Portrait)"
 msgstr ""
 
-#: ppdc/sample.c:165
-msgid "Return Address"
+#: cups/ppd-cache.c:3127
+msgid "Single Staple (Reverse Landscape)"
 msgstr ""
 
-#: ppdc/sample.c:449
-msgid "Rewind"
+#: cups/ppd-cache.c:3128
+msgid "Single Staple (Reverse Portrait)"
 msgstr ""
 
-#: cups/adminutil.c:2041
-#, c-format
-msgid "Running command: %s %s -N -A %s -c '%s'"
+#: cups/ppd-cache.c:3637
+msgid "Single Wall Cardboard"
 msgstr ""
 
-#: cups/snmp.c:947
-msgid "SEQUENCE uses indefinite length"
+#: cups/ppd-cache.c:3638
+msgid "Sleeve"
 msgstr ""
 
-#: cups/http-support.c:1399
-msgid "SSL/TLS Negotiation Error"
+#: ppdc/sample.c:283
+msgid "Special Paper"
 msgstr ""
 
-#: cups/http-support.c:1356
-msgid "See Other"
+#: backend/lpd.c:1126
+#, c-format
+msgid "Spooling job, %.0f%% complete."
 msgstr ""
 
-#: backend/usb-darwin.c:552 backend/usb-libusb.c:346
-msgid "Sending data to printer."
+#: cups/ppd-cache.c:3844
+msgid "Stacker 1"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1042
-msgid "Server Restarted"
+#: cups/ppd-cache.c:3853
+msgid "Stacker 10"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1048
-msgid "Server Security Auditing"
+#: cups/ppd-cache.c:3845
+msgid "Stacker 2"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1044
-msgid "Server Started"
+#: cups/ppd-cache.c:3846
+msgid "Stacker 3"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1046
-msgid "Server Stopped"
+#: cups/ppd-cache.c:3847
+msgid "Stacker 4"
 msgstr ""
 
-#: cups/tls-darwin.c:1136
-msgid "Server credentials not set."
+#: cups/ppd-cache.c:3848
+msgid "Stacker 5"
 msgstr ""
 
-#: cups/http-support.c:1393
-msgid "Service Unavailable"
+#: cups/ppd-cache.c:3849
+msgid "Stacker 6"
 msgstr ""
 
-#: cgi-bin/admin.c:2766 cgi-bin/admin.c:2812 cgi-bin/admin.c:2969
-#: cgi-bin/admin.c:2988
-msgid "Set Allowed Users"
+#: cups/ppd-cache.c:3850
+msgid "Stacker 7"
 msgstr ""
 
-#: cgi-bin/admin.c:3015
-msgid "Set As Server Default"
+#: cups/ppd-cache.c:3851
+msgid "Stacker 8"
 msgstr ""
 
-#: cgi-bin/admin.c:3115
-msgid "Set Class Options"
+#: cups/ppd-cache.c:3852
+msgid "Stacker 9"
 msgstr ""
 
-#: cgi-bin/admin.c:3115 cgi-bin/admin.c:3289 cgi-bin/admin.c:3671
-msgid "Set Printer Options"
+#: ppdc/sample.c:336
+msgid "Standard"
 msgstr ""
 
-#: cgi-bin/admin.c:3841 cgi-bin/admin.c:3885 cgi-bin/admin.c:3903
-msgid "Set Publishing"
+#: cups/ppd-cache.c:3126
+msgid "Staple"
 msgstr ""
 
-#: ppdc/sample.c:166
-msgid "Shipping Address"
+#: cups/ppd-cache.c:3084
+msgid "Staple Edge"
 msgstr ""
 
-#: ppdc/sample.c:273
-msgid "Short-Edge (Landscape)"
+#: cups/ppd-cache.c:3088
+msgid "Staple Edge (Landscape)"
 msgstr ""
 
-#: ppdc/sample.c:288
-msgid "Special Paper"
+#: cups/ppd-cache.c:3086
+msgid "Staple Edge (Portrait)"
 msgstr ""
 
-#: backend/lpd.c:1065
-#, c-format
-msgid "Spooling job, %.0f%% complete."
+#: cups/ppd-cache.c:3085
+msgid "Staple Edge (Reverse Landscape)"
 msgstr ""
 
-#: ppdc/sample.c:341
-msgid "Standard"
+#: cups/ppd-cache.c:3087
+msgid "Staple Edge (Reverse Portrait)"
 msgstr ""
 
 #. TRANSLATORS: Banner/cover sheet before the print job.
-#: cgi-bin/admin.c:3532
+#: cgi-bin/admin.c:3536
 msgid "Starting Banner"
 msgstr ""
 
-#: filter/rastertoepson.c:1054 filter/rastertohp.c:782
-#: filter/rastertolabel.c:1206
+#: filter/rastertoepson.c:1088 filter/rastertohp.c:756
+#: filter/rastertolabel.c:1209
 #, c-format
 msgid "Starting page %d."
 msgstr ""
@@ -5184,21 +6270,33 @@ msgstr ""
 msgid "Statement"
 msgstr ""
 
-#: ppdc/sample.c:251
-msgid "Stylus Color Series"
+#: cups/ppd-cache.c:3639
+msgid "Stationery"
+msgstr ""
+
+#: cups/ppd-cache.c:3640
+msgid "Stationery Archival"
+msgstr ""
+
+#: cups/ppd-cache.c:3642
+msgid "Stationery Cotton"
 msgstr ""
 
-#: ppdc/sample.c:257
-msgid "Stylus Photo Series"
+#: cups/ppd-cache.c:3645
+msgid "Stationery Heavyweight Coated"
 msgstr ""
 
-#: scheduler/ipp.c:3564 scheduler/ipp.c:6483 scheduler/ipp.c:7182
-#: scheduler/ipp.c:8682
+#: cups/ppd-cache.c:3646
+msgid "Stationery Inkjet Paper"
+msgstr ""
+
+#: scheduler/ipp.c:3593 scheduler/ipp.c:6892 scheduler/ipp.c:7602
+#: scheduler/ipp.c:9123
 #, c-format
 msgid "Subscription #%d does not exist."
 msgstr ""
 
-#: test/ippfind.c:2768
+#: test/ippfind.c:2804
 msgid "Substitutions:"
 msgstr ""
 
@@ -5214,10 +6312,14 @@ msgstr ""
 msgid "Super B/A3"
 msgstr ""
 
-#: cups/http-support.c:1338
+#: cups/http-support.c:1342
 msgid "Switching Protocols"
 msgstr ""
 
+#: cups/ppd-cache.c:3651
+msgid "Tab Stock"
+msgstr ""
+
 #: ppdc/sample.c:159
 msgid "Tabloid"
 msgstr ""
@@ -5230,275 +6332,380 @@ msgstr ""
 msgid "Tabloid Oversize Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:342
+#: ppdc/sample.c:337
 msgid "Tear"
 msgstr ""
 
-#: ppdc/sample.c:447
+#: ppdc/sample.c:442
 msgid "Tear-Off"
 msgstr ""
 
-#: ppdc/sample.c:388
+#: ppdc/sample.c:383
 msgid "Tear-Off Adjust Position"
 msgstr ""
 
-#: scheduler/ipp.c:1321
+#: scheduler/ipp.c:1366
 #, c-format
 msgid "The \"%s\" attribute is required for print jobs."
 msgstr ""
 
-#: scheduler/ipp.c:6198 scheduler/ipp.c:6276 scheduler/ipp.c:6292
-#: scheduler/ipp.c:6310
+#: scheduler/ipp.c:6553 scheduler/ipp.c:6633 scheduler/ipp.c:6646
+#: scheduler/ipp.c:6658 scheduler/ipp.c:6673
 #, c-format
 msgid "The %s attribute cannot be provided with job-ids."
 msgstr ""
 
-#: scheduler/ipp.c:1297
+#: scheduler/ipp.c:1345
 #, c-format
-msgid "The '%s' Job Description attribute cannot be supplied in a job creation request."
+msgid "The '%s' Job Status attribute cannot be supplied in a job creation request."
 msgstr ""
 
-#: scheduler/ipp.c:5134
+#: scheduler/ipp.c:5230
 #, c-format
 msgid "The '%s' operation attribute cannot be supplied in a Create-Job request."
 msgstr ""
 
-#: scheduler/ipp.c:6713
+#: scheduler/ipp.c:7122
 #, c-format
 msgid "The PPD file \"%s\" could not be found."
 msgstr ""
 
-#: scheduler/ipp.c:6700
+#: scheduler/ipp.c:7111
 #, c-format
 msgid "The PPD file \"%s\" could not be opened: %s"
 msgstr ""
 
-#: filter/rastertoepson.c:1023 filter/rastertohp.c:753
-#: filter/rastertolabel.c:1170
+#: filter/rastertoepson.c:1057 filter/rastertohp.c:727
+#: filter/rastertolabel.c:1173
 msgid "The PPD file could not be opened."
 msgstr ""
 
-#: cgi-bin/admin.c:727
+#: cgi-bin/admin.c:723
 msgid "The class name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#)."
 msgstr ""
 
-#: cups/localize.c:338
+#: cups/ppd-localize.c:336
 msgid "The developer unit needs to be replaced."
 msgstr ""
 
-#: cups/localize.c:336
+#: cups/ppd-localize.c:334
 msgid "The developer unit will need to be replaced soon."
 msgstr ""
 
-#: cups/localize.c:328
+#: cups/ppd-localize.c:326
 msgid "The fuser's temperature is high."
 msgstr ""
 
-#: cups/localize.c:330
+#: cups/ppd-localize.c:328
 msgid "The fuser's temperature is low."
 msgstr ""
 
-#: scheduler/ipp.c:2087
+#: scheduler/ipp.c:2112
 msgid "The notify-lease-duration attribute cannot be used with job subscriptions."
 msgstr ""
 
-#: scheduler/ipp.c:2070 scheduler/ipp.c:5452
+#: scheduler/ipp.c:2095 scheduler/ipp.c:5804
 #, c-format
 msgid "The notify-user-data value is too large (%d > 63 octets)."
 msgstr ""
 
-#: cups/localize.c:334
+#: cups/ppd-localize.c:332
 msgid "The optical photoconductor needs to be replaced."
 msgstr ""
 
-#: cups/localize.c:332
+#: cups/ppd-localize.c:330
 msgid "The optical photoconductor will need to be replaced soon."
 msgstr ""
 
-#: backend/ipp.c:940
+#: backend/ipp.c:1001
 msgid "The printer configuration is incorrect or the printer no longer exists."
 msgstr ""
 
-#: backend/lpd.c:627 backend/lpd.c:1017 backend/lpd.c:1099 backend/lpd.c:1149
+#: backend/lpd.c:688 backend/lpd.c:1078 backend/lpd.c:1160 backend/lpd.c:1210
 msgid "The printer did not respond."
 msgstr ""
 
-#: backend/ipp.c:784 backend/ipp.c:903 backend/ipp.c:1017 backend/ipp.c:1408
-#: backend/ipp.c:1572 backend/lpd.c:836 backend/socket.c:379
-#: backend/usb-unix.c:124 backend/usb-unix.c:414 backend/usb-unix.c:497
+#: backend/ipp.c:774 backend/ipp.c:964 backend/ipp.c:1078 backend/ipp.c:1499
+#: backend/ipp.c:1669 backend/lpd.c:897 backend/socket.c:360
+#: backend/usb-unix.c:122 backend/usb-unix.c:412 backend/usb-unix.c:495
 msgid "The printer is in use."
 msgstr ""
 
-#: cups/localize.c:320
+#: cups/ppd-localize.c:318
 msgid "The printer is low on ink."
 msgstr ""
 
-#: cups/localize.c:298
+#: cups/ppd-localize.c:296
 msgid "The printer is low on toner."
 msgstr ""
 
-#: backend/runloop.c:243 backend/runloop.c:363 cups/localize.c:296
+#: backend/runloop.c:241 backend/runloop.c:361 cups/ppd-localize.c:294
 msgid "The printer is not connected."
 msgstr ""
 
-#: backend/ipp.c:762 backend/ipp.c:795 backend/ipp.c:899 backend/lpd.c:815
-#: backend/lpd.c:856 backend/socket.c:358 backend/socket.c:391
+#: backend/ipp.c:752 backend/ipp.c:785 backend/ipp.c:960 backend/lpd.c:876
+#: backend/lpd.c:917 backend/socket.c:339 backend/socket.c:372
 msgid "The printer is not responding."
 msgstr ""
 
-#: backend/runloop.c:385
+#: backend/runloop.c:383
 msgid "The printer is now connected."
 msgstr ""
 
-#: backend/usb-darwin.c:1300
+#: backend/usb-darwin.c:1342
 msgid "The printer is now online."
 msgstr ""
 
-#: backend/usb-darwin.c:1321
+#: backend/usb-darwin.c:1381
 msgid "The printer is offline."
 msgstr ""
 
-#: backend/ipp.c:777 backend/lpd.c:829 backend/socket.c:372
+#: backend/ipp.c:767 backend/lpd.c:890 backend/socket.c:353
 msgid "The printer is unreachable at this time."
 msgstr ""
 
-#: cups/localize.c:322
+#: cups/ppd-localize.c:320
 msgid "The printer may be out of ink."
 msgstr ""
 
-#: cups/localize.c:300
+#: cups/ppd-localize.c:298
 msgid "The printer may be out of toner."
 msgstr ""
 
-#: backend/ipp.c:771 backend/lpd.c:823 backend/socket.c:366
+#: backend/ipp.c:761 backend/lpd.c:884 backend/socket.c:347
 msgid "The printer may not exist or is unavailable at this time."
 msgstr ""
 
-#: cgi-bin/admin.c:909
+#: 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 (#)."
 msgstr ""
 
-#: scheduler/ipp.c:788 scheduler/ipp.c:1048 scheduler/ipp.c:3205
-#: scheduler/ipp.c:3384 scheduler/ipp.c:5117 scheduler/ipp.c:5286
-#: scheduler/ipp.c:5600 scheduler/ipp.c:6164 scheduler/ipp.c:6918
-#: scheduler/ipp.c:6974 scheduler/ipp.c:7288 scheduler/ipp.c:7554
-#: scheduler/ipp.c:7643 scheduler/ipp.c:7676 scheduler/ipp.c:7999
-#: scheduler/ipp.c:8392 scheduler/ipp.c:8474 scheduler/ipp.c:9638
-#: scheduler/ipp.c:10090 scheduler/ipp.c:10421 scheduler/ipp.c:10503
-#: scheduler/ipp.c:10876
+#: scheduler/ipp.c:789 scheduler/ipp.c:1072 scheduler/ipp.c:3232
+#: scheduler/ipp.c:3413 scheduler/ipp.c:5213 scheduler/ipp.c:5638
+#: scheduler/ipp.c:5953 scheduler/ipp.c:6519 scheduler/ipp.c:7326
+#: scheduler/ipp.c:7382 scheduler/ipp.c:7708 scheduler/ipp.c:7980
+#: scheduler/ipp.c:8069 scheduler/ipp.c:8102 scheduler/ipp.c:8426
+#: scheduler/ipp.c:8833 scheduler/ipp.c:8915 scheduler/ipp.c:10089
+#: scheduler/ipp.c:10541 scheduler/ipp.c:10894 scheduler/ipp.c:10976
+#: scheduler/ipp.c:11351
 msgid "The printer or class does not exist."
 msgstr ""
 
-#: scheduler/ipp.c:1234
+#: scheduler/ipp.c:1284
 msgid "The printer or class is not shared."
 msgstr ""
 
-#: cups/localize.c:302
+#: cups/ppd-localize.c:300
 msgid "The printer's cover is open."
 msgstr ""
 
-#: cups/localize.c:306
+#: cups/ppd-localize.c:304
 msgid "The printer's door is open."
 msgstr ""
 
-#: cups/localize.c:304
+#: cups/ppd-localize.c:302
 msgid "The printer's interlock is open."
 msgstr ""
 
-#: cups/localize.c:324
+#: cups/ppd-localize.c:322
 msgid "The printer's waste bin is almost full."
 msgstr ""
 
-#: cups/localize.c:326
+#: cups/ppd-localize.c:324
 msgid "The printer's waste bin is full."
 msgstr ""
 
-#: scheduler/ipp.c:894 scheduler/ipp.c:2251
+#: scheduler/ipp.c:895 scheduler/ipp.c:2276
 #, c-format
 msgid "The printer-uri \"%s\" contains invalid characters."
 msgstr ""
 
-#: scheduler/ipp.c:3182
+#: scheduler/ipp.c:3209
 msgid "The printer-uri attribute is required."
 msgstr ""
 
-#: scheduler/ipp.c:878
+#: scheduler/ipp.c:879
 msgid "The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"."
 msgstr ""
 
-#: scheduler/ipp.c:2235
+#: scheduler/ipp.c:2260
 msgid "The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"."
 msgstr ""
 
-#: cgi-bin/admin.c:452
+#: cgi-bin/admin.c:448
 msgid "The subscription name may not contain spaces, slashes (/), question marks (?), or the pound sign (#)."
 msgstr ""
 
-#: scheduler/client.c:2223
+#: scheduler/client.c:2247
 msgid "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to enable it."
 msgstr ""
 
-#: scheduler/ipp.c:6259
+#: scheduler/ipp.c:6617
 #, c-format
 msgid "The which-jobs value \"%s\" is not supported."
 msgstr ""
 
-#: scheduler/ipp.c:5530
+#: scheduler/ipp.c:5882
 msgid "There are too many subscriptions."
 msgstr ""
 
-#: backend/usb-darwin.c:386 backend/usb-darwin.c:445 backend/usb-darwin.c:514
-#: backend/usb-darwin.c:535 backend/usb-libusb.c:271 backend/usb-libusb.c:325
+#: 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
 msgid "There was an unrecoverable USB error."
 msgstr ""
 
-#: ppdc/sample.c:435
+#: ppdc/sample.c:430
 msgid "Thermal Transfer Media"
 msgstr ""
 
-#: scheduler/ipp.c:1479
+#: scheduler/ipp.c:1524
 msgid "Too many active jobs."
 msgstr ""
 
-#: scheduler/ipp.c:1373
+#: scheduler/ipp.c:1418
 #, c-format
 msgid "Too many job-sheets values (%d > 2)."
 msgstr ""
 
-#: scheduler/ipp.c:2536
+#: scheduler/ipp.c:2587
 #, c-format
 msgid "Too many printer-state-reasons values (%d > %d)."
 msgstr ""
 
-#: ppdc/sample.c:289
+#: cups/ppd-cache.c:3463
+msgid "Top"
+msgstr ""
+
+#: cups/ppd-cache.c:3854
+msgid "Top Tray"
+msgstr ""
+
+#: cups/ppd-cache.c:3652
+msgid "Tractor"
+msgstr ""
+
+#: cups/ppd-cache.c:3653
+msgid "Transfer"
+msgstr ""
+
+#: cups/ppd-cache.c:3654 ppdc/sample.c:284
 msgid "Transparency"
 msgstr ""
 
-#: ppdc/sample.c:284
+#: ppdc/sample.c:279
 msgid "Tray"
 msgstr ""
 
-#: ppdc/sample.c:264
+#: cups/ppd-cache.c:3472 cups/ppd-cache.c:3855 ppdc/sample.c:256
 msgid "Tray 1"
 msgstr ""
 
-#: ppdc/sample.c:265
+#: cups/ppd-cache.c:3481 cups/ppd-cache.c:3864
+msgid "Tray 10"
+msgstr ""
+
+#: cups/ppd-cache.c:3482
+msgid "Tray 11"
+msgstr ""
+
+#: cups/ppd-cache.c:3483
+msgid "Tray 12"
+msgstr ""
+
+#: cups/ppd-cache.c:3484
+msgid "Tray 13"
+msgstr ""
+
+#: cups/ppd-cache.c:3485
+msgid "Tray 14"
+msgstr ""
+
+#: cups/ppd-cache.c:3486
+msgid "Tray 15"
+msgstr ""
+
+#: cups/ppd-cache.c:3487
+msgid "Tray 16"
+msgstr ""
+
+#: cups/ppd-cache.c:3488
+msgid "Tray 17"
+msgstr ""
+
+#: cups/ppd-cache.c:3489
+msgid "Tray 18"
+msgstr ""
+
+#: cups/ppd-cache.c:3490
+msgid "Tray 19"
+msgstr ""
+
+#: cups/ppd-cache.c:3473 cups/ppd-cache.c:3856 ppdc/sample.c:257
 msgid "Tray 2"
 msgstr ""
 
-#: ppdc/sample.c:266
+#: cups/ppd-cache.c:3491
+msgid "Tray 20"
+msgstr ""
+
+#: cups/ppd-cache.c:3474 cups/ppd-cache.c:3857 ppdc/sample.c:258
 msgid "Tray 3"
 msgstr ""
 
-#: ppdc/sample.c:267
+#: cups/ppd-cache.c:3475 cups/ppd-cache.c:3858 ppdc/sample.c:259
 msgid "Tray 4"
 msgstr ""
 
-#: cups/http-support.c:1378
+#: cups/ppd-cache.c:3476 cups/ppd-cache.c:3859
+msgid "Tray 5"
+msgstr ""
+
+#: cups/ppd-cache.c:3477 cups/ppd-cache.c:3860
+msgid "Tray 6"
+msgstr ""
+
+#: cups/ppd-cache.c:3478 cups/ppd-cache.c:3861
+msgid "Tray 7"
+msgstr ""
+
+#: cups/ppd-cache.c:3479 cups/ppd-cache.c:3862
+msgid "Tray 8"
+msgstr ""
+
+#: cups/ppd-cache.c:3480 cups/ppd-cache.c:3863
+msgid "Tray 9"
+msgstr ""
+
+#: cups/ppd-cache.c:3138
+msgid "Triple Staple (Landscape)"
+msgstr ""
+
+#: cups/ppd-cache.c:3136
+msgid "Triple Staple (Portrait)"
+msgstr ""
+
+#: cups/ppd-cache.c:3135
+msgid "Triple Staple (Reverse Landscape)"
+msgstr ""
+
+#: cups/ppd-cache.c:3137
+msgid "Triple Staple (Reverse Portrait)"
+msgstr ""
+
+#: cups/ppd-cache.c:3655
+msgid "Triple Wall Cardboard"
+msgstr ""
+
+#: cups/tls-darwin.c:648 cups/tls-darwin.c:730 cups/tls-gnutls.c:482
+#: cups/tls-gnutls.c:564
+msgid "Trust on first use is disabled."
+msgstr ""
+
+#: cups/http-support.c:1382
 msgid "URI Too Long"
 msgstr ""
 
-#: cups/http-support.c:1453
+#: cups/http-support.c:1457
 msgid "URI too large"
 msgstr ""
 
@@ -5534,527 +6741,538 @@ msgstr ""
 msgid "US Letter Small"
 msgstr ""
 
-#: cgi-bin/admin.c:1939 cgi-bin/admin.c:1952 cgi-bin/admin.c:1976
+#: cgi-bin/admin.c:1943 cgi-bin/admin.c:1956 cgi-bin/admin.c:1980
 msgid "Unable to access cupsd.conf file"
 msgstr ""
 
-#: cgi-bin/help.c:133
+#: cgi-bin/help.c:127
 msgid "Unable to access help file."
 msgstr ""
 
-#: cgi-bin/admin.c:504
+#: cgi-bin/admin.c:500
 msgid "Unable to add RSS subscription"
 msgstr ""
 
-#: cgi-bin/admin.c:792
+#: cgi-bin/admin.c:788
 msgid "Unable to add class"
 msgstr ""
 
-#: backend/ipp.c:1754
+#: backend/ipp.c:1856
 msgid "Unable to add document to print job."
 msgstr ""
 
-#: scheduler/ipp.c:1538
+#: scheduler/ipp.c:1582
 #, c-format
 msgid "Unable to add job for destination \"%s\"."
 msgstr ""
 
-#: cgi-bin/admin.c:1037 cgi-bin/admin.c:1399
+#: cgi-bin/admin.c:1034 cgi-bin/admin.c:1403
 msgid "Unable to add printer"
 msgstr ""
 
-#: scheduler/ipp.c:1164
+#: scheduler/ipp.c:1202
 msgid "Unable to allocate memory for file types."
 msgstr ""
 
-#: filter/pstops.c:418
+#: filter/pstops.c:421
 msgid "Unable to allocate memory for page info"
 msgstr ""
 
-#: filter/pstops.c:412
+#: filter/pstops.c:415
 msgid "Unable to allocate memory for pages array"
 msgstr ""
 
-#: cgi-bin/admin.c:1505
+#: cgi-bin/admin.c:1509
 msgid "Unable to cancel RSS subscription"
 msgstr ""
 
-#: backend/ipp.c:2035 backend/ipp.c:2470
+#: backend/ipp.c:2141 backend/ipp.c:2651
 msgid "Unable to cancel print job."
 msgstr ""
 
-#: cgi-bin/admin.c:2970
+#: cgi-bin/admin.c:2974
 msgid "Unable to change printer"
 msgstr ""
 
-#: cgi-bin/admin.c:3886
+#: cgi-bin/admin.c:3890
 msgid "Unable to change printer-is-shared attribute"
 msgstr ""
 
-#: cgi-bin/admin.c:1637 cgi-bin/admin.c:1779
+#: cgi-bin/admin.c:1641 cgi-bin/admin.c:1783
 msgid "Unable to change server settings"
 msgstr ""
 
-#: cups/ipp.c:5301
+#: cups/ipp.c:5364
 #, c-format
 msgid "Unable to compile mimeMediaType regular expression: %s."
 msgstr ""
 
-#: cups/ipp.c:5247
+#: cups/ipp.c:5310
 #, c-format
 msgid "Unable to compile naturalLanguage regular expression: %s."
 msgstr ""
 
-#: filter/commandtops.c:407
+#: filter/commandtops.c:405
 msgid "Unable to configure printer options."
 msgstr ""
 
-#: cups/adminutil.c:900 cups/request.c:1038
+#: cups/adminutil.c:899 cups/request.c:1050
 msgid "Unable to connect to host."
 msgstr ""
 
-#: backend/ipp.c:740 backend/ipp.c:1213 backend/lpd.c:795 backend/socket.c:338
-#: backend/usb-unix.c:110
+#: backend/ipp.c:730 backend/ipp.c:1276 backend/lpd.c:856 backend/socket.c:319
+#: backend/usb-unix.c:108
 msgid "Unable to contact printer, queuing on next printer in class."
 msgstr ""
 
-#: cups/adminutil.c:715
+#: cups/adminutil.c:714
 #, c-format
 msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
 msgstr ""
 
-#: cups/adminutil.c:680
+#: cups/adminutil.c:679
 #, c-format
 msgid "Unable to copy 64-bit Windows printer driver files (%d)."
 msgstr ""
 
-#: cups/adminutil.c:511
+#: cups/adminutil.c:510
 #, c-format
 msgid "Unable to copy CUPS printer driver files (%d)."
 msgstr ""
 
-#: scheduler/ipp.c:2656
+#: scheduler/ipp.c:2690
 #, c-format
 msgid "Unable to copy PPD file - %s"
 msgstr ""
 
-#: scheduler/ipp.c:2711
+#: scheduler/ipp.c:2735
 msgid "Unable to copy PPD file."
 msgstr ""
 
-#: cups/adminutil.c:476
+#: cups/adminutil.c:475
 #, c-format
 msgid "Unable to copy Windows 2000 printer driver files (%d)."
 msgstr ""
 
-#: cups/adminutil.c:599
+#: cups/adminutil.c:598
 #, c-format
 msgid "Unable to copy Windows 9x printer driver files (%d)."
 msgstr ""
 
-#: scheduler/ipp.c:2633
-#, c-format
-msgid "Unable to copy interface script - %s"
+#: cups/tls-darwin.c:614 cups/tls-gnutls.c:445
+msgid "Unable to create credentials from array."
 msgstr ""
 
-#: cups/util.c:569 cups/util.c:1631
+#: cups/ppd-util.c:542 cups/util.c:482
 msgid "Unable to create printer-uri"
 msgstr ""
 
-#: cups/tls-darwin.c:1244
+#: scheduler/ipp.c:5478
+msgid "Unable to create printer."
+msgstr ""
+
+#: cups/tls-darwin.c:1444 cups/tls-gnutls.c:1475
 msgid "Unable to create server credentials."
 msgstr ""
 
-#: cgi-bin/admin.c:1830 cgi-bin/admin.c:1842 scheduler/cupsfilter.c:1262
+#: cgi-bin/admin.c:1834 cgi-bin/admin.c:1846 scheduler/cupsfilter.c:1288
 msgid "Unable to create temporary file"
 msgstr ""
 
-#: cgi-bin/admin.c:2133
+#: cgi-bin/admin.c:2137
 msgid "Unable to delete class"
 msgstr ""
 
-#: cgi-bin/admin.c:2218
+#: cgi-bin/admin.c:2222
 msgid "Unable to delete printer"
 msgstr ""
 
-#: cgi-bin/classes.c:252 cgi-bin/printers.c:261
+#: cgi-bin/classes.c:250 cgi-bin/printers.c:259
 msgid "Unable to do maintenance command"
 msgstr ""
 
-#: cgi-bin/admin.c:1954
+#: cgi-bin/admin.c:1958
 msgid "Unable to edit cupsd.conf files larger than 1MB"
 msgstr ""
 
-#: cups/tls-darwin.c:1412 cups/tls-sspi.c:493
+#: cups/tls-darwin.c:1611
 msgid "Unable to establish a secure connection to host (certificate chain invalid)."
 msgstr ""
 
-#: cups/tls-darwin.c:1402 cups/tls-sspi.c:483
+#: cups/tls-darwin.c:1601
 msgid "Unable to establish a secure connection to host (certificate not yet valid)."
 msgstr ""
 
-#: cups/tls-darwin.c:1397 cups/tls-sspi.c:478
+#: cups/tls-darwin.c:1596
 msgid "Unable to establish a secure connection to host (expired certificate)."
 msgstr ""
 
-#: cups/tls-darwin.c:1407 cups/tls-sspi.c:488
+#: cups/tls-darwin.c:1606
 msgid "Unable to establish a secure connection to host (host name mismatch)."
 msgstr ""
 
-#: cups/tls-darwin.c:1417 cups/tls-sspi.c:498
+#: cups/tls-darwin.c:1616
 msgid "Unable to establish a secure connection to host (peer dropped connection before responding)."
 msgstr ""
 
-#: cups/tls-darwin.c:1392 cups/tls-sspi.c:473
+#: cups/tls-darwin.c:1591
 msgid "Unable to establish a secure connection to host (self-signed certificate)."
 msgstr ""
 
-#: cups/tls-darwin.c:1387 cups/tls-sspi.c:468
+#: cups/tls-darwin.c:1586
 msgid "Unable to establish a secure connection to host (untrusted certificate)."
 msgstr ""
 
-#: cups/tls-darwin.c:1444 cups/tls-sspi.c:269 cups/tls-sspi.c:525
-#: cups/tls-sspi.c:558 cups/tls-sspi.c:575
+#: cups/tls-darwin.c:1643 cups/tls-sspi.c:1277 cups/tls-sspi.c:1294
 msgid "Unable to establish a secure connection to host."
 msgstr ""
 
-#: cgi-bin/ipp-var.c:350
+#: cgi-bin/ipp-var.c:351
 msgid "Unable to find destination for job"
 msgstr ""
 
-#: cups/http-support.c:1914
+#: cups/http-support.c:1951
 msgid "Unable to find printer."
 msgstr ""
 
-#: cups/tls-darwin.c:1258
+#: cups/tls-darwin.c:1457
 msgid "Unable to find server credentials."
 msgstr ""
 
-#: backend/ipp.c:3426
+#: backend/ipp.c:3312
 msgid "Unable to get backend exit status."
 msgstr ""
 
-#: cgi-bin/classes.c:442
+#: cgi-bin/classes.c:430
 msgid "Unable to get class list"
 msgstr ""
 
-#: cgi-bin/classes.c:541
+#: cgi-bin/classes.c:529
 msgid "Unable to get class status"
 msgstr ""
 
-#: cgi-bin/admin.c:1300
+#: cgi-bin/admin.c:1297
 msgid "Unable to get list of printer drivers"
 msgstr ""
 
-#: cgi-bin/admin.c:2820
+#: cgi-bin/admin.c:2824
 msgid "Unable to get printer attributes"
 msgstr ""
 
-#: cgi-bin/printers.c:459
+#: cgi-bin/printers.c:447
 msgid "Unable to get printer list"
 msgstr ""
 
-#: cgi-bin/printers.c:561
+#: cgi-bin/printers.c:549
 msgid "Unable to get printer status"
 msgstr ""
 
-#: backend/ipp.c:964
+#: backend/ipp.c:1025
 msgid "Unable to get printer status."
 msgstr ""
 
-#: cups/adminutil.c:554 cups/adminutil.c:758
+#: cups/adminutil.c:553 cups/adminutil.c:757
 #, c-format
 msgid "Unable to install Windows 2000 printer driver files (%d)."
 msgstr ""
 
-#: cups/adminutil.c:628
+#: cups/adminutil.c:627
 #, c-format
 msgid "Unable to install Windows 9x printer driver files (%d)."
 msgstr ""
 
-#: cgi-bin/help.c:92
+#: cgi-bin/help.c:86
 msgid "Unable to load help index."
 msgstr ""
 
-#: backend/ipp.c:665 backend/lpd.c:426 backend/socket.c:277
+#: backend/network.c:74
 #, c-format
 msgid "Unable to locate printer \"%s\"."
 msgstr ""
 
-#: backend/dnssd.c:787 backend/ipp.c:334 backend/lpd.c:196
-#: backend/socket.c:163
+#: backend/dnssd.c:785 backend/ipp.c:342 backend/lpd.c:191
+#: backend/socket.c:160
 msgid "Unable to locate printer."
 msgstr ""
 
-#: cgi-bin/admin.c:791
+#: cgi-bin/admin.c:787
 msgid "Unable to modify class"
 msgstr ""
 
-#: cgi-bin/admin.c:1036 cgi-bin/admin.c:1398
+#: cgi-bin/admin.c:1033 cgi-bin/admin.c:1402
 msgid "Unable to modify printer"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:417 cgi-bin/ipp-var.c:506
+#: cgi-bin/ipp-var.c:418 cgi-bin/ipp-var.c:507
 msgid "Unable to move job"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:419 cgi-bin/ipp-var.c:508
+#: cgi-bin/ipp-var.c:420 cgi-bin/ipp-var.c:509
 msgid "Unable to move jobs"
 msgstr ""
 
-#: cgi-bin/admin.c:3166 cups/ppd.c:297
+#: cgi-bin/admin.c:3170 cups/ppd.c:314
 msgid "Unable to open PPD file"
 msgstr ""
 
-#: cgi-bin/admin.c:2588
+#: cgi-bin/admin.c:2592
 msgid "Unable to open cupsd.conf file:"
 msgstr ""
 
-#: backend/usb-unix.c:134
+#: backend/usb-unix.c:132
 msgid "Unable to open device file"
 msgstr ""
 
-#: scheduler/ipp.c:5945
+#: scheduler/ipp.c:6296
 #, c-format
 msgid "Unable to open document #%d in job #%d."
 msgstr ""
 
-#: cgi-bin/help.c:364
+#: cgi-bin/help.c:358
 msgid "Unable to open help file."
 msgstr ""
 
-#: backend/ipp.c:376 backend/ipp.c:1501 backend/ipp.c:1709 backend/lpd.c:496
-#: backend/socket.c:150 backend/usb.c:237 filter/gziptoany.c:67
-#: filter/pstops.c:267
+#: backend/ipp.c:384 backend/ipp.c:1596 backend/ipp.c:1809 backend/lpd.c:479
+#: backend/socket.c:147 backend/usb.c:229 filter/gziptoany.c:71
+#: filter/pstops.c:268
 msgid "Unable to open print file"
 msgstr ""
 
-#: filter/rastertoepson.c:983 filter/rastertohp.c:713
-#: filter/rastertolabel.c:1128
+#: filter/rastertoepson.c:1017 filter/rastertohp.c:687
+#: filter/rastertolabel.c:1131
 msgid "Unable to open raster file"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:780
+#: cgi-bin/ipp-var.c:781
 msgid "Unable to print test page"
 msgstr ""
 
-#: backend/runloop.c:85 backend/runloop.c:314 backend/usb-darwin.c:622
-#: backend/usb-darwin.c:666 backend/usb-libusb.c:416 backend/usb-libusb.c:451
+#: 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
 msgid "Unable to read print data."
 msgstr ""
 
-#: cups/dest.c:3351
-msgid "Unable to resolve printer URI."
+#: scheduler/ipp.c:8585 scheduler/ipp.c:9828
+msgid "Unable to rename job document file."
 msgstr ""
 
-#: cups/adminutil.c:2077
+#: cups/dest.c:3534
+msgid "Unable to resolve printer-uri."
+msgstr ""
+
+#: cups/adminutil.c:2136
 #, c-format
 msgid "Unable to run \"%s\": %s"
 msgstr ""
 
-#: filter/pstops.c:530
+#: filter/pstops.c:533
 msgid "Unable to see in file"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:583 cgi-bin/ipp-var.c:603
+#: cgi-bin/ipp-var.c:584 cgi-bin/ipp-var.c:604
 msgid "Unable to send command to printer driver"
 msgstr ""
 
-#: backend/usb-darwin.c:744 backend/usb-libusb.c:527
+#: backend/usb-darwin.c:758 backend/usb-libusb.c:527
 msgid "Unable to send data to printer."
 msgstr ""
 
-#: cups/adminutil.c:810
+#: cups/adminutil.c:809
 #, c-format
 msgid "Unable to set Windows printer driver (%d)."
 msgstr ""
 
-#: cgi-bin/admin.c:3787
+#: cgi-bin/admin.c:3791
 msgid "Unable to set options"
 msgstr ""
 
-#: cgi-bin/admin.c:3057
+#: cgi-bin/admin.c:3061
 msgid "Unable to set server default"
 msgstr ""
 
-#: backend/ipp.c:3285 backend/ipp.c:3362 backend/ipp.c:3370
+#: backend/ipp.c:3171 backend/ipp.c:3248 backend/ipp.c:3256
 msgid "Unable to start backend process."
 msgstr ""
 
-#: cgi-bin/admin.c:1892
+#: cgi-bin/admin.c:1896
 msgid "Unable to upload cupsd.conf file"
 msgstr ""
 
-#: backend/usb-darwin.c:2016 backend/usb-darwin.c:2040
+#: backend/usb-darwin.c:2148 backend/usb-darwin.c:2172
 msgid "Unable to use legacy USB class driver."
 msgstr ""
 
-#: backend/runloop.c:114 backend/runloop.c:369
+#: backend/runloop.c:112 backend/runloop.c:367
 msgid "Unable to write print data"
 msgstr ""
 
-#: filter/gziptoany.c:86
+#: filter/gziptoany.c:90
 #, c-format
 msgid "Unable to write uncompressed print data: %s"
 msgstr ""
 
-#: cups/http-support.c:1366
+#: cups/http-support.c:1370
 msgid "Unauthorized"
 msgstr ""
 
-#: cgi-bin/admin.c:3483
+#: cgi-bin/admin.c:3487
 msgid "Units"
 msgstr ""
 
-#: cups/http-support.c:1406 cups/http-support.c:1490 cups/ppd.c:324
+#: cups/http-support.c:1410 cups/http-support.c:1494 cups/ppd.c:341
 msgid "Unknown"
 msgstr ""
 
-#: filter/pstops.c:2185
+#: filter/pstops.c:2188
 #, c-format
 msgid "Unknown choice \"%s\" for option \"%s\"."
 msgstr ""
 
-#: backend/ipp.c:518
+#: backend/ipp.c:526
 #, c-format
 msgid "Unknown encryption option value: \"%s\"."
 msgstr ""
 
-#: backend/lpd.c:342
+#: backend/lpd.c:337
 #, c-format
 msgid "Unknown file order: \"%s\"."
 msgstr ""
 
-#: backend/lpd.c:313
+#: backend/lpd.c:308
 #, c-format
 msgid "Unknown format character: \"%c\"."
 msgstr ""
 
-#: cups/dest-options.c:946
+#: cups/hash.c:233
+msgid "Unknown hash algorithm."
+msgstr ""
+
+#: cups/dest-options.c:963
 msgid "Unknown media size name."
 msgstr ""
 
-#: backend/ipp.c:582
+#: backend/ipp.c:590
 #, c-format
 msgid "Unknown option \"%s\" with value \"%s\"."
 msgstr ""
 
-#: filter/pstops.c:2168
+#: filter/pstops.c:2171
 #, c-format
 msgid "Unknown option \"%s\"."
 msgstr ""
 
-#: backend/lpd.c:328
+#: backend/lpd.c:323
 #, c-format
 msgid "Unknown print mode: \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:10292
+#: scheduler/ipp.c:10763
 #, c-format
 msgid "Unknown printer-error-policy \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:10275
+#: scheduler/ipp.c:10746
 #, c-format
 msgid "Unknown printer-op-policy \"%s\"."
 msgstr ""
 
-#: cups/http.c:2322
+#: cups/http.c:2292
 msgid "Unknown request method."
 msgstr ""
 
-#: cups/http.c:2342
+#: cups/http.c:2312
 msgid "Unknown request version."
 msgstr ""
 
-#: cups/http-support.c:1483
+#: cups/http-support.c:1487
 msgid "Unknown scheme in URI"
 msgstr ""
 
-#: cups/http-addrlist.c:737
+#: cups/http-addrlist.c:806
 msgid "Unknown service name."
 msgstr ""
 
-#: backend/ipp.c:547
+#: backend/ipp.c:555
 #, c-format
 msgid "Unknown version option value: \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:10747
+#: scheduler/ipp.c:11222
 #, c-format
 msgid "Unsupported 'compression' value \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:10777
+#: scheduler/ipp.c:11252
 #, c-format
 msgid "Unsupported 'document-format' value \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:10852
+#: scheduler/ipp.c:11327
 msgid "Unsupported 'job-name' value."
 msgstr ""
 
-#: scheduler/ipp.c:329
+#: scheduler/ipp.c:327
 #, c-format
 msgid "Unsupported character set \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:7965 scheduler/ipp.c:9199
+#: scheduler/ipp.c:8392 scheduler/ipp.c:9640
 #, c-format
 msgid "Unsupported compression \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:8099 scheduler/ipp.c:9349
+#: scheduler/ipp.c:8528 scheduler/ipp.c:9793
 #, c-format
 msgid "Unsupported document-format \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:9332
+#: scheduler/ipp.c:9776
 #, c-format
 msgid "Unsupported document-format \"%s/%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:1339
+#: scheduler/ipp.c:1384
 #, c-format
 msgid "Unsupported format \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:1437
+#: scheduler/ipp.c:1482
 msgid "Unsupported margins."
 msgstr ""
 
-#: cups/pwg-media.c:549
+#: cups/pwg-media.c:543
 msgid "Unsupported media value."
 msgstr ""
 
-#: filter/pstops.c:2450
+#: filter/pstops.c:2453
 #, c-format
 msgid "Unsupported number-up value %d, using number-up=1."
 msgstr ""
 
-#: filter/pstops.c:2484
+#: filter/pstops.c:2487
 #, c-format
 msgid "Unsupported number-up-layout value %s, using number-up-layout=lrtb."
 msgstr ""
 
-#: filter/pstops.c:2535
+#: filter/pstops.c:2538
 #, c-format
 msgid "Unsupported page-border value %s, using page-border=none."
 msgstr ""
 
-#: filter/rastertopwg.c:139 filter/rastertopwg.c:147 filter/rastertopwg.c:156
+#: filter/rastertopwg.c:137 filter/rastertopwg.c:173 filter/rastertopwg.c:181
+#: filter/rastertopwg.c:190
 msgid "Unsupported raster data."
 msgstr ""
 
-#: cups/snmp.c:1064
+#: cups/snmp.c:1062
 msgid "Unsupported value type"
 msgstr ""
 
-#: cups/http-support.c:1381
+#: cups/http-support.c:1385
 msgid "Upgrade Required"
 msgstr ""
 
-#: systemv/lpadmin.c:654
+#: systemv/lpadmin.c:635
 msgid ""
 "Usage:\n"
 "\n"
@@ -6066,47 +7284,39 @@ msgid ""
 "                       [-u allow:user,user] [-u deny:user,user]"
 msgstr ""
 
-#: backend/dnssd.c:227 backend/ipp.c:323 backend/lpd.c:183
-#: backend/socket.c:127 backend/usb.c:183 filter/commandtops.c:63
-#: filter/gziptoany.c:46 filter/pstops.c:231 monitor/bcp.c:56
-#: monitor/tbcp.c:55
+#: 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
 #, c-format
 msgid "Usage: %s job-id user title copies options [file]"
 msgstr ""
 
-#: systemv/cupsaddsmb.c:281
+#: systemv/cupsaddsmb.c:273
 msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
 msgstr ""
 
-#: systemv/cupsctl.c:200
+#: systemv/cupsctl.c:193
 msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
 msgstr ""
 
-#: scheduler/main.c:2076
+#: scheduler/main.c:2047
 msgid "Usage: cupsd [options]"
 msgstr ""
 
-#: scheduler/cupsfilter.c:1455
-msgid "Usage: cupsfilter [ options ] filename"
+#: scheduler/cupsfilter.c:1479
+msgid "Usage: cupsfilter [ options ] [ -- ] filename"
 msgstr ""
 
-#: systemv/cupstestdsc.c:425
+#: systemv/cupstestdsc.c:417
 msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
 msgstr ""
 
-#: systemv/cupstestppd.c:3813
+#: systemv/cupstestppd.c:3855
 msgid "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]"
 msgstr ""
 
-#: test/ippdiscover.c:814
-msgid ""
-"Usage: ippdiscover [options] -a\n"
-"       ippdiscover [options] \"service name\"\n"
-"\n"
-"Options:"
-msgstr ""
-
-#: test/ippfind.c:2708
+#: test/ippfind.c:2744
 msgid ""
 "Usage: ippfind [options] regtype[,subtype][.domain.] ... [expression]\n"
 "       ippfind [options] name[.regtype[.domain.]] ... [expression]\n"
@@ -6114,7 +7324,7 @@ msgid ""
 "       ippfind --version"
 msgstr ""
 
-#: test/ipptool.c:4661
+#: test/ipptool.c:4928
 msgid "Usage: ipptool [options] URI filename [ ... filenameN ]"
 msgstr ""
 
@@ -6122,7 +7332,7 @@ msgstr ""
 msgid "Usage: lpmove job/src dest"
 msgstr ""
 
-#: systemv/lpoptions.c:539
+#: systemv/lpoptions.c:523
 msgid ""
 "Usage: lpoptions [-h server] [-E] -d printer\n"
 "       lpoptions [-h server] [-E] [-p printer] -l\n"
@@ -6130,1254 +7340,1187 @@ msgid ""
 "       lpoptions [-h server] [-E] -x printer"
 msgstr ""
 
-#: systemv/lppasswd.c:476
-msgid "Usage: lppasswd [-g groupname]"
-msgstr ""
-
-#: systemv/lppasswd.c:479
-msgid ""
-"Usage: lppasswd [-g groupname] [username]\n"
-"       lppasswd [-g groupname] -a [username]\n"
-"       lppasswd [-g groupname] -x [username]"
-msgstr ""
-
-#: berkeley/lpq.c:637
+#: berkeley/lpq.c:646
 msgid "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]"
 msgstr ""
 
-#: ppdc/ppdc.cxx:435
+#: ppdc/ppdc.cxx:428
 msgid "Usage: ppdc [options] filename.drv [ ... filenameN.drv ]"
 msgstr ""
 
-#: ppdc/ppdhtml.cxx:172
+#: ppdc/ppdhtml.cxx:175
 msgid "Usage: ppdhtml [options] filename.drv >filename.html"
 msgstr ""
 
-#: ppdc/ppdi.cxx:128
+#: ppdc/ppdi.cxx:121
 msgid "Usage: ppdi [options] filename.ppd [ ... filenameN.ppd ]"
 msgstr ""
 
-#: ppdc/ppdmerge.cxx:361
+#: ppdc/ppdmerge.cxx:359
 msgid "Usage: ppdmerge [options] filename.ppd [ ... filenameN.ppd ]"
 msgstr ""
 
-#: ppdc/ppdpo.cxx:252
+#: ppdc/ppdpo.cxx:245
 msgid "Usage: ppdpo [options] -o filename.po filename.drv [ ... filenameN.drv ]"
 msgstr ""
 
-#: backend/snmp.c:192
+#: backend/snmp.c:190
 msgid "Usage: snmp [host-or-ip-address]"
 msgstr ""
 
-#: cups/snmp.c:1016
+#: cups/snmp.c:1014
 msgid "Value uses indefinite length"
 msgstr ""
 
-#: cups/snmp.c:1001
+#: cups/snmp.c:999
 msgid "VarBind uses indefinite length"
 msgstr ""
 
-#: cups/snmp.c:951
+#: cups/ppd-cache.c:3643
+msgid "Vellum Paper"
+msgstr ""
+
+#: cups/snmp.c:949
 msgid "Version uses indefinite length"
 msgstr ""
 
-#: backend/ipp.c:1871
+#: backend/ipp.c:1976
 msgid "Waiting for job to complete."
 msgstr ""
 
-#: backend/usb-darwin.c:469 backend/usb-libusb.c:223
+#: backend/usb-darwin.c:429 backend/usb-darwin.c:483 backend/usb-libusb.c:223
 msgid "Waiting for printer to become available."
 msgstr ""
 
-#: backend/socket.c:440
+#: backend/socket.c:421
 msgid "Waiting for printer to finish."
 msgstr ""
 
-#: cups/adminutil.c:782
+#: cups/adminutil.c:781
 msgid "Warning, no Windows 2000 printer drivers are installed."
 msgstr ""
 
-#: cups/http-support.c:1402
+#: cups/ppd-cache.c:3572
+msgid "Waterproof Fabric"
+msgstr ""
+
+#: cups/http-support.c:1406
 msgid "Web Interface is Disabled"
 msgstr ""
 
-#: cups/ppd.c:1902
+#: cups/ppd-cache.c:3656
+msgid "Wet Film"
+msgstr ""
+
+#: cups/ppd-cache.c:3565
+msgid "Windowed Envelope"
+msgstr ""
+
+#: cups/ppd.c:1985
 msgid "Yes"
 msgstr ""
 
-#: scheduler/client.c:2210
+#: scheduler/client.c:2234
 #, c-format
 msgid "You must access this page using the URL <A HREF=\"https://%s:%d%s\">https://%s:%d%s</A>."
 msgstr ""
 
-#: systemv/lppasswd.c:254
-msgid "Your password must be at least 6 characters long, cannot contain your username, and must contain at least one letter and number."
+#: cups/ppd-cache.c:3101
+msgid "Z Fold"
 msgstr ""
 
-#: ppdc/sample.c:439
+#: ppdc/sample.c:434
 msgid "ZPL Label Printer"
 msgstr ""
 
-#: ppdc/sample.c:362
+#: ppdc/sample.c:357
 msgid "Zebra"
 msgstr ""
 
-#: cups/notify.c:102
+#: cups/notify.c:94
 msgid "aborted"
 msgstr ""
 
-#: cups/notify.c:99
+#: cups/notify.c:91
 msgid "canceled"
 msgstr ""
 
-#: cups/notify.c:105
+#: cups/notify.c:97
 msgid "completed"
 msgstr ""
 
-#: scheduler/ipp.c:5817
+#: scheduler/ipp.c:6168
 msgid "cups-deviced failed to execute."
 msgstr ""
 
-#: scheduler/ipp.c:6636 scheduler/ipp.c:6885
+#: scheduler/ipp.c:7054 scheduler/ipp.c:7293
 msgid "cups-driverd failed to execute."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:233
+#: systemv/cupsaddsmb.c:225
 #, c-format
 msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
 msgstr ""
 
-#: systemv/cupsctl.c:141
+#: systemv/cupsctl.c:134
 msgid "cupsctl: Cannot set Listen or Port directly."
 msgstr ""
 
-#: systemv/cupsctl.c:152
+#: systemv/cupsctl.c:145
 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
 msgstr ""
 
-#: systemv/cupsctl.c:195
+#: systemv/cupsctl.c:188
 #, c-format
 msgid "cupsctl: Unknown option \"%s\""
 msgstr ""
 
-#: systemv/cupsctl.c:197
+#: systemv/cupsctl.c:190
 #, c-format
 msgid "cupsctl: Unknown option \"-%c\""
 msgstr ""
 
-#: scheduler/main.c:162
+#: scheduler/main.c:178
 msgid "cupsd: Expected config filename after \"-c\" option."
 msgstr ""
 
-#: scheduler/main.c:249
+#: scheduler/main.c:274
 msgid "cupsd: Expected cups-files.conf filename after \"-s\" option."
 msgstr ""
 
-#: scheduler/main.c:260
+#: scheduler/main.c:248
+msgid "cupsd: On-demand support not compiled in, running in normal mode."
+msgstr ""
+
+#: scheduler/main.c:285
 msgid "cupsd: Relative cups-files.conf filename not allowed."
 msgstr ""
 
-#: scheduler/main.c:193 scheduler/main.c:200
+#: scheduler/main.c:209 scheduler/main.c:216
 msgid "cupsd: Unable to get current directory."
 msgstr ""
 
-#: scheduler/main.c:307 scheduler/main.c:316
+#: scheduler/main.c:341 scheduler/main.c:350
 msgid "cupsd: Unable to get path to cups-files.conf file."
 msgstr ""
 
-#: scheduler/main.c:289
+#: scheduler/main.c:323
 #, c-format
 msgid "cupsd: Unknown argument \"%s\" - aborting."
 msgstr ""
 
-#: scheduler/main.c:282
+#: scheduler/main.c:316
 #, c-format
 msgid "cupsd: Unknown option \"%c\" - aborting."
 msgstr ""
 
-#: scheduler/main.c:227
-msgid "cupsd: launchd(8) support not compiled in, running in normal mode."
-msgstr ""
-
-#: scheduler/cupsfilter.c:1235
+#: scheduler/cupsfilter.c:1261
 #, c-format
 msgid "cupsfilter: Invalid document number %d."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1229
+#: scheduler/cupsfilter.c:1255
 #, c-format
 msgid "cupsfilter: Invalid job ID %d."
 msgstr ""
 
-#: scheduler/cupsfilter.c:340
+#: scheduler/cupsfilter.c:346
 msgid "cupsfilter: Only one filename can be specified."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1277
+#: scheduler/cupsfilter.c:1303
 #, c-format
 msgid "cupsfilter: Unable to get job file - %s"
 msgstr ""
 
-#: systemv/cupstestppd.c:261
+#: systemv/cupstestppd.c:239
 msgid "cupstestppd: The -q option is incompatible with the -v option."
 msgstr ""
 
-#: systemv/cupstestppd.c:277
+#: systemv/cupstestppd.c:255
 msgid "cupstestppd: The -v option is incompatible with the -q option."
 msgstr ""
 
-#: systemv/lpstat.c:1234 systemv/lpstat.c:1237 systemv/lpstat.c:1240
+#: systemv/lpstat.c:1230 systemv/lpstat.c:1233 systemv/lpstat.c:1236
 #, c-format
 msgid "device for %s/%s: %s"
 msgstr ""
 
-#: systemv/lpstat.c:1220 systemv/lpstat.c:1223 systemv/lpstat.c:1226
+#: systemv/lpstat.c:1216 systemv/lpstat.c:1219 systemv/lpstat.c:1222
 #, c-format
 msgid "device for %s: %s"
 msgstr ""
 
-#: cups/snmp.c:988
+#: cups/snmp.c:986
 msgid "error-index uses indefinite length"
 msgstr ""
 
-#: cups/snmp.c:980
+#: cups/snmp.c:978
 msgid "error-status uses indefinite length"
 msgstr ""
 
-#: cups/notify.c:90
+#: cups/notify.c:82
 msgid "held"
 msgstr ""
 
-#: berkeley/lpc.c:201
+#: berkeley/lpc.c:199
 msgid "help\t\tGet help on commands."
 msgstr ""
 
-#: cups/notify.c:131
+#: cups/notify.c:123
 msgid "idle"
 msgstr ""
 
-#: test/ippfind.c:2435
+#: test/ippfind.c:2463
 #, c-format
 msgid "ippfind: Bad regular expression: %s"
 msgstr ""
 
-#: test/ippfind.c:324
+#: test/ippfind.c:326
 msgid "ippfind: Cannot use --and after --or."
 msgstr ""
 
-#: test/ippfind.c:597
+#: test/ippfind.c:599
 #, c-format
 msgid "ippfind: Expected key name after %s."
 msgstr ""
 
-#: test/ippfind.c:547 test/ippfind.c:730
+#: test/ippfind.c:549 test/ippfind.c:732
 #, c-format
 msgid "ippfind: Expected port range after %s."
 msgstr ""
 
-#: test/ippfind.c:357
+#: test/ippfind.c:359
 #, c-format
 msgid "ippfind: Expected program after %s."
 msgstr ""
 
-#: test/ippfind.c:374
+#: test/ippfind.c:376
 #, c-format
 msgid "ippfind: Expected semi-colon after %s."
 msgstr ""
 
-#: test/ippfind.c:1958
+#: test/ippfind.c:1963
 msgid "ippfind: Missing close brace in substitution."
 msgstr ""
 
-#: test/ippfind.c:1049
+#: test/ippfind.c:1051
 msgid "ippfind: Missing close parenthesis."
 msgstr ""
 
-#: test/ippfind.c:331
+#: test/ippfind.c:333
 msgid "ippfind: Missing expression before \"--and\"."
 msgstr ""
 
-#: test/ippfind.c:444
+#: test/ippfind.c:446
 msgid "ippfind: Missing expression before \"--or\"."
 msgstr ""
 
-#: test/ippfind.c:867
+#: test/ippfind.c:869
 #, c-format
 msgid "ippfind: Missing key name after %s."
 msgstr ""
 
-#: test/ippfind.c:1020
+#: test/ippfind.c:1022
 msgid "ippfind: Missing open parenthesis."
 msgstr ""
 
-#: test/ippfind.c:897
+#: test/ippfind.c:899
 #, c-format
 msgid "ippfind: Missing program after %s."
 msgstr ""
 
-#: test/ippfind.c:343 test/ippfind.c:397 test/ippfind.c:426 test/ippfind.c:532
-#: test/ippfind.c:614 test/ippfind.c:629 test/ippfind.c:784 test/ippfind.c:799
-#: test/ippfind.c:822 test/ippfind.c:882
+#: 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
 #, c-format
 msgid "ippfind: Missing regular expression after %s."
 msgstr ""
 
-#: test/ippfind.c:915
+#: test/ippfind.c:917
 #, c-format
 msgid "ippfind: Missing semi-colon after %s."
 msgstr ""
 
-#: test/ippfind.c:1905 test/ippfind.c:1930
+#: test/ippfind.c:1910 test/ippfind.c:1935
 msgid "ippfind: Out of memory."
 msgstr ""
 
-#: test/ippfind.c:993
+#: test/ippfind.c:995
 msgid "ippfind: Too many parenthesis."
 msgstr ""
 
-#: test/ippfind.c:1262 test/ippfind.c:1398 test/ippfind.c:2527
+#: test/ippfind.c:1264 test/ippfind.c:1400 test/ippfind.c:2555
 #, c-format
 msgid "ippfind: Unable to browse or resolve: %s"
 msgstr ""
 
-#: test/ippfind.c:2017 test/ippfind.c:2044
+#: test/ippfind.c:2033 test/ippfind.c:2060
 #, c-format
 msgid "ippfind: Unable to execute \"%s\": %s"
 msgstr ""
 
-#: test/ippfind.c:1139 test/ippfind.c:1147 test/ippfind.c:1158
+#: test/ippfind.c:1141 test/ippfind.c:1149 test/ippfind.c:1160
 #, c-format
 msgid "ippfind: Unable to use Bonjour: %s"
 msgstr ""
 
-#: test/ippfind.c:1987
+#: test/ippfind.c:1992
 #, c-format
 msgid "ippfind: Unknown variable \"{%s}\"."
 msgstr ""
 
-#: test/ipptool.c:355 test/ipptool.c:504 test/ipptool.c:528
-msgid "ipptool: \"-i\" and \"-n\" are incompatible with -X\"."
+#: test/ipptool.c:317 test/ipptool.c:380 test/ipptool.c:535 test/ipptool.c:558
+msgid "ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."
 msgstr ""
 
-#: test/ipptool.c:585
+#: test/ipptool.c:614
 #, c-format
 msgid "ipptool: Bad URI - %s."
 msgstr ""
 
-#: test/ipptool.c:497
+#: test/ipptool.c:528
 msgid "ipptool: Invalid seconds for \"-i\"."
 msgstr ""
 
-#: test/ipptool.c:566
+#: test/ipptool.c:595
 msgid "ipptool: May only specify a single URI."
 msgstr ""
 
-#: test/ipptool.c:520
+#: test/ipptool.c:550
 msgid "ipptool: Missing count for \"-n\"."
 msgstr ""
 
-#: test/ipptool.c:390
+#: test/ipptool.c:414
 msgid "ipptool: Missing filename for \"-f\"."
 msgstr ""
 
-#: test/ipptool.c:371
+#: test/ipptool.c:395
 msgid "ipptool: Missing name=value for \"-d\"."
 msgstr ""
 
-#: test/ipptool.c:487
+#: test/ipptool.c:518
 msgid "ipptool: Missing seconds for \"-i\"."
 msgstr ""
 
-#: test/ipptool.c:611
+#: test/ipptool.c:640
 msgid "ipptool: URI required before test file."
 msgstr ""
 
-#: test/ipptool.c:547
+#: test/ipptool.c:576
 #, c-format
 msgid "ipptool: Unknown option \"-%c\"."
 msgstr ""
 
-#: scheduler/ipp.c:7632
+#: scheduler/ipp.c:8058
 msgid "job-printer-uri attribute missing."
 msgstr ""
 
-#: systemv/lpadmin.c:117 systemv/lpadmin.c:361
+#: systemv/lpadmin.c:125 systemv/lpadmin.c:362
 msgid "lpadmin: Class name can only contain printable characters."
 msgstr ""
 
-#: systemv/lpadmin.c:600
-msgid "lpadmin: Expected PPD after \"-P\" option."
+#: systemv/lpadmin.c:215
+#, c-format
+msgid "lpadmin: Expected PPD after \"-%c\" option."
 msgstr ""
 
 #: systemv/lpadmin.c:443
 msgid "lpadmin: Expected allow/deny:userlist after \"-u\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:350
+#: systemv/lpadmin.c:353
 msgid "lpadmin: Expected class after \"-r\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:106
+#: systemv/lpadmin.c:115
 msgid "lpadmin: Expected class name after \"-c\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:544
+#: systemv/lpadmin.c:537
 msgid "lpadmin: Expected description after \"-D\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:477
+#: systemv/lpadmin.c:473
 msgid "lpadmin: Expected device URI after \"-v\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:560
+#: systemv/lpadmin.c:550
 msgid "lpadmin: Expected file type(s) after \"-I\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:188
+#: systemv/lpadmin.c:194
 msgid "lpadmin: Expected hostname after \"-h\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:207
-msgid "lpadmin: Expected interface after \"-i\" option."
-msgstr ""
-
-#: systemv/lpadmin.c:580
+#: systemv/lpadmin.c:569
 msgid "lpadmin: Expected location after \"-L\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:260
+#: systemv/lpadmin.c:266
 msgid "lpadmin: Expected model after \"-m\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:403
+#: systemv/lpadmin.c:401
 msgid "lpadmin: Expected name after \"-R\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:280
+#: systemv/lpadmin.c:286
 msgid "lpadmin: Expected name=value after \"-o\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:299
+#: systemv/lpadmin.c:306
 msgid "lpadmin: Expected printer after \"-p\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:150
+#: systemv/lpadmin.c:157
 msgid "lpadmin: Expected printer name after \"-d\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:511
+#: systemv/lpadmin.c:506
 msgid "lpadmin: Expected printer or class after \"-x\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:961
+#: systemv/lpadmin.c:942
 msgid "lpadmin: No member names were seen."
 msgstr ""
 
-#: systemv/lpadmin.c:748
+#: systemv/lpadmin.c:729
 #, c-format
 msgid "lpadmin: Printer %s is already a member of class %s."
 msgstr ""
 
-#: systemv/lpadmin.c:975
+#: systemv/lpadmin.c:956
 #, c-format
 msgid "lpadmin: Printer %s is not a member of class %s."
 msgstr ""
 
-#: systemv/lpadmin.c:161 systemv/lpadmin.c:310 systemv/lpadmin.c:522
+#: systemv/lpadmin.c:166 systemv/lpadmin.c:315 systemv/lpadmin.c:515
 msgid "lpadmin: Printer name can only contain printable characters."
 msgstr ""
 
-#: systemv/lpadmin.c:91
+#: systemv/lpadmin.c:99
 msgid ""
 "lpadmin: Unable to add a printer to the class:\n"
 "         You must specify a printer name first."
 msgstr ""
 
-#: systemv/lpadmin.c:82 systemv/lpadmin.c:135 systemv/lpadmin.c:239
-#: systemv/lpadmin.c:325 systemv/lpadmin.c:379 systemv/lpadmin.c:496
-#: systemv/lpadmin.c:633
+#: 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
 #, c-format
 msgid "lpadmin: Unable to connect to server: %s"
 msgstr ""
 
-#: systemv/lpadmin.c:1314
+#: systemv/lpadmin.c:1396
 msgid "lpadmin: Unable to create temporary file"
 msgstr ""
 
-#: systemv/lpadmin.c:388
+#: systemv/lpadmin.c:385
 msgid ""
 "lpadmin: Unable to delete option:\n"
 "         You must specify a printer name first."
 msgstr ""
 
-#: systemv/lpadmin.c:1324
+#: systemv/lpadmin.c:1388
+#, c-format
+msgid "lpadmin: Unable to open PPD \"%s\": %s on line %d."
+msgstr ""
+
+#: systemv/lpadmin.c:1408
 #, c-format
 msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 msgstr ""
 
-#: systemv/lpadmin.c:334
+#: systemv/lpadmin.c:337
 msgid ""
 "lpadmin: Unable to remove a printer from the class:\n"
 "         You must specify a printer name first."
 msgstr ""
 
-#: systemv/lpadmin.c:642
+#: systemv/lpadmin.c:620
 msgid ""
 "lpadmin: Unable to set the printer options:\n"
 "         You must specify a printer name first."
 msgstr ""
 
-#: systemv/lpadmin.c:460
+#: systemv/lpadmin.c:456
 #, c-format
 msgid "lpadmin: Unknown allow/deny option \"%s\"."
 msgstr ""
 
-#: systemv/lpadmin.c:615
+#: systemv/lpadmin.c:585
 #, c-format
 msgid "lpadmin: Unknown argument \"%s\"."
 msgstr ""
 
-#: systemv/lpadmin.c:610
+#: systemv/lpadmin.c:578
 #, c-format
 msgid "lpadmin: Unknown option \"%c\"."
 msgstr ""
 
-#: systemv/lpadmin.c:566
+#: systemv/lpadmin.c:554
 msgid "lpadmin: Warning - content type list ignored."
 msgstr ""
 
-#: berkeley/lpc.c:68 berkeley/lpc.c:96 berkeley/lpc.c:132
+#: berkeley/lpc.c:66 berkeley/lpc.c:94 berkeley/lpc.c:130
 msgid "lpc> "
 msgstr ""
 
-#: systemv/lpinfo.c:137
+#: systemv/lpinfo.c:82
 msgid "lpinfo: Expected 1284 device ID string after \"--device-id\"."
 msgstr ""
 
-#: systemv/lpinfo.c:190
+#: systemv/lpinfo.c:129
 msgid "lpinfo: Expected language after \"--language\"."
 msgstr ""
 
-#: systemv/lpinfo.c:207
+#: systemv/lpinfo.c:144
 msgid "lpinfo: Expected make and model after \"--make-and-model\"."
 msgstr ""
 
-#: systemv/lpinfo.c:224
+#: systemv/lpinfo.c:159
 msgid "lpinfo: Expected product string after \"--product\"."
 msgstr ""
 
-#: systemv/lpinfo.c:155
+#: systemv/lpinfo.c:98
 msgid "lpinfo: Expected scheme list after \"--exclude-schemes\"."
 msgstr ""
 
-#: systemv/lpinfo.c:173
+#: systemv/lpinfo.c:114
 msgid "lpinfo: Expected scheme list after \"--include-schemes\"."
 msgstr ""
 
-#: systemv/lpinfo.c:241
+#: systemv/lpinfo.c:174
 msgid "lpinfo: Expected timeout after \"--timeout\"."
 msgstr ""
 
-#: systemv/lpinfo.c:265
-#, c-format
-msgid "lpinfo: Unknown argument \"%s\"."
-msgstr ""
-
-#: systemv/lpinfo.c:259
-#, c-format
-msgid "lpinfo: Unknown option \"%c\"."
-msgstr ""
-
-#: systemv/lpinfo.c:252
-#, c-format
-msgid "lpinfo: Unknown option \"%s\"."
-msgstr ""
-
 #: systemv/lpmove.c:133
 #, c-format
 msgid "lpmove: Unable to connect to server: %s"
 msgstr ""
 
-#: systemv/lpmove.c:119
+#: systemv/lpmove.c:118
 #, c-format
 msgid "lpmove: Unknown argument \"%s\"."
 msgstr ""
 
-#: systemv/lpmove.c:97
-#, c-format
-msgid "lpmove: Unknown option \"%c\"."
-msgstr ""
-
-#: systemv/lpoptions.c:143 systemv/lpoptions.c:161 systemv/lpoptions.c:237
+#: systemv/lpoptions.c:150 systemv/lpoptions.c:168 systemv/lpoptions.c:247
 msgid "lpoptions: No printers."
 msgstr ""
 
-#: systemv/lpoptions.c:212
+#: systemv/lpoptions.c:224
 #, c-format
 msgid "lpoptions: Unable to add printer or instance: %s"
 msgstr ""
 
-#: systemv/lpoptions.c:507
+#: systemv/lpoptions.c:491
 #, c-format
 msgid "lpoptions: Unable to get PPD file for %s: %s"
 msgstr ""
 
-#: systemv/lpoptions.c:515
+#: systemv/lpoptions.c:499
 #, c-format
 msgid "lpoptions: Unable to open PPD file for %s."
 msgstr ""
 
-#: systemv/lpoptions.c:92
+#: systemv/lpoptions.c:96
 msgid "lpoptions: Unknown printer or class."
 msgstr ""
 
-#: systemv/lppasswd.c:173
-msgid "lppasswd: Only root can add or delete passwords."
-msgstr ""
-
-#: systemv/lppasswd.c:302
-msgid "lppasswd: Password file busy."
-msgstr ""
-
-#: systemv/lppasswd.c:431
-msgid "lppasswd: Password file not updated."
-msgstr ""
-
-#: systemv/lppasswd.c:398
-msgid "lppasswd: Sorry, password doesn't match."
-msgstr ""
-
-#: systemv/lppasswd.c:253
-msgid "lppasswd: Sorry, password rejected."
-msgstr ""
-
-#: systemv/lppasswd.c:230
-msgid "lppasswd: Sorry, passwords don't match."
-msgstr ""
-
-#: systemv/lppasswd.c:199 systemv/lppasswd.c:218
-#, c-format
-msgid "lppasswd: Unable to copy password string: %s"
-msgstr ""
-
-#: systemv/lppasswd.c:304 systemv/lppasswd.c:312 systemv/lppasswd.c:329
-#, c-format
-msgid "lppasswd: Unable to open password file: %s"
-msgstr ""
-
-#: systemv/lppasswd.c:364 systemv/lppasswd.c:377 systemv/lppasswd.c:408
-#, c-format
-msgid "lppasswd: Unable to write to password file: %s"
-msgstr ""
-
-#: systemv/lppasswd.c:446
-#, c-format
-msgid "lppasswd: failed to backup old password file: %s"
-msgstr ""
-
-#: systemv/lppasswd.c:458
-#, c-format
-msgid "lppasswd: failed to rename password file: %s"
-msgstr ""
-
-#: systemv/lppasswd.c:389
-#, c-format
-msgid "lppasswd: user \"%s\" and group \"%s\" do not exist."
-msgstr ""
-
-#: systemv/lpstat.c:1076
+#: systemv/lpstat.c:1072
 #, c-format
 msgid "lpstat: error - %s environment variable names non-existent destination \"%s\"."
 msgstr ""
 
-#: systemv/lpstat.c:1012
+#: systemv/lpstat.c:1008
 #, c-format
 msgid "members of class %s:"
 msgstr ""
 
-#: berkeley/lpq.c:549
+#: berkeley/lpq.c:558
 msgid "no entries"
 msgstr ""
 
-#: systemv/lpstat.c:1080
+#: systemv/lpstat.c:1076
 msgid "no system default destination"
 msgstr ""
 
-#: scheduler/ipp.c:5501
+#: scheduler/ipp.c:5853
 msgid "notify-events not specified."
 msgstr ""
 
-#: scheduler/ipp.c:2024 scheduler/ipp.c:5406
+#: scheduler/ipp.c:2049 scheduler/ipp.c:5758
 #, c-format
 msgid "notify-recipient-uri URI \"%s\" is already used."
 msgstr ""
 
-#: scheduler/ipp.c:2014 scheduler/ipp.c:5396
+#: scheduler/ipp.c:2039 scheduler/ipp.c:5748
 #, c-format
 msgid "notify-recipient-uri URI \"%s\" uses unknown scheme."
 msgstr ""
 
-#: cups/notify.c:87
+#: cups/notify.c:79
 msgid "pending"
 msgstr ""
 
-#: ppdc/ppdc.cxx:113 ppdc/ppdpo.cxx:93
+#: ppdc/ppdc.cxx:106 ppdc/ppdpo.cxx:85
 #, c-format
 msgid "ppdc: Adding include directory \"%s\"."
 msgstr ""
 
-#: ppdc/ppdpo.cxx:134
+#: ppdc/ppdpo.cxx:128
 #, c-format
 msgid "ppdc: Adding/updating UI text from %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:367
+#: ppdc/ppdc-source.cxx:365
 #, c-format
 msgid "ppdc: Bad boolean value (%s) on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-import.cxx:264
+#: ppdc/ppdc-import.cxx:257
 #, c-format
 msgid "ppdc: Bad font attribute: %s"
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1753
+#: ppdc/ppdc-source.cxx:1751
 #, c-format
 msgid "ppdc: Bad resolution name \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1070
+#: ppdc/ppdc-source.cxx:1068
 #, c-format
 msgid "ppdc: Bad status keyword %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1990
+#: ppdc/ppdc-source.cxx:1988
 #, c-format
 msgid "ppdc: Bad variable substitution ($%c) on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2675
+#: ppdc/ppdc-source.cxx:2673
 #, c-format
 msgid "ppdc: Choice found on line %d of %s with no Option."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1655
+#: ppdc/ppdc-source.cxx:1653
 #, c-format
 msgid "ppdc: Duplicate #po for locale %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:889
+#: ppdc/ppdc-source.cxx:887
 #, c-format
 msgid "ppdc: Expected a filter definition on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:912
+#: ppdc/ppdc-source.cxx:910
 #, c-format
 msgid "ppdc: Expected a program name on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:351
+#: ppdc/ppdc-source.cxx:349
 #, c-format
 msgid "ppdc: Expected boolean value on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1050
+#: ppdc/ppdc-source.cxx:1048
 #, c-format
 msgid "ppdc: Expected charset after Font on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:404
+#: ppdc/ppdc-source.cxx:402
 #, c-format
 msgid "ppdc: Expected choice code on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:392
+#: ppdc/ppdc-source.cxx:390
 #, c-format
 msgid "ppdc: Expected choice name/text on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:460
+#: ppdc/ppdc-source.cxx:458
 #, c-format
 msgid "ppdc: Expected color order for ColorModel on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:449
+#: ppdc/ppdc-source.cxx:447
 #, c-format
 msgid "ppdc: Expected colorspace for ColorModel on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:471
+#: ppdc/ppdc-source.cxx:469
 #, c-format
 msgid "ppdc: Expected compression for ColorModel on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:652
+#: ppdc/ppdc-source.cxx:650
 #, c-format
 msgid "ppdc: Expected constraints string for UIConstraints on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2861
+#: ppdc/ppdc-source.cxx:2859
 #, c-format
 msgid "ppdc: Expected driver type keyword following DriverType on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:783
+#: ppdc/ppdc-source.cxx:781
 #, c-format
 msgid "ppdc: Expected duplex type after Duplex on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1034
+#: ppdc/ppdc-source.cxx:1032
 #, c-format
 msgid "ppdc: Expected encoding after Font on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1646
+#: ppdc/ppdc-source.cxx:1644
 #, c-format
 msgid "ppdc: Expected filename after #po %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1162
+#: ppdc/ppdc-source.cxx:1160
 #, c-format
 msgid "ppdc: Expected group name/text on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2575
+#: ppdc/ppdc-source.cxx:2573
 #, c-format
 msgid "ppdc: Expected include filename on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1459
+#: ppdc/ppdc-source.cxx:1457
 #, c-format
 msgid "ppdc: Expected integer on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1638
+#: ppdc/ppdc-source.cxx:1636
 #, c-format
 msgid "ppdc: Expected locale after #po on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:310
+#: ppdc/ppdc-source.cxx:308
 #, c-format
 msgid "ppdc: Expected name after %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3233
+#: ppdc/ppdc-source.cxx:3231
 #, c-format
 msgid "ppdc: Expected name after FileName on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1015
+#: ppdc/ppdc-source.cxx:1013
 #, c-format
 msgid "ppdc: Expected name after Font on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3064
+#: ppdc/ppdc-source.cxx:3062
 #, c-format
 msgid "ppdc: Expected name after Manufacturer on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3097
+#: ppdc/ppdc-source.cxx:3095
 #, c-format
 msgid "ppdc: Expected name after MediaSize on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3187
+#: ppdc/ppdc-source.cxx:3185
 #, c-format
 msgid "ppdc: Expected name after ModelName on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3250
+#: ppdc/ppdc-source.cxx:3248
 #, c-format
 msgid "ppdc: Expected name after PCFileName on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1113
+#: ppdc/ppdc-source.cxx:1111
 #, c-format
 msgid "ppdc: Expected name/text after %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1202
+#: ppdc/ppdc-source.cxx:1200
 #, c-format
 msgid "ppdc: Expected name/text after Installable on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1739
+#: ppdc/ppdc-source.cxx:1737
 #, c-format
 msgid "ppdc: Expected name/text after Resolution on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:436
+#: ppdc/ppdc-source.cxx:434
 #, c-format
 msgid "ppdc: Expected name/text combination for ColorModel on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1531
+#: ppdc/ppdc-source.cxx:1529
 #, c-format
 msgid "ppdc: Expected option name/text on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1565
+#: ppdc/ppdc-source.cxx:1563
 #, c-format
 msgid "ppdc: Expected option section on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1543
+#: ppdc/ppdc-source.cxx:1541
 #, c-format
 msgid "ppdc: Expected option type on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1722
+#: ppdc/ppdc-source.cxx:1720
 #, c-format
 msgid "ppdc: Expected override field after Resolution on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-catalog.cxx:328 ppdc/ppdc-catalog.cxx:340
+#: ppdc/ppdc-catalog.cxx:389 ppdc/ppdc-catalog.cxx:401
 #, c-format
 msgid "ppdc: Expected quoted string on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:961
+#: ppdc/ppdc-source.cxx:959
 #, c-format
 msgid "ppdc: Expected real number on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:529
+#: ppdc/ppdc-source.cxx:527
 #, c-format
 msgid "ppdc: Expected resolution/mediatype following ColorProfile on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1820
+#: ppdc/ppdc-source.cxx:1818
 #, c-format
 msgid "ppdc: Expected resolution/mediatype following SimpleColorProfile on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:318
+#: ppdc/ppdc-source.cxx:316
 #, c-format
 msgid "ppdc: Expected selector after %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1058
+#: ppdc/ppdc-source.cxx:1056
 #, c-format
 msgid "ppdc: Expected status after Font on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2750
+#: ppdc/ppdc-source.cxx:2748
 #, c-format
 msgid "ppdc: Expected string after Copyright on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3353
+#: ppdc/ppdc-source.cxx:3351
 #, c-format
 msgid "ppdc: Expected string after Version on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:685
+#: ppdc/ppdc-source.cxx:683
 #, c-format
 msgid "ppdc: Expected two option names on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:329
+#: ppdc/ppdc-source.cxx:327
 #, c-format
 msgid "ppdc: Expected value after %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1042
+#: ppdc/ppdc-source.cxx:1040
 #, c-format
 msgid "ppdc: Expected version after Font on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:184
+#: ppdc/ppdc-source.cxx:182
 #, c-format
 msgid "ppdc: Invalid #include/#po filename \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:929
+#: ppdc/ppdc-source.cxx:927
 #, c-format
 msgid "ppdc: Invalid cost for filter on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:921
+#: ppdc/ppdc-source.cxx:919
 #, c-format
 msgid "ppdc: Invalid empty MIME type for filter on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:937
+#: ppdc/ppdc-source.cxx:935
 #, c-format
 msgid "ppdc: Invalid empty program name for filter on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1585
+#: ppdc/ppdc-source.cxx:1583
 #, c-format
 msgid "ppdc: Invalid option section \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1557
+#: ppdc/ppdc-source.cxx:1555
 #, c-format
 msgid "ppdc: Invalid option type \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc.cxx:251 ppdc/ppdpo.cxx:123
+#: ppdc/ppdc.cxx:244 ppdc/ppdpo.cxx:115
 #, c-format
 msgid "ppdc: Loading driver information file \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc.cxx:187
+#: ppdc/ppdc.cxx:180
 #, c-format
 msgid "ppdc: Loading messages for locale \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc.cxx:126
+#: ppdc/ppdc.cxx:119
 #, c-format
 msgid "ppdc: Loading messages from \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2368 ppdc/ppdc-source.cxx:2600
+#: ppdc/ppdc-source.cxx:2366 ppdc/ppdc-source.cxx:2598
 #, c-format
 msgid "ppdc: Missing #endif at end of \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2469 ppdc/ppdc-source.cxx:2504
-#: ppdc/ppdc-source.cxx:2534
+#: ppdc/ppdc-source.cxx:2467 ppdc/ppdc-source.cxx:2502
+#: ppdc/ppdc-source.cxx:2532
 #, c-format
 msgid "ppdc: Missing #if on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-catalog.cxx:405
+#: ppdc/ppdc-catalog.cxx:466
 #, c-format
 msgid "ppdc: Need a msgid line before any translation strings on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-driver.cxx:712
+#: ppdc/ppdc-driver.cxx:710
 #, c-format
 msgid "ppdc: No message catalog provided for locale %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1608 ppdc/ppdc-source.cxx:2838
-#: ppdc/ppdc-source.cxx:2924 ppdc/ppdc-source.cxx:3017
-#: ppdc/ppdc-source.cxx:3150 ppdc/ppdc-source.cxx:3283
+#: 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
 #, c-format
 msgid "ppdc: Option %s defined in two different groups on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1601
+#: ppdc/ppdc-source.cxx:1599
 #, c-format
 msgid "ppdc: Option %s redefined with a different type on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:662
+#: ppdc/ppdc-source.cxx:660
 #, c-format
 msgid "ppdc: Option constraint must *name on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2451
+#: ppdc/ppdc-source.cxx:2449
 #, c-format
 msgid "ppdc: Too many nested #if's on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc.cxx:374
+#: ppdc/ppdc.cxx:367
 #, c-format
 msgid "ppdc: Unable to create PPD file \"%s\" - %s."
 msgstr ""
 
-#: ppdc/ppdc.cxx:266
+#: ppdc/ppdc.cxx:259
 #, c-format
 msgid "ppdc: Unable to create output directory %s: %s"
 msgstr ""
 
-#: ppdc/ppdc.cxx:287
+#: ppdc/ppdc.cxx:280
 #, c-format
 msgid "ppdc: Unable to create output pipes: %s"
 msgstr ""
 
-#: ppdc/ppdc.cxx:303 ppdc/ppdc.cxx:309
+#: ppdc/ppdc.cxx:296 ppdc/ppdc.cxx:302
 #, c-format
 msgid "ppdc: Unable to execute cupstestppd: %s"
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1687
+#: ppdc/ppdc-source.cxx:1685
 #, c-format
 msgid "ppdc: Unable to find #po file %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2607
+#: ppdc/ppdc-source.cxx:2605
 #, c-format
 msgid "ppdc: Unable to find include file \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc.cxx:198
+#: ppdc/ppdc.cxx:191
 #, c-format
 msgid "ppdc: Unable to find localization for \"%s\" - %s"
 msgstr ""
 
-#: ppdc/ppdc.cxx:135
+#: ppdc/ppdc.cxx:128
 #, c-format
 msgid "ppdc: Unable to load localization file \"%s\" - %s"
 msgstr ""
 
-#: ppdc/ppdc-file.cxx:50
+#: ppdc/ppdc-file.cxx:41
 #, c-format
 msgid "ppdc: Unable to open %s: %s"
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2011
+#: ppdc/ppdc-source.cxx:2009
 #, c-format
 msgid "ppdc: Undefined variable (%s) on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-catalog.cxx:422
+#: ppdc/ppdc-catalog.cxx:483
 #, c-format
 msgid "ppdc: Unexpected text on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2880
+#: ppdc/ppdc-source.cxx:2878
 #, c-format
 msgid "ppdc: Unknown driver type %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:863
+#: ppdc/ppdc-source.cxx:861
 #, c-format
 msgid "ppdc: Unknown duplex type \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3110
+#: ppdc/ppdc-source.cxx:3108
 #, c-format
 msgid "ppdc: Unknown media size \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-catalog.cxx:450
+#: ppdc/ppdc-catalog.cxx:511
 #, c-format
 msgid "ppdc: Unknown message catalog format for \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3364
+#: ppdc/ppdc-source.cxx:3362
 #, c-format
 msgid "ppdc: Unknown token \"%s\" seen on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:971
+#: ppdc/ppdc-source.cxx:969
 #, c-format
 msgid "ppdc: Unknown trailing characters in real number \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2121
+#: ppdc/ppdc-source.cxx:2119
 #, c-format
 msgid "ppdc: Unterminated string starting with %c on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc.cxx:365
+#: ppdc/ppdc.cxx:358
 #, c-format
 msgid "ppdc: Warning - overlapping filename \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc.cxx:380
+#: ppdc/ppdc.cxx:373
 #, c-format
 msgid "ppdc: Writing %s."
 msgstr ""
 
-#: ppdc/ppdc.cxx:148
+#: ppdc/ppdc.cxx:141
 #, c-format
 msgid "ppdc: Writing PPD files to directory \"%s\"."
 msgstr ""
 
-#: ppdc/ppdmerge.cxx:130
+#: ppdc/ppdmerge.cxx:128
 #, c-format
 msgid "ppdmerge: Bad LanguageVersion \"%s\" in %s."
 msgstr ""
 
-#: ppdc/ppdmerge.cxx:170
+#: ppdc/ppdmerge.cxx:168
 #, c-format
 msgid "ppdmerge: Ignoring PPD file %s."
 msgstr ""
 
-#: ppdc/ppdmerge.cxx:154
+#: ppdc/ppdmerge.cxx:152
 #, c-format
 msgid "ppdmerge: Unable to backup %s to %s - %s"
 msgstr ""
 
-#: systemv/lpstat.c:1797
+#: systemv/lpstat.c:1775
 #, c-format
 msgid "printer %s disabled since %s -"
 msgstr ""
 
-#: systemv/lpstat.c:1786
+#: systemv/lpstat.c:1764
 #, c-format
 msgid "printer %s is idle.  enabled since %s"
 msgstr ""
 
-#: systemv/lpstat.c:1791
+#: systemv/lpstat.c:1769
 #, c-format
 msgid "printer %s now printing %s-%d.  enabled since %s"
 msgstr ""
 
-#: systemv/lpstat.c:1920
+#: systemv/lpstat.c:1894
 #, c-format
 msgid "printer %s/%s disabled since %s -"
 msgstr ""
 
-#: systemv/lpstat.c:1906
+#: systemv/lpstat.c:1880
 #, c-format
 msgid "printer %s/%s is idle.  enabled since %s"
 msgstr ""
 
-#: systemv/lpstat.c:1913
+#: systemv/lpstat.c:1887
 #, c-format
 msgid "printer %s/%s now printing %s-%d.  enabled since %s"
 msgstr ""
 
-#: cups/notify.c:93 cups/notify.c:134
+#: cups/notify.c:85 cups/notify.c:126
 msgid "processing"
 msgstr ""
 
-#: systemv/lp.c:662
+#: systemv/lp.c:666
 #, c-format
 msgid "request id is %s-%d (%d file(s))"
 msgstr ""
 
-#: cups/snmp.c:972
+#: cups/snmp.c:970
 msgid "request-id uses indefinite length"
 msgstr ""
 
-#: systemv/lpstat.c:2052
+#: systemv/lpstat.c:2022
 msgid "scheduler is not running"
 msgstr ""
 
-#: systemv/lpstat.c:2048
+#: systemv/lpstat.c:2018
 msgid "scheduler is running"
 msgstr ""
 
-#: cups/adminutil.c:2148
+#: cups/adminutil.c:2207
 #, c-format
 msgid "stat of %s failed: %s"
 msgstr ""
 
-#: berkeley/lpc.c:203
+#: berkeley/lpc.c:201
 msgid "status\t\tShow status of daemon and queue."
 msgstr ""
 
-#: cups/notify.c:96 cups/notify.c:137
+#: cups/notify.c:88 cups/notify.c:129
 msgid "stopped"
 msgstr ""
 
-#: systemv/lpstat.c:1054
+#: systemv/lpstat.c:1050
 #, c-format
 msgid "system default destination: %s"
 msgstr ""
 
-#: systemv/lpstat.c:1051
+#: systemv/lpstat.c:1047
 #, c-format
 msgid "system default destination: %s/%s"
 msgstr ""
 
-#: cups/notify.c:108 cups/notify.c:140
+#: cups/notify.c:100 cups/notify.c:132
 msgid "unknown"
 msgstr ""
 
-#: cups/notify.c:117
+#: cups/notify.c:109
 msgid "untitled"
 msgstr ""
 
-#: cups/snmp.c:997
+#: cups/snmp.c:995
 msgid "variable-bindings uses indefinite length"
 msgstr ""