From 84987361cb306e284ad03c896b474e05d0b94227 Mon Sep 17 00:00:00 2001 From: msweet Date: Fri, 28 Mar 2014 14:49:58 +0000 Subject: [PATCH] Add --list-filters options to cupsfilter (STR #4325) Also update cupsfilter to look for cups-files.conf instead of cupsd.conf (this was never updated after the security changes to use cups-files.conf) Update the man page to use the "modern" markup and sections. Prep for future cups(1) man page that provides an overview of CUPS and the standard environment. Update man page converter to not add whitespace before punctuation. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11770 a1ca3aef-8c08-0410-bb20-df032aa958be --- CHANGES.txt | 3 +- doc/help/man-cupsfilter.html | 60 +++--- doc/help/man-ippfind.html | 4 +- doc/help/man-ppdi.html | 2 +- locale/cups.pot | 344 ++++++++++++++++---------------- locale/cups.strings | 8 +- locale/cups_ca.po | 35 +++- locale/cups_cs.po | 18 +- locale/cups_es.po | 35 +++- locale/cups_fr.po | 18 +- locale/cups_it.po | 33 +++- locale/cups_ja.po | 35 +++- locale/cups_ru.po | 18 +- man/cupsfilter.man | 76 +++---- man/mantohtml.c | 2 +- scheduler/cupsfilter.c | 373 ++++++++++++++++++----------------- 16 files changed, 592 insertions(+), 472 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 0e3a62fa5..717e8601c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,4 @@ -CHANGES.txt - 2.0b1 - 2014-03-27 +CHANGES.txt - 2.0b1 - 2014-03-28 -------------------------------- CHANGES IN CUPS V2.0b1 @@ -11,6 +11,7 @@ CHANGES IN CUPS V2.0b1 - Dropped support for AIX, HP-UX, and OSF/1 (aka Digital UNIX) - Adopted Linux man page conventions and updated all man pages (STR #4372) + - Added a "--list-filters" option to the cupsfilter command (STR #4325) - Added systemd support (STR #3917) - Added support for re-sending a job as a raster file if a higher-level format such as PDF fails () diff --git a/doc/help/man-cupsfilter.html b/doc/help/man-cupsfilter.html index dfb7a833d..84d816923 100644 --- a/doc/help/man-cupsfilter.html +++ b/doc/help/man-cupsfilter.html @@ -11,7 +11,7 @@ cupsfilter - convert a file to another format using cups filters

Synopsis

cupsfilter -[ -D ] [ -U +[ --list-filters] [ -D ] [ -U user ] [ -c config-file @@ -34,71 +34,77 @@ cupsfilter - convert a file to another format using cups filters ] [ -u ] filename

Description

-cupsfilter is a front-end to the CUPS filter subsystem which allows you -to convert a file to a specific format, just as if you had printed the file -through CUPS. By default, cupsfilter generates a PDF file. +cupsfilter +is a front-end to the CUPS filter subsystem which allows you to convert a file to a specific format, just as if you had printed the file through CUPS. By default, +cupsfilter +generates a PDF file. The converted file is sent to the standard output.

Options

-

-D +

--list-filters
+Do not actually run the filters, just print the filters used to stdout. +

-D
Delete the input file after conversion.

-U user
-
Specifies the username passed to the filters. The default is the name of the current user.

-c config-file
-
-Uses the named cupsd.conf configuration file. +Uses the named cups-files.conf configuration file.

-d printer
Uses information from the named printer.

-e
-
Use every filter from the PPD file.

-i mime/type
-
-Specifies the source file type. The default file type is guessed using the -filename and contents of the file. +Specifies the source file type. The default file type is guessed using the filename and contents of the file.

-j job-id[,N]
-
-Converts document N from the specified job. If N is omitted, document 1 is -converted. +Converts document N from the specified job. If N is omitted, document 1 is converted.

-m mime/type
-
-Specifies the destination file type. The default file type is application/pdf. -Use printer/foo to convert to the printer format defined by the filters in the -PPD file. +Specifies the destination file type. The default file type is application/pdf. Use printer/foo to convert to the printer format defined by the filters in the PPD file.

-n copies
-
Specifies the number of copies to generate.

-o name=value
-
Specifies options to pass to the CUPS filters.

-p filename.ppd
-
Specifies the PPD file to use.

-t title
-
Specifies the document title.

-u
-
Delete the PPD file after conversion. +

Exit Status

+cupsfilter +returns a non-zero exit status on any error. +

Environment

+All of the standard +cups(1) +environment variables affect the operation of +cupsfilter. +

Files

+/etc/cups/cups-files.conf, /etc/cups/*.convs, /etc/cups/*.types, /usr/share/cups/mime/*.convs, /usr/share/cups/mime/*.types +

Notes

+Unlike when printing, filters run using the +cupsfilter +command use the current user and security session. This may result in different output or unexpected behavior. +

Example

+The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf": +
+    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
+

See Also

-cupsd.conf(5) -
+cups(1), cupsd.conf(5), filter(7), mime.convs(7), mime.types(7), http://localhost:631/help

Copyright

-Copyright 2007-2013 by Apple Inc. +Copyright © 2007-2014 by Apple Inc. diff --git a/doc/help/man-ippfind.html b/doc/help/man-ippfind.html index fb414c727..ee1adbfa9 100644 --- a/doc/help/man-ippfind.html +++ b/doc/help/man-ippfind.html @@ -14,13 +14,13 @@ ippfind - find internet printing protocol printers [ options ] regtype[,subtype][.domain.] ... [ -expression ... +expression... ] ippfind [ options ] name[.regtype[.domain.]] ... [ -expression ... +expression... ] ippfind --help diff --git a/doc/help/man-ppdi.html b/doc/help/man-ppdi.html index 1106cbc7c..1e326b911 100644 --- a/doc/help/man-ppdi.html +++ b/doc/help/man-ppdi.html @@ -18,7 +18,7 @@ ppdi - import ppd files ] ppd-file [ -ppd-file2 ... ppd-fileN +ppd-file2... ppd-fileN ]

Description

ppdi imports one or more PPD files into a PPD compiler source file. diff --git a/locale/cups.pot b/locale/cups.pot index c65598751..a29ca210d 100644 --- a/locale/cups.pot +++ b/locale/cups.pot @@ -30,7 +30,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.6\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2014-03-17 07:47-0400\n" +"POT-Creation-Date: 2014-03-28 10:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1037,6 +1037,10 @@ msgstr "" 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 "" @@ -1097,19 +1101,19 @@ msgstr "" msgid " --version Show program version." msgstr "" -#: test/ippfind.c:2716 test/ipptool.c:4664 +#: test/ippfind.c:2716 test/ipptool.c:4676 msgid " -4 Connect using IPv4." msgstr "" -#: test/ippfind.c:2717 test/ipptool.c:4665 +#: test/ippfind.c:2717 test/ipptool.c:4677 msgid " -6 Connect using IPv6." msgstr "" -#: test/ipptool.c:4666 +#: test/ipptool.c:4678 msgid " -C Send requests using chunking (default)." msgstr "" -#: scheduler/cupsfilter.c:1457 +#: scheduler/cupsfilter.c:1484 msgid " -D Remove the input file when finished." msgstr "" @@ -1121,11 +1125,11 @@ msgstr "" msgid " -E Encrypt the connection." msgstr "" -#: test/ipptool.c:4668 +#: test/ipptool.c:4680 msgid " -E Test with HTTP Upgrade to TLS." msgstr "" -#: scheduler/main.c:2080 +#: scheduler/main.c:2161 msgid " -F Run in the foreground but detach from console." msgstr "" @@ -1133,7 +1137,7 @@ msgstr "" msgid " -H samba-server Use the named SAMBA server." msgstr "" -#: test/ipptool.c:4670 +#: test/ipptool.c:4682 msgid " -I Ignore errors." msgstr "" @@ -1145,11 +1149,11 @@ msgstr "" msgid " -I {filename,filters,none,profiles}" msgstr "" -#: test/ipptool.c:4671 +#: test/ipptool.c:4683 msgid " -L Send requests using content-length." msgstr "" -#: scheduler/cupsfilter.c:1459 +#: scheduler/cupsfilter.c:1485 msgid " -P filename.ppd Set PPD file." msgstr "" @@ -1161,7 +1165,7 @@ msgstr "" msgid " -R root-directory Set alternate root." msgstr "" -#: test/ipptool.c:4673 +#: test/ipptool.c:4685 msgid " -S Test with SSL encryption." msgstr "" @@ -1169,15 +1173,15 @@ msgstr "" msgid " -T seconds Set the browse timeout in seconds." msgstr "" -#: test/ipptool.c:4675 +#: test/ipptool.c:4687 msgid " -T seconds Set the receive/send timeout in seconds." msgstr "" -#: scheduler/cupsfilter.c:1460 systemv/cupsaddsmb.c:288 systemv/cupsctl.c:206 +#: scheduler/cupsfilter.c:1486 systemv/cupsaddsmb.c:288 systemv/cupsctl.c:206 msgid " -U username Specify username." msgstr "" -#: test/ippfind.c:2720 test/ipptool.c:4677 +#: test/ippfind.c:2720 test/ipptool.c:4689 msgid " -V version Set default IPP version." msgstr "" @@ -1185,7 +1189,7 @@ msgstr "" msgid " -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,translations}" msgstr "" -#: test/ipptool.c:4679 +#: test/ipptool.c:4691 msgid " -X Produce XML plist instead of plain text." msgstr "" @@ -1201,7 +1205,11 @@ msgstr "" msgid " -c catalog.po Load the specified message catalog." msgstr "" -#: scheduler/cupsfilter.c:1461 scheduler/main.c:2078 +#: scheduler/cupsfilter.c:1487 +msgid " -c cups-files.conf Set cups-files.conf file to use." +msgstr "" + +#: scheduler/main.c:2159 msgid " -c cupsd.conf Set cupsd.conf file to use." msgstr "" @@ -1209,7 +1217,7 @@ msgstr "" msgid " -d domain Browse/resolve in specified domain." msgstr "" -#: test/ipptool.c:4681 +#: test/ipptool.c:4693 msgid " -d name=value Set named variable to value." msgstr "" @@ -1217,7 +1225,7 @@ msgstr "" msgid " -d output-dir Specify the output directory." msgstr "" -#: scheduler/cupsfilter.c:1463 +#: scheduler/cupsfilter.c:1488 msgid " -d printer Use the named printer." msgstr "" @@ -1225,19 +1233,19 @@ msgstr "" msgid " -d regex Match domain to regular expression." msgstr "" -#: scheduler/cupsfilter.c:1465 +#: scheduler/cupsfilter.c:1489 msgid " -e Use every filter from the PPD file." msgstr "" -#: scheduler/main.c:2079 +#: scheduler/main.c:2160 msgid " -f Run in the foreground." msgstr "" -#: test/ipptool.c:4683 +#: test/ipptool.c:4695 msgid " -f filename Set default request filename." msgstr "" -#: scheduler/main.c:2082 +#: scheduler/main.c:2163 msgid " -h Show this usage message." msgstr "" @@ -1249,15 +1257,15 @@ msgstr "" msgid " -h server[:port] Specify server address." msgstr "" -#: scheduler/cupsfilter.c:1467 +#: scheduler/cupsfilter.c:1490 msgid " -i mime/type Set input MIME type (otherwise auto-typed)." msgstr "" -#: test/ipptool.c:4685 +#: test/ipptool.c:4697 msgid " -i seconds Repeat the last file with the given time interval." msgstr "" -#: scheduler/cupsfilter.c:1469 +#: scheduler/cupsfilter.c:1491 msgid " -j job-id[,N] Filter file N from the specified job (default is file 1)." msgstr "" @@ -1265,8 +1273,8 @@ msgstr "" msgid " -l List attributes." msgstr "" -#: scheduler/main.c:2083 -msgid " -l Run cupsd from launchd(8)." +#: scheduler/main.c:2164 +msgid " -l Run cupsd on demand." msgstr "" #: ppdc/ppdc.cxx:446 @@ -1277,15 +1285,15 @@ msgstr "" msgid " -m Use the ModelName value as the filename." msgstr "" -#: scheduler/cupsfilter.c:1471 +#: scheduler/cupsfilter.c:1492 msgid " -m mime/type Set output MIME type (otherwise application/pdf)." msgstr "" -#: scheduler/cupsfilter.c:1473 +#: scheduler/cupsfilter.c:1493 msgid " -n copies Set number of copies." msgstr "" -#: test/ipptool.c:4687 +#: test/ipptool.c:4699 msgid " -n count Repeat the last file the given number of times." msgstr "" @@ -1301,7 +1309,7 @@ msgstr "" msgid " -o filename.ppd[.gz] Set output file (otherwise stdout)." msgstr "" -#: scheduler/cupsfilter.c:1474 +#: scheduler/cupsfilter.c:1494 msgid " -o name=value Set option(s)." msgstr "" @@ -1309,7 +1317,7 @@ msgstr "" msgid " -p Print URI if true." msgstr "" -#: scheduler/cupsfilter.c:1475 +#: scheduler/cupsfilter.c:1495 msgid " -p filename.ppd Set PPD file." msgstr "" @@ -1321,7 +1329,7 @@ msgstr "" msgid " -q Quietly report match via exit code." msgstr "" -#: systemv/cupstestppd.c:3826 test/ipptool.c:4689 +#: systemv/cupstestppd.c:3826 test/ipptool.c:4701 msgid " -q Run silently." msgstr "" @@ -1337,7 +1345,7 @@ msgstr "" msgid " -s Print service name if true." msgstr "" -#: test/ipptool.c:4690 +#: test/ipptool.c:4702 msgid " -t Produce a test report." msgstr "" @@ -1345,7 +1353,7 @@ msgstr "" msgid " -t Test PPDs instead of generating them." msgstr "" -#: scheduler/main.c:2084 +#: scheduler/main.c:2165 msgid " -t Test the configuration file." msgstr "" @@ -1353,7 +1361,7 @@ msgstr "" msgid " -t key True if the TXT record contains the key." msgstr "" -#: scheduler/cupsfilter.c:1476 +#: scheduler/cupsfilter.c:1496 msgid " -t title Set title." msgstr "" @@ -1361,7 +1369,7 @@ msgstr "" msgid " -t type Browse/resolve with specified type." msgstr "" -#: scheduler/cupsfilter.c:1477 +#: scheduler/cupsfilter.c:1497 msgid " -u Remove the PPD file when finished." msgstr "" @@ -1369,7 +1377,7 @@ msgstr "" msgid " -u regex Match URI to regular expression." msgstr "" -#: systemv/cupsaddsmb.c:291 systemv/cupstestppd.c:3828 test/ipptool.c:4691 +#: systemv/cupsaddsmb.c:291 systemv/cupstestppd.c:3828 test/ipptool.c:4703 #: ppdc/ppdc.cxx:452 ppdc/ppdpo.cxx:259 msgid " -v Be verbose." msgstr "" @@ -1715,7 +1723,7 @@ msgstr "" msgid "%s accepting requests since %s" msgstr "" -#: scheduler/ipp.c:9843 +#: scheduler/ipp.c:9841 #, c-format msgid "%s cannot be changed." msgstr "" @@ -1741,7 +1749,7 @@ msgid "%s is ready and printing" msgstr "" #: filter/rastertoepson.c:970 filter/rastertohp.c:700 -#: filter/rastertolabel.c:1115 +#: filter/rastertolabel.c:1120 #, c-format msgid "%s job-id user title copies options [file]" msgstr "" @@ -1772,7 +1780,7 @@ msgid "%s: %-33.33s [job %d localhost]" msgstr "" #. TRANSLATORS: Message is "subject: error" -#: cups/langprintf.c:77 scheduler/cupsfilter.c:698 systemv/lpadmin.c:791 +#: 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 @@ -1785,7 +1793,7 @@ msgstr "" msgid "%s: %s failed: %s" msgstr "" -#: test/ippfind.c:773 test/ipptool.c:344 +#: test/ippfind.c:773 test/ipptool.c:346 #, c-format msgid "%s: Bad version %s for \"-V\"." msgstr "" @@ -1995,17 +2003,17 @@ msgstr "" msgid "%s: Invalid destination name in list \"%s\"." msgstr "" -#: scheduler/cupsfilter.c:551 +#: scheduler/cupsfilter.c:579 #, c-format msgid "%s: Invalid filter string \"%s\"." msgstr "" -#: test/ippfind.c:745 test/ipptool.c:312 +#: test/ippfind.c:745 test/ipptool.c:314 #, c-format msgid "%s: Missing timeout for \"-T\"." msgstr "" -#: test/ippfind.c:758 test/ipptool.c:326 +#: test/ippfind.c:758 test/ipptool.c:328 #, c-format msgid "%s: Missing version for \"-V\"." msgstr "" @@ -2015,7 +2023,7 @@ msgstr "" msgid "%s: Need job ID (\"-i jobid\") before \"-H restart\"." msgstr "" -#: scheduler/cupsfilter.c:442 +#: scheduler/cupsfilter.c:451 #, c-format msgid "%s: No filter to convert from %s/%s to %s/%s." msgstr "" @@ -2028,12 +2036,12 @@ msgstr "" #: berkeley/lpq.c:83 berkeley/lpr.c:67 berkeley/lprm.c:67 systemv/cancel.c:82 #: systemv/cupsaccept.c:88 systemv/cupsaddsmb.c:86 systemv/lp.c:96 #: systemv/lpadmin.c:225 systemv/lpinfo.c:88 systemv/lpmove.c:73 -#: systemv/lpstat.c:88 test/ipptool.c:284 test/ipptool.c:301 +#: systemv/lpstat.c:88 test/ipptool.c:286 test/ipptool.c:303 #, c-format msgid "%s: Sorry, no encryption support." msgstr "" -#: berkeley/lpq.c:284 scheduler/cupsfilter.c:1247 systemv/cancel.c:245 +#: 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." @@ -2044,7 +2052,7 @@ msgstr "" msgid "%s: Unable to contact server." msgstr "" -#: scheduler/cupsfilter.c:407 +#: scheduler/cupsfilter.c:416 #, c-format msgid "%s: Unable to determine MIME type of \"%s\"." msgstr "" @@ -2054,12 +2062,12 @@ msgstr "" msgid "%s: Unable to open %s: %s" msgstr "" -#: scheduler/cupsfilter.c:646 ppdc/ppdmerge.cxx:106 +#: 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:374 +#: scheduler/cupsfilter.c:383 #, c-format msgid "%s: Unable to read MIME database from \"%s\" or \"%s\"." msgstr "" @@ -2069,12 +2077,12 @@ msgstr "" msgid "%s: Unknown destination \"%s\"." msgstr "" -#: scheduler/cupsfilter.c:419 +#: scheduler/cupsfilter.c:428 #, c-format msgid "%s: Unknown destination MIME type %s/%s." msgstr "" -#: scheduler/cupsfilter.c:1452 +#: scheduler/cupsfilter.c:1479 #, c-format msgid "%s: Unknown option \"%c\"." msgstr "" @@ -2089,7 +2097,7 @@ msgstr "" msgid "%s: Unknown option \"-%c\"." msgstr "" -#: scheduler/cupsfilter.c:399 +#: scheduler/cupsfilter.c:408 #, c-format msgid "%s: Unknown source MIME type %s/%s." msgstr "" @@ -3168,7 +3176,7 @@ msgstr "" msgid "B9" msgstr "" -#: scheduler/ipp.c:10766 +#: scheduler/ipp.c:10764 #, c-format msgid "Bad 'document-format' value \"%s\"." msgstr "" @@ -3237,12 +3245,12 @@ msgstr "" msgid "Bad device-uri scheme \"%s\"." msgstr "" -#: scheduler/ipp.c:8018 scheduler/ipp.c:8034 scheduler/ipp.c:9252 +#: scheduler/ipp.c:8016 scheduler/ipp.c:8032 scheduler/ipp.c:9250 #, c-format msgid "Bad document-format \"%s\"." msgstr "" -#: scheduler/ipp.c:9268 +#: scheduler/ipp.c:9266 #, c-format msgid "Bad document-format-default \"%s\"." msgstr "" @@ -3264,7 +3272,7 @@ msgstr "" msgid "Bad job-name value: Wrong type or count." msgstr "" -#: scheduler/ipp.c:9858 +#: scheduler/ipp.c:9856 msgid "Bad job-priority value." msgstr "" @@ -3277,24 +3285,24 @@ msgstr "" msgid "Bad job-sheets value type." msgstr "" -#: scheduler/ipp.c:9888 +#: scheduler/ipp.c:9886 msgid "Bad job-state value." msgstr "" -#: scheduler/ipp.c:2981 scheduler/ipp.c:3441 scheduler/ipp.c:5883 -#: scheduler/ipp.c:6030 scheduler/ipp.c:7452 scheduler/ipp.c:7721 -#: scheduler/ipp.c:8570 scheduler/ipp.c:8796 scheduler/ipp.c:9148 -#: scheduler/ipp.c:9751 +#: scheduler/ipp.c: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 "" -#: scheduler/ipp.c:2039 scheduler/ipp.c:5421 +#: scheduler/ipp.c:2039 scheduler/ipp.c:5419 #, c-format msgid "Bad notify-pull-method \"%s\"." msgstr "" -#: scheduler/ipp.c:2003 scheduler/ipp.c:5385 +#: scheduler/ipp.c:2003 scheduler/ipp.c:5383 #, c-format msgid "Bad notify-recipient-uri \"%s\"." msgstr "" @@ -3412,7 +3420,7 @@ msgstr "" msgid "Change Settings" msgstr "" -#: scheduler/ipp.c:2051 scheduler/ipp.c:5433 +#: scheduler/ipp.c:2051 scheduler/ipp.c:5431 #, c-format msgid "Character set \"%s\" not supported." msgstr "" @@ -3569,7 +3577,7 @@ msgstr "" msgid "Disabled" msgstr "" -#: scheduler/ipp.c:5932 +#: scheduler/ipp.c:5930 #, c-format msgid "Document #%d does not exist in job #%d." msgstr "" @@ -3971,7 +3979,7 @@ msgid "File device URIs have been disabled. To enable, see the FileDevice direct msgstr "" #: filter/rastertoepson.c:1102 filter/rastertohp.c:834 -#: filter/rastertolabel.c:1254 +#: filter/rastertolabel.c:1259 #, c-format msgid "Finished page %d." msgstr "" @@ -4001,9 +4009,9 @@ msgid "Glossy Paper" msgstr "" #: scheduler/ipp.c:2959 scheduler/ipp.c:3367 scheduler/ipp.c:3905 -#: scheduler/ipp.c:5861 scheduler/ipp.c:6008 scheduler/ipp.c:7429 -#: scheduler/ipp.c:8548 scheduler/ipp.c:8774 scheduler/ipp.c:9126 -#: scheduler/ipp.c:9729 +#: 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 "" @@ -4248,17 +4256,17 @@ msgstr "" msgid "JIS B9" msgstr "" -#: scheduler/ipp.c:8846 +#: scheduler/ipp.c:8844 #, c-format msgid "Job #%d cannot be restarted - no files." msgstr "" #: scheduler/ipp.c:2999 scheduler/ipp.c:3233 scheduler/ipp.c:3292 -#: scheduler/ipp.c:3469 scheduler/ipp.c:3915 scheduler/ipp.c:5519 -#: scheduler/ipp.c:5901 scheduler/ipp.c:6048 scheduler/ipp.c:6337 -#: scheduler/ipp.c:7276 scheduler/ipp.c:7298 scheduler/ipp.c:7470 -#: scheduler/ipp.c:7695 scheduler/ipp.c:7738 scheduler/ipp.c:8588 -#: scheduler/ipp.c:8814 scheduler/ipp.c:9166 scheduler/ipp.c:9769 +#: scheduler/ipp.c: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 "" @@ -4278,12 +4286,12 @@ msgstr "" msgid "Job #%d is already completed - can't cancel." msgstr "" -#: scheduler/ipp.c:7496 scheduler/ipp.c:7780 scheduler/ipp.c:9784 +#: scheduler/ipp.c:7494 scheduler/ipp.c:7778 scheduler/ipp.c:9782 #, c-format msgid "Job #%d is finished and cannot be altered." msgstr "" -#: scheduler/ipp.c:8828 +#: scheduler/ipp.c:8826 #, c-format msgid "Job #%d is not complete." msgstr "" @@ -4293,7 +4301,7 @@ msgstr "" msgid "Job #%d is not held for authentication." msgstr "" -#: scheduler/ipp.c:8602 +#: scheduler/ipp.c:8600 #, c-format msgid "Job #%d is not held." msgstr "" @@ -4314,7 +4322,7 @@ msgstr "" msgid "Job Stopped" msgstr "" -#: scheduler/ipp.c:9866 +#: scheduler/ipp.c:9864 msgid "Job is completed and cannot be changed." msgstr "" @@ -4322,11 +4330,11 @@ msgstr "" msgid "Job operation failed" msgstr "" -#: scheduler/ipp.c:9902 scheduler/ipp.c:9919 scheduler/ipp.c:9930 +#: scheduler/ipp.c:9900 scheduler/ipp.c:9917 scheduler/ipp.c:9928 msgid "Job state cannot be changed." msgstr "" -#: scheduler/ipp.c:8694 +#: scheduler/ipp.c:8692 msgid "Job subscriptions cannot be renewed." msgstr "" @@ -4346,7 +4354,7 @@ msgstr "" msgid "Label Top" msgstr "" -#: scheduler/ipp.c:2060 scheduler/ipp.c:5442 +#: scheduler/ipp.c:2060 scheduler/ipp.c:5440 #, c-format msgid "Language \"%s\" not supported." msgstr "" @@ -4431,7 +4439,7 @@ msgstr "" msgid "Missing asterisk in column 1" msgstr "" -#: scheduler/ipp.c:5924 +#: scheduler/ipp.c:5922 msgid "Missing document-number attribute." msgstr "" @@ -4446,7 +4454,7 @@ msgstr "" msgid "Missing form variable" msgstr "" -#: scheduler/ipp.c:9220 +#: scheduler/ipp.c:9218 msgid "Missing last-document attribute in request." msgstr "" @@ -4458,7 +4466,7 @@ msgstr "" msgid "Missing media-size in media-col." msgstr "" -#: scheduler/ipp.c:6467 +#: scheduler/ipp.c:6465 msgid "Missing notify-subscription-ids attribute." msgstr "" @@ -4564,7 +4572,7 @@ msgstr "" msgid "No Content" msgstr "" -#: cups/util.c:1271 +#: cups/util.c:1283 msgid "No PPD name" msgstr "" @@ -4597,11 +4605,11 @@ msgstr "" msgid "No community name" msgstr "" -#: scheduler/ipp.c:5724 +#: scheduler/ipp.c:5722 msgid "No default printer." msgstr "" -#: cgi-bin/ipp-var.c:421 scheduler/ipp.c:7042 +#: cgi-bin/ipp-var.c:421 scheduler/ipp.c:7040 msgid "No destinations added." msgstr "" @@ -4617,7 +4625,7 @@ msgstr "" msgid "No error-status" msgstr "" -#: scheduler/ipp.c:7984 scheduler/ipp.c:9234 +#: scheduler/ipp.c:7982 scheduler/ipp.c:9232 msgid "No file in print request." msgstr "" @@ -4630,7 +4638,7 @@ msgid "No name OID" msgstr "" #: filter/rastertoepson.c:1132 filter/rastertohp.c:865 -#: filter/rastertolabel.c:1283 +#: filter/rastertolabel.c:1288 msgid "No pages were found." msgstr "" @@ -4642,11 +4650,11 @@ msgstr "" msgid "No printer-uri found" msgstr "" -#: cups/util.c:1792 +#: cups/util.c:1791 msgid "No printer-uri found for class" msgstr "" -#: scheduler/ipp.c:6127 +#: scheduler/ipp.c:6125 msgid "No printer-uri in request." msgstr "" @@ -4662,11 +4670,11 @@ msgstr "" msgid "No request-id" msgstr "" -#: scheduler/ipp.c:5327 +#: scheduler/ipp.c:5325 msgid "No subscription attributes in request." msgstr "" -#: scheduler/ipp.c:7369 +#: scheduler/ipp.c:7367 msgid "No subscriptions found." msgstr "" @@ -4710,7 +4718,7 @@ msgstr "" msgid "Not Supported" msgstr "" -#: scheduler/ipp.c:1490 scheduler/ipp.c:10463 +#: scheduler/ipp.c:1490 scheduler/ipp.c:10461 msgid "Not allowed to print." msgstr "" @@ -4764,9 +4772,9 @@ msgstr "" msgid "Options Installed" msgstr "" -#: scheduler/cupsfilter.c:1456 scheduler/main.c:2077 systemv/cupsaddsmb.c:284 +#: 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:4663 ppdc/ppdc.cxx:437 +#: test/ippfind.c:2715 test/ipptool.c:4675 ppdc/ppdc.cxx:437 #: ppdc/ppdhtml.cxx:174 ppdc/ppdi.cxx:130 ppdc/ppdmerge.cxx:363 #: ppdc/ppdpo.cxx:254 msgid "Options:" @@ -5019,7 +5027,7 @@ msgid "Printers" msgstr "" #: filter/rastertoepson.c:1078 filter/rastertohp.c:806 -#: filter/rastertolabel.c:1230 +#: filter/rastertolabel.c:1235 #, c-format msgid "Printing page %d, %u%% complete." msgstr "" @@ -5032,7 +5040,7 @@ msgstr "" msgid "Quarto" msgstr "" -#: scheduler/ipp.c:1485 scheduler/ipp.c:10458 +#: scheduler/ipp.c:1485 scheduler/ipp.c:10456 msgid "Quota limit reached." msgstr "" @@ -5175,7 +5183,7 @@ msgid "Starting Banner" msgstr "" #: filter/rastertoepson.c:1054 filter/rastertohp.c:782 -#: filter/rastertolabel.c:1206 +#: filter/rastertolabel.c:1211 #, c-format msgid "Starting page %d." msgstr "" @@ -5192,8 +5200,8 @@ msgstr "" msgid "Stylus Photo Series" msgstr "" -#: scheduler/ipp.c:3564 scheduler/ipp.c:6483 scheduler/ipp.c:7182 -#: scheduler/ipp.c:8682 +#: 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 "" @@ -5247,8 +5255,8 @@ msgstr "" msgid "The \"%s\" attribute is required for print jobs." msgstr "" -#: scheduler/ipp.c:6198 scheduler/ipp.c:6276 scheduler/ipp.c:6292 -#: scheduler/ipp.c:6310 +#: scheduler/ipp.c:6196 scheduler/ipp.c:6274 scheduler/ipp.c:6290 +#: scheduler/ipp.c:6308 #, c-format msgid "The %s attribute cannot be provided with job-ids." msgstr "" @@ -5263,18 +5271,18 @@ msgstr "" msgid "The '%s' operation attribute cannot be supplied in a Create-Job request." msgstr "" -#: scheduler/ipp.c:6713 +#: scheduler/ipp.c:6711 #, c-format msgid "The PPD file \"%s\" could not be found." msgstr "" -#: scheduler/ipp.c:6700 +#: scheduler/ipp.c:6698 #, c-format msgid "The PPD file \"%s\" could not be opened: %s" msgstr "" #: filter/rastertoepson.c:1023 filter/rastertohp.c:753 -#: filter/rastertolabel.c:1170 +#: filter/rastertolabel.c:1175 msgid "The PPD file could not be opened." msgstr "" @@ -5302,7 +5310,7 @@ msgstr "" msgid "The notify-lease-duration attribute cannot be used with job subscriptions." msgstr "" -#: scheduler/ipp.c:2070 scheduler/ipp.c:5452 +#: scheduler/ipp.c:2070 scheduler/ipp.c:5450 #, c-format msgid "The notify-user-data value is too large (%d > 63 octets)." msgstr "" @@ -5379,13 +5387,13 @@ msgid "The printer name may only contain up to 127 printable characters and may msgstr "" #: scheduler/ipp.c:788 scheduler/ipp.c:1048 scheduler/ipp.c:3205 -#: scheduler/ipp.c:3384 scheduler/ipp.c:5117 scheduler/ipp.c:5286 -#: scheduler/ipp.c:5600 scheduler/ipp.c:6164 scheduler/ipp.c:6918 -#: scheduler/ipp.c:6974 scheduler/ipp.c:7288 scheduler/ipp.c:7554 -#: scheduler/ipp.c:7643 scheduler/ipp.c:7676 scheduler/ipp.c:7999 -#: scheduler/ipp.c:8392 scheduler/ipp.c:8474 scheduler/ipp.c:9638 -#: scheduler/ipp.c:10090 scheduler/ipp.c:10421 scheduler/ipp.c:10503 -#: scheduler/ipp.c:10876 +#: scheduler/ipp.c: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 "" @@ -5438,12 +5446,12 @@ msgstr "" msgid "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to enable it." msgstr "" -#: scheduler/ipp.c:6259 +#: scheduler/ipp.c:6257 #, c-format msgid "The which-jobs value \"%s\" is not supported." msgstr "" -#: scheduler/ipp.c:5530 +#: scheduler/ipp.c:5528 msgid "There are too many subscriptions." msgstr "" @@ -5657,7 +5665,7 @@ msgstr "" msgid "Unable to copy interface script - %s" msgstr "" -#: cups/util.c:569 cups/util.c:1631 +#: cups/util.c:569 cups/util.c:1639 msgid "Unable to create printer-uri" msgstr "" @@ -5665,7 +5673,7 @@ msgstr "" msgid "Unable to create server credentials." msgstr "" -#: cgi-bin/admin.c:1830 cgi-bin/admin.c:1842 scheduler/cupsfilter.c:1262 +#: cgi-bin/admin.c:1830 cgi-bin/admin.c:1842 scheduler/cupsfilter.c:1290 msgid "Unable to create temporary file" msgstr "" @@ -5730,7 +5738,7 @@ msgstr "" msgid "Unable to find server credentials." msgstr "" -#: backend/ipp.c:3426 +#: backend/ipp.c:3465 msgid "Unable to get backend exit status." msgstr "" @@ -5814,7 +5822,7 @@ msgstr "" msgid "Unable to open device file" msgstr "" -#: scheduler/ipp.c:5945 +#: scheduler/ipp.c:5943 #, c-format msgid "Unable to open document #%d in job #%d." msgstr "" @@ -5830,7 +5838,7 @@ msgid "Unable to open print file" msgstr "" #: filter/rastertoepson.c:983 filter/rastertohp.c:713 -#: filter/rastertolabel.c:1128 +#: filter/rastertolabel.c:1133 msgid "Unable to open raster file" msgstr "" @@ -5877,7 +5885,7 @@ msgstr "" msgid "Unable to set server default" msgstr "" -#: backend/ipp.c:3285 backend/ipp.c:3362 backend/ipp.c:3370 +#: backend/ipp.c:3324 backend/ipp.c:3401 backend/ipp.c:3409 msgid "Unable to start backend process." msgstr "" @@ -5949,12 +5957,12 @@ msgstr "" msgid "Unknown print mode: \"%s\"." msgstr "" -#: scheduler/ipp.c:10292 +#: scheduler/ipp.c:10290 #, c-format msgid "Unknown printer-error-policy \"%s\"." msgstr "" -#: scheduler/ipp.c:10275 +#: scheduler/ipp.c:10273 #, c-format msgid "Unknown printer-op-policy \"%s\"." msgstr "" @@ -5980,17 +5988,17 @@ msgstr "" msgid "Unknown version option value: \"%s\"." msgstr "" -#: scheduler/ipp.c:10747 +#: scheduler/ipp.c:10745 #, c-format msgid "Unsupported 'compression' value \"%s\"." msgstr "" -#: scheduler/ipp.c:10777 +#: scheduler/ipp.c:10775 #, c-format msgid "Unsupported 'document-format' value \"%s\"." msgstr "" -#: scheduler/ipp.c:10852 +#: scheduler/ipp.c:10850 msgid "Unsupported 'job-name' value." msgstr "" @@ -5999,17 +6007,17 @@ msgstr "" msgid "Unsupported character set \"%s\"." msgstr "" -#: scheduler/ipp.c:7965 scheduler/ipp.c:9199 +#: scheduler/ipp.c:7963 scheduler/ipp.c:9197 #, c-format msgid "Unsupported compression \"%s\"." msgstr "" -#: scheduler/ipp.c:8099 scheduler/ipp.c:9349 +#: scheduler/ipp.c:8097 scheduler/ipp.c:9347 #, c-format msgid "Unsupported document-format \"%s\"." msgstr "" -#: scheduler/ipp.c:9332 +#: scheduler/ipp.c:9330 #, c-format msgid "Unsupported document-format \"%s/%s\"." msgstr "" @@ -6082,12 +6090,12 @@ msgstr "" msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]" msgstr "" -#: scheduler/main.c:2076 +#: scheduler/main.c:2157 msgid "Usage: cupsd [options]" msgstr "" -#: scheduler/cupsfilter.c:1455 -msgid "Usage: cupsfilter [ options ] filename" +#: scheduler/cupsfilter.c:1481 +msgid "Usage: cupsfilter [ options ] [ -- ] filename" msgstr "" #: systemv/cupstestdsc.c:425 @@ -6114,7 +6122,7 @@ msgid "" " ippfind --version" msgstr "" -#: test/ipptool.c:4661 +#: test/ipptool.c:4673 msgid "Usage: ipptool [options] URI filename [ ... filenameN ]" msgstr "" @@ -6234,11 +6242,11 @@ msgstr "" msgid "completed" msgstr "" -#: scheduler/ipp.c:5817 +#: scheduler/ipp.c:5815 msgid "cups-deviced failed to execute." msgstr "" -#: scheduler/ipp.c:6636 scheduler/ipp.c:6885 +#: scheduler/ipp.c:6634 scheduler/ipp.c:6883 msgid "cups-driverd failed to execute." msgstr "" @@ -6266,55 +6274,55 @@ msgstr "" msgid "cupsctl: Unknown option \"-%c\"" msgstr "" -#: scheduler/main.c:162 +#: scheduler/main.c:172 msgid "cupsd: Expected config filename after \"-c\" option." msgstr "" -#: scheduler/main.c:249 +#: scheduler/main.c:259 msgid "cupsd: Expected cups-files.conf filename after \"-s\" option." msgstr "" -#: scheduler/main.c:260 +#: 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:193 scheduler/main.c:200 +#: scheduler/main.c:203 scheduler/main.c:210 msgid "cupsd: Unable to get current directory." msgstr "" -#: scheduler/main.c:307 scheduler/main.c:316 +#: scheduler/main.c:317 scheduler/main.c:326 msgid "cupsd: Unable to get path to cups-files.conf file." msgstr "" -#: scheduler/main.c:289 +#: scheduler/main.c:299 #, c-format msgid "cupsd: Unknown argument \"%s\" - aborting." msgstr "" -#: scheduler/main.c:282 +#: scheduler/main.c:292 #, c-format msgid "cupsd: Unknown option \"%c\" - aborting." msgstr "" -#: scheduler/main.c:227 -msgid "cupsd: launchd(8) support not compiled in, running in normal mode." -msgstr "" - -#: scheduler/cupsfilter.c:1235 +#: scheduler/cupsfilter.c:1263 #, c-format msgid "cupsfilter: Invalid document number %d." msgstr "" -#: scheduler/cupsfilter.c:1229 +#: scheduler/cupsfilter.c:1257 #, c-format msgid "cupsfilter: Invalid job ID %d." msgstr "" -#: scheduler/cupsfilter.c:340 +#: scheduler/cupsfilter.c:348 msgid "cupsfilter: Only one filename can be specified." msgstr "" -#: scheduler/cupsfilter.c:1277 +#: scheduler/cupsfilter.c:1305 #, c-format msgid "cupsfilter: Unable to get job file - %s" msgstr "" @@ -6456,49 +6464,49 @@ msgstr "" msgid "ippfind: Unknown variable \"{%s}\"." msgstr "" -#: test/ipptool.c:355 test/ipptool.c:504 test/ipptool.c:528 +#: 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:585 +#: test/ipptool.c:587 #, c-format msgid "ipptool: Bad URI - %s." msgstr "" -#: test/ipptool.c:497 +#: test/ipptool.c:499 msgid "ipptool: Invalid seconds for \"-i\"." msgstr "" -#: test/ipptool.c:566 +#: test/ipptool.c:568 msgid "ipptool: May only specify a single URI." msgstr "" -#: test/ipptool.c:520 +#: test/ipptool.c:522 msgid "ipptool: Missing count for \"-n\"." msgstr "" -#: test/ipptool.c:390 +#: test/ipptool.c:392 msgid "ipptool: Missing filename for \"-f\"." msgstr "" -#: test/ipptool.c:371 +#: test/ipptool.c:373 msgid "ipptool: Missing name=value for \"-d\"." msgstr "" -#: test/ipptool.c:487 +#: test/ipptool.c:489 msgid "ipptool: Missing seconds for \"-i\"." msgstr "" -#: test/ipptool.c:611 +#: test/ipptool.c:613 msgid "ipptool: URI required before test file." msgstr "" -#: test/ipptool.c:547 +#: test/ipptool.c:549 #, c-format msgid "ipptool: Unknown option \"-%c\"." msgstr "" -#: scheduler/ipp.c:7632 +#: scheduler/ipp.c:7630 msgid "job-printer-uri attribute missing." msgstr "" @@ -6804,16 +6812,16 @@ msgstr "" msgid "no system default destination" msgstr "" -#: scheduler/ipp.c:5501 +#: scheduler/ipp.c:5499 msgid "notify-events not specified." msgstr "" -#: scheduler/ipp.c:2024 scheduler/ipp.c:5406 +#: scheduler/ipp.c:2024 scheduler/ipp.c:5404 #, c-format msgid "notify-recipient-uri URI \"%s\" is already used." msgstr "" -#: scheduler/ipp.c:2014 scheduler/ipp.c:5396 +#: scheduler/ipp.c:2014 scheduler/ipp.c:5394 #, c-format msgid "notify-recipient-uri URI \"%s\" uses unknown scheme." msgstr "" diff --git a/locale/cups.strings b/locale/cups.strings index 39b3452c7..359445a70 100644 --- a/locale/cups.strings +++ b/locale/cups.strings @@ -192,6 +192,7 @@ " --help Show this help." = " --help Show this help."; " --host regex Match hostname to regular expression." = " --host regex Match hostname to regular expression."; " --lf End lines with LF (UNIX/Linux/OS X)." = " --lf End lines with LF (UNIX/Linux/OS X)."; +" --list-filters List filters that will be used." = " --list-filters List filters that will be used."; " --local True if service is local." = " --local True if service is local."; " --ls List attributes." = " --ls List attributes."; " --name regex Match service name to regular expression." = " --name regex Match service name to regular expression."; @@ -233,6 +234,7 @@ " -a Browse for all services." = " -a Browse for all services."; " -a Export all printers." = " -a Export all printers."; " -c catalog.po Load the specified message catalog." = " -c catalog.po Load the specified message catalog."; +" -c cups-files.conf Set cups-files.conf file to use." = " -c cups-files.conf Set cups-files.conf file to use."; " -c cupsd.conf Set cupsd.conf file to use." = " -c cupsd.conf Set cupsd.conf file to use."; " -d domain Browse/resolve in specified domain." = " -d domain Browse/resolve in specified domain."; " -d name=value Set named variable to value." = " -d name=value Set named variable to value."; @@ -249,7 +251,7 @@ " -i seconds Repeat the last file with the given time interval." = " -i seconds Repeat the last file with the given time interval."; " -j job-id[,N] Filter file N from the specified job (default is file 1)." = " -j job-id[,N] Filter file N from the specified job (default is file 1)."; " -l List attributes." = " -l List attributes."; -" -l Run cupsd from launchd(8)." = " -l Run cupsd from launchd(8)."; +" -l Run cupsd on demand." = " -l Run cupsd on demand."; " -l lang[,lang,...] Specify the output language(s) (locale)." = " -l lang[,lang,...] Specify the output language(s) (locale)."; " -m Use the ModelName value as the filename." = " -m Use the ModelName value as the filename."; " -m mime/type Set output MIME type (otherwise application/pdf)." = " -m mime/type Set output MIME type (otherwise application/pdf)."; @@ -1358,7 +1360,7 @@ "Usage: cupsaddsmb [options] printer1 ... printerN" = "Usage: cupsaddsmb [options] printer1 ... printerN"; "Usage: cupsctl [options] [param=value ... paramN=valueN]" = "Usage: cupsctl [options] [param=value ... paramN=valueN]"; "Usage: cupsd [options]" = "Usage: cupsd [options]"; -"Usage: cupsfilter [ options ] filename" = "Usage: cupsfilter [ options ] filename"; +"Usage: cupsfilter [ options ] [ -- ] filename" = "Usage: cupsfilter [ options ] [ -- ] filename"; "Usage: cupstestdsc [options] filename.ps [... filename.ps]" = "Usage: cupstestdsc [options] filename.ps [... filename.ps]"; "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]" = "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]"; "Usage: ippdiscover [options] -a\n ippdiscover [options] \"service name\"\n\nOptions:" = "Usage: ippdiscover [options] -a\n ippdiscover [options] \"service name\"\n\nOptions:"; @@ -1400,12 +1402,12 @@ "cupsctl: Unknown option \"-%c\"" = "cupsctl: Unknown option \"-%c\""; "cupsd: Expected config filename after \"-c\" option." = "cupsd: Expected config filename after \"-c\" option."; "cupsd: Expected cups-files.conf filename after \"-s\" option." = "cupsd: Expected cups-files.conf filename after \"-s\" option."; +"cupsd: On-demand support not compiled in, running in normal mode." = "cupsd: On-demand support not compiled in, running in normal mode."; "cupsd: Relative cups-files.conf filename not allowed." = "cupsd: Relative cups-files.conf filename not allowed."; "cupsd: Unable to get current directory." = "cupsd: Unable to get current directory."; "cupsd: Unable to get path to cups-files.conf file." = "cupsd: Unable to get path to cups-files.conf file."; "cupsd: Unknown argument \"%s\" - aborting." = "cupsd: Unknown argument \"%s\" - aborting."; "cupsd: Unknown option \"%c\" - aborting." = "cupsd: Unknown option \"%c\" - aborting."; -"cupsd: launchd(8) support not compiled in, running in normal mode." = "cupsd: launchd(8) support not compiled in, running in normal mode."; "cupsfilter: Invalid document number %d." = "cupsfilter: Invalid document number %d."; "cupsfilter: Invalid job ID %d." = "cupsfilter: Invalid job ID %d."; "cupsfilter: Only one filename can be specified." = "cupsfilter: Only one filename can be specified."; diff --git a/locale/cups_ca.po b/locale/cups_ca.po index 49f3ab53b..1dd442bd4 100644 --- a/locale/cups_ca.po +++ b/locale/cups_ca.po @@ -32,7 +32,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.4.6\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2014-03-17 07:47-0400\n" +"POT-Creation-Date: 2014-03-28 10:47-0400\n" "PO-Revision-Date: 2012-09-29 11:21+0200\n" "Last-Translator: Àngel Mompó \n" "Language-Team: Catalan \n" @@ -982,6 +982,9 @@ msgstr "" msgid " --lf End lines with LF (UNIX/Linux/OS X)." msgstr " --lf Final de línia amb LF (UNIX/Linux/OS X)." +msgid " --list-filters List filters that will be used." +msgstr "" + msgid " --local True if service is local." msgstr "" @@ -1118,6 +1121,9 @@ msgstr " -a Exporta totes les impressores." msgid " -c catalog.po Load the specified message catalog." msgstr " -c catàleg.po Carrega el catàleg de missatges indicat." +msgid " -c cups-files.conf Set cups-files.conf file to use." +msgstr "" + msgid " -c cupsd.conf Set cupsd.conf file to use." msgstr "" " -c cupsd.conf Estableix el fitxer cupsd.conf que cal fer servir." @@ -1177,8 +1183,8 @@ msgstr "" msgid " -l List attributes." msgstr "" -msgid " -l Run cupsd from launchd(8)." -msgstr " -l Executa cupsd des de launchd(8)." +msgid " -l Run cupsd on demand." +msgstr "" msgid " -l lang[,lang,...] Specify the output language(s) (locale)." msgstr "" @@ -4923,8 +4929,8 @@ msgstr "Sintaxi: cupsctl [opcions] [param=valor ... paramN=valorN]" msgid "Usage: cupsd [options]" msgstr "Sintaxi: cupsd [opcions]" -msgid "Usage: cupsfilter [ options ] filename" -msgstr "Sintaxi: cupsfilter [ opcions ] nomfitxer" +msgid "Usage: cupsfilter [ options ] [ -- ] filename" +msgstr "" msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]" msgstr "Sintaxi: cupstestdsc [opcions] nomfitxer.ps [...nomfitxer.ps]" @@ -5092,6 +5098,9 @@ msgstr "" msgid "cupsd: Expected cups-files.conf filename after \"-s\" option." msgstr "" +msgid "cupsd: On-demand support not compiled in, running in normal mode." +msgstr "" + msgid "cupsd: Relative cups-files.conf filename not allowed." msgstr "" @@ -5109,11 +5118,6 @@ msgstr "cupsd: l'argument «%s» és desconegut - s'interromp." msgid "cupsd: Unknown option \"%c\" - aborting." msgstr "cupsd: l'opció «%c» és desconeguda - s'interromp." -msgid "cupsd: launchd(8) support not compiled in, running in normal mode." -msgstr "" -"cupsd: no s'ha compilat amb compatibilitat per launchd(8). S'executa en mode " -"normal." - #, c-format msgid "cupsfilter: Invalid document number %d." msgstr "cupsfilter: el document número %d no és vàlid." @@ -6070,6 +6074,9 @@ msgstr "La variable-bindings fa servir una longitud indefinida" #~ " -j tipus/mime Estableix el tipus MIME de sortida " #~ "(application/pdf si no s'especifica)." +#~ msgid " -l Run cupsd from launchd(8)." +#~ msgstr " -l Executa cupsd des de launchd(8)." + #~ msgid "" #~ " -o filename Set file to be generated (otherwise stdout)." #~ msgstr "" @@ -6255,11 +6262,19 @@ msgstr "La variable-bindings fa servir una longitud indefinida" #~ msgid "Usage: convert [ options ]" #~ msgstr "Sintaxi: convert [ opcions ]" +#~ msgid "Usage: cupsfilter [ options ] filename" +#~ msgstr "Sintaxi: cupsfilter [ opcions ] nomfitxer" + #~ msgid "convert: Use the -f option to specify a file to convert." #~ msgstr "" #~ "convert: feu servir l'opció -f per especificar el fitxer que voleu " #~ "convertir." +#~ msgid "cupsd: launchd(8) support not compiled in, running in normal mode." +#~ msgstr "" +#~ "cupsd: no s'ha compilat amb compatibilitat per launchd(8). S'executa en " +#~ "mode normal." + #~ msgid "ipptool: \"-i\" is incompatible with \"-X\"." #~ msgstr "ipptool: «-i» no és compatible amb «-X»." diff --git a/locale/cups_cs.po b/locale/cups_cs.po index 0397682b8..78f376ff7 100644 --- a/locale/cups_cs.po +++ b/locale/cups_cs.po @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.6\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2014-03-17 07:47-0400\n" +"POT-Creation-Date: 2014-03-28 10:47-0400\n" "PO-Revision-Date: 2012-09-14 10:26+0100\n" "Last-Translator: Jan Bartos \n" "Language-Team: Czech\n" @@ -835,6 +835,9 @@ msgstr "" msgid " --lf End lines with LF (UNIX/Linux/OS X)." msgstr "" +msgid " --list-filters List filters that will be used." +msgstr "" + msgid " --local True if service is local." msgstr "" @@ -961,6 +964,9 @@ msgstr "" msgid " -c catalog.po Load the specified message catalog." msgstr "" +msgid " -c cups-files.conf Set cups-files.conf file to use." +msgstr "" + msgid " -c cupsd.conf Set cupsd.conf file to use." msgstr "" @@ -1012,7 +1018,7 @@ msgstr "" msgid " -l List attributes." msgstr "" -msgid " -l Run cupsd from launchd(8)." +msgid " -l Run cupsd on demand." msgstr "" msgid " -l lang[,lang,...] Specify the output language(s) (locale)." @@ -4661,7 +4667,7 @@ msgstr "" msgid "Usage: cupsd [options]" msgstr "" -msgid "Usage: cupsfilter [ options ] filename" +msgid "Usage: cupsfilter [ options ] [ -- ] filename" msgstr "" msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]" @@ -4816,6 +4822,9 @@ msgstr "" msgid "cupsd: Expected cups-files.conf filename after \"-s\" option." msgstr "" +msgid "cupsd: On-demand support not compiled in, running in normal mode." +msgstr "" + msgid "cupsd: Relative cups-files.conf filename not allowed." msgstr "" @@ -4833,9 +4842,6 @@ msgstr "" msgid "cupsd: Unknown option \"%c\" - aborting." msgstr "" -msgid "cupsd: launchd(8) support not compiled in, running in normal mode." -msgstr "" - #, c-format msgid "cupsfilter: Invalid document number %d." msgstr "" diff --git a/locale/cups_es.po b/locale/cups_es.po index 8feb25ab5..8883e172d 100644 --- a/locale/cups_es.po +++ b/locale/cups_es.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.6\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2014-03-17 07:47-0400\n" +"POT-Creation-Date: 2014-03-28 10:47-0400\n" "PO-Revision-Date: 2012-07-01 20:21+0100\n" "Last-Translator: Juan Pablo González Riopedre \n" "Language-Team: Spanish\n" @@ -974,6 +974,9 @@ msgstr "" msgid " --lf End lines with LF (UNIX/Linux/OS X)." msgstr " --lf Finalizar líneas con LF (UNIX/Linux/OS X)." +msgid " --list-filters List filters that will be used." +msgstr "" + msgid " --local True if service is local." msgstr "" @@ -1110,6 +1113,9 @@ msgstr " -a Exporta todas las impresoras." msgid " -c catalog.po Load the specified message catalog." msgstr " -c catálogo.po Carga el catálogo de mensajes especificado." +msgid " -c cups-files.conf Set cups-files.conf file to use." +msgstr "" + msgid " -c cupsd.conf Set cupsd.conf file to use." msgstr " -c cupsd.conf Establece el archivo cupsd.conf a usar." @@ -1168,8 +1174,8 @@ msgstr "" msgid " -l List attributes." msgstr "" -msgid " -l Run cupsd from launchd(8)." -msgstr " -l Ejecuta cupsd desde launchd(8)." +msgid " -l Run cupsd on demand." +msgstr "" msgid " -l lang[,lang,...] Specify the output language(s) (locale)." msgstr "" @@ -4915,8 +4921,8 @@ msgstr "Uso: cupsctl [opciones] [param=valor ... paramN=valorN]" msgid "Usage: cupsd [options]" msgstr "Uso: cupsd [opciones)" -msgid "Usage: cupsfilter [ options ] filename" -msgstr "Uso: cupsfilter ( opciones ) archivo" +msgid "Usage: cupsfilter [ options ] [ -- ] filename" +msgstr "" msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]" msgstr "Uso: cupstestdsc [opciones] nombre_archivo.ps [... nombre_archivo.ps]" @@ -5090,6 +5096,9 @@ msgstr "" msgid "cupsd: Expected cups-files.conf filename after \"-s\" option." msgstr "" +msgid "cupsd: On-demand support not compiled in, running in normal mode." +msgstr "" + msgid "cupsd: Relative cups-files.conf filename not allowed." msgstr "" @@ -5107,11 +5116,6 @@ msgstr "cupsd: Argumento \"%s\" desconocido - cancelando." msgid "cupsd: Unknown option \"%c\" - aborting." msgstr "cupsd: Opción \"%c\" desconocida - cancelando." -msgid "cupsd: launchd(8) support not compiled in, running in normal mode." -msgstr "" -"cupsd: el uso de launchd(8) no ha sido compilado, ejecutándose en modo " -"normal." - #, c-format msgid "cupsfilter: Invalid document number %d." msgstr "cupsfilter: Número de documento %d no válido." @@ -6007,6 +6011,9 @@ msgstr "sin título" msgid "variable-bindings uses indefinite length" msgstr "variable-bindings usa una longitud indefinida" +#~ msgid " -l Run cupsd from launchd(8)." +#~ msgstr " -l Ejecuta cupsd desde launchd(8)." + #~ msgid "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes" #~ msgstr "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes" @@ -6090,6 +6097,14 @@ msgstr "variable-bindings usa una longitud indefinida" #~ msgid "Unable to open compressed print file" #~ msgstr "No se ha podido abrir el archivo de impresión comprimido" +#~ msgid "Usage: cupsfilter [ options ] filename" +#~ msgstr "Uso: cupsfilter ( opciones ) archivo" + +#~ msgid "cupsd: launchd(8) support not compiled in, running in normal mode." +#~ msgstr "" +#~ "cupsd: el uso de launchd(8) no ha sido compilado, ejecutándose en modo " +#~ "normal." + #~ msgid "ipptool: Bad version %s for \"-V\"." #~ msgstr "ipptool: Versión %s para \"-V\" incorrecta." diff --git a/locale/cups_fr.po b/locale/cups_fr.po index dfee2ba05..1859b00b0 100644 --- a/locale/cups_fr.po +++ b/locale/cups_fr.po @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.6\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2014-03-17 07:47-0400\n" +"POT-Creation-Date: 2014-03-28 10:47-0400\n" "PO-Revision-Date: 2012-12-12 11:12+0100\n" "Last-Translator: denis meramdjougoma \n" "Language-Team: LANGUAGE \n" @@ -835,6 +835,9 @@ msgstr "" msgid " --lf End lines with LF (UNIX/Linux/OS X)." msgstr "" +msgid " --list-filters List filters that will be used." +msgstr "" + msgid " --local True if service is local." msgstr "" @@ -961,6 +964,9 @@ msgstr "" msgid " -c catalog.po Load the specified message catalog." msgstr "" +msgid " -c cups-files.conf Set cups-files.conf file to use." +msgstr "" + msgid " -c cupsd.conf Set cupsd.conf file to use." msgstr "" @@ -1012,7 +1018,7 @@ msgstr "" msgid " -l List attributes." msgstr "" -msgid " -l Run cupsd from launchd(8)." +msgid " -l Run cupsd on demand." msgstr "" msgid " -l lang[,lang,...] Specify the output language(s) (locale)." @@ -4663,7 +4669,7 @@ msgstr "" msgid "Usage: cupsd [options]" msgstr "" -msgid "Usage: cupsfilter [ options ] filename" +msgid "Usage: cupsfilter [ options ] [ -- ] filename" msgstr "" msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]" @@ -4818,6 +4824,9 @@ msgstr "" msgid "cupsd: Expected cups-files.conf filename after \"-s\" option." msgstr "" +msgid "cupsd: On-demand support not compiled in, running in normal mode." +msgstr "" + msgid "cupsd: Relative cups-files.conf filename not allowed." msgstr "" @@ -4835,9 +4844,6 @@ msgstr "" msgid "cupsd: Unknown option \"%c\" - aborting." msgstr "" -msgid "cupsd: launchd(8) support not compiled in, running in normal mode." -msgstr "" - #, c-format msgid "cupsfilter: Invalid document number %d." msgstr "" diff --git a/locale/cups_it.po b/locale/cups_it.po index 34bcb2567..8fd1e0f5f 100644 --- a/locale/cups_it.po +++ b/locale/cups_it.po @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.6\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2014-03-17 07:47-0400\n" +"POT-Creation-Date: 2014-03-28 10:47-0400\n" "PO-Revision-Date: 2013-07-14 12:00+0200\n" "Last-Translator: Giovanni Scafora \n" "Language-Team: Arch Linux Italian Team \n" @@ -985,6 +985,9 @@ msgstr "" msgid " --lf End lines with LF (UNIX/Linux/OS X)." msgstr " --lf Termina le righe con LF (UNIX/Linux/OS X)." +msgid " --list-filters List filters that will be used." +msgstr "" + msgid " --local True if service is local." msgstr " --local Vero se il servizio è locale." @@ -1135,6 +1138,9 @@ msgid " -c catalog.po Load the specified message catalog." msgstr "" " -c catalog.po Carica il catalogo del messaggio specificato." +msgid " -c cups-files.conf Set cups-files.conf file to use." +msgstr "" + msgid " -c cupsd.conf Set cupsd.conf file to use." msgstr " -c cupsd.conf Imposta il file cupsd.conf da utilizzare." @@ -1196,8 +1202,8 @@ msgstr "" msgid " -l List attributes." msgstr " -l Elenca gli attributi." -msgid " -l Run cupsd from launchd(8)." -msgstr " -l Avvia cupsd da launchd(8)." +msgid " -l Run cupsd on demand." +msgstr "" msgid " -l lang[,lang,...] Specify the output language(s) (locale)." msgstr " -l lang[,lang,...] Specifica la lingua(e) (locale) di output." @@ -4995,8 +5001,8 @@ msgstr "Uso: cupsctl [opzioni] [param=valore ... paramN=valoreN]" msgid "Usage: cupsd [options]" msgstr "Uso: cupsd [opzioni]" -msgid "Usage: cupsfilter [ options ] filename" -msgstr "Uso: cupsfilter [ opzioni ] file" +msgid "Usage: cupsfilter [ options ] [ -- ] filename" +msgstr "" msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]" msgstr "Uso: cupstestdsc [opzioni] file.ps [... file.ps]" @@ -5169,6 +5175,9 @@ msgstr "cupsd: dopo l'opzione \"-c\" è previsto il file di configurazione." msgid "cupsd: Expected cups-files.conf filename after \"-s\" option." msgstr "cupsd: dopo l'opzione \"-s\" è previsto il file cups-files.conf." +msgid "cupsd: On-demand support not compiled in, running in normal mode." +msgstr "" + msgid "cupsd: Relative cups-files.conf filename not allowed." msgstr "cupsd: non è consentito il file relativo cups-files.conf." @@ -5186,10 +5195,6 @@ msgstr "cupsd: argomento sconosciuto \"%s\" - operazione interrotta." msgid "cupsd: Unknown option \"%c\" - aborting." msgstr "cupsd: opzione sconosciuta \"%c\" - operazione interrotta." -msgid "cupsd: launchd(8) support not compiled in, running in normal mode." -msgstr "" -"cupsd: launchd(8) non supporta i compilati, quando è in modalità normale." - #, c-format msgid "cupsfilter: Invalid document number %d." msgstr "cupsfilter: il numero del documento non è valido %d." @@ -6083,6 +6088,9 @@ msgstr "senza titolo" msgid "variable-bindings uses indefinite length" msgstr "variable-bindings utilizza una lunghezza indefinita" +#~ msgid " -l Run cupsd from launchd(8)." +#~ msgstr " -l Avvia cupsd da launchd(8)." + #~ msgid "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes" #~ msgstr "%-6s %-10.10s %-4d %-10d %-27.27s %.0f byte" @@ -6138,3 +6146,10 @@ msgstr "variable-bindings utilizza una lunghezza indefinita" #~ msgid "There is a paper jam." #~ msgstr "Vi è un inceppamento della carta." + +#~ msgid "Usage: cupsfilter [ options ] filename" +#~ msgstr "Uso: cupsfilter [ opzioni ] file" + +#~ msgid "cupsd: launchd(8) support not compiled in, running in normal mode." +#~ msgstr "" +#~ "cupsd: launchd(8) non supporta i compilati, quando è in modalità normale." diff --git a/locale/cups_ja.po b/locale/cups_ja.po index c398c9a71..f0825e47c 100644 --- a/locale/cups_ja.po +++ b/locale/cups_ja.po @@ -28,7 +28,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.7\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2014-03-17 07:47-0400\n" +"POT-Creation-Date: 2014-03-28 10:47-0400\n" "PO-Revision-Date: 2013-08-19 11:51+0900\n" "Last-Translator: OPFC TRANSCUPS \n" "Language-Team: OPFC TRANSCUPS \n" @@ -981,6 +981,9 @@ msgstr " --host <正規表現> ホスト名が正規表現にマッチす msgid " --lf End lines with LF (UNIX/Linux/OS X)." msgstr " --lf 行末を LF とする (UNIX/Linux/OS X)。" +msgid " --list-filters List filters that will be used." +msgstr "" + msgid " --local True if service is local." msgstr " --local サービスがローカルなら真。" @@ -1119,6 +1122,9 @@ msgstr " -a すべてのプリンターをエクスポー msgid " -c catalog.po Load the specified message catalog." msgstr " -c catalog.po 指定したメッセージカタログをロードする。" +msgid " -c cups-files.conf Set cups-files.conf file to use." +msgstr "" + msgid " -c cupsd.conf Set cupsd.conf file to use." msgstr " -c cupsd.conf 使用する cupsd.conf ファイルを指定する。" @@ -1177,8 +1183,8 @@ msgstr "" msgid " -l List attributes." msgstr " -l 属性の一覧を表示する。" -msgid " -l Run cupsd from launchd(8)." -msgstr " -l launchd(8) から cupsd を実行する。" +msgid " -l Run cupsd on demand." +msgstr "" msgid " -l lang[,lang,...] Specify the output language(s) (locale)." msgstr " -l lang[,lang,...] 出力言語を指定する。(複数可能)" @@ -4931,8 +4937,8 @@ msgstr "Usage: cupsctl [オプション] [パラメータ=値 ... パラメー msgid "Usage: cupsd [options]" msgstr "使い方: cupsd [オプション]" -msgid "Usage: cupsfilter [ options ] filename" -msgstr "使い方: cupsfilter [オプション] ファイル名" +msgid "Usage: cupsfilter [ options ] [ -- ] filename" +msgstr "" msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]" msgstr "使い方: cupstestdsc [オプション] filename.ps [... filename.ps]" @@ -5109,6 +5115,9 @@ msgid "cupsd: Expected cups-files.conf filename after \"-s\" option." msgstr "" "cupsd: cups-files.conf ファイル名は \"-s\" オプションの後ろにあるべきです。" +msgid "cupsd: On-demand support not compiled in, running in normal mode." +msgstr "" + msgid "cupsd: Relative cups-files.conf filename not allowed." msgstr "cupsd: 相対パスでの cups-files.conf の指定はできません。" @@ -5126,11 +5135,6 @@ msgstr "cupsd: \"%s\" は未知の引数です - 停止します。" msgid "cupsd: Unknown option \"%c\" - aborting." msgstr "cupsd: \"%c\" は未知のオプションです - 停止します。" -msgid "cupsd: launchd(8) support not compiled in, running in normal mode." -msgstr "" -"cupsd: launchd(8) サポートがコンパイルされていないので、通常モードで動作しま" -"す。" - #, c-format msgid "cupsfilter: Invalid document number %d." msgstr "cupsfilter: 不正な文書番号 %d です。" @@ -6057,6 +6061,9 @@ msgstr "タイトルなし" msgid "variable-bindings uses indefinite length" msgstr "variable-bindings の長さが不定" +#~ msgid " -l Run cupsd from launchd(8)." +#~ msgstr " -l launchd(8) から cupsd を実行する。" + #~ msgid "" #~ "\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 2911 4.1.6 節)." #~ msgstr "" @@ -6144,6 +6151,14 @@ msgstr "variable-bindings の長さが不定" #~ msgid "Unable to open compressed print file" #~ msgstr "圧縮プリントファイルを開けません" +#~ msgid "Usage: cupsfilter [ options ] filename" +#~ msgstr "使い方: cupsfilter [オプション] ファイル名" + +#~ msgid "cupsd: launchd(8) support not compiled in, running in normal mode." +#~ msgstr "" +#~ "cupsd: launchd(8) サポートがコンパイルされていないので、通常モードで動作し" +#~ "ます。" + #~ msgid "ipptool: Bad version %s for \"-V\"." #~ msgstr "ipptool: \"-V\" オプションに不正なバージョン %s が指定されました。" diff --git a/locale/cups_ru.po b/locale/cups_ru.po index 75e17b928..e40307211 100644 --- a/locale/cups_ru.po +++ b/locale/cups_ru.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.4\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2014-03-17 07:47-0400\n" +"POT-Creation-Date: 2014-03-28 10:47-0400\n" "PO-Revision-Date: 2009-02-16 12:00-0800\n" "Last-Translator: Apple Inc.\n" "Language-Team: Apple Inc.\n" @@ -808,6 +808,9 @@ msgstr "" msgid " --lf End lines with LF (UNIX/Linux/OS X)." msgstr "" +msgid " --list-filters List filters that will be used." +msgstr "" + msgid " --local True if service is local." msgstr "" @@ -934,6 +937,9 @@ msgstr "" msgid " -c catalog.po Load the specified message catalog." msgstr "" +msgid " -c cups-files.conf Set cups-files.conf file to use." +msgstr "" + msgid " -c cupsd.conf Set cupsd.conf file to use." msgstr "" @@ -985,7 +991,7 @@ msgstr "" msgid " -l List attributes." msgstr "" -msgid " -l Run cupsd from launchd(8)." +msgid " -l Run cupsd on demand." msgstr "" msgid " -l lang[,lang,...] Specify the output language(s) (locale)." @@ -4635,7 +4641,7 @@ msgstr "" msgid "Usage: cupsd [options]" msgstr "" -msgid "Usage: cupsfilter [ options ] filename" +msgid "Usage: cupsfilter [ options ] [ -- ] filename" msgstr "" msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]" @@ -4790,6 +4796,9 @@ msgstr "" msgid "cupsd: Expected cups-files.conf filename after \"-s\" option." msgstr "" +msgid "cupsd: On-demand support not compiled in, running in normal mode." +msgstr "" + msgid "cupsd: Relative cups-files.conf filename not allowed." msgstr "" @@ -4807,9 +4816,6 @@ msgstr "" msgid "cupsd: Unknown option \"%c\" - aborting." msgstr "" -msgid "cupsd: launchd(8) support not compiled in, running in normal mode." -msgstr "" - #, c-format msgid "cupsfilter: Invalid document number %d." msgstr "" diff --git a/man/cupsfilter.man b/man/cupsfilter.man index bfc532e35..03bc4a67b 100644 --- a/man/cupsfilter.man +++ b/man/cupsfilter.man @@ -1,22 +1,22 @@ .\" .\" "$Id$" .\" -.\" cupsfilter man page for CUPS. +.\" cupsfilter man page for CUPS. .\" -.\" Copyright 2007-2013 by Apple Inc. +.\" Copyright 2007-2014 by Apple Inc. .\" -.\" 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/". .\" -.TH cupsfilter 8 "CUPS" "20 June 2012" "Apple Inc." +.TH cupsfilter 8 "CUPS" "28 March 2014" "Apple Inc." .SH NAME cupsfilter \- convert a file to another format using cups filters .SH SYNOPSIS .B cupsfilter -[ -D ] [ -U +[ --list-filters] [ -D ] [ -U .I user ] [ -c .I config-file @@ -39,71 +39,77 @@ cupsfilter \- convert a file to another format using cups filters ] [ -u ] .I filename .SH DESCRIPTION -\fIcupsfilter\fR is a front-end to the CUPS filter subsystem which allows you -to convert a file to a specific format, just as if you had printed the file -through CUPS. By default, \fIcupsfilter\fR generates a PDF file. +.B cupsfilter +is a front-end to the CUPS filter subsystem which allows you to convert a file to a specific format, just as if you had printed the file through CUPS. By default, +.B cupsfilter +generates a PDF file. The converted file is sent to the standard output. .SH OPTIONS .TP 5 +--list-filters +Do not actually run the filters, just print the filters used to stdout. +.TP 5 -D -.br Delete the input file after conversion. .TP 5 -U user -.br Specifies the username passed to the filters. The default is the name of the current user. .TP 5 -c config-file -.br -Uses the named cupsd.conf configuration file. +Uses the named cups-files.conf configuration file. .TP 5 -d printer Uses information from the named printer. .TP 5 -e -.br Use every filter from the PPD file. .TP 5 -i mime/type -.br -Specifies the source file type. The default file type is guessed using the -filename and contents of the file. +Specifies the source file type. The default file type is guessed using the filename and contents of the file. .TP 5 -j job-id[,N] -.br -Converts document N from the specified job. If N is omitted, document 1 is -converted. +Converts document N from the specified job. If N is omitted, document 1 is converted. .TP 5 -m mime/type -.br -Specifies the destination file type. The default file type is application/pdf. -Use printer/foo to convert to the printer format defined by the filters in the -PPD file. +Specifies the destination file type. The default file type is application/pdf. Use printer/foo to convert to the printer format defined by the filters in the PPD file. .TP 5 -n copies -.br Specifies the number of copies to generate. .TP 5 -o name=value -.br Specifies options to pass to the CUPS filters. .TP 5 -p filename.ppd -.br Specifies the PPD file to use. .TP 5 -t title -.br Specifies the document title. .TP 5 -u -.br Delete the PPD file after conversion. +.SH EXIT STATUS +.B cupsfilter +returns a non-zero exit status on any error. +.SH ENVIRONMENT +All of the standard +.BR cups (1) +environment variables affect the operation of +.BR cupsfilter . +.SH FILES +/etc/cups/cups-files.conf, /etc/cups/*.convs, /etc/cups/*.types, /usr/share/cups/mime/*.convs, /usr/share/cups/mime/*.types +.SH NOTES +Unlike when printing, filters run using the +.B cupsfilter +command use the current user and security session. This may result in different output or unexpected behavior. +.SH EXAMPLE +The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf": +.nf + cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf +.fi .SH SEE ALSO -\fIcupsd.conf(5)\fR -.br +.BR cups (1), cupsd.conf (5), filter(7), mime.convs (7), mime.types (7), http://localhost:631/help .SH COPYRIGHT -Copyright 2007-2013 by Apple Inc. +Copyright \[co] 2007-2014 by Apple Inc. .\" .\" End of "$Id$". .\" diff --git a/man/mantohtml.c b/man/mantohtml.c index 1f0b6aaa6..d498903b1 100644 --- a/man/mantohtml.c +++ b/man/mantohtml.c @@ -764,7 +764,7 @@ html_alternate(const char *s, /* I - String */ while (isspace(*s & 255)) s ++; - if (*s && *s != '(') + if (*s && *s != '(' && *s != '.' && *s != ',') putc(' ', fp); } diff --git a/scheduler/cupsfilter.c b/scheduler/cupsfilter.c index 56960f642..2b30faaf1 100644 --- a/scheduler/cupsfilter.c +++ b/scheduler/cupsfilter.c @@ -81,7 +81,7 @@ static int exec_filters(mime_type_t *srctype, cups_option_t *options); static void get_job_file(const char *job); static int open_pipe(int *fds); -static int read_cupsd_conf(const char *filename); +static int read_cups_files_conf(const char *filename); static void set_string(char **s, const char *val); static void sighandler(int sig); static void usage(const char *opt) __attribute__((noreturn)); @@ -95,7 +95,8 @@ int /* O - Exit status */ main(int argc, /* I - Number of command-line args */ char *argv[]) /* I - Command-line arguments */ { - int i; /* Looping vars */ + int i, /* Looping vars */ + list_filters = 0; /* Just list the filters? */ const char *command, /* Command name */ *opt, /* Current option */ *printer; /* Printer name */ @@ -111,7 +112,7 @@ main(int argc, /* I - Number of command-line args */ char mimedir[1024]; /* MIME directory */ char *infile, /* File to filter */ *outfile; /* File to create */ - char cupsdconf[1024]; /* cupsd.conf file */ + char cupsfilesconf[1024]; /* cups-files.conf file */ const char *server_root; /* CUPS_SERVERROOT environment variable */ mime_type_t *src, /* Source type */ *dst; /* Destination type */ @@ -155,7 +156,7 @@ main(int argc, /* I - Number of command-line args */ if ((server_root = getenv("CUPS_SERVERROOT")) == NULL) server_root = CUPS_SERVERROOT; - snprintf(cupsdconf, sizeof(cupsdconf), "%s/cupsd.conf", server_root); + snprintf(cupsfilesconf, sizeof(cupsfilesconf), "%s/cups-files.conf", server_root); /* * Process command-line arguments... @@ -164,168 +165,175 @@ main(int argc, /* I - Number of command-line args */ _cupsSetLocale(argv); for (i = 1; i < argc; i ++) + { if (argv[i][0] == '-') { - for (opt = argv[i] + 1; *opt; opt ++) - switch (*opt) + if (!strcmp(argv[i], "--list-filters")) + { + list_filters = 1; + } + else if (!strcmp(argv[i], "--")) + { + i ++; + if (i < argc && !infile) + infile = argv[i]; + else + usage(opt); + } + else + { + for (opt = argv[i] + 1; *opt; opt ++) { - case '-' : /* Next argument is a filename... */ - i ++; - if (i < argc && !infile) - infile = argv[i]; - else - usage(opt); - break; - - case 'a' : /* Specify option... */ - i ++; - if (i < argc) - num_options = cupsParseOptions(argv[i], num_options, &options); - else - usage(opt); - break; - - case 'c' : /* Specify cupsd.conf file location... */ - i ++; - if (i < argc) - { - if (!strcmp(command, "convert")) - num_options = cupsAddOption("copies", argv[i], num_options, - &options); + switch (*opt) + { + case 'a' : /* Specify option... */ + i ++; + if (i < argc) + num_options = cupsParseOptions(argv[i], num_options, &options); else - strlcpy(cupsdconf, argv[i], sizeof(cupsdconf)); - } - else - usage(opt); - break; - - case 'd' : /* Specify the real printer name */ - i ++; - if (i < argc) - printer = argv[i]; - else - usage(opt); - break; - - case 'D' : /* Delete input file after conversion */ - removeinfile = 1; - break; - - case 'e' : /* Use every filter from the PPD file */ - all_filters = 1; - break; - - case 'f' : /* Specify input file... */ - i ++; - if (i < argc && !infile) - infile = argv[i]; - else - usage(opt); - break; - - case 'i' : /* Specify source MIME type... */ - i ++; - if (i < argc) - { - if (sscanf(argv[i], "%15[^/]/%255s", super, type) != 2) usage(opt); + break; - srctype = argv[i]; - } - else - usage(opt); - break; + case 'c' : /* Specify cups-files.conf file location... */ + i ++; + if (i < argc) + { + if (!strcmp(command, "convert")) + num_options = cupsAddOption("copies", argv[i], num_options, &options); + else + strlcpy(cupsfilesconf, argv[i], sizeof(cupsfilesconf)); + } + else + usage(opt); + break; - case 'j' : /* Get job file or specify destination MIME type... */ - if (strcmp(command, "convert")) - { - i ++; + case 'd' : /* Specify the real printer name */ + i ++; + if (i < argc) + printer = argv[i]; + else + usage(opt); + break; + + case 'D' : /* Delete input file after conversion */ + removeinfile = 1; + break; + + case 'e' : /* Use every filter from the PPD file */ + all_filters = 1; + break; + + case 'f' : /* Specify input file... */ + i ++; + if (i < argc && !infile) + infile = argv[i]; + else + usage(opt); + break; + + case 'i' : /* Specify source MIME type... */ + i ++; if (i < argc) { - get_job_file(argv[i]); - infile = TempFile; + if (sscanf(argv[i], "%15[^/]/%255s", super, type) != 2) + usage(opt); + + srctype = argv[i]; } else usage(opt); + break; + + case 'j' : /* Get job file or specify destination MIME type... */ + if (strcmp(command, "convert")) + { + i ++; + if (i < argc) + { + get_job_file(argv[i]); + infile = TempFile; + } + else + usage(opt); - break; - } + break; + } - case 'm' : /* Specify destination MIME type... */ - i ++; - if (i < argc) - { - if (sscanf(argv[i], "%15[^/]/%255s", super, type) != 2) + case 'm' : /* Specify destination MIME type... */ + i ++; + if (i < argc) + { + if (sscanf(argv[i], "%15[^/]/%255s", super, type) != 2) + usage(opt); + + dsttype = argv[i]; + } + else usage(opt); + break; - dsttype = argv[i]; - } - else - usage(opt); - break; - - case 'n' : /* Specify number of copies... */ - i ++; - if (i < argc) - num_options = cupsAddOption("copies", argv[i], num_options, - &options); - else - usage(opt); - break; - - case 'o' : /* Specify option(s) or output filename */ - i ++; - if (i < argc) - { - if (!strcmp(command, "convert")) + case 'n' : /* Specify number of copies... */ + i ++; + if (i < argc) + num_options = cupsAddOption("copies", argv[i], num_options, &options); + else + usage(opt); + break; + + case 'o' : /* Specify option(s) or output filename */ + i ++; + if (i < argc) { - if (outfile) - usage(NULL); + if (!strcmp(command, "convert")) + { + if (outfile) + usage(NULL); + else + outfile = argv[i]; + } else - outfile = argv[i]; + num_options = cupsParseOptions(argv[i], num_options, &options); } else - num_options = cupsParseOptions(argv[i], num_options, - &options); - } - else - usage(opt); - break; - - case 'p' : /* Specify PPD file... */ - case 'P' : /* Specify PPD file... */ - i ++; - if (i < argc) - ppdfile = argv[i]; - else - usage(opt); - break; - - case 't' : /* Specify title... */ - case 'J' : /* Specify title... */ - i ++; - if (i < argc) - title = argv[i]; - else - usage(opt); - break; - - case 'u' : /* Delete PPD file after conversion */ - removeppd = 1; - break; - - case 'U' : /* Specify username... */ - i ++; - if (i < argc) - user = argv[i]; - else - usage(opt); - break; - - default : /* Something we don't understand... */ - usage(opt); - break; + usage(opt); + break; + + case 'p' : /* Specify PPD file... */ + case 'P' : /* Specify PPD file... */ + i ++; + if (i < argc) + ppdfile = argv[i]; + else + usage(opt); + break; + + case 't' : /* Specify title... */ + case 'J' : /* Specify title... */ + i ++; + if (i < argc) + title = argv[i]; + else + usage(opt); + break; + + case 'u' : /* Delete PPD file after conversion */ + removeppd = 1; + break; + + case 'U' : /* Specify username... */ + i ++; + if (i < argc) + user = argv[i]; + else + usage(opt); + break; + + default : /* Something we don't understand... */ + usage(opt); + break; + } } + } } else if (!infile) { @@ -340,6 +348,7 @@ main(int argc, /* I - Number of command-line args */ _("cupsfilter: Only one filename can be specified.")); usage(NULL); } + } if (!infile && !srctype) usage(NULL); @@ -355,10 +364,10 @@ main(int argc, /* I - Number of command-line args */ } /* - * Load the cupsd.conf file and create the MIME database... + * Load the cups-files.conf file and create the MIME database... */ - if (read_cupsd_conf(cupsdconf)) + if (read_cups_files_conf(cupsfilesconf)) return (1); snprintf(mimedir, sizeof(mimedir), "%s/mime", DataDir); @@ -473,12 +482,31 @@ main(int argc, /* I - Number of command-line args */ filters = prefilters; } - /* - * Do it! - */ + if (list_filters) + { + /* + * List filters... + */ + + mime_filter_t *filter; /* Current filter */ + + for (filter = (mime_filter_t *)cupsArrayFirst(filters); + filter; + filter = (mime_filter_t *)cupsArrayNext(filters)) + if (strcmp(filter->filter, "-")) + _cupsLangPuts(stdout, filter->filter); - status = exec_filters(src, filters, infile, outfile, ppdfile, printer, user, - title, num_options, options); + status = 0; + } + else + { + /* + * Run filters... + */ + + status = exec_filters(src, filters, infile, outfile, ppdfile, printer, user, + title, num_options, options); + } /* * Remove files as needed, then exit... @@ -1336,13 +1364,14 @@ open_pipe(int *fds) /* O - Pipe file descriptors (2) */ /* - * 'read_cupsd_conf()' - Read the cupsd.conf file to get the filter settings. + * 'read_cups_files_conf()' - Read the cups-files.conf file to get the filter settings. */ static int /* O - 0 on success, 1 on error */ -read_cupsd_conf(const char *filename) /* I - File to read */ +read_cups_files_conf( + const char *filename) /* I - File to read */ { - cups_file_t *fp; /* cupsd.conf file */ + cups_file_t *fp; /* cups-files.conf file */ const char *temp; /* Temporary string */ char line[1024], /* Line from file */ *ptr; /* Pointer into line */ @@ -1395,9 +1424,7 @@ read_cupsd_conf(const char *filename) /* I - File to read */ cupsFileClose(fp); } - snprintf(line, sizeof(line), - "%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR ":/bin:/usr/bin", - ServerBin); + snprintf(line, sizeof(line), "%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR ":/bin:/usr/bin", ServerBin); set_string(&Path, line); return (0); @@ -1449,33 +1476,25 @@ static void usage(const char *opt) /* I - Incorrect option, if any */ { if (opt) - _cupsLangPrintf(stderr, _("%s: Unknown option \"%c\"."), "cupsfilter", - *opt); + _cupsLangPrintf(stderr, _("%s: Unknown option \"%c\"."), "cupsfilter", *opt); - _cupsLangPuts(stdout, _("Usage: cupsfilter [ options ] filename")); + _cupsLangPuts(stdout, _("Usage: cupsfilter [ options ] [ -- ] filename")); _cupsLangPuts(stdout, _("Options:")); - _cupsLangPuts(stdout, _(" -D Remove the input file " - "when finished.")); + _cupsLangPuts(stdout, _(" --list-filters List filters that will be used.")); + _cupsLangPuts(stdout, _(" -D Remove the input file when finished.")); _cupsLangPuts(stdout, _(" -P filename.ppd Set PPD file.")); _cupsLangPuts(stdout, _(" -U username Specify username.")); - _cupsLangPuts(stdout, _(" -c cupsd.conf Set cupsd.conf file to " - "use.")); - _cupsLangPuts(stdout, _(" -d printer Use the named " - "printer.")); - _cupsLangPuts(stdout, _(" -e Use every filter from " - "the PPD file.")); - _cupsLangPuts(stdout, _(" -i mime/type Set input MIME type " - "(otherwise auto-typed).")); - _cupsLangPuts(stdout, _(" -j job-id[,N] Filter file N from the " - "specified job (default is file 1).")); - _cupsLangPuts(stdout, _(" -m mime/type Set output MIME type " - "(otherwise application/pdf).")); + _cupsLangPuts(stdout, _(" -c cups-files.conf Set cups-files.conf file to use.")); + _cupsLangPuts(stdout, _(" -d printer Use the named printer.")); + _cupsLangPuts(stdout, _(" -e Use every filter from the PPD file.")); + _cupsLangPuts(stdout, _(" -i mime/type Set input MIME type (otherwise auto-typed).")); + _cupsLangPuts(stdout, _(" -j job-id[,N] Filter file N from the specified job (default is file 1).")); + _cupsLangPuts(stdout, _(" -m mime/type Set output MIME type (otherwise application/pdf).")); _cupsLangPuts(stdout, _(" -n copies Set number of copies.")); _cupsLangPuts(stdout, _(" -o name=value Set option(s).")); _cupsLangPuts(stdout, _(" -p filename.ppd Set PPD file.")); _cupsLangPuts(stdout, _(" -t title Set title.")); - _cupsLangPuts(stdout, _(" -u Remove the PPD file " - "when finished.")); + _cupsLangPuts(stdout, _(" -u Remove the PPD file when finished.")); exit(1); } -- 2.39.2