Add localized error message for failed TLS negotiation.

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

diff --git a/locale/cups.pot b/locale/cups.pot
index 80871068d37d33b565186237cd437905f2aa850b..070cad210242372c2f0ade7493eb467a742db854 100644 (file)
--- a/locale/cups.pot
+++ b/locale/cups.pot
@@ -1,16 +1,16 @@
 #
 # "$Id$"
 #
-#   Message catalog template for CUPS.
+# Message catalog template for CUPS.
 #
-#   Copyright 2007-2010 by Apple Inc.
-#   Copyright 2005-2007 by Easy Software Products.
+# Copyright 2007-2014 by Apple Inc.
+# Copyright 2005-2007 by Easy Software Products.
 #
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file.  If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 #
@@ -28,9 +28,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: CUPS 1.5\n"
+"Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2011-04-22 10:53-0700\n"
+"POT-Creation-Date: 2014-05-09 14:24-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,363 +39,363 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: systemv/lpstat.c:1873 systemv/lpstat.c:1998
+#: systemv/lpstat.c:1887 systemv/lpstat.c:2010
 msgid "\t\t(all)"
 msgstr ""
 
-#: systemv/lpstat.c:1876 systemv/lpstat.c:1879 systemv/lpstat.c:2001
-#: systemv/lpstat.c:2004
+#: systemv/lpstat.c:1890 systemv/lpstat.c:1893 systemv/lpstat.c:2013
+#: systemv/lpstat.c:2016
 msgid "\t\t(none)"
 msgstr ""
 
-#: berkeley/lpc.c:433
+#: berkeley/lpc.c:426
 #, c-format
 msgid "\t%d entries"
 msgstr ""
 
-#: systemv/lpstat.c:753 systemv/lpstat.c:769
+#: systemv/lpstat.c:785 systemv/lpstat.c:801
 #, c-format
 msgid "\t%s"
 msgstr ""
 
-#: systemv/lpstat.c:1854 systemv/lpstat.c:1979
+#: systemv/lpstat.c:1868 systemv/lpstat.c:1991
 msgid "\tAfter fault: continue"
 msgstr ""
 
-#: systemv/lpstat.c:1478 systemv/lpstat.c:1823 systemv/lpstat.c:1949
+#: systemv/lpstat.c:1488 systemv/lpstat.c:1837 systemv/lpstat.c:1961
 #, c-format
 msgid "\tAlerts: %s"
 msgstr ""
 
-#: systemv/lpstat.c:1877 systemv/lpstat.c:2002
+#: systemv/lpstat.c:1891 systemv/lpstat.c:2014
 msgid "\tBanner required"
 msgstr ""
 
-#: systemv/lpstat.c:1878 systemv/lpstat.c:2003
+#: systemv/lpstat.c:1892 systemv/lpstat.c:2015
 msgid "\tCharset sets:"
 msgstr ""
 
-#: systemv/lpstat.c:1842 systemv/lpstat.c:1967
+#: systemv/lpstat.c:1856 systemv/lpstat.c:1979
 msgid "\tConnection: direct"
 msgstr ""
 
-#: systemv/lpstat.c:1833 systemv/lpstat.c:1959
+#: systemv/lpstat.c:1847 systemv/lpstat.c:1971
 msgid "\tConnection: remote"
 msgstr ""
 
-#: systemv/lpstat.c:1797 systemv/lpstat.c:1923
+#: systemv/lpstat.c:1813 systemv/lpstat.c:1937
 msgid "\tContent types: any"
 msgstr ""
 
-#: systemv/lpstat.c:1881 systemv/lpstat.c:2006
+#: systemv/lpstat.c:1895 systemv/lpstat.c:2018
 msgid "\tDefault page size:"
 msgstr ""
 
-#: systemv/lpstat.c:1880 systemv/lpstat.c:2005
+#: systemv/lpstat.c:1894 systemv/lpstat.c:2017
 msgid "\tDefault pitch:"
 msgstr ""
 
-#: systemv/lpstat.c:1882 systemv/lpstat.c:2007
+#: systemv/lpstat.c:1896 systemv/lpstat.c:2019
 msgid "\tDefault port settings:"
 msgstr ""
 
-#: systemv/lpstat.c:1803 systemv/lpstat.c:1929
+#: systemv/lpstat.c:1819 systemv/lpstat.c:1943
 #, c-format
 msgid "\tDescription: %s"
 msgstr ""
 
-#: systemv/lpstat.c:1796 systemv/lpstat.c:1922
+#: systemv/lpstat.c:1812 systemv/lpstat.c:1936
 msgid "\tForm mounted:"
 msgstr ""
 
-#: systemv/lpstat.c:1875 systemv/lpstat.c:2000
+#: systemv/lpstat.c:1889 systemv/lpstat.c:2012
 msgid "\tForms allowed:"
 msgstr ""
 
-#: systemv/lpstat.c:1837 systemv/lpstat.c:1963
+#: systemv/lpstat.c:1851 systemv/lpstat.c:1975
 #, c-format
 msgid "\tInterface: %s.ppd"
 msgstr ""
 
-#: systemv/lpstat.c:1846 systemv/lpstat.c:1971
+#: systemv/lpstat.c:1860 systemv/lpstat.c:1983
 #, c-format
 msgid "\tInterface: %s/interfaces/%s"
 msgstr ""
 
-#: systemv/lpstat.c:1850 systemv/lpstat.c:1975
+#: systemv/lpstat.c:1864 systemv/lpstat.c:1987
 #, c-format
 msgid "\tInterface: %s/ppd/%s.ppd"
 msgstr ""
 
-#: systemv/lpstat.c:1828 systemv/lpstat.c:1954
+#: systemv/lpstat.c:1842 systemv/lpstat.c:1966
 #, c-format
 msgid "\tLocation: %s"
 msgstr ""
 
-#: systemv/lpstat.c:1853 systemv/lpstat.c:1978
+#: systemv/lpstat.c:1867 systemv/lpstat.c:1990
 msgid "\tOn fault: no alert"
 msgstr ""
 
-#: systemv/lpstat.c:1798 systemv/lpstat.c:1924
+#: systemv/lpstat.c:1814 systemv/lpstat.c:1938
 msgid "\tPrinter types: unknown"
 msgstr ""
 
-#: systemv/lpstat.c:1459
+#: systemv/lpstat.c:1471
 #, c-format
 msgid "\tStatus: %s"
 msgstr ""
 
-#: systemv/lpstat.c:1858 systemv/lpstat.c:1872 systemv/lpstat.c:1983
-#: systemv/lpstat.c:1997
+#: systemv/lpstat.c:1872 systemv/lpstat.c:1886 systemv/lpstat.c:1995
+#: systemv/lpstat.c:2009
 msgid "\tUsers allowed:"
 msgstr ""
 
-#: systemv/lpstat.c:1865 systemv/lpstat.c:1990
+#: systemv/lpstat.c:1879 systemv/lpstat.c:2002
 msgid "\tUsers denied:"
 msgstr ""
 
-#: berkeley/lpc.c:435
+#: berkeley/lpc.c:428
 msgid "\tdaemon present"
 msgstr ""
 
-#: berkeley/lpc.c:431
+#: berkeley/lpc.c:424
 msgid "\tno entries"
 msgstr ""
 
-#: berkeley/lpc.c:403 berkeley/lpc.c:415
+#: berkeley/lpc.c:396 berkeley/lpc.c:408
 #, c-format
 msgid "\tprinter is on device '%s' speed -1"
 msgstr ""
 
-#: berkeley/lpc.c:428
+#: berkeley/lpc.c:421
 msgid "\tprinting is disabled"
 msgstr ""
 
-#: berkeley/lpc.c:426
+#: berkeley/lpc.c:419
 msgid "\tprinting is enabled"
 msgstr ""
 
-#: systemv/lpstat.c:1481
+#: systemv/lpstat.c:1491
 #, c-format
 msgid "\tqueued for %s"
 msgstr ""
 
-#: berkeley/lpc.c:423
+#: berkeley/lpc.c:416
 msgid "\tqueuing is disabled"
 msgstr ""
 
-#: berkeley/lpc.c:421
+#: berkeley/lpc.c:414
 msgid "\tqueuing is enabled"
 msgstr ""
 
-#: systemv/lpstat.c:1789 systemv/lpstat.c:1915
+#: systemv/lpstat.c:1805 systemv/lpstat.c:1929
 msgid "\treason unknown"
 msgstr ""
 
-#: systemv/cupstestppd.c:436
+#: systemv/cupstestppd.c:454
 msgid ""
 "\n"
 "    DETAILED CONFORMANCE TEST RESULTS"
 msgstr ""
 
-#: systemv/cupstestppd.c:3619
+#: systemv/cupstestppd.c:3820
 msgid "                          Ignore specific warnings."
 msgstr ""
 
-#: systemv/cupstestppd.c:3623
+#: systemv/cupstestppd.c:3824
 msgid "                          Issue warnings instead of errors."
 msgstr ""
 
-#: systemv/cupstestppd.c:392 systemv/cupstestppd.c:397
+#: systemv/cupstestppd.c:410 systemv/cupstestppd.c:415
 msgid "                REF: Page 15, section 3.1."
 msgstr ""
 
-#: systemv/cupstestppd.c:387
+#: systemv/cupstestppd.c:405
 msgid "                REF: Page 15, section 3.2."
 msgstr ""
 
-#: systemv/cupstestppd.c:407
+#: systemv/cupstestppd.c:425
 msgid "                REF: Page 19, section 3.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:360
+#: systemv/cupstestppd.c:378
 msgid "                REF: Page 20, section 3.4."
 msgstr ""
 
-#: systemv/cupstestppd.c:412
+#: systemv/cupstestppd.c:430
 msgid "                REF: Page 27, section 3.5."
 msgstr ""
 
-#: systemv/cupstestppd.c:355
+#: systemv/cupstestppd.c:373
 msgid "                REF: Page 42, section 5.2."
 msgstr ""
 
-#: systemv/cupstestppd.c:402
+#: systemv/cupstestppd.c:420
 msgid "                REF: Pages 16-17, section 3.2."
 msgstr ""
 
-#: systemv/cupstestppd.c:372
+#: systemv/cupstestppd.c:390
 msgid "                REF: Pages 42-45, section 5.2."
 msgstr ""
 
-#: systemv/cupstestppd.c:366
+#: systemv/cupstestppd.c:384
 msgid "                REF: Pages 45-46, section 5.2."
 msgstr ""
 
-#: systemv/cupstestppd.c:377
+#: systemv/cupstestppd.c:395
 msgid "                REF: Pages 48-49, section 5.2."
 msgstr ""
 
-#: systemv/cupstestppd.c:382
+#: systemv/cupstestppd.c:400
 msgid "                REF: Pages 52-54, section 5.2."
 msgstr ""
 
-#: berkeley/lpq.c:553
+#: berkeley/lpq.c:528
 #, c-format
 msgid "        %-39.39s %.0f bytes"
 msgstr ""
 
-#: systemv/cupstestppd.c:555
+#: systemv/cupstestppd.c:589
 #, c-format
 msgid "        PASS    Default%s"
 msgstr ""
 
-#: systemv/cupstestppd.c:490
+#: systemv/cupstestppd.c:524
 msgid "        PASS    DefaultImageableArea"
 msgstr ""
 
-#: systemv/cupstestppd.c:524
+#: systemv/cupstestppd.c:558
 msgid "        PASS    DefaultPaperDimension"
 msgstr ""
 
-#: systemv/cupstestppd.c:597
+#: systemv/cupstestppd.c:631
 msgid "        PASS    FileVersion"
 msgstr ""
 
-#: systemv/cupstestppd.c:641
+#: systemv/cupstestppd.c:675
 msgid "        PASS    FormatVersion"
 msgstr ""
 
-#: systemv/cupstestppd.c:661
+#: systemv/cupstestppd.c:695
 msgid "        PASS    LanguageEncoding"
 msgstr ""
 
-#: systemv/cupstestppd.c:681
+#: systemv/cupstestppd.c:715
 msgid "        PASS    LanguageVersion"
 msgstr ""
 
-#: systemv/cupstestppd.c:733
+#: systemv/cupstestppd.c:769
 msgid "        PASS    Manufacturer"
 msgstr ""
 
-#: systemv/cupstestppd.c:773
+#: systemv/cupstestppd.c:809
 msgid "        PASS    ModelName"
 msgstr ""
 
-#: systemv/cupstestppd.c:793
+#: systemv/cupstestppd.c:829
 msgid "        PASS    NickName"
 msgstr ""
 
-#: systemv/cupstestppd.c:853
+#: systemv/cupstestppd.c:889
 msgid "        PASS    PCFileName"
 msgstr ""
 
-#: systemv/cupstestppd.c:928
+#: systemv/cupstestppd.c:964
 msgid "        PASS    PSVersion"
 msgstr ""
 
-#: systemv/cupstestppd.c:833
+#: systemv/cupstestppd.c:869
 msgid "        PASS    PageRegion"
 msgstr ""
 
-#: systemv/cupstestppd.c:813
+#: systemv/cupstestppd.c:849
 msgid "        PASS    PageSize"
 msgstr ""
 
-#: systemv/cupstestppd.c:888
+#: systemv/cupstestppd.c:924
 msgid "        PASS    Product"
 msgstr ""
 
-#: systemv/cupstestppd.c:963
+#: systemv/cupstestppd.c:999
 msgid "        PASS    ShortNickName"
 msgstr ""
 
-#: systemv/cupstestppd.c:1338
+#: systemv/cupstestppd.c:1374
 #, c-format
 msgid "        WARN    %s has no corresponding options."
 msgstr ""
 
-#: systemv/cupstestppd.c:1450
+#: systemv/cupstestppd.c:1486
 #, c-format
 msgid ""
 "        WARN    %s shares a common prefix with %s\n"
 "                REF: Page 15, section 3.2."
 msgstr ""
 
-#: systemv/cupstestppd.c:1309
+#: systemv/cupstestppd.c:1345
 #, c-format
 msgid ""
 "        WARN    Duplex option keyword %s may not work as expected and should be named Duplex.\n"
 "                REF: Page 122, section 5.17"
 msgstr ""
 
-#: systemv/cupstestppd.c:1708
+#: systemv/cupstestppd.c:1744
 msgid "        WARN    File contains a mix of CR, LF, and CR LF line endings."
 msgstr ""
 
-#: systemv/cupstestppd.c:1354
+#: systemv/cupstestppd.c:1390
 msgid ""
 "        WARN    LanguageEncoding required by PPD 4.3 spec.\n"
 "                REF: Pages 56-57, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1690
+#: systemv/cupstestppd.c:1726
 #, c-format
 msgid "        WARN    Line %d only contains whitespace."
 msgstr ""
 
-#: systemv/cupstestppd.c:1362
+#: systemv/cupstestppd.c:1398
 msgid ""
 "        WARN    Manufacturer required by PPD 4.3 spec.\n"
 "                REF: Pages 58-59, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1713
+#: systemv/cupstestppd.c:1749
 msgid "        WARN    Non-Windows PPD files should use lines ending with only LF, not CR LF."
 msgstr ""
 
-#: systemv/cupstestppd.c:1346
+#: systemv/cupstestppd.c:1382
 #, c-format
 msgid ""
 "        WARN    Obsolete PPD version %.1f.\n"
 "                REF: Page 42, section 5.2."
 msgstr ""
 
-#: systemv/cupstestppd.c:1377
+#: systemv/cupstestppd.c:1413
 msgid ""
 "        WARN    PCFileName longer than 8.3 in violation of PPD spec.\n"
 "                REF: Pages 61-62, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1385
+#: systemv/cupstestppd.c:1421
 msgid ""
 "        WARN    PCFileName should contain a unique filename.\n"
 "                REF: Pages 61-62, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1420
+#: systemv/cupstestppd.c:1456
 msgid ""
 "        WARN    Protocols contains PJL but JCL attributes are not set.\n"
 "                REF: Pages 78-79, section 5.7."
 msgstr ""
 
-#: systemv/cupstestppd.c:1411
+#: systemv/cupstestppd.c:1447
 msgid ""
 "        WARN    Protocols contains both PJL and BCP; expected TBCP.\n"
 "                REF: Pages 78-79, section 5.7."
 msgstr ""
 
-#: systemv/cupstestppd.c:1394
+#: systemv/cupstestppd.c:1430
 msgid ""
 "        WARN    ShortNickName required by PPD 4.3 spec.\n"
 "                REF: Pages 64-65, section 5.3."
@@ -409,373 +409,376 @@ msgstr ""
 msgid "       cupstestdsc [options] -"
 msgstr ""
 
-#: systemv/cupstestppd.c:3614
+#: systemv/cupstestppd.c:3815
 msgid "       program | cupstestppd [options] -"
 msgstr ""
 
-#: systemv/cupstestppd.c:3546
+#: systemv/cupstestppd.c:3747
 #, c-format
 msgid ""
 "      %s  \"%s %s\" conflicts with \"%s %s\"\n"
 "                (constraint=\"%s %s %s %s\")."
 msgstr ""
 
-#: systemv/cupstestppd.c:2212
+#: systemv/cupstestppd.c:2248
 #, c-format
 msgid "      %s  %s %s does not exist."
 msgstr ""
 
-#: systemv/cupstestppd.c:3703
+#: systemv/cupstestppd.c:3904
 #, c-format
 msgid "      %s  %s file \"%s\" has the wrong capitalization."
 msgstr ""
 
-#: systemv/cupstestppd.c:2282
+#: systemv/cupstestppd.c:2318
 #, c-format
 msgid ""
 "      %s  Bad %s choice %s.\n"
 "                REF: Page 122, section 5.17"
 msgstr ""
 
-#: systemv/cupstestppd.c:3306 systemv/cupstestppd.c:3355
-#: systemv/cupstestppd.c:3394
+#: systemv/cupstestppd.c:3507 systemv/cupstestppd.c:3556
+#: systemv/cupstestppd.c:3595
 #, c-format
 msgid "      %s  Bad UTF-8 \"%s\" translation string for option %s, choice %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:3260
+#: systemv/cupstestppd.c:3461
 #, c-format
 msgid "      %s  Bad UTF-8 \"%s\" translation string for option %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:2335
+#: systemv/cupstestppd.c:2389
 #, c-format
 msgid "      %s  Bad cupsFilter value \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:2814
+#: systemv/cupstestppd.c:2475
+#, c-format
+msgid "      %s  Bad cupsFilter2 value \"%s\"."
+msgstr ""
+
+#: systemv/cupstestppd.c:2964
 #, c-format
 msgid "      %s  Bad cupsICCProfile %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:2421
+#: systemv/cupstestppd.c:2571
 #, c-format
 msgid "      %s  Bad cupsPreFilter value \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:1786
+#: systemv/cupstestppd.c:1822
 #, c-format
 msgid "      %s  Bad cupsUIConstraints %s: \"%s\""
 msgstr ""
 
-#: systemv/cupstestppd.c:3210
+#: systemv/cupstestppd.c:3411
 #, c-format
 msgid "      %s  Bad language \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:2379 systemv/cupstestppd.c:2465
-#: systemv/cupstestppd.c:2523 systemv/cupstestppd.c:2578
-#: systemv/cupstestppd.c:2633 systemv/cupstestppd.c:2688
-#: systemv/cupstestppd.c:2741 systemv/cupstestppd.c:2863
+#: systemv/cupstestppd.c:2433 systemv/cupstestppd.c:2529
+#: systemv/cupstestppd.c:2615 systemv/cupstestppd.c:2673
+#: systemv/cupstestppd.c:2728 systemv/cupstestppd.c:2783
+#: systemv/cupstestppd.c:2838 systemv/cupstestppd.c:2891
+#: systemv/cupstestppd.c:3013
 #, c-format
 msgid "      %s  Bad permissions on %s file \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:2405 systemv/cupstestppd.c:2492
-#: systemv/cupstestppd.c:2547 systemv/cupstestppd.c:2602
-#: systemv/cupstestppd.c:2657 systemv/cupstestppd.c:2712
+#: systemv/cupstestppd.c:2373 systemv/cupstestppd.c:2459
+#: systemv/cupstestppd.c:2555 systemv/cupstestppd.c:2642
+#: systemv/cupstestppd.c:2697 systemv/cupstestppd.c:2752
+#: systemv/cupstestppd.c:2807 systemv/cupstestppd.c:2862
 #, c-format
 msgid "      %s  Bad spelling of %s - should be %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:2757
+#: systemv/cupstestppd.c:2907
 #, c-format
 msgid "      %s  Cannot provide both APScanAppPath and APScanAppBundleID."
 msgstr ""
 
-#: systemv/cupstestppd.c:2169
+#: systemv/cupstestppd.c:2205
 #, c-format
 msgid "      %s  Default choices conflicting."
 msgstr ""
 
-#: systemv/cupstestppd.c:1767
+#: systemv/cupstestppd.c:1803
 #, c-format
 msgid "      %s  Empty cupsUIConstraints %s"
 msgstr ""
 
-#: systemv/cupstestppd.c:3338 systemv/cupstestppd.c:3378
+#: systemv/cupstestppd.c:3539 systemv/cupstestppd.c:3579
 #, c-format
 msgid "      %s  Missing \"%s\" translation string for option %s, choice %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:3246
+#: systemv/cupstestppd.c:3447
 #, c-format
 msgid "      %s  Missing \"%s\" translation string for option %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:2364 systemv/cupstestppd.c:2450
-#: systemv/cupstestppd.c:2508 systemv/cupstestppd.c:2563
-#: systemv/cupstestppd.c:2618 systemv/cupstestppd.c:2673
-#: systemv/cupstestppd.c:2725 systemv/cupstestppd.c:2848
+#: systemv/cupstestppd.c:2418 systemv/cupstestppd.c:2514
+#: systemv/cupstestppd.c:2600 systemv/cupstestppd.c:2658
+#: systemv/cupstestppd.c:2713 systemv/cupstestppd.c:2768
+#: systemv/cupstestppd.c:2823 systemv/cupstestppd.c:2875
+#: systemv/cupstestppd.c:2998
 #, c-format
 msgid "      %s  Missing %s file \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:2971
+#: systemv/cupstestppd.c:3121
 #, c-format
 msgid ""
 "      %s  Missing REQUIRED PageRegion option.\n"
 "                REF: Page 100, section 5.14."
 msgstr ""
 
-#: systemv/cupstestppd.c:2956
+#: systemv/cupstestppd.c:3106
 #, c-format
 msgid ""
 "      %s  Missing REQUIRED PageSize option.\n"
 "                REF: Page 99, section 5.14."
 msgstr ""
 
-#: systemv/cupstestppd.c:1977 systemv/cupstestppd.c:2018
+#: systemv/cupstestppd.c:2013 systemv/cupstestppd.c:2054
 #, c-format
 msgid "      %s  Missing choice *%s %s in UIConstraints \"*%s %s *%s %s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:1872
+#: systemv/cupstestppd.c:1908
 #, c-format
 msgid "      %s  Missing choice *%s %s in cupsUIConstraints %s: \"%s\""
 msgstr ""
 
-#: systemv/cupstestppd.c:1804
+#: systemv/cupstestppd.c:1840
 #, c-format
 msgid "      %s  Missing cupsUIResolver %s"
 msgstr ""
 
-#: systemv/cupstestppd.c:1963 systemv/cupstestppd.c:2004
+#: systemv/cupstestppd.c:1999 systemv/cupstestppd.c:2040
 #, c-format
 msgid "      %s  Missing option %s in UIConstraints \"*%s %s *%s %s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:1856
+#: systemv/cupstestppd.c:1892
 #, c-format
 msgid "      %s  Missing option %s in cupsUIConstraints %s: \"%s\""
 msgstr ""
 
-#: systemv/cupstestppd.c:3432
+#: systemv/cupstestppd.c:3633
 #, c-format
 msgid "      %s  No base translation \"%s\" is included in file."
 msgstr ""
 
-#: systemv/cupstestppd.c:2258
+#: systemv/cupstestppd.c:2294
 #, c-format
 msgid ""
 "      %s  REQUIRED %s does not define choice None.\n"
 "                REF: Page 122, section 5.17"
 msgstr ""
 
-#: systemv/cupstestppd.c:3029 systemv/cupstestppd.c:3043
+#: systemv/cupstestppd.c:3180 systemv/cupstestppd.c:3194
 #, c-format
 msgid "      %s  Size \"%s\" defined for %s but not for %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:3009
+#: systemv/cupstestppd.c:3160
 #, c-format
 msgid "      %s  Size \"%s\" has unexpected dimensions (%gx%g)."
 msgstr ""
 
-#: systemv/cupstestppd.c:3152
+#: systemv/cupstestppd.c:3351
 #, c-format
 msgid "      %s  Size \"%s\" should be \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:3118
+#: systemv/cupstestppd.c:3300
 #, c-format
 msgid "      %s  Size \"%s\" should be the Adobe standard name \"%s\"."
 msgstr ""
 
-#: systemv/cupstestppd.c:2891
+#: systemv/cupstestppd.c:3041
 #, c-format
 msgid "      %s  cupsICCProfile %s hash value collides with %s."
 msgstr ""
 
-#: systemv/cupstestppd.c:1927
+#: systemv/cupstestppd.c:1963
 #, c-format
 msgid "      %s  cupsUIResolver %s causes a loop."
 msgstr ""
 
-#: systemv/cupstestppd.c:1909
+#: systemv/cupstestppd.c:1945
 #, c-format
 msgid "      %s  cupsUIResolver %s does not list at least two different options."
 msgstr ""
 
-#: systemv/cupstestppd.c:2127
-#, c-format
-msgid "      **FAIL**  %s choice names %s and %s differ only by case."
-msgstr ""
-
-#: systemv/cupstestppd.c:1132
+#: systemv/cupstestppd.c:1168
 #, c-format
 msgid ""
 "      **FAIL**  %s must be 1284DeviceID\n"
 "                REF: Page 72, section 5.5"
 msgstr ""
 
-#: systemv/cupstestppd.c:546
+#: systemv/cupstestppd.c:580
 #, c-format
 msgid ""
-"      **FAIL**  BAD Default%s %s\n"
+"      **FAIL**  Bad Default%s %s\n"
 "                REF: Page 40, section 4.5."
 msgstr ""
 
-#: systemv/cupstestppd.c:480
+#: systemv/cupstestppd.c:514
 #, c-format
 msgid ""
-"      **FAIL**  BAD DefaultImageableArea %s\n"
+"      **FAIL**  Bad DefaultImageableArea %s\n"
 "                REF: Page 102, section 5.15."
 msgstr ""
 
-#: systemv/cupstestppd.c:516
+#: systemv/cupstestppd.c:550
 #, c-format
 msgid ""
-"      **FAIL**  BAD DefaultPaperDimension %s\n"
+"      **FAIL**  Bad DefaultPaperDimension %s\n"
 "                REF: Page 103, section 5.15."
 msgstr ""
 
-#: systemv/cupstestppd.c:989
+#: systemv/cupstestppd.c:623
+#, c-format
 msgid ""
-"      **FAIL**  BAD JobPatchFile attribute in file\n"
-"                REF: Page 24, section 3.4."
+"      **FAIL**  Bad FileVersion \"%s\"\n"
+"                REF: Page 56, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:709
+#: systemv/cupstestppd.c:667
+#, c-format
 msgid ""
-"      **FAIL**  BAD Manufacturer (should be \"HP\")\n"
-"                REF: Page 211, table D.1."
+"      **FAIL**  Bad FormatVersion \"%s\"\n"
+"                REF: Page 56, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:725
+#: systemv/cupstestppd.c:1025
 msgid ""
-"      **FAIL**  BAD Manufacturer (should be \"Oki\")\n"
-"                REF: Page 211, table D.1."
+"      **FAIL**  Bad JobPatchFile attribute in file\n"
+"                REF: Page 24, section 3.4."
 msgstr ""
 
-#: systemv/cupstestppd.c:764
+#: systemv/cupstestppd.c:1213
 #, c-format
-msgid ""
-"      **FAIL**  BAD ModelName - \"%c\" not allowed in string.\n"
-"                REF: Pages 59-60, section 5.3."
-msgstr ""
-
-#: systemv/cupstestppd.c:920
-msgid ""
-"      **FAIL**  BAD PSVersion - not \"(string) int\".\n"
-"                REF: Pages 62-64, section 5.3."
+msgid "      **FAIL**  Bad LanguageEncoding %s - must be ISOLatin1."
 msgstr ""
 
-#: systemv/cupstestppd.c:881
-msgid ""
-"      **FAIL**  BAD Product - not \"(string)\".\n"
-"                REF: Page 62, section 5.3."
+#: systemv/cupstestppd.c:1227
+#, c-format
+msgid "      **FAIL**  Bad LanguageVersion %s - must be English."
 msgstr ""
 
-#: systemv/cupstestppd.c:955
+#: systemv/cupstestppd.c:743 systemv/cupstestppd.c:760
+#, c-format
 msgid ""
-"      **FAIL**  BAD ShortNickName - longer than 31 chars.\n"
-"                REF: Pages 64-65, section 5.3."
+"      **FAIL**  Bad Manufacturer (should be \"%s\")\n"
+"                REF: Page 211, table D.1."
 msgstr ""
 
-#: systemv/cupstestppd.c:1113
+#: systemv/cupstestppd.c:800
 #, c-format
 msgid ""
-"      **FAIL**  Bad %s choice %s\n"
-"                REF: Page 84, section 5.9"
+"      **FAIL**  Bad ModelName - \"%c\" not allowed in string.\n"
+"                REF: Pages 59-60, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:589
-#, c-format
+#: systemv/cupstestppd.c:956
 msgid ""
-"      **FAIL**  Bad FileVersion \"%s\"\n"
-"                REF: Page 56, section 5.3."
+"      **FAIL**  Bad PSVersion - not \"(string) int\".\n"
+"                REF: Pages 62-64, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:633
-#, c-format
+#: systemv/cupstestppd.c:917
 msgid ""
-"      **FAIL**  Bad FormatVersion \"%s\"\n"
-"                REF: Page 56, section 5.3."
+"      **FAIL**  Bad Product - not \"(string)\".\n"
+"                REF: Page 62, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1177
-#, c-format
-msgid "      **FAIL**  Bad LanguageEncoding %s - must be ISOLatin1."
+#: systemv/cupstestppd.c:991
+msgid ""
+"      **FAIL**  Bad ShortNickName - longer than 31 chars.\n"
+"                REF: Pages 64-65, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1191
+#: systemv/cupstestppd.c:1149
 #, c-format
-msgid "      **FAIL**  Bad LanguageVersion %s - must be English."
+msgid ""
+"      **FAIL**  Bad option %s choice %s\n"
+"                REF: Page 84, section 5.9"
 msgstr ""
 
-#: systemv/cupstestppd.c:3573 systemv/cupstestppd.c:3595
+#: systemv/cupstestppd.c:3774 systemv/cupstestppd.c:3796
 #, c-format
 msgid "      **FAIL**  Default option code cannot be interpreted: %s"
 msgstr ""
 
-#: systemv/cupstestppd.c:1250
+#: systemv/cupstestppd.c:1286
 #, c-format
 msgid "      **FAIL**  Default translation string for option %s choice %s contains 8-bit characters."
 msgstr ""
 
-#: systemv/cupstestppd.c:1223
+#: systemv/cupstestppd.c:1259
 #, c-format
 msgid "      **FAIL**  Default translation string for option %s contains 8-bit characters."
 msgstr ""
 
-#: systemv/cupstestppd.c:2065
+#: systemv/cupstestppd.c:2101
 #, c-format
 msgid "      **FAIL**  Group names %s and %s differ only by case."
 msgstr ""
 
-#: systemv/cupstestppd.c:2110
+#: systemv/cupstestppd.c:2146
+#, c-format
+msgid "      **FAIL**  Multiple occurrences of option %s choice name %s."
+msgstr ""
+
+#: systemv/cupstestppd.c:2163
 #, c-format
-msgid "      **FAIL**  Multiple occurrences of %s choice name %s."
+msgid "      **FAIL**  Option %s choice names %s and %s differ only by case."
 msgstr ""
 
-#: systemv/cupstestppd.c:2087
+#: systemv/cupstestppd.c:2123
 #, c-format
 msgid "      **FAIL**  Option names %s and %s differ only by case."
 msgstr ""
 
-#: systemv/cupstestppd.c:566
+#: systemv/cupstestppd.c:600
 #, c-format
 msgid ""
 "      **FAIL**  REQUIRED Default%s\n"
 "                REF: Page 40, section 4.5."
 msgstr ""
 
-#: systemv/cupstestppd.c:465
+#: systemv/cupstestppd.c:499
 msgid ""
 "      **FAIL**  REQUIRED DefaultImageableArea\n"
 "                REF: Page 102, section 5.15."
 msgstr ""
 
-#: systemv/cupstestppd.c:501
+#: systemv/cupstestppd.c:535
 msgid ""
 "      **FAIL**  REQUIRED DefaultPaperDimension\n"
 "                REF: Page 103, section 5.15."
 msgstr ""
 
-#: systemv/cupstestppd.c:607
+#: systemv/cupstestppd.c:641
 msgid ""
 "      **FAIL**  REQUIRED FileVersion\n"
 "                REF: Page 56, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:651
+#: systemv/cupstestppd.c:685
 msgid ""
 "      **FAIL**  REQUIRED FormatVersion\n"
 "                REF: Page 56, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:1040
+#: systemv/cupstestppd.c:1076
 #, c-format
 msgid ""
 "      **FAIL**  REQUIRED ImageableArea for PageSize %s\n"
@@ -783,68 +786,68 @@ msgid ""
 "                REF: Page 102, section 5.15."
 msgstr ""
 
-#: systemv/cupstestppd.c:671
+#: systemv/cupstestppd.c:705
 msgid ""
 "      **FAIL**  REQUIRED LanguageEncoding\n"
 "                REF: Pages 56-57, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:691
+#: systemv/cupstestppd.c:725
 msgid ""
 "      **FAIL**  REQUIRED LanguageVersion\n"
 "                REF: Pages 57-58, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:743
+#: systemv/cupstestppd.c:779
 msgid ""
 "      **FAIL**  REQUIRED Manufacturer\n"
 "                REF: Pages 58-59, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:783
+#: systemv/cupstestppd.c:819
 msgid ""
 "      **FAIL**  REQUIRED ModelName\n"
 "                REF: Pages 59-60, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:803
+#: systemv/cupstestppd.c:839
 msgid ""
 "      **FAIL**  REQUIRED NickName\n"
 "                REF: Page 60, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:863
+#: systemv/cupstestppd.c:899
 msgid ""
 "      **FAIL**  REQUIRED PCFileName\n"
 "                REF: Pages 61-62, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:938
+#: systemv/cupstestppd.c:974
 msgid ""
 "      **FAIL**  REQUIRED PSVersion\n"
 "                REF: Pages 62-64, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:843
+#: systemv/cupstestppd.c:879
 msgid ""
 "      **FAIL**  REQUIRED PageRegion\n"
 "                REF: Page 100, section 5.14."
 msgstr ""
 
-#: systemv/cupstestppd.c:1009
+#: systemv/cupstestppd.c:1045
 msgid ""
 "      **FAIL**  REQUIRED PageSize\n"
 "                REF: Page 41, section 5.\n"
 "                REF: Page 99, section 5.14."
 msgstr ""
 
-#: systemv/cupstestppd.c:823
+#: systemv/cupstestppd.c:859
 msgid ""
 "      **FAIL**  REQUIRED PageSize\n"
 "                REF: Pages 99-100, section 5.14."
 msgstr ""
 
-#: systemv/cupstestppd.c:1062
+#: systemv/cupstestppd.c:1098
 #, c-format
 msgid ""
 "      **FAIL**  REQUIRED PaperDimension for PageSize %s\n"
@@ -852,29 +855,25 @@ msgid ""
 "                REF: Page 103, section 5.15."
 msgstr ""
 
-#: systemv/cupstestppd.c:898
+#: systemv/cupstestppd.c:934
 msgid ""
 "      **FAIL**  REQUIRED Product\n"
 "                REF: Page 62, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:973
+#: systemv/cupstestppd.c:1009
 msgid ""
 "      **FAIL**  REQUIRED ShortNickName\n"
 "                REF: Page 64-65, section 5.3."
 msgstr ""
 
-#: systemv/cupstestppd.c:335
-#, c-format
-msgid "      **FAIL**  Unable to open PPD file - %s"
-msgstr ""
-
-#: systemv/cupstestppd.c:347
+#: systemv/cupstestppd.c:334 systemv/cupstestppd.c:353
+#: systemv/cupstestppd.c:365
 #, c-format
 msgid "      **FAIL**  Unable to open PPD file - %s on line %d."
 msgstr ""
 
-#: systemv/cupstestppd.c:1462
+#: systemv/cupstestppd.c:1498
 #, c-format
 msgid "    %d ERRORS FOUND"
 msgstr ""
@@ -943,7 +942,7 @@ msgid ""
 "        REF: Page 43, %%Pages:"
 msgstr ""
 
-#: systemv/cupstestppd.c:1464
+#: systemv/cupstestppd.c:1500
 msgid "    NO ERRORS FOUND"
 msgstr ""
 
@@ -976,698 +975,1055 @@ msgstr ""
 msgid "    Warning: obsolete DSC version %.1f in file."
 msgstr ""
 
-#: systemv/cupsctl.c:216
+#: test/ippfind.c:2758
+msgid "  ! expression            Unary NOT of expression."
+msgstr ""
+
+#: test/ippfind.c:2757
+msgid "  ( expressions )         Group expressions."
+msgstr ""
+
+#: systemv/cupsctl.c:210
 msgid "  --[no-]debug-logging    Turn debug logging on/off."
 msgstr ""
 
-#: systemv/cupsctl.c:218
+#: systemv/cupsctl.c:212
 msgid "  --[no-]remote-admin     Turn remote administration on/off."
 msgstr ""
 
-#: systemv/cupsctl.c:220
+#: systemv/cupsctl.c:214
 msgid "  --[no-]remote-any       Allow/prevent access from the Internet."
 msgstr ""
 
-#: systemv/cupsctl.c:222
-msgid "  --[no-]remote-printers  Show/hide remote printers."
-msgstr ""
-
-#: systemv/cupsctl.c:224
+#: systemv/cupsctl.c:216
 msgid "  --[no-]share-printers   Turn printer sharing on/off."
 msgstr ""
 
-#: systemv/cupsctl.c:226
+#: systemv/cupsctl.c:218
 msgid "  --[no-]user-cancel-any  Allow/prevent users to cancel any job."
 msgstr ""
 
-#: ppdc/ppdc.cxx:456
+#: ppdc/ppdc.cxx:450
 msgid "  --cr                    End lines with CR (Mac OS 9)."
 msgstr ""
 
-#: ppdc/ppdc.cxx:458
+#: ppdc/ppdc.cxx:452
 msgid "  --crlf                  End lines with CR + LF (Windows)."
 msgstr ""
 
-#: ppdc/ppdc.cxx:460
-msgid "  --lf                    End lines with LF (UNIX/Linux/Mac OS X)."
+#: test/ippfind.c:2739
+msgid "  --domain regex          Match domain to regular expression."
+msgstr ""
+
+#: test/ippfind.c:2740
+msgid ""
+"  --exec utility [argument ...] ;\n"
+"                          Execute program if true."
+msgstr ""
+
+#: test/ippfind.c:2760
+msgid "  --false                 Always false."
+msgstr ""
+
+#: test/ippfind.c:2722
+msgid "  --help                  Show this help."
+msgstr ""
+
+#: test/ippfind.c:2742
+msgid "  --host regex            Match hostname to regular expression."
+msgstr ""
+
+#: ppdc/ppdc.cxx:454
+msgid "  --lf                    End lines with LF (UNIX/Linux/OS X)."
+msgstr ""
+
+#: scheduler/cupsfilter.c:1483
+msgid "  --list-filters          List filters that will be used."
+msgstr ""
+
+#: test/ippfind.c:2744
+msgid "  --local                 True if service is local."
+msgstr ""
+
+#: test/ippfind.c:2743
+msgid "  --ls                    List attributes."
+msgstr ""
+
+#: test/ippfind.c:2745
+msgid "  --name regex            Match service name to regular expression."
+msgstr ""
+
+#: test/ippfind.c:2759
+msgid "  --not expression        Unary NOT of expression."
+msgstr ""
+
+#: test/ippfind.c:2746
+msgid "  --path regex            Match resource path to regular expression."
+msgstr ""
+
+#: test/ippfind.c:2747
+msgid "  --port number[-number]  Match port to number or range."
+msgstr ""
+
+#: test/ippfind.c:2748
+msgid "  --print                 Print URI if true."
+msgstr ""
+
+#: test/ippfind.c:2749
+msgid "  --print-name            Print service name if true."
+msgstr ""
+
+#: test/ippfind.c:2750
+msgid "  --quiet                 Quietly report match via exit code."
+msgstr ""
+
+#: test/ippfind.c:2751
+msgid "  --remote                True if service is remote."
+msgstr ""
+
+#: test/ippfind.c:2761
+msgid "  --true                  Always true."
+msgstr ""
+
+#: test/ippfind.c:2752
+msgid "  --txt key               True if the TXT record contains the key."
+msgstr ""
+
+#: test/ippfind.c:2753
+msgid "  --txt-* regex           Match TXT record key to regular expression."
+msgstr ""
+
+#: test/ippfind.c:2754
+msgid "  --uri regex             Match URI to regular expression."
+msgstr ""
+
+#: test/ippfind.c:2723
+msgid "  --version               Show program version."
 msgstr ""
 
-#: test/ipptool.c:3828
+#: test/ippfind.c:2716 test/ipptool.c:4713
 msgid "  -4                      Connect using IPv4."
 msgstr ""
 
-#: test/ipptool.c:3829
+#: test/ippfind.c:2717 test/ipptool.c:4714
 msgid "  -6                      Connect using IPv6."
 msgstr ""
 
-#: test/ipptool.c:3830
+#: test/ipptool.c:4715
 msgid "  -C                      Send requests using chunking (default)."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1357 scheduler/cupsfilter.c:1384
+#: scheduler/cupsfilter.c:1484
 msgid "  -D                      Remove the input file when finished."
 msgstr ""
 
-#: ppdc/ppdc.cxx:438 ppdc/ppdhtml.cxx:175 ppdc/ppdpo.cxx:255
+#: ppdc/ppdc.cxx:433 ppdc/ppdhtml.cxx:175 ppdc/ppdpo.cxx:255
 msgid "  -D name=value           Set named variable to value."
 msgstr ""
 
-#: systemv/cupsctl.c:211
-msgid "  -E                      Enable encryption."
-msgstr ""
-
-#: systemv/cupsaddsmb.c:285
-msgid "  -E                      Encrypt the connection to the server."
+#: systemv/cupsaddsmb.c:285 systemv/cupsctl.c:205
+msgid "  -E                      Encrypt the connection."
 msgstr ""
 
-#: test/ipptool.c:3832
-msgid "  -E                      Test with TLS encryption."
+#: test/ipptool.c:4717
+msgid "  -E                      Test with HTTP Upgrade to TLS."
 msgstr ""
 
-#: scheduler/main.c:2191
+#: scheduler/main.c:2161
 msgid "  -F                      Run in the foreground but detach from console."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:287
+#: systemv/cupsaddsmb.c:286
 msgid "  -H samba-server         Use the named SAMBA server."
 msgstr ""
 
-#: test/ipptool.c:3834
+#: test/ipptool.c:4719
 msgid "  -I                      Ignore errors."
 msgstr ""
 
-#: ppdc/ppdc.cxx:440 ppdc/ppdhtml.cxx:177 ppdc/ppdi.cxx:131 ppdc/ppdpo.cxx:257
+#: ppdc/ppdc.cxx:435 ppdc/ppdhtml.cxx:177 ppdc/ppdi.cxx:131 ppdc/ppdpo.cxx:257
 msgid "  -I include-dir          Add include directory to search path."
 msgstr ""
 
-#: systemv/cupstestppd.c:3618
+#: systemv/cupstestppd.c:3819
 msgid "  -I {filename,filters,none,profiles}"
 msgstr ""
 
-#: scheduler/cupsfilter.c:1386
-msgid "  -J title                Set title."
-msgstr ""
-
-#: test/ipptool.c:3835
+#: test/ipptool.c:4720
 msgid "  -L                      Send requests using content-length."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1359 scheduler/cupsfilter.c:1387
+#: scheduler/cupsfilter.c:1485
 msgid "  -P filename.ppd         Set PPD file."
 msgstr ""
 
-#: systemv/cupstestppd.c:3620
-msgid "  -R root-directory       Set alternate root."
+#: test/ippfind.c:2726
+msgid "  -P number[-number]      Match port to number or range."
 msgstr ""
 
-#: test/ipptool.c:3837
-msgid "  -S                      Test with SSL encryption."
+#: systemv/cupstestppd.c:3821
+msgid "  -R root-directory       Set alternate root."
 msgstr ""
 
-#: test/ipptool.c:3839
-msgid "  -T                      Set the receive/send timeout in seconds."
+#: test/ipptool.c:4722
+msgid "  -S                      Test with SSL encryption."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:289
-msgid "  -U samba-user           Authenticate using the named SAMBA user."
+#: test/ippfind.c:2718
+msgid "  -T seconds              Set the browse timeout in seconds."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1360 scheduler/cupsfilter.c:1388
-msgid "  -U username             Set username for job."
+#: test/ipptool.c:4724
+msgid "  -T seconds              Set the receive/send timeout in seconds."
 msgstr ""
 
-#: systemv/cupsctl.c:212
+#: scheduler/cupsfilter.c:1486 systemv/cupsaddsmb.c:288 systemv/cupsctl.c:206
 msgid "  -U username             Specify username."
 msgstr ""
 
-#: test/ipptool.c:3841
+#: test/ippfind.c:2720 test/ipptool.c:4726
 msgid "  -V version              Set default IPP version."
 msgstr ""
 
-#: systemv/cupstestppd.c:3621
+#: systemv/cupstestppd.c:3822
 msgid "  -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,translations}"
 msgstr ""
 
-#: test/ipptool.c:3843
+#: test/ipptool.c:4728
 msgid "  -X                      Produce XML plist instead of plain text."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:291
-msgid "  -a                      Export all printers."
+#: test/ippdiscover.c:818
+msgid "  -a                      Browse for all services."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1389
-msgid "  -a 'name=value ...'     Set option(s)."
+#: systemv/cupsaddsmb.c:289
+msgid "  -a                      Export all printers."
 msgstr ""
 
-#: ppdc/ppdc.cxx:442
+#: ppdc/ppdc.cxx:437
 msgid "  -c catalog.po           Load the specified message catalog."
 msgstr ""
 
-#: scheduler/main.c:2188
-msgid "  -c config-file          Load alternate configuration file."
+#: scheduler/cupsfilter.c:1487
+msgid "  -c cups-files.conf      Set cups-files.conf file to use."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1390
-msgid "  -c copies               Set number of copies."
+#: scheduler/main.c:2159
+msgid "  -c cupsd.conf           Set cupsd.conf file to use."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1361
-msgid "  -c cupsd.conf           Set cupsd.conf file to use."
+#: test/ippdiscover.c:819
+msgid "  -d domain               Browse/resolve in specified domain."
 msgstr ""
 
-#: test/ipptool.c:3845
+#: test/ipptool.c:4730
 msgid "  -d name=value           Set named variable to value."
 msgstr ""
 
-#: ppdc/ppdc.cxx:444
+#: ppdc/ppdc.cxx:439
 msgid "  -d output-dir           Specify the output directory."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1363 scheduler/cupsfilter.c:1391
+#: scheduler/cupsfilter.c:1488
 msgid "  -d printer              Use the named printer."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1365 scheduler/cupsfilter.c:1393
+#: test/ippfind.c:2727
+msgid "  -d regex                Match domain to regular expression."
+msgstr ""
+
+#: scheduler/cupsfilter.c:1489
 msgid "  -e                      Use every filter from the PPD file."
 msgstr ""
 
-#: scheduler/main.c:2190
+#: scheduler/main.c:2160
 msgid "  -f                      Run in the foreground."
 msgstr ""
 
-#: test/ipptool.c:3847
+#: test/ipptool.c:4732
 msgid "  -f filename             Set default request filename."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1395
-msgid "  -f filename             Set file to be converted (otherwise stdin)."
-msgstr ""
-
-#: scheduler/main.c:2193
+#: scheduler/main.c:2163
 msgid "  -h                      Show this usage message."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:292
-msgid "  -h cups-server          Use the named CUPS server."
+#: test/ippfind.c:2728
+msgid "  -h regex                Match hostname to regular expression."
 msgstr ""
 
-#: systemv/cupsctl.c:213
+#: systemv/cupsaddsmb.c:290 systemv/cupsctl.c:207
 msgid "  -h server[:port]        Specify server address."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1367 scheduler/cupsfilter.c:1397
+#: scheduler/cupsfilter.c:1490
 msgid "  -i mime/type            Set input MIME type (otherwise auto-typed)."
 msgstr ""
 
-#: test/ipptool.c:3849
+#: test/ipptool.c:4734
 msgid "  -i seconds              Repeat the last file with the given time interval."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1369
+#: scheduler/cupsfilter.c:1491
 msgid "  -j job-id[,N]           Filter file N from the specified job (default is file 1)."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1399
-msgid "  -j mime/type            Set output MIME type (otherwise application/pdf)."
+#: test/ippfind.c:2729
+msgid "  -l                      List attributes."
 msgstr ""
 
-#: scheduler/main.c:2194
-msgid "  -l                      Run cupsd from launchd(8)."
+#: scheduler/main.c:2164
+msgid "  -l                      Run cupsd on demand."
 msgstr ""
 
-#: ppdc/ppdc.cxx:446
+#: ppdc/ppdc.cxx:441
 msgid "  -l lang[,lang,...]      Specify the output language(s) (locale)."
 msgstr ""
 
-#: ppdc/ppdc.cxx:448
+#: ppdc/ppdc.cxx:443
 msgid "  -m                      Use the ModelName value as the filename."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1371
+#: scheduler/cupsfilter.c:1492
 msgid "  -m mime/type            Set output MIME type (otherwise application/pdf)."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1373
+#: scheduler/cupsfilter.c:1493
 msgid "  -n copies               Set number of copies."
 msgstr ""
 
-#: test/ipptool.c:3851
+#: test/ipptool.c:4736
 msgid "  -n count                Repeat the last file the given number of times."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1401
-msgid "  -o filename             Set file to be generated (otherwise stdout)."
+#: test/ippfind.c:2730
+msgid "  -n regex                Match service name to regular expression."
 msgstr ""
 
 #: ppdc/ppdi.cxx:133
 msgid "  -o filename.drv         Set driver information file (otherwise ppdi.drv)."
 msgstr ""
 
-#: ppdc/ppdmerge.cxx:370
+#: ppdc/ppdmerge.cxx:364
 msgid "  -o filename.ppd[.gz]    Set output file (otherwise stdout)."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1374
+#: scheduler/cupsfilter.c:1494
 msgid "  -o name=value           Set option(s)."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1375
+#: test/ippfind.c:2731
+msgid "  -p                      Print URI if true."
+msgstr ""
+
+#: scheduler/cupsfilter.c:1495
 msgid "  -p filename.ppd         Set PPD file."
 msgstr ""
 
-#: test/ipptool.c:3853
-msgid "  -q                      Be quiet - no output except errors."
+#: test/ippdiscover.c:820
+msgid "  -p program              Run specified program for each service."
+msgstr ""
+
+#: test/ippfind.c:2732
+msgid "  -q                      Quietly report match via exit code."
 msgstr ""
 
-#: systemv/cupstestppd.c:3625
+#: systemv/cupstestppd.c:3826 test/ipptool.c:4738
 msgid "  -q                      Run silently."
 msgstr ""
 
-#: systemv/cupstestppd.c:3626
+#: test/ippfind.c:2733
+msgid "  -r                      True if service is remote."
+msgstr ""
+
+#: systemv/cupstestppd.c:3827
 msgid "  -r                      Use 'relaxed' open mode."
 msgstr ""
 
-#: test/ipptool.c:3855
+#: test/ippfind.c:2734
+msgid "  -s                      Print service name if true."
+msgstr ""
+
+#: test/ipptool.c:4739
 msgid "  -t                      Produce a test report."
 msgstr ""
 
-#: ppdc/ppdc.cxx:450
+#: ppdc/ppdc.cxx:445
 msgid "  -t                      Test PPDs instead of generating them."
 msgstr ""
 
-#: scheduler/main.c:2195
+#: scheduler/main.c:2165
 msgid "  -t                      Test the configuration file."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1376
-msgid "  -t title                Set title."
+#: test/ippfind.c:2735
+msgid "  -t key                  True if the TXT record contains the key."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1377 scheduler/cupsfilter.c:1403
-msgid "  -u                      Remove the PPD file when finished."
+#: scheduler/cupsfilter.c:1496
+msgid "  -t title                Set title."
 msgstr ""
 
-#: systemv/cupstestppd.c:3627
-msgid "  -v                      Be slightly verbose."
+#: test/ippdiscover.c:821
+msgid "  -t type                 Browse/resolve with specified type."
 msgstr ""
 
-#: ppdc/ppdc.cxx:452 ppdc/ppdpo.cxx:259
-msgid "  -v                      Be verbose (more v's for more verbosity)."
+#: scheduler/cupsfilter.c:1497
+msgid "  -u                      Remove the PPD file when finished."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:294
-msgid "  -v                      Be verbose (show commands)."
+#: test/ippfind.c:2736
+msgid "  -u regex                Match URI to regular expression."
 msgstr ""
 
-#: test/ipptool.c:3856
-msgid "  -v                      Show all attributes sent and received."
+#: systemv/cupsaddsmb.c:291 systemv/cupstestppd.c:3828 test/ipptool.c:4740
+#: ppdc/ppdc.cxx:447 ppdc/ppdpo.cxx:259
+msgid "  -v                      Be verbose."
 msgstr ""
 
-#: systemv/cupstestppd.c:3628
+#: systemv/cupstestppd.c:3829
 msgid "  -vv                     Be very verbose."
 msgstr ""
 
-#: ppdc/ppdc.cxx:454
+#: test/ippfind.c:2737
+msgid ""
+"  -x utility [argument ...] ;\n"
+"                          Execute program if true."
+msgstr ""
+
+#: ppdc/ppdc.cxx:448
 msgid "  -z                      Compress PPD files using GNU zip."
 msgstr ""
 
-#: systemv/cupstestppd.c:333 systemv/cupstestppd.c:345
-#: systemv/cupstestppd.c:462 systemv/cupstestppd.c:477
-#: systemv/cupstestppd.c:498 systemv/cupstestppd.c:513
-#: systemv/cupstestppd.c:543 systemv/cupstestppd.c:563
-#: systemv/cupstestppd.c:586 systemv/cupstestppd.c:604
-#: systemv/cupstestppd.c:630 systemv/cupstestppd.c:648
-#: systemv/cupstestppd.c:668 systemv/cupstestppd.c:688
-#: systemv/cupstestppd.c:706 systemv/cupstestppd.c:722
-#: systemv/cupstestppd.c:740 systemv/cupstestppd.c:761
-#: systemv/cupstestppd.c:780 systemv/cupstestppd.c:800
-#: systemv/cupstestppd.c:820 systemv/cupstestppd.c:840
-#: systemv/cupstestppd.c:860 systemv/cupstestppd.c:878
-#: systemv/cupstestppd.c:895 systemv/cupstestppd.c:917
-#: systemv/cupstestppd.c:935 systemv/cupstestppd.c:952
-#: systemv/cupstestppd.c:970 systemv/cupstestppd.c:986
-#: systemv/cupstestppd.c:1006 systemv/cupstestppd.c:1037
-#: systemv/cupstestppd.c:1059 systemv/cupstestppd.c:1110
-#: systemv/cupstestppd.c:1129 systemv/cupstestppd.c:1173
-#: systemv/cupstestppd.c:1187 systemv/cupstestppd.c:1219
-#: systemv/cupstestppd.c:1246 systemv/cupstestppd.c:1764
-#: systemv/cupstestppd.c:1783 systemv/cupstestppd.c:1801
-#: systemv/cupstestppd.c:1853 systemv/cupstestppd.c:1869
-#: systemv/cupstestppd.c:1906 systemv/cupstestppd.c:1924
-#: systemv/cupstestppd.c:1960 systemv/cupstestppd.c:1974
-#: systemv/cupstestppd.c:2001 systemv/cupstestppd.c:2015
-#: systemv/cupstestppd.c:2061 systemv/cupstestppd.c:2083
-#: systemv/cupstestppd.c:2106 systemv/cupstestppd.c:2123
-#: systemv/cupstestppd.c:2165 systemv/cupstestppd.c:2208
-#: systemv/cupstestppd.c:2255 systemv/cupstestppd.c:2279
-#: systemv/cupstestppd.c:2331 systemv/cupstestppd.c:2361
-#: systemv/cupstestppd.c:2375 systemv/cupstestppd.c:2401
-#: systemv/cupstestppd.c:2417 systemv/cupstestppd.c:2447
-#: systemv/cupstestppd.c:2461 systemv/cupstestppd.c:2488
-#: systemv/cupstestppd.c:2505 systemv/cupstestppd.c:2519
-#: systemv/cupstestppd.c:2543 systemv/cupstestppd.c:2560
-#: systemv/cupstestppd.c:2574 systemv/cupstestppd.c:2598
-#: systemv/cupstestppd.c:2615 systemv/cupstestppd.c:2629
-#: systemv/cupstestppd.c:2653 systemv/cupstestppd.c:2670
-#: systemv/cupstestppd.c:2684 systemv/cupstestppd.c:2708
-#: systemv/cupstestppd.c:2722 systemv/cupstestppd.c:2737
-#: systemv/cupstestppd.c:2754 systemv/cupstestppd.c:2810
-#: systemv/cupstestppd.c:2845 systemv/cupstestppd.c:2859
-#: systemv/cupstestppd.c:2887 systemv/cupstestppd.c:2952
-#: systemv/cupstestppd.c:2967 systemv/cupstestppd.c:3005
-#: systemv/cupstestppd.c:3025 systemv/cupstestppd.c:3039
-#: systemv/cupstestppd.c:3206 systemv/cupstestppd.c:3242
-#: systemv/cupstestppd.c:3256 systemv/cupstestppd.c:3302
-#: systemv/cupstestppd.c:3334 systemv/cupstestppd.c:3351
-#: systemv/cupstestppd.c:3374 systemv/cupstestppd.c:3390
-#: systemv/cupstestppd.c:3428 systemv/cupstestppd.c:3569
-#: systemv/cupstestppd.c:3591 systemv/cupstestppd.c:3699
-msgid " FAIL"
+#: test/ippfind.c:2780
+msgid "  IPPFIND_SERVICE_DOMAIN  Domain name"
 msgstr ""
 
-#: systemv/cupstestppd.c:1270
-msgid " PASS"
+#: test/ippfind.c:2781
+msgid ""
+"  IPPFIND_SERVICE_HOSTNAME\n"
+"                          Fully-qualified domain name"
 msgstr ""
 
-#: berkeley/lpq.c:559
-#, c-format
-msgid "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes"
+#: test/ippfind.c:2783
+msgid "  IPPFIND_SERVICE_NAME    Service instance name"
 msgstr ""
 
-#: berkeley/lpq.c:564
-#, c-format
-msgid "%-7s %-7.7s %-7d %-31.31s %.0f bytes"
+#: test/ippfind.c:2784
+msgid "  IPPFIND_SERVICE_PORT    Port number"
 msgstr ""
 
-#: filter/bannertops.c:784
-#, c-format
-msgid "%.0f x %.0f millimeters"
+#: test/ippfind.c:2785
+msgid "  IPPFIND_SERVICE_REGTYPE DNS-SD registration type"
 msgstr ""
 
-#: filter/bannertops.c:805
-#, c-format
-msgid "%.0f x %.0f to %.0f x %.0f millimeters"
+#: test/ippfind.c:2786
+msgid "  IPPFIND_SERVICE_SCHEME  URI scheme"
 msgstr ""
 
-#: filter/bannertops.c:775
-#, c-format
-msgid "%.2f x %.2f inches"
+#: test/ippfind.c:2787
+msgid "  IPPFIND_SERVICE_URI     URI"
 msgstr ""
 
-#: filter/bannertops.c:794
-#, c-format
-msgid "%.2f x %.2f to %.2f x %.2f inches"
+#: test/ippfind.c:2788
+msgid "  IPPFIND_TXT_*           Value of TXT record key"
 msgstr ""
 
-#: systemv/lpstat.c:747
-#, c-format
-msgid "%s accepting requests since %s"
+#: test/ippfind.c:2763
+msgid ""
+"  expression --and expression\n"
+"                          Logical AND."
 msgstr ""
 
-#: scheduler/ipp.c:11155
-#, c-format
-msgid "%s cannot be changed."
+#: test/ippfind.c:2765
+msgid ""
+"  expression --or expression\n"
+"                          Logical OR."
+msgstr ""
+
+#: test/ippfind.c:2762
+msgid "  expression expression   Logical AND."
+msgstr ""
+
+#: test/ippfind.c:2770
+msgid "  {service_domain}        Domain name"
+msgstr ""
+
+#: test/ippfind.c:2771
+msgid "  {service_hostname}      Fully-qualified domain name"
+msgstr ""
+
+#: test/ippfind.c:2772
+msgid "  {service_name}          Service instance name"
+msgstr ""
+
+#: test/ippfind.c:2773
+msgid "  {service_port}          Port number"
+msgstr ""
+
+#: test/ippfind.c:2774
+msgid "  {service_regtype}       DNS-SD registration type"
+msgstr ""
+
+#: test/ippfind.c:2775
+msgid "  {service_scheme}        URI scheme"
+msgstr ""
+
+#: test/ippfind.c:2776
+msgid "  {service_uri}           URI"
+msgstr ""
+
+#: test/ippfind.c:2777
+msgid "  {txt_*}                 Value of TXT record key"
+msgstr ""
+
+#: test/ippfind.c:2769
+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
+msgid " FAIL"
 msgstr ""
 
-#: berkeley/lpc.c:189
-#, c-format
-msgid "%s is not implemented by the CUPS version of lpc."
+#: systemv/cupstestppd.c:1306
+msgid " PASS"
 msgstr ""
 
-#: berkeley/lpq.c:650
+#: cups/ipp.c:5227
 #, c-format
-msgid "%s is not ready"
+msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 2911 section 4.1.5)."
 msgstr ""
 
-#: berkeley/lpq.c:643
+#: cups/ipp.c:5238
 #, c-format
-msgid "%s is ready"
+msgid "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 2911 section 4.1.5)."
 msgstr ""
 
-#: berkeley/lpq.c:646
+#: cups/ipp.c:4858
 #, c-format
-msgid "%s is ready and printing"
+msgid "\"%s\": Bad attribute name - bad length %d (RFC 2911 section 4.1.3)."
 msgstr ""
 
-#: driver/rastertoescpx.c:1775 driver/rastertopclx.c:1800
-#: filter/rastertoepson.c:985 filter/rastertohp.c:711
-#: filter/rastertolabel.c:1134
+#: cups/ipp.c:4850
 #, c-format
-msgid "%s job-id user title copies options [file]"
+msgid "\"%s\": Bad attribute name - invalid character (RFC 2911 section 4.1.3)."
 msgstr ""
 
-#: systemv/lpstat.c:751
+#: cups/ipp.c:4876
 #, c-format
-msgid "%s not accepting requests since %s -"
+msgid "\"%s\": Bad boolen value %d (RFC 2911 section 4.1.11)."
 msgstr ""
 
-#: scheduler/ipp.c:718
+#: cups/ipp.c:5290
 #, c-format
-msgid "%s not supported."
+msgid "\"%s\": Bad charset value \"%s\" - bad characters (RFC 2911 section 4.1.7)."
 msgstr ""
 
-#: systemv/lpstat.c:762
+#: cups/ipp.c:5299
 #, c-format
-msgid "%s/%s accepting requests since %s"
+msgid "\"%s\": Bad charset value \"%s\" - bad length %d (RFC 2911 section 4.1.7)."
 msgstr ""
 
-#: systemv/lpstat.c:767
+#: cups/ipp.c:4976
 #, c-format
-msgid "%s/%s not accepting requests since %s -"
+msgid "\"%s\": Bad dateTime UTC hours %u (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: berkeley/lpq.c:551
+#: cups/ipp.c:4984
 #, c-format
-msgid "%s: %-33.33s [job %d localhost]"
+msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#. TRANSLATORS: Message is "subject: error"
-#: cups/langprintf.c:86
+#: cups/ipp.c:4968
 #, c-format
-msgid "%s: %s"
+msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: systemv/cancel.c:294 systemv/cancel.c:357
+#: cups/ipp.c:4928
 #, c-format
-msgid "%s: %s failed: %s"
+msgid "\"%s\": Bad dateTime day %u (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: systemv/cupsaccept.c:68
+#: cups/ipp.c:4960
 #, c-format
-msgid "%s: Don't know what to do."
+msgid "\"%s\": Bad dateTime deciseconds %u (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: berkeley/lpq.c:236 berkeley/lpr.c:344 systemv/lp.c:584
+#: cups/ipp.c:4936
 #, c-format
-msgid "%s: Error - %s environment variable names non-existent destination \"%s\"."
+msgid "\"%s\": Bad dateTime hours %u (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: systemv/lp.c:231
+#: cups/ipp.c:4944
 #, c-format
-msgid "%s: Error - bad job ID."
+msgid "\"%s\": Bad dateTime minutes %u (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: systemv/lp.c:219
+#: cups/ipp.c:4920
 #, c-format
-msgid "%s: Error - cannot print files and alter jobs simultaneously."
+msgid "\"%s\": Bad dateTime month %u (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: systemv/lp.c:505
+#: cups/ipp.c:4952
 #, c-format
-msgid "%s: Error - cannot print from stdin if files or a job ID are provided."
+msgid "\"%s\": Bad dateTime seconds %u (RFC 2911 section 4.1.14)."
 msgstr ""
 
-#: systemv/lp.c:461
+#: cups/ipp.c:4890
 #, c-format
-msgid "%s: Error - expected character set after \"-S\" option."
+msgid "\"%s\": Bad enum value %d - out of range (RFC 2911 section 4.1.4)."
 msgstr ""
 
-#: systemv/lp.c:480
+#: cups/ipp.c:5205
 #, c-format
-msgid "%s: Error - expected content type after \"-T\" option."
+msgid "\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 2911 section 4.1.3)."
 msgstr ""
 
-#: berkeley/lpr.c:240
+#: cups/ipp.c:5196
 #, c-format
-msgid "%s: Error - expected copies after \"-#\" option."
+msgid "\"%s\": Bad keyword value \"%s\" - invalid character (RFC 2911 section 4.1.3)."
 msgstr ""
 
-#: systemv/lp.c:264
+#: cups/ipp.c:5399
 #, c-format
-msgid "%s: Error - expected copies after \"-n\" option."
+msgid "\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 2911 section 4.1.9)."
 msgstr ""
 
-#: berkeley/lpr.c:209
+#: cups/ipp.c:5409
 #, c-format
-msgid "%s: Error - expected destination after \"-P\" option."
+msgid "\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 2911 section 4.1.9)."
 msgstr ""
 
-#: systemv/lpstat.c:231
+#: cups/ipp.c:5167
 #, c-format
-msgid "%s: Error - expected destination after \"-b\" option."
+msgid "\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.2)."
 msgstr ""
 
-#: systemv/lp.c:138
+#: cups/ipp.c:5176
 #, c-format
-msgid "%s: Error - expected destination after \"-d\" option."
+msgid "\"%s\": Bad name value \"%s\" - bad length %d (RFC 2911 section 4.1.2)."
 msgstr ""
 
-#: systemv/lp.c:168
+#: cups/ipp.c:5345
 #, c-format
-msgid "%s: Error - expected form after \"-f\" option."
+msgid "\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 2911 section 4.1.8)."
 msgstr ""
 
-#: systemv/lp.c:391
+#: cups/ipp.c:5355
 #, c-format
-msgid "%s: Error - expected hold name after \"-H\" option."
+msgid "\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 2911 section 4.1.8)."
 msgstr ""
 
-#: berkeley/lpr.c:103
+#: cups/ipp.c:4904
 #, c-format
-msgid "%s: Error - expected hostname after \"-H\" option."
+msgid "\"%s\": Bad octetString value - bad length %d (RFC 2911 section 4.1.10)."
 msgstr ""
 
-#: berkeley/lpq.c:180 berkeley/lprm.c:123 systemv/cancel.c:124
-#: systemv/cupsaccept.c:123 systemv/lp.c:189 systemv/lpstat.c:291
+#: cups/ipp.c:5047
 #, c-format
-msgid "%s: Error - expected hostname after \"-h\" option."
+msgid "\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 2911 section 4.1.13)."
 msgstr ""
 
-#: systemv/lp.c:371
+#: cups/ipp.c:5028
 #, c-format
-msgid "%s: Error - expected mode list after \"-y\" option."
+msgid "\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 2911 section 4.1.15)."
 msgstr ""
 
-#: berkeley/lpr.c:263
+#: cups/ipp.c:4997
 #, c-format
-msgid "%s: Error - expected name after \"-%c\" option."
+msgid "\"%s\": Bad resolution value %dx%d%s - cross feed resolution must be positive (RFC 2911 section 4.1.15)."
 msgstr ""
 
-#: berkeley/lpr.c:153 systemv/lp.c:288
+#: cups/ipp.c:5012
 #, c-format
-msgid "%s: Error - expected option=value after \"-o\" option."
+msgid "\"%s\": Bad resolution value %dx%d%s - feed resolution must be positive (RFC 2911 section 4.1.15)."
 msgstr ""
 
-#: systemv/lp.c:441
+#: cups/ipp.c:5109
 #, c-format
-msgid "%s: Error - expected page list after \"-P\" option."
+msgid "\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.1)."
 msgstr ""
 
-#: systemv/lp.c:308
+#: cups/ipp.c:5118
 #, c-format
-msgid "%s: Error - expected priority after \"-%c\" option."
+msgid "\"%s\": Bad text value \"%s\" - bad length %d (RFC 2911 section 4.1.1)."
 msgstr ""
 
-#: systemv/cupsaccept.c:141
+#: cups/ipp.c:5261
 #, c-format
-msgid "%s: Error - expected reason text after \"-r\" option."
+msgid "\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 2911 section 4.1.6)."
 msgstr ""
 
-#: systemv/lp.c:354
+#: cups/ipp.c:5270
 #, c-format
-msgid "%s: Error - expected title after \"-t\" option."
+msgid "\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 2911 section 4.1.6)."
 msgstr ""
 
-#: berkeley/lpq.c:111 berkeley/lpr.c:84 berkeley/lprm.c:104
-#: systemv/cancel.c:94 systemv/cupsaccept.c:101 systemv/lp.c:116
-#: systemv/lpadmin.c:387 systemv/lpstat.c:137
+#: berkeley/lpq.c:533
 #, c-format
-msgid "%s: Error - expected username after \"-U\" option."
+msgid "%-7s %-7.7s %-7d %-31.31s %.0f bytes"
 msgstr ""
 
-#: systemv/cancel.c:145
+#: systemv/lpstat.c:779
 #, c-format
-msgid "%s: Error - expected username after \"-u\" option."
+msgid "%s accepting requests since %s"
 msgstr ""
 
-#: berkeley/lpr.c:125
+#: scheduler/ipp.c:9841
 #, c-format
-msgid "%s: Error - expected value after \"-%c\" option."
+msgid "%s cannot be changed."
 msgstr ""
 
-#: systemv/lpstat.c:157 systemv/lpstat.c:171
+#: berkeley/lpc.c:181
 #, c-format
-msgid "%s: Error - need \"completed\", \"not-completed\", or \"all\" after \"-W\" option."
+msgid "%s is not implemented by the CUPS version of lpc."
 msgstr ""
 
-#: berkeley/lpq.c:241 berkeley/lpr.c:349 systemv/lp.c:589
+#: berkeley/lpq.c:618
 #, c-format
-msgid "%s: Error - no default destination available."
+msgid "%s is not ready"
 msgstr ""
 
-#: systemv/lp.c:330
+#: berkeley/lpq.c:611
 #, c-format
-msgid "%s: Error - priority must be between 1 and 100."
+msgid "%s is ready"
 msgstr ""
 
-#: berkeley/lpr.c:352 systemv/lp.c:592
+#: berkeley/lpq.c:614
 #, c-format
-msgid "%s: Error - scheduler not responding."
+msgid "%s is ready and printing"
 msgstr ""
 
-#: berkeley/lpr.c:305 systemv/lp.c:537
+#: filter/rastertoepson.c:970 filter/rastertohp.c:700
+#: filter/rastertolabel.c:1120
 #, c-format
-msgid "%s: Error - too many files - \"%s\"."
+msgid "%s job-id user title copies options [file]"
 msgstr ""
 
-#: berkeley/lpr.c:287 systemv/lp.c:520
+#: systemv/lpstat.c:783
 #, c-format
-msgid "%s: Error - unable to access \"%s\" - %s"
+msgid "%s not accepting requests since %s -"
 msgstr ""
 
-#: berkeley/lpr.c:396 systemv/lp.c:624
+#: scheduler/ipp.c:618
 #, c-format
-msgid "%s: Error - unable to queue from stdin - %s."
+msgid "%s not supported."
 msgstr ""
 
-#: berkeley/lprm.c:87 berkeley/lprm.c:172 systemv/cancel.c:214
+#: systemv/lpstat.c:794
 #, c-format
-msgid "%s: Error - unknown destination \"%s\"."
+msgid "%s/%s accepting requests since %s"
 msgstr ""
 
-#: berkeley/lpq.c:150
+#: systemv/lpstat.c:799
 #, c-format
-msgid "%s: Error - unknown destination \"%s/%s\"."
+msgid "%s/%s not accepting requests since %s -"
 msgstr ""
 
-#: berkeley/lpr.c:274 berkeley/lprm.c:139 systemv/cancel.c:156
-#: systemv/cupsaccept.c:164 systemv/lp.c:496 systemv/lpstat.c:452
+#: berkeley/lpq.c:526
 #, c-format
-msgid "%s: Error - unknown option \"%c\"."
+msgid "%s: %-33.33s [job %d localhost]"
 msgstr ""
 
-#: systemv/cupsaccept.c:157
+#. TRANSLATORS: Message is "subject: error"
+#: cups/langprintf.c:77 scheduler/cupsfilter.c:726 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
 #, c-format
-msgid "%s: Error - unknown option \"%s\"."
+msgid "%s: %s"
 msgstr ""
 
-#: systemv/lp.c:208
+#: systemv/cancel.c:305 systemv/cancel.c:368
 #, c-format
-msgid "%s: Expected job ID after \"-i\" option."
+msgid "%s: %s failed: %s"
 msgstr ""
 
-#: scheduler/cupsfilter.c:562
+#: test/ippfind.c:773 test/ipptool.c:346
 #, c-format
-msgid "%s: Filter \"%s\" not available: %s"
+msgid "%s: Bad version %s for \"-V\"."
 msgstr ""
 
-#: systemv/lpstat.c:504 systemv/lpstat.c:543
+#: systemv/cupsaccept.c:68
 #, c-format
-msgid "%s: Invalid destination name in list \"%s\"."
+msgid "%s: Don't know what to do."
 msgstr ""
 
-#: scheduler/cupsfilter.c:543
+#: berkeley/lpq.c:225 berkeley/lpr.c:358 systemv/lp.c:602
 #, c-format
-msgid "%s: Invalid filter string \"%s\"."
+msgid "%s: Error - %s environment variable names non-existent destination \"%s\"."
 msgstr ""
 
-#: systemv/lp.c:418
+#: 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
+#, c-format
+msgid "%s: Error - add '/version=1.1' to server name."
+msgstr ""
+
+#: systemv/lp.c:234
+#, c-format
+msgid "%s: Error - bad job ID."
+msgstr ""
+
+#: systemv/lp.c:222
+#, c-format
+msgid "%s: Error - cannot print files and alter jobs simultaneously."
+msgstr ""
+
+#: systemv/lp.c:515
+#, c-format
+msgid "%s: Error - cannot print from stdin if files or a job ID are provided."
+msgstr ""
+
+#: systemv/lp.c:464
+#, c-format
+msgid "%s: Error - expected character set after \"-S\" option."
+msgstr ""
+
+#: systemv/lp.c:483
+#, c-format
+msgid "%s: Error - expected content type after \"-T\" option."
+msgstr ""
+
+#: berkeley/lpr.c:245
+#, c-format
+msgid "%s: Error - expected copies after \"-#\" option."
+msgstr ""
+
+#: systemv/lp.c:267
+#, c-format
+msgid "%s: Error - expected copies after \"-n\" option."
+msgstr ""
+
+#: berkeley/lpr.c:206
+#, c-format
+msgid "%s: Error - expected destination after \"-P\" option."
+msgstr ""
+
+#: systemv/lp.c:132
+#, c-format
+msgid "%s: Error - expected destination after \"-d\" option."
+msgstr ""
+
+#: systemv/lp.c:171
+#, c-format
+msgid "%s: Error - expected form after \"-f\" option."
+msgstr ""
+
+#: systemv/lp.c:394
+#, c-format
+msgid "%s: Error - expected hold name after \"-H\" option."
+msgstr ""
+
+#: berkeley/lpr.c:100
+#, 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
+#, c-format
+msgid "%s: Error - expected hostname after \"-h\" option."
+msgstr ""
+
+#: systemv/lp.c:374
+#, c-format
+msgid "%s: Error - expected mode list after \"-y\" option."
+msgstr ""
+
+#: berkeley/lpr.c:268
+#, c-format
+msgid "%s: Error - expected name after \"-%c\" option."
+msgstr ""
+
+#: berkeley/lpr.c:150 systemv/lp.c:291
+#, c-format
+msgid "%s: Error - expected option=value after \"-o\" option."
+msgstr ""
+
+#: systemv/lp.c:444
+#, c-format
+msgid "%s: Error - expected page list after \"-P\" option."
+msgstr ""
+
+#: systemv/lp.c:311
+#, c-format
+msgid "%s: Error - expected priority after \"-%c\" option."
+msgstr ""
+
+#: systemv/cupsaccept.c:141
+#, c-format
+msgid "%s: Error - expected reason text after \"-r\" option."
+msgstr ""
+
+#: systemv/lp.c:357
+#, 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
+#, c-format
+msgid "%s: Error - expected username after \"-U\" option."
+msgstr ""
+
+#: systemv/cancel.c:145
+#, c-format
+msgid "%s: Error - expected username after \"-u\" option."
+msgstr ""
+
+#: berkeley/lpr.c:122
+#, c-format
+msgid "%s: Error - expected value after \"-%c\" option."
+msgstr ""
+
+#: systemv/lpstat.c:144 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
+#, c-format
+msgid "%s: Error - no default destination available."
+msgstr ""
+
+#: systemv/lp.c:333
+#, c-format
+msgid "%s: Error - priority must be between 1 and 100."
+msgstr ""
+
+#: berkeley/lpr.c:366 systemv/lp.c:610
+#, c-format
+msgid "%s: Error - scheduler not responding."
+msgstr ""
+
+#: berkeley/lpr.c:311 systemv/lp.c:547
+#, c-format
+msgid "%s: Error - too many files - \"%s\"."
+msgstr ""
+
+#: berkeley/lpr.c:293 systemv/lp.c:530
+#, c-format
+msgid "%s: Error - unable to access \"%s\" - %s"
+msgstr ""
+
+#: berkeley/lpr.c:409 systemv/lp.c:641
+#, c-format
+msgid "%s: Error - unable to queue from stdin - %s."
+msgstr ""
+
+#: berkeley/lprm.c:87 berkeley/lprm.c:172 systemv/cancel.c:222
+#, c-format
+msgid "%s: Error - unknown destination \"%s\"."
+msgstr ""
+
+#: berkeley/lpq.c:137
+#, 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
+#, c-format
+msgid "%s: Error - unknown option \"%c\"."
+msgstr ""
+
+#: systemv/cupsaccept.c:157 systemv/lp.c:497
+#, c-format
+msgid "%s: Error - unknown option \"%s\"."
+msgstr ""
+
+#: systemv/lp.c:211
+#, c-format
+msgid "%s: Expected job ID after \"-i\" option."
+msgstr ""
+
+#: systemv/lpstat.c:514 systemv/lpstat.c:554
+#, c-format
+msgid "%s: Invalid destination name in list \"%s\"."
+msgstr ""
+
+#: scheduler/cupsfilter.c:579
+#, c-format
+msgid "%s: Invalid filter string \"%s\"."
+msgstr ""
+
+#: test/ippfind.c:745 test/ipptool.c:314
+#, c-format
+msgid "%s: Missing timeout for \"-T\"."
+msgstr ""
+
+#: test/ippfind.c:758 test/ipptool.c:328
+#, c-format
+msgid "%s: Missing version for \"-V\"."
+msgstr ""
+
+#: systemv/lp.c:421
 #, c-format
 msgid "%s: Need job ID (\"-i jobid\") before \"-H restart\"."
 msgstr ""
 
-#: scheduler/cupsfilter.c:457
+#: scheduler/cupsfilter.c:451
 #, c-format
 msgid "%s: No filter to convert from %s/%s to %s/%s."
 msgstr ""
@@ -1677,1510 +2033,1502 @@ msgstr ""
 msgid "%s: Operation failed: %s"
 msgstr ""
 
-#: berkeley/lpq.c:97 berkeley/lpr.c:70 berkeley/lprm.c:67 systemv/cancel.c:81
-#: systemv/cupsaccept.c:88 systemv/cupsaddsmb.c:86 systemv/lp.c:102
-#: systemv/lpadmin.c:233 systemv/lpinfo.c:88 systemv/lpmove.c:73
-#: systemv/lpstat.c:102 test/ipptool.c:278 test/ipptool.c:295
+#: 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:286 test/ipptool.c:303
 #, c-format
 msgid "%s: Sorry, no encryption support."
 msgstr ""
 
-#: berkeley/lpq.c:295 scheduler/cupsfilter.c:1145 systemv/cancel.c:237
+#: berkeley/lpq.c:284 scheduler/cupsfilter.c:1275 systemv/cancel.c:245
 #: systemv/cupsaddsmb.c:144 systemv/cupsaddsmb.c:171
 #, c-format
 msgid "%s: Unable to connect to server."
 msgstr ""
 
-#: systemv/cancel.c:317
+#: systemv/cancel.c:328
 #, c-format
 msgid "%s: Unable to contact server."
 msgstr ""
 
-#: scheduler/cupsfilter.c:423
+#: scheduler/cupsfilter.c:416
 #, c-format
 msgid "%s: Unable to determine MIME type of \"%s\"."
 msgstr ""
 
-#: ppdc/ppdmerge.cxx:96
+#: ppdc/ppdmerge.cxx:90
 #, c-format
 msgid "%s: Unable to open %s: %s"
 msgstr ""
 
-#: scheduler/cupsfilter.c:607 ppdc/ppdmerge.cxx:112
+#: scheduler/cupsfilter.c:674 ppdc/ppdmerge.cxx:106
 #, c-format
 msgid "%s: Unable to open PPD file: %s on line %d."
 msgstr ""
 
-#: scheduler/cupsfilter.c:388
+#: scheduler/cupsfilter.c:383
 #, c-format
 msgid "%s: Unable to read MIME database from \"%s\" or \"%s\"."
 msgstr ""
 
-#: berkeley/lpq.c:153 systemv/lpstat.c:558
+#: berkeley/lpq.c:140 systemv/lpstat.c:575
 #, c-format
 msgid "%s: Unknown destination \"%s\"."
 msgstr ""
 
-#: scheduler/cupsfilter.c:434
+#: scheduler/cupsfilter.c:428
 #, c-format
 msgid "%s: Unknown destination MIME type %s/%s."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1351
+#: scheduler/cupsfilter.c:1479
 #, c-format
 msgid "%s: Unknown option \"%c\"."
 msgstr ""
 
-#: scheduler/cupsfilter.c:415
+#: test/ippfind.c:644
+#, c-format
+msgid "%s: Unknown option \"%s\"."
+msgstr ""
+
+#: test/ippfind.c:924
+#, c-format
+msgid "%s: Unknown option \"-%c\"."
+msgstr ""
+
+#: scheduler/cupsfilter.c:408
 #, c-format
 msgid "%s: Unknown source MIME type %s/%s."
 msgstr ""
 
-#: berkeley/lpr.c:139
+#: berkeley/lpr.c:136
 #, c-format
 msgid "%s: Warning - \"%c\" format modifier not supported - output may not be correct."
 msgstr ""
 
-#: systemv/lp.c:468
+#: systemv/lp.c:471
 #, c-format
 msgid "%s: Warning - character set option ignored."
 msgstr ""
 
-#: systemv/lp.c:487
+#: systemv/lp.c:490
 #, c-format
 msgid "%s: Warning - content type option ignored."
 msgstr ""
 
-#: systemv/lp.c:175
+#: systemv/lp.c:178
 #, c-format
 msgid "%s: Warning - form option ignored."
 msgstr ""
 
-#: systemv/lp.c:378
+#: systemv/lp.c:381
 #, c-format
 msgid "%s: Warning - mode option ignored."
 msgstr ""
 
-#: ppdc/sample.c:316
+#: ppdc/sample.c:310
 msgid "-1"
 msgstr ""
 
-#: ppdc/sample.c:307
+#: ppdc/sample.c:301
 msgid "-10"
 msgstr ""
 
-#: ppdc/sample.c:399
+#: ppdc/sample.c:393
 msgid "-100"
 msgstr ""
 
-#: ppdc/sample.c:398
+#: ppdc/sample.c:392
 msgid "-105"
 msgstr ""
 
-#: ppdc/sample.c:306
+#: ppdc/sample.c:300
 msgid "-11"
 msgstr ""
 
-#: ppdc/sample.c:397
+#: ppdc/sample.c:391
 msgid "-110"
 msgstr ""
 
-#: ppdc/sample.c:396
+#: ppdc/sample.c:390
 msgid "-115"
 msgstr ""
 
-#: ppdc/sample.c:305
+#: ppdc/sample.c:299
 msgid "-12"
 msgstr ""
 
-#: ppdc/sample.c:395
+#: ppdc/sample.c:389
 msgid "-120"
 msgstr ""
 
-#: ppdc/sample.c:304
+#: ppdc/sample.c:298
 msgid "-13"
 msgstr ""
 
-#: ppdc/sample.c:303
+#: ppdc/sample.c:297
 msgid "-14"
 msgstr ""
 
-#: ppdc/sample.c:302
+#: ppdc/sample.c:296
 msgid "-15"
 msgstr ""
 
-#: ppdc/sample.c:315
+#: ppdc/sample.c:309
 msgid "-2"
 msgstr ""
 
-#: ppdc/sample.c:415
+#: ppdc/sample.c:409
 msgid "-20"
 msgstr ""
 
-#: ppdc/sample.c:414
+#: ppdc/sample.c:408
 msgid "-25"
 msgstr ""
 
-#: ppdc/sample.c:314
+#: ppdc/sample.c:308
 msgid "-3"
 msgstr ""
 
-#: ppdc/sample.c:413
+#: ppdc/sample.c:407
 msgid "-30"
 msgstr ""
 
-#: ppdc/sample.c:412
+#: ppdc/sample.c:406
 msgid "-35"
 msgstr ""
 
-#: ppdc/sample.c:313
+#: ppdc/sample.c:307
 msgid "-4"
 msgstr ""
 
-#: ppdc/sample.c:411
+#: ppdc/sample.c:405
 msgid "-40"
 msgstr ""
 
-#: ppdc/sample.c:410
+#: ppdc/sample.c:404
 msgid "-45"
 msgstr ""
 
-#: ppdc/sample.c:312
+#: ppdc/sample.c:306
 msgid "-5"
 msgstr ""
 
-#: ppdc/sample.c:409
+#: ppdc/sample.c:403
 msgid "-50"
 msgstr ""
 
-#: ppdc/sample.c:408
+#: ppdc/sample.c:402
 msgid "-55"
 msgstr ""
 
-#: ppdc/sample.c:311
+#: ppdc/sample.c:305
 msgid "-6"
 msgstr ""
 
-#: ppdc/sample.c:407
+#: ppdc/sample.c:401
 msgid "-60"
 msgstr ""
 
-#: ppdc/sample.c:406
+#: ppdc/sample.c:400
 msgid "-65"
 msgstr ""
 
-#: ppdc/sample.c:310
+#: ppdc/sample.c:304
 msgid "-7"
 msgstr ""
 
-#: ppdc/sample.c:405
+#: ppdc/sample.c:399
 msgid "-70"
 msgstr ""
 
-#: ppdc/sample.c:404
+#: ppdc/sample.c:398
 msgid "-75"
 msgstr ""
 
-#: ppdc/sample.c:309
+#: ppdc/sample.c:303
 msgid "-8"
 msgstr ""
 
-#: ppdc/sample.c:403
+#: ppdc/sample.c:397
 msgid "-80"
 msgstr ""
 
-#: ppdc/sample.c:402
+#: ppdc/sample.c:396
 msgid "-85"
 msgstr ""
 
-#: ppdc/sample.c:308
+#: ppdc/sample.c:302
 msgid "-9"
 msgstr ""
 
-#: ppdc/sample.c:401
+#: ppdc/sample.c:395
 msgid "-90"
 msgstr ""
 
-#: ppdc/sample.c:400
+#: ppdc/sample.c:394
 msgid "-95"
 msgstr ""
 
-#: ppdc/sample.c:317
+#: ppdc/sample.c:311
 msgid "0"
 msgstr ""
 
-#: ppdc/sample.c:318
+#: ppdc/sample.c:312
 msgid "1"
 msgstr ""
 
-#: ppdc/sample.c:390
+#: ppdc/sample.c:384
 msgid "1 inch/sec."
 msgstr ""
 
-#: ppdc/sample.c:178
+#: ppdc/sample.c:172
 msgid "1.25x0.25\""
 msgstr ""
 
-#: ppdc/sample.c:179
+#: ppdc/sample.c:173
 msgid "1.25x2.25\""
 msgstr ""
 
-#: ppdc/sample.c:438
+#: ppdc/sample.c:432
 msgid "1.5 inch/sec."
 msgstr ""
 
-#: ppdc/sample.c:180
+#: ppdc/sample.c:174
 msgid "1.50x0.25\""
 msgstr ""
 
-#: ppdc/sample.c:181
+#: ppdc/sample.c:175
 msgid "1.50x0.50\""
 msgstr ""
 
-#: ppdc/sample.c:182
+#: ppdc/sample.c:176
 msgid "1.50x1.00\""
 msgstr ""
 
-#: ppdc/sample.c:183
+#: ppdc/sample.c:177
 msgid "1.50x2.00\""
 msgstr ""
 
-#: ppdc/sample.c:327
+#: ppdc/sample.c:321
 msgid "10"
 msgstr ""
 
-#: ppdc/sample.c:449
+#: ppdc/sample.c:443
 msgid "10 inches/sec."
 msgstr ""
 
-#: ppdc/sample.c:3
-msgid "10 x 11\""
+#: ppdc/sample.c:6
+msgid "10 x 11"
 msgstr ""
 
-#: ppdc/sample.c:4
-msgid "10 x 13\""
+#: ppdc/sample.c:7
+msgid "10 x 13"
 msgstr ""
 
-#: ppdc/sample.c:5
-msgid "10 x 14\""
+#: ppdc/sample.c:8
+msgid "10 x 14"
 msgstr ""
 
-#: ppdc/sample.c:429
+#: ppdc/sample.c:423
 msgid "100"
 msgstr ""
 
-#: ppdc/sample.c:340
+#: ppdc/sample.c:334
 msgid "100 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:430
+#: ppdc/sample.c:424
 msgid "105"
 msgstr ""
 
-#: ppdc/sample.c:328
+#: ppdc/sample.c:322
 msgid "11"
 msgstr ""
 
-#: ppdc/sample.c:450
+#: ppdc/sample.c:444
 msgid "11 inches/sec."
 msgstr ""
 
-#: ppdc/sample.c:431
+#: ppdc/sample.c:425
 msgid "110"
 msgstr ""
 
-#: ppdc/sample.c:432
+#: ppdc/sample.c:426
 msgid "115"
 msgstr ""
 
-#: ppdc/sample.c:329
+#: ppdc/sample.c:323
 msgid "12"
 msgstr ""
 
-#: ppdc/sample.c:451
+#: ppdc/sample.c:445
 msgid "12 inches/sec."
 msgstr ""
 
-#: ppdc/sample.c:6
-msgid "12 x 11\""
+#: ppdc/sample.c:9
+msgid "12 x 11"
 msgstr ""
 
-#: ppdc/sample.c:433
+#: ppdc/sample.c:427
 msgid "120"
 msgstr ""
 
-#: ppdc/sample.c:341
+#: ppdc/sample.c:335
 msgid "120 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:249
+#: ppdc/sample.c:243
 msgid "120x60dpi"
 msgstr ""
 
-#: ppdc/sample.c:255
+#: ppdc/sample.c:249
 msgid "120x72dpi"
 msgstr ""
 
-#: ppdc/sample.c:330
+#: ppdc/sample.c:324
 msgid "13"
 msgstr ""
 
-#: ppdc/sample.c:238
+#: ppdc/sample.c:232
 msgid "136dpi"
 msgstr ""
 
-#: ppdc/sample.c:331
+#: ppdc/sample.c:325
 msgid "14"
 msgstr ""
 
-#: ppdc/sample.c:332
+#: ppdc/sample.c:326
 msgid "15"
 msgstr ""
 
-#: ppdc/sample.c:334
+#: ppdc/sample.c:328
 msgid "15 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:7
-msgid "15 x 11\""
+#: ppdc/sample.c:10
+msgid "15 x 11"
 msgstr ""
 
-#: ppdc/sample.c:342
+#: ppdc/sample.c:336
 msgid "150 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:289
+#: ppdc/sample.c:283
 msgid "150dpi"
 msgstr ""
 
-#: ppdc/sample.c:374
+#: ppdc/sample.c:368
 msgid "16"
 msgstr ""
 
-#: ppdc/sample.c:375
+#: ppdc/sample.c:369
 msgid "17"
 msgstr ""
 
-#: ppdc/sample.c:376
+#: ppdc/sample.c:370
 msgid "18"
 msgstr ""
 
-#: ppdc/sample.c:250
+#: ppdc/sample.c:244
 msgid "180dpi"
 msgstr ""
 
-#: ppdc/sample.c:377
+#: ppdc/sample.c:371
 msgid "19"
 msgstr ""
 
-#: ppdc/sample.c:319
+#: ppdc/sample.c:313
 msgid "2"
 msgstr ""
 
-#: ppdc/sample.c:391
+#: ppdc/sample.c:385
 msgid "2 inches/sec."
 msgstr ""
 
-#: ppdc/sample.c:276
+#: ppdc/sample.c:270
 msgid "2-Sided Printing"
 msgstr ""
 
-#: ppdc/sample.c:184
+#: ppdc/sample.c:178
 msgid "2.00x0.37\""
 msgstr ""
 
-#: ppdc/sample.c:185
+#: ppdc/sample.c:179
 msgid "2.00x0.50\""
 msgstr ""
 
-#: ppdc/sample.c:186
+#: ppdc/sample.c:180
 msgid "2.00x1.00\""
 msgstr ""
 
-#: ppdc/sample.c:187
+#: ppdc/sample.c:181
 msgid "2.00x1.25\""
 msgstr ""
 
-#: ppdc/sample.c:188
+#: ppdc/sample.c:182
 msgid "2.00x2.00\""
 msgstr ""
 
-#: ppdc/sample.c:189
+#: ppdc/sample.c:183
 msgid "2.00x3.00\""
 msgstr ""
 
-#: ppdc/sample.c:190
+#: ppdc/sample.c:184
 msgid "2.00x4.00\""
 msgstr ""
 
-#: ppdc/sample.c:191
+#: ppdc/sample.c:185
 msgid "2.00x5.50\""
 msgstr ""
 
-#: ppdc/sample.c:192
+#: ppdc/sample.c:186
 msgid "2.25x0.50\""
 msgstr ""
 
-#: ppdc/sample.c:193
+#: ppdc/sample.c:187
 msgid "2.25x1.25\""
 msgstr ""
 
-#: ppdc/sample.c:194
+#: ppdc/sample.c:188
 msgid "2.25x4.00\""
 msgstr ""
 
-#: ppdc/sample.c:195
+#: ppdc/sample.c:189
 msgid "2.25x5.50\""
 msgstr ""
 
-#: ppdc/sample.c:196
+#: ppdc/sample.c:190
 msgid "2.38x5.50\""
 msgstr ""
 
-#: ppdc/sample.c:439
+#: ppdc/sample.c:433
 msgid "2.5 inches/sec."
 msgstr ""
 
-#: ppdc/sample.c:197
+#: ppdc/sample.c:191
 msgid "2.50x1.00\""
 msgstr ""
 
-#: ppdc/sample.c:198
+#: ppdc/sample.c:192
 msgid "2.50x2.00\""
 msgstr ""
 
-#: ppdc/sample.c:199
+#: ppdc/sample.c:193
 msgid "2.75x1.25\""
 msgstr ""
 
-#: ppdc/sample.c:200
+#: ppdc/sample.c:194
 msgid "2.9 x 1\""
 msgstr ""
 
-#: ppdc/sample.c:378
+#: ppdc/sample.c:372
 msgid "20"
 msgstr ""
 
-#: ppdc/sample.c:335
+#: ppdc/sample.c:329
 msgid "20 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:343
+#: ppdc/sample.c:337
 msgid "200 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:239
+#: ppdc/sample.c:233
 msgid "203dpi"
 msgstr ""
 
-#: ppdc/sample.c:379
+#: ppdc/sample.c:373
 msgid "21"
 msgstr ""
 
-#: ppdc/sample.c:380
+#: ppdc/sample.c:374
 msgid "22"
 msgstr ""
 
-#: ppdc/sample.c:381
+#: ppdc/sample.c:375
 msgid "23"
 msgstr ""
 
-#: ppdc/sample.c:382
+#: ppdc/sample.c:376
 msgid "24"
 msgstr ""
 
-#: ppdc/sample.c:247
+#: ppdc/sample.c:241
 msgid "24-Pin Series"
 msgstr ""
 
-#: ppdc/sample.c:256
+#: ppdc/sample.c:250
 msgid "240x72dpi"
 msgstr ""
 
-#: ppdc/sample.c:383
+#: ppdc/sample.c:377
 msgid "25"
 msgstr ""
 
-#: ppdc/sample.c:344
+#: ppdc/sample.c:338
 msgid "250 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:384
+#: ppdc/sample.c:378
 msgid "26"
 msgstr ""
 
-#: ppdc/sample.c:385
+#: ppdc/sample.c:379
 msgid "27"
 msgstr ""
 
-#: ppdc/sample.c:386
+#: ppdc/sample.c:380
 msgid "28"
 msgstr ""
 
-#: ppdc/sample.c:387
+#: ppdc/sample.c:381
 msgid "29"
 msgstr ""
 
-#: ppdc/sample.c:320
+#: ppdc/sample.c:314
 msgid "3"
 msgstr ""
 
-#: ppdc/sample.c:392
+#: ppdc/sample.c:386
 msgid "3 inches/sec."
 msgstr ""
 
-#: ppdc/sample.c:201
+#: ppdc/sample.c:3
+msgid "3 x 5"
+msgstr ""
+
+#: ppdc/sample.c:195
 msgid "3.00x1.00\""
 msgstr ""
 
-#: ppdc/sample.c:202
+#: ppdc/sample.c:196
 msgid "3.00x1.25\""
 msgstr ""
 
-#: ppdc/sample.c:203
+#: ppdc/sample.c:197
 msgid "3.00x2.00\""
 msgstr ""
 
-#: ppdc/sample.c:204
+#: ppdc/sample.c:198
 msgid "3.00x3.00\""
 msgstr ""
 
-#: ppdc/sample.c:205
+#: ppdc/sample.c:199
 msgid "3.00x5.00\""
 msgstr ""
 
-#: ppdc/sample.c:206
+#: ppdc/sample.c:200
 msgid "3.25x2.00\""
 msgstr ""
 
-#: ppdc/sample.c:207
+#: ppdc/sample.c:201
 msgid "3.25x5.00\""
 msgstr ""
 
-#: ppdc/sample.c:208
+#: ppdc/sample.c:202
 msgid "3.25x5.50\""
 msgstr ""
 
-#: ppdc/sample.c:209
+#: ppdc/sample.c:203
 msgid "3.25x5.83\""
 msgstr ""
 
-#: ppdc/sample.c:210
+#: ppdc/sample.c:204
 msgid "3.25x7.83\""
 msgstr ""
 
-#: ppdc/sample.c:168
-msgid "3.5\" Disk"
+#: ppdc/sample.c:4
+msgid "3.5 x 5"
 msgstr ""
 
-#: ppdc/sample.c:177
-msgid "3.5\" Disk - 2 1/8 x 2 3/4\""
+#: ppdc/sample.c:171
+msgid "3.5\" Disk"
 msgstr ""
 
-#: ppdc/sample.c:211
+#: ppdc/sample.c:205
 msgid "3.50x1.00\""
 msgstr ""
 
-#: ppdc/sample.c:388
+#: ppdc/sample.c:382
 msgid "30"
 msgstr ""
 
-#: ppdc/sample.c:336
+#: ppdc/sample.c:330
 msgid "30 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:345
+#: ppdc/sample.c:339
 msgid "300 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:240
+#: ppdc/sample.c:234
 msgid "300dpi"
 msgstr ""
 
-#: ppdc/sample.c:416
+#: ppdc/sample.c:410
 msgid "35"
 msgstr ""
 
-#: ppdc/sample.c:252
+#: ppdc/sample.c:246
 msgid "360dpi"
 msgstr ""
 
-#: ppdc/sample.c:251
+#: ppdc/sample.c:245
 msgid "360x180dpi"
 msgstr ""
 
-#: ppdc/sample.c:321
+#: ppdc/sample.c:315
 msgid "4"
 msgstr ""
 
-#: ppdc/sample.c:393
+#: ppdc/sample.c:387
 msgid "4 inches/sec."
 msgstr ""
 
-#: ppdc/sample.c:212
+#: ppdc/sample.c:206
 msgid "4.00x1.00\""
 msgstr ""
 
-#: ppdc/sample.c:220
+#: ppdc/sample.c:214
 msgid "4.00x13.00\""
 msgstr ""
 
-#: ppdc/sample.c:213
+#: ppdc/sample.c:207
 msgid "4.00x2.00\""
 msgstr ""
 
-#: ppdc/sample.c:214
+#: ppdc/sample.c:208
 msgid "4.00x2.50\""
 msgstr ""
 
-#: ppdc/sample.c:215
+#: ppdc/sample.c:209
 msgid "4.00x3.00\""
 msgstr ""
 
-#: ppdc/sample.c:216
+#: ppdc/sample.c:210
 msgid "4.00x4.00\""
 msgstr ""
 
-#: ppdc/sample.c:217
+#: ppdc/sample.c:211
 msgid "4.00x5.00\""
 msgstr ""
 
-#: ppdc/sample.c:218
+#: ppdc/sample.c:212
 msgid "4.00x6.00\""
 msgstr ""
 
-#: ppdc/sample.c:219
+#: ppdc/sample.c:213
 msgid "4.00x6.50\""
 msgstr ""
 
-#: ppdc/sample.c:417
+#: ppdc/sample.c:411
 msgid "40"
 msgstr ""
 
-#: ppdc/sample.c:337
+#: ppdc/sample.c:331
 msgid "40 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:418
+#: ppdc/sample.c:412
 msgid "45"
 msgstr ""
 
-#: ppdc/sample.c:322
+#: ppdc/sample.c:316
 msgid "5"
 msgstr ""
 
-#: ppdc/sample.c:443
+#: ppdc/sample.c:437
 msgid "5 inches/sec."
 msgstr ""
 
-#: ppdc/sample.c:419
+#: ppdc/sample.c:5
+msgid "5 x 7"
+msgstr ""
+
+#: ppdc/sample.c:413
 msgid "50"
 msgstr ""
 
-#: ppdc/sample.c:420
+#: ppdc/sample.c:414
 msgid "55"
 msgstr ""
 
-#: ppdc/sample.c:323
+#: ppdc/sample.c:317
 msgid "6"
 msgstr ""
 
-#: ppdc/sample.c:444
+#: ppdc/sample.c:438
 msgid "6 inches/sec."
 msgstr ""
 
-#: ppdc/sample.c:221
+#: ppdc/sample.c:215
 msgid "6.00x1.00\""
 msgstr ""
 
-#: ppdc/sample.c:222
+#: ppdc/sample.c:216
 msgid "6.00x2.00\""
 msgstr ""
 
-#: ppdc/sample.c:223
+#: ppdc/sample.c:217
 msgid "6.00x3.00\""
 msgstr ""
 
-#: ppdc/sample.c:224
+#: ppdc/sample.c:218
 msgid "6.00x4.00\""
 msgstr ""
 
-#: ppdc/sample.c:225
+#: ppdc/sample.c:219
 msgid "6.00x5.00\""
 msgstr ""
 
-#: ppdc/sample.c:226
+#: ppdc/sample.c:220
 msgid "6.00x6.00\""
 msgstr ""
 
-#: ppdc/sample.c:227
+#: ppdc/sample.c:221
 msgid "6.00x6.50\""
 msgstr ""
 
-#: ppdc/sample.c:421
+#: ppdc/sample.c:415
 msgid "60"
 msgstr ""
 
-#: ppdc/sample.c:338
+#: ppdc/sample.c:332
 msgid "60 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:267
+#: ppdc/sample.c:261
 msgid "600dpi"
 msgstr ""
 
-#: ppdc/sample.c:248
+#: ppdc/sample.c:242
 msgid "60dpi"
 msgstr ""
 
-#: ppdc/sample.c:254
+#: ppdc/sample.c:248
 msgid "60x72dpi"
 msgstr ""
 
-#: ppdc/sample.c:422
+#: ppdc/sample.c:416
 msgid "65"
 msgstr ""
 
-#: ppdc/sample.c:324
+#: ppdc/sample.c:318
 msgid "7"
 msgstr ""
 
-#: ppdc/sample.c:446
+#: ppdc/sample.c:440
 msgid "7 inches/sec."
 msgstr ""
 
-#: ppdc/sample.c:8
-msgid "7 x 9\""
+#: ppdc/sample.c:11
+msgid "7 x 9"
 msgstr ""
 
-#: ppdc/sample.c:423
+#: ppdc/sample.c:417
 msgid "70"
 msgstr ""
 
-#: ppdc/sample.c:258
+#: ppdc/sample.c:252
 msgid "720dpi"
 msgstr ""
 
-#: ppdc/sample.c:424
+#: ppdc/sample.c:418
 msgid "75"
 msgstr ""
 
-#: ppdc/sample.c:325
+#: ppdc/sample.c:319
 msgid "8"
 msgstr ""
 
-#: ppdc/sample.c:447
+#: ppdc/sample.c:441
 msgid "8 inches/sec."
 msgstr ""
 
-#: ppdc/sample.c:9
-msgid "8 x 10\""
+#: ppdc/sample.c:12
+msgid "8 x 10"
 msgstr ""
 
-#: ppdc/sample.c:228
+#: ppdc/sample.c:222
 msgid "8.00x1.00\""
 msgstr ""
 
-#: ppdc/sample.c:229
+#: ppdc/sample.c:223
 msgid "8.00x2.00\""
 msgstr ""
 
-#: ppdc/sample.c:230
+#: ppdc/sample.c:224
 msgid "8.00x3.00\""
 msgstr ""
 
-#: ppdc/sample.c:231
+#: ppdc/sample.c:225
 msgid "8.00x4.00\""
 msgstr ""
 
-#: ppdc/sample.c:232
+#: ppdc/sample.c:226
 msgid "8.00x5.00\""
 msgstr ""
 
-#: ppdc/sample.c:233
+#: ppdc/sample.c:227
 msgid "8.00x6.00\""
 msgstr ""
 
-#: ppdc/sample.c:234
+#: ppdc/sample.c:228
 msgid "8.00x6.50\""
 msgstr ""
 
-#: ppdc/sample.c:425
+#: ppdc/sample.c:419
 msgid "80"
 msgstr ""
 
-#: ppdc/sample.c:339
+#: ppdc/sample.c:333
 msgid "80 mm/sec."
 msgstr ""
 
-#: ppdc/sample.c:426
+#: ppdc/sample.c:420
 msgid "85"
 msgstr ""
 
-#: ppdc/sample.c:326
+#: ppdc/sample.c:320
 msgid "9"
 msgstr ""
 
-#: ppdc/sample.c:448
+#: ppdc/sample.c:442
 msgid "9 inches/sec."
 msgstr ""
 
-#: ppdc/sample.c:10
-msgid "9 x 11\""
+#: ppdc/sample.c:13
+msgid "9 x 11"
 msgstr ""
 
-#: ppdc/sample.c:11
-msgid "9 x 12\""
+#: ppdc/sample.c:14
+msgid "9 x 12"
 msgstr ""
 
-#: ppdc/sample.c:253
+#: ppdc/sample.c:247
 msgid "9-Pin Series"
 msgstr ""
 
-#: ppdc/sample.c:427
+#: ppdc/sample.c:421
 msgid "90"
 msgstr ""
 
-#: ppdc/sample.c:428
+#: ppdc/sample.c:422
 msgid "95"
 msgstr ""
 
-#: berkeley/lpc.c:213
+#: berkeley/lpc.c:205
 msgid "?Invalid help command unknown."
 msgstr ""
 
-#: cgi-bin/admin.c:2443
+#: cgi-bin/admin.c:2348
 msgid "A Samba password is required to export printer drivers"
 msgstr ""
 
-#: cgi-bin/admin.c:2439
+#: cgi-bin/admin.c:2344
 msgid "A Samba username is required to export printer drivers"
 msgstr ""
 
-#: scheduler/ipp.c:2431
+#: scheduler/ipp.c:2273
 #, c-format
 msgid "A class named \"%s\" already exists."
 msgstr ""
 
-#: scheduler/ipp.c:1034
+#: scheduler/ipp.c:916
 #, c-format
 msgid "A printer named \"%s\" already exists."
 msgstr ""
 
-#: ppdc/sample.c:12
+#: ppdc/sample.c:15
 msgid "A0"
 msgstr ""
 
-#: ppdc/sample.c:13
+#: ppdc/sample.c:16
 msgid "A0 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:14
+#: ppdc/sample.c:17
 msgid "A1"
 msgstr ""
 
-#: ppdc/sample.c:15
+#: ppdc/sample.c:18
 msgid "A1 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:34
+#: ppdc/sample.c:37
 msgid "A10"
 msgstr ""
 
-#: ppdc/sample.c:16
+#: ppdc/sample.c:19
 msgid "A2"
 msgstr ""
 
-#: ppdc/sample.c:17
+#: ppdc/sample.c:20
 msgid "A2 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:18
+#: ppdc/sample.c:21
 msgid "A3"
 msgstr ""
 
-#: ppdc/sample.c:19
+#: ppdc/sample.c:22
 msgid "A3 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:20
+#: ppdc/sample.c:23
 msgid "A3 Oversize"
 msgstr ""
 
-#: ppdc/sample.c:21
+#: ppdc/sample.c:24
 msgid "A3 Oversize Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:22
+#: ppdc/sample.c:25
 msgid "A4"
 msgstr ""
 
-#: ppdc/sample.c:24
+#: ppdc/sample.c:27
 msgid "A4 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:23
+#: ppdc/sample.c:26
 msgid "A4 Oversize"
 msgstr ""
 
-#: ppdc/sample.c:25
+#: ppdc/sample.c:28
 msgid "A4 Small"
 msgstr ""
 
-#: ppdc/sample.c:26
+#: ppdc/sample.c:29
 msgid "A5"
 msgstr ""
 
-#: ppdc/sample.c:28
+#: ppdc/sample.c:31
 msgid "A5 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:27
+#: ppdc/sample.c:30
 msgid "A5 Oversize"
 msgstr ""
 
-#: ppdc/sample.c:29
+#: ppdc/sample.c:32
 msgid "A6"
 msgstr ""
 
-#: ppdc/sample.c:30
+#: ppdc/sample.c:33
 msgid "A6 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:31
+#: ppdc/sample.c:34
 msgid "A7"
 msgstr ""
 
-#: ppdc/sample.c:32
+#: ppdc/sample.c:35
 msgid "A8"
 msgstr ""
 
-#: ppdc/sample.c:33
+#: ppdc/sample.c:36
 msgid "A9"
 msgstr ""
 
-#: ppdc/sample.c:35
+#: ppdc/sample.c:38
 msgid "ANSI A"
 msgstr ""
 
-#: ppdc/sample.c:36
+#: ppdc/sample.c:39
 msgid "ANSI B"
 msgstr ""
 
-#: ppdc/sample.c:37
+#: ppdc/sample.c:40
 msgid "ANSI C"
 msgstr ""
 
-#: ppdc/sample.c:38
+#: ppdc/sample.c:41
 msgid "ANSI D"
 msgstr ""
 
-#: ppdc/sample.c:39
+#: ppdc/sample.c:42
 msgid "ANSI E"
 msgstr ""
 
-#: ppdc/sample.c:44
+#: ppdc/sample.c:47
 msgid "ARCH C"
 msgstr ""
 
-#: ppdc/sample.c:45
+#: ppdc/sample.c:48
 msgid "ARCH C Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:46
+#: ppdc/sample.c:49
 msgid "ARCH D"
 msgstr ""
 
-#: ppdc/sample.c:47
+#: ppdc/sample.c:50
 msgid "ARCH D Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:48
+#: ppdc/sample.c:51
 msgid "ARCH E"
 msgstr ""
 
-#: ppdc/sample.c:49
+#: ppdc/sample.c:52
 msgid "ARCH E Long Edge"
 msgstr ""
 
-#: cgi-bin/classes.c:169 cgi-bin/printers.c:172
+#: cgi-bin/classes.c:161 cgi-bin/printers.c:164
 msgid "Accept Jobs"
 msgstr ""
 
-#: cups/http-support.c:1253
+#: cups/http-support.c:1347
 msgid "Accepted"
 msgstr ""
 
-#: cgi-bin/admin.c:570
+#: cgi-bin/admin.c:548
 msgid "Add Class"
 msgstr ""
 
-#: cgi-bin/admin.c:883
+#: cgi-bin/admin.c:860
 msgid "Add Printer"
 msgstr ""
 
-#: cgi-bin/admin.c:444 cgi-bin/admin.c:477 cgi-bin/admin.c:525
-#: cgi-bin/admin.c:535
+#: cgi-bin/admin.c:422 cgi-bin/admin.c:455 cgi-bin/admin.c:503
+#: cgi-bin/admin.c:513
 msgid "Add RSS Subscription"
 msgstr ""
 
-#: ppdc/sample.c:160
+#: ppdc/sample.c:163
 msgid "Address"
 msgstr ""
 
-#: ppdc/sample.c:169
-msgid "Address - 1 1/8 x 3 1/2\""
-msgstr ""
-
-#: cgi-bin/admin.c:210 cgi-bin/admin.c:284 cgi-bin/admin.c:2864
+#: cgi-bin/admin.c:188 cgi-bin/admin.c:262 cgi-bin/admin.c:2725
 msgid "Administration"
 msgstr ""
 
-#: ppdc/sample.c:435
+#: ppdc/sample.c:429
 msgid "Always"
 msgstr ""
 
-#: backend/socket.c:127
+#: backend/socket.c:121
 msgid "AppSocket/HP JetDirect"
 msgstr ""
 
-#: ppdc/sample.c:456
+#: ppdc/sample.c:450
 msgid "Applicator"
 msgstr ""
 
-#: scheduler/ipp.c:1159
+#: scheduler/ipp.c:991
 #, c-format
 msgid "Attempt to set %s printer-state to bad value %d."
 msgstr ""
 
-#: scheduler/ipp.c:352
+#: scheduler/ipp.c:239
 #, c-format
 msgid "Attribute groups are out of order (%x < %x)."
 msgstr ""
 
-#: ppdc/sample.c:123
+#: ppdc/sample.c:126
 msgid "B0"
 msgstr ""
 
-#: ppdc/sample.c:124
+#: ppdc/sample.c:127
 msgid "B1"
 msgstr ""
 
-#: ppdc/sample.c:134
+#: ppdc/sample.c:137
 msgid "B10"
 msgstr ""
 
-#: ppdc/sample.c:125
+#: ppdc/sample.c:128
 msgid "B2"
 msgstr ""
 
-#: ppdc/sample.c:126
+#: ppdc/sample.c:129
 msgid "B3"
 msgstr ""
 
-#: ppdc/sample.c:127
+#: ppdc/sample.c:130
 msgid "B4"
 msgstr ""
 
-#: ppdc/sample.c:128
+#: ppdc/sample.c:131
 msgid "B5"
 msgstr ""
 
-#: ppdc/sample.c:129
+#: ppdc/sample.c:132
 msgid "B5 Oversize"
 msgstr ""
 
-#: ppdc/sample.c:130
+#: ppdc/sample.c:133
 msgid "B6"
 msgstr ""
 
-#: ppdc/sample.c:131
+#: ppdc/sample.c:134
 msgid "B7"
 msgstr ""
 
-#: ppdc/sample.c:132
+#: ppdc/sample.c:135
 msgid "B8"
 msgstr ""
 
-#: ppdc/sample.c:133
+#: ppdc/sample.c:136
 msgid "B9"
 msgstr ""
 
-#: cups/dest.c:827
+#: scheduler/ipp.c:10764
+#, c-format
+msgid "Bad 'document-format' value \"%s\"."
+msgstr ""
+
+#: cups/dest.c:1642
 msgid "Bad NULL dests pointer"
 msgstr ""
 
-#: cups/ppd.c:345
+#: cups/ppd.c:303
 msgid "Bad OpenGroup"
 msgstr ""
 
-#: cups/ppd.c:347
+#: cups/ppd.c:305
 msgid "Bad OpenUI/JCLOpenUI"
 msgstr ""
 
-#: cups/ppd.c:349
+#: cups/ppd.c:307
 msgid "Bad OrderDependency"
 msgstr ""
 
-#: cups/ppd-cache.c:144 cups/ppd-cache.c:189 cups/ppd-cache.c:227
-#: cups/ppd-cache.c:233 cups/ppd-cache.c:249 cups/ppd-cache.c:265
-#: cups/ppd-cache.c:274 cups/ppd-cache.c:282 cups/ppd-cache.c:299
-#: cups/ppd-cache.c:307 cups/ppd-cache.c:322 cups/ppd-cache.c:330
-#: cups/ppd-cache.c:348 cups/ppd-cache.c:360 cups/ppd-cache.c:375
-#: cups/ppd-cache.c:387 cups/ppd-cache.c:409 cups/ppd-cache.c:417
-#: cups/ppd-cache.c:435 cups/ppd-cache.c:443 cups/ppd-cache.c:458
-#: cups/ppd-cache.c:466 cups/ppd-cache.c:484 cups/ppd-cache.c:492
-#: cups/ppd-cache.c:519 cups/ppd-cache.c:546 cups/ppd-cache.c:554
-#: cups/ppd-cache.c:562
+#: 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
 msgid "Bad PPD cache file."
 msgstr ""
 
-#: cups/http-support.c:1268
+#: cups/http-support.c:1362
 msgid "Bad Request"
 msgstr ""
 
-#: cups/snmp.c:1002
+#: cups/snmp.c:954
 msgid "Bad SNMP version number"
 msgstr ""
 
-#: cups/ppd.c:350
+#: cups/ppd.c:308
 msgid "Bad UIConstraints"
 msgstr ""
 
-#: filter/pstext.c:278 filter/texttops.c:297 filter/texttops.c:309
-#, c-format
-msgid "Bad charset file \"%s\"."
-msgstr ""
-
-#: filter/texttops.c:472
-#, c-format
-msgid "Bad charset type: %s"
-msgstr ""
-
-#: filter/textcommon.c:613
-#, c-format
-msgid "Bad columns value %d."
+#: cups/http-support.c:1456
+msgid "Bad arguments to function"
 msgstr ""
 
-#: scheduler/ipp.c:1460
+#: scheduler/ipp.c:1352
 #, c-format
 msgid "Bad copies value %d."
 msgstr ""
 
-#: filter/textcommon.c:625
-#, c-format
-msgid "Bad cpi value %f."
-msgstr ""
-
-#: cups/ppd.c:358
+#: cups/ppd.c:316
 msgid "Bad custom parameter"
 msgstr ""
 
-#: cups/http-support.c:1420 scheduler/ipp.c:2550
+#: cups/http-support.c:1598 scheduler/ipp.c:2359
 #, c-format
 msgid "Bad device-uri \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:2591
+#: scheduler/ipp.c:2398
 #, c-format
 msgid "Bad device-uri scheme \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:9382 scheduler/ipp.c:9398 scheduler/ipp.c:10574
-#: scheduler/ipp.c:12079
+#: scheduler/ipp.c:8016 scheduler/ipp.c:8032 scheduler/ipp.c:9250
 #, c-format
 msgid "Bad document-format \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:10590
+#: scheduler/ipp.c:9266
 #, c-format
 msgid "Bad document-format-default \"%s\"."
 msgstr ""
 
-#: cups/util.c:927
+#: cups/util.c:896
 msgid "Bad filename buffer"
 msgstr ""
 
-#: filter/pstext.c:324 filter/pstext.c:362
-#, c-format
-msgid "Bad font description line \"%s\"."
+#: cups/http-support.c:1465
+msgid "Bad hostname/address in URI"
 msgstr ""
 
-#: filter/texttops.c:364 filter/texttops.c:402
+#: scheduler/ipp.c:1528
 #, c-format
-msgid "Bad font description line: %s"
+msgid "Bad job-name value: %s"
+msgstr ""
+
+#: scheduler/ipp.c:1521
+msgid "Bad job-name value: Wrong type or count."
 msgstr ""
 
-#: scheduler/ipp.c:11171
+#: scheduler/ipp.c:9856
 msgid "Bad job-priority value."
 msgstr ""
 
-#: scheduler/ipp.c:1490
+#: scheduler/ipp.c:1382
 #, c-format
 msgid "Bad job-sheets value \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:1474
+#: scheduler/ipp.c:1366
 msgid "Bad job-sheets value type."
 msgstr ""
 
-#: scheduler/ipp.c:11201
+#: scheduler/ipp.c:9886
 msgid "Bad job-state value."
 msgstr ""
 
-#: scheduler/ipp.c:4057 scheduler/ipp.c:4510 scheduler/ipp.c:7242
-#: scheduler/ipp.c:7389 scheduler/ipp.c:8832 scheduler/ipp.c:9085
-#: scheduler/ipp.c:9933 scheduler/ipp.c:10158 scheduler/ipp.c:10475
-#: scheduler/ipp.c:11063
+#: scheduler/ipp.c:2981 scheduler/ipp.c:3441 scheduler/ipp.c:5881
+#: scheduler/ipp.c:6028 scheduler/ipp.c:7450 scheduler/ipp.c:7719
+#: scheduler/ipp.c:8568 scheduler/ipp.c:8794 scheduler/ipp.c:9146
+#: scheduler/ipp.c:9749
 #, c-format
 msgid "Bad job-uri \"%s\"."
 msgstr ""
 
-#: filter/textcommon.c:637
-#, c-format
-msgid "Bad lpi value %f."
-msgstr ""
-
-#: scheduler/ipp.c:2194 scheduler/ipp.c:6784
+#: scheduler/ipp.c:2039 scheduler/ipp.c:5419
 #, c-format
 msgid "Bad notify-pull-method \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:2158 scheduler/ipp.c:6748
+#: scheduler/ipp.c:2003 scheduler/ipp.c:5383
 #, c-format
 msgid "Bad notify-recipient-uri \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:1506
+#: scheduler/ipp.c:1398
 #, c-format
 msgid "Bad number-up value %d."
 msgstr ""
 
-#: cups/adminutil.c:292
+#: cups/adminutil.c:281
 #, c-format
 msgid "Bad option + choice on line %d."
 msgstr ""
 
-#: scheduler/ipp.c:1523
+#: scheduler/ipp.c:1415
 #, c-format
 msgid "Bad page-ranges values %d-%d."
 msgstr ""
 
-#: scheduler/ipp.c:2634
+#: cups/http-support.c:1462
+msgid "Bad port number in URI"
+msgstr ""
+
+#: scheduler/ipp.c:2441
 #, c-format
 msgid "Bad port-monitor \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:2695
+#: cups/dest.c:610 cups/dest.c:1296
+msgid "Bad printer URI."
+msgstr ""
+
+#: scheduler/ipp.c:2502
 #, c-format
 msgid "Bad printer-state value %d."
 msgstr ""
 
-#: scheduler/ipp.c:320
+#: scheduler/ipp.c:207
 #, c-format
 msgid "Bad request ID %d."
 msgstr ""
 
-#: scheduler/ipp.c:305
+#: scheduler/ipp.c:192
 #, c-format
 msgid "Bad request version number %d.%d."
 msgstr ""
 
-#: cgi-bin/admin.c:1485
-msgid "Bad subscription ID"
-msgstr ""
-
-#: filter/pstext.c:337
-#, c-format
-msgid "Bad text direction \"%s\"."
+#: cups/http-support.c:1459
+msgid "Bad resource in URI"
 msgstr ""
 
-#: filter/texttops.c:377
-#, c-format
-msgid "Bad text direction: %s"
+#: cups/http-support.c:1471
+msgid "Bad scheme in URI"
 msgstr ""
 
-#: filter/pstext.c:375
-#, c-format
-msgid "Bad text width \"%s\"."
+#: cgi-bin/admin.c:1464
+msgid "Bad subscription ID"
 msgstr ""
 
-#: filter/texttops.c:416
-#, c-format
-msgid "Bad text width: %s"
+#: cups/http-support.c:1468
+msgid "Bad username in URI"
 msgstr ""
 
-#: cups/ppd.c:360
+#: cups/ppd.c:318
 msgid "Bad value string"
 msgstr ""
 
-#: cgi-bin/admin.c:3409 cgi-bin/admin.c:3655
-msgid "Banners"
+#: cups/http-support.c:1474
+msgid "Bad/empty URI"
 msgstr ""
 
-#: filter/bannertops.c:666
-msgid "Billing Information: "
+#: cgi-bin/admin.c:3270 cgi-bin/admin.c:3516
+msgid "Banners"
 msgstr ""
 
-#: ppdc/sample.c:293
+#: ppdc/sample.c:287
 msgid "Bond Paper"
 msgstr ""
 
-#: backend/usb-darwin.c:1861
+#: backend/usb-darwin.c:1874
 #, c-format
 msgid "Boolean expected for waiteof option \"%s\"."
 msgstr ""
 
-#: filter/pstops.c:2107
+#: filter/pstops.c:2029
 msgid "Buffer overflow detected, aborting."
 msgstr ""
 
-#: ppdc/sample.c:260
+#: ppdc/sample.c:254
 msgid "CMYK"
 msgstr ""
 
-#: ppdc/sample.c:369
+#: ppdc/sample.c:363
 msgid "CPCL Label Printer"
 msgstr ""
 
-#: cgi-bin/admin.c:1486 cgi-bin/admin.c:1525 cgi-bin/admin.c:1535
+#: cgi-bin/admin.c:1465 cgi-bin/admin.c:1504 cgi-bin/admin.c:1514
 msgid "Cancel RSS Subscription"
 msgstr ""
 
-#: backend/ipp.c:1653
+#: backend/ipp.c:2183
 msgid "Canceling print job."
 msgstr ""
 
-#: scheduler/ipp.c:2675
+#: scheduler/ipp.c:2482
 msgid "Cannot share a remote Kerberized printer."
 msgstr ""
 
-#: ppdc/sample.c:285
+#: ppdc/sample.c:279
 msgid "Cassette"
 msgstr ""
 
-#: cgi-bin/admin.c:1708 cgi-bin/admin.c:1872 cgi-bin/admin.c:1884
-#: cgi-bin/admin.c:1895
+#: cgi-bin/admin.c:1635 cgi-bin/admin.c:1777 cgi-bin/admin.c:1790
+#: cgi-bin/admin.c:1801
 msgid "Change Settings"
 msgstr ""
 
-#: scheduler/ipp.c:2206 scheduler/ipp.c:6796
+#: scheduler/ipp.c:2051 scheduler/ipp.c:5431
 #, c-format
 msgid "Character set \"%s\" not supported."
 msgstr ""
 
-#: cgi-bin/classes.c:195 cgi-bin/classes.c:322
+#: cgi-bin/classes.c:187 cgi-bin/classes.c:314
 msgid "Classes"
 msgstr ""
 
-#: cgi-bin/printers.c:182
+#: cgi-bin/printers.c:174
 msgid "Clean Print Heads"
 msgstr ""
 
-#: scheduler/ipp.c:4959
+#: scheduler/ipp.c:3893
 msgid "Close-Job doesn't support the job-uri attribute."
 msgstr ""
 
-#: ppdc/sample.c:288
+#: ppdc/sample.c:282
 msgid "Color"
 msgstr ""
 
-#: ppdc/sample.c:259
+#: ppdc/sample.c:253
 msgid "Color Mode"
 msgstr ""
 
-#: berkeley/lpc.c:204
+#: berkeley/lpc.c:196
 msgid ""
 "Commands may be abbreviated.  Commands are:\n"
 "\n"
 "exit    help    quit    status  ?"
 msgstr ""
 
-#: cups/snmp.c:1006
+#: cups/snmp.c:958
 msgid "Community name uses indefinite length"
 msgstr ""
 
-#: backend/ipp.c:683 backend/lpd.c:858 backend/socket.c:389
+#: backend/ipp.c:839 backend/lpd.c:879 backend/socket.c:400
 msgid "Connected to printer."
 msgstr ""
 
-#: backend/ipp.c:590 backend/lpd.c:698 backend/socket.c:308
+#: backend/ipp.c:744 backend/lpd.c:702 backend/socket.c:319
 msgid "Connecting to printer."
 msgstr ""
 
-#: cups/http-support.c:1241
+#: cups/http-support.c:1335
 msgid "Continue"
 msgstr ""
 
-#: ppdc/sample.c:371
+#: ppdc/sample.c:365
 msgid "Continuous"
 msgstr ""
 
-#: backend/lpd.c:1009 backend/lpd.c:1151
+#: backend/lpd.c:1028 backend/lpd.c:1160
 msgid "Control file sent successfully."
 msgstr ""
 
-#: backend/ipp.c:1070 backend/lpd.c:455
+#: backend/ipp.c:1334 backend/lpd.c:472
 msgid "Copying print data."
 msgstr ""
 
-#: cups/http-support.c:1250
+#: cups/http-support.c:1344
 msgid "Created"
 msgstr ""
 
-#: filter/bannertops.c:854
-msgid "Created On: "
-msgstr ""
-
-#: cups/ppd.c:1080 cups/ppd.c:1120 cups/ppd.c:1365 cups/ppd.c:1468
+#: cups/ppd.c:1069 cups/ppd.c:1109 cups/ppd.c:1354 cups/ppd.c:1457
 msgid "Custom"
 msgstr ""
 
-#: ppdc/sample.c:365
+#: ppdc/sample.c:359
 msgid "CustominCutInterval"
 msgstr ""
 
-#: ppdc/sample.c:363
+#: ppdc/sample.c:357
 msgid "CustominTearInterval"
 msgstr ""
 
-#: ppdc/sample.c:349
+#: ppdc/sample.c:343
 msgid "Cut"
 msgstr ""
 
-#: ppdc/sample.c:457
+#: ppdc/sample.c:451
 msgid "Cutter"
 msgstr ""
 
-#: ppdc/sample.c:245
+#: ppdc/sample.c:239
 msgid "Dark"
 msgstr ""
 
-#: ppdc/sample.c:241
+#: ppdc/sample.c:235
 msgid "Darkness"
 msgstr ""
 
-#: backend/lpd.c:1099
+#: backend/lpd.c:1113
 msgid "Data file sent successfully."
 msgstr ""
 
-#: cgi-bin/admin.c:2168 cgi-bin/admin.c:2179 cgi-bin/admin.c:2224
+#: cgi-bin/admin.c:2074 cgi-bin/admin.c:2085 cgi-bin/admin.c:2130
 msgid "Delete Class"
 msgstr ""
 
-#: cgi-bin/admin.c:2253 cgi-bin/admin.c:2264 cgi-bin/admin.c:2309
+#: cgi-bin/admin.c:2159 cgi-bin/admin.c:2170 cgi-bin/admin.c:2215
 msgid "Delete Printer"
 msgstr ""
 
-#: filter/bannertops.c:735
-msgid "Description: "
-msgstr ""
-
-#: ppdc/sample.c:287
+#: ppdc/sample.c:281
 msgid "DeskJet Series"
 msgstr ""
 
-#: scheduler/ipp.c:1426
+#: scheduler/ipp.c:1276
 #, c-format
 msgid "Destination \"%s\" is not accepting jobs."
 msgstr ""
@@ -3196,74 +3544,76 @@ msgid ""
 "        location = %s"
 msgstr ""
 
-#: ppdc/sample.c:442
+#: ppdc/sample.c:436
 msgid "Direct Thermal Media"
 msgstr ""
 
-#: cups/file.c:263
+#: cups/file.c:258
+#, c-format
+msgid "Directory \"%s\" contains a relative path."
+msgstr ""
+
+#: cups/file.c:230
 #, c-format
 msgid "Directory \"%s\" has insecure permissions (0%o/uid=%d/gid=%d)."
 msgstr ""
 
-#: cups/file.c:280
+#: cups/file.c:247
 #, c-format
 msgid "Directory \"%s\" is a file."
 msgstr ""
 
-#: cups/file.c:251
+#: cups/file.c:218
 #, c-format
 msgid "Directory \"%s\" not available: %s"
 msgstr ""
 
-#: cups/file.c:236
+#: cups/file.c:203
 #, c-format
 msgid "Directory \"%s\" permissions OK (0%o/uid=%d/gid=%d)."
 msgstr ""
 
-#: ppdc/sample.c:351
+#: ppdc/sample.c:345
 msgid "Disabled"
 msgstr ""
 
-#: scheduler/ipp.c:7291
+#: scheduler/ipp.c:5930
 #, c-format
 msgid "Document #%d does not exist in job #%d."
 msgstr ""
 
-#: filter/bannertops.c:820
-msgid "Driver Name: "
-msgstr ""
-
-#: filter/bannertops.c:831
-msgid "Driver Version: "
-msgstr ""
-
-#: ppdc/sample.c:281
+#: ppdc/sample.c:275
 msgid "Duplexer"
 msgstr ""
 
-#: ppdc/sample.c:235
+#: ppdc/sample.c:229
 msgid "Dymo"
 msgstr ""
 
-#: ppdc/sample.c:437
+#: ppdc/sample.c:431
 msgid "EPL1 Label Printer"
 msgstr ""
 
-#: ppdc/sample.c:440
+#: ppdc/sample.c:434
 msgid "EPL2 Label Printer"
 msgstr ""
 
-#: cgi-bin/admin.c:1923 cgi-bin/admin.c:1935 cgi-bin/admin.c:1989
-#: cgi-bin/admin.c:1996 cgi-bin/admin.c:2031 cgi-bin/admin.c:2044
-#: cgi-bin/admin.c:2068 cgi-bin/admin.c:2141
+#: 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
 msgid "Edit Configuration File"
 msgstr ""
 
-#: cups/adminutil.c:337
+#: cups/adminutil.c:326
 msgid "Empty PPD file."
 msgstr ""
 
-#: cgi-bin/admin.c:3676
+#: cups/http.c:4608
+msgid "Encryption is not supported."
+msgstr ""
+
+#. TRANSLATORS: Banner/cover sheet after the print job.
+#: cgi-bin/admin.c:3541
 msgid "Ending Banner"
 msgstr ""
 
@@ -3271,244 +3621,236 @@ msgstr ""
 msgid "English"
 msgstr ""
 
-#: systemv/lppasswd.c:193
-msgid "Enter old password:"
-msgstr ""
-
-#: systemv/lppasswd.c:224
-msgid "Enter password again:"
-msgstr ""
-
-#: systemv/lppasswd.c:212
-msgid "Enter password:"
-msgstr ""
-
-#: scheduler/client.c:2439
+#: scheduler/client.c:2200
 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 ""
 
-#: ppdc/sample.c:70
+#: ppdc/sample.c:73
 msgid "Envelope #10 "
 msgstr ""
 
-#: ppdc/sample.c:71
+#: ppdc/sample.c:74
 msgid "Envelope #11"
 msgstr ""
 
-#: ppdc/sample.c:72
+#: ppdc/sample.c:75
 msgid "Envelope #12"
 msgstr ""
 
-#: ppdc/sample.c:73
+#: ppdc/sample.c:76
 msgid "Envelope #14"
 msgstr ""
 
-#: ppdc/sample.c:74
+#: ppdc/sample.c:77
 msgid "Envelope #9"
 msgstr ""
 
-#: ppdc/sample.c:86
+#: ppdc/sample.c:89
 msgid "Envelope B4"
 msgstr ""
 
-#: ppdc/sample.c:87
+#: ppdc/sample.c:90
 msgid "Envelope B5"
 msgstr ""
 
-#: ppdc/sample.c:88
+#: ppdc/sample.c:91
 msgid "Envelope B6"
 msgstr ""
 
-#: ppdc/sample.c:75
+#: ppdc/sample.c:78
 msgid "Envelope C0"
 msgstr ""
 
-#: ppdc/sample.c:76
+#: ppdc/sample.c:79
 msgid "Envelope C1"
 msgstr ""
 
-#: ppdc/sample.c:77
+#: ppdc/sample.c:80
 msgid "Envelope C2"
 msgstr ""
 
-#: ppdc/sample.c:78
+#: ppdc/sample.c:81
 msgid "Envelope C3"
 msgstr ""
 
-#: ppdc/sample.c:64
+#: ppdc/sample.c:67
 msgid "Envelope C4"
 msgstr ""
 
-#: ppdc/sample.c:65
+#: ppdc/sample.c:68
 msgid "Envelope C5"
 msgstr ""
 
-#: ppdc/sample.c:66
+#: ppdc/sample.c:69
 msgid "Envelope C6"
 msgstr ""
 
-#: ppdc/sample.c:79
+#: ppdc/sample.c:82
 msgid "Envelope C65"
 msgstr ""
 
-#: ppdc/sample.c:80
+#: ppdc/sample.c:83
 msgid "Envelope C7"
 msgstr ""
 
-#: ppdc/sample.c:81
+#: ppdc/sample.c:84
 msgid "Envelope Choukei 3"
 msgstr ""
 
-#: ppdc/sample.c:82
+#: ppdc/sample.c:85
 msgid "Envelope Choukei 3 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:83
+#: ppdc/sample.c:86
 msgid "Envelope Choukei 4"
 msgstr ""
 
-#: ppdc/sample.c:84
+#: ppdc/sample.c:87
 msgid "Envelope Choukei 4 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:67
+#: ppdc/sample.c:70
 msgid "Envelope DL"
 msgstr ""
 
-#: ppdc/sample.c:275
+#: ppdc/sample.c:269
 msgid "Envelope Feed"
 msgstr ""
 
-#: ppdc/sample.c:85
+#: ppdc/sample.c:88
 msgid "Envelope Invite"
 msgstr ""
 
-#: ppdc/sample.c:89
+#: ppdc/sample.c:92
 msgid "Envelope Italian"
 msgstr ""
 
-#: ppdc/sample.c:90
+#: ppdc/sample.c:93
 msgid "Envelope Kaku2"
 msgstr ""
 
-#: ppdc/sample.c:91
+#: ppdc/sample.c:94
 msgid "Envelope Kaku2 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:92
+#: ppdc/sample.c:95
 msgid "Envelope Kaku3"
 msgstr ""
 
-#: ppdc/sample.c:93
+#: ppdc/sample.c:96
 msgid "Envelope Kaku3 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:94
+#: ppdc/sample.c:97
 msgid "Envelope Monarch"
 msgstr ""
 
-#: ppdc/sample.c:96
+#: ppdc/sample.c:99
 msgid "Envelope PRC1 "
 msgstr ""
 
-#: ppdc/sample.c:97
+#: ppdc/sample.c:100
 msgid "Envelope PRC1 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:114
+#: ppdc/sample.c:117
 msgid "Envelope PRC10"
 msgstr ""
 
-#: ppdc/sample.c:115
+#: ppdc/sample.c:118
 msgid "Envelope PRC10 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:98
+#: ppdc/sample.c:101
 msgid "Envelope PRC2"
 msgstr ""
 
-#: ppdc/sample.c:99
+#: ppdc/sample.c:102
 msgid "Envelope PRC2 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:100
+#: ppdc/sample.c:103
 msgid "Envelope PRC3"
 msgstr ""
 
-#: ppdc/sample.c:101
+#: ppdc/sample.c:104
 msgid "Envelope PRC3 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:102
+#: ppdc/sample.c:105
 msgid "Envelope PRC4"
 msgstr ""
 
-#: ppdc/sample.c:103
+#: ppdc/sample.c:106
 msgid "Envelope PRC4 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:105
+#: ppdc/sample.c:108
 msgid "Envelope PRC5 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:104
+#: ppdc/sample.c:107
 msgid "Envelope PRC5PRC5"
 msgstr ""
 
-#: ppdc/sample.c:106
+#: ppdc/sample.c:109
 msgid "Envelope PRC6"
 msgstr ""
 
-#: ppdc/sample.c:107
+#: ppdc/sample.c:110
 msgid "Envelope PRC6 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:108
+#: ppdc/sample.c:111
 msgid "Envelope PRC7"
 msgstr ""
 
-#: ppdc/sample.c:109
+#: ppdc/sample.c:112
 msgid "Envelope PRC7 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:110
+#: ppdc/sample.c:113
 msgid "Envelope PRC8"
 msgstr ""
 
-#: ppdc/sample.c:111
+#: ppdc/sample.c:114
 msgid "Envelope PRC8 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:112
+#: ppdc/sample.c:115
 msgid "Envelope PRC9"
 msgstr ""
 
-#: ppdc/sample.c:113
+#: ppdc/sample.c:116
 msgid "Envelope PRC9 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:95
+#: ppdc/sample.c:98
 msgid "Envelope Personal"
 msgstr ""
 
-#: ppdc/sample.c:116
+#: ppdc/sample.c:119
 msgid "Envelope You4"
 msgstr ""
 
-#: ppdc/sample.c:117
+#: ppdc/sample.c:120
 msgid "Envelope You4 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:246
+#: test/ippfind.c:2779
+msgid "Environment Variables:"
+msgstr ""
+
+#: ppdc/sample.c:240
 msgid "Epson"
 msgstr ""
 
-#: cgi-bin/admin.c:3719
+#: cgi-bin/admin.c:3584
 msgid "Error Policy"
 msgstr ""
 
-#: filter/rastertopwg.c:160 filter/rastertopwg.c:175 filter/rastertopwg.c:186
-#: filter/rastertopwg.c:197
+#: filter/rastertopwg.c:395 filter/rastertopwg.c:410 filter/rastertopwg.c:421
+#: filter/rastertopwg.c:432
 msgid "Error sending raster data."
 msgstr ""
 
@@ -3516,58 +3858,62 @@ msgstr ""
 msgid "Error: need hostname after \"-h\" option."
 msgstr ""
 
-#: ppdc/sample.c:361
+#: ppdc/sample.c:355
 msgid "Every 10 Labels"
 msgstr ""
 
-#: ppdc/sample.c:353
+#: ppdc/sample.c:347
 msgid "Every 2 Labels"
 msgstr ""
 
-#: ppdc/sample.c:354
+#: ppdc/sample.c:348
 msgid "Every 3 Labels"
 msgstr ""
 
-#: ppdc/sample.c:355
+#: ppdc/sample.c:349
 msgid "Every 4 Labels"
 msgstr ""
 
-#: ppdc/sample.c:356
+#: ppdc/sample.c:350
 msgid "Every 5 Labels"
 msgstr ""
 
-#: ppdc/sample.c:357
+#: ppdc/sample.c:351
 msgid "Every 6 Labels"
 msgstr ""
 
-#: ppdc/sample.c:358
+#: ppdc/sample.c:352
 msgid "Every 7 Labels"
 msgstr ""
 
-#: ppdc/sample.c:359
+#: ppdc/sample.c:353
 msgid "Every 8 Labels"
 msgstr ""
 
-#: ppdc/sample.c:360
+#: ppdc/sample.c:354
 msgid "Every 9 Labels"
 msgstr ""
 
-#: ppdc/sample.c:352
+#: ppdc/sample.c:346
 msgid "Every Label"
 msgstr ""
 
-#: ppdc/sample.c:118
+#: ppdc/sample.c:121
 msgid "Executive"
 msgstr ""
 
-#: cups/http-support.c:1296
+#: cups/http-support.c:1390
 msgid "Expectation Failed"
 msgstr ""
 
-#: cgi-bin/admin.c:2431 cgi-bin/admin.c:2450
+#: cgi-bin/admin.c:2336 cgi-bin/admin.c:2355
 msgid "Export Printers to Samba"
 msgstr ""
 
+#: test/ippfind.c:2725
+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
@@ -3578,511 +3924,578 @@ msgstr ""
 msgid "FAIL"
 msgstr ""
 
-#: ppdc/sample.c:119
+#: ppdc/sample.c:122
 msgid "FanFold German"
 msgstr ""
 
-#: ppdc/sample.c:120
+#: ppdc/sample.c:123
 msgid "FanFold Legal German"
 msgstr ""
 
-#: ppdc/sample.c:121
+#: ppdc/sample.c:124
 msgid "Fanfold US"
 msgstr ""
 
-#: cups/file.c:270
+#: cups/file.c:262
+#, c-format
+msgid "File \"%s\" contains a relative path."
+msgstr ""
+
+#: cups/file.c:237
 #, c-format
 msgid "File \"%s\" has insecure permissions (0%o/uid=%d/gid=%d)."
 msgstr ""
 
-#: cups/file.c:284
+#: cups/file.c:251
 #, c-format
 msgid "File \"%s\" is a directory."
 msgstr ""
 
-#: cups/file.c:256
+#: cups/file.c:223
 #, c-format
 msgid "File \"%s\" not available: %s"
 msgstr ""
 
-#: cups/file.c:242
+#: cups/file.c:209
 #, c-format
 msgid "File \"%s\" permissions OK (0%o/uid=%d/gid=%d)."
 msgstr ""
 
-#: ppdc/sample.c:166
-msgid "File Folder"
-msgstr ""
-
-#: ppdc/sample.c:175
-msgid "File Folder - 9/16 x 3 7/16\""
+#: ppdc/sample.c:169
+msgid "File Folder "
 msgstr ""
 
-#: scheduler/ipp.c:2570
+#: scheduler/ipp.c:2377
 #, c-format
-msgid "File device URIs have been disabled. To enable, see the FileDevice directive in \"%s/cupsd.conf\"."
+msgid "File device URIs have been disabled. To enable, see the FileDevice directive in \"%s/cups-files.conf\"."
 msgstr ""
 
-#: driver/rastertoescpx.c:1899 driver/rastertopclx.c:1924
-#: filter/rastertoepson.c:1117 filter/rastertohp.c:845
-#: filter/rastertolabel.c:1273
+#: filter/rastertoepson.c:1102 filter/rastertohp.c:834
+#: filter/rastertolabel.c:1259
 #, c-format
 msgid "Finished page %d."
 msgstr ""
 
-#: ppdc/sample.c:122
+#: ppdc/sample.c:125
 msgid "Folio"
 msgstr ""
 
-#: cups/http-support.c:1275
+#: cups/http-support.c:1369
 msgid "Forbidden"
 msgstr ""
 
-#: filter/imagetoraster.c:1180
-#, c-format
-msgid "Formatting page %d."
-msgstr ""
-
-#: cups/ppd.c:708 cups/ppd.c:1269
+#: cups/ppd.c:700 cups/ppd.c:1258
 msgid "General"
 msgstr ""
 
-#: ppdc/sample.c:265
+#: ppdc/sample.c:259
 msgid "Generic"
 msgstr ""
 
-#: cups/snmp.c:1016
+#: cups/snmp.c:968
 msgid "Get-Response-PDU uses indefinite length"
 msgstr ""
 
-#: ppdc/sample.c:296
+#: ppdc/sample.c:290
 msgid "Glossy Paper"
 msgstr ""
 
-#: scheduler/ipp.c:4035 scheduler/ipp.c:4436 scheduler/ipp.c:4971
-#: scheduler/ipp.c:7220 scheduler/ipp.c:7367 scheduler/ipp.c:8809
-#: scheduler/ipp.c:9911 scheduler/ipp.c:10136 scheduler/ipp.c:10453
-#: scheduler/ipp.c:11041
+#: scheduler/ipp.c:2959 scheduler/ipp.c:3367 scheduler/ipp.c:3905
+#: scheduler/ipp.c:5859 scheduler/ipp.c:6006 scheduler/ipp.c:7427
+#: scheduler/ipp.c:8546 scheduler/ipp.c:8772 scheduler/ipp.c:9124
+#: scheduler/ipp.c:9727
 msgid "Got a printer-uri attribute but no job-id."
 msgstr ""
 
-#: ppdc/sample.c:261
+#: ppdc/sample.c:255
 msgid "Grayscale"
 msgstr ""
 
-#: ppdc/sample.c:286
+#: ppdc/sample.c:280
 msgid "HP"
 msgstr ""
 
-#: ppdc/sample.c:167
+#: ppdc/sample.c:170
 msgid "Hanging Folder"
 msgstr ""
 
-#: ppdc/sample.c:176
-msgid "Hanging Folder - 9/16 x 2\""
+#: cgi-bin/help.c:143
+msgid "Help file not in index."
+msgstr ""
+
+#: cups/ipp.c:3183 cups/ipp.c:3210 cups/ipp.c:3233
+msgid "IPP 1setOf attribute with incompatible value tags."
+msgstr ""
+
+#: cups/ipp.c:3146
+msgid "IPP attribute has no name."
+msgstr ""
+
+#: cups/ipp.c:7000
+msgid "IPP attribute is not a member of the message."
+msgstr ""
+
+#: cups/ipp.c:3594
+msgid "IPP begCollection value not 0 bytes."
+msgstr ""
+
+#: cups/ipp.c:3376
+msgid "IPP boolean value not 1 byte."
+msgstr ""
+
+#: cups/ipp.c:3437
+msgid "IPP date value not 11 bytes."
+msgstr ""
+
+#: cups/ipp.c:3615
+msgid "IPP endCollection value not 0 bytes."
+msgstr ""
+
+#: cups/ipp.c:3351
+msgid "IPP enum value not 4 bytes."
+msgstr ""
+
+#: cups/ipp.c:3075
+msgid "IPP extension tag larger than 0x7FFFFFFF."
+msgstr ""
+
+#: cups/ipp.c:3348
+msgid "IPP integer value not 4 bytes."
+msgstr ""
+
+#: cups/ipp.c:3547
+msgid "IPP language length overflows value."
+msgstr ""
+
+#: cups/ipp.c:3556
+msgid "IPP language length too large."
+msgstr ""
+
+#: cups/ipp.c:3260
+msgid "IPP member name is not empty."
+msgstr ""
+
+#: cups/ipp.c:3641
+msgid "IPP memberName value is empty."
+msgstr ""
+
+#: cups/ipp.c:3633
+msgid "IPP memberName with no attribute."
+msgstr ""
+
+#: cups/ipp.c:3129
+msgid "IPP name larger than 32767 bytes."
+msgstr ""
+
+#: cups/ipp.c:3514
+msgid "IPP nameWithLanguage value less than minimum 4 bytes."
+msgstr ""
+
+#: cups/ipp.c:3671
+msgid "IPP octetString length too large."
+msgstr ""
+
+#: cups/ipp.c:3482
+msgid "IPP rangeOfInteger value not 8 bytes."
+msgstr ""
+
+#: cups/ipp.c:3455
+msgid "IPP resolution value not 9 bytes."
+msgstr ""
+
+#: cups/ipp.c:3574
+msgid "IPP string length overflows value."
+msgstr ""
+
+#: cups/ipp.c:3510
+msgid "IPP textWithLanguage value less than minimum 4 bytes."
+msgstr ""
+
+#: cups/ipp.c:3334
+msgid "IPP value larger than 32767 bytes."
 msgstr ""
 
 #: ppdc/sample.c:1
 msgid "ISOLatin1"
 msgstr ""
 
-#: cups/ppd.c:353
+#: cups/ppd.c:311
 msgid "Illegal control character"
 msgstr ""
 
-#: cups/ppd.c:354
+#: cups/ppd.c:312
 msgid "Illegal main keyword string"
 msgstr ""
 
-#: cups/ppd.c:355
+#: cups/ppd.c:313
 msgid "Illegal option keyword string"
 msgstr ""
 
-#: cups/ppd.c:356
+#: cups/ppd.c:314
 msgid "Illegal translation string"
 msgstr ""
 
-#: cups/ppd.c:357
+#: cups/ppd.c:315
 msgid "Illegal whitespace character"
 msgstr ""
 
-#: ppdc/sample.c:280
+#: ppdc/sample.c:274
 msgid "Installable Options"
 msgstr ""
 
-#: ppdc/sample.c:283
+#: ppdc/sample.c:277
 msgid "Installed"
 msgstr ""
 
-#: ppdc/sample.c:299
+#: ppdc/sample.c:293
 msgid "IntelliBar Label Printer"
 msgstr ""
 
-#: ppdc/sample.c:298
+#: ppdc/sample.c:292
 msgid "Intellitech"
 msgstr ""
 
-#: cups/http-support.c:1302
+#: cups/http-support.c:1396
 msgid "Internal Server Error"
 msgstr ""
 
-#: cups/ppd.c:344
+#: cups/ppd.c:302
 msgid "Internal error"
 msgstr ""
 
-#: ppdc/sample.c:164
+#: ppdc/sample.c:167
 msgid "Internet Postage 2-Part"
 msgstr ""
 
-#: ppdc/sample.c:173
-msgid "Internet Postage 2-Part - 2 1/4 x 7 1/2\""
+#: ppdc/sample.c:168
+msgid "Internet Postage 3-Part"
 msgstr ""
 
-#: ppdc/sample.c:165
-msgid "Internet Postage 3-Part"
+#: backend/ipp.c:317
+msgid "Internet Printing Protocol"
 msgstr ""
 
-#: ppdc/sample.c:174
-msgid "Internet Postage 3-Part - 2 1/4 x 7\""
+#: cups/pwg-media.c:293 cups/pwg-media.c:312
+msgid "Invalid media name arguments."
 msgstr ""
 
-#: backend/ipp.c:262
-msgid "Internet Printing Protocol"
+#: cups/dest-options.c:1014
+msgid "Invalid media size."
 msgstr ""
 
-#: cups/ppd.c:1387
+#: filter/commandtops.c:114
+#, c-format
+msgid "Invalid printer command \"%s\"."
+msgstr ""
+
+#: cups/ppd.c:1376
 msgid "JCL"
 msgstr ""
 
-#: ppdc/sample.c:50
+#: ppdc/sample.c:53
 msgid "JIS B0"
 msgstr ""
 
-#: ppdc/sample.c:52
+#: ppdc/sample.c:55
 msgid "JIS B1"
 msgstr ""
 
-#: ppdc/sample.c:51
+#: ppdc/sample.c:54
 msgid "JIS B10"
 msgstr ""
 
-#: ppdc/sample.c:53
+#: ppdc/sample.c:56
 msgid "JIS B2"
 msgstr ""
 
-#: ppdc/sample.c:54
+#: ppdc/sample.c:57
 msgid "JIS B3"
 msgstr ""
 
-#: ppdc/sample.c:55
+#: ppdc/sample.c:58
 msgid "JIS B4"
 msgstr ""
 
-#: ppdc/sample.c:56
+#: ppdc/sample.c:59
 msgid "JIS B4 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:57
+#: ppdc/sample.c:60
 msgid "JIS B5"
 msgstr ""
 
-#: ppdc/sample.c:58
+#: ppdc/sample.c:61
 msgid "JIS B5 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:59
+#: ppdc/sample.c:62
 msgid "JIS B6"
 msgstr ""
 
-#: ppdc/sample.c:60
+#: ppdc/sample.c:63
 msgid "JIS B6 Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:61
+#: ppdc/sample.c:64
 msgid "JIS B7"
 msgstr ""
 
-#: ppdc/sample.c:62
+#: ppdc/sample.c:65
 msgid "JIS B8"
 msgstr ""
 
-#: ppdc/sample.c:63
+#: ppdc/sample.c:66
 msgid "JIS B9"
 msgstr ""
 
-#: scheduler/ipp.c:10208
+#: scheduler/ipp.c:8844
 #, c-format
 msgid "Job #%d cannot be restarted - no files."
 msgstr ""
 
-#: scheduler/ipp.c:4075 scheduler/ipp.c:4306 scheduler/ipp.c:4361
-#: scheduler/ipp.c:4538 scheduler/ipp.c:4981 scheduler/ipp.c:6882
-#: scheduler/ipp.c:7260 scheduler/ipp.c:7407 scheduler/ipp.c:7707
-#: scheduler/ipp.c:8656 scheduler/ipp.c:8678 scheduler/ipp.c:8850
-#: scheduler/ipp.c:9059 scheduler/ipp.c:9102 scheduler/ipp.c:9951
-#: scheduler/ipp.c:10176 scheduler/ipp.c:10493 scheduler/ipp.c:11081
+#: scheduler/ipp.c:2999 scheduler/ipp.c:3233 scheduler/ipp.c:3292
+#: scheduler/ipp.c:3469 scheduler/ipp.c:3915 scheduler/ipp.c:5517
+#: scheduler/ipp.c:5899 scheduler/ipp.c:6046 scheduler/ipp.c:6335
+#: scheduler/ipp.c:7274 scheduler/ipp.c:7296 scheduler/ipp.c:7468
+#: scheduler/ipp.c:7693 scheduler/ipp.c:7736 scheduler/ipp.c:8586
+#: scheduler/ipp.c:8812 scheduler/ipp.c:9164 scheduler/ipp.c:9767
 #, c-format
 msgid "Job #%d does not exist."
 msgstr ""
 
-#: scheduler/ipp.c:4570
+#: scheduler/ipp.c:3501
 #, c-format
 msgid "Job #%d is already aborted - can't cancel."
 msgstr ""
 
-#: scheduler/ipp.c:4564
+#: scheduler/ipp.c:3495
 #, c-format
 msgid "Job #%d is already canceled - can't cancel."
 msgstr ""
 
-#: scheduler/ipp.c:4576
+#: scheduler/ipp.c:3507
 #, c-format
 msgid "Job #%d is already completed - can't cancel."
 msgstr ""
 
-#: scheduler/ipp.c:9144 scheduler/ipp.c:11096
+#: scheduler/ipp.c:7494 scheduler/ipp.c:7778 scheduler/ipp.c:9782
 #, c-format
 msgid "Job #%d is finished and cannot be altered."
 msgstr ""
 
-#: scheduler/ipp.c:10190
+#: scheduler/ipp.c:8826
 #, c-format
 msgid "Job #%d is not complete."
 msgstr ""
 
-#: scheduler/ipp.c:4090
+#: scheduler/ipp.c:3014
 #, c-format
 msgid "Job #%d is not held for authentication."
 msgstr ""
 
-#: scheduler/ipp.c:9965
+#: scheduler/ipp.c:8600
 #, c-format
 msgid "Job #%d is not held."
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1055
+#: cgi-bin/ipp-var.c:1036
 msgid "Job Completed"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1053
+#: cgi-bin/ipp-var.c:1034
 msgid "Job Created"
 msgstr ""
 
-#: filter/bannertops.c:623
-msgid "Job ID: "
-msgstr ""
-
-#: cgi-bin/ipp-var.c:1059
+#: cgi-bin/ipp-var.c:1040
 msgid "Job Options Changed"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1057
+#: cgi-bin/ipp-var.c:1038
 msgid "Job Stopped"
 msgstr ""
 
-#: filter/bannertops.c:631
-msgid "Job UUID: "
-msgstr ""
-
-#: scheduler/ipp.c:11179
+#: scheduler/ipp.c:9864
 msgid "Job is completed and cannot be changed."
 msgstr ""
 
-#: cgi-bin/jobs.c:198
-msgid "Job operation failed:"
+#: cgi-bin/jobs.c:192
+msgid "Job operation failed"
 msgstr ""
 
-#: scheduler/ipp.c:11215 scheduler/ipp.c:11234 scheduler/ipp.c:11245
+#: scheduler/ipp.c:9900 scheduler/ipp.c:9917 scheduler/ipp.c:9928
 msgid "Job state cannot be changed."
 msgstr ""
 
-#: scheduler/ipp.c:10056
+#: scheduler/ipp.c:8692
 msgid "Job subscriptions cannot be renewed."
 msgstr ""
 
-#: cgi-bin/jobs.c:103 cgi-bin/jobs.c:114 cgi-bin/jobs.c:195
+#: cgi-bin/jobs.c:97 cgi-bin/jobs.c:108 cgi-bin/jobs.c:189
 msgid "Jobs"
 msgstr ""
 
-#: backend/lpd.c:183
+#: backend/lpd.c:177
 msgid "LPD/LPR Host or Printer"
 msgstr ""
 
-#: ppdc/sample.c:236
+#: ppdc/sample.c:230
 msgid "Label Printer"
 msgstr ""
 
-#: ppdc/sample.c:452
+#: ppdc/sample.c:446
 msgid "Label Top"
 msgstr ""
 
-#: scheduler/ipp.c:2215 scheduler/ipp.c:6805
+#: scheduler/ipp.c:2060 scheduler/ipp.c:5440
 #, c-format
 msgid "Language \"%s\" not supported."
 msgstr ""
 
-#: ppdc/sample.c:161
+#: ppdc/sample.c:164
 msgid "Large Address"
 msgstr ""
 
-#: ppdc/sample.c:170
-msgid "Large Address - 1 4/10 x 3 1/2\""
-msgstr ""
-
-#: ppdc/sample.c:297
+#: ppdc/sample.c:291
 msgid "LaserJet Series PCL 4/5"
 msgstr ""
 
-#: ppdc/sample.c:40
+#: ppdc/sample.c:43
 msgid "Letter Oversize"
 msgstr ""
 
-#: ppdc/sample.c:41
+#: ppdc/sample.c:44
 msgid "Letter Oversize Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:242
+#: ppdc/sample.c:236
 msgid "Light"
 msgstr ""
 
-#: cups/ppd.c:352
+#: cups/ppd.c:310
 msgid "Line longer than the maximum allowed (255 characters)"
 msgstr ""
 
-#: cgi-bin/admin.c:2468
+#: cgi-bin/admin.c:2373
 msgid "List Available Printers"
 msgstr ""
 
-#: filter/imagetoraster.c:660
-msgid "Loading print file."
-msgstr ""
-
-#: filter/bannertops.c:744
-msgid "Location: "
+#: cups/localize.c:291
+msgid "Load paper."
 msgstr ""
 
-#: ppdc/sample.c:278
+#: ppdc/sample.c:272
 msgid "Long-Edge (Portrait)"
 msgstr ""
 
-#: cups/http-support.c:1517
+#: cups/http-support.c:1725
 msgid "Looking for printer."
 msgstr ""
 
-#: filter/bannertops.c:753
-msgid "Make and Model: "
-msgstr ""
-
-#: ppdc/sample.c:274
+#: ppdc/sample.c:268
 msgid "Manual Feed"
 msgstr ""
 
-#: filter/bannertops.c:780
-msgid "Media Dimensions: "
-msgstr ""
-
-#: filter/bannertops.c:800
-msgid "Media Limits: "
-msgstr ""
-
-#: filter/bannertops.c:769
-msgid "Media Name: "
-msgstr ""
-
-#: cups/ppd.c:755 cups/ppd.c:1324
+#: cups/ppd.c:747 cups/ppd.c:1313
 msgid "Media Size"
 msgstr ""
 
-#: cups/ppd.c:759 cups/ppd.c:1328 ppdc/sample.c:268
+#: cups/ppd.c:751 cups/ppd.c:1317 ppdc/sample.c:262
 msgid "Media Source"
 msgstr ""
 
-#: ppdc/sample.c:370
+#: ppdc/sample.c:364
 msgid "Media Tracking"
 msgstr ""
 
-#: cups/ppd.c:757 cups/ppd.c:1326 ppdc/sample.c:291
+#: cups/ppd.c:749 cups/ppd.c:1315 ppdc/sample.c:285
 msgid "Media Type"
 msgstr ""
 
-#: ppdc/sample.c:243
+#: ppdc/sample.c:237
 msgid "Medium"
 msgstr ""
 
-#: cups/ppd.c:341
+#: cups/ppd.c:299
 msgid "Memory allocation error"
 msgstr ""
 
-#: cups/ppd.c:361
+#: cups/ppd.c:319
 msgid "Missing CloseGroup"
 msgstr ""
 
-#: cups/ppd.c:342
+#: cups/ppd.c:300
 msgid "Missing PPD-Adobe-4.x header"
 msgstr ""
 
-#: cups/ppd.c:351
+#: cups/ppd.c:309
 msgid "Missing asterisk in column 1"
 msgstr ""
 
-#: scheduler/ipp.c:7283
+#: scheduler/ipp.c:5922
 msgid "Missing document-number attribute."
 msgstr ""
 
-#: cups/adminutil.c:273
+#: cups/adminutil.c:262
 #, c-format
 msgid "Missing double quote on line %d."
 msgstr ""
 
-#: cgi-bin/admin.c:737 cgi-bin/admin.c:2180 cgi-bin/admin.c:2265
-#: cgi-bin/admin.c:2904 cgi-bin/admin.c:3158 cgi-bin/admin.c:3269
-#: cgi-bin/admin.c:3975
+#: 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"
 msgstr ""
 
-#: cups/pwg-media.c:470
+#: scheduler/ipp.c:9218
+msgid "Missing last-document attribute in request."
+msgstr ""
+
+#: cups/pwg-media.c:555
 msgid "Missing media or media-col."
 msgstr ""
 
-#: cups/pwg-media.c:389
+#: cups/pwg-media.c:474
 msgid "Missing media-size in media-col."
 msgstr ""
 
-#: scheduler/ipp.c:7837
+#: scheduler/ipp.c:6465
 msgid "Missing notify-subscription-ids attribute."
 msgstr ""
 
-#: cups/ppd.c:359
+#: cups/ppd.c:317
 msgid "Missing option keyword"
 msgstr ""
 
-#: scheduler/ipp.c:4217 scheduler/ipp.c:4242
+#: scheduler/ipp.c:3140 scheduler/ipp.c:3165
 msgid "Missing requesting-user-name attribute."
 msgstr ""
 
-#: scheduler/ipp.c:488
+#: scheduler/ipp.c:388
 msgid "Missing required attributes."
 msgstr ""
 
-#: filter/bannertops.c:222
-#, c-format
-msgid "Missing value on line %d of banner file."
+#: cups/http-support.c:1486
+msgid "Missing resource in URI"
+msgstr ""
+
+#: cups/http-support.c:1480
+msgid "Missing scheme in URI"
 msgstr ""
 
-#: cups/adminutil.c:254
+#: cups/adminutil.c:243
 #, c-format
 msgid "Missing value on line %d."
 msgstr ""
 
-#: cups/ppd.c:343
+#: cups/ppd.c:301
 msgid "Missing value string"
 msgstr ""
 
-#: cups/pwg-media.c:377
+#: cups/pwg-media.c:462
 msgid "Missing x-dimension in media-size."
 msgstr ""
 
-#: cups/pwg-media.c:383
+#: cups/pwg-media.c:468
 msgid "Missing y-dimension in media-size."
 msgstr ""
 
@@ -4095,96 +4508,104 @@ msgid ""
 "        device-id = %s"
 msgstr ""
 
-#: cgi-bin/admin.c:570
+#: test/ippfind.c:2756
+msgid "Modifiers:"
+msgstr ""
+
+#: cgi-bin/admin.c:548
 msgid "Modify Class"
 msgstr ""
 
-#: cgi-bin/admin.c:883
+#: cgi-bin/admin.c:860
 msgid "Modify Printer"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:425 cgi-bin/ipp-var.c:516
+#: cgi-bin/ipp-var.c:410 cgi-bin/ipp-var.c:501
 msgid "Move All Jobs"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:364 cgi-bin/ipp-var.c:423 cgi-bin/ipp-var.c:514
+#: cgi-bin/ipp-var.c:349 cgi-bin/ipp-var.c:408 cgi-bin/ipp-var.c:499
 msgid "Move Job"
 msgstr ""
 
-#: cups/http-support.c:1259
+#: cups/http-support.c:1353
 msgid "Moved Permanently"
 msgstr ""
 
-#: cups/ppd.c:340
+#: cups/ppd.c:298
 msgid "NULL PPD file pointer"
 msgstr ""
 
-#: cups/snmp.c:1053
+#: cups/snmp.c:1005
 msgid "Name OID uses indefinite length"
 msgstr ""
 
-#: scheduler/ipp.c:1222
+#: scheduler/ipp.c:1054
 msgid "Nested classes are not allowed."
 msgstr ""
 
-#: ppdc/sample.c:436
+#: ppdc/sample.c:430
 msgid "Never"
 msgstr ""
 
-#: ppdc/sample.c:262
+#: ppdc/sample.c:256
 msgid "New Stylus Color Series"
 msgstr ""
 
-#: ppdc/sample.c:264
+#: ppdc/sample.c:258
 msgid "New Stylus Photo Series"
 msgstr ""
 
-#: cups/ppd.c:1916
+#: cups/ppd.c:1904
 msgid "No"
 msgstr ""
 
-#: cups/http-support.c:1256
+#: cups/http-support.c:1350
 msgid "No Content"
 msgstr ""
 
-#: cups/util.c:1286
+#: cups/util.c:1283
 msgid "No PPD name"
 msgstr ""
 
-#: cups/snmp.c:1047
+#: cups/snmp.c:999
 msgid "No VarBind SEQUENCE"
 msgstr ""
 
-#: cups/adminutil.c:788
+#: cups/adminutil.c:777
 msgid "No Windows printer drivers are installed."
 msgstr ""
 
-#: cups/request.c:577 cups/request.c:871
+#: cups/request.c:570 cups/request.c:933
 msgid "No active connection"
 msgstr ""
 
-#: scheduler/ipp.c:4487
+#: cups/request.c:350
+msgid "No active connection."
+msgstr ""
+
+#: scheduler/ipp.c:3418
 #, c-format
 msgid "No active jobs on %s."
 msgstr ""
 
-#: scheduler/ipp.c:329
+#: scheduler/ipp.c:216
 msgid "No attributes in request."
 msgstr ""
 
-#: scheduler/ipp.c:4118
+#: scheduler/ipp.c:3041
 msgid "No authentication information provided."
 msgstr ""
 
-#: cups/snmp.c:1004
+#: cups/snmp.c:956
 msgid "No community name"
 msgstr ""
 
-#: scheduler/ipp.c:7083
+#: scheduler/ipp.c:5722
 msgid "No default printer."
 msgstr ""
 
-#: cgi-bin/ipp-var.c:436 scheduler/ipp.c:8413
+#: cgi-bin/ipp-var.c:421 scheduler/ipp.c:7040
 msgid "No destinations added."
 msgstr ""
 
@@ -4192,109 +4613,116 @@ msgstr ""
 msgid "No device URI found in argv[0] or in DEVICE_URI environment variable."
 msgstr ""
 
-#: cups/snmp.c:1034
+#: cups/snmp.c:986
 msgid "No error-index"
 msgstr ""
 
-#: cups/snmp.c:1026
+#: cups/snmp.c:978
 msgid "No error-status"
 msgstr ""
 
-#: scheduler/ipp.c:9348 scheduler/ipp.c:10556
+#: scheduler/ipp.c:7982 scheduler/ipp.c:9232
 msgid "No file in print request."
 msgstr ""
 
-#: filter/pstext.c:438
-msgid "No fonts in charset file."
-msgstr ""
-
-#: cups/util.c:921
+#: cups/util.c:890
 msgid "No modification time"
 msgstr ""
 
-#: cups/snmp.c:1051
+#: cups/snmp.c:1003
 msgid "No name OID"
 msgstr ""
 
-#: driver/rastertoescpx.c:1918 driver/rastertopclx.c:1943
-#: filter/rastertoepson.c:1147 filter/rastertohp.c:876
-#: filter/rastertolabel.c:1302
+#: filter/rastertoepson.c:1132 filter/rastertohp.c:865
+#: filter/rastertolabel.c:1288
 msgid "No pages were found."
 msgstr ""
 
-#: cups/util.c:915
+#: cups/util.c:884
 msgid "No printer name"
 msgstr ""
 
-#: cups/util.c:1788
+#: cups/util.c:1807
 msgid "No printer-uri found"
 msgstr ""
 
-#: cups/util.c:1773
+#: cups/util.c:1791
 msgid "No printer-uri found for class"
 msgstr ""
 
-#: scheduler/ipp.c:7486
+#: scheduler/ipp.c:6125
 msgid "No printer-uri in request."
 msgstr ""
 
-#: cups/snmp.c:1018
+#: cups/http.c:2260
+msgid "No request URI."
+msgstr ""
+
+#: cups/http.c:2277
+msgid "No request protocol version."
+msgstr ""
+
+#: cups/request.c:358
+msgid "No request sent."
+msgstr ""
+
+#: cups/snmp.c:970
 msgid "No request-id"
 msgstr ""
 
-#: scheduler/ipp.c:6690
+#: scheduler/ipp.c:5325
 msgid "No subscription attributes in request."
 msgstr ""
 
-#: scheduler/ipp.c:8749
+#: scheduler/ipp.c:7367
 msgid "No subscriptions found."
 msgstr ""
 
-#: cups/snmp.c:1042
+#: cups/snmp.c:994
 msgid "No variable-bindings SEQUENCE"
 msgstr ""
 
-#: cups/snmp.c:997
+#: cups/snmp.c:949
 msgid "No version number"
 msgstr ""
 
-#: ppdc/sample.c:373
+#: ppdc/sample.c:367
 msgid "Non-continuous (Mark sensing)"
 msgstr ""
 
-#: ppdc/sample.c:372
+#: ppdc/sample.c:366
 msgid "Non-continuous (Web sensing)"
 msgstr ""
 
-#: ppdc/sample.c:244
+#: ppdc/sample.c:238
 msgid "Normal"
 msgstr ""
 
-#: cups/http-support.c:1278
+#: cups/http-support.c:1372
 msgid "Not Found"
 msgstr ""
 
-#: cups/http-support.c:1290
+#: cups/http-support.c:1384
 msgid "Not Implemented"
 msgstr ""
 
-#: ppdc/sample.c:282
+#: ppdc/sample.c:276
 msgid "Not Installed"
 msgstr ""
 
-#: cups/http-support.c:1265
+#: cups/http-support.c:1359
 msgid "Not Modified"
 msgstr ""
 
-#: cups/http-support.c:1293
+#: cups/http-support.c:1387
 msgid "Not Supported"
 msgstr ""
 
-#: scheduler/ipp.c:1598 scheduler/ipp.c:11777
+#: scheduler/ipp.c:1490 scheduler/ipp.c:10461
 msgid "Not allowed to print."
 msgstr ""
 
-#: ppdc/sample.c:143
+#: ppdc/sample.c:146
 msgid "Note"
 msgstr ""
 
@@ -4302,141 +4730,145 @@ msgstr ""
 msgid "Note: this program only validates the DSC comments, not the PostScript itself."
 msgstr ""
 
-#: cups/http-support.c:1247 cups/ppd.c:338
+#: cups/http-support.c:1341 cups/http-support.c:1477 cups/ppd.c:296
 msgid "OK"
 msgstr ""
 
-#: ppdc/sample.c:277
+#: ppdc/sample.c:271
 msgid "Off (1-Sided)"
 msgstr ""
 
-#: ppdc/sample.c:367
+#: ppdc/sample.c:361
 msgid "Oki"
 msgstr ""
 
-#: cgi-bin/help.c:90 cgi-bin/help.c:131 cgi-bin/help.c:141 cgi-bin/help.c:172
+#: cgi-bin/help.c:91 cgi-bin/help.c:132 cgi-bin/help.c:142 cgi-bin/help.c:172
 msgid "Online Help"
 msgstr ""
 
-#: cups/adminutil.c:955
+#: cups/adminutil.c:944
 #, c-format
 msgid "Open of %s failed: %s"
 msgstr ""
 
-#: cups/ppd.c:346
+#: cups/ppd.c:304
 msgid "OpenGroup without a CloseGroup first"
 msgstr ""
 
-#: cups/ppd.c:348
+#: cups/ppd.c:306
 msgid "OpenUI/JCLOpenUI without a CloseUI/JCLCloseUI first"
 msgstr ""
 
-#: cgi-bin/admin.c:3746
+#: cgi-bin/admin.c:3611
 msgid "Operation Policy"
 msgstr ""
 
-#: filter/pstops.c:2255
+#: filter/pstops.c:2177
 #, c-format
 msgid "Option \"%s\" cannot be included via %%%%IncludeFeature."
 msgstr ""
 
-#: cgi-bin/admin.c:3400 cgi-bin/admin.c:3484
+#: cgi-bin/admin.c:3261 cgi-bin/admin.c:3345
 msgid "Options Installed"
 msgstr ""
 
-#: scheduler/cupsfilter.c:1356 scheduler/cupsfilter.c:1383
-#: scheduler/main.c:2187 systemv/cupsaddsmb.c:284 systemv/cupsctl.c:209
-#: systemv/cupstestdsc.c:429 systemv/cupstestppd.c:3616 test/ipptool.c:3827
-#: ppdc/ppdc.cxx:437 ppdc/ppdhtml.cxx:174 ppdc/ppdi.cxx:130
-#: ppdc/ppdmerge.cxx:369 ppdc/ppdpo.cxx:254
+#: scheduler/cupsfilter.c:1482 scheduler/main.c:2158 systemv/cupsaddsmb.c:284
+#: systemv/cupsctl.c:203 systemv/cupstestdsc.c:429 systemv/cupstestppd.c:3817
+#: test/ippfind.c:2715 test/ipptool.c:4712 ppdc/ppdc.cxx:432
+#: ppdc/ppdhtml.cxx:174 ppdc/ppdi.cxx:130 ppdc/ppdmerge.cxx:363
+#: ppdc/ppdpo.cxx:254
 msgid "Options:"
 msgstr ""
 
-#: filter/bannertops.c:674
-msgid "Options: "
-msgstr ""
-
-#: cups/ppd-cache.c:152
+#: cups/ppd-cache.c:125
 msgid "Out of date PPD cache file."
 msgstr ""
 
-#: cups/ppd-cache.c:1313
+#: cups/ppd-cache.c:1410
 msgid "Out of memory."
 msgstr ""
 
-#: cups/ppd.c:761 cups/ppd.c:1330
+#: cups/ppd.c:753 cups/ppd.c:1319
 msgid "Output Mode"
 msgstr ""
 
-#: systemv/lpstat.c:1188 systemv/lpstat.c:1192
-#, c-format
-msgid "Output for printer %s is sent to %s"
-msgstr ""
-
-#: systemv/lpstat.c:1182
-#, c-format
-msgid "Output for printer %s is sent to remote printer %s on %s"
+#: cups/localize.c:316
+msgid "Output bin is almost full."
 msgstr ""
 
-#: systemv/lpstat.c:1206 systemv/lpstat.c:1210
-#, c-format
-msgid "Output for printer %s/%s is sent to %s"
+#: cups/localize.c:318
+msgid "Output bin is full."
 msgstr ""
 
-#: systemv/lpstat.c:1200
-#, c-format
-msgid "Output for printer %s/%s is sent to remote printer %s on %s"
+#: cups/localize.c:314
+msgid "Output bin is missing."
 msgstr ""
 
 #: systemv/cupstestdsc.c:399
 msgid "PASS"
 msgstr ""
 
-#: ppdc/sample.c:266
+#: ppdc/sample.c:260
 msgid "PCL Laser Printer"
 msgstr ""
 
-#: ppdc/sample.c:146
+#: ppdc/sample.c:149
 msgid "PRC16K"
 msgstr ""
 
-#: ppdc/sample.c:147
+#: ppdc/sample.c:150
 msgid "PRC16K Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:148
+#: ppdc/sample.c:151
 msgid "PRC32K"
 msgstr ""
 
-#: ppdc/sample.c:151
+#: ppdc/sample.c:154
 msgid "PRC32K Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:149
+#: ppdc/sample.c:152
 msgid "PRC32K Oversize"
 msgstr ""
 
-#: ppdc/sample.c:150
+#: ppdc/sample.c:153
 msgid "PRC32K Oversize Long Edge"
 msgstr ""
 
-#: cups/snmp.c:1014
+#: cups/snmp.c:966
 msgid "Packet does not contain a Get-Response-PDU"
 msgstr ""
 
-#: cups/snmp.c:993
+#: cups/snmp.c:945
 msgid "Packet does not start with SEQUENCE"
 msgstr ""
 
-#: ppdc/sample.c:366
+#: cups/localize.c:293
+msgid "Paper jam."
+msgstr ""
+
+#: cups/localize.c:310
+msgid "Paper tray is almost empty."
+msgstr ""
+
+#: cups/localize.c:312
+msgid "Paper tray is empty."
+msgstr ""
+
+#: cups/localize.c:308
+msgid "Paper tray is missing."
+msgstr ""
+
+#: ppdc/sample.c:360
 msgid "ParamCustominCutInterval"
 msgstr ""
 
-#: ppdc/sample.c:364
+#: ppdc/sample.c:358
 msgid "ParamCustominTearInterval"
 msgstr ""
 
-#: cups/auth.c:156
+#: cups/auth.c:195 cups/auth.c:362
 #, c-format
 msgid "Password for %s on %s? "
 msgstr ""
@@ -4446,59 +4878,63 @@ msgstr ""
 msgid "Password for %s required to access %s via SAMBA: "
 msgstr ""
 
-#: cgi-bin/classes.c:167
+#: cgi-bin/classes.c:159
 msgid "Pause Class"
 msgstr ""
 
-#: cgi-bin/printers.c:170
+#: cgi-bin/printers.c:162
 msgid "Pause Printer"
 msgstr ""
 
-#: ppdc/sample.c:454
+#: ppdc/sample.c:448
 msgid "Peel-Off"
 msgstr ""
 
-#: ppdc/sample.c:157
+#: ppdc/sample.c:160
 msgid "Photo"
 msgstr ""
 
-#: ppdc/sample.c:158
+#: ppdc/sample.c:161
 msgid "Photo Labels"
 msgstr ""
 
-#: ppdc/sample.c:292
+#: ppdc/sample.c:286
 msgid "Plain Paper"
 msgstr ""
 
-#: cgi-bin/admin.c:3418 cgi-bin/admin.c:3695
+#: cgi-bin/admin.c:3279 cgi-bin/admin.c:3560
 msgid "Policies"
 msgstr ""
 
-#: cgi-bin/admin.c:3425 cgi-bin/admin.c:3764 cgi-bin/admin.c:3777
+#: cgi-bin/admin.c:3286 cgi-bin/admin.c:3629 cgi-bin/admin.c:3642
 msgid "Port Monitor"
 msgstr ""
 
-#: ppdc/sample.c:284
+#: ppdc/sample.c:278
 msgid "PostScript Printer"
 msgstr ""
 
-#: ppdc/sample.c:144
+#: ppdc/sample.c:147
 msgid "Postcard"
 msgstr ""
 
-#: ppdc/sample.c:68
+#: ppdc/sample.c:71
 msgid "Postcard Double "
 msgstr ""
 
-#: ppdc/sample.c:69
+#: ppdc/sample.c:72
 msgid "Postcard Double Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:145
+#: ppdc/sample.c:148
 msgid "Postcard Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:301
+#: backend/ipp.c:946 backend/ipp.c:954
+msgid "Preparing to print."
+msgstr ""
+
+#: ppdc/sample.c:295
 msgid "Print Density"
 msgstr ""
 
@@ -4506,1229 +4942,1127 @@ msgstr ""
 msgid "Print Job:"
 msgstr ""
 
-#: ppdc/sample.c:346
+#: ppdc/sample.c:340
 msgid "Print Mode"
 msgstr ""
 
-#: ppdc/sample.c:389
+#: ppdc/sample.c:383
 msgid "Print Rate"
 msgstr ""
 
-#: cgi-bin/printers.c:179
+#: cgi-bin/printers.c:171
 msgid "Print Self-Test Page"
 msgstr ""
 
-#: ppdc/sample.c:333
+#: ppdc/sample.c:327
 msgid "Print Speed"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:792
+#: cgi-bin/ipp-var.c:777
 msgid "Print Test Page"
 msgstr ""
 
-#: ppdc/sample.c:362
+#: ppdc/sample.c:356
 msgid "Print and Cut"
 msgstr ""
 
-#: ppdc/sample.c:350
+#: ppdc/sample.c:344
 msgid "Print and Tear"
 msgstr ""
 
-#: backend/ipp.c:1320
-#, c-format
-msgid "Print file accepted - job ID %d."
-msgstr ""
-
-#: backend/ipp.c:1313
-msgid "Print file accepted - job ID unknown."
-msgstr ""
-
-#: backend/parallel.c:286 backend/socket.c:415 backend/usb-unix.c:195
+#: backend/socket.c:429 backend/usb-unix.c:184
 msgid "Print file sent."
 msgstr ""
 
-#: backend/ipp.c:1277
-msgid "Print file was not accepted."
+#: backend/ipp.c:2157
+msgid "Print job canceled at printer."
 msgstr ""
 
-#: filter/bannertops.c:648
-msgid "Printed For: "
+#: backend/ipp.c:2149
+msgid "Print job too large."
 msgstr ""
 
-#: filter/bannertops.c:656
-msgid "Printed From: "
+#: backend/ipp.c:1627
+msgid "Print job was not accepted."
 msgstr ""
 
-#: filter/bannertops.c:876
-msgid "Printed On: "
-msgstr ""
-
-#: cgi-bin/ipp-var.c:1047
+#: cgi-bin/ipp-var.c:1028
 msgid "Printer Added"
 msgstr ""
 
-#: ppdc/sample.c:269
+#: ppdc/sample.c:263
 msgid "Printer Default"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1051
+#: cgi-bin/ipp-var.c:1032
 msgid "Printer Deleted"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1049
+#: cgi-bin/ipp-var.c:1030
 msgid "Printer Modified"
 msgstr ""
 
-#: filter/bannertops.c:614
-msgid "Printer Name: "
-msgstr ""
-
-#: cgi-bin/ipp-var.c:1045
+#: cgi-bin/ipp-var.c:1026
 msgid "Printer Paused"
 msgstr ""
 
-#: ppdc/sample.c:300
+#: ppdc/sample.c:294
 msgid "Printer Settings"
 msgstr ""
 
-#: backend/usb-unix.c:132
-msgid "Printer busy, will retry in 10 seconds."
-msgstr ""
-
-#: backend/parallel.c:234 backend/serial.c:256
-msgid "Printer busy; will retry in 30 seconds."
-msgstr ""
-
-#: backend/lpd.c:607 backend/lpd.c:995 backend/lpd.c:1082 backend/lpd.c:1137
-#, c-format
-msgid "Printer did not respond after %d seconds."
-msgstr ""
-
-#: backend/ipp.c:791 backend/ipp.c:798
-#, c-format
-msgid "Printer does not support IPP/%d.%d, trying IPP/%s."
-msgstr ""
-
-#: backend/usb-unix.c:429 backend/usb-unix.c:513
-msgid "Printer is busy, will retry in 5 seconds."
-msgstr ""
-
-#: backend/runloop.c:253 backend/runloop.c:371
-msgid "Printer is not currently connected."
+#: backend/ipp.c:2152
+msgid "Printer cannot print supplied content."
 msgstr ""
 
-#: backend/runloop.c:392
-msgid "Printer is now connected."
-msgstr ""
-
-#: backend/usb-darwin.c:1304
-msgid "Printer is now online."
-msgstr ""
-
-#: backend/usb-darwin.c:1322
-msgid "Printer is offline."
-msgstr ""
-
-#: backend/usb-unix.c:139
-msgid "Printer not connected, will retry in 30 seconds."
-msgstr ""
-
-#: backend/parallel.c:240
-msgid "Printer not connected; will retry in 30 seconds."
+#: backend/ipp.c:2155
+msgid "Printer cannot print with supplied options."
 msgstr ""
 
 #: cups/notify.c:126
 msgid "Printer:"
 msgstr ""
 
-#: cgi-bin/printers.c:204 cgi-bin/printers.c:332
+#: cgi-bin/printers.c:196 cgi-bin/printers.c:324
 msgid "Printers"
 msgstr ""
 
-#: driver/rastertoescpx.c:1882 driver/rastertopclx.c:1904
-#: filter/rastertoepson.c:1093 filter/rastertohp.c:817
-#: filter/rastertolabel.c:1249
+#: filter/rastertoepson.c:1078 filter/rastertohp.c:806
+#: filter/rastertolabel.c:1235
 #, c-format
-msgid "Printing page %d, %d%% complete."
+msgid "Printing page %d, %u%% complete."
 msgstr ""
 
-#: filter/imagetops.c:810
-#, c-format
-msgid "Printing page %d."
-msgstr ""
-
-#: cgi-bin/classes.c:173 cgi-bin/printers.c:176
+#: cgi-bin/classes.c:165 cgi-bin/printers.c:168
 msgid "Purge Jobs"
 msgstr ""
 
-#: ppdc/sample.c:152
+#: ppdc/sample.c:155
 msgid "Quarto"
 msgstr ""
 
-#: scheduler/ipp.c:1593 scheduler/ipp.c:11772
+#: scheduler/ipp.c:1485 scheduler/ipp.c:10456
 msgid "Quota limit reached."
 msgstr ""
 
-#: berkeley/lpq.c:514
+#: berkeley/lpq.c:490
 msgid "Rank    Owner   Job     File(s)                         Total Size"
 msgstr ""
 
-#: berkeley/lpq.c:510
-msgid "Rank   Owner      Pri  Job        Files                       Total Size"
-msgstr ""
-
-#: backend/ipp.c:1632 backend/socket.c:466 driver/rastertoescpx.c:1923
-#: driver/rastertopclx.c:1948 filter/rastertoepson.c:1152
-#: filter/rastertohp.c:881 filter/rastertolabel.c:1307
-msgid "Ready to print."
-msgstr ""
-
-#: cgi-bin/classes.c:171 cgi-bin/printers.c:174
+#: cgi-bin/classes.c:163 cgi-bin/printers.c:166
 msgid "Reject Jobs"
 msgstr ""
 
-#: backend/lpd.c:1005 backend/lpd.c:1147
+#: backend/lpd.c:1024 backend/lpd.c:1156
 #, c-format
 msgid "Remote host did not accept control file (%d)."
 msgstr ""
 
-#: backend/lpd.c:1095
+#: backend/lpd.c:1109
 #, c-format
 msgid "Remote host did not accept data file (%d)."
 msgstr ""
 
-#: ppdc/sample.c:434
+#: ppdc/sample.c:428
 msgid "Reprint After Error"
 msgstr ""
 
-#: cups/http-support.c:1281
+#: cups/http-support.c:1375
 msgid "Request Entity Too Large"
 msgstr ""
 
-#: cups/ppd.c:763 cups/ppd.c:1332 ppdc/sample.c:237
+#: cups/ppd.c:755 cups/ppd.c:1321 ppdc/sample.c:231
 msgid "Resolution"
 msgstr ""
 
-#: cgi-bin/classes.c:165
+#: cgi-bin/classes.c:157
 msgid "Resume Class"
 msgstr ""
 
-#: cgi-bin/printers.c:167
+#: cgi-bin/printers.c:159
 msgid "Resume Printer"
 msgstr ""
 
-#: ppdc/sample.c:162
+#: ppdc/sample.c:165
 msgid "Return Address"
 msgstr ""
 
-#: ppdc/sample.c:171
-msgid "Return Address - 3/4 x 2\""
-msgstr ""
-
-#: ppdc/sample.c:455
+#: ppdc/sample.c:449
 msgid "Rewind"
 msgstr ""
 
-#: cups/adminutil.c:2169
+#: cups/adminutil.c:2041
 #, c-format
 msgid "Running command: %s %s -N -A %s -c '%s'"
 msgstr ""
 
-#: cups/snmp.c:995
+#: cups/snmp.c:947
 msgid "SEQUENCE uses indefinite length"
 msgstr ""
 
-#: cups/http-support.c:1305
+#: cups/http-support.c:1399
 msgid "SSL/TLS Negotiation Error"
 msgstr ""
 
-#: cups/http-support.c:1262
+#: cups/http-support.c:1356
 msgid "See Other"
 msgstr ""
 
-#: backend/usb-darwin.c:541
+#: backend/usb-darwin.c:552 backend/usb-libusb.c:346
 msgid "Sending data to printer."
 msgstr ""
 
-#: backend/serial.c:783 backend/serial.c:942 backend/serial.c:1064
-#: backend/serial.c:1158
-#, c-format
-msgid "Serial Port #%d"
-msgstr ""
-
-#: cgi-bin/ipp-var.c:1061
+#: cgi-bin/ipp-var.c:1042
 msgid "Server Restarted"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1067
+#: cgi-bin/ipp-var.c:1048
 msgid "Server Security Auditing"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1063
+#: cgi-bin/ipp-var.c:1044
 msgid "Server Started"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:1065
+#: cgi-bin/ipp-var.c:1046
 msgid "Server Stopped"
 msgstr ""
 
-#: cups/http-support.c:1299
+#: cups/tls-darwin.c:1028
+msgid "Server credentials not set."
+msgstr ""
+
+#: cups/http-support.c:1393
 msgid "Service Unavailable"
 msgstr ""
 
-#: cgi-bin/admin.c:2905 cgi-bin/admin.c:2951 cgi-bin/admin.c:3108
-#: cgi-bin/admin.c:3127
+#: cgi-bin/admin.c:2766 cgi-bin/admin.c:2812 cgi-bin/admin.c:2969
+#: cgi-bin/admin.c:2988
 msgid "Set Allowed Users"
 msgstr ""
 
-#: cgi-bin/admin.c:3154
+#: cgi-bin/admin.c:3015
 msgid "Set As Server Default"
 msgstr ""
 
-#: cgi-bin/admin.c:3254
+#: cgi-bin/admin.c:3115
 msgid "Set Class Options"
 msgstr ""
 
-#: cgi-bin/admin.c:3254 cgi-bin/admin.c:3428 cgi-bin/admin.c:3806
+#: cgi-bin/admin.c:3115 cgi-bin/admin.c:3289 cgi-bin/admin.c:3671
 msgid "Set Printer Options"
 msgstr ""
 
-#: cgi-bin/admin.c:3976 cgi-bin/admin.c:4020 cgi-bin/admin.c:4038
+#: cgi-bin/admin.c:3841 cgi-bin/admin.c:3885 cgi-bin/admin.c:3903
 msgid "Set Publishing"
 msgstr ""
 
-#: ppdc/sample.c:163
+#: ppdc/sample.c:166
 msgid "Shipping Address"
 msgstr ""
 
-#: ppdc/sample.c:172
-msgid "Shipping Address - 2 5/16 x 4\""
-msgstr ""
-
-#: ppdc/sample.c:279
+#: ppdc/sample.c:273
 msgid "Short-Edge (Landscape)"
 msgstr ""
 
-#: ppdc/sample.c:294
+#: ppdc/sample.c:288
 msgid "Special Paper"
 msgstr ""
 
-#: backend/lpd.c:1046
+#: backend/lpd.c:1065
 #, c-format
 msgid "Spooling job, %.0f%% complete."
 msgstr ""
 
-#: ppdc/sample.c:347
+#: ppdc/sample.c:341
 msgid "Standard"
 msgstr ""
 
-#: cgi-bin/admin.c:3669
+#. TRANSLATORS: Banner/cover sheet before the print job.
+#: cgi-bin/admin.c:3532
 msgid "Starting Banner"
 msgstr ""
 
-#: driver/rastertoescpx.c:1866 driver/rastertopclx.c:1887
-#: filter/rastertoepson.c:1069 filter/rastertohp.c:793
-#: filter/rastertolabel.c:1225
+#: filter/rastertoepson.c:1054 filter/rastertohp.c:782
+#: filter/rastertolabel.c:1211
 #, c-format
 msgid "Starting page %d."
 msgstr ""
 
-#: ppdc/sample.c:153
+#: ppdc/sample.c:156
 msgid "Statement"
 msgstr ""
 
-#: ppdc/sample.c:257
+#: ppdc/sample.c:251
 msgid "Stylus Color Series"
 msgstr ""
 
-#: ppdc/sample.c:263
+#: ppdc/sample.c:257
 msgid "Stylus Photo Series"
 msgstr ""
 
-#: scheduler/ipp.c:4633 scheduler/ipp.c:7853 scheduler/ipp.c:8562
-#: scheduler/ipp.c:10044
+#: scheduler/ipp.c:3564 scheduler/ipp.c:6481 scheduler/ipp.c:7180
+#: scheduler/ipp.c:8680
 #, c-format
 msgid "Subscription #%d does not exist."
 msgstr ""
 
-#: ppdc/sample.c:154
+#: test/ippfind.c:2768
+msgid "Substitutions:"
+msgstr ""
+
+#: ppdc/sample.c:157
 msgid "Super A"
 msgstr ""
 
-#: ppdc/sample.c:155
+#: ppdc/sample.c:158
 msgid "Super B"
 msgstr ""
 
-#: ppdc/sample.c:159
+#: ppdc/sample.c:162
 msgid "Super B/A3"
 msgstr ""
 
-#: cups/http-support.c:1244
+#: cups/http-support.c:1338
 msgid "Switching Protocols"
 msgstr ""
 
-#: ppdc/sample.c:156
+#: ppdc/sample.c:159
 msgid "Tabloid"
 msgstr ""
 
-#: ppdc/sample.c:42
+#: ppdc/sample.c:45
 msgid "Tabloid Oversize"
 msgstr ""
 
-#: ppdc/sample.c:43
+#: ppdc/sample.c:46
 msgid "Tabloid Oversize Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:348
+#: ppdc/sample.c:342
 msgid "Tear"
 msgstr ""
 
-#: ppdc/sample.c:453
+#: ppdc/sample.c:447
 msgid "Tear-Off"
 msgstr ""
 
-#: ppdc/sample.c:394
+#: ppdc/sample.c:388
 msgid "Tear-Off Adjust Position"
 msgstr ""
 
-#: scheduler/ipp.c:7557 scheduler/ipp.c:7635 scheduler/ipp.c:7651
-#: scheduler/ipp.c:7669
+#: scheduler/ipp.c:1321
 #, c-format
-msgid "The %s attribute cannot be provided with job-ids."
+msgid "The \"%s\" attribute is required for print jobs."
 msgstr ""
 
-#: scheduler/ipp.c:8084
+#: scheduler/ipp.c:6196 scheduler/ipp.c:6274 scheduler/ipp.c:6290
+#: scheduler/ipp.c:6308
 #, c-format
-msgid "The PPD file \"%s\" could not be found."
+msgid "The %s attribute cannot be provided with job-ids."
 msgstr ""
 
-#: scheduler/ipp.c:8071
+#: scheduler/ipp.c:1297
 #, c-format
-msgid "The PPD file \"%s\" could not be opened: %s"
-msgstr ""
-
-#: driver/rastertoescpx.c:1794 driver/rastertopclx.c:1819
-#: filter/rastertoepson.c:1038 filter/rastertohp.c:764
-#: filter/rastertolabel.c:1189
-msgid "The PPD file could not be opened."
-msgstr ""
-
-#: cgi-bin/admin.c:750
-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:353
-msgid "The developer unit needs to be replaced."
-msgstr ""
-
-#: cups/localize.c:351
-msgid "The developer unit will need to be replaced soon."
-msgstr ""
-
-#: cups/localize.c:343
-msgid "The fuser's temperature is high."
+msgid "The '%s' Job Description attribute cannot be supplied in a job creation request."
 msgstr ""
 
-#: cups/localize.c:345
-msgid "The fuser's temperature is low."
+#: scheduler/ipp.c:5134
+#, c-format
+msgid "The '%s' operation attribute cannot be supplied in a Create-Job request."
 msgstr ""
 
-#: scheduler/ipp.c:2242
-msgid "The notify-lease-duration attribute cannot be used with job subscriptions."
+#: scheduler/ipp.c:6711
+#, c-format
+msgid "The PPD file \"%s\" could not be found."
 msgstr ""
 
-#: scheduler/ipp.c:2225 scheduler/ipp.c:6815
+#: scheduler/ipp.c:6698
 #, c-format
-msgid "The notify-user-data value is too large (%d > 63 octets)."
+msgid "The PPD file \"%s\" could not be opened: %s"
 msgstr ""
 
-#: cups/localize.c:349
-msgid "The optical photoconductor needs to be replaced."
+#: filter/rastertoepson.c:1023 filter/rastertohp.c:753
+#: filter/rastertolabel.c:1175
+msgid "The PPD file could not be opened."
 msgstr ""
 
-#: cups/localize.c:347
-msgid "The optical photoconductor will need to be replaced soon."
+#: cgi-bin/admin.c:727
+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:331
-msgid "The output bin is almost full."
+#: cups/localize.c:338
+msgid "The developer unit needs to be replaced."
 msgstr ""
 
-#: cups/localize.c:333
-msgid "The output bin is full."
+#: cups/localize.c:336
+msgid "The developer unit will need to be replaced soon."
 msgstr ""
 
-#: cups/localize.c:329
-msgid "The output bin is missing."
+#: cups/localize.c:328
+msgid "The fuser's temperature is high."
 msgstr ""
 
-#: filter/imagetoraster.c:459
-msgid "The page setup information was not valid."
+#: cups/localize.c:330
+msgid "The fuser's temperature is low."
 msgstr ""
 
-#: cups/localize.c:325
-msgid "The paper tray is almost empty."
+#: scheduler/ipp.c:2087
+msgid "The notify-lease-duration attribute cannot be used with job subscriptions."
 msgstr ""
 
-#: cups/localize.c:327
-msgid "The paper tray is empty."
+#: scheduler/ipp.c:2070 scheduler/ipp.c:5450
+#, c-format
+msgid "The notify-user-data value is too large (%d > 63 octets)."
 msgstr ""
 
-#: cups/localize.c:323
-msgid "The paper tray is missing."
+#: cups/localize.c:334
+msgid "The optical photoconductor needs to be replaced."
 msgstr ""
 
-#: cups/localize.c:306
-msgid "The paper tray needs to be filled."
+#: cups/localize.c:332
+msgid "The optical photoconductor will need to be replaced soon."
 msgstr ""
 
-#: filter/imagetops.c:315 filter/imagetoraster.c:675
-msgid "The print file could not be opened."
+#: backend/ipp.c:966
+msgid "The printer configuration is incorrect or the printer no longer exists."
 msgstr ""
 
-#: backend/ipp.c:808
-msgid "The printer URI is incorrect or no longer exists."
+#: backend/lpd.c:627 backend/lpd.c:1017 backend/lpd.c:1099 backend/lpd.c:1149
+msgid "The printer did not respond."
 msgstr ""
 
-#: cups/localize.c:335
-msgid "The printer is almost out of ink."
+#: backend/ipp.c:810 backend/ipp.c:929 backend/ipp.c:1043 backend/ipp.c:1434
+#: backend/ipp.c:1599 backend/lpd.c:836 backend/socket.c:379
+#: backend/usb-unix.c:124 backend/usb-unix.c:414 backend/usb-unix.c:497
+msgid "The printer is in use."
 msgstr ""
 
-#: backend/ipp.c:656 backend/ipp.c:773 backend/ipp.c:851 backend/ipp.c:1129
-#: backend/ipp.c:1257 backend/lpd.c:832 backend/socket.c:368
-msgid "The printer is busy."
+#: cups/localize.c:320
+msgid "The printer is low on ink."
 msgstr ""
 
-#: cups/localize.c:313
+#: cups/localize.c:298
 msgid "The printer is low on toner."
 msgstr ""
 
-#: cups/localize.c:311
+#: backend/runloop.c:243 backend/runloop.c:363 cups/localize.c:296
 msgid "The printer is not connected."
 msgstr ""
 
-#: backend/ipp.c:634 backend/ipp.c:667 backend/ipp.c:769 backend/lpd.c:811
-#: backend/lpd.c:852 backend/socket.c:347 backend/socket.c:380
+#: backend/ipp.c:788 backend/ipp.c:821 backend/ipp.c:925 backend/lpd.c:815
+#: backend/lpd.c:856 backend/socket.c:358 backend/socket.c:391
 msgid "The printer is not responding."
 msgstr ""
 
-#: cups/localize.c:337
-msgid "The printer is out of ink."
+#: backend/runloop.c:385
+msgid "The printer is now connected."
+msgstr ""
+
+#: backend/usb-darwin.c:1300
+msgid "The printer is now online."
 msgstr ""
 
-#: cups/localize.c:315
-msgid "The printer is out of toner."
+#: backend/usb-darwin.c:1321
+msgid "The printer is offline."
 msgstr ""
 
-#: backend/ipp.c:649 backend/lpd.c:825 backend/socket.c:361
+#: backend/ipp.c:803 backend/lpd.c:829 backend/socket.c:372
 msgid "The printer is unreachable at this time."
 msgstr ""
 
-#: backend/ipp.c:643 backend/lpd.c:819 backend/socket.c:355
+#: cups/localize.c:322
+msgid "The printer may be out of ink."
+msgstr ""
+
+#: cups/localize.c:300
+msgid "The printer may be out of toner."
+msgstr ""
+
+#: backend/ipp.c:797 backend/lpd.c:823 backend/socket.c:366
 msgid "The printer may not exist or is unavailable at this time."
 msgstr ""
 
-#: cgi-bin/admin.c:932
+#: cgi-bin/admin.c:909
 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:904 scheduler/ipp.c:1216 scheduler/ipp.c:4282
-#: scheduler/ipp.c:4453 scheduler/ipp.c:6346 scheduler/ipp.c:6649
-#: scheduler/ipp.c:6963 scheduler/ipp.c:7523 scheduler/ipp.c:8289
-#: scheduler/ipp.c:8345 scheduler/ipp.c:8668 scheduler/ipp.c:8918
-#: scheduler/ipp.c:9007 scheduler/ipp.c:9040 scheduler/ipp.c:9363
-#: scheduler/ipp.c:9756 scheduler/ipp.c:9837 scheduler/ipp.c:10950
-#: scheduler/ipp.c:11405 scheduler/ipp.c:11735 scheduler/ipp.c:11817
-#: scheduler/ipp.c:12109
+#: scheduler/ipp.c:788 scheduler/ipp.c:1048 scheduler/ipp.c:3205
+#: scheduler/ipp.c:3384 scheduler/ipp.c:5117 scheduler/ipp.c:5284
+#: scheduler/ipp.c:5598 scheduler/ipp.c:6162 scheduler/ipp.c:6916
+#: scheduler/ipp.c:6972 scheduler/ipp.c:7286 scheduler/ipp.c:7552
+#: scheduler/ipp.c:7641 scheduler/ipp.c:7674 scheduler/ipp.c:7997
+#: scheduler/ipp.c:8390 scheduler/ipp.c:8472 scheduler/ipp.c:9636
+#: scheduler/ipp.c:10088 scheduler/ipp.c:10419 scheduler/ipp.c:10501
+#: scheduler/ipp.c:10874
 msgid "The printer or class does not exist."
 msgstr ""
 
-#: scheduler/ipp.c:1384
+#: scheduler/ipp.c:1234
 msgid "The printer or class is not shared."
 msgstr ""
 
-#: cups/localize.c:317
+#: cups/localize.c:302
 msgid "The printer's cover is open."
 msgstr ""
 
-#: cups/localize.c:321
+#: cups/localize.c:306
 msgid "The printer's door is open."
 msgstr ""
 
-#: cups/localize.c:319
+#: cups/localize.c:304
 msgid "The printer's interlock is open."
 msgstr ""
 
-#: cups/localize.c:339
+#: cups/localize.c:324
 msgid "The printer's waste bin is almost full."
 msgstr ""
 
-#: cups/localize.c:341
+#: cups/localize.c:326
 msgid "The printer's waste bin is full."
 msgstr ""
 
-#: scheduler/ipp.c:1011 scheduler/ipp.c:2408
+#: scheduler/ipp.c:894 scheduler/ipp.c:2251
 #, c-format
 msgid "The printer-uri \"%s\" contains invalid characters."
 msgstr ""
 
-#: scheduler/ipp.c:4259
+#: scheduler/ipp.c:3182
 msgid "The printer-uri attribute is required."
 msgstr ""
 
-#: scheduler/ipp.c:995
+#: scheduler/ipp.c:878
 msgid "The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"."
 msgstr ""
 
-#: scheduler/ipp.c:2392
+#: scheduler/ipp.c:2235
 msgid "The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"."
 msgstr ""
 
-#: cgi-bin/admin.c:474
+#: cgi-bin/admin.c:452
 msgid "The subscription name may not contain spaces, slashes (/), question marks (?), or the pound sign (#)."
 msgstr ""
 
-#: scheduler/client.c:2462
+#: scheduler/client.c:2223
 msgid "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to enable it."
 msgstr ""
 
-#: scheduler/ipp.c:7618
+#: scheduler/ipp.c:6257
 #, c-format
 msgid "The which-jobs value \"%s\" is not supported."
 msgstr ""
 
-#: scheduler/ipp.c:6893
+#: scheduler/ipp.c:5528
 msgid "There are too many subscriptions."
 msgstr ""
 
-#: cups/localize.c:308
-msgid "There is a paper jam."
-msgstr ""
-
-#: backend/usb-darwin.c:377 backend/usb-darwin.c:436 backend/usb-darwin.c:503
-#: backend/usb-darwin.c:524
+#: 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
 msgid "There was an unrecoverable USB error."
 msgstr ""
 
-#: ppdc/sample.c:441
+#: ppdc/sample.c:435
 msgid "Thermal Transfer Media"
 msgstr ""
 
-#: backend/ipp.c:925 backend/ipp.c:934 backend/ipp.c:1157
-msgid "This printer does not conform to the IPP standard and may not work."
-msgstr ""
-
-#: backend/ipp.c:747 backend/ipp.c:866
-msgid "This printer does not conform to the IPP standard. Please contact the manufacturer of your printer for assistance."
-msgstr ""
-
-#: filter/bannertops.c:640
-msgid "Title: "
-msgstr ""
-
-#: scheduler/ipp.c:1587
+#: scheduler/ipp.c:1479
 msgid "Too many active jobs."
 msgstr ""
 
-#: scheduler/ipp.c:1481
+#: scheduler/ipp.c:1373
 #, c-format
 msgid "Too many job-sheets values (%d > 2)."
 msgstr ""
 
-#: scheduler/ipp.c:2729
+#: scheduler/ipp.c:2536
 #, c-format
 msgid "Too many printer-state-reasons values (%d > %d)."
 msgstr ""
 
-#: ppdc/sample.c:295
+#: ppdc/sample.c:289
 msgid "Transparency"
 msgstr ""
 
-#: ppdc/sample.c:290
+#: ppdc/sample.c:284
 msgid "Tray"
 msgstr ""
 
-#: ppdc/sample.c:270
+#: ppdc/sample.c:264
 msgid "Tray 1"
 msgstr ""
 
-#: ppdc/sample.c:271
+#: ppdc/sample.c:265
 msgid "Tray 2"
 msgstr ""
 
-#: ppdc/sample.c:272
+#: ppdc/sample.c:266
 msgid "Tray 3"
 msgstr ""
 
-#: ppdc/sample.c:273
+#: ppdc/sample.c:267
 msgid "Tray 4"
 msgstr ""
 
-#: cups/http-support.c:1284
+#: cups/http-support.c:1378
 msgid "URI Too Long"
 msgstr ""
 
-#: ppdc/sample.c:135
+#: cups/http-support.c:1453
+msgid "URI too large"
+msgstr ""
+
+#: ppdc/sample.c:138
 msgid "US Ledger"
 msgstr ""
 
-#: ppdc/sample.c:136
+#: ppdc/sample.c:139
 msgid "US Legal"
 msgstr ""
 
-#: ppdc/sample.c:137
+#: ppdc/sample.c:140
 msgid "US Legal Oversize"
 msgstr ""
 
-#: ppdc/sample.c:138
+#: ppdc/sample.c:141
 msgid "US Letter"
 msgstr ""
 
-#: ppdc/sample.c:139
+#: ppdc/sample.c:142
 msgid "US Letter Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:140
+#: ppdc/sample.c:143
 msgid "US Letter Oversize"
 msgstr ""
 
-#: ppdc/sample.c:141
+#: ppdc/sample.c:144
 msgid "US Letter Oversize Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:142
+#: ppdc/sample.c:145
 msgid "US Letter Small"
 msgstr ""
 
-#: backend/serial.c:796
-#, c-format
-msgid "USB Serial Port #%d"
+#: cgi-bin/admin.c:1939 cgi-bin/admin.c:1952 cgi-bin/admin.c:1976
+msgid "Unable to access cupsd.conf file"
 msgstr ""
 
-#: cgi-bin/admin.c:2033 cgi-bin/admin.c:2046 cgi-bin/admin.c:2070
-msgid "Unable to access cupsd.conf file:"
+#: cgi-bin/help.c:133
+msgid "Unable to access help file."
 msgstr ""
 
-#: cgi-bin/admin.c:526
-msgid "Unable to add RSS subscription:"
+#: cgi-bin/admin.c:504
+msgid "Unable to add RSS subscription"
 msgstr ""
 
-#: cgi-bin/admin.c:815
-msgid "Unable to add class:"
+#: cgi-bin/admin.c:792
+msgid "Unable to add class"
 msgstr ""
 
-#: backend/ipp.c:1395
+#: backend/ipp.c:1781
 msgid "Unable to add document to print job."
 msgstr ""
 
-#: scheduler/ipp.c:1628
+#: scheduler/ipp.c:1538
 #, c-format
 msgid "Unable to add job for destination \"%s\"."
 msgstr ""
 
-#: cgi-bin/admin.c:1060 cgi-bin/admin.c:1420
-msgid "Unable to add printer:"
+#: cgi-bin/admin.c:1037 cgi-bin/admin.c:1399
+msgid "Unable to add printer"
 msgstr ""
 
-#: scheduler/ipp.c:1326
+#: scheduler/ipp.c:1164
 msgid "Unable to allocate memory for file types."
 msgstr ""
 
-#: filter/pstops.c:450
+#: filter/pstops.c:418
 msgid "Unable to allocate memory for page info"
 msgstr ""
 
-#: filter/pstops.c:444
+#: filter/pstops.c:412
 msgid "Unable to allocate memory for pages array"
 msgstr ""
 
-#: cgi-bin/admin.c:1526
-msgid "Unable to cancel RSS subscription:"
+#: cgi-bin/admin.c:1505
+msgid "Unable to cancel RSS subscription"
 msgstr ""
 
-#: backend/ipp.c:1674
+#: backend/ipp.c:2062 backend/ipp.c:2497
 msgid "Unable to cancel print job."
 msgstr ""
 
-#: cgi-bin/admin.c:4021
-msgid "Unable to change printer-is-shared attribute:"
+#: cgi-bin/admin.c:2970
+msgid "Unable to change printer"
 msgstr ""
 
-#: cgi-bin/admin.c:3109
-msgid "Unable to change printer:"
+#: cgi-bin/admin.c:3886
+msgid "Unable to change printer-is-shared attribute"
 msgstr ""
 
-#: cgi-bin/admin.c:1710 cgi-bin/admin.c:1874
-msgid "Unable to change server settings:"
+#: cgi-bin/admin.c:1637 cgi-bin/admin.c:1779
+msgid "Unable to change server settings"
 msgstr ""
 
-#: cups/adminutil.c:911 cups/request.c:972
-msgid "Unable to connect to host."
+#: cups/ipp.c:5389
+#, c-format
+msgid "Unable to compile mimeMediaType regular expression: %s."
+msgstr ""
+
+#: cups/ipp.c:5335
+#, c-format
+msgid "Unable to compile naturalLanguage regular expression: %s."
 msgstr ""
 
-#: cups/http-addrlist.c:172
-msgid "Unable to connect to server"
+#: filter/commandtops.c:407
+msgid "Unable to configure printer options."
 msgstr ""
 
-#: backend/ipp.c:612 backend/ipp.c:974 backend/lpd.c:791
-#: backend/parallel.c:219 backend/serial.c:241 backend/socket.c:327
-#: backend/usb-unix.c:117
+#: cups/adminutil.c:900 cups/request.c:1066
+msgid "Unable to connect to host."
+msgstr ""
+
+#: backend/ipp.c:766 backend/ipp.c:1239 backend/lpd.c:795 backend/socket.c:338
+#: backend/usb-unix.c:110
 msgid "Unable to contact printer, queuing on next printer in class."
 msgstr ""
 
-#: cups/adminutil.c:726
+#: cups/adminutil.c:715
 #, c-format
 msgid "Unable to copy 64-bit CUPS printer driver files (%d)."
 msgstr ""
 
-#: cups/adminutil.c:691
+#: cups/adminutil.c:680
 #, c-format
 msgid "Unable to copy 64-bit Windows printer driver files (%d)."
 msgstr ""
 
-#: cups/adminutil.c:522
+#: cups/adminutil.c:511
 #, c-format
 msgid "Unable to copy CUPS printer driver files (%d)."
 msgstr ""
 
-#: scheduler/ipp.c:2849
+#: scheduler/ipp.c:2656
 #, c-format
 msgid "Unable to copy PPD file - %s"
 msgstr ""
 
-#: scheduler/ipp.c:2904
+#: scheduler/ipp.c:2711
 msgid "Unable to copy PPD file."
 msgstr ""
 
-#: cups/adminutil.c:487
+#: cups/adminutil.c:476
 #, c-format
 msgid "Unable to copy Windows 2000 printer driver files (%d)."
 msgstr ""
 
-#: cups/adminutil.c:610
+#: cups/adminutil.c:599
 #, c-format
 msgid "Unable to copy Windows 9x printer driver files (%d)."
 msgstr ""
 
-#: scheduler/ipp.c:2826
+#: scheduler/ipp.c:2633
 #, c-format
 msgid "Unable to copy interface script - %s"
 msgstr ""
 
-#: filter/imagetops.c:134 filter/imagetoraster.c:294
-msgid "Unable to copy print file"
-msgstr ""
-
-#: backend/ipp.c:1764
-msgid "Unable to create compressed print file"
-msgstr ""
-
-#: filter/imagetoraster.c:235
-msgid "Unable to create pipes for filters"
-msgstr ""
-
-#: cups/util.c:601 cups/util.c:1644
+#: cups/util.c:569 cups/util.c:1639
 msgid "Unable to create printer-uri"
 msgstr ""
 
-#: scheduler/cupsfilter.c:1160
-msgid "Unable to create temporary file"
+#: cups/tls-darwin.c:1136
+msgid "Unable to create server credentials."
 msgstr ""
 
-#: cgi-bin/admin.c:1924 cgi-bin/admin.c:1936
-msgid "Unable to create temporary file:"
+#: cgi-bin/admin.c:1830 cgi-bin/admin.c:1842 scheduler/cupsfilter.c:1290
+msgid "Unable to create temporary file"
 msgstr ""
 
-#: cgi-bin/admin.c:2227
-msgid "Unable to delete class:"
+#: cgi-bin/admin.c:2133
+msgid "Unable to delete class"
 msgstr ""
 
-#: cgi-bin/admin.c:2312
-msgid "Unable to delete printer:"
+#: cgi-bin/admin.c:2218
+msgid "Unable to delete printer"
 msgstr ""
 
-#: cgi-bin/classes.c:260 cgi-bin/printers.c:269
-msgid "Unable to do maintenance command:"
+#: cgi-bin/classes.c:252 cgi-bin/printers.c:261
+msgid "Unable to do maintenance command"
 msgstr ""
 
-#: cgi-bin/admin.c:2048
+#: cgi-bin/admin.c:1954
 msgid "Unable to edit cupsd.conf files larger than 1MB"
 msgstr ""
 
-#: cups/http.c:4086
+#: cups/tls-darwin.c:1304 cups/tls-sspi.c:493
 msgid "Unable to establish a secure connection to host (certificate chain invalid)."
 msgstr ""
 
-#: cups/http.c:4076
+#: cups/tls-darwin.c:1294 cups/tls-sspi.c:483
 msgid "Unable to establish a secure connection to host (certificate not yet valid)."
 msgstr ""
 
-#: cups/http.c:4071
+#: cups/tls-darwin.c:1289 cups/tls-sspi.c:478
 msgid "Unable to establish a secure connection to host (expired certificate)."
 msgstr ""
 
-#: cups/http.c:4081
+#: cups/tls-darwin.c:1299 cups/tls-sspi.c:488
 msgid "Unable to establish a secure connection to host (host name mismatch)."
 msgstr ""
 
-#: cups/http.c:4091
+#: cups/tls-darwin.c:1309 cups/tls-sspi.c:498
 msgid "Unable to establish a secure connection to host (peer dropped connection before responding)."
 msgstr ""
 
-#: cups/http.c:4066
+#: cups/tls-darwin.c:1284 cups/tls-sspi.c:473
 msgid "Unable to establish a secure connection to host (self-signed certificate)."
 msgstr ""
 
-#: cups/http.c:4061
+#: cups/tls-darwin.c:1279 cups/tls-sspi.c:468
 msgid "Unable to establish a secure connection to host (untrusted certificate)."
 msgstr ""
 
-#: cups/http.c:4118
+#: cups/tls-darwin.c:1336 cups/tls-sspi.c:269 cups/tls-sspi.c:525
+#: cups/tls-sspi.c:558 cups/tls-sspi.c:575
 msgid "Unable to establish a secure connection to host."
 msgstr ""
 
-#: cgi-bin/ipp-var.c:365
+#: cgi-bin/ipp-var.c:350
 msgid "Unable to find destination for job"
 msgstr ""
 
-#: cups/http-support.c:1627
+#: cups/http-support.c:1949
 msgid "Unable to find printer."
 msgstr ""
 
-#: filter/imagetoraster.c:259
-msgid "Unable to fork filter"
+#: cups/tls-darwin.c:1150
+msgid "Unable to find server credentials."
 msgstr ""
 
-#: backend/ipp.c:1786
-msgid "Unable to generate compressed print file"
+#: backend/ipp.c:3475
+msgid "Unable to get backend exit status."
 msgstr ""
 
-#: cgi-bin/classes.c:450
-msgid "Unable to get class list:"
+#: cgi-bin/classes.c:442
+msgid "Unable to get class list"
 msgstr ""
 
-#: cgi-bin/classes.c:549
-msgid "Unable to get class status:"
+#: cgi-bin/classes.c:541
+msgid "Unable to get class status"
 msgstr ""
 
-#: cgi-bin/admin.c:1321
-msgid "Unable to get list of printer drivers:"
+#: cgi-bin/admin.c:1300
+msgid "Unable to get list of printer drivers"
 msgstr ""
 
-#: backend/ipp.c:1482
-msgid "Unable to get print job status."
+#: cgi-bin/admin.c:2820
+msgid "Unable to get printer attributes"
 msgstr ""
 
-#: cgi-bin/admin.c:2959
-msgid "Unable to get printer attributes:"
+#: cgi-bin/printers.c:459
+msgid "Unable to get printer list"
 msgstr ""
 
-#: cgi-bin/printers.c:467
-msgid "Unable to get printer list:"
+#: cgi-bin/printers.c:561
+msgid "Unable to get printer status"
 msgstr ""
 
-#: backend/ipp.c:827
+#: backend/ipp.c:990
 msgid "Unable to get printer status."
 msgstr ""
 
-#: cgi-bin/printers.c:569
-msgid "Unable to get printer status:"
-msgstr ""
-
-#: cups/adminutil.c:565 cups/adminutil.c:769
+#: cups/adminutil.c:554 cups/adminutil.c:758
 #, c-format
 msgid "Unable to install Windows 2000 printer driver files (%d)."
 msgstr ""
 
-#: cups/adminutil.c:639
+#: cups/adminutil.c:628
 #, c-format
 msgid "Unable to install Windows 9x printer driver files (%d)."
 msgstr ""
 
-#: backend/ipp.c:549 backend/lpd.c:417 backend/socket.c:273
+#: cgi-bin/help.c:92
+msgid "Unable to load help index."
+msgstr ""
+
+#: backend/ipp.c:665 backend/lpd.c:426 backend/socket.c:277
 #, c-format
 msgid "Unable to locate printer \"%s\"."
 msgstr ""
 
-#: backend/dnssd.c:497 backend/ipp.c:294 backend/lpd.c:200
-#: backend/socket.c:169
+#: backend/dnssd.c:787 backend/ipp.c:334 backend/lpd.c:196
+#: backend/socket.c:163
 msgid "Unable to locate printer."
 msgstr ""
 
-#: cgi-bin/admin.c:814
-msgid "Unable to modify class:"
+#: cgi-bin/admin.c:791
+msgid "Unable to modify class"
 msgstr ""
 
-#: cgi-bin/admin.c:1059 cgi-bin/admin.c:1419
-msgid "Unable to modify printer:"
+#: cgi-bin/admin.c:1036 cgi-bin/admin.c:1398
+msgid "Unable to modify printer"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:432 cgi-bin/ipp-var.c:521
+#: cgi-bin/ipp-var.c:417 cgi-bin/ipp-var.c:506
 msgid "Unable to move job"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:434 cgi-bin/ipp-var.c:523
+#: cgi-bin/ipp-var.c:419 cgi-bin/ipp-var.c:508
 msgid "Unable to move jobs"
 msgstr ""
 
-#: cups/ppd.c:339
+#: cgi-bin/admin.c:3166 cups/ppd.c:297
 msgid "Unable to open PPD file"
 msgstr ""
 
-#: cgi-bin/admin.c:3305
-msgid "Unable to open PPD file:"
-msgstr ""
-
-#: filter/texttops.c:282
-msgid "Unable to open charset file"
-msgstr ""
-
-#: backend/ipp.c:1770
-msgid "Unable to open compressed print file"
-msgstr ""
-
-#: cgi-bin/admin.c:2683
+#: cgi-bin/admin.c:2588
 msgid "Unable to open cupsd.conf file:"
 msgstr ""
 
-#: backend/parallel.c:246 backend/serial.c:261 backend/usb-unix.c:145
+#: backend/usb-unix.c:134
 msgid "Unable to open device file"
 msgstr ""
 
-#: scheduler/ipp.c:7304
+#: scheduler/ipp.c:5943
 #, c-format
 msgid "Unable to open document #%d in job #%d."
 msgstr ""
 
-#: backend/ipp.c:1776 backend/lpd.c:476 backend/parallel.c:150
-#: backend/serial.c:190 backend/socket.c:156 backend/usb.c:237
-#: filter/bannertops.c:183 filter/gziptoany.c:71 filter/pstext.c:89
-#: filter/pstext.c:249 filter/pstext.c:266 filter/pstops.c:299
-msgid "Unable to open print file"
+#: cgi-bin/help.c:364
+msgid "Unable to open help file."
 msgstr ""
 
-#: filter/texttops.c:263
-msgid "Unable to open psglyphs"
+#: backend/ipp.c:376 backend/ipp.c:1528 backend/ipp.c:1736 backend/lpd.c:496
+#: backend/socket.c:150 backend/usb.c:237 filter/gziptoany.c:67
+#: filter/pstops.c:267
+msgid "Unable to open print file"
 msgstr ""
 
-#: driver/rastertoescpx.c:1814 driver/rastertopclx.c:1839
-#: filter/rastertoepson.c:998 filter/rastertohp.c:724
-#: filter/rastertolabel.c:1147
+#: filter/rastertoepson.c:983 filter/rastertohp.c:713
+#: filter/rastertolabel.c:1133
 msgid "Unable to open raster file"
 msgstr ""
 
-#: filter/texttops.c:216
-#, c-format
-msgid "Unable to print %d text columns."
-msgstr ""
-
-#: filter/texttops.c:180 filter/texttops.c:188 filter/texttops.c:196
-#, c-format
-msgid "Unable to print %dx%d text page."
-msgstr ""
-
-#: cgi-bin/ipp-var.c:795
-msgid "Unable to print test page:"
+#: cgi-bin/ipp-var.c:780
+msgid "Unable to print test page"
 msgstr ""
 
-#: backend/runloop.c:95 backend/runloop.c:322
-msgid "Unable to read print data"
+#: 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
+msgid "Unable to read print data."
 msgstr ""
 
-#: backend/usb-darwin.c:611 backend/usb-darwin.c:655
-msgid "Unable to read print data."
+#: cups/dest.c:3351
+msgid "Unable to resolve printer URI."
 msgstr ""
 
-#: cups/adminutil.c:2205
+#: cups/adminutil.c:2077
 #, c-format
 msgid "Unable to run \"%s\": %s"
 msgstr ""
 
-#: filter/pstops.c:562
+#: filter/pstops.c:530
 msgid "Unable to see in file"
 msgstr ""
 
-#: cgi-bin/ipp-var.c:598 cgi-bin/ipp-var.c:618
+#: cgi-bin/ipp-var.c:583 cgi-bin/ipp-var.c:603
 msgid "Unable to send command to printer driver"
 msgstr ""
 
-#: backend/usb-darwin.c:733 backend/usb-libusb.c:179 backend/usb-libusb.c:781
+#: backend/usb-darwin.c:744 backend/usb-libusb.c:527
 msgid "Unable to send data to printer."
 msgstr ""
 
-#: filter/imagetoraster.c:1238 filter/imagetoraster.c:1335
-#: filter/imagetoraster.c:1376
-msgid "Unable to send raster data to the driver."
-msgstr ""
-
-#: cups/adminutil.c:821
+#: cups/adminutil.c:810
 #, c-format
 msgid "Unable to set Windows printer driver (%d)."
 msgstr ""
 
-#: cgi-bin/admin.c:3922
-msgid "Unable to set options:"
+#: cgi-bin/admin.c:3787
+msgid "Unable to set options"
+msgstr ""
+
+#: cgi-bin/admin.c:3057
+msgid "Unable to set server default"
 msgstr ""
 
-#: cgi-bin/admin.c:3196
-msgid "Unable to set server default:"
+#: backend/ipp.c:3334 backend/ipp.c:3411 backend/ipp.c:3419
+msgid "Unable to start backend process."
 msgstr ""
 
-#: cgi-bin/admin.c:1986
-msgid "Unable to upload cupsd.conf file:"
+#: cgi-bin/admin.c:1892
+msgid "Unable to upload cupsd.conf file"
 msgstr ""
 
-#: backend/usb-darwin.c:2000 backend/usb-darwin.c:2024
+#: backend/usb-darwin.c:2016 backend/usb-darwin.c:2040
 msgid "Unable to use legacy USB class driver."
 msgstr ""
 
-#: backend/runloop.c:124 backend/runloop.c:377
+#: backend/runloop.c:114 backend/runloop.c:369
 msgid "Unable to write print data"
 msgstr ""
 
-#: filter/gziptoany.c:90
+#: filter/gziptoany.c:86
 #, c-format
 msgid "Unable to write uncompressed print data: %s"
 msgstr ""
 
-#: cups/http-support.c:1272
+#: cups/http-support.c:1366
 msgid "Unauthorized"
 msgstr ""
 
-#: cgi-bin/admin.c:3622
+#: cgi-bin/admin.c:3483
 msgid "Units"
 msgstr ""
 
-#: cups/http-support.c:1312 cups/ppd.c:366
+#: cups/http-support.c:1406 cups/http-support.c:1490 cups/ppd.c:324
 msgid "Unknown"
 msgstr ""
 
-#: filter/pstops.c:2263
+#: filter/pstops.c:2185
 #, c-format
 msgid "Unknown choice \"%s\" for option \"%s\"."
 msgstr ""
 
-#: backend/ipp.c:408
+#: backend/ipp.c:518
 #, c-format
 msgid "Unknown encryption option value: \"%s\"."
 msgstr ""
 
-#: backend/lpd.c:346
+#: backend/lpd.c:342
 #, c-format
 msgid "Unknown file order: \"%s\"."
 msgstr ""
 
-#: backend/lpd.c:317
+#: backend/lpd.c:313
 #, c-format
 msgid "Unknown format character: \"%c\"."
 msgstr ""
 
-#: backend/ipp.c:455
+#: cups/dest-options.c:946
+msgid "Unknown media size name."
+msgstr ""
+
+#: backend/ipp.c:582
 #, c-format
 msgid "Unknown option \"%s\" with value \"%s\"."
 msgstr ""
 
-#: filter/pstops.c:2246
+#: filter/pstops.c:2168
 #, c-format
 msgid "Unknown option \"%s\"."
 msgstr ""
 
-#: backend/lpd.c:332
+#: backend/lpd.c:328
 #, c-format
 msgid "Unknown print mode: \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:11607
+#: scheduler/ipp.c:10290
 #, c-format
 msgid "Unknown printer-error-policy \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:11590
+#: scheduler/ipp.c:10273
 #, c-format
 msgid "Unknown printer-op-policy \"%s\"."
 msgstr ""
 
-#: backend/ipp.c:427
+#: cups/http.c:2309
+msgid "Unknown request method."
+msgstr ""
+
+#: cups/http.c:2329
+msgid "Unknown request version."
+msgstr ""
+
+#: cups/http-support.c:1483
+msgid "Unknown scheme in URI"
+msgstr ""
+
+#: cups/http-addrlist.c:737
+msgid "Unknown service name."
+msgstr ""
+
+#: backend/ipp.c:547
 #, c-format
 msgid "Unknown version option value: \"%s\"."
 msgstr ""
 
-#: backend/serial.c:379
+#: scheduler/ipp.c:10745
 #, c-format
-msgid "Unsupported baud rate: %s"
+msgid "Unsupported 'compression' value \"%s\"."
 msgstr ""
 
-#: filter/pstops.c:2454
+#: scheduler/ipp.c:10775
 #, c-format
-msgid "Unsupported brightness value %s, using brightness=100."
+msgid "Unsupported 'document-format' value \"%s\"."
+msgstr ""
+
+#: scheduler/ipp.c:10850
+msgid "Unsupported 'job-name' value."
 msgstr ""
 
-#: scheduler/ipp.c:429
+#: scheduler/ipp.c:329
 #, c-format
 msgid "Unsupported character set \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:9329 scheduler/ipp.c:10526 scheduler/ipp.c:12061
+#: scheduler/ipp.c:7963 scheduler/ipp.c:9197
 #, c-format
 msgid "Unsupported compression \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:9463 scheduler/ipp.c:10671 scheduler/ipp.c:12090
+#: scheduler/ipp.c:8097 scheduler/ipp.c:9347
 #, c-format
 msgid "Unsupported document-format \"%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:10654
+#: scheduler/ipp.c:9330
 #, c-format
 msgid "Unsupported document-format \"%s/%s\"."
 msgstr ""
 
-#: scheduler/ipp.c:1447
+#: scheduler/ipp.c:1339
 #, c-format
 msgid "Unsupported format \"%s\"."
 msgstr ""
 
-#: filter/pstops.c:2536
-#, c-format
-msgid "Unsupported gamma value %s, using gamma=1000."
-msgstr ""
-
-#: scheduler/ipp.c:1545
+#: scheduler/ipp.c:1437
 msgid "Unsupported margins."
 msgstr ""
 
-#: cups/pwg-media.c:464
+#: cups/pwg-media.c:549
 msgid "Unsupported media value."
 msgstr ""
 
-#: filter/pstops.c:2580
+#: filter/pstops.c:2450
 #, c-format
 msgid "Unsupported number-up value %d, using number-up=1."
 msgstr ""
 
-#: filter/pstops.c:2614
+#: filter/pstops.c:2484
 #, c-format
 msgid "Unsupported number-up-layout value %s, using number-up-layout=lrtb."
 msgstr ""
 
-#: filter/pstops.c:2665
+#: filter/pstops.c:2535
 #, c-format
 msgid "Unsupported page-border value %s, using page-border=none."
 msgstr ""
 
-#: filter/rastertopwg.c:130 filter/rastertopwg.c:138 filter/rastertopwg.c:147
+#: filter/rastertopwg.c:139 filter/rastertopwg.c:147 filter/rastertopwg.c:156
 msgid "Unsupported raster data."
 msgstr ""
 
-#: cups/snmp.c:1112
+#: cups/snmp.c:1064
 msgid "Unsupported value type"
 msgstr ""
 
-#: cups/http-support.c:1287
+#: cups/http-support.c:1381
 msgid "Upgrade Required"
 msgstr ""
 
-#: systemv/lpadmin.c:617
+#: systemv/lpadmin.c:654
 msgid ""
 "Usage:\n"
 "\n"
@@ -5740,54 +6074,55 @@ msgid ""
 "                       [-u allow:user,user] [-u deny:user,user]"
 msgstr ""
 
-#: filter/pdftops.c:103
-#, c-format
-msgid "Usage: %s job user title copies options [filename]"
-msgstr ""
-
-#: backend/dnssd.c:171 backend/ipp.c:268 backend/lpd.c:189
-#: backend/parallel.c:127 backend/serial.c:167 backend/socket.c:133
-#: backend/usb.c:183 driver/commandtoescpx.c:57 driver/commandtopclx.c:57
-#: filter/textcommon.c:518 monitor/bcp.c:62 monitor/tbcp.c:61
+#: 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
 #, c-format
 msgid "Usage: %s job-id user title copies options [file]"
 msgstr ""
 
-#: filter/bannertops.c:118 filter/commandtops.c:73 filter/gziptoany.c:50
-#: filter/imagetops.c:116 filter/imagetoraster.c:208 filter/pstops.c:263
-#, c-format
-msgid "Usage: %s job-id user title copies options file"
-msgstr ""
-
-#: scheduler/cupsfilter.c:1382
-msgid "Usage: convert [ options ]"
-msgstr ""
-
 #: systemv/cupsaddsmb.c:281
 msgid "Usage: cupsaddsmb [options] printer1 ... printerN"
 msgstr ""
 
-#: systemv/cupsctl.c:206
+#: systemv/cupsctl.c:200
 msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
 msgstr ""
 
-#: scheduler/main.c:2186
+#: scheduler/main.c:2157
 msgid "Usage: cupsd [options]"
 msgstr ""
 
-#: scheduler/cupsfilter.c:1355
-msgid "Usage: cupsfilter [ options ] filename"
+#: scheduler/cupsfilter.c:1481
+msgid "Usage: cupsfilter [ options ] [ -- ] filename"
 msgstr ""
 
 #: systemv/cupstestdsc.c:425
 msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]"
 msgstr ""
 
-#: systemv/cupstestppd.c:3612
+#: systemv/cupstestppd.c:3813
 msgid "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]"
 msgstr ""
 
-#: test/ipptool.c:3825
+#: test/ippdiscover.c:814
+msgid ""
+"Usage: ippdiscover [options] -a\n"
+"       ippdiscover [options] \"service name\"\n"
+"\n"
+"Options:"
+msgstr ""
+
+#: test/ippfind.c:2708
+msgid ""
+"Usage: ippfind [options] regtype[,subtype][.domain.] ... [expression]\n"
+"       ippfind [options] name[.regtype[.domain.]] ... [expression]\n"
+"       ippfind --help\n"
+"       ippfind --version"
+msgstr ""
+
+#: test/ipptool.c:4710
 msgid "Usage: ipptool [options] URI filename [ ... filenameN ]"
 msgstr ""
 
@@ -5795,7 +6130,7 @@ msgstr ""
 msgid "Usage: lpmove job/src dest"
 msgstr ""
 
-#: systemv/lpoptions.c:553
+#: systemv/lpoptions.c:539
 msgid ""
 "Usage: lpoptions [-h server] [-E] -d printer\n"
 "       lpoptions [-h server] [-E] [-p printer] -l\n"
@@ -5803,22 +6138,11 @@ 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:669
+#: berkeley/lpq.c:637
 msgid "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]"
 msgstr ""
 
-#: ppdc/ppdc.cxx:435
+#: ppdc/ppdc.cxx:430
 msgid "Usage: ppdc [options] filename.drv [ ... filenameN.drv ]"
 msgstr ""
 
@@ -5830,7 +6154,7 @@ msgstr ""
 msgid "Usage: ppdi [options] filename.ppd [ ... filenameN.ppd ]"
 msgstr ""
 
-#: ppdc/ppdmerge.cxx:367
+#: ppdc/ppdmerge.cxx:361
 msgid "Usage: ppdmerge [options] filename.ppd [ ... filenameN.ppd ]"
 msgstr ""
 
@@ -5838,60 +6162,56 @@ msgstr ""
 msgid "Usage: ppdpo [options] -o filename.po filename.drv [ ... filenameN.drv ]"
 msgstr ""
 
-#: backend/snmp.c:218
+#: backend/snmp.c:192
 msgid "Usage: snmp [host-or-ip-address]"
 msgstr ""
 
-#: cups/snmp.c:1064
+#: cups/snmp.c:1016
 msgid "Value uses indefinite length"
 msgstr ""
 
-#: cups/snmp.c:1049
+#: cups/snmp.c:1001
 msgid "VarBind uses indefinite length"
 msgstr ""
 
-#: cups/snmp.c:999
+#: cups/snmp.c:951
 msgid "Version uses indefinite length"
 msgstr ""
 
-#: backend/ipp.c:1419
+#: backend/ipp.c:1898
 msgid "Waiting for job to complete."
 msgstr ""
 
-#: backend/usb-darwin.c:455 backend/usb-libusb.c:118
+#: backend/usb-darwin.c:469 backend/usb-libusb.c:223
 msgid "Waiting for printer to become available."
 msgstr ""
 
-#: backend/socket.c:435
+#: backend/socket.c:440
 msgid "Waiting for printer to finish."
 msgstr ""
 
-#: cups/adminutil.c:793
+#: cups/adminutil.c:782
 msgid "Warning, no Windows 2000 printer drivers are installed."
 msgstr ""
 
-#: cups/http-support.c:1308
+#: cups/http-support.c:1402
 msgid "Web Interface is Disabled"
 msgstr ""
 
-#: cups/ppd.c:1914
+#: cups/ppd.c:1902
 msgid "Yes"
 msgstr ""
 
-#: scheduler/client.c:2449
+#: scheduler/client.c:2210
 #, 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."
-msgstr ""
-
-#: ppdc/sample.c:445
+#: ppdc/sample.c:439
 msgid "ZPL Label Printer"
 msgstr ""
 
-#: ppdc/sample.c:368
+#: ppdc/sample.c:362
 msgid "Zebra"
 msgstr ""
 
@@ -5907,15 +6227,11 @@ msgstr ""
 msgid "completed"
 msgstr ""
 
-#: scheduler/cupsfilter.c:346
-msgid "convert: Use the -f option to specify a file to convert."
-msgstr ""
-
-#: scheduler/ipp.c:7176
+#: scheduler/ipp.c:5815
 msgid "cups-deviced failed to execute."
 msgstr ""
 
-#: scheduler/ipp.c:8006 scheduler/ipp.c:8256
+#: scheduler/ipp.c:6634 scheduler/ipp.c:6883
 msgid "cups-driverd failed to execute."
 msgstr ""
 
@@ -5924,89 +6240,101 @@ msgstr ""
 msgid "cupsaddsmb: No PPD file for printer \"%s\" - %s"
 msgstr ""
 
-#: systemv/cupsctl.c:147
+#: systemv/cupsctl.c:141
 msgid "cupsctl: Cannot set Listen or Port directly."
 msgstr ""
 
-#: systemv/cupsctl.c:158
+#: systemv/cupsctl.c:152
 #, c-format
 msgid "cupsctl: Unable to connect to server: %s"
 msgstr ""
 
-#: systemv/cupsctl.c:201
+#: systemv/cupsctl.c:195
 #, c-format
 msgid "cupsctl: Unknown option \"%s\""
 msgstr ""
 
-#: systemv/cupsctl.c:203
+#: systemv/cupsctl.c:197
 #, c-format
 msgid "cupsctl: Unknown option \"-%c\""
 msgstr ""
 
-#: scheduler/main.c:197
+#: scheduler/main.c:172
 msgid "cupsd: Expected config filename after \"-c\" option."
 msgstr ""
 
-#: scheduler/main.c:229 scheduler/main.c:236
+#: scheduler/main.c:259
+msgid "cupsd: Expected cups-files.conf filename after \"-s\" option."
+msgstr ""
+
+#: scheduler/main.c:237
+msgid "cupsd: On-demand support not compiled in, running in normal mode."
+msgstr ""
+
+#: scheduler/main.c:270
+msgid "cupsd: Relative cups-files.conf filename not allowed."
+msgstr ""
+
+#: scheduler/main.c:203 scheduler/main.c:210
 msgid "cupsd: Unable to get current directory."
 msgstr ""
 
-#: scheduler/main.c:303
+#: scheduler/main.c:317 scheduler/main.c:326
+msgid "cupsd: Unable to get path to cups-files.conf file."
+msgstr ""
+
+#: scheduler/main.c:299
 #, c-format
 msgid "cupsd: Unknown argument \"%s\" - aborting."
 msgstr ""
 
-#: scheduler/main.c:296
+#: scheduler/main.c:292
 #, c-format
 msgid "cupsd: Unknown option \"%c\" - aborting."
 msgstr ""
 
-#: scheduler/main.c:263
-msgid "cupsd: launchd(8) support not compiled in, running in normal mode."
-msgstr ""
-
-#: scheduler/cupsfilter.c:1133
+#: scheduler/cupsfilter.c:1263
 #, c-format
 msgid "cupsfilter: Invalid document number %d."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1127
+#: scheduler/cupsfilter.c:1257
 #, c-format
 msgid "cupsfilter: Invalid job ID %d."
 msgstr ""
 
-#: scheduler/cupsfilter.c:354
+#: scheduler/cupsfilter.c:348
 msgid "cupsfilter: Only one filename can be specified."
 msgstr ""
 
-#: scheduler/cupsfilter.c:1175
+#: scheduler/cupsfilter.c:1305
 #, c-format
 msgid "cupsfilter: Unable to get job file - %s"
 msgstr ""
 
-#: systemv/cupstestppd.c:260
+#: systemv/cupstestppd.c:261
 msgid "cupstestppd: The -q option is incompatible with the -v option."
 msgstr ""
 
-#: systemv/cupstestppd.c:276
+#: systemv/cupstestppd.c:277
 msgid "cupstestppd: The -v option is incompatible with the -q option."
 msgstr ""
 
-#: systemv/lpstat.c:1228 systemv/lpstat.c:1231 systemv/lpstat.c:1234
+#: systemv/lpstat.c:1234 systemv/lpstat.c:1237 systemv/lpstat.c:1240
 #, c-format
 msgid "device for %s/%s: %s"
 msgstr ""
 
-#: systemv/lpstat.c:1215 systemv/lpstat.c:1218 systemv/lpstat.c:1221
+#: systemv/lpstat.c:1220 systemv/lpstat.c:1223 systemv/lpstat.c:1226
 #, c-format
 msgid "device for %s: %s"
 msgstr ""
 
-#: cups/snmp.c:1036
+#: cups/snmp.c:988
 msgid "error-index uses indefinite length"
 msgstr ""
 
-#: cups/snmp.c:1028
+#: cups/snmp.c:980
 msgid "error-status uses indefinite length"
 msgstr ""
 
@@ -6014,7 +6342,7 @@ msgstr ""
 msgid "held"
 msgstr ""
 
-#: berkeley/lpc.c:209
+#: berkeley/lpc.c:201
 msgid "help\t\tGet help on commands."
 msgstr ""
 
@@ -6022,208 +6350,297 @@ msgstr ""
 msgid "idle"
 msgstr ""
 
-#: test/ipptool.c:347
-msgid "ipptool: \"-i\" and \"-n\" are incompatible with -X\"."
+#: test/ippfind.c:2435
+#, c-format
+msgid "ippfind: Bad regular expression: %s"
+msgstr ""
+
+#: test/ippfind.c:324
+msgid "ippfind: Cannot use --and after --or."
 msgstr ""
 
-#: test/ipptool.c:422
-msgid "ipptool: \"-i\" is incompatible with \"-X\"."
+#: test/ippfind.c:597
+#, c-format
+msgid "ippfind: Expected key name after %s."
 msgstr ""
 
-#: test/ipptool.c:446
-msgid "ipptool: \"-n\" is incompatible with \"-X\"."
+#: test/ippfind.c:547 test/ippfind.c:730
+#, c-format
+msgid "ippfind: Expected port range after %s."
 msgstr ""
 
-#: test/ipptool.c:504
+#: test/ippfind.c:357
 #, c-format
-msgid "ipptool: Bad URI - %s."
+msgid "ippfind: Expected program after %s."
+msgstr ""
+
+#: test/ippfind.c:374
+#, c-format
+msgid "ippfind: Expected semi-colon after %s."
+msgstr ""
+
+#: test/ippfind.c:1958
+msgid "ippfind: Missing close brace in substitution."
+msgstr ""
+
+#: test/ippfind.c:1049
+msgid "ippfind: Missing close parenthesis."
+msgstr ""
+
+#: test/ippfind.c:331
+msgid "ippfind: Missing expression before \"--and\"."
+msgstr ""
+
+#: test/ippfind.c:444
+msgid "ippfind: Missing expression before \"--or\"."
+msgstr ""
+
+#: test/ippfind.c:867
+#, c-format
+msgid "ippfind: Missing key name after %s."
+msgstr ""
+
+#: test/ippfind.c:1020
+msgid "ippfind: Missing open parenthesis."
+msgstr ""
+
+#: test/ippfind.c:897
+#, 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
+#, c-format
+msgid "ippfind: Missing regular expression after %s."
+msgstr ""
+
+#: test/ippfind.c:915
+#, c-format
+msgid "ippfind: Missing semi-colon after %s."
+msgstr ""
+
+#: test/ippfind.c:1905 test/ippfind.c:1930
+msgid "ippfind: Out of memory."
+msgstr ""
+
+#: test/ippfind.c:993
+msgid "ippfind: Too many parenthesis."
+msgstr ""
+
+#: test/ippfind.c:1262 test/ippfind.c:1398 test/ippfind.c:2527
+#, c-format
+msgid "ippfind: Unable to browse or resolve: %s"
+msgstr ""
+
+#: test/ippfind.c:2017 test/ippfind.c:2044
+#, c-format
+msgid "ippfind: Unable to execute \"%s\": %s"
+msgstr ""
+
+#: test/ippfind.c:1139 test/ippfind.c:1147 test/ippfind.c:1158
+#, c-format
+msgid "ippfind: Unable to use Bonjour: %s"
+msgstr ""
+
+#: test/ippfind.c:1987
+#, c-format
+msgid "ippfind: Unknown variable \"{%s}\"."
+msgstr ""
+
+#: test/ipptool.c:357 test/ipptool.c:506 test/ipptool.c:530
+msgid "ipptool: \"-i\" and \"-n\" are incompatible with -X\"."
 msgstr ""
 
-#: test/ipptool.c:336
+#: test/ipptool.c:587
 #, c-format
-msgid "ipptool: Bad version %s for \"-V\"."
+msgid "ipptool: Bad URI - %s."
 msgstr ""
 
-#: test/ipptool.c:415
+#: test/ipptool.c:499
 msgid "ipptool: Invalid seconds for \"-i\"."
 msgstr ""
 
-#: test/ipptool.c:485
+#: test/ipptool.c:568
 msgid "ipptool: May only specify a single URI."
 msgstr ""
 
-#: test/ipptool.c:438
+#: test/ipptool.c:522
 msgid "ipptool: Missing count for \"-n\"."
 msgstr ""
 
-#: test/ipptool.c:382
+#: test/ipptool.c:392
 msgid "ipptool: Missing filename for \"-f\"."
 msgstr ""
 
-#: test/ipptool.c:363
+#: test/ipptool.c:373
 msgid "ipptool: Missing name=value for \"-d\"."
 msgstr ""
 
-#: test/ipptool.c:405
+#: test/ipptool.c:489
 msgid "ipptool: Missing seconds for \"-i\"."
 msgstr ""
 
-#: test/ipptool.c:306
-msgid "ipptool: Missing timeout for \"-T\"."
-msgstr ""
-
-#: test/ipptool.c:319
-msgid "ipptool: Missing version for \"-V\"."
-msgstr ""
-
-#: test/ipptool.c:527
+#: test/ipptool.c:613
 msgid "ipptool: URI required before test file."
 msgstr ""
 
-#: test/ipptool.c:465
+#: test/ipptool.c:549
 #, c-format
 msgid "ipptool: Unknown option \"-%c\"."
 msgstr ""
 
-#: scheduler/ipp.c:8996
+#: scheduler/ipp.c:7630
 msgid "job-printer-uri attribute missing."
 msgstr ""
 
-#: systemv/lpadmin.c:125 systemv/lpadmin.c:369
+#: systemv/lpadmin.c:117 systemv/lpadmin.c:361
 msgid "lpadmin: Class name can only contain printable characters."
 msgstr ""
 
-#: systemv/lpadmin.c:563
+#: systemv/lpadmin.c:600
 msgid "lpadmin: Expected PPD after \"-P\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:406
+#: systemv/lpadmin.c:443
 msgid "lpadmin: Expected allow/deny:userlist after \"-u\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:358
+#: systemv/lpadmin.c:350
 msgid "lpadmin: Expected class after \"-r\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:114
+#: systemv/lpadmin.c:106
 msgid "lpadmin: Expected class name after \"-c\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:507
+#: systemv/lpadmin.c:544
 msgid "lpadmin: Expected description after \"-D\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:440
+#: systemv/lpadmin.c:477
 msgid "lpadmin: Expected device URI after \"-v\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:523
+#: systemv/lpadmin.c:560
 msgid "lpadmin: Expected file type(s) after \"-I\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:196
+#: systemv/lpadmin.c:188
 msgid "lpadmin: Expected hostname after \"-h\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:215
+#: systemv/lpadmin.c:207
 msgid "lpadmin: Expected interface after \"-i\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:543
+#: systemv/lpadmin.c:580
 msgid "lpadmin: Expected location after \"-L\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:268
+#: systemv/lpadmin.c:260
 msgid "lpadmin: Expected model after \"-m\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:288
+#: systemv/lpadmin.c:403
+msgid "lpadmin: Expected name after \"-R\" option."
+msgstr ""
+
+#: systemv/lpadmin.c:280
 msgid "lpadmin: Expected name=value after \"-o\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:307
+#: systemv/lpadmin.c:299
 msgid "lpadmin: Expected printer after \"-p\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:158
+#: systemv/lpadmin.c:150
 msgid "lpadmin: Expected printer name after \"-d\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:474
+#: systemv/lpadmin.c:511
 msgid "lpadmin: Expected printer or class after \"-x\" option."
 msgstr ""
 
-#: systemv/lpadmin.c:939
+#: systemv/lpadmin.c:961
 msgid "lpadmin: No member names were seen."
 msgstr ""
 
-#: systemv/lpadmin.c:704
+#: systemv/lpadmin.c:748
 #, c-format
 msgid "lpadmin: Printer %s is already a member of class %s."
 msgstr ""
 
-#: systemv/lpadmin.c:953
+#: systemv/lpadmin.c:975
 #, c-format
 msgid "lpadmin: Printer %s is not a member of class %s."
 msgstr ""
 
-#: systemv/lpadmin.c:169 systemv/lpadmin.c:318 systemv/lpadmin.c:485
+#: systemv/lpadmin.c:161 systemv/lpadmin.c:310 systemv/lpadmin.c:522
 msgid "lpadmin: Printer name can only contain printable characters."
 msgstr ""
 
-#: systemv/lpadmin.c:99
+#: systemv/lpadmin.c:91
 msgid ""
 "lpadmin: Unable to add a printer to the class:\n"
 "         You must specify a printer name first."
 msgstr ""
 
-#: systemv/lpadmin.c:90 systemv/lpadmin.c:143 systemv/lpadmin.c:247
-#: systemv/lpadmin.c:333 systemv/lpadmin.c:459 systemv/lpadmin.c:596
+#: 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
 #, c-format
 msgid "lpadmin: Unable to connect to server: %s"
 msgstr ""
 
-#: systemv/lpadmin.c:1235
+#: systemv/lpadmin.c:1314
 msgid "lpadmin: Unable to create temporary file"
 msgstr ""
 
-#: systemv/lpadmin.c:1245
+#: systemv/lpadmin.c:388
+msgid ""
+"lpadmin: Unable to delete option:\n"
+"         You must specify a printer name first."
+msgstr ""
+
+#: systemv/lpadmin.c:1324
 #, c-format
 msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 msgstr ""
 
-#: systemv/lpadmin.c:342
+#: systemv/lpadmin.c:334
 msgid ""
 "lpadmin: Unable to remove a printer from the class:\n"
 "         You must specify a printer name first."
 msgstr ""
 
-#: systemv/lpadmin.c:605
+#: systemv/lpadmin.c:642
 msgid ""
 "lpadmin: Unable to set the printer options:\n"
 "         You must specify a printer name first."
 msgstr ""
 
-#: systemv/lpadmin.c:423
+#: systemv/lpadmin.c:460
 #, c-format
 msgid "lpadmin: Unknown allow/deny option \"%s\"."
 msgstr ""
 
-#: systemv/lpadmin.c:578
+#: systemv/lpadmin.c:615
 #, c-format
 msgid "lpadmin: Unknown argument \"%s\"."
 msgstr ""
 
-#: systemv/lpadmin.c:573
+#: systemv/lpadmin.c:610
 #, c-format
 msgid "lpadmin: Unknown option \"%c\"."
 msgstr ""
 
-#: systemv/lpadmin.c:529
+#: systemv/lpadmin.c:566
 msgid "lpadmin: Warning - content type list ignored."
 msgstr ""
 
-#: berkeley/lpc.c:76 berkeley/lpc.c:104 berkeley/lpc.c:140
+#: berkeley/lpc.c:68 berkeley/lpc.c:96 berkeley/lpc.c:132
 msgid "lpc> "
 msgstr ""
 
@@ -6285,111 +6702,57 @@ msgstr ""
 msgid "lpmove: Unknown option \"%c\"."
 msgstr ""
 
-#: systemv/lpoptions.c:150 systemv/lpoptions.c:168 systemv/lpoptions.c:244
+#: systemv/lpoptions.c:143 systemv/lpoptions.c:161 systemv/lpoptions.c:237
 msgid "lpoptions: No printers."
 msgstr ""
 
-#: systemv/lpoptions.c:219
+#: systemv/lpoptions.c:212
 #, c-format
 msgid "lpoptions: Unable to add printer or instance: %s"
 msgstr ""
 
-#: systemv/lpoptions.c:521
+#: systemv/lpoptions.c:507
 #, c-format
 msgid "lpoptions: Unable to get PPD file for %s: %s"
 msgstr ""
 
-#: systemv/lpoptions.c:529
+#: systemv/lpoptions.c:515
 #, c-format
 msgid "lpoptions: Unable to open PPD file for %s."
 msgstr ""
 
-#: systemv/lpoptions.c:99
+#: systemv/lpoptions.c:92
 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:1036
+#: systemv/lpstat.c:1076
 #, c-format
 msgid "lpstat: error - %s environment variable names non-existent destination \"%s\"."
 msgstr ""
 
-#: systemv/lpstat.c:967
+#: systemv/lpstat.c:1012
 #, c-format
 msgid "members of class %s:"
 msgstr ""
 
-#: berkeley/lpq.c:581
+#: berkeley/lpq.c:549
 msgid "no entries"
 msgstr ""
 
-#: systemv/lpstat.c:1040
+#: systemv/lpstat.c:1080
 msgid "no system default destination"
 msgstr ""
 
-#: scheduler/ipp.c:6864
+#: scheduler/ipp.c:5499
 msgid "notify-events not specified."
 msgstr ""
 
-#: scheduler/ipp.c:2179 scheduler/ipp.c:6769
+#: scheduler/ipp.c:2024 scheduler/ipp.c:5404
 #, c-format
 msgid "notify-recipient-uri URI \"%s\" is already used."
 msgstr ""
 
-#: scheduler/ipp.c:2169 scheduler/ipp.c:6759
+#: scheduler/ipp.c:2014 scheduler/ipp.c:5394
 #, c-format
 msgid "notify-recipient-uri URI \"%s\" uses unknown scheme."
 msgstr ""
@@ -6398,7 +6761,7 @@ msgstr ""
 msgid "pending"
 msgstr ""
 
-#: ppdc/ppdc.cxx:113 ppdc/ppdpo.cxx:93
+#: ppdc/ppdc.cxx:108 ppdc/ppdpo.cxx:93
 #, c-format
 msgid "ppdc: Adding include directory \"%s\"."
 msgstr ""
@@ -6408,7 +6771,7 @@ msgstr ""
 msgid "ppdc: Adding/updating UI text from %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:412
+#: ppdc/ppdc-source.cxx:367
 #, c-format
 msgid "ppdc: Bad boolean value (%s) on line %d of %s."
 msgstr ""
@@ -6418,485 +6781,485 @@ msgstr ""
 msgid "ppdc: Bad font attribute: %s"
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1797
+#: ppdc/ppdc-source.cxx:1753
 #, c-format
 msgid "ppdc: Bad resolution name \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1115
+#: ppdc/ppdc-source.cxx:1070
 #, c-format
 msgid "ppdc: Bad status keyword %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2034
+#: ppdc/ppdc-source.cxx:1990
 #, c-format
 msgid "ppdc: Bad variable substitution ($%c) on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2710
+#: ppdc/ppdc-source.cxx:2675
 #, c-format
 msgid "ppdc: Choice found on line %d of %s with no Option."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1699
+#: ppdc/ppdc-source.cxx:1655
 #, c-format
 msgid "ppdc: Duplicate #po for locale %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:934
+#: ppdc/ppdc-source.cxx:889
 #, c-format
 msgid "ppdc: Expected a filter definition on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:957
+#: ppdc/ppdc-source.cxx:912
 #, c-format
 msgid "ppdc: Expected a program name on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:396
+#: ppdc/ppdc-source.cxx:351
 #, c-format
 msgid "ppdc: Expected boolean value on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1095
+#: ppdc/ppdc-source.cxx:1050
 #, c-format
 msgid "ppdc: Expected charset after Font on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:449
+#: ppdc/ppdc-source.cxx:404
 #, c-format
 msgid "ppdc: Expected choice code on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:437
+#: ppdc/ppdc-source.cxx:392
 #, c-format
 msgid "ppdc: Expected choice name/text on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:505
+#: ppdc/ppdc-source.cxx:460
 #, c-format
 msgid "ppdc: Expected color order for ColorModel on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:494
+#: ppdc/ppdc-source.cxx:449
 #, c-format
 msgid "ppdc: Expected colorspace for ColorModel on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:516
+#: ppdc/ppdc-source.cxx:471
 #, c-format
 msgid "ppdc: Expected compression for ColorModel on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:697
+#: ppdc/ppdc-source.cxx:652
 #, c-format
 msgid "ppdc: Expected constraints string for UIConstraints on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2896
+#: ppdc/ppdc-source.cxx:2861
 #, c-format
 msgid "ppdc: Expected driver type keyword following DriverType on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:828
+#: ppdc/ppdc-source.cxx:783
 #, c-format
 msgid "ppdc: Expected duplex type after Duplex on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1079
+#: ppdc/ppdc-source.cxx:1034
 #, c-format
 msgid "ppdc: Expected encoding after Font on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1690
+#: ppdc/ppdc-source.cxx:1646
 #, c-format
 msgid "ppdc: Expected filename after #po %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1207
+#: ppdc/ppdc-source.cxx:1162
 #, c-format
 msgid "ppdc: Expected group name/text on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2610
+#: ppdc/ppdc-source.cxx:2575
 #, c-format
 msgid "ppdc: Expected include filename on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1503
+#: ppdc/ppdc-source.cxx:1459
 #, c-format
 msgid "ppdc: Expected integer on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1682
+#: ppdc/ppdc-source.cxx:1638
 #, c-format
 msgid "ppdc: Expected locale after #po on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:355
+#: ppdc/ppdc-source.cxx:310
 #, c-format
 msgid "ppdc: Expected name after %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3268
+#: ppdc/ppdc-source.cxx:3233
 #, c-format
 msgid "ppdc: Expected name after FileName on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1060
+#: ppdc/ppdc-source.cxx:1015
 #, c-format
 msgid "ppdc: Expected name after Font on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3099
+#: ppdc/ppdc-source.cxx:3064
 #, c-format
 msgid "ppdc: Expected name after Manufacturer on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3132
+#: ppdc/ppdc-source.cxx:3097
 #, c-format
 msgid "ppdc: Expected name after MediaSize on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3222
+#: ppdc/ppdc-source.cxx:3187
 #, c-format
 msgid "ppdc: Expected name after ModelName on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3285
+#: ppdc/ppdc-source.cxx:3250
 #, c-format
 msgid "ppdc: Expected name after PCFileName on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1158
+#: ppdc/ppdc-source.cxx:1113
 #, c-format
 msgid "ppdc: Expected name/text after %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1247
+#: ppdc/ppdc-source.cxx:1202
 #, c-format
 msgid "ppdc: Expected name/text after Installable on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1783
+#: ppdc/ppdc-source.cxx:1739
 #, c-format
 msgid "ppdc: Expected name/text after Resolution on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:481
+#: ppdc/ppdc-source.cxx:436
 #, c-format
 msgid "ppdc: Expected name/text combination for ColorModel on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1575
+#: ppdc/ppdc-source.cxx:1531
 #, c-format
 msgid "ppdc: Expected option name/text on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1609
+#: ppdc/ppdc-source.cxx:1565
 #, c-format
 msgid "ppdc: Expected option section on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1587
+#: ppdc/ppdc-source.cxx:1543
 #, c-format
 msgid "ppdc: Expected option type on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1766
+#: ppdc/ppdc-source.cxx:1722
 #, c-format
 msgid "ppdc: Expected override field after Resolution on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-catalog.cxx:341 ppdc/ppdc-catalog.cxx:353
+#: 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:1006
+#: ppdc/ppdc-source.cxx:961
 #, c-format
 msgid "ppdc: Expected real number on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:574
+#: ppdc/ppdc-source.cxx:529
 #, c-format
 msgid "ppdc: Expected resolution/mediatype following ColorProfile on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1864
+#: ppdc/ppdc-source.cxx:1820
 #, c-format
 msgid "ppdc: Expected resolution/mediatype following SimpleColorProfile on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:363
+#: ppdc/ppdc-source.cxx:318
 #, c-format
 msgid "ppdc: Expected selector after %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1103
+#: ppdc/ppdc-source.cxx:1058
 #, c-format
 msgid "ppdc: Expected status after Font on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2785
+#: ppdc/ppdc-source.cxx:2750
 #, c-format
 msgid "ppdc: Expected string after Copyright on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3388
+#: ppdc/ppdc-source.cxx:3353
 #, c-format
 msgid "ppdc: Expected string after Version on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:730
+#: ppdc/ppdc-source.cxx:685
 #, c-format
 msgid "ppdc: Expected two option names on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:374
+#: ppdc/ppdc-source.cxx:329
 #, c-format
 msgid "ppdc: Expected value after %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1087
+#: ppdc/ppdc-source.cxx:1042
 #, c-format
 msgid "ppdc: Expected version after Font on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:229
+#: ppdc/ppdc-source.cxx:184
 #, c-format
 msgid "ppdc: Invalid #include/#po filename \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:974
+#: ppdc/ppdc-source.cxx:929
 #, c-format
 msgid "ppdc: Invalid cost for filter on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:966
+#: ppdc/ppdc-source.cxx:921
 #, c-format
 msgid "ppdc: Invalid empty MIME type for filter on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:982
+#: ppdc/ppdc-source.cxx:937
 #, c-format
 msgid "ppdc: Invalid empty program name for filter on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1629
+#: ppdc/ppdc-source.cxx:1585
 #, c-format
 msgid "ppdc: Invalid option section \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1601
+#: ppdc/ppdc-source.cxx:1557
 #, 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:246 ppdc/ppdpo.cxx:123
 #, c-format
 msgid "ppdc: Loading driver information file \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc.cxx:187
+#: ppdc/ppdc.cxx:182
 #, c-format
 msgid "ppdc: Loading messages for locale \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc.cxx:126
+#: ppdc/ppdc.cxx:121
 #, c-format
 msgid "ppdc: Loading messages from \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2403 ppdc/ppdc-source.cxx:2635
+#: ppdc/ppdc-source.cxx:2368 ppdc/ppdc-source.cxx:2600
 #, c-format
 msgid "ppdc: Missing #endif at end of \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2504 ppdc/ppdc-source.cxx:2539
-#: ppdc/ppdc-source.cxx:2569
+#: ppdc/ppdc-source.cxx:2469 ppdc/ppdc-source.cxx:2504
+#: ppdc/ppdc-source.cxx:2534
 #, c-format
 msgid "ppdc: Missing #if on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-catalog.cxx:418
+#: 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:730
+#: ppdc/ppdc-driver.cxx:712
 #, c-format
 msgid "ppdc: No message catalog provided for locale %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1652 ppdc/ppdc-source.cxx:2873
-#: ppdc/ppdc-source.cxx:2959 ppdc/ppdc-source.cxx:3052
-#: ppdc/ppdc-source.cxx:3185 ppdc/ppdc-source.cxx:3318
+#: 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
 #, c-format
 msgid "ppdc: Option %s defined in two different groups on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1645
+#: ppdc/ppdc-source.cxx:1601
 #, c-format
 msgid "ppdc: Option %s redefined with a different type on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:707
+#: ppdc/ppdc-source.cxx:662
 #, c-format
 msgid "ppdc: Option constraint must *name on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2486
+#: ppdc/ppdc-source.cxx:2451
 #, c-format
 msgid "ppdc: Too many nested #if's on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc.cxx:374
+#: ppdc/ppdc.cxx:369
 #, c-format
 msgid "ppdc: Unable to create PPD file \"%s\" - %s."
 msgstr ""
 
-#: ppdc/ppdc.cxx:266
+#: ppdc/ppdc.cxx:261
 #, c-format
 msgid "ppdc: Unable to create output directory %s: %s"
 msgstr ""
 
-#: ppdc/ppdc.cxx:287
+#: ppdc/ppdc.cxx:282
 #, c-format
 msgid "ppdc: Unable to create output pipes: %s"
 msgstr ""
 
-#: ppdc/ppdc.cxx:303 ppdc/ppdc.cxx:309
+#: ppdc/ppdc.cxx:298 ppdc/ppdc.cxx:304
 #, c-format
 msgid "ppdc: Unable to execute cupstestppd: %s"
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1731
+#: ppdc/ppdc-source.cxx:1687
 #, c-format
 msgid "ppdc: Unable to find #po file %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2642
+#: ppdc/ppdc-source.cxx:2607
 #, c-format
 msgid "ppdc: Unable to find include file \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc.cxx:198
+#: ppdc/ppdc.cxx:193
 #, c-format
 msgid "ppdc: Unable to find localization for \"%s\" - %s"
 msgstr ""
 
-#: ppdc/ppdc.cxx:135
+#: ppdc/ppdc.cxx:130
 #, c-format
 msgid "ppdc: Unable to load localization file \"%s\" - %s"
 msgstr ""
 
-#: ppdc/ppdc-file.cxx:49
+#: ppdc/ppdc-file.cxx:50
 #, c-format
 msgid "ppdc: Unable to open %s: %s"
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2055
+#: ppdc/ppdc-source.cxx:2011
 #, c-format
 msgid "ppdc: Undefined variable (%s) on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-catalog.cxx:435
+#: ppdc/ppdc-catalog.cxx:483
 #, c-format
 msgid "ppdc: Unexpected text on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2915
+#: ppdc/ppdc-source.cxx:2880
 #, c-format
 msgid "ppdc: Unknown driver type %s on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:908
+#: ppdc/ppdc-source.cxx:863
 #, c-format
 msgid "ppdc: Unknown duplex type \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3145
+#: ppdc/ppdc-source.cxx:3110
 #, c-format
 msgid "ppdc: Unknown media size \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-catalog.cxx:463
+#: ppdc/ppdc-catalog.cxx:511
 #, c-format
 msgid "ppdc: Unknown message catalog format for \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:3399
+#: ppdc/ppdc-source.cxx:3364
 #, c-format
 msgid "ppdc: Unknown token \"%s\" seen on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:1016
+#: ppdc/ppdc-source.cxx:971
 #, c-format
 msgid "ppdc: Unknown trailing characters in real number \"%s\" on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc-source.cxx:2165
+#: ppdc/ppdc-source.cxx:2121
 #, c-format
 msgid "ppdc: Unterminated string starting with %c on line %d of %s."
 msgstr ""
 
-#: ppdc/ppdc.cxx:365
+#: ppdc/ppdc.cxx:360
 #, c-format
 msgid "ppdc: Warning - overlapping filename \"%s\"."
 msgstr ""
 
-#: ppdc/ppdc.cxx:380
+#: ppdc/ppdc.cxx:375
 #, c-format
 msgid "ppdc: Writing %s."
 msgstr ""
 
-#: ppdc/ppdc.cxx:148
+#: ppdc/ppdc.cxx:143
 #, c-format
 msgid "ppdc: Writing PPD files to directory \"%s\"."
 msgstr ""
 
-#: ppdc/ppdmerge.cxx:136
+#: ppdc/ppdmerge.cxx:130
 #, c-format
 msgid "ppdmerge: Bad LanguageVersion \"%s\" in %s."
 msgstr ""
 
-#: ppdc/ppdmerge.cxx:176
+#: ppdc/ppdmerge.cxx:170
 #, c-format
 msgid "ppdmerge: Ignoring PPD file %s."
 msgstr ""
 
-#: ppdc/ppdmerge.cxx:160
+#: ppdc/ppdmerge.cxx:154
 #, c-format
 msgid "ppdmerge: Unable to backup %s to %s - %s"
 msgstr ""
 
-#: systemv/lpstat.c:1781
+#: systemv/lpstat.c:1797
 #, c-format
 msgid "printer %s disabled since %s -"
 msgstr ""
 
-#: systemv/lpstat.c:1770
+#: systemv/lpstat.c:1786
 #, c-format
 msgid "printer %s is idle.  enabled since %s"
 msgstr ""
 
-#: systemv/lpstat.c:1775
+#: systemv/lpstat.c:1791
 #, c-format
 msgid "printer %s now printing %s-%d.  enabled since %s"
 msgstr ""
 
-#: systemv/lpstat.c:1906
+#: systemv/lpstat.c:1920
 #, c-format
 msgid "printer %s/%s disabled since %s -"
 msgstr ""
 
-#: systemv/lpstat.c:1892
+#: systemv/lpstat.c:1906
 #, c-format
 msgid "printer %s/%s is idle.  enabled since %s"
 msgstr ""
 
-#: systemv/lpstat.c:1899
+#: systemv/lpstat.c:1913
 #, c-format
 msgid "printer %s/%s now printing %s-%d.  enabled since %s"
 msgstr ""
@@ -6905,29 +7268,29 @@ msgstr ""
 msgid "processing"
 msgstr ""
 
-#: systemv/lp.c:639
+#: systemv/lp.c:662
 #, c-format
 msgid "request id is %s-%d (%d file(s))"
 msgstr ""
 
-#: cups/snmp.c:1020
+#: cups/snmp.c:972
 msgid "request-id uses indefinite length"
 msgstr ""
 
-#: systemv/lpstat.c:2045
+#: systemv/lpstat.c:2052
 msgid "scheduler is not running"
 msgstr ""
 
-#: systemv/lpstat.c:2041
+#: systemv/lpstat.c:2048
 msgid "scheduler is running"
 msgstr ""
 
-#: cups/adminutil.c:2276
+#: cups/adminutil.c:2148
 #, c-format
 msgid "stat of %s failed: %s"
 msgstr ""
 
-#: berkeley/lpc.c:211
+#: berkeley/lpc.c:203
 msgid "status\t\tShow status of daemon and queue."
 msgstr ""
 
@@ -6935,12 +7298,12 @@ msgstr ""
 msgid "stopped"
 msgstr ""
 
-#: systemv/lpstat.c:1014
+#: systemv/lpstat.c:1054
 #, c-format
 msgid "system default destination: %s"
 msgstr ""
 
-#: systemv/lpstat.c:1011
+#: systemv/lpstat.c:1051
 #, c-format
 msgid "system default destination: %s/%s"
 msgstr ""
@@ -6953,7 +7316,7 @@ msgstr ""
 msgid "untitled"
 msgstr ""
 
-#: cups/snmp.c:1045
+#: cups/snmp.c:997
 msgid "variable-bindings uses indefinite length"
 msgstr ""