From 84315f460a5c9eb38f7fcc4204acf98ed2b29406 Mon Sep 17 00:00:00 2001 From: msweet Date: Wed, 23 Mar 2011 00:05:29 +0000 Subject: [PATCH] Merge changes from CUPS 1.5svn-r9641 git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3071 a1ca3aef-8c08-0410-bb20-df032aa958be --- Makefile | 10 + backend/ipp.c | 51 +- backend/usb-darwin.c | 80 +- berkeley/lpq.c | 6 +- berkeley/lpr.c | 8 +- config-scripts/cups-common.m4 | 1 + config.h.in | 7 + cups/Makefile | 11 + cups/adminutil.c | 30 +- cups/http-support.c | 4 +- cups/http.c | 32 +- cups/langprintf.c | 17 +- cups/localize.c | 2 +- cups/pwg-media.c | 2 +- cups/transcode.c | 4 +- data/media.defs | 217 ++- doc/help/spec-raster.html | 34 +- locale/Makefile | 4 +- locale/cups.pot | 2527 ++++++++++++-------------- locale/cups.strings | 2025 +++------------------ locale/cups_zh_TW.po | 2 +- locale/po2strings.c | 31 +- ppdc/ppdc.cxx | 36 +- ppdc/ppdhtml.cxx | 8 +- ppdc/ppdi.cxx | 8 +- ppdc/ppdmerge.cxx | 5 +- ppdc/ppdpo.cxx | 12 +- scheduler/Makefile | 11 +- scheduler/conf.c | 7 + scheduler/cupsfilter.c | 72 +- scheduler/dirsvc.c | 7 +- scheduler/dirsvc.h | 4 +- scheduler/ipp.c | 314 ++-- scheduler/job.c | 1 - scheduler/main.c | 15 +- scheduler/printers.c | 34 + scheduler/server.c | 2 +- scheduler/sysman.c | 60 +- systemv/cancel.c | 4 +- systemv/cupsaddsmb.c | 19 +- systemv/cupsctl.c | 18 +- systemv/cupstestppd.c | 117 +- systemv/lp.c | 4 +- templates/pl/admin.tmpl | 2 +- templates/pl/help-header.tmpl | 2 +- test/ipptool.c | 59 +- xcode/CUPS.xcodeproj/project.pbxproj | 1556 ++++++++++++++-- 47 files changed, 3674 insertions(+), 3808 deletions(-) diff --git a/Makefile b/Makefile index b37bae7df..964f562e9 100644 --- a/Makefile +++ b/Makefile @@ -280,6 +280,16 @@ docset: apihelp org.cups.docset +# +# Lines of code computation... +# + +sloc: + for dir in cups cupslite scheduler; do \ + (cd $$dir; $(MAKE) $(MFLAGS) sloc) || exit 1;\ + done + + # # Make software distributions using EPM (http://www.epmhome.org/)... # diff --git a/backend/ipp.c b/backend/ipp.c index c972d7731..95263a85e 100644 --- a/backend/ipp.c +++ b/backend/ipp.c @@ -86,6 +86,7 @@ static const char * const pattrs[] = /* Printer attributes we want */ "marker-names", "marker-types", "media-col-supported", + "multiple-document-handling-supported", "operations-supported", "printer-alert", "printer-alert-description", @@ -117,7 +118,8 @@ static ipp_t *new_request(ipp_op_t op, int version, const char *uri, int num_options, cups_option_t *options, const char *compression, int copies, const char *format, _ppd_cache_t *pc, - ipp_attribute_t *media_col_sup); + ipp_attribute_t *media_col_sup, + ipp_attribute_t *doc_handling_sup); static const char *password_cb(const char *); static void report_attr(ipp_attribute_t *attr); static int report_printer_state(ipp_t *ipp, int job_id); @@ -185,6 +187,7 @@ main(int argc, /* I - Number of command-line args */ ipp_attribute_t *format_sup; /* document-format-supported */ ipp_attribute_t *media_col_sup; /* media-col-supported */ ipp_attribute_t *operations_sup; /* operations-supported */ + ipp_attribute_t *doc_handling_sup; /* multiple-document-handling-supported */ ipp_attribute_t *printer_state; /* printer-state attribute */ ipp_attribute_t *printer_accepting; /* printer-is-accepting-jobs */ int validate_job; /* Does printer support Validate-Job? */ @@ -688,13 +691,14 @@ main(int argc, /* I - Number of command-line args */ * copies... */ - copies_sup = NULL; - cups_version = NULL; - format_sup = NULL; - media_col_sup = NULL; - supported = NULL; - operations_sup = NULL; - validate_job = 0; + copies_sup = NULL; + cups_version = NULL; + format_sup = NULL; + media_col_sup = NULL; + supported = NULL; + operations_sup = NULL; + doc_handling_sup = NULL; + validate_job = 0; do { @@ -892,6 +896,10 @@ main(int argc, /* I - Number of command-line args */ "Get-Printer-Attributes request.\n", stderr); } + doc_handling_sup = ippFindAttribute(supported, + "multiple-document-handling-supported", + IPP_TAG_KEYWORD); + report_printer_state(supported, 0); } while (ipp_status > IPP_OK_CONFLICT); @@ -1063,7 +1071,7 @@ main(int argc, /* I - Number of command-line args */ request = new_request(IPP_VALIDATE_JOB, version, uri, argv[2], argv[3], num_options, options, compression, copies_sup ? copies : 1, document_format, pc, - media_col_sup); + media_col_sup, doc_handling_sup); ippDelete(cupsDoRequest(http, request, resource)); @@ -1138,7 +1146,7 @@ main(int argc, /* I - Number of command-line args */ request = new_request(num_files > 1 ? IPP_CREATE_JOB : IPP_PRINT_JOB, version, uri, argv[2], argv[3], num_options, options, compression, copies_sup ? copies : 1, document_format, - pc, media_col_sup); + pc, media_col_sup, doc_handling_sup); /* * Do the request... @@ -1838,7 +1846,8 @@ new_request( int copies, /* I - copies value or 0 */ const char *format, /* I - documet-format value or NULL */ _ppd_cache_t *pc, /* I - PPD cache and mapping data */ - ipp_attribute_t *media_col_sup) /* I - media-col-supported values */ + ipp_attribute_t *media_col_sup, /* I - media-col-supported values */ + ipp_attribute_t *doc_handling_sup) /* I - multiple-document-handling-supported values */ { int i; /* Looping var */ ipp_t *request; /* Request data */ @@ -1847,7 +1856,8 @@ new_request( ipp_t *media_col, /* media-col value */ *media_size; /* media-size value */ const char *media_source, /* media-source value */ - *media_type; /* media-type value */ + *media_type, /* media-type value */ + *collate_str; /* multiple-document-handling value */ /* @@ -2028,6 +2038,23 @@ new_request( ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "sides", NULL, "two-sided-short-edge"); } + + if (doc_handling_sup && + (keyword = cupsGetOption("collate", num_options, options)) != NULL) + { + if (!strcasecmp(keyword, "true")) + collate_str = "separate-documents-collated-copies"; + else + collate_str = "separate-documents-uncollated-copies"; + + for (i = 0; i < doc_handling_sup->num_values; i ++) + if (!strcmp(doc_handling_sup->values[i].string.text, collate_str)) + { + ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, + "multiple-document-handling", NULL, collate_str); + break; + } + } } else { diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c index 4b7bb5c38..a41dfbf38 100644 --- a/backend/usb-darwin.c +++ b/backend/usb-darwin.c @@ -131,7 +131,7 @@ extern char **environ; #define kUSBClassDriverProperty CFSTR("USB Printing Class") -#define kUSBGenericTOPrinterClassDriver CFSTR("/System/Library/Printers/Libraries/USBGenericTOPrintingClass.plugin") +#define kUSBGenericTOPrinterClassDriver CFSTR("/System/Library/Printers/Libraries/USBGenericPrintingClass.plugin") #define kUSBPrinterClassDeviceNotOpen -9664 /*kPMInvalidIOMContext*/ @@ -342,7 +342,7 @@ print_device(const char *uri, /* I - Device URI */ ssize_t total_bytes; /* Total bytes written */ UInt32 bytes; /* Bytes written */ struct timeval *timeout, /* Timeout pointer */ - stimeout; /* Timeout for select() */ + tv; /* Time value */ struct timespec cond_timeout; /* pthread condition timeout */ @@ -562,15 +562,15 @@ print_device(const char *uri, /* I - Device URI */ if (g.print_bytes) { - stimeout.tv_sec = 0; - stimeout.tv_usec = 100000; /* 100ms */ - timeout = &stimeout; + tv.tv_sec = 0; + tv.tv_usec = 100000; /* 100ms */ + timeout = &tv; } else if (g.drain_output) { - stimeout.tv_sec = 0; - stimeout.tv_usec = 0; - timeout = &stimeout; + tv.tv_sec = 0; + tv.tv_usec = 0; + timeout = &tv; } else timeout = NULL; @@ -728,6 +728,7 @@ print_device(const char *uri, /* I - Device URI */ /* * Write error - bail if we don't see an error we can retry... */ + _cupsLangPrintFilter(stderr, "ERROR", _("Unable to send data to printer.")); fprintf(stderr, "DEBUG: USB class driver WritePipe returned %x\n", @@ -763,7 +764,7 @@ print_device(const char *uri, /* I - Device URI */ /* * Re-enable the SIGTERM handler so pthread_kill() will work... */ - + struct sigaction action; /* POSIX signal action */ memset(&action, 0, sizeof(action)); @@ -788,26 +789,32 @@ print_device(const char *uri, /* I - Device URI */ g.sidechannel_thread_stop = 1; pthread_mutex_lock(&g.sidechannel_thread_mutex); + if (!g.sidechannel_thread_done) { - /* - * Wait for the side-channel thread to exit... - */ + gettimeofday(&tv, NULL); + cond_timeout.tv_sec = tv.tv_sec + WAIT_SIDE_DELAY; + cond_timeout.tv_nsec = tv.tv_usec * 1000; - cond_timeout.tv_sec = time(NULL) + WAIT_SIDE_DELAY; - cond_timeout.tv_nsec = 0; - if (pthread_cond_timedwait(&g.sidechannel_thread_cond, - &g.sidechannel_thread_mutex, - &cond_timeout) != 0) + while (!g.sidechannel_thread_done) + { + if (pthread_cond_timedwait(&g.sidechannel_thread_cond, + &g.sidechannel_thread_mutex, + &cond_timeout) != 0) + break; + } + + if (!g.sidechannel_thread_done) { /* * Force the side-channel thread to exit... */ - fputs("DEBUG: Force the side-channel thread to exit...\n", stderr); + fputs("DEBUG: Force the side-channel thread to exit...\n", stderr); pthread_kill(sidechannel_thread_id, SIGTERM); } } + pthread_mutex_unlock(&g.sidechannel_thread_mutex); pthread_join(sidechannel_thread_id, NULL); @@ -834,11 +841,18 @@ print_device(const char *uri, /* I - Device URI */ if (!g.read_thread_done) { - cond_timeout.tv_sec = time(NULL) + WAIT_EOF_DELAY; - cond_timeout.tv_nsec = 0; + gettimeofday(&tv, NULL); + cond_timeout.tv_sec = tv.tv_sec + WAIT_EOF_DELAY; + cond_timeout.tv_nsec = tv.tv_usec * 1000; - if (pthread_cond_timedwait(&g.read_thread_cond, &g.read_thread_mutex, - &cond_timeout) != 0) + while (!g.read_thread_done) + { + if (pthread_cond_timedwait(&g.read_thread_cond, &g.read_thread_mutex, + &cond_timeout) != 0) + break; + } + + if (!g.read_thread_done) { /* * Force the read thread to exit... @@ -849,6 +863,7 @@ print_device(const char *uri, /* I - Device URI */ pthread_kill(read_thread_id, SIGTERM); } } + pthread_mutex_unlock(&g.read_thread_mutex); pthread_join(read_thread_id, NULL); /* wait for the read thread to return */ @@ -2201,7 +2216,7 @@ static void parse_pserror(char *sockBuffer, static void soft_reset() { fd_set input_set; /* Input set for select() */ - struct timeval stimeout; /* Timeout for select() */ + struct timeval tv; /* Time value */ char buffer[2048]; /* Buffer */ struct timespec cond_timeout; /* pthread condition timeout */ @@ -2214,10 +2229,17 @@ static void soft_reset() { (*g.classdriver)->Abort(g.classdriver); - cond_timeout.tv_sec = time(NULL) + 1; - cond_timeout.tv_nsec = 0; + gettimeofday(&tv, NULL); + cond_timeout.tv_sec = tv.tv_sec + 1; + cond_timeout.tv_nsec = tv.tv_usec * 1000; - pthread_cond_timedwait(&g.readwrite_lock_cond, &g.readwrite_lock_mutex, &cond_timeout); + while (g.readwrite_lock) + { + if (pthread_cond_timedwait(&g.readwrite_lock_cond, + &g.readwrite_lock_mutex, + &cond_timeout) != 0) + break; + } } g.readwrite_lock = 1; @@ -2232,10 +2254,10 @@ static void soft_reset() FD_ZERO(&input_set); FD_SET(g.print_fd, &input_set); - stimeout.tv_sec = 0; - stimeout.tv_usec = 0; + tv.tv_sec = 0; + tv.tv_usec = 0; - while (select(g.print_fd+1, &input_set, NULL, NULL, &stimeout) > 0) + while (select(g.print_fd+1, &input_set, NULL, NULL, &tv) > 0) if (read(g.print_fd, buffer, sizeof(buffer)) <= 0) break; diff --git a/berkeley/lpq.c b/berkeley/lpq.c index 9a4a9ca64..9e3f73d11 100644 --- a/berkeley/lpq.c +++ b/berkeley/lpq.c @@ -3,7 +3,7 @@ * * "lpq" command for CUPS. * - * Copyright 2007-2010 by Apple Inc. + * Copyright 2007-2011 by Apple Inc. * Copyright 1997-2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -233,12 +233,12 @@ main(int argc, /* I - Number of command-line arguments */ if (dest && !cupsGetDest(dest, NULL, num_dests, dests)) _cupsLangPrintf(stderr, - _("%s: error - %s environment variable names " + _("%s: Error - %s environment variable names " "non-existent destination \"%s\"."), argv[0], val, dest); else _cupsLangPrintf(stderr, - _("%s: error - no default destination available."), + _("%s: Error - no default destination available."), argv[0]); httpClose(http); cupsFreeDests(num_dests, dests); diff --git a/berkeley/lpr.c b/berkeley/lpr.c index 1bfe11e4d..b71f54fed 100644 --- a/berkeley/lpr.c +++ b/berkeley/lpr.c @@ -3,7 +3,7 @@ * * "lpr" command for CUPS. * - * Copyright 2007-2010 by Apple Inc. + * Copyright 2007-2011 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -150,7 +150,7 @@ main(int argc, /* I - Number of command-line arguments */ if (i >= argc) { _cupsLangPrintf(stderr, - _("%s: error - expected option=value after " + _("%s: Error - expected option=value after " "\"-o\" option."), argv[0]); return (1); } @@ -237,7 +237,7 @@ main(int argc, /* I - Number of command-line arguments */ if (i >= argc) { _cupsLangPrintf(stderr, - _("%s: Error - expected copy count after " + _("%s: Error - expected copies after " "\"-#\" option."), argv[0]); return (1); } @@ -284,7 +284,7 @@ main(int argc, /* I - Number of command-line arguments */ if (access(argv[i], R_OK) != 0) { _cupsLangPrintf(stderr, - _("%s: Error - unable to access \"%s\" - %s."), + _("%s: Error - unable to access \"%s\" - %s"), argv[0], argv[i], strerror(errno)); return (1); } diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index e1b6fc6f5..5d4fe5bd6 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -320,6 +320,7 @@ case $uname in AC_CHECK_HEADER(CoreFoundation/CoreFoundation.h,AC_DEFINE(HAVE_COREFOUNDATION_H)) AC_CHECK_HEADER(CoreFoundation/CFPriv.h,AC_DEFINE(HAVE_CFPRIV_H)) AC_CHECK_HEADER(CoreFoundation/CFBundlePriv.h,AC_DEFINE(HAVE_CFBUNDLEPRIV_H)) + AC_CHECK_HEADER(IOKit/pwr_mgt/IOPMLibPrivate.h,AC_DEFINE(HAVE_IOKIT_PWR_MGT_IOPMLIBPRIVATE_H)) dnl Check for dynamic store function... AC_CHECK_FUNCS(SCDynamicStoreCopyComputerName) diff --git a/config.h.in b/config.h.in index a21c6f886..0f047a474 100644 --- a/config.h.in +++ b/config.h.in @@ -557,6 +557,13 @@ #undef HAVE_NOTIFY_POST +/* + * Do we have Darwin's IOKit private headers? + */ + +#undef HAVE_IOKIT_PWR_MGT_IOPMLIBPRIVATE_H + + /* * Do we have DBUS? */ diff --git a/cups/Makefile b/cups/Makefile index adc5581fe..38fdcb645 100644 --- a/cups/Makefile +++ b/cups/Makefile @@ -656,6 +656,17 @@ framedhelp: backchannel.c backend.h backend.c sidechannel.c sidechannel.h +# +# Lines of code computation... +# + +sloc: + echo "libcupslite: \c" + sloccount $(LITEOBJS:.o=.c) 2>/dev/null | grep "Total Physical" | awk '{print $$9}' + echo "libcups: \c" + sloccount $(LIBOBJS:.o=.c) 2>/dev/null | grep "Total Physical" | awk '{print $$9}' + + # # Dependencies... # diff --git a/cups/adminutil.c b/cups/adminutil.c index cbb101201..99f8476c3 100644 --- a/cups/adminutil.c +++ b/cups/adminutil.c @@ -251,7 +251,7 @@ cupsAdminCreateWindowsPPD( if ((ptr = strchr(line, ':')) == NULL) { snprintf(line, sizeof(line), - _cupsLangString(language, _("Missing value on line %d")), + _cupsLangString(language, _("Missing value on line %d.")), linenum); _cupsSetError(IPP_DOCUMENT_FORMAT_ERROR, line, 0); @@ -270,7 +270,7 @@ cupsAdminCreateWindowsPPD( { snprintf(line, sizeof(line), _cupsLangString(language, - _("Missing double quote on line %d")), + _("Missing double quote on line %d.")), linenum); _cupsSetError(IPP_DOCUMENT_FORMAT_ERROR, line, 0); @@ -289,7 +289,7 @@ cupsAdminCreateWindowsPPD( { snprintf(line, sizeof(line), _cupsLangString(language, - _("Bad option + choice on line %d")), + _("Bad option + choice on line %d.")), linenum); _cupsSetError(IPP_DOCUMENT_FORMAT_ERROR, line, 0); @@ -334,7 +334,7 @@ cupsAdminCreateWindowsPPD( if (linenum == 0) { - _cupsSetError(IPP_DOCUMENT_FORMAT_ERROR, _("Empty PPD file"), 1); + _cupsSetError(IPP_DOCUMENT_FORMAT_ERROR, _("Empty PPD file."), 1); cupsFileClose(dstfp); unlink(buffer); @@ -485,7 +485,7 @@ cupsAdminExportSamba( snprintf(message, sizeof(message), _cupsLangString(language, _("Unable to copy Windows 2000 printer " - "driver files (%d)")), status); + "driver files (%d).")), status); _cupsSetError(IPP_INTERNAL_ERROR, message, 0); @@ -520,7 +520,7 @@ cupsAdminExportSamba( snprintf(message, sizeof(message), _cupsLangString(language, _("Unable to copy CUPS printer driver " - "files (%d)")), status); + "files (%d).")), status); _cupsSetError(IPP_INTERNAL_ERROR, message, 0); @@ -563,7 +563,7 @@ cupsAdminExportSamba( snprintf(message, sizeof(message), _cupsLangString(language, _("Unable to install Windows 2000 printer " - "driver files (%d)")), status); + "driver files (%d).")), status); _cupsSetError(IPP_INTERNAL_ERROR, message, 0); @@ -608,7 +608,7 @@ cupsAdminExportSamba( snprintf(message, sizeof(message), _cupsLangString(language, _("Unable to copy Windows 9x printer " - "driver files (%d)")), status); + "driver files (%d).")), status); _cupsSetError(IPP_INTERNAL_ERROR, message, 0); @@ -637,7 +637,7 @@ cupsAdminExportSamba( snprintf(message, sizeof(message), _cupsLangString(language, _("Unable to install Windows 9x printer " - "driver files (%d)")), status); + "driver files (%d).")), status); _cupsSetError(IPP_INTERNAL_ERROR, message, 0); @@ -689,7 +689,7 @@ cupsAdminExportSamba( snprintf(message, sizeof(message), _cupsLangString(language, _("Unable to copy 64-bit Windows printer " - "driver files (%d)")), status); + "driver files (%d).")), status); _cupsSetError(IPP_INTERNAL_ERROR, message, 0); @@ -724,7 +724,7 @@ cupsAdminExportSamba( snprintf(message, sizeof(message), _cupsLangString(language, _("Unable to copy 64-bit CUPS printer driver " - "files (%d)")), status); + "files (%d).")), status); _cupsSetError(IPP_INTERNAL_ERROR, message, 0); @@ -767,7 +767,7 @@ cupsAdminExportSamba( snprintf(message, sizeof(message), _cupsLangString(language, _("Unable to install Windows 2000 printer " - "driver files (%d)")), status); + "driver files (%d).")), status); _cupsSetError(IPP_INTERNAL_ERROR, message, 0); @@ -785,13 +785,13 @@ cupsAdminExportSamba( if (!have_drivers) strlcpy(message, _cupsLangString(language, - _("No Windows printer drivers are installed")), + _("No Windows printer drivers are installed.")), sizeof(message)); else strlcpy(message, _cupsLangString(language, _("Warning, no Windows 2000 printer drivers " - "are installed")), + "are installed.")), sizeof(message)); _cupsSetError(IPP_NOT_FOUND, message, 0); @@ -818,7 +818,7 @@ cupsAdminExportSamba( { snprintf(message, sizeof(message), _cupsLangString(language, - _("Unable to set Windows printer driver (%d)")), + _("Unable to set Windows printer driver (%d).")), status); _cupsSetError(IPP_INTERNAL_ERROR, message, 0); diff --git a/cups/http-support.c b/cups/http-support.c index 255f760e5..1d73f7d48 100644 --- a/cups/http-support.c +++ b/cups/http-support.c @@ -3,7 +3,7 @@ * * HTTP support routines for CUPS. * - * Copyright 2007-2010 by Apple Inc. + * Copyright 2007-2011 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -1364,7 +1364,7 @@ _httpResolveURI( #endif /* DEBUG */ { if (logit) - _cupsLangPrintFilter(stderr, "ERROR", _("Bad device URI \"%s\"."), uri); + _cupsLangPrintFilter(stderr, "ERROR", _("Bad device-uri \"%s\"."), uri); DEBUG_printf(("6_httpResolveURI: httpSeparateURI returned %d!", status)); DEBUG_puts("5_httpResolveURI: Returning NULL"); diff --git a/cups/http.c b/cups/http.c index 83a7a79d5..5bcf7facd 100644 --- a/cups/http.c +++ b/cups/http.c @@ -3456,9 +3456,7 @@ http_read_ssl(http_t *http, /* I - Connection to server */ case 0 : result = (int)processed; break; - case errSSLClosedGraceful : - result = 0; - break; + case errSSLWouldBlock : if (processed) result = (int)processed; @@ -3468,9 +3466,16 @@ http_read_ssl(http_t *http, /* I - Connection to server */ errno = EINTR; } break; + + case errSSLClosedGraceful : default : - errno = EPIPE; - result = -1; + if (processed) + result = (int)processed; + else + { + result = -1; + errno = EPIPE; + } break; } @@ -4485,9 +4490,7 @@ http_write_ssl(http_t *http, /* I - Connection to server */ case 0 : result = (int)processed; break; - case errSSLClosedGraceful : - result = 0; - break; + case errSSLWouldBlock : if (processed) result = (int)processed; @@ -4497,13 +4500,20 @@ http_write_ssl(http_t *http, /* I - Connection to server */ errno = EINTR; } break; + + case errSSLClosedGraceful : default : - errno = EPIPE; - result = -1; + if (processed) + result = (int)processed; + else + { + result = -1; + errno = EPIPE; + } break; } # elif defined(HAVE_SSPISSL) - return _sspiWrite((_sspi_struct_t*) http->tls, (void*) buf, len); + return _sspiWrite((_sspi_struct_t *)http->tls, (void *)buf, len); # endif /* HAVE_LIBSSL */ DEBUG_printf(("3http_write_ssl: Returning %d.", (int)result)); diff --git a/cups/langprintf.c b/cups/langprintf.c index f072e3e02..1a9f8b789 100644 --- a/cups/langprintf.c +++ b/cups/langprintf.c @@ -3,7 +3,7 @@ * * Localized printf/puts functions for CUPS. * - * Copyright 2007-2010 by Apple Inc. + * Copyright 2007-2011 by Apple Inc. * Copyright 2002-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -42,6 +42,7 @@ _cupsLangPrintError(const char *prefix, /* I - Non-localized message prefix */ int bytes; /* Number of bytes formatted */ int last_errno; /* Last error */ char buffer[2048], /* Message buffer */ + *bufptr, /* Pointer into buffer */ output[8192]; /* Output buffer */ _cups_globals_t *cg; /* Global data */ @@ -72,9 +73,19 @@ _cupsLangPrintError(const char *prefix, /* I - Non-localized message prefix */ * Format the message... */ - snprintf(buffer, sizeof(buffer), "%s%s%s: %s\n", prefix ? prefix : "", - prefix ? ": " : "", + if (prefix) + { + snprintf(buffer, sizeof(buffer), "%s:", prefix); + bufptr = buffer + strlen(buffer); + } + else + bufptr = buffer; + + snprintf(bufptr, sizeof(buffer) - (bufptr - buffer), + /* TRANSLATORS: Message is "subject: error" */ + _cupsLangString(cg->lang_default, _("%s: %s")), _cupsLangString(cg->lang_default, message), strerror(last_errno)); + strlcat(buffer, "\n", sizeof(buffer)); /* * Convert and write to stderr... diff --git a/cups/localize.c b/cups/localize.c index 25b068a98..52518339a 100644 --- a/cups/localize.c +++ b/cups/localize.c @@ -308,7 +308,7 @@ ppdLocalizeIPPReason( message = _("There is a paper jam."); else if (!strncmp(reason, "offline", 7) || !strncmp(reason, "shutdown", 8)) - message = _("The printer is offline."); + message = _("The printer is not connected."); else if (!strncmp(reason, "toner-low", 9)) message = _("The printer is low on toner."); else if (!strncmp(reason, "toner-empty", 11)) diff --git a/cups/pwg-media.c b/cups/pwg-media.c index 306bf6d85..9a752e69c 100644 --- a/cups/pwg-media.c +++ b/cups/pwg-media.c @@ -441,7 +441,7 @@ _pwgInitSize(_pwg_size_t *size, /* I - Size to initialize */ const char *suffix; /* Suffix on media string */ pwg = _pwgMediaForPPD(name); - if (pwg && + if (pwg && (suffix = name + strlen(name) - 10 /* .FullBleed */) > name && !strcasecmp(suffix, ".FullBleed")) { diff --git a/cups/transcode.c b/cups/transcode.c index 29e21b4b0..0e33744ad 100644 --- a/cups/transcode.c +++ b/cups/transcode.c @@ -88,7 +88,7 @@ cupsCharsetToUTF8( const cups_encoding_t encoding) /* I - Encoding */ { cups_utf8_t *destptr; /* Pointer into UTF-8 buffer */ -#ifdef HAVE_ICONV_H +#ifdef HAVE_ICONV_H size_t srclen, /* Length of source string */ outBytesLeft; /* Bytes remaining in output buffer */ #endif /* HAVE_ICONV_H */ @@ -208,7 +208,7 @@ cupsUTF8ToCharset( const cups_encoding_t encoding) /* I - Encoding */ { char *destptr; /* Pointer into destination */ -#ifdef HAVE_ICONV_H +#ifdef HAVE_ICONV_H size_t srclen, /* Length of source string */ outBytesLeft; /* Bytes remaining in output buffer */ #endif /* HAVE_ICONV_H */ diff --git a/data/media.defs b/data/media.defs index 88036937d..8d5d278e7 100644 --- a/data/media.defs +++ b/data/media.defs @@ -30,17 +30,17 @@ #media "A2.Transverse/A2" 1684 1191 #media "A3/A3" 842 1191 #media "A3.Transverse/A3" 1191 842 -#media "A3Extra/A3 (Oversize)" 913 1262 -#media "A3Extra.Transverse/A3 (Oversize)" 913 1262 +#media "A3Extra/A3 Oversize" 913 1262 +#media "A3Extra.Transverse/A3 Oversize" 913 1262 #media "A3Rotated/A3" 1191 842 #media "A4/A4" 595 842 -#media "A4Extra/A4 (Oversize)" 667 914 -#media "A4Plus/A4 (Oversize)" 595 936 +#media "A4Extra/A4 Oversize" 667 914 +#media "A4Plus/A4 Oversize" 595 936 #media "A4Rotated/A4" 842 595 -#media "A4Small/A4 (Small)" 595 842 +#media "A4Small/A4 Small" 595 842 #media "A4.Transverse/A4" 842 595 #media "A5/A5" 420 595 -#media "A5Extra/A5 (Oversize)" 492 668 +#media "A5Extra/A5 Oversize" 492 668 #media "A5Rotated/A5" 595 420 #media "A5.Transverse/A5" 595 420 #media "A6/A6" 297 420 @@ -54,117 +54,117 @@ #media "AnsiC/ANSI C" 1224 1584 #media "AnsiD/ANSI D" 1584 2448 #media "AnsiE/ANSI E" 2448 3168 -#media "ARCHA/ARCH A" 648 864 -#media "ARCHA.Transverse/ARCH A" 864 648 -#media "ARCHB/ARCH B" 864 1296 -#media "ARCHB.Transverse/ARCH B" 1296 864 +#media "ARCHA/Letter Oversize" 648 864 +#media "ARCHA.Transverse/Letter Oversize" 864 648 +#media "ARCHB/Tabloid Oversize" 864 1296 +#media "ARCHB.Transverse/Tabloid Oversize" 1296 864 #media "ARCHC/ARCH C" 1296 1728 #media "ARCHC.Transverse/ARCH C" 1728 1296 #media "ARCHD/ARCH D" 1728 2592 #media "ARCHD.Transverse/ARCH D" 2592 1728 #media "ARCHE/ARCH E" 2592 3456 #media "ARCHE.Transverse/ARCH E" 3456 2592 -#media "B0/B0" 2920 4127 -#media "B10/B10" 91 127 -#media "B1/B1" 2064 2918 -#media "B1/B1" 2064 2920 -#media "B2/B2" 1460 2064 -#media "B3/B3" 1032 1460 -#media "B4/B4" 729 1032 -#media "B4Rotated/B4" 1032 729 -#media "B5/B5" 516 729 -#media "B5Rotated/B5" 729 516 -#media "B5.Transverse/B5" 516 729 -#media "B6/B6" 363 516 -#media "B6Rotated/B6" 516 363 -#media "B7/B7" 258 363 -#media "B8/B8" 181 258 -#media "B9/B9" 127 181 -#media "C4/C4" 649 918 -#media "C5/C5" 459 649 -#media "C6/C6" 323 459 -#media "DL/DL" 312 624 -#media "DoublePostcard/Double Postcard" 567 420 -#media "DoublePostcardRotated/Double Postcard" 420 567 -#media "Env10/#10 Envelope" 297 684 -#media "Env11/#11 Envelope" 324 747 -#media "Env12/#12 Envelope" 342 792 -#media "Env14/#14 Envelope" 360 828 -#media "Env9/#9 Envelope" 279 639 -#media "EnvC0/C0 Envelope" 2599 3676 -#media "EnvC1/C1 Envelope" 1837 2599 -#media "EnvC2/C2 Envelope" 1298 1837 -#media "EnvC3/C3 Envelope" 918 1296 -#media "EnvC4/C4 Envelope" 649 918 -#media "EnvC5/C5 Envelope" 459 649 -#media "EnvC65/C65 Envelope" 324 648 -#media "EnvC6/C6 Envelope" 323 459 -#media "EnvC7/C7 Envelope" 230 323 -#media "EnvChou3/Chou3 Envelope" 340 666 -#media "EnvChou3Rotated/Chou3 Envelope" 666 340 -#media "EnvChou4/Chou4 Envelope" 255 581 -#media "EnvChou4Rotated/Chou4 Envelope" 581 255 -#media "EnvDL/DL Envelope" 312 624 -#media "EnvInvite/Invite Envelope" 624 624 -#media "EnvISOB4/ISO B4 Envelope" 708 1001 -#media "EnvISOB5/ISO B5 Envelope" 499 709 -#media "EnvISOB6/ISO B6 Envelope" 499 354 -#media "EnvItalian/Italian Envelope" 312 652 -#media "EnvKaku2/Kaku2 Envelope" 680 941 -#media "EnvKaku2Rotated/Kaku2 Envelope" 941 680 -#media "EnvKaku3/Kaku3 Envelope" 612 785 -#media "EnvKaku3Rotated/Kaku3 Envelope" 785 612 -#media "EnvMonarch/Monarch Envelope" 279 540 -#media "EnvPersonal/Personal Envelope" 261 468 -#media "EnvPRC1/PRC1 Envelope" 289 468 -#media "EnvPRC1Rotated/PRC1 Envelope" 468 289 -#media "EnvPRC2/PRC2 Envelope" 289 499 -#media "EnvPRC2Rotated/PRC2 Envelope" 499 289 -#media "EnvPRC3/PRC3 Envelope" 354 499 -#media "EnvPRC3Rotated/PRC3 Envelope" 499 354 -#media "EnvPRC4/PRC4 Envelope" 312 590 -#media "EnvPRC4Rotated/PRC4 Envelope" 590 312 -#media "EnvPRC5/PRC5 Envelope" 312 624 -#media "EnvPRC5Rotated/PRC5 Envelope" 624 312 -#media "EnvPRC6/PRC6 Envelope" 340 652 -#media "EnvPRC6Rotated/PRC6 Envelope" 652 340 -#media "EnvPRC7/PRC7 Envelope" 454 652 -#media "EnvPRC7Rotated/PRC7 Envelope" 652 454 -#media "EnvPRC8/PRC8 Envelope" 340 876 -#media "EnvPRC8Rotated/PRC8 Envelope" 876 340 -#media "EnvPRC9/PRC9 Envelope" 649 918 -#media "EnvPRC9Rotated/PRC9 Envelope" 918 649 -#media "EnvPRC10/PRC10 Envelope" 918 1298 -#media "EnvPRC10Rotated/PRC10 Envelope" 1298 918 -#media "EnvYou4/You4 Envelope" 298 666 -#media "EnvYou4Rotated/You4 Envelope" 666 298 -#media "Executive/US Executive" 522 756 -#media "FanFoldGerman/German FanFold" 612 864 -#media "FanFoldGermanLegal/German FanFold Legal" 612 936 -#media "FanFoldUS/US Fanfold" 1071 792 +#media "B0/JB0" 2920 4127 +#media "B10/JB10" 91 127 +#media "B1/JB1" 2064 2918 +#media "B1/JB1" 2064 2920 +#media "B2/JB2" 1460 2064 +#media "B3/JB3" 1032 1460 +#media "B4/JB4" 729 1032 +#media "B4Rotated/JB4" 1032 729 +#media "B5/B5 JIS" 516 729 +#media "B5Rotated/B5 JIS" 729 516 +#media "B5.Transverse/B5 JIS" 516 729 +#media "B6/JB6" 363 516 +#media "B6Rotated/JB6" 516 363 +#media "B7/JB7" 258 363 +#media "B8/JB8" 181 258 +#media "B9/JB9" 127 181 +#media "C4/Envelope C4" 649 918 +#media "C5/Envelope C5" 459 649 +#media "C6/Envelope C6" 323 459 +#media "DL/Envelope DL" 312 624 +#media "DoublePostcard/Postcard Double " 567 420 +#media "DoublePostcardRotated/Postcard Double" 420 567 +#media "Env10/Envelope #10 " 297 684 +#media "Env11/Envelope #11" 324 747 +#media "Env12/Envelope #12" 342 792 +#media "Env14/Envelope #14" 360 828 +#media "Env9/Envelope #9" 279 639 +#media "EnvC0/Envelope C0" 2599 3676 +#media "EnvC1/Envelope C1" 1837 2599 +#media "EnvC2/Envelope C2" 1298 1837 +#media "EnvC3/Envelope C3" 918 1296 +#media "EnvC4/Envelope C4" 649 918 +#media "EnvC5/Envelope C5" 459 649 +#media "EnvC65/Envelope C65" 324 648 +#media "EnvC6/Envelope C6" 323 459 +#media "EnvC7/Envelope C7" 230 323 +#media "EnvChou3/Envelope Choukei 3" 340 666 +#media "EnvChou3Rotated/Envelope Choukei 3" 666 340 +#media "EnvChou4/Envelope Choukei 4" 255 581 +#media "EnvChou4Rotated/Envelope Choukei 4" 581 255 +#media "EnvDL/Envelope DL" 312 624 +#media "EnvInvite/Envelope Invite" 624 624 +#media "EnvISOB4/Envelope B4" 708 1001 +#media "EnvISOB5/Envelope B5" 499 709 +#media "EnvISOB6/Envelope B6" 499 354 +#media "EnvItalian/Envelope Italian" 312 652 +#media "EnvKaku2/Envelope Kaku2" 680 941 +#media "EnvKaku2Rotated/Envelope Kaku2" 941 680 +#media "EnvKaku3/Envelope Kaku3" 612 785 +#media "EnvKaku3Rotated/Envelope Kaku3" 785 612 +#media "EnvMonarch/Envelope Monarch" 279 540 +#media "EnvPersonal/Envelope Personal" 261 468 +#media "EnvPRC1/Envelope PRC1 " 289 468 +#media "EnvPRC1Rotated/Envelope PRC1 " 468 289 +#media "EnvPRC2/Envelope PRC2" 289 499 +#media "EnvPRC2Rotated/Envelope PRC2" 499 289 +#media "EnvPRC3/Envelope PRC3" 354 499 +#media "EnvPRC3Rotated/Envelope PRC3" 499 354 +#media "EnvPRC4/Envelope PRC4" 312 590 +#media "EnvPRC4Rotated/Envelope PRC4" 590 312 +#media "EnvPRC5/Envelope PRC5PRC5" 312 624 +#media "EnvPRC5Rotated/Envelope PRC5" 624 312 +#media "EnvPRC6/Envelope PRC6" 340 652 +#media "EnvPRC6Rotated/Envelope PRC6" 652 340 +#media "EnvPRC7/Envelope PRC7" 454 652 +#media "EnvPRC7Rotated/Envelope PRC7" 652 454 +#media "EnvPRC8/Envelope PRC8" 340 876 +#media "EnvPRC8Rotated/Envelope PRC8" 876 340 +#media "EnvPRC9/Envelope PRC9" 649 918 +#media "EnvPRC9Rotated/Envelope PRC9" 918 649 +#media "EnvPRC10/Envelope PRC10" 918 1298 +#media "EnvPRC10Rotated/Envelope PRC10" 1298 918 +#media "EnvYou4/Envelope You4" 298 666 +#media "EnvYou4Rotated/Envelope You4" 666 298 +#media "Executive/Executive" 522 756 +#media "FanFoldGerman/FanFold German" 612 864 +#media "FanFoldGermanLegal/FanFold Legal German" 612 936 +#media "FanFoldUS/Fanfold US" 1071 792 #media "Folio/Folio" 595 935 -#media "ISOB0/ISO B0" 2835 4008 -#media "ISOB1/ISO B1" 2004 2835 -#media "ISOB2/ISO B2" 1417 2004 -#media "ISOB3/ISO B3" 1001 1417 -#media "ISOB4/ISO B4" 709 1001 -#media "ISOB5/ISO B5" 499 709 -#media "ISOB5Extra/ISO B5 (Oversize)" 570 782 -#media "ISOB6/ISO B6" 354 499 -#media "ISOB7/ISO B7" 249 354 -#media "ISOB8/ISO B8" 176 249 -#media "ISOB9/ISO B9" 125 176 -#media "ISOB10/ISO B10" 88 125 +#media "ISOB0/B0" 2835 4008 +#media "ISOB1/B1" 2004 2835 +#media "ISOB2/B2" 1417 2004 +#media "ISOB3/B3" 1001 1417 +#media "ISOB4/B4" 709 1001 +#media "ISOB5/B5" 499 709 +#media "ISOB5Extra/B5 Oversize" 570 782 +#media "ISOB6/B6" 354 499 +#media "ISOB7/B7" 249 354 +#media "ISOB8/B8" 176 249 +#media "ISOB9/B9" 125 176 +#media "ISOB10/B10" 88 125 #media "Ledger/US Ledger" 1224 792 #media "Legal/US Legal" 612 1008 -#media "LegalExtra/US Legal (Oversize)" 684 1080 +#media "LegalExtra/US Legal Oversize" 684 1080 #media "Letter/US Letter" 612 792 #media "Letter.Transverse/US Letter" 792 612 -#media "LetterExtra/US Letter (Oversize)" 684 864 -#media "LetterExtra.Transverse/US Letter (Oversize)" 864 684 -#media "LetterPlus/US Letter (Oversize)" 612 914 +#media "LetterExtra/US Letter Oversize" 684 864 +#media "LetterExtra.Transverse/US Letter Oversize" 864 684 +#media "LetterPlus/US Letter Oversize" 612 914 #media "LetterRotated/US Letter" 792 612 -#media "LetterSmall/US Letter (Small)" 612 792 +#media "LetterSmall/US Letter Small" 612 792 #media "Monarch/Monarch" 279 540 #media "Note/Note" 612 792 #media "Postcard/Postcard" 284 419 @@ -172,15 +172,15 @@ #media "PRC16K/PRC16K" 414 610 #media "PRC16KRotated/PRC16K" 610 414 #media "PRC32K/PRC32K" 275 428 -#media "PRC32KBig/PRC32K (Oversize)" 275 428 -#media "PRC32KBigRotated/PRC32K (Oversize)" 428 275 +#media "PRC32KBig/PRC32K Oversize" 275 428 +#media "PRC32KBigRotated/PRC32K Oversize" 428 275 #media "PRC32KRotated/PRC32K" 428 275 #media "Quarto/Quarto" 610 780 #media "Statement/Statement" 396 612 #media "SuperA/Super A" 643 1009 #media "SuperB/Super B" 864 1380 #media "Tabloid/Tabloid" 792 1224 -#media "TabloidExtra/Tabloid (Oversize)" 864 1296 +#media "TabloidExtra/Tabloid Oversize" 864 1296 /* * Non-standard sizes... @@ -188,7 +188,6 @@ #media "Photo4x6/Photo" 288 432 #media "PhotoLabel/Photo Labels" 288 468 -#media "w288h418/Photo" 288 418 #media "w936h1368/Super B/A3" 936 1368 #media "w81h252/Address" 81 252 #media "w101h252/Large Address" 101 252 diff --git a/doc/help/spec-raster.html b/doc/help/spec-raster.html index 7d285e80f..61e61d5ec 100644 --- a/doc/help/spec-raster.html +++ b/doc/help/spec-raster.html @@ -263,14 +263,14 @@ Unsigned Integer cupsBitsPerColor 1, 2, 4, 8 bits for version 1 raster files
- 1, 2, 4, 8, and 16 bits for version 2 raster files + 1, 2, 4, 8, and 16 bits for version 2/3 raster files 388-391 Unsigned Integer cupsBitsPerPixel 1 to 32 bits for version 1 raster files
- 1 to 64 bits for version 2 raster files + 1 to 240 bits for version 2/3 raster files 392-395 @@ -327,20 +327,20 @@ 45 = ICCE (CIE Lab with hint for 14 colors)
46 = ICCF (CIE Lab with hint for 15 colors)
48 = Device1 (DeviceN for 1 color)
- 48 = Device2 (DeviceN for 2 colors)
- 48 = Device3 (DeviceN for 3 colors)
- 48 = Device4 (DeviceN for 4 colors)
- 48 = Device5 (DeviceN for 5 colors)
- 48 = Device6 (DeviceN for 6 colors)
- 48 = Device7 (DeviceN for 7 colors)
- 48 = Device8 (DeviceN for 8 colors)
- 48 = Device9 (DeviceN for 9 colors)
- 48 = DeviceA (DeviceN for 10 colors)
- 48 = DeviceB (DeviceN for 11 colors)
- 48 = DeviceC (DeviceN for 12 colors)
- 48 = DeviceD (DeviceN for 13 colors)
- 48 = DeviceE (DeviceN for 14 colors)
- 48 = DeviceF (DeviceN for 15 colors) + 49 = Device2 (DeviceN for 2 colors)
+ 50 = Device3 (DeviceN for 3 colors)
+ 51 = Device4 (DeviceN for 4 colors)
+ 52 = Device5 (DeviceN for 5 colors)
+ 53 = Device6 (DeviceN for 6 colors)
+ 54 = Device7 (DeviceN for 7 colors)
+ 55 = Device8 (DeviceN for 8 colors)
+ 56 = Device9 (DeviceN for 9 colors)
+ 57 = DeviceA (DeviceN for 10 colors)
+ 58 = DeviceB (DeviceN for 11 colors)
+ 59 = DeviceC (DeviceN for 12 colors)
+ 60 = DeviceD (DeviceN for 13 colors)
+ 61 = DeviceE (DeviceN for 14 colors)
+ 62 = DeviceF (DeviceN for 15 colors) @@ -397,7 +397,7 @@ 420-423 Unsigned Integer cupsNumColors - 1 to 6 colors + 1 to 15 colors 424-427 diff --git a/locale/Makefile b/locale/Makefile index 8b672deb5..3789ea4cf 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -3,7 +3,7 @@ # # Locale file makefile for the Common UNIX Printing System (CUPS). # -# Copyright 2007-2008 by Apple Inc. +# Copyright 2007-2011 by Apple Inc. # Copyright 1993-2007 by Easy Software Products. # # These coded instructions, statements, and computer programs are the @@ -130,7 +130,7 @@ pot: checkpo po2strings echo Updating cups.pot... mv cups.pot cups.pot.bck touch cups.pot - cd ..; xgettext -o locale/cups.pot -s \ + cd ..; xgettext -o locale/cups.pot -cTRANSLATORS -s \ --keyword=_ --no-wrap \ --copyright-holder="Apple Inc." \ --package-name="CUPS" --package-version="1.5" \ diff --git a/locale/cups.pot b/locale/cups.pot index 0a47eea13..2f2cdb30f 100644 --- a/locale/cups.pot +++ b/locale/cups.pot @@ -30,10 +30,11 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.5\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2011-03-14 15:47-0700\n" +"POT-Creation-Date: 2011-03-21 15:59-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" @@ -191,61 +192,61 @@ msgstr "" msgid "\treason unknown" msgstr "" -#: systemv/cupstestppd.c:434 +#: systemv/cupstestppd.c:436 msgid "" "\n" " DETAILED CONFORMANCE TEST RESULTS" msgstr "" -#: systemv/cupstestppd.c:3494 -msgid " Ignore specific warnings." +#: systemv/cupstestppd.c:3493 +msgid " Ignore specific warnings." msgstr "" -#: systemv/cupstestppd.c:3498 -msgid " Issue warnings instead of errors." +#: systemv/cupstestppd.c:3497 +msgid " Issue warnings instead of errors." msgstr "" -#: systemv/cupstestppd.c:390 systemv/cupstestppd.c:395 +#: systemv/cupstestppd.c:392 systemv/cupstestppd.c:397 msgid " REF: Page 15, section 3.1." msgstr "" -#: systemv/cupstestppd.c:385 +#: systemv/cupstestppd.c:387 msgid " REF: Page 15, section 3.2." msgstr "" -#: systemv/cupstestppd.c:405 +#: systemv/cupstestppd.c:407 msgid " REF: Page 19, section 3.3." msgstr "" -#: systemv/cupstestppd.c:358 +#: systemv/cupstestppd.c:360 msgid " REF: Page 20, section 3.4." msgstr "" -#: systemv/cupstestppd.c:410 +#: systemv/cupstestppd.c:412 msgid " REF: Page 27, section 3.5." msgstr "" -#: systemv/cupstestppd.c:353 +#: systemv/cupstestppd.c:355 msgid " REF: Page 42, section 5.2." msgstr "" -#: systemv/cupstestppd.c:400 +#: systemv/cupstestppd.c:402 msgid " REF: Pages 16-17, section 3.2." msgstr "" -#: systemv/cupstestppd.c:370 +#: systemv/cupstestppd.c:372 msgid " REF: Pages 42-45, section 5.2." msgstr "" -#: systemv/cupstestppd.c:364 +#: systemv/cupstestppd.c:366 msgid " REF: Pages 45-46, section 5.2." msgstr "" -#: systemv/cupstestppd.c:375 +#: systemv/cupstestppd.c:377 msgid " REF: Pages 48-49, section 5.2." msgstr "" -#: systemv/cupstestppd.c:380 +#: systemv/cupstestppd.c:382 msgid " REF: Pages 52-54, section 5.2." msgstr "" @@ -254,158 +255,158 @@ msgstr "" msgid " %-39.39s %.0f bytes" msgstr "" -#: systemv/cupstestppd.c:553 +#: systemv/cupstestppd.c:555 #, c-format msgid " PASS Default%s" msgstr "" -#: systemv/cupstestppd.c:488 +#: systemv/cupstestppd.c:490 msgid " PASS DefaultImageableArea" msgstr "" -#: systemv/cupstestppd.c:522 +#: systemv/cupstestppd.c:524 msgid " PASS DefaultPaperDimension" msgstr "" -#: systemv/cupstestppd.c:595 +#: systemv/cupstestppd.c:597 msgid " PASS FileVersion" msgstr "" -#: systemv/cupstestppd.c:639 +#: systemv/cupstestppd.c:641 msgid " PASS FormatVersion" msgstr "" -#: systemv/cupstestppd.c:659 +#: systemv/cupstestppd.c:661 msgid " PASS LanguageEncoding" msgstr "" -#: systemv/cupstestppd.c:679 +#: systemv/cupstestppd.c:681 msgid " PASS LanguageVersion" msgstr "" -#: systemv/cupstestppd.c:731 +#: systemv/cupstestppd.c:733 msgid " PASS Manufacturer" msgstr "" -#: systemv/cupstestppd.c:771 +#: systemv/cupstestppd.c:773 msgid " PASS ModelName" msgstr "" -#: systemv/cupstestppd.c:791 +#: systemv/cupstestppd.c:793 msgid " PASS NickName" msgstr "" -#: systemv/cupstestppd.c:851 +#: systemv/cupstestppd.c:853 msgid " PASS PCFileName" msgstr "" -#: systemv/cupstestppd.c:926 +#: systemv/cupstestppd.c:928 msgid " PASS PSVersion" msgstr "" -#: systemv/cupstestppd.c:831 +#: systemv/cupstestppd.c:833 msgid " PASS PageRegion" msgstr "" -#: systemv/cupstestppd.c:811 +#: systemv/cupstestppd.c:813 msgid " PASS PageSize" msgstr "" -#: systemv/cupstestppd.c:886 +#: systemv/cupstestppd.c:888 msgid " PASS Product" msgstr "" -#: systemv/cupstestppd.c:961 +#: systemv/cupstestppd.c:963 msgid " PASS ShortNickName" msgstr "" -#: systemv/cupstestppd.c:3421 +#: systemv/cupstestppd.c:3420 #, c-format msgid "" " WARN \"%s %s\" conflicts with \"%s %s\"\n" " (constraint=\"%s %s %s %s\")." msgstr "" -#: systemv/cupstestppd.c:1336 +#: systemv/cupstestppd.c:1338 #, c-format msgid " WARN %s has no corresponding options." msgstr "" -#: systemv/cupstestppd.c:1457 +#: systemv/cupstestppd.c:1459 #, c-format msgid "" " WARN %s shares a common prefix with %s\n" " REF: Page 15, section 3.2." msgstr "" -#: systemv/cupstestppd.c:1345 +#: systemv/cupstestppd.c:1347 msgid " WARN Default choices conflicting." msgstr "" -#: systemv/cupstestppd.c:1307 +#: systemv/cupstestppd.c:1309 #, 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:1715 +#: systemv/cupstestppd.c:1717 msgid " WARN File contains a mix of CR, LF, and CR LF line endings." msgstr "" -#: systemv/cupstestppd.c:1361 +#: systemv/cupstestppd.c:1363 msgid "" " WARN LanguageEncoding required by PPD 4.3 spec.\n" " REF: Pages 56-57, section 5.3." msgstr "" -#: systemv/cupstestppd.c:1697 +#: systemv/cupstestppd.c:1699 #, c-format msgid " WARN Line %d only contains whitespace." msgstr "" -#: systemv/cupstestppd.c:1369 +#: systemv/cupstestppd.c:1371 msgid "" " WARN Manufacturer required by PPD 4.3 spec.\n" " REF: Pages 58-59, section 5.3." msgstr "" -#: systemv/cupstestppd.c:1720 +#: systemv/cupstestppd.c:1722 msgid " WARN Non-Windows PPD files should use lines ending with only LF, not CR LF." msgstr "" -#: systemv/cupstestppd.c:1353 +#: systemv/cupstestppd.c:1355 #, c-format msgid "" " WARN Obsolete PPD version %.1f.\n" " REF: Page 42, section 5.2." msgstr "" -#: systemv/cupstestppd.c:1384 +#: systemv/cupstestppd.c:1386 msgid "" " WARN PCFileName longer than 8.3 in violation of PPD spec.\n" " REF: Pages 61-62, section 5.3." msgstr "" -#: systemv/cupstestppd.c:1392 +#: systemv/cupstestppd.c:1394 msgid "" " WARN PCFileName should contain a unique filename.\n" " REF: Pages 61-62, section 5.3." msgstr "" -#: systemv/cupstestppd.c:1427 +#: systemv/cupstestppd.c:1429 msgid "" " WARN Protocols contains PJL but JCL attributes are not set.\n" " REF: Pages 78-79, section 5.7." msgstr "" -#: systemv/cupstestppd.c:1418 +#: systemv/cupstestppd.c:1420 msgid "" " WARN Protocols contains both PJL and BCP; expected TBCP.\n" " REF: Pages 78-79, section 5.7." msgstr "" -#: systemv/cupstestppd.c:1401 +#: systemv/cupstestppd.c:1403 msgid "" " WARN ShortNickName required by PPD 4.3 spec.\n" " REF: Pages 64-65, section 5.3." @@ -419,415 +420,351 @@ msgstr "" msgid " cupstestdsc [options] -" msgstr "" -#: systemv/cupstestppd.c:3489 +#: systemv/cupstestppd.c:3488 msgid " program | cupstestppd [options] -" msgstr "" -#: systemv/cupstestppd.c:2203 +#: systemv/cupstestppd.c:2205 #, c-format msgid " %s %s %s does not exist." msgstr "" -#: systemv/cupstestppd.c:3578 +#: systemv/cupstestppd.c:3577 #, c-format msgid " %s %s file \"%s\" has the wrong capitalization." msgstr "" -#: systemv/cupstestppd.c:2273 +#: systemv/cupstestppd.c:2275 #, c-format msgid "" " %s Bad %s choice %s.\n" " REF: Page 122, section 5.17" msgstr "" -#: systemv/cupstestppd.c:3182 systemv/cupstestppd.c:3231 -#: systemv/cupstestppd.c:3270 +#: systemv/cupstestppd.c:3181 systemv/cupstestppd.c:3230 +#: systemv/cupstestppd.c:3269 #, c-format msgid " %s Bad UTF-8 \"%s\" translation string for option %s, choice %s." msgstr "" -#: systemv/cupstestppd.c:3136 +#: systemv/cupstestppd.c:3135 #, c-format msgid " %s Bad UTF-8 \"%s\" translation string for option %s." msgstr "" -#: systemv/cupstestppd.c:2326 +#: systemv/cupstestppd.c:2328 #, c-format msgid " %s Bad cupsFilter value \"%s\"." msgstr "" -#: systemv/cupstestppd.c:2808 +#: systemv/cupstestppd.c:2807 #, c-format msgid " %s Bad cupsICCProfile %s." msgstr "" -#: systemv/cupstestppd.c:2411 +#: systemv/cupstestppd.c:2414 #, c-format msgid " %s Bad cupsPreFilter value \"%s\"." msgstr "" -#: systemv/cupstestppd.c:1793 +#: systemv/cupstestppd.c:1795 #, c-format msgid " %s Bad cupsUIConstraints %s: \"%s\"" msgstr "" -#: systemv/cupstestppd.c:3086 +#: systemv/cupstestppd.c:3085 #, c-format msgid " %s Bad language \"%s\"." msgstr "" -#: systemv/cupstestppd.c:2513 -#, c-format -msgid " %s Bad permissions on APDialogExtension file \"%s\"." -msgstr "" - -#: systemv/cupstestppd.c:2569 -#, c-format -msgid " %s Bad permissions on APPrinterIconPath file \"%s\"." -msgstr "" - -#: systemv/cupstestppd.c:2625 -#, c-format -msgid " %s Bad permissions on APPrinterLowInkTool file \"%s\"." -msgstr "" - -#: systemv/cupstestppd.c:2681 -#, c-format -msgid " %s Bad permissions on APPrinterUtilityPath file \"%s\"." -msgstr "" - -#: systemv/cupstestppd.c:2734 -#, c-format -msgid " %s Bad permissions on APScanAppPath file \"%s\"." -msgstr "" - -#: systemv/cupstestppd.c:2369 -#, c-format -msgid " %s Bad permissions on cupsFilter file \"%s\"." -msgstr "" - -#: systemv/cupstestppd.c:2856 +#: systemv/cupstestppd.c:2372 systemv/cupstestppd.c:2458 +#: systemv/cupstestppd.c:2516 systemv/cupstestppd.c:2571 +#: systemv/cupstestppd.c:2626 systemv/cupstestppd.c:2681 +#: systemv/cupstestppd.c:2734 systemv/cupstestppd.c:2856 #, c-format -msgid " %s Bad permissions on cupsICCProfile file \"%s\"." +msgid " %s Bad permissions on %s file \"%s\"." msgstr "" -#: systemv/cupstestppd.c:2454 -#, c-format -msgid " %s Bad permissions on cupsPreFilter file \"%s\"." -msgstr "" - -#: systemv/cupstestppd.c:2395 systemv/cupstestppd.c:2482 -#: systemv/cupstestppd.c:2538 systemv/cupstestppd.c:2594 -#: systemv/cupstestppd.c:2650 systemv/cupstestppd.c:2706 +#: systemv/cupstestppd.c:2398 systemv/cupstestppd.c:2485 +#: systemv/cupstestppd.c:2540 systemv/cupstestppd.c:2595 +#: systemv/cupstestppd.c:2650 systemv/cupstestppd.c:2705 #, c-format msgid " %s Bad spelling of %s - should be %s." msgstr "" -#: systemv/cupstestppd.c:2751 +#: systemv/cupstestppd.c:2750 #, c-format msgid " %s Cannot provide both APScanAppPath and APScanAppBundleID." msgstr "" -#: systemv/cupstestppd.c:1774 +#: systemv/cupstestppd.c:1776 #, c-format msgid " %s Empty cupsUIConstraints %s" msgstr "" -#: systemv/cupstestppd.c:3214 systemv/cupstestppd.c:3254 +#: systemv/cupstestppd.c:3213 systemv/cupstestppd.c:3253 #, c-format msgid " %s Missing \"%s\" translation string for option %s, choice %s." msgstr "" -#: systemv/cupstestppd.c:3122 +#: systemv/cupstestppd.c:3121 #, c-format msgid " %s Missing \"%s\" translation string for option %s." msgstr "" -#: systemv/cupstestppd.c:2498 -#, c-format -msgid " %s Missing APDialogExtension file \"%s\"." -msgstr "" - -#: systemv/cupstestppd.c:2554 -#, c-format -msgid " %s Missing APPrinterIconPath file \"%s\"." -msgstr "" - -#: systemv/cupstestppd.c:2610 -#, c-format -msgid " %s Missing APPrinterLowInkTool file \"%s\"." -msgstr "" - -#: systemv/cupstestppd.c:2666 +#: systemv/cupstestppd.c:2357 systemv/cupstestppd.c:2443 +#: systemv/cupstestppd.c:2501 systemv/cupstestppd.c:2556 +#: systemv/cupstestppd.c:2611 systemv/cupstestppd.c:2666 +#: systemv/cupstestppd.c:2718 systemv/cupstestppd.c:2841 #, c-format -msgid " %s Missing APPrinterUtilityPath file \"%s\"." +msgid " %s Missing %s file \"%s\"." msgstr "" -#: systemv/cupstestppd.c:2719 -#, c-format -msgid " %s Missing APScanAppPath file \"%s\"." -msgstr "" - -#: systemv/cupstestppd.c:2953 +#: systemv/cupstestppd.c:2952 #, c-format msgid "" " %s Missing REQUIRED PageRegion option.\n" " REF: Page 100, section 5.14." msgstr "" -#: systemv/cupstestppd.c:2938 +#: systemv/cupstestppd.c:2937 #, c-format msgid "" " %s Missing REQUIRED PageSize option.\n" " REF: Page 99, section 5.14." msgstr "" -#: systemv/cupstestppd.c:1984 systemv/cupstestppd.c:2025 +#: systemv/cupstestppd.c:1986 systemv/cupstestppd.c:2027 #, c-format msgid " %s Missing choice *%s %s in UIConstraints \"*%s %s *%s %s\"." msgstr "" -#: systemv/cupstestppd.c:1879 +#: systemv/cupstestppd.c:1881 #, c-format msgid " %s Missing choice *%s %s in cupsUIConstraints %s: \"%s\"" msgstr "" -#: systemv/cupstestppd.c:2355 -#, c-format -msgid " %s Missing cupsFilter file \"%s\"." -msgstr "" - -#: systemv/cupstestppd.c:2842 -#, c-format -msgid " %s Missing cupsICCProfile file \"%s\"." -msgstr "" - -#: systemv/cupstestppd.c:2440 -#, c-format -msgid " %s Missing cupsPreFilter file \"%s\"." -msgstr "" - -#: systemv/cupstestppd.c:1811 +#: systemv/cupstestppd.c:1813 #, c-format msgid " %s Missing cupsUIResolver %s" msgstr "" -#: systemv/cupstestppd.c:1970 systemv/cupstestppd.c:2011 +#: systemv/cupstestppd.c:1972 systemv/cupstestppd.c:2013 #, c-format msgid " %s Missing option %s in UIConstraints \"*%s %s *%s %s\"." msgstr "" -#: systemv/cupstestppd.c:1863 +#: systemv/cupstestppd.c:1865 #, c-format msgid " %s Missing option %s in cupsUIConstraints %s: \"%s\"" msgstr "" -#: systemv/cupstestppd.c:3308 +#: systemv/cupstestppd.c:3307 #, c-format msgid " %s No base translation \"%s\" is included in file." msgstr "" -#: systemv/cupstestppd.c:2249 +#: systemv/cupstestppd.c:2251 #, c-format msgid "" " %s REQUIRED %s does not define choice None.\n" " REF: Page 122, section 5.17" msgstr "" -#: systemv/cupstestppd.c:3011 systemv/cupstestppd.c:3025 +#: systemv/cupstestppd.c:3010 systemv/cupstestppd.c:3024 #, c-format msgid " %s Size \"%s\" defined for %s but not for %s." msgstr "" -#: systemv/cupstestppd.c:2991 +#: systemv/cupstestppd.c:2990 #, c-format msgid " %s Size \"%s\" has unexpected dimensions (%gx%g)." msgstr "" -#: systemv/cupstestppd.c:2885 +#: systemv/cupstestppd.c:2884 #, c-format msgid " %s cupsICCProfile %s hash value collides with %s." msgstr "" -#: systemv/cupstestppd.c:1934 +#: systemv/cupstestppd.c:1936 #, c-format msgid " %s cupsUIResolver %s causes a loop." msgstr "" -#: systemv/cupstestppd.c:1916 +#: systemv/cupstestppd.c:1918 #, c-format msgid " %s cupsUIResolver %s does not list at least two different options." msgstr "" -#: systemv/cupstestppd.c:2134 +#: systemv/cupstestppd.c:2136 #, c-format msgid " **FAIL** %s choice names %s and %s differ only by case." msgstr "" -#: systemv/cupstestppd.c:1130 +#: systemv/cupstestppd.c:1132 #, c-format msgid "" " **FAIL** %s must be 1284DeviceID\n" " REF: Page 72, section 5.5" msgstr "" -#: systemv/cupstestppd.c:544 +#: systemv/cupstestppd.c:546 #, c-format msgid "" " **FAIL** BAD Default%s %s\n" " REF: Page 40, section 4.5." msgstr "" -#: systemv/cupstestppd.c:478 +#: systemv/cupstestppd.c:480 #, c-format msgid "" " **FAIL** BAD DefaultImageableArea %s\n" " REF: Page 102, section 5.15." msgstr "" -#: systemv/cupstestppd.c:514 +#: systemv/cupstestppd.c:516 #, c-format msgid "" " **FAIL** BAD DefaultPaperDimension %s\n" " REF: Page 103, section 5.15." msgstr "" -#: systemv/cupstestppd.c:987 +#: systemv/cupstestppd.c:989 msgid "" " **FAIL** BAD JobPatchFile attribute in file\n" " REF: Page 24, section 3.4." msgstr "" -#: systemv/cupstestppd.c:707 +#: systemv/cupstestppd.c:709 msgid "" " **FAIL** BAD Manufacturer (should be \"HP\")\n" " REF: Page 211, table D.1." msgstr "" -#: systemv/cupstestppd.c:723 +#: systemv/cupstestppd.c:725 msgid "" " **FAIL** BAD Manufacturer (should be \"Oki\")\n" " REF: Page 211, table D.1." msgstr "" -#: systemv/cupstestppd.c:762 +#: systemv/cupstestppd.c:764 #, c-format msgid "" " **FAIL** BAD ModelName - \"%c\" not allowed in string.\n" " REF: Pages 59-60, section 5.3." msgstr "" -#: systemv/cupstestppd.c:918 +#: systemv/cupstestppd.c:920 msgid "" " **FAIL** BAD PSVersion - not \"(string) int\".\n" " REF: Pages 62-64, section 5.3." msgstr "" -#: systemv/cupstestppd.c:879 +#: systemv/cupstestppd.c:881 msgid "" " **FAIL** BAD Product - not \"(string)\".\n" " REF: Page 62, section 5.3." msgstr "" -#: systemv/cupstestppd.c:953 +#: systemv/cupstestppd.c:955 msgid "" " **FAIL** BAD ShortNickName - longer than 31 chars.\n" " REF: Pages 64-65, section 5.3." msgstr "" -#: systemv/cupstestppd.c:1111 +#: systemv/cupstestppd.c:1113 #, c-format msgid "" " **FAIL** Bad %s choice %s\n" " REF: Page 84, section 5.9" msgstr "" -#: systemv/cupstestppd.c:587 +#: systemv/cupstestppd.c:589 #, c-format msgid "" " **FAIL** Bad FileVersion \"%s\"\n" " REF: Page 56, section 5.3." msgstr "" -#: systemv/cupstestppd.c:631 +#: systemv/cupstestppd.c:633 #, c-format msgid "" " **FAIL** Bad FormatVersion \"%s\"\n" " REF: Page 56, section 5.3." msgstr "" -#: systemv/cupstestppd.c:1175 +#: systemv/cupstestppd.c:1177 #, c-format msgid " **FAIL** Bad LanguageEncoding %s - must be ISOLatin1." msgstr "" -#: systemv/cupstestppd.c:1189 +#: systemv/cupstestppd.c:1191 #, c-format msgid " **FAIL** Bad LanguageVersion %s - must be English." msgstr "" -#: systemv/cupstestppd.c:3448 systemv/cupstestppd.c:3470 +#: systemv/cupstestppd.c:3447 systemv/cupstestppd.c:3469 #, c-format msgid " **FAIL** Default option code cannot be interpreted: %s" msgstr "" -#: systemv/cupstestppd.c:1248 +#: systemv/cupstestppd.c:1250 #, c-format msgid " **FAIL** Default translation string for option %s choice %s contains 8-bit characters." msgstr "" -#: systemv/cupstestppd.c:1221 +#: systemv/cupstestppd.c:1223 #, c-format msgid " **FAIL** Default translation string for option %s contains 8-bit characters." msgstr "" -#: systemv/cupstestppd.c:2072 +#: systemv/cupstestppd.c:2074 #, c-format msgid " **FAIL** Group names %s and %s differ only by case." msgstr "" -#: systemv/cupstestppd.c:2117 +#: systemv/cupstestppd.c:2119 #, c-format msgid " **FAIL** Multiple occurrences of %s choice name %s." msgstr "" -#: systemv/cupstestppd.c:2094 +#: systemv/cupstestppd.c:2096 #, c-format msgid " **FAIL** Option names %s and %s differ only by case." msgstr "" -#: systemv/cupstestppd.c:564 +#: systemv/cupstestppd.c:566 #, c-format msgid "" " **FAIL** REQUIRED Default%s\n" " REF: Page 40, section 4.5." msgstr "" -#: systemv/cupstestppd.c:463 +#: systemv/cupstestppd.c:465 msgid "" " **FAIL** REQUIRED DefaultImageableArea\n" " REF: Page 102, section 5.15." msgstr "" -#: systemv/cupstestppd.c:499 +#: systemv/cupstestppd.c:501 msgid "" " **FAIL** REQUIRED DefaultPaperDimension\n" " REF: Page 103, section 5.15." msgstr "" -#: systemv/cupstestppd.c:605 +#: systemv/cupstestppd.c:607 msgid "" " **FAIL** REQUIRED FileVersion\n" " REF: Page 56, section 5.3." msgstr "" -#: systemv/cupstestppd.c:649 +#: systemv/cupstestppd.c:651 msgid "" " **FAIL** REQUIRED FormatVersion\n" " REF: Page 56, section 5.3." msgstr "" -#: systemv/cupstestppd.c:1038 +#: systemv/cupstestppd.c:1040 #, c-format msgid "" " **FAIL** REQUIRED ImageableArea for PageSize %s\n" @@ -835,68 +772,68 @@ msgid "" " REF: Page 102, section 5.15." msgstr "" -#: systemv/cupstestppd.c:669 +#: systemv/cupstestppd.c:671 msgid "" " **FAIL** REQUIRED LanguageEncoding\n" " REF: Pages 56-57, section 5.3." msgstr "" -#: systemv/cupstestppd.c:689 +#: systemv/cupstestppd.c:691 msgid "" " **FAIL** REQUIRED LanguageVersion\n" " REF: Pages 57-58, section 5.3." msgstr "" -#: systemv/cupstestppd.c:741 +#: systemv/cupstestppd.c:743 msgid "" " **FAIL** REQUIRED Manufacturer\n" " REF: Pages 58-59, section 5.3." msgstr "" -#: systemv/cupstestppd.c:781 +#: systemv/cupstestppd.c:783 msgid "" " **FAIL** REQUIRED ModelName\n" " REF: Pages 59-60, section 5.3." msgstr "" -#: systemv/cupstestppd.c:801 +#: systemv/cupstestppd.c:803 msgid "" " **FAIL** REQUIRED NickName\n" " REF: Page 60, section 5.3." msgstr "" -#: systemv/cupstestppd.c:861 +#: systemv/cupstestppd.c:863 msgid "" " **FAIL** REQUIRED PCFileName\n" " REF: Pages 61-62, section 5.3." msgstr "" -#: systemv/cupstestppd.c:936 +#: systemv/cupstestppd.c:938 msgid "" " **FAIL** REQUIRED PSVersion\n" " REF: Pages 62-64, section 5.3." msgstr "" -#: systemv/cupstestppd.c:841 +#: systemv/cupstestppd.c:843 msgid "" " **FAIL** REQUIRED PageRegion\n" " REF: Page 100, section 5.14." msgstr "" -#: systemv/cupstestppd.c:1007 +#: systemv/cupstestppd.c:1009 msgid "" " **FAIL** REQUIRED PageSize\n" " REF: Page 41, section 5.\n" " REF: Page 99, section 5.14." msgstr "" -#: systemv/cupstestppd.c:821 +#: systemv/cupstestppd.c:823 msgid "" " **FAIL** REQUIRED PageSize\n" " REF: Pages 99-100, section 5.14." msgstr "" -#: systemv/cupstestppd.c:1060 +#: systemv/cupstestppd.c:1062 #, c-format msgid "" " **FAIL** REQUIRED PaperDimension for PageSize %s\n" @@ -904,91 +841,37 @@ msgid "" " REF: Page 103, section 5.15." msgstr "" -#: systemv/cupstestppd.c:896 +#: systemv/cupstestppd.c:898 msgid "" " **FAIL** REQUIRED Product\n" " REF: Page 62, section 5.3." msgstr "" -#: systemv/cupstestppd.c:971 +#: systemv/cupstestppd.c:973 msgid "" " **FAIL** REQUIRED ShortNickName\n" " REF: Page 64-65, section 5.3." msgstr "" -#: systemv/cupstestppd.c:1469 +#: systemv/cupstestppd.c:335 #, c-format -msgid " %d ERRORS FOUND" -msgstr "" - -#: systemv/cupsctl.c:216 -msgid " --[no-]debug-logging Turn debug logging on/off." -msgstr "" - -#: systemv/cupsctl.c:218 -msgid " --[no-]remote-admin Turn remote administration on/off." -msgstr "" - -#: systemv/cupsctl.c:220 -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 -msgid " --[no-]share-printers Turn printer sharing on/off." -msgstr "" - -#: systemv/cupsctl.c:226 -msgid " --[no-]user-cancel-any Allow/prevent users to cancel any job." -msgstr "" - -#: systemv/cupsctl.c:211 -msgid " -E Enable encryption." -msgstr "" - -#: systemv/cupstestppd.c:3493 -msgid " -I {filename,filters,none,profiles}" -msgstr "" - -#: systemv/cupstestppd.c:3495 -msgid " -R root-directory Set alternate root." +msgid " **FAIL** Unable to open PPD file - %s" msgstr "" -#: systemv/cupsctl.c:212 -msgid " -U username Specify username." +#: systemv/cupstestppd.c:347 +#, c-format +msgid " **FAIL** Unable to open PPD file - %s on line %d." msgstr "" -#: systemv/cupstestppd.c:3496 -msgid " -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,translations}" +#: systemv/cupstestppd.c:1471 +#, c-format +msgid " %d ERRORS FOUND" msgstr "" #: systemv/cupstestdsc.c:431 msgid " -h Show program usage" msgstr "" -#: systemv/cupsctl.c:213 -msgid " -h server[:port] Specify server address." -msgstr "" - -#: systemv/cupstestppd.c:3500 -msgid " -q Run silently." -msgstr "" - -#: systemv/cupstestppd.c:3501 -msgid " -r Use 'relaxed' open mode." -msgstr "" - -#: systemv/cupstestppd.c:3502 -msgid " -v Be slightly verbose." -msgstr "" - -#: systemv/cupstestppd.c:3503 -msgid " -vv Be very verbose." -msgstr "" - #: systemv/cupstestdsc.c:234 systemv/cupstestdsc.c:276 #, c-format msgid "" @@ -1049,7 +932,7 @@ msgid "" " REF: Page 43, %%Pages:" msgstr "" -#: systemv/cupstestppd.c:1471 +#: systemv/cupstestppd.c:1473 msgid " NO ERRORS FOUND" msgstr "" @@ -1082,339 +965,378 @@ msgstr "" msgid " Warning: obsolete DSC version %.1f in file." msgstr "" +#: systemv/cupsctl.c:216 +msgid " --[no-]debug-logging Turn debug logging on/off." +msgstr "" + +#: systemv/cupsctl.c:218 +msgid " --[no-]remote-admin Turn remote administration on/off." +msgstr "" + +#: systemv/cupsctl.c:220 +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 +msgid " --[no-]share-printers Turn printer sharing on/off." +msgstr "" + +#: systemv/cupsctl.c:226 +msgid " --[no-]user-cancel-any Allow/prevent users to cancel any job." +msgstr "" + #: ppdc/ppdc.cxx:456 -msgid " --cr End lines with CR (Mac OS 9)." +msgid " --cr End lines with CR (Mac OS 9)." msgstr "" #: ppdc/ppdc.cxx:458 -msgid " --crlf End lines with CR + LF (Windows)." +msgid " --crlf End lines with CR + LF (Windows)." msgstr "" #: ppdc/ppdc.cxx:460 -msgid " --lf End lines with LF (UNIX/Linux/Mac OS X)." +msgid " --lf End lines with LF (UNIX/Linux/Mac OS X)." msgstr "" -#: test/ipptool.c:3826 -msgid " -4 Connect using IPv4." +#: test/ipptool.c:3828 +msgid " -4 Connect using IPv4." msgstr "" -#: test/ipptool.c:3827 -msgid " -6 Connect using IPv6." +#: test/ipptool.c:3829 +msgid " -6 Connect using IPv6." msgstr "" -#: test/ipptool.c:3828 -msgid " -C Send requests using chunking (default)." +#: test/ipptool.c:3830 +msgid " -C Send requests using chunking (default)." msgstr "" -#: scheduler/cupsfilter.c:1391 -msgid " -D Remove the input file when finished." +#: scheduler/cupsfilter.c:1357 scheduler/cupsfilter.c:1384 +msgid " -D Remove the input file when finished." msgstr "" -#: ppdc/ppdc.cxx:438 ppdc/ppdhtml.cxx:175 -msgid " -D name=value Set named variable to value." +#: ppdc/ppdc.cxx:438 ppdc/ppdhtml.cxx:175 ppdc/ppdpo.cxx:255 +msgid " -D name=value Set named variable to value." msgstr "" -#: ppdc/ppdpo.cxx:255 -msgid " -D name=value Set named variable to value." +#: systemv/cupsctl.c:211 +msgid " -E Enable encryption." msgstr "" #: systemv/cupsaddsmb.c:285 -msgid " -E Encrypt the connection to the server." +msgid " -E Encrypt the connection to the server." msgstr "" -#: test/ipptool.c:3830 -msgid " -E Test with TLS encryption." +#: test/ipptool.c:3832 +msgid " -E Test with TLS encryption." +msgstr "" + +#: scheduler/main.c:2251 +msgid " -F Run in the foreground but detach from console." msgstr "" #: systemv/cupsaddsmb.c:287 -msgid " -H samba-server Use the named SAMBA server." +msgid " -H samba-server Use the named SAMBA server." msgstr "" -#: test/ipptool.c:3831 -msgid " -I Ignore errors." +#: test/ipptool.c:3834 +msgid " -I Ignore errors." msgstr "" -#: ppdc/ppdi.cxx:131 -msgid " -I include-dir" +#: ppdc/ppdc.cxx:440 ppdc/ppdhtml.cxx:177 ppdc/ppdi.cxx:131 ppdc/ppdpo.cxx:257 +msgid " -I include-dir Add include directory to search path." msgstr "" -#: ppdc/ppdc.cxx:440 -msgid " -I include-dir Add include directory to search path." +#: systemv/cupstestppd.c:3492 +msgid " -I {filename,filters,none,profiles}" msgstr "" -#: ppdc/ppdhtml.cxx:177 ppdc/ppdpo.cxx:257 -msgid " -I include-dir Add include directory to search path." +#: scheduler/cupsfilter.c:1386 +msgid " -J title Set title." msgstr "" -#: scheduler/cupsfilter.c:1387 -msgid " -J title Set title." +#: test/ipptool.c:3835 +msgid " -L Send requests using content-length." msgstr "" -#: test/ipptool.c:3832 -msgid " -L Send requests using content-length." +#: scheduler/cupsfilter.c:1359 scheduler/cupsfilter.c:1387 +msgid " -P filename.ppd Set PPD file." msgstr "" -#: scheduler/cupsfilter.c:1384 -msgid " -P filename.ppd Set PPD file." +#: systemv/cupstestppd.c:3494 +msgid " -R root-directory Set alternate root." msgstr "" -#: test/ipptool.c:3834 -msgid " -S Test with SSL encryption." +#: test/ipptool.c:3837 +msgid " -S Test with SSL encryption." msgstr "" -#: test/ipptool.c:3835 -msgid " -T Set the receive/send timeout in seconds." +#: test/ipptool.c:3839 +msgid " -T Set the receive/send timeout in seconds." msgstr "" -#: systemv/cupsaddsmb.c:288 -msgid " -U samba-user Authenticate using the named SAMBA user." +#: systemv/cupsaddsmb.c:289 +msgid " -U samba-user Authenticate using the named SAMBA user." msgstr "" -#: scheduler/cupsfilter.c:1386 -msgid " -U username Set username for job." +#: scheduler/cupsfilter.c:1360 scheduler/cupsfilter.c:1388 +msgid " -U username Set username for job." msgstr "" -#: test/ipptool.c:3837 -msgid " -V version Set default IPP version." +#: systemv/cupsctl.c:212 +msgid " -U username Specify username." +msgstr "" + +#: test/ipptool.c:3841 +msgid " -V version Set default IPP version." msgstr "" -#: test/ipptool.c:3838 -msgid " -X Produce XML plist instead of plain text." +#: systemv/cupstestppd.c:3495 +msgid " -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,translations}" +msgstr "" + +#: test/ipptool.c:3843 +msgid " -X Produce XML plist instead of plain text." msgstr "" -#: systemv/cupsaddsmb.c:290 -msgid " -a Export all printers." +#: systemv/cupsaddsmb.c:291 +msgid " -a Export all printers." msgstr "" -#: scheduler/cupsfilter.c:1385 -msgid " -a 'name=value ...' Set option(s)." +#: scheduler/cupsfilter.c:1389 +msgid " -a 'name=value ...' Set option(s)." msgstr "" #: ppdc/ppdc.cxx:442 -msgid " -c catalog.po Load the specified message catalog." +msgid " -c catalog.po Load the specified message catalog." +msgstr "" + +#: scheduler/main.c:2248 +msgid " -c config-file Load alternate configuration file." msgstr "" -#: scheduler/cupsfilter.c:1388 -msgid " -c copies Set number of copies." +#: scheduler/cupsfilter.c:1390 +msgid " -c copies Set number of copies." msgstr "" -#: scheduler/cupsfilter.c:1358 -msgid " -c cupsd.conf Set cupsd.conf file to use." +#: scheduler/cupsfilter.c:1361 +msgid " -c cupsd.conf Set cupsd.conf file to use." msgstr "" -#: test/ipptool.c:3840 -msgid " -d name=value Define variable." +#: test/ipptool.c:3845 +msgid " -d name=value Set named variable to value." msgstr "" #: ppdc/ppdc.cxx:444 -msgid " -d output-dir Specify the output directory." +msgid " -d output-dir Specify the output directory." msgstr "" -#: scheduler/cupsfilter.c:1373 -msgid " -d printer Use the named printer." +#: scheduler/cupsfilter.c:1363 scheduler/cupsfilter.c:1391 +msgid " -d printer Use the named printer." msgstr "" -#: scheduler/cupsfilter.c:1359 -msgid " -d printer Use the named printer." +#: scheduler/cupsfilter.c:1365 scheduler/cupsfilter.c:1393 +msgid " -e Use every filter from the PPD file." msgstr "" -#: scheduler/cupsfilter.c:1374 -msgid " -e Use every filter from the PPD file." +#: scheduler/main.c:2250 +msgid " -f Run in the foreground." msgstr "" -#: scheduler/cupsfilter.c:1360 -msgid " -e Use every filter from the PPD file." +#: test/ipptool.c:3847 +msgid " -f filename Set default request filename." msgstr "" -#: scheduler/cupsfilter.c:1376 -msgid " -f filename Set file to be converted (otherwise stdin)." +#: scheduler/cupsfilter.c:1395 +msgid " -f filename Set file to be converted (otherwise stdin)." msgstr "" -#: test/ipptool.c:3841 -msgid " -f filename Set default request filename." +#: scheduler/main.c:2253 +msgid " -h Show this usage message." msgstr "" -#: systemv/cupsaddsmb.c:291 -msgid " -h cups-server Use the named CUPS server." +#: systemv/cupsaddsmb.c:292 +msgid " -h cups-server Use the named CUPS server." msgstr "" -#: scheduler/cupsfilter.c:1380 -msgid " -i mime/type Set input MIME type (otherwise auto-typed)." +#: systemv/cupsctl.c:213 +msgid " -h server[:port] Specify server address." msgstr "" -#: test/ipptool.c:3842 -msgid " -i seconds Repeat the last file with the given time interval." +#: scheduler/cupsfilter.c:1367 scheduler/cupsfilter.c:1397 +msgid " -i mime/type Set input MIME type (otherwise auto-typed)." msgstr "" -#: scheduler/cupsfilter.c:1362 -msgid " -j job-id[,N] Filter file N from the specified job (default is file 1)." +#: test/ipptool.c:3849 +msgid " -i seconds Repeat the last file with the given time interval." msgstr "" -#: scheduler/cupsfilter.c:1382 -msgid " -j mime/type Set output MIME type (otherwise application/pdf)." +#: scheduler/cupsfilter.c:1369 +msgid " -j job-id[,N] Filter file N from the specified job (default is file 1)." msgstr "" -#: ppdc/ppdc.cxx:446 -msgid " -l lang[,lang,...] Specify the output language(s) (locale)." +#: scheduler/cupsfilter.c:1399 +msgid " -j mime/type Set output MIME type (otherwise application/pdf)." msgstr "" -#: ppdc/ppdc.cxx:448 -msgid " -m Use the ModelName value as the filename." +#: scheduler/main.c:2254 +msgid " -l Run cupsd from launchd(8)." msgstr "" -#: scheduler/cupsfilter.c:1364 -msgid " -n copies Set number of copies." +#: ppdc/ppdc.cxx:446 +msgid " -l lang[,lang,...] Specify the output language(s) (locale)." msgstr "" -#: test/ipptool.c:3844 -msgid " -n count Repeat the last file the given number of times." +#: ppdc/ppdc.cxx:448 +msgid " -m Use the ModelName value as the filename." msgstr "" -#: scheduler/cupsfilter.c:1378 -msgid " -o filename Set file to be generated (otherwise stdout)." +#: scheduler/cupsfilter.c:1371 +msgid " -m mime/type Set output MIME type (otherwise application/pdf)." msgstr "" -#: ppdc/ppdi.cxx:132 -msgid " -o filename.drv" +#: scheduler/cupsfilter.c:1373 +msgid " -n copies Set number of copies." msgstr "" -#: ppdc/ppdmerge.cxx:370 -msgid " -o filename.ppd[.gz]" +#: test/ipptool.c:3851 +msgid " -n count Repeat the last file the given number of times." msgstr "" -#: scheduler/cupsfilter.c:1365 -msgid " -o name=value Set option(s)." +#: scheduler/cupsfilter.c:1401 +msgid " -o filename Set file to be generated (otherwise stdout)." msgstr "" -#: scheduler/cupsfilter.c:1366 -msgid " -p filename.ppd Set PPD file." +#: ppdc/ppdi.cxx:133 +msgid " -o filename.drv Set driver information file (otherwise ppdi.drv)." msgstr "" -#: test/ipptool.c:3846 -msgid " -q Be quiet - no output except errors." +#: ppdc/ppdmerge.cxx:370 +msgid " -o filename.ppd[.gz] Set output file (otherwise stdout)." msgstr "" -#: ppdc/ppdc.cxx:450 -msgid " -t Test PPDs instead of generating them." +#: scheduler/cupsfilter.c:1374 +msgid " -o name=value Set option(s)." msgstr "" -#: test/ipptool.c:3848 -msgid " -t Produce a test report." +#: scheduler/cupsfilter.c:1375 +msgid " -p filename.ppd Set PPD file." msgstr "" -#: scheduler/cupsfilter.c:1367 -msgid " -t title Set title." +#: test/ipptool.c:3853 +msgid " -q Be quiet - no output except errors." msgstr "" -#: scheduler/cupsfilter.c:1389 -msgid " -u Remove the PPD file when finished." +#: systemv/cupstestppd.c:3499 +msgid " -q Run silently." msgstr "" -#: ppdc/ppdc.cxx:452 -msgid " -v Be verbose (more v's for more verbosity)." +#: systemv/cupstestppd.c:3500 +msgid " -r Use 'relaxed' open mode." msgstr "" -#: ppdc/ppdpo.cxx:259 -msgid " -v Be verbose (more v's for more verbosity)." +#: test/ipptool.c:3855 +msgid " -t Produce a test report." msgstr "" -#: systemv/cupsaddsmb.c:292 -msgid " -v Be verbose (show commands)." +#: ppdc/ppdc.cxx:450 +msgid " -t Test PPDs instead of generating them." msgstr "" -#: test/ipptool.c:3849 -msgid " -v Show all attributes sent and received." +#: scheduler/main.c:2255 +msgid " -t Test the configuration file." msgstr "" -#: ppdc/ppdc.cxx:454 -msgid " -z Compress PPD files using GNU zip." -msgstr "" - -#: systemv/cupstestppd.c:460 systemv/cupstestppd.c:475 -#: systemv/cupstestppd.c:496 systemv/cupstestppd.c:511 -#: systemv/cupstestppd.c:541 systemv/cupstestppd.c:561 -#: systemv/cupstestppd.c:584 systemv/cupstestppd.c:602 -#: systemv/cupstestppd.c:628 systemv/cupstestppd.c:646 -#: systemv/cupstestppd.c:666 systemv/cupstestppd.c:686 -#: systemv/cupstestppd.c:704 systemv/cupstestppd.c:720 -#: systemv/cupstestppd.c:738 systemv/cupstestppd.c:759 -#: systemv/cupstestppd.c:778 systemv/cupstestppd.c:798 -#: systemv/cupstestppd.c:818 systemv/cupstestppd.c:838 -#: systemv/cupstestppd.c:858 systemv/cupstestppd.c:876 -#: systemv/cupstestppd.c:893 systemv/cupstestppd.c:915 -#: systemv/cupstestppd.c:933 systemv/cupstestppd.c:950 -#: systemv/cupstestppd.c:968 systemv/cupstestppd.c:984 -#: systemv/cupstestppd.c:1004 systemv/cupstestppd.c:1035 -#: systemv/cupstestppd.c:1057 systemv/cupstestppd.c:1108 -#: systemv/cupstestppd.c:1127 systemv/cupstestppd.c:1171 -#: systemv/cupstestppd.c:1185 systemv/cupstestppd.c:1217 -#: systemv/cupstestppd.c:1244 systemv/cupstestppd.c:1771 -#: systemv/cupstestppd.c:1790 systemv/cupstestppd.c:1808 -#: systemv/cupstestppd.c:1860 systemv/cupstestppd.c:1876 -#: systemv/cupstestppd.c:1913 systemv/cupstestppd.c:1931 -#: systemv/cupstestppd.c:1967 systemv/cupstestppd.c:1981 -#: systemv/cupstestppd.c:2008 systemv/cupstestppd.c:2022 -#: systemv/cupstestppd.c:2068 systemv/cupstestppd.c:2090 -#: systemv/cupstestppd.c:2113 systemv/cupstestppd.c:2130 -#: systemv/cupstestppd.c:2199 systemv/cupstestppd.c:2246 -#: systemv/cupstestppd.c:2270 systemv/cupstestppd.c:2322 -#: systemv/cupstestppd.c:2352 systemv/cupstestppd.c:2366 -#: systemv/cupstestppd.c:2391 systemv/cupstestppd.c:2407 -#: systemv/cupstestppd.c:2437 systemv/cupstestppd.c:2451 -#: systemv/cupstestppd.c:2478 systemv/cupstestppd.c:2495 -#: systemv/cupstestppd.c:2510 systemv/cupstestppd.c:2534 -#: systemv/cupstestppd.c:2551 systemv/cupstestppd.c:2566 -#: systemv/cupstestppd.c:2590 systemv/cupstestppd.c:2607 -#: systemv/cupstestppd.c:2622 systemv/cupstestppd.c:2646 -#: systemv/cupstestppd.c:2663 systemv/cupstestppd.c:2678 -#: systemv/cupstestppd.c:2702 systemv/cupstestppd.c:2716 -#: systemv/cupstestppd.c:2731 systemv/cupstestppd.c:2748 -#: systemv/cupstestppd.c:2804 systemv/cupstestppd.c:2839 -#: systemv/cupstestppd.c:2853 systemv/cupstestppd.c:2881 -#: systemv/cupstestppd.c:2934 systemv/cupstestppd.c:2949 -#: systemv/cupstestppd.c:2987 systemv/cupstestppd.c:3007 -#: systemv/cupstestppd.c:3021 systemv/cupstestppd.c:3082 -#: systemv/cupstestppd.c:3118 systemv/cupstestppd.c:3132 -#: systemv/cupstestppd.c:3178 systemv/cupstestppd.c:3210 -#: systemv/cupstestppd.c:3227 systemv/cupstestppd.c:3250 -#: systemv/cupstestppd.c:3266 systemv/cupstestppd.c:3304 -#: systemv/cupstestppd.c:3444 systemv/cupstestppd.c:3466 -#: systemv/cupstestppd.c:3574 -msgid " FAIL" +#: scheduler/cupsfilter.c:1376 +msgid " -t title Set title." msgstr "" -#: systemv/cupstestppd.c:333 -#, c-format -msgid " FAIL **FAIL** Unable to open PPD file - %s" +#: scheduler/cupsfilter.c:1377 scheduler/cupsfilter.c:1403 +msgid " -u Remove the PPD file when finished." msgstr "" -#: systemv/cupstestppd.c:344 -#, c-format -msgid " FAIL **FAIL** Unable to open PPD file - %s on line %d." +#: systemv/cupstestppd.c:3501 +msgid " -v Be slightly verbose." msgstr "" -#: systemv/cupstestppd.c:1268 -msgid " PASS" +#: ppdc/ppdc.cxx:452 ppdc/ppdpo.cxx:259 +msgid " -v Be verbose (more v's for more verbosity)." msgstr "" -#: ppdc/sample.c:53 -msgid "#10 Envelope" +#: systemv/cupsaddsmb.c:294 +msgid " -v Be verbose (show commands)." msgstr "" -#: ppdc/sample.c:54 -msgid "#11 Envelope" +#: test/ipptool.c:3856 +msgid " -v Show all attributes sent and received." msgstr "" -#: ppdc/sample.c:55 -msgid "#12 Envelope" +#: systemv/cupstestppd.c:3502 +msgid " -vv Be very verbose." msgstr "" -#: ppdc/sample.c:56 -msgid "#14 Envelope" +#: ppdc/ppdc.cxx:454 +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:1773 +#: systemv/cupstestppd.c:1792 systemv/cupstestppd.c:1810 +#: systemv/cupstestppd.c:1862 systemv/cupstestppd.c:1878 +#: systemv/cupstestppd.c:1915 systemv/cupstestppd.c:1933 +#: systemv/cupstestppd.c:1969 systemv/cupstestppd.c:1983 +#: systemv/cupstestppd.c:2010 systemv/cupstestppd.c:2024 +#: systemv/cupstestppd.c:2070 systemv/cupstestppd.c:2092 +#: systemv/cupstestppd.c:2115 systemv/cupstestppd.c:2132 +#: systemv/cupstestppd.c:2201 systemv/cupstestppd.c:2248 +#: systemv/cupstestppd.c:2272 systemv/cupstestppd.c:2324 +#: systemv/cupstestppd.c:2354 systemv/cupstestppd.c:2368 +#: systemv/cupstestppd.c:2394 systemv/cupstestppd.c:2410 +#: systemv/cupstestppd.c:2440 systemv/cupstestppd.c:2454 +#: systemv/cupstestppd.c:2481 systemv/cupstestppd.c:2498 +#: systemv/cupstestppd.c:2512 systemv/cupstestppd.c:2536 +#: systemv/cupstestppd.c:2553 systemv/cupstestppd.c:2567 +#: systemv/cupstestppd.c:2591 systemv/cupstestppd.c:2608 +#: systemv/cupstestppd.c:2622 systemv/cupstestppd.c:2646 +#: systemv/cupstestppd.c:2663 systemv/cupstestppd.c:2677 +#: systemv/cupstestppd.c:2701 systemv/cupstestppd.c:2715 +#: systemv/cupstestppd.c:2730 systemv/cupstestppd.c:2747 +#: systemv/cupstestppd.c:2803 systemv/cupstestppd.c:2838 +#: systemv/cupstestppd.c:2852 systemv/cupstestppd.c:2880 +#: systemv/cupstestppd.c:2933 systemv/cupstestppd.c:2948 +#: systemv/cupstestppd.c:2986 systemv/cupstestppd.c:3006 +#: systemv/cupstestppd.c:3020 systemv/cupstestppd.c:3081 +#: systemv/cupstestppd.c:3117 systemv/cupstestppd.c:3131 +#: systemv/cupstestppd.c:3177 systemv/cupstestppd.c:3209 +#: systemv/cupstestppd.c:3226 systemv/cupstestppd.c:3249 +#: systemv/cupstestppd.c:3265 systemv/cupstestppd.c:3303 +#: systemv/cupstestppd.c:3443 systemv/cupstestppd.c:3465 +#: systemv/cupstestppd.c:3573 +msgid " FAIL" msgstr "" -#: ppdc/sample.c:57 -msgid "#9 Envelope" +#: systemv/cupstestppd.c:1270 +msgid " PASS" msgstr "" #: berkeley/lpq.c:559 @@ -1452,7 +1374,7 @@ msgstr "" msgid "%s accepting requests since %s" msgstr "" -#: scheduler/ipp.c:11207 +#: scheduler/ipp.c:11199 #, c-format msgid "%s cannot be changed." msgstr "" @@ -1491,7 +1413,7 @@ msgstr "" #: scheduler/ipp.c:722 #, c-format -msgid "%s not supported" +msgid "%s not supported." msgstr "" #: systemv/lpstat.c:762 @@ -1509,6 +1431,12 @@ msgstr "" msgid "%s: %-33.33s [job %d localhost]" msgstr "" +#. TRANSLATORS: Message is "subject: error" +#: cups/langprintf.c:86 +#, c-format +msgid "%s: %s" +msgstr "" + #: systemv/cancel.c:294 systemv/cancel.c:357 #, c-format msgid "%s: %s failed: %s" @@ -1519,7 +1447,7 @@ msgstr "" msgid "%s: Don't know what to do." msgstr "" -#: berkeley/lpr.c:344 systemv/lp.c:584 +#: berkeley/lpq.c:236 berkeley/lpr.c:344 systemv/lp.c:584 #, c-format msgid "%s: Error - %s environment variable names non-existent destination \"%s\"." msgstr "" @@ -1549,14 +1477,14 @@ msgstr "" msgid "%s: Error - expected content type after \"-T\" option." msgstr "" -#: systemv/lp.c:264 +#: berkeley/lpr.c:240 #, c-format -msgid "%s: Error - expected copies after \"-n\" option." +msgid "%s: Error - expected copies after \"-#\" option." msgstr "" -#: berkeley/lpr.c:240 +#: systemv/lp.c:264 #, c-format -msgid "%s: Error - expected copy count after \"-#\" option." +msgid "%s: Error - expected copies after \"-n\" option." msgstr "" #: berkeley/lpr.c:209 @@ -1605,9 +1533,9 @@ msgstr "" msgid "%s: Error - expected name after \"-%c\" option." msgstr "" -#: systemv/lp.c:288 +#: berkeley/lpr.c:153 systemv/lp.c:288 #, c-format -msgid "%s: Error - expected option string after \"-o\" option." +msgid "%s: Error - expected option=value after \"-o\" option." msgstr "" #: systemv/lp.c:441 @@ -1652,7 +1580,7 @@ msgstr "" msgid "%s: Error - need \"completed\", \"not-completed\", or \"all\" after \"-W\" option." msgstr "" -#: berkeley/lpr.c:349 systemv/lp.c:589 +#: berkeley/lpq.c:241 berkeley/lpr.c:349 systemv/lp.c:589 #, c-format msgid "%s: Error - no default destination available." msgstr "" @@ -1672,16 +1600,11 @@ msgstr "" msgid "%s: Error - too many files - \"%s\"." msgstr "" -#: systemv/lp.c:520 +#: berkeley/lpr.c:287 systemv/lp.c:520 #, c-format msgid "%s: Error - unable to access \"%s\" - %s" msgstr "" -#: berkeley/lpr.c:287 -#, c-format -msgid "%s: Error - unable to access \"%s\" - %s." -msgstr "" - #: berkeley/lpr.c:396 systemv/lp.c:624 #, c-format msgid "%s: Error - unable to queue from stdin - %s." @@ -1751,13 +1674,13 @@ msgstr "" msgid "%s: Sorry, no encryption support." msgstr "" -#: berkeley/lpq.c:295 scheduler/cupsfilter.c:1145 systemv/cupsaddsmb.c:144 -#: systemv/cupsaddsmb.c:171 +#: berkeley/lpq.c:295 scheduler/cupsfilter.c:1145 systemv/cancel.c:237 +#: systemv/cupsaddsmb.c:144 systemv/cupsaddsmb.c:171 #, c-format msgid "%s: Unable to connect to server." msgstr "" -#: systemv/cancel.c:237 systemv/cancel.c:317 +#: systemv/cancel.c:317 #, c-format msgid "%s: Unable to contact server." msgstr "" @@ -1827,234 +1750,195 @@ msgstr "" msgid "%s: Warning - mode option ignored." msgstr "" -#: berkeley/lpq.c:236 -#, c-format -msgid "%s: error - %s environment variable names non-existent destination \"%s\"." -msgstr "" - -#: berkeley/lpr.c:153 -#, c-format -msgid "%s: error - expected option=value after \"-o\" option." -msgstr "" - -#: berkeley/lpq.c:241 -#, c-format -msgid "%s: error - no default destination available." -msgstr "" - -#: ppdc/sample.c:284 +#: ppdc/sample.c:281 msgid "-1" msgstr "" -#: ppdc/sample.c:275 +#: ppdc/sample.c:272 msgid "-10" msgstr "" -#: ppdc/sample.c:367 +#: ppdc/sample.c:364 msgid "-100" msgstr "" -#: ppdc/sample.c:366 +#: ppdc/sample.c:363 msgid "-105" msgstr "" -#: ppdc/sample.c:274 +#: ppdc/sample.c:271 msgid "-11" msgstr "" -#: ppdc/sample.c:365 +#: ppdc/sample.c:362 msgid "-110" msgstr "" -#: ppdc/sample.c:364 +#: ppdc/sample.c:361 msgid "-115" msgstr "" -#: ppdc/sample.c:273 +#: ppdc/sample.c:270 msgid "-12" msgstr "" -#: ppdc/sample.c:363 +#: ppdc/sample.c:360 msgid "-120" msgstr "" -#: ppdc/sample.c:272 +#: ppdc/sample.c:269 msgid "-13" msgstr "" -#: ppdc/sample.c:271 +#: ppdc/sample.c:268 msgid "-14" msgstr "" -#: ppdc/sample.c:270 +#: ppdc/sample.c:267 msgid "-15" msgstr "" -#: ppdc/sample.c:283 +#: ppdc/sample.c:280 msgid "-2" msgstr "" -#: ppdc/sample.c:383 +#: ppdc/sample.c:380 msgid "-20" msgstr "" -#: ppdc/sample.c:382 +#: ppdc/sample.c:379 msgid "-25" msgstr "" -#: ppdc/sample.c:282 +#: ppdc/sample.c:279 msgid "-3" msgstr "" -#: ppdc/sample.c:381 +#: ppdc/sample.c:378 msgid "-30" msgstr "" -#: ppdc/sample.c:380 +#: ppdc/sample.c:377 msgid "-35" msgstr "" -#: ppdc/sample.c:281 +#: ppdc/sample.c:278 msgid "-4" msgstr "" -#: ppdc/sample.c:379 +#: ppdc/sample.c:376 msgid "-40" msgstr "" -#: ppdc/sample.c:378 +#: ppdc/sample.c:375 msgid "-45" msgstr "" -#: ppdc/sample.c:280 +#: ppdc/sample.c:277 msgid "-5" msgstr "" -#: ppdc/sample.c:377 +#: ppdc/sample.c:374 msgid "-50" msgstr "" -#: ppdc/sample.c:376 +#: ppdc/sample.c:373 msgid "-55" msgstr "" -#: ppdc/sample.c:279 +#: ppdc/sample.c:276 msgid "-6" msgstr "" -#: ppdc/sample.c:375 +#: ppdc/sample.c:372 msgid "-60" msgstr "" -#: ppdc/sample.c:374 +#: ppdc/sample.c:371 msgid "-65" msgstr "" -#: ppdc/sample.c:278 +#: ppdc/sample.c:275 msgid "-7" msgstr "" -#: ppdc/sample.c:373 +#: ppdc/sample.c:370 msgid "-70" msgstr "" -#: ppdc/sample.c:372 +#: ppdc/sample.c:369 msgid "-75" msgstr "" -#: ppdc/sample.c:277 +#: ppdc/sample.c:274 msgid "-8" msgstr "" -#: ppdc/sample.c:371 +#: ppdc/sample.c:368 msgid "-80" msgstr "" -#: ppdc/sample.c:370 +#: ppdc/sample.c:367 msgid "-85" msgstr "" -#: ppdc/sample.c:276 +#: ppdc/sample.c:273 msgid "-9" msgstr "" -#: ppdc/sample.c:369 +#: ppdc/sample.c:366 msgid "-90" msgstr "" -#: ppdc/sample.c:368 +#: ppdc/sample.c:365 msgid "-95" msgstr "" -#: scheduler/main.c:2200 -msgid "-F Run in the foreground but detach from console." -msgstr "" - -#: scheduler/main.c:2197 -msgid "-c config-file Load alternate configuration file." -msgstr "" - -#: scheduler/main.c:2199 -msgid "-f Run in the foreground." -msgstr "" - -#: scheduler/main.c:2202 -msgid "-h Show this usage message." -msgstr "" - -#: scheduler/main.c:2203 -msgid "-l Run cupsd from launchd(8)." -msgstr "" - -#: scheduler/main.c:2204 -msgid "-t Test the configuration file." -msgstr "" - -#: ppdc/sample.c:285 +#: ppdc/sample.c:282 msgid "0" msgstr "" -#: ppdc/sample.c:286 +#: ppdc/sample.c:283 msgid "1" msgstr "" -#: ppdc/sample.c:358 +#: ppdc/sample.c:355 msgid "1 inch/sec." msgstr "" -#: ppdc/sample.c:146 +#: ppdc/sample.c:143 msgid "1.25x0.25\"" msgstr "" -#: ppdc/sample.c:147 +#: ppdc/sample.c:144 msgid "1.25x2.25\"" msgstr "" -#: ppdc/sample.c:406 +#: ppdc/sample.c:403 msgid "1.5 inch/sec." msgstr "" -#: ppdc/sample.c:148 +#: ppdc/sample.c:145 msgid "1.50x0.25\"" msgstr "" -#: ppdc/sample.c:149 +#: ppdc/sample.c:146 msgid "1.50x0.50\"" msgstr "" -#: ppdc/sample.c:150 +#: ppdc/sample.c:147 msgid "1.50x1.00\"" msgstr "" -#: ppdc/sample.c:151 +#: ppdc/sample.c:148 msgid "1.50x2.00\"" msgstr "" -#: ppdc/sample.c:295 +#: ppdc/sample.c:292 msgid "10" msgstr "" -#: ppdc/sample.c:417 +#: ppdc/sample.c:414 msgid "10 inches/sec." msgstr "" @@ -2070,39 +1954,39 @@ msgstr "" msgid "10 x 14\"" msgstr "" -#: ppdc/sample.c:397 +#: ppdc/sample.c:394 msgid "100" msgstr "" -#: ppdc/sample.c:308 +#: ppdc/sample.c:305 msgid "100 mm/sec." msgstr "" -#: ppdc/sample.c:398 +#: ppdc/sample.c:395 msgid "105" msgstr "" -#: ppdc/sample.c:296 +#: ppdc/sample.c:293 msgid "11" msgstr "" -#: ppdc/sample.c:418 +#: ppdc/sample.c:415 msgid "11 inches/sec." msgstr "" -#: ppdc/sample.c:399 +#: ppdc/sample.c:396 msgid "110" msgstr "" -#: ppdc/sample.c:400 +#: ppdc/sample.c:397 msgid "115" msgstr "" -#: ppdc/sample.c:297 +#: ppdc/sample.c:294 msgid "12" msgstr "" -#: ppdc/sample.c:419 +#: ppdc/sample.c:416 msgid "12 inches/sec." msgstr "" @@ -2110,39 +1994,39 @@ msgstr "" msgid "12 x 11\"" msgstr "" -#: ppdc/sample.c:401 +#: ppdc/sample.c:398 msgid "120" msgstr "" -#: ppdc/sample.c:309 +#: ppdc/sample.c:306 msgid "120 mm/sec." msgstr "" -#: ppdc/sample.c:217 +#: ppdc/sample.c:214 msgid "120x60dpi" msgstr "" -#: ppdc/sample.c:223 +#: ppdc/sample.c:220 msgid "120x72dpi" msgstr "" -#: ppdc/sample.c:298 +#: ppdc/sample.c:295 msgid "13" msgstr "" -#: ppdc/sample.c:206 +#: ppdc/sample.c:203 msgid "136dpi" msgstr "" -#: ppdc/sample.c:299 +#: ppdc/sample.c:296 msgid "14" msgstr "" -#: ppdc/sample.c:300 +#: ppdc/sample.c:297 msgid "15" msgstr "" -#: ppdc/sample.c:302 +#: ppdc/sample.c:299 msgid "15 mm/sec." msgstr "" @@ -2150,407 +2034,407 @@ msgstr "" msgid "15 x 11\"" msgstr "" -#: ppdc/sample.c:310 +#: ppdc/sample.c:307 msgid "150 mm/sec." msgstr "" -#: ppdc/sample.c:257 +#: ppdc/sample.c:254 msgid "150dpi" msgstr "" -#: ppdc/sample.c:342 +#: ppdc/sample.c:339 msgid "16" msgstr "" -#: ppdc/sample.c:343 +#: ppdc/sample.c:340 msgid "17" msgstr "" -#: ppdc/sample.c:344 +#: ppdc/sample.c:341 msgid "18" msgstr "" -#: ppdc/sample.c:218 +#: ppdc/sample.c:215 msgid "180dpi" msgstr "" -#: ppdc/sample.c:345 +#: ppdc/sample.c:342 msgid "19" msgstr "" -#: ppdc/sample.c:287 +#: ppdc/sample.c:284 msgid "2" msgstr "" -#: ppdc/sample.c:359 +#: ppdc/sample.c:356 msgid "2 inches/sec." msgstr "" -#: ppdc/sample.c:244 +#: ppdc/sample.c:241 msgid "2-Sided Printing" msgstr "" -#: ppdc/sample.c:152 +#: ppdc/sample.c:149 msgid "2.00x0.37\"" msgstr "" -#: ppdc/sample.c:153 +#: ppdc/sample.c:150 msgid "2.00x0.50\"" msgstr "" -#: ppdc/sample.c:154 +#: ppdc/sample.c:151 msgid "2.00x1.00\"" msgstr "" -#: ppdc/sample.c:155 +#: ppdc/sample.c:152 msgid "2.00x1.25\"" msgstr "" -#: ppdc/sample.c:156 +#: ppdc/sample.c:153 msgid "2.00x2.00\"" msgstr "" -#: ppdc/sample.c:157 +#: ppdc/sample.c:154 msgid "2.00x3.00\"" msgstr "" -#: ppdc/sample.c:158 +#: ppdc/sample.c:155 msgid "2.00x4.00\"" msgstr "" -#: ppdc/sample.c:159 +#: ppdc/sample.c:156 msgid "2.00x5.50\"" msgstr "" -#: ppdc/sample.c:160 +#: ppdc/sample.c:157 msgid "2.25x0.50\"" msgstr "" -#: ppdc/sample.c:161 +#: ppdc/sample.c:158 msgid "2.25x1.25\"" msgstr "" -#: ppdc/sample.c:162 +#: ppdc/sample.c:159 msgid "2.25x4.00\"" msgstr "" -#: ppdc/sample.c:163 +#: ppdc/sample.c:160 msgid "2.25x5.50\"" msgstr "" -#: ppdc/sample.c:164 +#: ppdc/sample.c:161 msgid "2.38x5.50\"" msgstr "" -#: ppdc/sample.c:407 +#: ppdc/sample.c:404 msgid "2.5 inches/sec." msgstr "" -#: ppdc/sample.c:165 +#: ppdc/sample.c:162 msgid "2.50x1.00\"" msgstr "" -#: ppdc/sample.c:166 +#: ppdc/sample.c:163 msgid "2.50x2.00\"" msgstr "" -#: ppdc/sample.c:167 +#: ppdc/sample.c:164 msgid "2.75x1.25\"" msgstr "" -#: ppdc/sample.c:168 +#: ppdc/sample.c:165 msgid "2.9 x 1\"" msgstr "" -#: ppdc/sample.c:346 +#: ppdc/sample.c:343 msgid "20" msgstr "" -#: ppdc/sample.c:303 +#: ppdc/sample.c:300 msgid "20 mm/sec." msgstr "" -#: ppdc/sample.c:311 +#: ppdc/sample.c:308 msgid "200 mm/sec." msgstr "" -#: ppdc/sample.c:207 +#: ppdc/sample.c:204 msgid "203dpi" msgstr "" -#: ppdc/sample.c:347 +#: ppdc/sample.c:344 msgid "21" msgstr "" -#: ppdc/sample.c:348 +#: ppdc/sample.c:345 msgid "22" msgstr "" -#: ppdc/sample.c:349 +#: ppdc/sample.c:346 msgid "23" msgstr "" -#: ppdc/sample.c:350 +#: ppdc/sample.c:347 msgid "24" msgstr "" -#: ppdc/sample.c:215 +#: ppdc/sample.c:212 msgid "24-Pin Series" msgstr "" -#: ppdc/sample.c:224 +#: ppdc/sample.c:221 msgid "240x72dpi" msgstr "" -#: ppdc/sample.c:351 +#: ppdc/sample.c:348 msgid "25" msgstr "" -#: ppdc/sample.c:312 +#: ppdc/sample.c:309 msgid "250 mm/sec." msgstr "" -#: ppdc/sample.c:352 +#: ppdc/sample.c:349 msgid "26" msgstr "" -#: ppdc/sample.c:353 +#: ppdc/sample.c:350 msgid "27" msgstr "" -#: ppdc/sample.c:354 +#: ppdc/sample.c:351 msgid "28" msgstr "" -#: ppdc/sample.c:355 +#: ppdc/sample.c:352 msgid "29" msgstr "" -#: ppdc/sample.c:288 +#: ppdc/sample.c:285 msgid "3" msgstr "" -#: ppdc/sample.c:360 +#: ppdc/sample.c:357 msgid "3 inches/sec." msgstr "" -#: ppdc/sample.c:169 +#: ppdc/sample.c:166 msgid "3.00x1.00\"" msgstr "" -#: ppdc/sample.c:170 +#: ppdc/sample.c:167 msgid "3.00x1.25\"" msgstr "" -#: ppdc/sample.c:171 +#: ppdc/sample.c:168 msgid "3.00x2.00\"" msgstr "" -#: ppdc/sample.c:172 +#: ppdc/sample.c:169 msgid "3.00x3.00\"" msgstr "" -#: ppdc/sample.c:173 +#: ppdc/sample.c:170 msgid "3.00x5.00\"" msgstr "" -#: ppdc/sample.c:174 +#: ppdc/sample.c:171 msgid "3.25x2.00\"" msgstr "" -#: ppdc/sample.c:175 +#: ppdc/sample.c:172 msgid "3.25x5.00\"" msgstr "" -#: ppdc/sample.c:176 +#: ppdc/sample.c:173 msgid "3.25x5.50\"" msgstr "" -#: ppdc/sample.c:177 +#: ppdc/sample.c:174 msgid "3.25x5.83\"" msgstr "" -#: ppdc/sample.c:178 +#: ppdc/sample.c:175 msgid "3.25x7.83\"" msgstr "" -#: ppdc/sample.c:136 +#: ppdc/sample.c:133 msgid "3.5\" Disk" msgstr "" -#: ppdc/sample.c:145 +#: ppdc/sample.c:142 msgid "3.5\" Disk - 2 1/8 x 2 3/4\"" msgstr "" -#: ppdc/sample.c:179 +#: ppdc/sample.c:176 msgid "3.50x1.00\"" msgstr "" -#: ppdc/sample.c:356 +#: ppdc/sample.c:353 msgid "30" msgstr "" -#: ppdc/sample.c:304 +#: ppdc/sample.c:301 msgid "30 mm/sec." msgstr "" -#: ppdc/sample.c:313 +#: ppdc/sample.c:310 msgid "300 mm/sec." msgstr "" -#: ppdc/sample.c:208 +#: ppdc/sample.c:205 msgid "300dpi" msgstr "" -#: ppdc/sample.c:384 +#: ppdc/sample.c:381 msgid "35" msgstr "" -#: ppdc/sample.c:220 +#: ppdc/sample.c:217 msgid "360dpi" msgstr "" -#: ppdc/sample.c:219 +#: ppdc/sample.c:216 msgid "360x180dpi" msgstr "" -#: ppdc/sample.c:289 +#: ppdc/sample.c:286 msgid "4" msgstr "" -#: ppdc/sample.c:361 +#: ppdc/sample.c:358 msgid "4 inches/sec." msgstr "" -#: ppdc/sample.c:180 +#: ppdc/sample.c:177 msgid "4.00x1.00\"" msgstr "" -#: ppdc/sample.c:188 +#: ppdc/sample.c:185 msgid "4.00x13.00\"" msgstr "" -#: ppdc/sample.c:181 +#: ppdc/sample.c:178 msgid "4.00x2.00\"" msgstr "" -#: ppdc/sample.c:182 +#: ppdc/sample.c:179 msgid "4.00x2.50\"" msgstr "" -#: ppdc/sample.c:183 +#: ppdc/sample.c:180 msgid "4.00x3.00\"" msgstr "" -#: ppdc/sample.c:184 +#: ppdc/sample.c:181 msgid "4.00x4.00\"" msgstr "" -#: ppdc/sample.c:185 +#: ppdc/sample.c:182 msgid "4.00x5.00\"" msgstr "" -#: ppdc/sample.c:186 +#: ppdc/sample.c:183 msgid "4.00x6.00\"" msgstr "" -#: ppdc/sample.c:187 +#: ppdc/sample.c:184 msgid "4.00x6.50\"" msgstr "" -#: ppdc/sample.c:385 +#: ppdc/sample.c:382 msgid "40" msgstr "" -#: ppdc/sample.c:305 +#: ppdc/sample.c:302 msgid "40 mm/sec." msgstr "" -#: ppdc/sample.c:386 +#: ppdc/sample.c:383 msgid "45" msgstr "" -#: ppdc/sample.c:290 +#: ppdc/sample.c:287 msgid "5" msgstr "" -#: ppdc/sample.c:411 +#: ppdc/sample.c:408 msgid "5 inches/sec." msgstr "" -#: ppdc/sample.c:387 +#: ppdc/sample.c:384 msgid "50" msgstr "" -#: ppdc/sample.c:388 +#: ppdc/sample.c:385 msgid "55" msgstr "" -#: ppdc/sample.c:291 +#: ppdc/sample.c:288 msgid "6" msgstr "" -#: ppdc/sample.c:412 +#: ppdc/sample.c:409 msgid "6 inches/sec." msgstr "" -#: ppdc/sample.c:189 +#: ppdc/sample.c:186 msgid "6.00x1.00\"" msgstr "" -#: ppdc/sample.c:190 +#: ppdc/sample.c:187 msgid "6.00x2.00\"" msgstr "" -#: ppdc/sample.c:191 +#: ppdc/sample.c:188 msgid "6.00x3.00\"" msgstr "" -#: ppdc/sample.c:192 +#: ppdc/sample.c:189 msgid "6.00x4.00\"" msgstr "" -#: ppdc/sample.c:193 +#: ppdc/sample.c:190 msgid "6.00x5.00\"" msgstr "" -#: ppdc/sample.c:194 +#: ppdc/sample.c:191 msgid "6.00x6.00\"" msgstr "" -#: ppdc/sample.c:195 +#: ppdc/sample.c:192 msgid "6.00x6.50\"" msgstr "" -#: ppdc/sample.c:389 +#: ppdc/sample.c:386 msgid "60" msgstr "" -#: ppdc/sample.c:306 +#: ppdc/sample.c:303 msgid "60 mm/sec." msgstr "" -#: ppdc/sample.c:235 +#: ppdc/sample.c:232 msgid "600dpi" msgstr "" -#: ppdc/sample.c:216 +#: ppdc/sample.c:213 msgid "60dpi" msgstr "" -#: ppdc/sample.c:222 +#: ppdc/sample.c:219 msgid "60x72dpi" msgstr "" -#: ppdc/sample.c:390 +#: ppdc/sample.c:387 msgid "65" msgstr "" -#: ppdc/sample.c:292 +#: ppdc/sample.c:289 msgid "7" msgstr "" -#: ppdc/sample.c:414 +#: ppdc/sample.c:411 msgid "7 inches/sec." msgstr "" @@ -2558,23 +2442,23 @@ msgstr "" msgid "7 x 9\"" msgstr "" -#: ppdc/sample.c:391 +#: ppdc/sample.c:388 msgid "70" msgstr "" -#: ppdc/sample.c:226 +#: ppdc/sample.c:223 msgid "720dpi" msgstr "" -#: ppdc/sample.c:392 +#: ppdc/sample.c:389 msgid "75" msgstr "" -#: ppdc/sample.c:293 +#: ppdc/sample.c:290 msgid "8" msgstr "" -#: ppdc/sample.c:415 +#: ppdc/sample.c:412 msgid "8 inches/sec." msgstr "" @@ -2582,51 +2466,51 @@ msgstr "" msgid "8 x 10\"" msgstr "" -#: ppdc/sample.c:196 +#: ppdc/sample.c:193 msgid "8.00x1.00\"" msgstr "" -#: ppdc/sample.c:197 +#: ppdc/sample.c:194 msgid "8.00x2.00\"" msgstr "" -#: ppdc/sample.c:198 +#: ppdc/sample.c:195 msgid "8.00x3.00\"" msgstr "" -#: ppdc/sample.c:199 +#: ppdc/sample.c:196 msgid "8.00x4.00\"" msgstr "" -#: ppdc/sample.c:200 +#: ppdc/sample.c:197 msgid "8.00x5.00\"" msgstr "" -#: ppdc/sample.c:201 +#: ppdc/sample.c:198 msgid "8.00x6.00\"" msgstr "" -#: ppdc/sample.c:202 +#: ppdc/sample.c:199 msgid "8.00x6.50\"" msgstr "" -#: ppdc/sample.c:393 +#: ppdc/sample.c:390 msgid "80" msgstr "" -#: ppdc/sample.c:307 +#: ppdc/sample.c:304 msgid "80 mm/sec." msgstr "" -#: ppdc/sample.c:394 +#: ppdc/sample.c:391 msgid "85" msgstr "" -#: ppdc/sample.c:294 +#: ppdc/sample.c:291 msgid "9" msgstr "" -#: ppdc/sample.c:416 +#: ppdc/sample.c:413 msgid "9 inches/sec." msgstr "" @@ -2638,15 +2522,15 @@ msgstr "" msgid "9 x 12\"" msgstr "" -#: ppdc/sample.c:221 +#: ppdc/sample.c:218 msgid "9-Pin Series" msgstr "" -#: ppdc/sample.c:395 +#: ppdc/sample.c:392 msgid "90" msgstr "" -#: ppdc/sample.c:396 +#: ppdc/sample.c:393 msgid "95" msgstr "" @@ -2662,14 +2546,14 @@ msgstr "" msgid "A Samba username is required to export printer drivers" msgstr "" -#: scheduler/ipp.c:2464 +#: scheduler/ipp.c:2434 #, c-format -msgid "A class named \"%s\" already exists" +msgid "A class named \"%s\" already exists." msgstr "" #: scheduler/ipp.c:1038 #, c-format -msgid "A printer named \"%s\" already exists" +msgid "A printer named \"%s\" already exists." msgstr "" #: ppdc/sample.c:12 @@ -2693,7 +2577,7 @@ msgid "A3" msgstr "" #: ppdc/sample.c:16 -msgid "A3 (Oversize)" +msgid "A3 Oversize" msgstr "" #: ppdc/sample.c:17 @@ -2701,11 +2585,11 @@ msgid "A4" msgstr "" #: ppdc/sample.c:18 -msgid "A4 (Oversize)" +msgid "A4 Oversize" msgstr "" #: ppdc/sample.c:19 -msgid "A4 (Small)" +msgid "A4 Small" msgstr "" #: ppdc/sample.c:20 @@ -2713,7 +2597,7 @@ msgid "A5" msgstr "" #: ppdc/sample.c:21 -msgid "A5 (Oversize)" +msgid "A5 Oversize" msgstr "" #: ppdc/sample.c:22 @@ -2752,14 +2636,6 @@ msgstr "" msgid "ANSI E" msgstr "" -#: ppdc/sample.c:32 -msgid "ARCH A" -msgstr "" - -#: ppdc/sample.c:33 -msgid "ARCH B" -msgstr "" - #: ppdc/sample.c:34 msgid "ARCH C" msgstr "" @@ -2793,11 +2669,11 @@ msgstr "" msgid "Add RSS Subscription" msgstr "" -#: ppdc/sample.c:128 +#: ppdc/sample.c:125 msgid "Address" msgstr "" -#: ppdc/sample.c:137 +#: ppdc/sample.c:134 msgid "Address - 1 1/8 x 3 1/2\"" msgstr "" @@ -2805,7 +2681,7 @@ msgstr "" msgid "Administration" msgstr "" -#: ppdc/sample.c:403 +#: ppdc/sample.c:400 msgid "Always" msgstr "" @@ -2813,61 +2689,69 @@ msgstr "" msgid "AppSocket/HP JetDirect" msgstr "" -#: ppdc/sample.c:424 +#: ppdc/sample.c:421 msgid "Applicator" msgstr "" #: scheduler/ipp.c:1163 #, c-format -msgid "Attempt to set %s printer-state to bad value %d" +msgid "Attempt to set %s printer-state to bad value %d." msgstr "" #: scheduler/ipp.c:356 #, c-format -msgid "Attribute groups are out of order (%x < %x)" +msgid "Attribute groups are out of order (%x < %x)." msgstr "" -#: ppdc/sample.c:37 +#: ppdc/sample.c:93 msgid "B0" msgstr "" -#: ppdc/sample.c:39 +#: ppdc/sample.c:94 msgid "B1" msgstr "" -#: ppdc/sample.c:38 +#: ppdc/sample.c:104 msgid "B10" msgstr "" -#: ppdc/sample.c:40 +#: ppdc/sample.c:95 msgid "B2" msgstr "" -#: ppdc/sample.c:41 +#: ppdc/sample.c:96 msgid "B3" msgstr "" -#: ppdc/sample.c:42 +#: ppdc/sample.c:97 msgid "B4" msgstr "" -#: ppdc/sample.c:43 +#: ppdc/sample.c:98 msgid "B5" msgstr "" -#: ppdc/sample.c:44 +#: ppdc/sample.c:43 +msgid "B5 JIS" +msgstr "" + +#: ppdc/sample.c:99 +msgid "B5 Oversize" +msgstr "" + +#: ppdc/sample.c:100 msgid "B6" msgstr "" -#: ppdc/sample.c:45 +#: ppdc/sample.c:101 msgid "B7" msgstr "" -#: ppdc/sample.c:46 +#: ppdc/sample.c:102 msgid "B8" msgstr "" -#: ppdc/sample.c:47 +#: ppdc/sample.c:103 msgid "B9" msgstr "" @@ -2887,16 +2771,16 @@ msgstr "" msgid "Bad OrderDependency" msgstr "" -#: cups/ppd-cache.c:145 cups/ppd-cache.c:181 cups/ppd-cache.c:215 -#: cups/ppd-cache.c:221 cups/ppd-cache.c:237 cups/ppd-cache.c:253 -#: cups/ppd-cache.c:262 cups/ppd-cache.c:270 cups/ppd-cache.c:287 -#: cups/ppd-cache.c:295 cups/ppd-cache.c:310 cups/ppd-cache.c:318 -#: cups/ppd-cache.c:336 cups/ppd-cache.c:348 cups/ppd-cache.c:363 -#: cups/ppd-cache.c:375 cups/ppd-cache.c:397 cups/ppd-cache.c:405 -#: cups/ppd-cache.c:423 cups/ppd-cache.c:431 cups/ppd-cache.c:446 -#: cups/ppd-cache.c:454 cups/ppd-cache.c:472 cups/ppd-cache.c:480 -#: cups/ppd-cache.c:507 cups/ppd-cache.c:527 cups/ppd-cache.c:536 -#: cups/ppd-cache.c:544 cups/ppd-cache.c:552 +#: cups/ppd-cache.c:145 cups/ppd-cache.c:181 cups/ppd-cache.c:219 +#: cups/ppd-cache.c:225 cups/ppd-cache.c:241 cups/ppd-cache.c:257 +#: cups/ppd-cache.c:266 cups/ppd-cache.c:274 cups/ppd-cache.c:291 +#: cups/ppd-cache.c:299 cups/ppd-cache.c:314 cups/ppd-cache.c:322 +#: cups/ppd-cache.c:340 cups/ppd-cache.c:352 cups/ppd-cache.c:367 +#: cups/ppd-cache.c:379 cups/ppd-cache.c:401 cups/ppd-cache.c:409 +#: cups/ppd-cache.c:427 cups/ppd-cache.c:435 cups/ppd-cache.c:450 +#: cups/ppd-cache.c:458 cups/ppd-cache.c:476 cups/ppd-cache.c:484 +#: cups/ppd-cache.c:511 cups/ppd-cache.c:531 cups/ppd-cache.c:540 +#: cups/ppd-cache.c:548 cups/ppd-cache.c:556 msgid "Bad PPD cache file." msgstr "" @@ -2941,25 +2825,25 @@ msgstr "" msgid "Bad custom parameter" msgstr "" -#: cups/http-support.c:1367 +#: cups/http-support.c:1367 scheduler/ipp.c:2553 #, c-format -msgid "Bad device URI \"%s\"." +msgid "Bad device-uri \"%s\"." msgstr "" -#: scheduler/ipp.c:2583 +#: scheduler/ipp.c:2594 #, c-format -msgid "Bad device-uri \"%s\"" +msgid "Bad device-uri scheme \"%s\"." msgstr "" -#: scheduler/ipp.c:2623 +#: scheduler/ipp.c:9389 scheduler/ipp.c:9405 scheduler/ipp.c:10618 +#: scheduler/ipp.c:12123 #, c-format -msgid "Bad device-uri scheme \"%s\"" +msgid "Bad document-format \"%s\"." msgstr "" -#: scheduler/ipp.c:9392 scheduler/ipp.c:9408 scheduler/ipp.c:10624 -#: scheduler/ipp.c:12131 +#: scheduler/ipp.c:10634 #, c-format -msgid "Bad document-format \"%s\"" +msgid "Bad document-format-default \"%s\"." msgstr "" #: cups/util.c:927 @@ -2976,29 +2860,29 @@ msgstr "" msgid "Bad font description line: %s" msgstr "" -#: scheduler/ipp.c:11223 -msgid "Bad job-priority value" +#: scheduler/ipp.c:11215 +msgid "Bad job-priority value." msgstr "" #: scheduler/ipp.c:1494 #, c-format -msgid "Bad job-sheets value \"%s\"" +msgid "Bad job-sheets value \"%s\"." msgstr "" #: scheduler/ipp.c:1478 -msgid "Bad job-sheets value type" +msgid "Bad job-sheets value type." msgstr "" -#: scheduler/ipp.c:11253 -msgid "Bad job-state value" +#: scheduler/ipp.c:11245 +msgid "Bad job-state value." msgstr "" -#: scheduler/ipp.c:4063 scheduler/ipp.c:4518 scheduler/ipp.c:7250 -#: scheduler/ipp.c:7396 scheduler/ipp.c:8840 scheduler/ipp.c:9094 -#: scheduler/ipp.c:9944 scheduler/ipp.c:10170 scheduler/ipp.c:10525 -#: scheduler/ipp.c:11115 +#: scheduler/ipp.c:4064 scheduler/ipp.c:4517 scheduler/ipp.c:7249 +#: scheduler/ipp.c:7396 scheduler/ipp.c:8839 scheduler/ipp.c:9092 +#: scheduler/ipp.c:9940 scheduler/ipp.c:10165 scheduler/ipp.c:10519 +#: scheduler/ipp.c:11107 #, c-format -msgid "Bad job-uri attribute \"%s\"" +msgid "Bad job-uri \"%s\"." msgstr "" #: filter/textcommon.c:637 @@ -3006,14 +2890,14 @@ msgstr "" msgid "Bad lpi value %f." msgstr "" -#: scheduler/ipp.c:2199 scheduler/ipp.c:6792 +#: scheduler/ipp.c:2198 scheduler/ipp.c:6791 #, c-format -msgid "Bad notify-pull-method \"%s\"" +msgid "Bad notify-pull-method \"%s\"." msgstr "" -#: scheduler/ipp.c:2163 scheduler/ipp.c:6756 +#: scheduler/ipp.c:2162 scheduler/ipp.c:6755 #, c-format -msgid "Bad notify-recipient-uri URI \"%s\"" +msgid "Bad notify-recipient-uri \"%s\"." msgstr "" #: scheduler/ipp.c:1510 @@ -3023,7 +2907,7 @@ msgstr "" #: cups/adminutil.c:292 #, c-format -msgid "Bad option + choice on line %d" +msgid "Bad option + choice on line %d." msgstr "" #: scheduler/ipp.c:1527 @@ -3031,24 +2915,24 @@ msgstr "" msgid "Bad page-ranges values %d-%d." msgstr "" -#: scheduler/ipp.c:2667 +#: scheduler/ipp.c:2637 #, c-format -msgid "Bad port-monitor \"%s\"" +msgid "Bad port-monitor \"%s\"." msgstr "" -#: scheduler/ipp.c:2719 +#: scheduler/ipp.c:2689 #, c-format -msgid "Bad printer-state value %d" +msgid "Bad printer-state value %d." msgstr "" #: scheduler/ipp.c:324 #, c-format -msgid "Bad request ID %d" +msgid "Bad request ID %d." msgstr "" #: scheduler/ipp.c:309 #, c-format -msgid "Bad request version number %d.%d" +msgid "Bad request version number %d.%d." msgstr "" #: cgi-bin/admin.c:1485 @@ -3087,11 +2971,11 @@ msgstr "" msgid "Billing Information: " msgstr "" -#: ppdc/sample.c:261 +#: ppdc/sample.c:258 msgid "Bond Paper" msgstr "" -#: backend/usb-darwin.c:1854 +#: backend/usb-darwin.c:1883 #, c-format msgid "Boolean expected for waiteof option \"%s\"." msgstr "" @@ -3100,59 +2984,11 @@ msgstr "" msgid "Buffer overflow detected, aborting." msgstr "" -#: ppdc/sample.c:58 -msgid "C0 Envelope" -msgstr "" - -#: ppdc/sample.c:59 -msgid "C1 Envelope" -msgstr "" - -#: ppdc/sample.c:60 -msgid "C2 Envelope" -msgstr "" - -#: ppdc/sample.c:61 -msgid "C3 Envelope" -msgstr "" - -#: ppdc/sample.c:48 -msgid "C4" -msgstr "" - -#: ppdc/sample.c:62 -msgid "C4 Envelope" -msgstr "" - -#: ppdc/sample.c:49 -msgid "C5" -msgstr "" - -#: ppdc/sample.c:63 -msgid "C5 Envelope" -msgstr "" - -#: ppdc/sample.c:50 -msgid "C6" -msgstr "" - -#: ppdc/sample.c:65 -msgid "C6 Envelope" -msgstr "" - -#: ppdc/sample.c:64 -msgid "C65 Envelope" -msgstr "" - -#: ppdc/sample.c:66 -msgid "C7 Envelope" -msgstr "" - -#: ppdc/sample.c:228 +#: ppdc/sample.c:225 msgid "CMYK" msgstr "" -#: ppdc/sample.c:337 +#: ppdc/sample.c:334 msgid "CPCL Label Printer" msgstr "" @@ -3160,11 +2996,11 @@ msgstr "" msgid "Cancel RSS Subscription" msgstr "" -#: backend/ipp.c:1508 +#: backend/ipp.c:1565 msgid "Canceling print job." msgstr "" -#: ppdc/sample.c:253 +#: ppdc/sample.c:250 msgid "Cassette" msgstr "" @@ -3173,17 +3009,9 @@ msgstr "" msgid "Change Settings" msgstr "" -#: scheduler/ipp.c:2211 scheduler/ipp.c:6804 +#: scheduler/ipp.c:2210 scheduler/ipp.c:6803 #, c-format -msgid "Character set \"%s\" not supported" -msgstr "" - -#: ppdc/sample.c:67 -msgid "Chou3 Envelope" -msgstr "" - -#: ppdc/sample.c:68 -msgid "Chou4 Envelope" +msgid "Character set \"%s\" not supported." msgstr "" #: cgi-bin/classes.c:195 cgi-bin/classes.c:322 @@ -3194,15 +3022,15 @@ msgstr "" msgid "Clean Print Heads" msgstr "" -#: scheduler/ipp.c:4967 +#: scheduler/ipp.c:4966 msgid "Close-Job doesn't support the job-uri attribute." msgstr "" -#: ppdc/sample.c:256 +#: ppdc/sample.c:253 msgid "Color" msgstr "" -#: ppdc/sample.c:227 +#: ppdc/sample.c:224 msgid "Color Mode" msgstr "" @@ -3217,11 +3045,11 @@ msgstr "" msgid "Community name uses indefinite length" msgstr "" -#: backend/ipp.c:660 backend/lpd.c:861 backend/socket.c:392 +#: backend/ipp.c:666 backend/lpd.c:861 backend/socket.c:392 msgid "Connected to printer." msgstr "" -#: backend/ipp.c:564 backend/lpd.c:698 backend/socket.c:308 +#: backend/ipp.c:570 backend/lpd.c:698 backend/socket.c:308 msgid "Connecting to printer." msgstr "" @@ -3229,7 +3057,7 @@ msgstr "" msgid "Continue" msgstr "" -#: ppdc/sample.c:339 +#: ppdc/sample.c:336 msgid "Continuous" msgstr "" @@ -3237,15 +3065,10 @@ msgstr "" msgid "Control file sent successfully." msgstr "" -#: backend/lpd.c:455 +#: backend/ipp.c:1029 backend/lpd.c:455 msgid "Copying print data." msgstr "" -#: scheduler/ipp.c:10640 -#, c-format -msgid "Could not scan type \"%s\"" -msgstr "" - #: cups/http-support.c:1199 msgid "Created" msgstr "" @@ -3258,35 +3081,27 @@ msgstr "" msgid "Custom" msgstr "" -#: ppdc/sample.c:333 +#: ppdc/sample.c:330 msgid "CustominCutInterval" msgstr "" -#: ppdc/sample.c:331 +#: ppdc/sample.c:328 msgid "CustominTearInterval" msgstr "" -#: ppdc/sample.c:317 +#: ppdc/sample.c:314 msgid "Cut" msgstr "" -#: ppdc/sample.c:425 +#: ppdc/sample.c:422 msgid "Cutter" msgstr "" -#: ppdc/sample.c:51 -msgid "DL" -msgstr "" - -#: ppdc/sample.c:69 -msgid "DL Envelope" -msgstr "" - -#: ppdc/sample.c:213 +#: ppdc/sample.c:210 msgid "Dark" msgstr "" -#: ppdc/sample.c:209 +#: ppdc/sample.c:206 msgid "Darkness" msgstr "" @@ -3306,7 +3121,7 @@ msgstr "" msgid "Description: " msgstr "" -#: ppdc/sample.c:255 +#: ppdc/sample.c:252 msgid "DeskJet Series" msgstr "" @@ -3326,21 +3141,17 @@ msgid "" " location = %s" msgstr "" -#: ppdc/sample.c:410 +#: ppdc/sample.c:407 msgid "Direct Thermal Media" msgstr "" -#: ppdc/sample.c:319 +#: ppdc/sample.c:316 msgid "Disabled" msgstr "" #: scheduler/ipp.c:7298 #, c-format -msgid "Document %d not found in job %d." -msgstr "" - -#: ppdc/sample.c:52 -msgid "Double Postcard" +msgid "Document #%d does not exist in job #%d." msgstr "" #: filter/bannertops.c:820 @@ -3351,19 +3162,19 @@ msgstr "" msgid "Driver Version: " msgstr "" -#: ppdc/sample.c:249 +#: ppdc/sample.c:246 msgid "Duplexer" msgstr "" -#: ppdc/sample.c:203 +#: ppdc/sample.c:200 msgid "Dymo" msgstr "" -#: ppdc/sample.c:405 +#: ppdc/sample.c:402 msgid "EPL1 Label Printer" msgstr "" -#: ppdc/sample.c:408 +#: ppdc/sample.c:405 msgid "EPL2 Label Printer" msgstr "" @@ -3374,7 +3185,7 @@ msgid "Edit Configuration File" msgstr "" #: cups/adminutil.c:337 -msgid "Empty PPD file" +msgid "Empty PPD file." msgstr "" #: cgi-bin/admin.c:3676 @@ -3401,11 +3212,163 @@ msgstr "" 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:243 +#: ppdc/sample.c:54 +msgid "Envelope #10 " +msgstr "" + +#: ppdc/sample.c:55 +msgid "Envelope #11" +msgstr "" + +#: ppdc/sample.c:56 +msgid "Envelope #12" +msgstr "" + +#: ppdc/sample.c:57 +msgid "Envelope #14" +msgstr "" + +#: ppdc/sample.c:58 +msgid "Envelope #9" +msgstr "" + +#: ppdc/sample.c:68 +msgid "Envelope B4" +msgstr "" + +#: ppdc/sample.c:69 +msgid "Envelope B5" +msgstr "" + +#: ppdc/sample.c:70 +msgid "Envelope B6" +msgstr "" + +#: ppdc/sample.c:59 +msgid "Envelope C0" +msgstr "" + +#: ppdc/sample.c:60 +msgid "Envelope C1" +msgstr "" + +#: ppdc/sample.c:61 +msgid "Envelope C2" +msgstr "" + +#: ppdc/sample.c:62 +msgid "Envelope C3" +msgstr "" + +#: ppdc/sample.c:48 +msgid "Envelope C4" +msgstr "" + +#: ppdc/sample.c:49 +msgid "Envelope C5" +msgstr "" + +#: ppdc/sample.c:50 +msgid "Envelope C6" +msgstr "" + +#: ppdc/sample.c:63 +msgid "Envelope C65" +msgstr "" + +#: ppdc/sample.c:64 +msgid "Envelope C7" +msgstr "" + +#: ppdc/sample.c:65 +msgid "Envelope Choukei 3" +msgstr "" + +#: ppdc/sample.c:66 +msgid "Envelope Choukei 4" +msgstr "" + +#: ppdc/sample.c:51 +msgid "Envelope DL" +msgstr "" + +#: ppdc/sample.c:240 msgid "Envelope Feed" msgstr "" -#: ppdc/sample.c:214 +#: ppdc/sample.c:67 +msgid "Envelope Invite" +msgstr "" + +#: ppdc/sample.c:71 +msgid "Envelope Italian" +msgstr "" + +#: ppdc/sample.c:72 +msgid "Envelope Kaku2" +msgstr "" + +#: ppdc/sample.c:73 +msgid "Envelope Kaku3" +msgstr "" + +#: ppdc/sample.c:74 +msgid "Envelope Monarch" +msgstr "" + +#: ppdc/sample.c:76 +msgid "Envelope PRC1 " +msgstr "" + +#: ppdc/sample.c:86 +msgid "Envelope PRC10" +msgstr "" + +#: ppdc/sample.c:77 +msgid "Envelope PRC2" +msgstr "" + +#: ppdc/sample.c:78 +msgid "Envelope PRC3" +msgstr "" + +#: ppdc/sample.c:79 +msgid "Envelope PRC4" +msgstr "" + +#: ppdc/sample.c:81 +msgid "Envelope PRC5" +msgstr "" + +#: ppdc/sample.c:80 +msgid "Envelope PRC5PRC5" +msgstr "" + +#: ppdc/sample.c:82 +msgid "Envelope PRC6" +msgstr "" + +#: ppdc/sample.c:83 +msgid "Envelope PRC7" +msgstr "" + +#: ppdc/sample.c:84 +msgid "Envelope PRC8" +msgstr "" + +#: ppdc/sample.c:85 +msgid "Envelope PRC9" +msgstr "" + +#: ppdc/sample.c:75 +msgid "Envelope Personal" +msgstr "" + +#: ppdc/sample.c:87 +msgid "Envelope You4" +msgstr "" + +#: ppdc/sample.c:211 msgid "Epson" msgstr "" @@ -3417,46 +3380,50 @@ msgstr "" msgid "Error: need hostname after \"-h\" option." msgstr "" -#: ppdc/sample.c:329 +#: ppdc/sample.c:326 msgid "Every 10 Labels" msgstr "" -#: ppdc/sample.c:321 +#: ppdc/sample.c:318 msgid "Every 2 Labels" msgstr "" -#: ppdc/sample.c:322 +#: ppdc/sample.c:319 msgid "Every 3 Labels" msgstr "" -#: ppdc/sample.c:323 +#: ppdc/sample.c:320 msgid "Every 4 Labels" msgstr "" -#: ppdc/sample.c:324 +#: ppdc/sample.c:321 msgid "Every 5 Labels" msgstr "" -#: ppdc/sample.c:325 +#: ppdc/sample.c:322 msgid "Every 6 Labels" msgstr "" -#: ppdc/sample.c:326 +#: ppdc/sample.c:323 msgid "Every 7 Labels" msgstr "" -#: ppdc/sample.c:327 +#: ppdc/sample.c:324 msgid "Every 8 Labels" msgstr "" -#: ppdc/sample.c:328 +#: ppdc/sample.c:325 msgid "Every 9 Labels" msgstr "" -#: ppdc/sample.c:320 +#: ppdc/sample.c:317 msgid "Every Label" msgstr "" +#: ppdc/sample.c:88 +msgid "Executive" +msgstr "" + #: cups/http-support.c:1245 msgid "Expectation Failed" msgstr "" @@ -3475,17 +3442,29 @@ msgstr "" msgid "FAIL" msgstr "" -#: ppdc/sample.c:134 +#: ppdc/sample.c:89 +msgid "FanFold German" +msgstr "" + +#: ppdc/sample.c:90 +msgid "FanFold Legal German" +msgstr "" + +#: ppdc/sample.c:91 +msgid "Fanfold US" +msgstr "" + +#: ppdc/sample.c:131 msgid "File Folder" msgstr "" -#: ppdc/sample.c:143 +#: ppdc/sample.c:140 msgid "File Folder - 9/16 x 3 7/16\"" msgstr "" -#: scheduler/ipp.c:2603 +#: scheduler/ipp.c:2573 #, 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/cupsd.conf\"." msgstr "" #: driver/rastertoescpx.c:1899 driver/rastertopclx.c:1924 @@ -3495,7 +3474,7 @@ msgstr "" msgid "Finished page %d." msgstr "" -#: ppdc/sample.c:94 +#: ppdc/sample.c:92 msgid "Folio" msgstr "" @@ -3512,109 +3491,41 @@ msgstr "" msgid "General" msgstr "" -#: ppdc/sample.c:233 +#: ppdc/sample.c:230 msgid "Generic" msgstr "" -#: ppdc/sample.c:91 -msgid "German FanFold" -msgstr "" - -#: ppdc/sample.c:92 -msgid "German FanFold Legal" -msgstr "" - #: cups/snmp.c:1021 msgid "Get-Response-PDU uses indefinite length" msgstr "" -#: ppdc/sample.c:264 +#: ppdc/sample.c:261 msgid "Glossy Paper" msgstr "" -#: scheduler/ipp.c:4041 scheduler/ipp.c:4443 scheduler/ipp.c:4979 -#: scheduler/ipp.c:7227 scheduler/ipp.c:7373 scheduler/ipp.c:8817 -#: scheduler/ipp.c:9921 scheduler/ipp.c:10147 scheduler/ipp.c:10502 -#: scheduler/ipp.c:11092 -msgid "Got a printer-uri attribute but no job-id" +#: scheduler/ipp.c:4042 scheduler/ipp.c:4443 scheduler/ipp.c:4978 +#: scheduler/ipp.c:7227 scheduler/ipp.c:7374 scheduler/ipp.c:8816 +#: scheduler/ipp.c:9918 scheduler/ipp.c:10143 scheduler/ipp.c:10497 +#: scheduler/ipp.c:11085 +msgid "Got a printer-uri attribute but no job-id." msgstr "" -#: ppdc/sample.c:229 +#: ppdc/sample.c:226 msgid "Grayscale" msgstr "" -#: ppdc/sample.c:254 +#: ppdc/sample.c:251 msgid "HP" msgstr "" -#: ppdc/sample.c:135 +#: ppdc/sample.c:132 msgid "Hanging Folder" msgstr "" -#: ppdc/sample.c:144 +#: ppdc/sample.c:141 msgid "Hanging Folder - 9/16 x 2\"" msgstr "" -#: ppdc/sample.c:95 -msgid "ISO B0" -msgstr "" - -#: ppdc/sample.c:96 -msgid "ISO B1" -msgstr "" - -#: ppdc/sample.c:106 -msgid "ISO B10" -msgstr "" - -#: ppdc/sample.c:97 -msgid "ISO B2" -msgstr "" - -#: ppdc/sample.c:98 -msgid "ISO B3" -msgstr "" - -#: ppdc/sample.c:99 -msgid "ISO B4" -msgstr "" - -#: ppdc/sample.c:71 -msgid "ISO B4 Envelope" -msgstr "" - -#: ppdc/sample.c:100 -msgid "ISO B5" -msgstr "" - -#: ppdc/sample.c:101 -msgid "ISO B5 (Oversize)" -msgstr "" - -#: ppdc/sample.c:72 -msgid "ISO B5 Envelope" -msgstr "" - -#: ppdc/sample.c:102 -msgid "ISO B6" -msgstr "" - -#: ppdc/sample.c:73 -msgid "ISO B6 Envelope" -msgstr "" - -#: ppdc/sample.c:103 -msgid "ISO B7" -msgstr "" - -#: ppdc/sample.c:104 -msgid "ISO B8" -msgstr "" - -#: ppdc/sample.c:105 -msgid "ISO B9" -msgstr "" - #: ppdc/sample.c:1 msgid "ISOLatin1" msgstr "" @@ -3639,19 +3550,19 @@ msgstr "" msgid "Illegal whitespace character" msgstr "" -#: ppdc/sample.c:248 +#: ppdc/sample.c:245 msgid "Installable Options" msgstr "" -#: ppdc/sample.c:251 +#: ppdc/sample.c:248 msgid "Installed" msgstr "" -#: ppdc/sample.c:267 +#: ppdc/sample.c:264 msgid "IntelliBar Label Printer" msgstr "" -#: ppdc/sample.c:266 +#: ppdc/sample.c:263 msgid "Intellitech" msgstr "" @@ -3663,95 +3574,118 @@ msgstr "" msgid "Internal error" msgstr "" -#: ppdc/sample.c:132 +#: ppdc/sample.c:129 msgid "Internet Postage 2-Part" msgstr "" -#: ppdc/sample.c:141 +#: ppdc/sample.c:138 msgid "Internet Postage 2-Part - 2 1/4 x 7 1/2\"" msgstr "" -#: ppdc/sample.c:133 +#: ppdc/sample.c:130 msgid "Internet Postage 3-Part" msgstr "" -#: ppdc/sample.c:142 +#: ppdc/sample.c:139 msgid "Internet Postage 3-Part - 2 1/4 x 7\"" msgstr "" -#: backend/ipp.c:246 -msgid "Internet Printing Protocol" +#: backend/ipp.c:252 +msgid "Internet Printing Protocol" +msgstr "" + +#: ppdc/sample.c:37 +msgid "JB0" +msgstr "" + +#: ppdc/sample.c:39 +msgid "JB1" +msgstr "" + +#: ppdc/sample.c:38 +msgid "JB10" +msgstr "" + +#: ppdc/sample.c:40 +msgid "JB2" +msgstr "" + +#: ppdc/sample.c:41 +msgid "JB3" +msgstr "" + +#: ppdc/sample.c:42 +msgid "JB4" +msgstr "" + +#: ppdc/sample.c:44 +msgid "JB6" +msgstr "" + +#: ppdc/sample.c:45 +msgid "JB7" msgstr "" -#: ppdc/sample.c:70 -msgid "Invite Envelope" +#: ppdc/sample.c:46 +msgid "JB8" msgstr "" -#: ppdc/sample.c:74 -msgid "Italian Envelope" +#: ppdc/sample.c:47 +msgid "JB9" msgstr "" #: cups/ppd.c:1387 msgid "JCL" msgstr "" -#: scheduler/ipp.c:10220 +#: scheduler/ipp.c:10215 #, c-format -msgid "Job #%d cannot be restarted - no files" +msgid "Job #%d cannot be restarted - no files." msgstr "" -#: scheduler/ipp.c:4082 scheduler/ipp.c:4546 scheduler/ipp.c:4989 -#: scheduler/ipp.c:7268 scheduler/ipp.c:7414 scheduler/ipp.c:8686 -#: scheduler/ipp.c:8858 scheduler/ipp.c:9067 scheduler/ipp.c:9112 -#: scheduler/ipp.c:9962 scheduler/ipp.c:10188 scheduler/ipp.c:10543 -#: scheduler/ipp.c:11133 +#: scheduler/ipp.c:4082 scheduler/ipp.c:4313 scheduler/ipp.c:4368 +#: scheduler/ipp.c:4545 scheduler/ipp.c:4988 scheduler/ipp.c:6889 +#: scheduler/ipp.c:7267 scheduler/ipp.c:7414 scheduler/ipp.c:7714 +#: scheduler/ipp.c:8663 scheduler/ipp.c:8685 scheduler/ipp.c:8857 +#: scheduler/ipp.c:9066 scheduler/ipp.c:9109 scheduler/ipp.c:9958 +#: scheduler/ipp.c:10183 scheduler/ipp.c:10537 scheduler/ipp.c:11125 #, c-format -msgid "Job #%d does not exist" +msgid "Job #%d does not exist." msgstr "" -#: scheduler/ipp.c:4578 +#: scheduler/ipp.c:4577 #, c-format msgid "Job #%d is already aborted - can't cancel." msgstr "" -#: scheduler/ipp.c:4572 +#: scheduler/ipp.c:4571 #, c-format msgid "Job #%d is already canceled - can't cancel." msgstr "" -#: scheduler/ipp.c:4584 +#: scheduler/ipp.c:4583 #, c-format msgid "Job #%d is already completed - can't cancel." msgstr "" -#: scheduler/ipp.c:9154 scheduler/ipp.c:11148 -#, c-format -msgid "Job #%d is finished and cannot be altered" -msgstr "" - -#: scheduler/ipp.c:10202 +#: scheduler/ipp.c:9151 scheduler/ipp.c:11140 #, c-format -msgid "Job #%d is not complete" +msgid "Job #%d is finished and cannot be altered." msgstr "" -#: scheduler/ipp.c:9976 +#: scheduler/ipp.c:10197 #, c-format -msgid "Job #%d is not held" +msgid "Job #%d is not complete." msgstr "" #: scheduler/ipp.c:4097 #, c-format -msgid "Job #%d is not held for authentication" -msgstr "" - -#: scheduler/ipp.c:8664 -#, c-format -msgid "Job #%s does not exist" +msgid "Job #%d is not held for authentication." msgstr "" -#: scheduler/ipp.c:6890 +#: scheduler/ipp.c:9972 #, c-format -msgid "Job %d not found" +msgid "Job #%d is not held." msgstr "" #: cgi-bin/ipp-var.c:1055 @@ -3778,7 +3712,7 @@ msgstr "" msgid "Job UUID: " msgstr "" -#: scheduler/ipp.c:11231 +#: scheduler/ipp.c:11223 msgid "Job is completed and cannot be changed." msgstr "" @@ -3786,56 +3720,52 @@ msgstr "" msgid "Job operation failed:" msgstr "" -#: scheduler/ipp.c:11267 scheduler/ipp.c:11286 scheduler/ipp.c:11297 +#: scheduler/ipp.c:11259 scheduler/ipp.c:11278 scheduler/ipp.c:11289 msgid "Job state cannot be changed." msgstr "" -#: scheduler/ipp.c:10067 -msgid "Job subscriptions cannot be renewed" +#: scheduler/ipp.c:10063 +msgid "Job subscriptions cannot be renewed." msgstr "" #: cgi-bin/jobs.c:103 cgi-bin/jobs.c:114 cgi-bin/jobs.c:195 msgid "Jobs" msgstr "" -#: ppdc/sample.c:75 -msgid "Kaku2 Envelope" -msgstr "" - -#: ppdc/sample.c:76 -msgid "Kaku3 Envelope" -msgstr "" - #: backend/lpd.c:183 msgid "LPD/LPR Host or Printer" msgstr "" -#: ppdc/sample.c:204 +#: ppdc/sample.c:201 msgid "Label Printer" msgstr "" -#: ppdc/sample.c:420 +#: ppdc/sample.c:417 msgid "Label Top" msgstr "" -#: scheduler/ipp.c:2220 scheduler/ipp.c:6813 +#: scheduler/ipp.c:2219 scheduler/ipp.c:6812 #, c-format -msgid "Language \"%s\" not supported" +msgid "Language \"%s\" not supported." msgstr "" -#: ppdc/sample.c:129 +#: ppdc/sample.c:126 msgid "Large Address" msgstr "" -#: ppdc/sample.c:138 +#: ppdc/sample.c:135 msgid "Large Address - 1 4/10 x 3 1/2\"" msgstr "" -#: ppdc/sample.c:265 +#: ppdc/sample.c:262 msgid "LaserJet Series PCL 4/5" msgstr "" -#: ppdc/sample.c:210 +#: ppdc/sample.c:32 +msgid "Letter Oversize" +msgstr "" + +#: ppdc/sample.c:207 msgid "Light" msgstr "" @@ -3855,7 +3785,7 @@ msgstr "" msgid "Location: " msgstr "" -#: ppdc/sample.c:246 +#: ppdc/sample.c:243 msgid "Long-Edge (Portrait)" msgstr "" @@ -3867,7 +3797,7 @@ msgstr "" msgid "Make and Model: " msgstr "" -#: ppdc/sample.c:242 +#: ppdc/sample.c:239 msgid "Manual Feed" msgstr "" @@ -3887,19 +3817,19 @@ msgstr "" msgid "Media Size" msgstr "" -#: cups/ppd.c:759 cups/ppd.c:1328 ppdc/sample.c:236 +#: cups/ppd.c:759 cups/ppd.c:1328 ppdc/sample.c:233 msgid "Media Source" msgstr "" -#: ppdc/sample.c:338 +#: ppdc/sample.c:335 msgid "Media Tracking" msgstr "" -#: cups/ppd.c:757 cups/ppd.c:1326 ppdc/sample.c:259 +#: cups/ppd.c:757 cups/ppd.c:1326 ppdc/sample.c:256 msgid "Media Type" msgstr "" -#: ppdc/sample.c:211 +#: ppdc/sample.c:208 msgid "Medium" msgstr "" @@ -3919,13 +3849,13 @@ msgstr "" msgid "Missing asterisk in column 1" msgstr "" -#: scheduler/ipp.c:7291 -msgid "Missing document-number attribute" +#: scheduler/ipp.c:7290 +msgid "Missing document-number attribute." msgstr "" #: cups/adminutil.c:273 #, c-format -msgid "Missing double quote on line %d" +msgid "Missing double quote on line %d." msgstr "" #: cgi-bin/admin.c:737 cgi-bin/admin.c:2180 cgi-bin/admin.c:2265 @@ -3943,7 +3873,7 @@ msgid "Missing media-size in media-col." msgstr "" #: scheduler/ipp.c:7844 -msgid "Missing notify-subscription-ids attribute" +msgid "Missing notify-subscription-ids attribute." msgstr "" #: cups/ppd.c:359 @@ -3951,21 +3881,21 @@ msgid "Missing option keyword" msgstr "" #: scheduler/ipp.c:4224 scheduler/ipp.c:4249 -msgid "Missing requesting-user-name attribute" +msgid "Missing requesting-user-name attribute." msgstr "" #: scheduler/ipp.c:492 -msgid "Missing required attributes" +msgid "Missing required attributes." msgstr "" -#: cups/adminutil.c:254 +#: filter/bannertops.c:222 #, c-format -msgid "Missing value on line %d" +msgid "Missing value on line %d of banner file." msgstr "" -#: filter/bannertops.c:222 +#: cups/adminutil.c:254 #, c-format -msgid "Missing value on line %d of banner file." +msgid "Missing value on line %d." msgstr "" #: cups/ppd.c:343 @@ -3997,14 +3927,10 @@ msgstr "" msgid "Modify Printer" msgstr "" -#: ppdc/sample.c:113 +#: ppdc/sample.c:111 msgid "Monarch" msgstr "" -#: ppdc/sample.c:77 -msgid "Monarch Envelope" -msgstr "" - #: cgi-bin/ipp-var.c:425 cgi-bin/ipp-var.c:516 msgid "Move All Jobs" msgstr "" @@ -4026,43 +3952,43 @@ msgid "Name OID uses indefinite length" msgstr "" #: scheduler/ipp.c:1226 -msgid "Nested classes are not allowed" +msgid "Nested classes are not allowed." msgstr "" -#: backend/ipp.c:755 +#: backend/ipp.c:762 #, c-format msgid "Network host \"%s\" is busy; will retry in %d seconds." msgstr "" -#: backend/ipp.c:631 backend/lpd.c:833 backend/socket.c:369 +#: backend/ipp.c:637 backend/lpd.c:833 backend/socket.c:369 #, c-format msgid "Network printer \"%s\" is busy." msgstr "" -#: backend/ipp.c:643 backend/lpd.c:854 backend/socket.c:382 +#: backend/ipp.c:649 backend/lpd.c:854 backend/socket.c:382 #, c-format msgid "Network printer \"%s\" is not responding." msgstr "" -#: backend/ipp.c:624 backend/lpd.c:826 backend/socket.c:362 +#: backend/ipp.c:630 backend/lpd.c:826 backend/socket.c:362 #, c-format msgid "Network printer \"%s\" is unreachable at this time." msgstr "" -#: backend/ipp.c:617 backend/lpd.c:819 backend/socket.c:355 +#: backend/ipp.c:623 backend/lpd.c:819 backend/socket.c:355 #, c-format msgid "Network printer \"%s\" may not exist or is unavailable at this time." msgstr "" -#: ppdc/sample.c:404 +#: ppdc/sample.c:401 msgid "Never" msgstr "" -#: ppdc/sample.c:230 +#: ppdc/sample.c:227 msgid "New Stylus Color Series" msgstr "" -#: ppdc/sample.c:232 +#: ppdc/sample.c:229 msgid "New Stylus Photo Series" msgstr "" @@ -4083,7 +4009,7 @@ msgid "No VarBind SEQUENCE" msgstr "" #: cups/adminutil.c:788 -msgid "No Windows printer drivers are installed" +msgid "No Windows printer drivers are installed." msgstr "" #: cups/request.c:577 cups/request.c:863 @@ -4092,15 +4018,15 @@ msgstr "" #: scheduler/ipp.c:4494 #, c-format -msgid "No active jobs on %s" +msgid "No active jobs on %s." msgstr "" #: scheduler/ipp.c:333 -msgid "No attributes in request" +msgid "No attributes in request." msgstr "" #: scheduler/ipp.c:4125 -msgid "No authentication information provided" +msgid "No authentication information provided." msgstr "" #: cups/snmp.c:1009 @@ -4108,10 +4034,10 @@ msgid "No community name" msgstr "" #: scheduler/ipp.c:7090 -msgid "No default printer" +msgid "No default printer." msgstr "" -#: cgi-bin/ipp-var.c:436 scheduler/ipp.c:8421 +#: cgi-bin/ipp-var.c:436 scheduler/ipp.c:8420 msgid "No destinations added." msgstr "" @@ -4127,8 +4053,8 @@ msgstr "" msgid "No error-status" msgstr "" -#: scheduler/ipp.c:9358 scheduler/ipp.c:10606 -msgid "No file!?" +#: scheduler/ipp.c:9355 scheduler/ipp.c:10600 +msgid "No file in print request." msgstr "" #: filter/pstext.c:438 @@ -4162,18 +4088,18 @@ msgid "No printer-uri found for class" msgstr "" #: scheduler/ipp.c:7493 -msgid "No printer-uri in request" +msgid "No printer-uri in request." msgstr "" #: cups/snmp.c:1023 msgid "No request-id" msgstr "" -#: scheduler/ipp.c:6698 -msgid "No subscription attributes in request" +#: scheduler/ipp.c:6697 +msgid "No subscription attributes in request." msgstr "" -#: scheduler/ipp.c:8757 +#: scheduler/ipp.c:8756 msgid "No subscriptions found." msgstr "" @@ -4185,15 +4111,15 @@ msgstr "" msgid "No version number" msgstr "" -#: ppdc/sample.c:341 +#: ppdc/sample.c:338 msgid "Non-continuous (Mark sensing)" msgstr "" -#: ppdc/sample.c:340 +#: ppdc/sample.c:337 msgid "Non-continuous (Web sensing)" msgstr "" -#: ppdc/sample.c:212 +#: ppdc/sample.c:209 msgid "Normal" msgstr "" @@ -4205,7 +4131,7 @@ msgstr "" msgid "Not Implemented" msgstr "" -#: ppdc/sample.c:250 +#: ppdc/sample.c:247 msgid "Not Installed" msgstr "" @@ -4217,11 +4143,11 @@ msgstr "" msgid "Not Supported" msgstr "" -#: scheduler/ipp.c:1603 scheduler/ipp.c:11829 +#: scheduler/ipp.c:1602 scheduler/ipp.c:11821 msgid "Not allowed to print." msgstr "" -#: ppdc/sample.c:114 +#: ppdc/sample.c:112 msgid "Note" msgstr "" @@ -4233,11 +4159,11 @@ msgstr "" msgid "OK" msgstr "" -#: ppdc/sample.c:245 +#: ppdc/sample.c:242 msgid "Off (1-Sided)" msgstr "" -#: ppdc/sample.c:335 +#: ppdc/sample.c:332 msgid "Oki" msgstr "" @@ -4271,9 +4197,9 @@ msgstr "" msgid "Options Installed" msgstr "" -#: scheduler/cupsfilter.c:1357 scheduler/cupsfilter.c:1372 -#: scheduler/main.c:2196 systemv/cupsaddsmb.c:284 systemv/cupsctl.c:209 -#: systemv/cupstestdsc.c:429 systemv/cupstestppd.c:3491 test/ipptool.c:3825 +#: scheduler/cupsfilter.c:1356 scheduler/cupsfilter.c:1383 +#: scheduler/main.c:2247 systemv/cupsaddsmb.c:284 systemv/cupsctl.c:209 +#: systemv/cupstestdsc.c:429 systemv/cupstestppd.c:3490 test/ipptool.c:3827 #: ppdc/ppdc.cxx:437 ppdc/ppdhtml.cxx:174 ppdc/ppdi.cxx:130 #: ppdc/ppdmerge.cxx:369 ppdc/ppdpo.cxx:254 msgid "Options:" @@ -4283,7 +4209,7 @@ msgstr "" msgid "Options: " msgstr "" -#: cups/ppd-cache.c:1298 +#: cups/ppd-cache.c:1304 msgid "Out of memory." msgstr "" @@ -4315,60 +4241,20 @@ msgstr "" msgid "PASS" msgstr "" -#: ppdc/sample.c:234 +#: ppdc/sample.c:231 msgid "PCL Laser Printer" msgstr "" -#: ppdc/sample.c:79 -msgid "PRC1 Envelope" -msgstr "" - -#: ppdc/sample.c:88 -msgid "PRC10 Envelope" -msgstr "" - -#: ppdc/sample.c:116 +#: ppdc/sample.c:114 msgid "PRC16K" msgstr "" -#: ppdc/sample.c:80 -msgid "PRC2 Envelope" -msgstr "" - -#: ppdc/sample.c:81 -msgid "PRC3 Envelope" -msgstr "" - -#: ppdc/sample.c:117 +#: ppdc/sample.c:115 msgid "PRC32K" msgstr "" -#: ppdc/sample.c:118 -msgid "PRC32K (Oversize)" -msgstr "" - -#: ppdc/sample.c:82 -msgid "PRC4 Envelope" -msgstr "" - -#: ppdc/sample.c:83 -msgid "PRC5 Envelope" -msgstr "" - -#: ppdc/sample.c:84 -msgid "PRC6 Envelope" -msgstr "" - -#: ppdc/sample.c:85 -msgid "PRC7 Envelope" -msgstr "" - -#: ppdc/sample.c:86 -msgid "PRC8 Envelope" -msgstr "" - -#: ppdc/sample.c:87 -msgid "PRC9 Envelope" +#: ppdc/sample.c:116 +msgid "PRC32K Oversize" msgstr "" #: cups/snmp.c:1019 @@ -4379,11 +4265,11 @@ msgstr "" msgid "Packet does not start with SEQUENCE" msgstr "" -#: ppdc/sample.c:334 +#: ppdc/sample.c:331 msgid "ParamCustominCutInterval" msgstr "" -#: ppdc/sample.c:332 +#: ppdc/sample.c:329 msgid "ParamCustominTearInterval" msgstr "" @@ -4405,23 +4291,19 @@ msgstr "" msgid "Pause Printer" msgstr "" -#: ppdc/sample.c:422 +#: ppdc/sample.c:419 msgid "Peel-Off" msgstr "" -#: ppdc/sample.c:78 -msgid "Personal Envelope" -msgstr "" - -#: ppdc/sample.c:125 +#: ppdc/sample.c:122 msgid "Photo" msgstr "" -#: ppdc/sample.c:126 +#: ppdc/sample.c:123 msgid "Photo Labels" msgstr "" -#: ppdc/sample.c:260 +#: ppdc/sample.c:257 msgid "Plain Paper" msgstr "" @@ -4433,15 +4315,23 @@ msgstr "" msgid "Port Monitor" msgstr "" -#: ppdc/sample.c:252 +#: ppdc/sample.c:249 msgid "PostScript Printer" msgstr "" -#: ppdc/sample.c:115 +#: ppdc/sample.c:113 msgid "Postcard" msgstr "" -#: ppdc/sample.c:269 +#: ppdc/sample.c:53 +msgid "Postcard Double" +msgstr "" + +#: ppdc/sample.c:52 +msgid "Postcard Double " +msgstr "" + +#: ppdc/sample.c:266 msgid "Print Density" msgstr "" @@ -4449,11 +4339,11 @@ msgstr "" msgid "Print Job:" msgstr "" -#: ppdc/sample.c:314 +#: ppdc/sample.c:311 msgid "Print Mode" msgstr "" -#: ppdc/sample.c:357 +#: ppdc/sample.c:354 msgid "Print Rate" msgstr "" @@ -4461,7 +4351,7 @@ msgstr "" msgid "Print Self-Test Page" msgstr "" -#: ppdc/sample.c:301 +#: ppdc/sample.c:298 msgid "Print Speed" msgstr "" @@ -4469,20 +4359,20 @@ msgstr "" msgid "Print Test Page" msgstr "" -#: ppdc/sample.c:330 +#: ppdc/sample.c:327 msgid "Print and Cut" msgstr "" -#: ppdc/sample.c:318 +#: ppdc/sample.c:315 msgid "Print and Tear" msgstr "" -#: backend/ipp.c:1202 +#: backend/ipp.c:1256 #, c-format msgid "Print file accepted - job ID %d." msgstr "" -#: backend/ipp.c:1195 +#: backend/ipp.c:1249 msgid "Print file accepted - job ID unknown." msgstr "" @@ -4490,7 +4380,7 @@ msgstr "" msgid "Print file sent." msgstr "" -#: backend/ipp.c:1170 +#: backend/ipp.c:1224 #, c-format msgid "Print file was not accepted: %s" msgstr "" @@ -4511,7 +4401,7 @@ msgstr "" msgid "Printer Added" msgstr "" -#: ppdc/sample.c:237 +#: ppdc/sample.c:234 msgid "Printer Default" msgstr "" @@ -4531,7 +4421,7 @@ msgstr "" msgid "Printer Paused" msgstr "" -#: ppdc/sample.c:268 +#: ppdc/sample.c:265 msgid "Printer Settings" msgstr "" @@ -4539,7 +4429,7 @@ msgstr "" msgid "Printer busy, will retry in 10 seconds." msgstr "" -#: backend/ipp.c:1045 backend/ipp.c:1160 +#: backend/ipp.c:1090 backend/ipp.c:1214 msgid "Printer busy; will retry in 10 seconds." msgstr "" @@ -4552,7 +4442,7 @@ msgstr "" msgid "Printer did not respond after %d seconds." msgstr "" -#: backend/ipp.c:774 backend/ipp.c:781 +#: backend/ipp.c:781 backend/ipp.c:788 #, c-format msgid "Printer does not support IPP/%d.%d, trying IPP/%s." msgstr "" @@ -4569,11 +4459,11 @@ msgstr "" msgid "Printer is now connected." msgstr "" -#: backend/usb-darwin.c:1289 +#: backend/usb-darwin.c:1304 msgid "Printer is now online." msgstr "" -#: backend/usb-darwin.c:1307 +#: backend/usb-darwin.c:1322 msgid "Printer is offline." msgstr "" @@ -4609,11 +4499,11 @@ msgstr "" msgid "Purge Jobs" msgstr "" -#: ppdc/sample.c:119 +#: ppdc/sample.c:117 msgid "Quarto" msgstr "" -#: scheduler/ipp.c:1598 scheduler/ipp.c:11824 +#: scheduler/ipp.c:1597 scheduler/ipp.c:11816 msgid "Quota limit reached." msgstr "" @@ -4625,7 +4515,7 @@ msgstr "" msgid "Rank Owner Pri Job Files Total Size" msgstr "" -#: backend/ipp.c:1487 backend/socket.c:477 driver/rastertoescpx.c:1923 +#: backend/ipp.c:1544 backend/socket.c:477 driver/rastertoescpx.c:1923 #: driver/rastertopclx.c:1948 filter/rastertoepson.c:1152 #: filter/rastertohp.c:881 filter/rastertolabel.c:1307 msgid "Ready to print." @@ -4645,7 +4535,7 @@ msgstr "" msgid "Remote host did not accept data file (%d)." msgstr "" -#: ppdc/sample.c:402 +#: ppdc/sample.c:399 msgid "Reprint After Error" msgstr "" @@ -4653,7 +4543,7 @@ msgstr "" msgid "Request Entity Too Large" msgstr "" -#: cups/ppd.c:763 cups/ppd.c:1332 ppdc/sample.c:205 +#: cups/ppd.c:763 cups/ppd.c:1332 ppdc/sample.c:202 msgid "Resolution" msgstr "" @@ -4665,15 +4555,15 @@ msgstr "" msgid "Resume Printer" msgstr "" -#: ppdc/sample.c:130 +#: ppdc/sample.c:127 msgid "Return Address" msgstr "" -#: ppdc/sample.c:139 +#: ppdc/sample.c:136 msgid "Return Address - 3/4 x 2\"" msgstr "" -#: ppdc/sample.c:423 +#: ppdc/sample.c:420 msgid "Rewind" msgstr "" @@ -4745,19 +4635,19 @@ msgstr "" msgid "Set Publishing" msgstr "" -#: ppdc/sample.c:131 +#: ppdc/sample.c:128 msgid "Shipping Address" msgstr "" -#: ppdc/sample.c:140 +#: ppdc/sample.c:137 msgid "Shipping Address - 2 5/16 x 4\"" msgstr "" -#: ppdc/sample.c:247 +#: ppdc/sample.c:244 msgid "Short-Edge (Landscape)" msgstr "" -#: ppdc/sample.c:262 +#: ppdc/sample.c:259 msgid "Special Paper" msgstr "" @@ -4766,7 +4656,7 @@ msgstr "" msgid "Spooling job, %.0f%% complete." msgstr "" -#: ppdc/sample.c:315 +#: ppdc/sample.c:312 msgid "Standard" msgstr "" @@ -4781,27 +4671,33 @@ msgstr "" msgid "Starting page %d." msgstr "" -#: ppdc/sample.c:120 +#: ppdc/sample.c:118 msgid "Statement" msgstr "" -#: ppdc/sample.c:225 +#: ppdc/sample.c:222 msgid "Stylus Color Series" msgstr "" -#: ppdc/sample.c:231 +#: ppdc/sample.c:228 msgid "Stylus Photo Series" msgstr "" -#: ppdc/sample.c:121 +#: scheduler/ipp.c:4640 scheduler/ipp.c:7860 scheduler/ipp.c:8569 +#: scheduler/ipp.c:10051 +#, c-format +msgid "Subscription #%d does not exist." +msgstr "" + +#: ppdc/sample.c:119 msgid "Super A" msgstr "" -#: ppdc/sample.c:122 +#: ppdc/sample.c:120 msgid "Super B" msgstr "" -#: ppdc/sample.c:127 +#: ppdc/sample.c:124 msgid "Super B/A3" msgstr "" @@ -4809,23 +4705,23 @@ msgstr "" msgid "Switching Protocols" msgstr "" -#: ppdc/sample.c:123 +#: ppdc/sample.c:121 msgid "Tabloid" msgstr "" -#: ppdc/sample.c:124 -msgid "Tabloid (Oversize)" +#: ppdc/sample.c:33 +msgid "Tabloid Oversize" msgstr "" -#: ppdc/sample.c:316 +#: ppdc/sample.c:313 msgid "Tear" msgstr "" -#: ppdc/sample.c:421 +#: ppdc/sample.c:418 msgid "Tear-Off" msgstr "" -#: ppdc/sample.c:362 +#: ppdc/sample.c:359 msgid "Tear-Off Adjust Position" msgstr "" @@ -4835,12 +4731,12 @@ msgstr "" msgid "The %s attribute cannot be provided with job-ids." msgstr "" -#: scheduler/ipp.c:8092 +#: scheduler/ipp.c:8091 #, c-format msgid "The PPD file \"%s\" could not be found." msgstr "" -#: scheduler/ipp.c:8079 +#: scheduler/ipp.c:8078 #, c-format msgid "The PPD file \"%s\" could not be opened: %s" msgstr "" @@ -4871,13 +4767,13 @@ msgstr "" msgid "The fuser's temperature is low." msgstr "" -#: scheduler/ipp.c:2247 +#: scheduler/ipp.c:2246 msgid "The notify-lease-duration attribute cannot be used with job subscriptions." msgstr "" -#: scheduler/ipp.c:2230 scheduler/ipp.c:6823 +#: scheduler/ipp.c:2229 scheduler/ipp.c:6822 #, c-format -msgid "The notify-user-data value is too large (%d > 63 octets)" +msgid "The notify-user-data value is too large (%d > 63 octets)." msgstr "" #: cups/localize.c:349 @@ -4924,7 +4820,7 @@ msgstr "" msgid "The print file could not be opened." msgstr "" -#: backend/ipp.c:791 +#: backend/ipp.c:798 msgid "The printer URI is incorrect or no longer exists." msgstr "" @@ -4936,12 +4832,12 @@ msgstr "" msgid "The printer is low on toner." msgstr "" -#: backend/ipp.c:608 backend/ipp.c:750 backend/lpd.c:811 backend/socket.c:347 -msgid "The printer is not responding." +#: cups/localize.c:311 +msgid "The printer is not connected." msgstr "" -#: cups/localize.c:311 -msgid "The printer is offline." +#: backend/ipp.c:614 backend/ipp.c:757 backend/lpd.c:811 backend/socket.c:347 +msgid "The printer is not responding." msgstr "" #: cups/localize.c:337 @@ -4956,19 +4852,19 @@ msgstr "" 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:1388 -msgid "The printer or class is not shared" +#: scheduler/ipp.c:908 scheduler/ipp.c:1220 scheduler/ipp.c:4289 +#: scheduler/ipp.c:4460 scheduler/ipp.c:6353 scheduler/ipp.c:6656 +#: scheduler/ipp.c:6970 scheduler/ipp.c:7530 scheduler/ipp.c:8296 +#: scheduler/ipp.c:8352 scheduler/ipp.c:8675 scheduler/ipp.c:8925 +#: scheduler/ipp.c:9014 scheduler/ipp.c:9047 scheduler/ipp.c:9370 +#: scheduler/ipp.c:9763 scheduler/ipp.c:9844 scheduler/ipp.c:10994 +#: scheduler/ipp.c:11449 scheduler/ipp.c:11779 scheduler/ipp.c:11861 +#: scheduler/ipp.c:12153 +msgid "The printer or class does not exist." msgstr "" -#: scheduler/ipp.c:908 scheduler/ipp.c:1220 scheduler/ipp.c:4289 -#: scheduler/ipp.c:4460 scheduler/ipp.c:6354 scheduler/ipp.c:6657 -#: scheduler/ipp.c:6970 scheduler/ipp.c:7530 scheduler/ipp.c:8297 -#: scheduler/ipp.c:8353 scheduler/ipp.c:8676 scheduler/ipp.c:8926 -#: scheduler/ipp.c:9015 scheduler/ipp.c:9048 scheduler/ipp.c:9373 -#: scheduler/ipp.c:9766 scheduler/ipp.c:9847 scheduler/ipp.c:11001 -#: scheduler/ipp.c:11457 scheduler/ipp.c:11787 scheduler/ipp.c:11869 -#: scheduler/ipp.c:12161 -msgid "The printer or class was not found." +#: scheduler/ipp.c:1388 +msgid "The printer or class is not shared." msgstr "" #: cups/localize.c:317 @@ -4991,20 +4887,20 @@ msgstr "" msgid "The printer's waste bin is full." msgstr "" -#: scheduler/ipp.c:1015 scheduler/ipp.c:2441 +#: scheduler/ipp.c:1015 scheduler/ipp.c:2411 #, c-format msgid "The printer-uri \"%s\" contains invalid characters." msgstr "" #: scheduler/ipp.c:4266 -msgid "The printer-uri attribute is required" +msgid "The printer-uri attribute is required." msgstr "" #: scheduler/ipp.c:999 msgid "The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"." msgstr "" -#: scheduler/ipp.c:2425 +#: scheduler/ipp.c:2395 msgid "The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"." msgstr "" @@ -5034,53 +4930,57 @@ msgstr "" msgid "There was an unrecoverable USB error." msgstr "" -#: ppdc/sample.c:409 +#: ppdc/sample.c:406 msgid "Thermal Transfer Media" msgstr "" -#: backend/ipp.c:877 backend/ipp.c:886 +#: backend/ipp.c:884 backend/ipp.c:893 msgid "This printer does not conform to the IPP standard and may not work." msgstr "" +#: backend/ipp.c:738 +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:1592 +#: scheduler/ipp.c:1591 msgid "Too many active jobs." msgstr "" #: scheduler/ipp.c:1485 #, c-format -msgid "Too many job-sheets values (%d > 2)" +msgid "Too many job-sheets values (%d > 2)." msgstr "" -#: scheduler/ipp.c:2753 +#: scheduler/ipp.c:2723 #, c-format -msgid "Too many printer-state-reasons values (%d > %d)" +msgid "Too many printer-state-reasons values (%d > %d)." msgstr "" -#: ppdc/sample.c:263 +#: ppdc/sample.c:260 msgid "Transparency" msgstr "" -#: ppdc/sample.c:258 +#: ppdc/sample.c:255 msgid "Tray" msgstr "" -#: ppdc/sample.c:238 +#: ppdc/sample.c:235 msgid "Tray 1" msgstr "" -#: ppdc/sample.c:239 +#: ppdc/sample.c:236 msgid "Tray 2" msgstr "" -#: ppdc/sample.c:240 +#: ppdc/sample.c:237 msgid "Tray 3" msgstr "" -#: ppdc/sample.c:241 +#: ppdc/sample.c:238 msgid "Tray 4" msgstr "" @@ -5088,36 +4988,28 @@ msgstr "" msgid "URI Too Long" msgstr "" -#: ppdc/sample.c:90 -msgid "US Executive" +#: ppdc/sample.c:105 +msgid "US Ledger" msgstr "" -#: ppdc/sample.c:93 -msgid "US Fanfold" +#: ppdc/sample.c:106 +msgid "US Legal" msgstr "" #: ppdc/sample.c:107 -msgid "US Ledger" +msgid "US Legal Oversize" msgstr "" #: ppdc/sample.c:108 -msgid "US Legal" +msgid "US Letter" msgstr "" #: ppdc/sample.c:109 -msgid "US Legal (Oversize)" +msgid "US Letter Oversize" msgstr "" #: ppdc/sample.c:110 -msgid "US Letter" -msgstr "" - -#: ppdc/sample.c:111 -msgid "US Letter (Oversize)" -msgstr "" - -#: ppdc/sample.c:112 -msgid "US Letter (Small)" +msgid "US Letter Small" msgstr "" #: backend/serial.c:796 @@ -5137,14 +5029,14 @@ msgstr "" msgid "Unable to add class:" msgstr "" -#: backend/ipp.c:1274 +#: backend/ipp.c:1328 #, c-format msgid "Unable to add file to job: %s" msgstr "" -#: scheduler/ipp.c:1633 +#: scheduler/ipp.c:1632 #, c-format -msgid "Unable to add job for destination \"%s\"" +msgid "Unable to add job for destination \"%s\"." msgstr "" #: cgi-bin/admin.c:1060 cgi-bin/admin.c:1420 @@ -5152,7 +5044,7 @@ msgid "Unable to add printer:" msgstr "" #: scheduler/ipp.c:1330 -msgid "Unable to allocate memory for file types" +msgid "Unable to allocate memory for file types." msgstr "" #: filter/pstops.c:450 @@ -5167,7 +5059,7 @@ msgstr "" msgid "Unable to cancel RSS subscription:" msgstr "" -#: backend/ipp.c:1529 +#: backend/ipp.c:1586 #, c-format msgid "Unable to cancel job: %s" msgstr "" @@ -5192,7 +5084,7 @@ msgstr "" msgid "Unable to connect to server" msgstr "" -#: backend/ipp.c:586 backend/ipp.c:922 backend/lpd.c:791 +#: backend/ipp.c:592 backend/ipp.c:933 backend/lpd.c:791 #: backend/parallel.c:219 backend/serial.c:241 backend/socket.c:327 #: backend/usb-unix.c:117 msgid "Unable to contact printer, queuing on next printer in class." @@ -5200,39 +5092,39 @@ msgstr "" #: cups/adminutil.c:726 #, c-format -msgid "Unable to copy 64-bit CUPS printer driver files (%d)" +msgid "Unable to copy 64-bit CUPS printer driver files (%d)." msgstr "" #: cups/adminutil.c:691 #, c-format -msgid "Unable to copy 64-bit Windows printer driver files (%d)" +msgid "Unable to copy 64-bit Windows printer driver files (%d)." msgstr "" #: cups/adminutil.c:522 #, c-format -msgid "Unable to copy CUPS printer driver files (%d)" -msgstr "" - -#: scheduler/ipp.c:2928 -msgid "Unable to copy PPD file" +msgid "Unable to copy CUPS printer driver files (%d)." msgstr "" -#: scheduler/ipp.c:2873 +#: scheduler/ipp.c:2843 #, c-format msgid "Unable to copy PPD file - %s" msgstr "" +#: scheduler/ipp.c:2898 +msgid "Unable to copy PPD file." +msgstr "" + #: cups/adminutil.c:487 #, c-format -msgid "Unable to copy Windows 2000 printer driver files (%d)" +msgid "Unable to copy Windows 2000 printer driver files (%d)." msgstr "" #: cups/adminutil.c:610 #, c-format -msgid "Unable to copy Windows 9x printer driver files (%d)" +msgid "Unable to copy Windows 9x printer driver files (%d)." msgstr "" -#: scheduler/ipp.c:2850 +#: scheduler/ipp.c:2820 #, c-format msgid "Unable to copy interface script - %s" msgstr "" @@ -5241,7 +5133,7 @@ msgstr "" msgid "Unable to copy print file" msgstr "" -#: backend/ipp.c:1617 +#: backend/ipp.c:1674 msgid "Unable to create compressed print file" msgstr "" @@ -5277,35 +5169,35 @@ msgstr "" msgid "Unable to edit cupsd.conf files larger than 1MB" msgstr "" -#: cups/http.c:4065 +#: cups/http.c:4079 msgid "Unable to establish a secure connection to host (certificate chain invalid)." msgstr "" -#: cups/http.c:4055 +#: cups/http.c:4069 msgid "Unable to establish a secure connection to host (certificate not yet valid)." msgstr "" -#: cups/http.c:4050 +#: cups/http.c:4064 msgid "Unable to establish a secure connection to host (expired certificate)." msgstr "" -#: cups/http.c:4060 +#: cups/http.c:4074 msgid "Unable to establish a secure connection to host (host name mismatch)." msgstr "" -#: cups/http.c:4070 +#: cups/http.c:4084 msgid "Unable to establish a secure connection to host (peer dropped connection before responding)." msgstr "" -#: cups/http.c:4045 +#: cups/http.c:4059 msgid "Unable to establish a secure connection to host (self-signed certificate)." msgstr "" -#: cups/http.c:4040 +#: cups/http.c:4054 msgid "Unable to establish a secure connection to host (untrusted certificate)." msgstr "" -#: cups/http.c:4097 +#: cups/http.c:4111 msgid "Unable to establish a secure connection to host." msgstr "" @@ -5321,7 +5213,7 @@ msgstr "" msgid "Unable to fork filter" msgstr "" -#: backend/ipp.c:1639 +#: backend/ipp.c:1696 msgid "Unable to generate compressed print file" msgstr "" @@ -5333,7 +5225,7 @@ msgstr "" msgid "Unable to get class status:" msgstr "" -#: backend/ipp.c:1359 +#: backend/ipp.c:1413 #, c-format msgid "Unable to get job attributes: %s" msgstr "" @@ -5354,27 +5246,27 @@ msgstr "" msgid "Unable to get printer status:" msgstr "" -#: backend/ipp.c:811 +#: backend/ipp.c:818 #, c-format msgid "Unable to get printer status: %s" msgstr "" #: cups/adminutil.c:565 cups/adminutil.c:769 #, c-format -msgid "Unable to install Windows 2000 printer driver files (%d)" +msgid "Unable to install Windows 2000 printer driver files (%d)." msgstr "" #: cups/adminutil.c:639 #, c-format -msgid "Unable to install Windows 9x printer driver files (%d)" +msgid "Unable to install Windows 9x printer driver files (%d)." msgstr "" -#: backend/ipp.c:523 backend/lpd.c:417 backend/socket.c:273 +#: backend/ipp.c:529 backend/lpd.c:417 backend/socket.c:273 #, c-format msgid "Unable to locate printer \"%s\"." msgstr "" -#: backend/dnssd.c:497 backend/ipp.c:278 backend/lpd.c:200 +#: backend/dnssd.c:497 backend/ipp.c:284 backend/lpd.c:200 #: backend/socket.c:169 msgid "Unable to locate printer." msgstr "" @@ -5407,7 +5299,7 @@ msgstr "" msgid "Unable to open charset file" msgstr "" -#: backend/ipp.c:1623 +#: backend/ipp.c:1680 msgid "Unable to open compressed print file" msgstr "" @@ -5421,10 +5313,10 @@ msgstr "" #: scheduler/ipp.c:7311 #, c-format -msgid "Unable to open document %d in job %d" +msgid "Unable to open document #%d in job #%d." msgstr "" -#: backend/ipp.c:1629 backend/lpd.c:476 backend/parallel.c:150 +#: backend/ipp.c:1686 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 @@ -5455,10 +5347,6 @@ msgstr "" msgid "Unable to print test page:" msgstr "" -#: backend/ipp.c:731 -msgid "Unable to print: the printer does not conform to the IPP standard." -msgstr "" - #: backend/runloop.c:95 backend/runloop.c:322 msgid "Unable to read print data" msgstr "" @@ -5480,7 +5368,7 @@ msgstr "" msgid "Unable to send command to printer driver" msgstr "" -#: backend/usb-darwin.c:732 backend/usb-libusb.c:179 backend/usb-libusb.c:781 +#: backend/usb-darwin.c:733 backend/usb-libusb.c:179 backend/usb-libusb.c:781 msgid "Unable to send data to printer." msgstr "" @@ -5491,7 +5379,7 @@ msgstr "" #: cups/adminutil.c:821 #, c-format -msgid "Unable to set Windows printer driver (%d)" +msgid "Unable to set Windows printer driver (%d)." msgstr "" #: cgi-bin/admin.c:3922 @@ -5506,7 +5394,7 @@ msgstr "" msgid "Unable to upload cupsd.conf file:" msgstr "" -#: backend/usb-darwin.c:1993 backend/usb-darwin.c:2017 +#: backend/usb-darwin.c:2022 backend/usb-darwin.c:2046 msgid "Unable to use legacy USB class driver." msgstr "" @@ -5536,7 +5424,7 @@ msgstr "" msgid "Unknown choice \"%s\" for option \"%s\"." msgstr "" -#: backend/ipp.c:392 +#: backend/ipp.c:398 #, c-format msgid "Unknown encryption option value: \"%s\"." msgstr "" @@ -5551,7 +5439,7 @@ msgstr "" msgid "Unknown format character: \"%c\"." msgstr "" -#: backend/ipp.c:439 +#: backend/ipp.c:445 #, c-format msgid "Unknown option \"%s\" with value \"%s\"." msgstr "" @@ -5566,17 +5454,17 @@ msgstr "" msgid "Unknown print mode: \"%s\"." msgstr "" -#: scheduler/ipp.c:11659 +#: scheduler/ipp.c:11651 #, c-format msgid "Unknown printer-error-policy \"%s\"." msgstr "" -#: scheduler/ipp.c:11642 +#: scheduler/ipp.c:11634 #, c-format msgid "Unknown printer-op-policy \"%s\"." msgstr "" -#: backend/ipp.c:411 +#: backend/ipp.c:417 #, c-format msgid "Unknown version option value: \"%s\"." msgstr "" @@ -5593,27 +5481,27 @@ msgstr "" #: scheduler/ipp.c:433 #, c-format -msgid "Unsupported character set \"%s\"" +msgid "Unsupported character set \"%s\"." msgstr "" -#: scheduler/ipp.c:9339 scheduler/ipp.c:10576 scheduler/ipp.c:12113 +#: scheduler/ipp.c:9336 scheduler/ipp.c:10570 scheduler/ipp.c:12105 #, c-format -msgid "Unsupported compression \"%s\"" +msgid "Unsupported compression \"%s\"." msgstr "" -#: scheduler/ipp.c:9473 scheduler/ipp.c:12142 +#: scheduler/ipp.c:9470 scheduler/ipp.c:10715 scheduler/ipp.c:12134 #, c-format -msgid "Unsupported document-format \"%s\"" +msgid "Unsupported document-format \"%s\"." msgstr "" -#: scheduler/ipp.c:1451 scheduler/ipp.c:10722 +#: scheduler/ipp.c:10698 #, c-format -msgid "Unsupported format '%s'" +msgid "Unsupported document-format \"%s/%s\"." msgstr "" -#: scheduler/ipp.c:10705 +#: scheduler/ipp.c:1451 #, c-format -msgid "Unsupported format '%s/%s'" +msgid "Unsupported format \"%s\"." msgstr "" #: filter/pstops.c:2536 @@ -5669,7 +5557,7 @@ msgstr "" msgid "Usage: %s job user title copies options [filename]" msgstr "" -#: backend/dnssd.c:171 backend/ipp.c:252 backend/lpd.c:189 +#: backend/dnssd.c:171 backend/ipp.c:258 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 @@ -5683,7 +5571,7 @@ msgstr "" msgid "Usage: %s job-id user title copies options file" msgstr "" -#: scheduler/cupsfilter.c:1371 +#: scheduler/cupsfilter.c:1382 msgid "Usage: convert [ options ]" msgstr "" @@ -5695,23 +5583,23 @@ msgstr "" msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]" msgstr "" -#: scheduler/main.c:2195 +#: scheduler/main.c:2246 msgid "Usage: cupsd [options]" msgstr "" #: scheduler/cupsfilter.c:1355 -msgid "Usage: cupsfilter -m mime/type [ options ] filename" +msgid "Usage: cupsfilter [ options ] filename" msgstr "" #: systemv/cupstestdsc.c:425 msgid "Usage: cupstestdsc [options] filename.ps [... filename.ps]" msgstr "" -#: systemv/cupstestppd.c:3487 +#: systemv/cupstestppd.c:3486 msgid "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]" msgstr "" -#: test/ipptool.c:3823 +#: test/ipptool.c:3825 msgid "Usage: ipptool [options] URI filename [ ... filenameN ]" msgstr "" @@ -5778,7 +5666,7 @@ msgstr "" msgid "Version uses indefinite length" msgstr "" -#: backend/ipp.c:1299 +#: backend/ipp.c:1353 msgid "Waiting for job to complete." msgstr "" @@ -5791,7 +5679,7 @@ msgid "Waiting for printer to finish." msgstr "" #: cups/adminutil.c:793 -msgid "Warning, no Windows 2000 printer drivers are installed" +msgid "Warning, no Windows 2000 printer drivers are installed." msgstr "" #: cups/http-support.c:1257 @@ -5807,19 +5695,15 @@ msgstr "" msgid "You must access this page using the URL https://%s:%d%s." msgstr "" -#: ppdc/sample.c:89 -msgid "You4 Envelope" -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:413 +#: ppdc/sample.c:410 msgid "ZPL Label Printer" msgstr "" -#: ppdc/sample.c:336 +#: ppdc/sample.c:333 msgid "Zebra" msgstr "" @@ -5843,7 +5727,7 @@ msgstr "" msgid "cups-deviced failed to execute." msgstr "" -#: scheduler/ipp.c:8014 scheduler/ipp.c:8264 +#: scheduler/ipp.c:8013 scheduler/ipp.c:8263 msgid "cups-driverd failed to execute." msgstr "" @@ -5871,25 +5755,25 @@ msgstr "" msgid "cupsctl: Unknown option \"-%c\"" msgstr "" -#: scheduler/main.c:197 +#: scheduler/main.c:198 msgid "cupsd: Expected config filename after \"-c\" option." msgstr "" -#: scheduler/main.c:229 scheduler/main.c:236 +#: scheduler/main.c:230 scheduler/main.c:237 msgid "cupsd: Unable to get current directory." msgstr "" -#: scheduler/main.c:303 +#: scheduler/main.c:304 #, c-format msgid "cupsd: Unknown argument \"%s\" - aborting." msgstr "" -#: scheduler/main.c:296 +#: scheduler/main.c:297 #, c-format msgid "cupsd: Unknown option \"%c\" - aborting." msgstr "" -#: scheduler/main.c:263 +#: scheduler/main.c:264 msgid "cupsd: launchd(8) support not compiled in, running in normal mode." msgstr "" @@ -6013,13 +5897,8 @@ msgstr "" msgid "ipptool: Unknown option \"-%c\"." msgstr "" -#: scheduler/ipp.c:4313 scheduler/ipp.c:4368 scheduler/ipp.c:7714 -#, c-format -msgid "job-id %d not found." -msgstr "" - -#: scheduler/ipp.c:9004 -msgid "job-printer-uri attribute missing" +#: scheduler/ipp.c:9003 +msgid "job-printer-uri attribute missing." msgstr "" #: systemv/lpadmin.c:125 systemv/lpadmin.c:369 @@ -6313,24 +6192,18 @@ msgstr "" msgid "no system default destination" msgstr "" -#: scheduler/ipp.c:6872 -msgid "notify-events not specified" -msgstr "" - -#: scheduler/ipp.c:2184 scheduler/ipp.c:6777 -#, c-format -msgid "notify-recipient-uri URI \"%s\" is already used" +#: scheduler/ipp.c:6871 +msgid "notify-events not specified." msgstr "" -#: scheduler/ipp.c:2174 scheduler/ipp.c:6767 +#: scheduler/ipp.c:2183 scheduler/ipp.c:6776 #, c-format -msgid "notify-recipient-uri URI \"%s\" uses unknown scheme" +msgid "notify-recipient-uri URI \"%s\" is already used." msgstr "" -#: scheduler/ipp.c:4641 scheduler/ipp.c:7861 scheduler/ipp.c:8571 -#: scheduler/ipp.c:10056 +#: scheduler/ipp.c:2173 scheduler/ipp.c:6766 #, c-format -msgid "notify-subscription-id %d no good" +msgid "notify-recipient-uri URI \"%s\" uses unknown scheme." msgstr "" #: cups/notify.c:87 diff --git a/locale/cups.strings b/locale/cups.strings index 4728b265a..bab43a7a0 100644 --- a/locale/cups.strings +++ b/locale/cups.strings @@ -1,3050 +1,1497 @@ "\t\t(all)" = "\t\t(all)"; - "\t\t(none)" = "\t\t(none)"; - "\t%d entries" = "\t%d entries"; - "\t%s" = "\t%s"; - "\tAfter fault: continue" = "\tAfter fault: continue"; - "\tAlerts: %s" = "\tAlerts: %s"; - "\tBanner required" = "\tBanner required"; - "\tCharset sets:" = "\tCharset sets:"; - "\tConnection: direct" = "\tConnection: direct"; - "\tConnection: remote" = "\tConnection: remote"; - "\tContent types: any" = "\tContent types: any"; - "\tDefault page size:" = "\tDefault page size:"; - "\tDefault pitch:" = "\tDefault pitch:"; - "\tDefault port settings:" = "\tDefault port settings:"; - "\tDescription: %s" = "\tDescription: %s"; - "\tForm mounted:" = "\tForm mounted:"; - "\tForms allowed:" = "\tForms allowed:"; - "\tInterface: %s.ppd" = "\tInterface: %s.ppd"; - "\tInterface: %s/interfaces/%s" = "\tInterface: %s/interfaces/%s"; - "\tInterface: %s/ppd/%s.ppd" = "\tInterface: %s/ppd/%s.ppd"; - "\tLocation: %s" = "\tLocation: %s"; - "\tOn fault: no alert" = "\tOn fault: no alert"; - "\tPrinter types: unknown" = "\tPrinter types: unknown"; - "\tStatus: %s" = "\tStatus: %s"; - "\tUsers allowed:" = "\tUsers allowed:"; - "\tUsers denied:" = "\tUsers denied:"; - "\tdaemon present" = "\tdaemon present"; - "\tno entries" = "\tno entries"; - "\tprinter is on device '%s' speed -1" = "\tprinter is on device '%s' speed -1"; - "\tprinting is disabled" = "\tprinting is disabled"; - "\tprinting is enabled" = "\tprinting is enabled"; - "\tqueued for %s" = "\tqueued for %s"; - "\tqueuing is disabled" = "\tqueuing is disabled"; - "\tqueuing is enabled" = "\tqueuing is enabled"; - "\treason unknown" = "\treason unknown"; - "\n DETAILED CONFORMANCE TEST RESULTS" = "\n DETAILED CONFORMANCE TEST RESULTS"; - -" Ignore specific warnings." = " Ignore specific warnings."; - -" Issue warnings instead of errors." = " Issue warnings instead of errors."; - +" Ignore specific warnings." = " Ignore specific warnings."; +" Issue warnings instead of errors." = " Issue warnings instead of errors."; " REF: Page 15, section 3.1." = " REF: Page 15, section 3.1."; - " REF: Page 15, section 3.2." = " REF: Page 15, section 3.2."; - " REF: Page 19, section 3.3." = " REF: Page 19, section 3.3."; - " REF: Page 20, section 3.4." = " REF: Page 20, section 3.4."; - " REF: Page 27, section 3.5." = " REF: Page 27, section 3.5."; - " REF: Page 42, section 5.2." = " REF: Page 42, section 5.2."; - " REF: Pages 16-17, section 3.2." = " REF: Pages 16-17, section 3.2."; - " REF: Pages 42-45, section 5.2." = " REF: Pages 42-45, section 5.2."; - " REF: Pages 45-46, section 5.2." = " REF: Pages 45-46, section 5.2."; - " REF: Pages 48-49, section 5.2." = " REF: Pages 48-49, section 5.2."; - " REF: Pages 52-54, section 5.2." = " REF: Pages 52-54, section 5.2."; - " %-39.39s %.0f bytes" = " %-39.39s %.0f bytes"; - " PASS Default%s" = " PASS Default%s"; - " PASS DefaultImageableArea" = " PASS DefaultImageableArea"; - " PASS DefaultPaperDimension" = " PASS DefaultPaperDimension"; - " PASS FileVersion" = " PASS FileVersion"; - " PASS FormatVersion" = " PASS FormatVersion"; - " PASS LanguageEncoding" = " PASS LanguageEncoding"; - " PASS LanguageVersion" = " PASS LanguageVersion"; - " PASS Manufacturer" = " PASS Manufacturer"; - " PASS ModelName" = " PASS ModelName"; - " PASS NickName" = " PASS NickName"; - " PASS PCFileName" = " PASS PCFileName"; - " PASS PSVersion" = " PASS PSVersion"; - " PASS PageRegion" = " PASS PageRegion"; - " PASS PageSize" = " PASS PageSize"; - " PASS Product" = " PASS Product"; - " PASS ShortNickName" = " PASS ShortNickName"; - " WARN \"%s %s\" conflicts with \"%s %s\"\n (constraint=\"%s %s %s %s\")." = " WARN \"%s %s\" conflicts with \"%s %s\"\n (constraint=\"%s %s %s %s\")."; - " WARN %s has no corresponding options." = " WARN %s has no corresponding options."; - " WARN %s shares a common prefix with %s\n REF: Page 15, section 3.2." = " WARN %s shares a common prefix with %s\n REF: Page 15, section 3.2."; - " WARN Default choices conflicting." = " WARN Default choices conflicting."; - " WARN Duplex option keyword %s may not work as expected and should be named Duplex.\n REF: Page 122, section 5.17" = " WARN Duplex option keyword %s may not work as expected and should be named Duplex.\n REF: Page 122, section 5.17"; - " WARN File contains a mix of CR, LF, and CR LF line endings." = " WARN File contains a mix of CR, LF, and CR LF line endings."; - " WARN LanguageEncoding required by PPD 4.3 spec.\n REF: Pages 56-57, section 5.3." = " WARN LanguageEncoding required by PPD 4.3 spec.\n REF: Pages 56-57, section 5.3."; - " WARN Line %d only contains whitespace." = " WARN Line %d only contains whitespace."; - " WARN Manufacturer required by PPD 4.3 spec.\n REF: Pages 58-59, section 5.3." = " WARN Manufacturer required by PPD 4.3 spec.\n REF: Pages 58-59, section 5.3."; - " WARN Non-Windows PPD files should use lines ending with only LF, not CR LF." = " WARN Non-Windows PPD files should use lines ending with only LF, not CR LF."; - " WARN Obsolete PPD version %.1f.\n REF: Page 42, section 5.2." = " WARN Obsolete PPD version %.1f.\n REF: Page 42, section 5.2."; - " WARN PCFileName longer than 8.3 in violation of PPD spec.\n REF: Pages 61-62, section 5.3." = " WARN PCFileName longer than 8.3 in violation of PPD spec.\n REF: Pages 61-62, section 5.3."; - " WARN PCFileName should contain a unique filename.\n REF: Pages 61-62, section 5.3." = " WARN PCFileName should contain a unique filename.\n REF: Pages 61-62, section 5.3."; - " WARN Protocols contains PJL but JCL attributes are not set.\n REF: Pages 78-79, section 5.7." = " WARN Protocols contains PJL but JCL attributes are not set.\n REF: Pages 78-79, section 5.7."; - " WARN Protocols contains both PJL and BCP; expected TBCP.\n REF: Pages 78-79, section 5.7." = " WARN Protocols contains both PJL and BCP; expected TBCP.\n REF: Pages 78-79, section 5.7."; - " WARN ShortNickName required by PPD 4.3 spec.\n REF: Pages 64-65, section 5.3." = " WARN ShortNickName required by PPD 4.3 spec.\n REF: Pages 64-65, section 5.3."; - " cupsaddsmb [options] -a" = " cupsaddsmb [options] -a"; - " cupstestdsc [options] -" = " cupstestdsc [options] -"; - " program | cupstestppd [options] -" = " program | cupstestppd [options] -"; - " %s %s %s does not exist." = " %s %s %s does not exist."; - " %s %s file \"%s\" has the wrong capitalization." = " %s %s file \"%s\" has the wrong capitalization."; - " %s Bad %s choice %s.\n REF: Page 122, section 5.17" = " %s Bad %s choice %s.\n REF: Page 122, section 5.17"; - " %s Bad UTF-8 \"%s\" translation string for option %s, choice %s." = " %s Bad UTF-8 \"%s\" translation string for option %s, choice %s."; - " %s Bad UTF-8 \"%s\" translation string for option %s." = " %s Bad UTF-8 \"%s\" translation string for option %s."; - " %s Bad cupsFilter value \"%s\"." = " %s Bad cupsFilter value \"%s\"."; - " %s Bad cupsICCProfile %s." = " %s Bad cupsICCProfile %s."; - " %s Bad cupsPreFilter value \"%s\"." = " %s Bad cupsPreFilter value \"%s\"."; - " %s Bad cupsUIConstraints %s: \"%s\"" = " %s Bad cupsUIConstraints %s: \"%s\""; - " %s Bad language \"%s\"." = " %s Bad language \"%s\"."; - -" %s Bad permissions on APDialogExtension file \"%s\"." = " %s Bad permissions on APDialogExtension file \"%s\"."; - -" %s Bad permissions on APPrinterIconPath file \"%s\"." = " %s Bad permissions on APPrinterIconPath file \"%s\"."; - -" %s Bad permissions on APPrinterLowInkTool file \"%s\"." = " %s Bad permissions on APPrinterLowInkTool file \"%s\"."; - -" %s Bad permissions on APPrinterUtilityPath file \"%s\"." = " %s Bad permissions on APPrinterUtilityPath file \"%s\"."; - -" %s Bad permissions on APScanAppPath file \"%s\"." = " %s Bad permissions on APScanAppPath file \"%s\"."; - -" %s Bad permissions on cupsFilter file \"%s\"." = " %s Bad permissions on cupsFilter file \"%s\"."; - -" %s Bad permissions on cupsICCProfile file \"%s\"." = " %s Bad permissions on cupsICCProfile file \"%s\"."; - -" %s Bad permissions on cupsPreFilter file \"%s\"." = " %s Bad permissions on cupsPreFilter file \"%s\"."; - +" %s Bad permissions on %s file \"%s\"." = " %s Bad permissions on %s file \"%s\"."; " %s Bad spelling of %s - should be %s." = " %s Bad spelling of %s - should be %s."; - " %s Cannot provide both APScanAppPath and APScanAppBundleID." = " %s Cannot provide both APScanAppPath and APScanAppBundleID."; - " %s Empty cupsUIConstraints %s" = " %s Empty cupsUIConstraints %s"; - " %s Missing \"%s\" translation string for option %s, choice %s." = " %s Missing \"%s\" translation string for option %s, choice %s."; - " %s Missing \"%s\" translation string for option %s." = " %s Missing \"%s\" translation string for option %s."; - -" %s Missing APDialogExtension file \"%s\"." = " %s Missing APDialogExtension file \"%s\"."; - -" %s Missing APPrinterIconPath file \"%s\"." = " %s Missing APPrinterIconPath file \"%s\"."; - -" %s Missing APPrinterLowInkTool file \"%s\"." = " %s Missing APPrinterLowInkTool file \"%s\"."; - -" %s Missing APPrinterUtilityPath file \"%s\"." = " %s Missing APPrinterUtilityPath file \"%s\"."; - -" %s Missing APScanAppPath file \"%s\"." = " %s Missing APScanAppPath file \"%s\"."; - +" %s Missing %s file \"%s\"." = " %s Missing %s file \"%s\"."; " %s Missing REQUIRED PageRegion option.\n REF: Page 100, section 5.14." = " %s Missing REQUIRED PageRegion option.\n REF: Page 100, section 5.14."; - " %s Missing REQUIRED PageSize option.\n REF: Page 99, section 5.14." = " %s Missing REQUIRED PageSize option.\n REF: Page 99, section 5.14."; - " %s Missing choice *%s %s in UIConstraints \"*%s %s *%s %s\"." = " %s Missing choice *%s %s in UIConstraints \"*%s %s *%s %s\"."; - " %s Missing choice *%s %s in cupsUIConstraints %s: \"%s\"" = " %s Missing choice *%s %s in cupsUIConstraints %s: \"%s\""; - -" %s Missing cupsFilter file \"%s\"." = " %s Missing cupsFilter file \"%s\"."; - -" %s Missing cupsICCProfile file \"%s\"." = " %s Missing cupsICCProfile file \"%s\"."; - -" %s Missing cupsPreFilter file \"%s\"." = " %s Missing cupsPreFilter file \"%s\"."; - " %s Missing cupsUIResolver %s" = " %s Missing cupsUIResolver %s"; - " %s Missing option %s in UIConstraints \"*%s %s *%s %s\"." = " %s Missing option %s in UIConstraints \"*%s %s *%s %s\"."; - " %s Missing option %s in cupsUIConstraints %s: \"%s\"" = " %s Missing option %s in cupsUIConstraints %s: \"%s\""; - " %s No base translation \"%s\" is included in file." = " %s No base translation \"%s\" is included in file."; - " %s REQUIRED %s does not define choice None.\n REF: Page 122, section 5.17" = " %s REQUIRED %s does not define choice None.\n REF: Page 122, section 5.17"; - " %s Size \"%s\" defined for %s but not for %s." = " %s Size \"%s\" defined for %s but not for %s."; - " %s Size \"%s\" has unexpected dimensions (%gx%g)." = " %s Size \"%s\" has unexpected dimensions (%gx%g)."; - " %s cupsICCProfile %s hash value collides with %s." = " %s cupsICCProfile %s hash value collides with %s."; - " %s cupsUIResolver %s causes a loop." = " %s cupsUIResolver %s causes a loop."; - " %s cupsUIResolver %s does not list at least two different options." = " %s cupsUIResolver %s does not list at least two different options."; - " **FAIL** %s choice names %s and %s differ only by case." = " **FAIL** %s choice names %s and %s differ only by case."; - " **FAIL** %s must be 1284DeviceID\n REF: Page 72, section 5.5" = " **FAIL** %s must be 1284DeviceID\n REF: Page 72, section 5.5"; - " **FAIL** BAD Default%s %s\n REF: Page 40, section 4.5." = " **FAIL** BAD Default%s %s\n REF: Page 40, section 4.5."; - " **FAIL** BAD DefaultImageableArea %s\n REF: Page 102, section 5.15." = " **FAIL** BAD DefaultImageableArea %s\n REF: Page 102, section 5.15."; - " **FAIL** BAD DefaultPaperDimension %s\n REF: Page 103, section 5.15." = " **FAIL** BAD DefaultPaperDimension %s\n REF: Page 103, section 5.15."; - " **FAIL** BAD JobPatchFile attribute in file\n REF: Page 24, section 3.4." = " **FAIL** BAD JobPatchFile attribute in file\n REF: Page 24, section 3.4."; - " **FAIL** BAD Manufacturer (should be \"HP\")\n REF: Page 211, table D.1." = " **FAIL** BAD Manufacturer (should be \"HP\")\n REF: Page 211, table D.1."; - " **FAIL** BAD Manufacturer (should be \"Oki\")\n REF: Page 211, table D.1." = " **FAIL** BAD Manufacturer (should be \"Oki\")\n REF: Page 211, table D.1."; - " **FAIL** BAD ModelName - \"%c\" not allowed in string.\n REF: Pages 59-60, section 5.3." = " **FAIL** BAD ModelName - \"%c\" not allowed in string.\n REF: Pages 59-60, section 5.3."; - " **FAIL** BAD PSVersion - not \"(string) int\".\n REF: Pages 62-64, section 5.3." = " **FAIL** BAD PSVersion - not \"(string) int\".\n REF: Pages 62-64, section 5.3."; - " **FAIL** BAD Product - not \"(string)\".\n REF: Page 62, section 5.3." = " **FAIL** BAD Product - not \"(string)\".\n REF: Page 62, section 5.3."; - " **FAIL** BAD ShortNickName - longer than 31 chars.\n REF: Pages 64-65, section 5.3." = " **FAIL** BAD ShortNickName - longer than 31 chars.\n REF: Pages 64-65, section 5.3."; - " **FAIL** Bad %s choice %s\n REF: Page 84, section 5.9" = " **FAIL** Bad %s choice %s\n REF: Page 84, section 5.9"; - " **FAIL** Bad FileVersion \"%s\"\n REF: Page 56, section 5.3." = " **FAIL** Bad FileVersion \"%s\"\n REF: Page 56, section 5.3."; - " **FAIL** Bad FormatVersion \"%s\"\n REF: Page 56, section 5.3." = " **FAIL** Bad FormatVersion \"%s\"\n REF: Page 56, section 5.3."; - " **FAIL** Bad LanguageEncoding %s - must be ISOLatin1." = " **FAIL** Bad LanguageEncoding %s - must be ISOLatin1."; - " **FAIL** Bad LanguageVersion %s - must be English." = " **FAIL** Bad LanguageVersion %s - must be English."; - " **FAIL** Default option code cannot be interpreted: %s" = " **FAIL** Default option code cannot be interpreted: %s"; - " **FAIL** Default translation string for option %s choice %s contains 8-bit characters." = " **FAIL** Default translation string for option %s choice %s contains 8-bit characters."; - " **FAIL** Default translation string for option %s contains 8-bit characters." = " **FAIL** Default translation string for option %s contains 8-bit characters."; - " **FAIL** Group names %s and %s differ only by case." = " **FAIL** Group names %s and %s differ only by case."; - " **FAIL** Multiple occurrences of %s choice name %s." = " **FAIL** Multiple occurrences of %s choice name %s."; - " **FAIL** Option names %s and %s differ only by case." = " **FAIL** Option names %s and %s differ only by case."; - " **FAIL** REQUIRED Default%s\n REF: Page 40, section 4.5." = " **FAIL** REQUIRED Default%s\n REF: Page 40, section 4.5."; - " **FAIL** REQUIRED DefaultImageableArea\n REF: Page 102, section 5.15." = " **FAIL** REQUIRED DefaultImageableArea\n REF: Page 102, section 5.15."; - " **FAIL** REQUIRED DefaultPaperDimension\n REF: Page 103, section 5.15." = " **FAIL** REQUIRED DefaultPaperDimension\n REF: Page 103, section 5.15."; - " **FAIL** REQUIRED FileVersion\n REF: Page 56, section 5.3." = " **FAIL** REQUIRED FileVersion\n REF: Page 56, section 5.3."; - " **FAIL** REQUIRED FormatVersion\n REF: Page 56, section 5.3." = " **FAIL** REQUIRED FormatVersion\n REF: Page 56, section 5.3."; - " **FAIL** REQUIRED ImageableArea for PageSize %s\n REF: Page 41, section 5.\n REF: Page 102, section 5.15." = " **FAIL** REQUIRED ImageableArea for PageSize %s\n REF: Page 41, section 5.\n REF: Page 102, section 5.15."; - " **FAIL** REQUIRED LanguageEncoding\n REF: Pages 56-57, section 5.3." = " **FAIL** REQUIRED LanguageEncoding\n REF: Pages 56-57, section 5.3."; - " **FAIL** REQUIRED LanguageVersion\n REF: Pages 57-58, section 5.3." = " **FAIL** REQUIRED LanguageVersion\n REF: Pages 57-58, section 5.3."; - " **FAIL** REQUIRED Manufacturer\n REF: Pages 58-59, section 5.3." = " **FAIL** REQUIRED Manufacturer\n REF: Pages 58-59, section 5.3."; - " **FAIL** REQUIRED ModelName\n REF: Pages 59-60, section 5.3." = " **FAIL** REQUIRED ModelName\n REF: Pages 59-60, section 5.3."; - " **FAIL** REQUIRED NickName\n REF: Page 60, section 5.3." = " **FAIL** REQUIRED NickName\n REF: Page 60, section 5.3."; - " **FAIL** REQUIRED PCFileName\n REF: Pages 61-62, section 5.3." = " **FAIL** REQUIRED PCFileName\n REF: Pages 61-62, section 5.3."; - " **FAIL** REQUIRED PSVersion\n REF: Pages 62-64, section 5.3." = " **FAIL** REQUIRED PSVersion\n REF: Pages 62-64, section 5.3."; - " **FAIL** REQUIRED PageRegion\n REF: Page 100, section 5.14." = " **FAIL** REQUIRED PageRegion\n REF: Page 100, section 5.14."; - " **FAIL** REQUIRED PageSize\n REF: Page 41, section 5.\n REF: Page 99, section 5.14." = " **FAIL** REQUIRED PageSize\n REF: Page 41, section 5.\n REF: Page 99, section 5.14."; - " **FAIL** REQUIRED PageSize\n REF: Pages 99-100, section 5.14." = " **FAIL** REQUIRED PageSize\n REF: Pages 99-100, section 5.14."; - " **FAIL** REQUIRED PaperDimension for PageSize %s\n REF: Page 41, section 5.\n REF: Page 103, section 5.15." = " **FAIL** REQUIRED PaperDimension for PageSize %s\n REF: Page 41, section 5.\n REF: Page 103, section 5.15."; - " **FAIL** REQUIRED Product\n REF: Page 62, section 5.3." = " **FAIL** REQUIRED Product\n REF: Page 62, section 5.3."; - " **FAIL** REQUIRED ShortNickName\n REF: Page 64-65, section 5.3." = " **FAIL** REQUIRED ShortNickName\n REF: Page 64-65, section 5.3."; - +" **FAIL** Unable to open PPD file - %s" = " **FAIL** Unable to open PPD file - %s"; +" **FAIL** Unable to open PPD file - %s on line %d." = " **FAIL** Unable to open PPD file - %s on line %d."; " %d ERRORS FOUND" = " %d ERRORS FOUND"; - -" --[no-]debug-logging Turn debug logging on/off." = " --[no-]debug-logging Turn debug logging on/off."; - -" --[no-]remote-admin Turn remote administration on/off." = " --[no-]remote-admin Turn remote administration on/off."; - -" --[no-]remote-any Allow/prevent access from the Internet." = " --[no-]remote-any Allow/prevent access from the Internet."; - -" --[no-]remote-printers Show/hide remote printers." = " --[no-]remote-printers Show/hide remote printers."; - -" --[no-]share-printers Turn printer sharing on/off." = " --[no-]share-printers Turn printer sharing on/off."; - -" --[no-]user-cancel-any Allow/prevent users to cancel any job." = " --[no-]user-cancel-any Allow/prevent users to cancel any job."; - -" -E Enable encryption." = " -E Enable encryption."; - -" -I {filename,filters,none,profiles}" = " -I {filename,filters,none,profiles}"; - -" -R root-directory Set alternate root." = " -R root-directory Set alternate root."; - -" -U username Specify username." = " -U username Specify username."; - -" -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,translations}" = " -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,translations}"; - " -h Show program usage" = " -h Show program usage"; - -" -h server[:port] Specify server address." = " -h server[:port] Specify server address."; - -" -q Run silently." = " -q Run silently."; - -" -r Use 'relaxed' open mode." = " -r Use 'relaxed' open mode."; - -" -v Be slightly verbose." = " -v Be slightly verbose."; - -" -vv Be very verbose." = " -vv Be very verbose."; - " Bad %%%%BoundingBox: on line %d.\n REF: Page 39, %%%%BoundingBox:" = " Bad %%%%BoundingBox: on line %d.\n REF: Page 39, %%%%BoundingBox:"; - " Bad %%%%Page: on line %d.\n REF: Page 53, %%%%Page:" = " Bad %%%%Page: on line %d.\n REF: Page 53, %%%%Page:"; - " Bad %%%%Pages: on line %d.\n REF: Page 43, %%%%Pages:" = " Bad %%%%Pages: on line %d.\n REF: Page 43, %%%%Pages:"; - " Line %d is longer than 255 characters (%d).\n REF: Page 25, Line Length" = " Line %d is longer than 255 characters (%d).\n REF: Page 25, Line Length"; - " Missing %!PS-Adobe-3.0 on first line.\n REF: Page 17, 3.1 Conforming Documents" = " Missing %!PS-Adobe-3.0 on first line.\n REF: Page 17, 3.1 Conforming Documents"; - " Missing %%EndComments comment. REF: Page 41, %%EndComments" = " Missing %%EndComments comment. REF: Page 41, %%EndComments"; - " Missing or bad %%BoundingBox: comment.\n REF: Page 39, %%BoundingBox:" = " Missing or bad %%BoundingBox: comment.\n REF: Page 39, %%BoundingBox:"; - " Missing or bad %%Page: comments.\n REF: Page 53, %%Page:" = " Missing or bad %%Page: comments.\n REF: Page 53, %%Page:"; - " Missing or bad %%Pages: comment.\n REF: Page 43, %%Pages:" = " Missing or bad %%Pages: comment.\n REF: Page 43, %%Pages:"; - " NO ERRORS FOUND" = " NO ERRORS FOUND"; - " Saw %d lines that exceeded 255 characters." = " Saw %d lines that exceeded 255 characters."; - " Too many %%BeginDocument comments." = " Too many %%BeginDocument comments."; - " Too many %%EndDocument comments." = " Too many %%EndDocument comments."; - " Warning: file contains binary data." = " Warning: file contains binary data."; - " Warning: no %%EndComments comment in file." = " Warning: no %%EndComments comment in file."; - " Warning: obsolete DSC version %.1f in file." = " Warning: obsolete DSC version %.1f in file."; - -" --cr End lines with CR (Mac OS 9)." = " --cr End lines with CR (Mac OS 9)."; - -" --crlf End lines with CR + LF (Windows)." = " --crlf End lines with CR + LF (Windows)."; - -" --lf End lines with LF (UNIX/Linux/Mac OS X)." = " --lf End lines with LF (UNIX/Linux/Mac OS X)."; - -" -4 Connect using IPv4." = " -4 Connect using IPv4."; - -" -6 Connect using IPv6." = " -6 Connect using IPv6."; - -" -C Send requests using chunking (default)." = " -C Send requests using chunking (default)."; - -" -D Remove the input file when finished." = " -D Remove the input file when finished."; - -" -D name=value Set named variable to value." = " -D name=value Set named variable to value."; - -" -D name=value Set named variable to value." = " -D name=value Set named variable to value."; - -" -E Encrypt the connection to the server." = " -E Encrypt the connection to the server."; - -" -E Test with TLS encryption." = " -E Test with TLS encryption."; - -" -H samba-server Use the named SAMBA server." = " -H samba-server Use the named SAMBA server."; - -" -I Ignore errors." = " -I Ignore errors."; - -" -I include-dir" = " -I include-dir"; - -" -I include-dir Add include directory to search path." = " -I include-dir Add include directory to search path."; - -" -I include-dir Add include directory to search path." = " -I include-dir Add include directory to search path."; - -" -J title Set title." = " -J title Set title."; - -" -L Send requests using content-length." = " -L Send requests using content-length."; - -" -P filename.ppd Set PPD file." = " -P filename.ppd Set PPD file."; - -" -S Test with SSL encryption." = " -S Test with SSL encryption."; - -" -T Set the receive/send timeout in seconds." = " -T Set the receive/send timeout in seconds."; - -" -U samba-user Authenticate using the named SAMBA user." = " -U samba-user Authenticate using the named SAMBA user."; - -" -U username Set username for job." = " -U username Set username for job."; - -" -V version Set default IPP version." = " -V version Set default IPP version."; - -" -X Produce XML plist instead of plain text." = " -X Produce XML plist instead of plain text."; - -" -a Export all printers." = " -a Export all printers."; - -" -a 'name=value ...' Set option(s)." = " -a 'name=value ...' Set option(s)."; - -" -c catalog.po Load the specified message catalog." = " -c catalog.po Load the specified message catalog."; - -" -c copies Set number of copies." = " -c copies Set number of copies."; - -" -c cupsd.conf Set cupsd.conf file to use." = " -c cupsd.conf Set cupsd.conf file to use."; - -" -d name=value Define variable." = " -d name=value Define variable."; - -" -d output-dir Specify the output directory." = " -d output-dir Specify the output directory."; - -" -d printer Use the named printer." = " -d printer Use the named printer."; - -" -d printer Use the named printer." = " -d printer Use the named printer."; - -" -e Use every filter from the PPD file." = " -e Use every filter from the PPD file."; - -" -e Use every filter from the PPD file." = " -e Use every filter from the PPD file."; - -" -f filename Set file to be converted (otherwise stdin)." = " -f filename Set file to be converted (otherwise stdin)."; - -" -f filename Set default request filename." = " -f filename Set default request filename."; - -" -h cups-server Use the named CUPS server." = " -h cups-server Use the named CUPS server."; - -" -i mime/type Set input MIME type (otherwise auto-typed)." = " -i mime/type Set input MIME type (otherwise auto-typed)."; - -" -i seconds Repeat the last file with the given time interval." = " -i seconds Repeat the last file with the given time interval."; - -" -j job-id[,N] Filter file N from the specified job (default is file 1)." = " -j job-id[,N] Filter file N from the specified job (default is file 1)."; - -" -j mime/type Set output MIME type (otherwise application/pdf)." = " -j mime/type Set output MIME type (otherwise application/pdf)."; - -" -l 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."; - -" -n copies Set number of copies." = " -n copies Set number of copies."; - -" -n count Repeat the last file the given number of times." = " -n count Repeat the last file the given number of times."; - -" -o filename Set file to be generated (otherwise stdout)." = " -o filename Set file to be generated (otherwise stdout)."; - -" -o filename.drv" = " -o filename.drv"; - -" -o filename.ppd[.gz]" = " -o filename.ppd[.gz]"; - -" -o name=value Set option(s)." = " -o name=value Set option(s)."; - -" -p filename.ppd Set PPD file." = " -p filename.ppd Set PPD file."; - -" -q Be quiet - no output except errors." = " -q Be quiet - no output except errors."; - -" -t Test PPDs instead of generating them." = " -t Test PPDs instead of generating them."; - -" -t Produce a test report." = " -t Produce a test report."; - -" -t title Set title." = " -t title Set title."; - -" -u Remove the PPD file when finished." = " -u Remove the PPD file when finished."; - -" -v Be verbose (more v's for more verbosity)." = " -v Be verbose (more v's for more verbosity)."; - -" -v Be verbose (more v's for more verbosity)." = " -v Be verbose (more v's for more verbosity)."; - -" -v Be verbose (show commands)." = " -v Be verbose (show commands)."; - -" -v Show all attributes sent and received." = " -v Show all attributes sent and received."; - -" -z Compress PPD files using GNU zip." = " -z Compress PPD files using GNU zip."; - +" --[no-]debug-logging Turn debug logging on/off." = " --[no-]debug-logging Turn debug logging on/off."; +" --[no-]remote-admin Turn remote administration on/off." = " --[no-]remote-admin Turn remote administration on/off."; +" --[no-]remote-any Allow/prevent access from the Internet." = " --[no-]remote-any Allow/prevent access from the Internet."; +" --[no-]remote-printers Show/hide remote printers." = " --[no-]remote-printers Show/hide remote printers."; +" --[no-]share-printers Turn printer sharing on/off." = " --[no-]share-printers Turn printer sharing on/off."; +" --[no-]user-cancel-any Allow/prevent users to cancel any job." = " --[no-]user-cancel-any Allow/prevent users to cancel any job."; +" --cr End lines with CR (Mac OS 9)." = " --cr End lines with CR (Mac OS 9)."; +" --crlf End lines with CR + LF (Windows)." = " --crlf End lines with CR + LF (Windows)."; +" --lf End lines with LF (UNIX/Linux/Mac OS X)." = " --lf End lines with LF (UNIX/Linux/Mac OS X)."; +" -4 Connect using IPv4." = " -4 Connect using IPv4."; +" -6 Connect using IPv6." = " -6 Connect using IPv6."; +" -C Send requests using chunking (default)." = " -C Send requests using chunking (default)."; +" -D Remove the input file when finished." = " -D Remove the input file when finished."; +" -D name=value Set named variable to value." = " -D name=value Set named variable to value."; +" -E Enable encryption." = " -E Enable encryption."; +" -E Encrypt the connection to the server." = " -E Encrypt the connection to the server."; +" -E Test with TLS encryption." = " -E Test with TLS encryption."; +" -F Run in the foreground but detach from console." = " -F Run in the foreground but detach from console."; +" -H samba-server Use the named SAMBA server." = " -H samba-server Use the named SAMBA server."; +" -I Ignore errors." = " -I Ignore errors."; +" -I include-dir Add include directory to search path." = " -I include-dir Add include directory to search path."; +" -I {filename,filters,none,profiles}" = " -I {filename,filters,none,profiles}"; +" -J title Set title." = " -J title Set title."; +" -L Send requests using content-length." = " -L Send requests using content-length."; +" -P filename.ppd Set PPD file." = " -P filename.ppd Set PPD file."; +" -R root-directory Set alternate root." = " -R root-directory Set alternate root."; +" -S Test with SSL encryption." = " -S Test with SSL encryption."; +" -T Set the receive/send timeout in seconds." = " -T Set the receive/send timeout in seconds."; +" -U samba-user Authenticate using the named SAMBA user." = " -U samba-user Authenticate using the named SAMBA user."; +" -U username Set username for job." = " -U username Set username for job."; +" -U username Specify username." = " -U username Specify username."; +" -V version Set default IPP version." = " -V version Set default IPP version."; +" -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,translations}" = " -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,translations}"; +" -X Produce XML plist instead of plain text." = " -X Produce XML plist instead of plain text."; +" -a Export all printers." = " -a Export all printers."; +" -a 'name=value ...' Set option(s)." = " -a 'name=value ...' Set option(s)."; +" -c catalog.po Load the specified message catalog." = " -c catalog.po Load the specified message catalog."; +" -c config-file Load alternate configuration file." = " -c config-file Load alternate configuration file."; +" -c copies Set number of copies." = " -c copies Set number of copies."; +" -c cupsd.conf Set cupsd.conf file to use." = " -c cupsd.conf Set cupsd.conf file to use."; +" -d name=value Set named variable to value." = " -d name=value Set named variable to value."; +" -d output-dir Specify the output directory." = " -d output-dir Specify the output directory."; +" -d printer Use the named printer." = " -d printer Use the named printer."; +" -e Use every filter from the PPD file." = " -e Use every filter from the PPD file."; +" -f Run in the foreground." = " -f Run in the foreground."; +" -f filename Set default request filename." = " -f filename Set default request filename."; +" -f filename Set file to be converted (otherwise stdin)." = " -f filename Set file to be converted (otherwise stdin)."; +" -h Show this usage message." = " -h Show this usage message."; +" -h cups-server Use the named CUPS server." = " -h cups-server Use the named CUPS server."; +" -h server[:port] Specify server address." = " -h server[:port] Specify server address."; +" -i mime/type Set input MIME type (otherwise auto-typed)." = " -i mime/type Set input MIME type (otherwise auto-typed)."; +" -i seconds Repeat the last file with the given time interval." = " -i seconds Repeat the last file with the given time interval."; +" -j job-id[,N] Filter file N from the specified job (default is file 1)." = " -j job-id[,N] Filter file N from the specified job (default is file 1)."; +" -j mime/type Set output MIME type (otherwise application/pdf)." = " -j mime/type Set output MIME type (otherwise application/pdf)."; +" -l Run cupsd from launchd(8)." = " -l Run cupsd from launchd(8)."; +" -l lang[,lang,...] Specify the output language(s) (locale)." = " -l lang[,lang,...] Specify the output language(s) (locale)."; +" -m Use the ModelName value as the filename." = " -m Use the ModelName value as the filename."; +" -m mime/type Set output MIME type (otherwise application/pdf)." = " -m mime/type Set output MIME type (otherwise application/pdf)."; +" -n copies Set number of copies." = " -n copies Set number of copies."; +" -n count Repeat the last file the given number of times." = " -n count Repeat the last file the given number of times."; +" -o filename Set file to be generated (otherwise stdout)." = " -o filename Set file to be generated (otherwise stdout)."; +" -o filename.drv Set driver information file (otherwise ppdi.drv)." = " -o filename.drv Set driver information file (otherwise ppdi.drv)."; +" -o filename.ppd[.gz] Set output file (otherwise stdout)." = " -o filename.ppd[.gz] Set output file (otherwise stdout)."; +" -o name=value Set option(s)." = " -o name=value Set option(s)."; +" -p filename.ppd Set PPD file." = " -p filename.ppd Set PPD file."; +" -q Be quiet - no output except errors." = " -q Be quiet - no output except errors."; +" -q Run silently." = " -q Run silently."; +" -r Use 'relaxed' open mode." = " -r Use 'relaxed' open mode."; +" -t Produce a test report." = " -t Produce a test report."; +" -t Test PPDs instead of generating them." = " -t Test PPDs instead of generating them."; +" -t Test the configuration file." = " -t Test the configuration file."; +" -t title Set title." = " -t title Set title."; +" -u Remove the PPD file when finished." = " -u Remove the PPD file when finished."; +" -v Be slightly verbose." = " -v Be slightly verbose."; +" -v Be verbose (more v's for more verbosity)." = " -v Be verbose (more v's for more verbosity)."; +" -v Be verbose (show commands)." = " -v Be verbose (show commands)."; +" -v Show all attributes sent and received." = " -v Show all attributes sent and received."; +" -vv Be very verbose." = " -vv Be very verbose."; +" -z Compress PPD files using GNU zip." = " -z Compress PPD files using GNU zip."; " FAIL" = " FAIL"; - -" FAIL **FAIL** Unable to open PPD file - %s" = " FAIL **FAIL** Unable to open PPD file - %s"; - -" FAIL **FAIL** Unable to open PPD file - %s on line %d." = " FAIL **FAIL** Unable to open PPD file - %s on line %d."; - " PASS" = " PASS"; - -"#10 Envelope" = "#10 Envelope"; - -"#11 Envelope" = "#11 Envelope"; - -"#12 Envelope" = "#12 Envelope"; - -"#14 Envelope" = "#14 Envelope"; - -"#9 Envelope" = "#9 Envelope"; - "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes" = "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes"; - "%-7s %-7.7s %-7d %-31.31s %.0f bytes" = "%-7s %-7.7s %-7d %-31.31s %.0f bytes"; - "%.0f x %.0f millimeters" = "%.0f x %.0f millimeters"; - "%.0f x %.0f to %.0f x %.0f millimeters" = "%.0f x %.0f to %.0f x %.0f millimeters"; - "%.2f x %.2f inches" = "%.2f x %.2f inches"; - "%.2f x %.2f to %.2f x %.2f inches" = "%.2f x %.2f to %.2f x %.2f inches"; - "%s accepting requests since %s" = "%s accepting requests since %s"; - "%s cannot be changed." = "%s cannot be changed."; - "%s is not implemented by the CUPS version of lpc." = "%s is not implemented by the CUPS version of lpc."; - "%s is not ready" = "%s is not ready"; - "%s is ready" = "%s is ready"; - "%s is ready and printing" = "%s is ready and printing"; - "%s job-id user title copies options [file]" = "%s job-id user title copies options [file]"; - "%s not accepting requests since %s -" = "%s not accepting requests since %s -"; - -"%s not supported" = "%s not supported"; - +"%s not supported." = "%s not supported."; "%s/%s accepting requests since %s" = "%s/%s accepting requests since %s"; - "%s/%s not accepting requests since %s -" = "%s/%s not accepting requests since %s -"; - "%s: %-33.33s [job %d localhost]" = "%s: %-33.33s [job %d localhost]"; - +// TRANSLATORS: Message is "subject: error" +"%s: %s" = "%s: %s"; "%s: %s failed: %s" = "%s: %s failed: %s"; - "%s: Don't know what to do." = "%s: Don't know what to do."; - "%s: Error - %s environment variable names non-existent destination \"%s\"." = "%s: Error - %s environment variable names non-existent destination \"%s\"."; - "%s: Error - bad job ID." = "%s: Error - bad job ID."; - "%s: Error - cannot print files and alter jobs simultaneously." = "%s: Error - cannot print files and alter jobs simultaneously."; - "%s: Error - cannot print from stdin if files or a job ID are provided." = "%s: Error - cannot print from stdin if files or a job ID are provided."; - "%s: Error - expected character set after \"-S\" option." = "%s: Error - expected character set after \"-S\" option."; - "%s: Error - expected content type after \"-T\" option." = "%s: Error - expected content type after \"-T\" option."; - +"%s: Error - expected copies after \"-#\" option." = "%s: Error - expected copies after \"-#\" option."; "%s: Error - expected copies after \"-n\" option." = "%s: Error - expected copies after \"-n\" option."; - -"%s: Error - expected copy count after \"-#\" option." = "%s: Error - expected copy count after \"-#\" option."; - "%s: Error - expected destination after \"-P\" option." = "%s: Error - expected destination after \"-P\" option."; - "%s: Error - expected destination after \"-b\" option." = "%s: Error - expected destination after \"-b\" option."; - "%s: Error - expected destination after \"-d\" option." = "%s: Error - expected destination after \"-d\" option."; - "%s: Error - expected form after \"-f\" option." = "%s: Error - expected form after \"-f\" option."; - "%s: Error - expected hold name after \"-H\" option." = "%s: Error - expected hold name after \"-H\" option."; - "%s: Error - expected hostname after \"-H\" option." = "%s: Error - expected hostname after \"-H\" option."; - "%s: Error - expected hostname after \"-h\" option." = "%s: Error - expected hostname after \"-h\" option."; - "%s: Error - expected mode list after \"-y\" option." = "%s: Error - expected mode list after \"-y\" option."; - "%s: Error - expected name after \"-%c\" option." = "%s: Error - expected name after \"-%c\" option."; - -"%s: Error - expected option string after \"-o\" option." = "%s: Error - expected option string after \"-o\" option."; - +"%s: Error - expected option=value after \"-o\" option." = "%s: Error - expected option=value after \"-o\" option."; "%s: Error - expected page list after \"-P\" option." = "%s: Error - expected page list after \"-P\" option."; - "%s: Error - expected priority after \"-%c\" option." = "%s: Error - expected priority after \"-%c\" option."; - "%s: Error - expected reason text after \"-r\" option." = "%s: Error - expected reason text after \"-r\" option."; - "%s: Error - expected title after \"-t\" option." = "%s: Error - expected title after \"-t\" option."; - "%s: Error - expected username after \"-U\" option." = "%s: Error - expected username after \"-U\" option."; - "%s: Error - expected username after \"-u\" option." = "%s: Error - expected username after \"-u\" option."; - "%s: Error - expected value after \"-%c\" option." = "%s: Error - expected value after \"-%c\" option."; - "%s: Error - need \"completed\", \"not-completed\", or \"all\" after \"-W\" option." = "%s: Error - need \"completed\", \"not-completed\", or \"all\" after \"-W\" option."; - "%s: Error - no default destination available." = "%s: Error - no default destination available."; - "%s: Error - priority must be between 1 and 100." = "%s: Error - priority must be between 1 and 100."; - "%s: Error - scheduler not responding." = "%s: Error - scheduler not responding."; - "%s: Error - too many files - \"%s\"." = "%s: Error - too many files - \"%s\"."; - "%s: Error - unable to access \"%s\" - %s" = "%s: Error - unable to access \"%s\" - %s"; - -"%s: Error - unable to access \"%s\" - %s." = "%s: Error - unable to access \"%s\" - %s."; - "%s: Error - unable to queue from stdin - %s." = "%s: Error - unable to queue from stdin - %s."; - "%s: Error - unknown destination \"%s\"." = "%s: Error - unknown destination \"%s\"."; - "%s: Error - unknown destination \"%s/%s\"." = "%s: Error - unknown destination \"%s/%s\"."; - "%s: Error - unknown option \"%c\"." = "%s: Error - unknown option \"%c\"."; - "%s: Error - unknown option \"%s\"." = "%s: Error - unknown option \"%s\"."; - "%s: Expected job ID after \"-i\" option." = "%s: Expected job ID after \"-i\" option."; - "%s: Filter \"%s\" not available: %s" = "%s: Filter \"%s\" not available: %s"; - "%s: Invalid destination name in list \"%s\"." = "%s: Invalid destination name in list \"%s\"."; - "%s: Invalid filter string \"%s\"." = "%s: Invalid filter string \"%s\"."; - "%s: Need job ID (\"-i jobid\") before \"-H restart\"." = "%s: Need job ID (\"-i jobid\") before \"-H restart\"."; - "%s: No filter to convert from %s/%s to %s/%s." = "%s: No filter to convert from %s/%s to %s/%s."; - "%s: Operation failed: %s" = "%s: Operation failed: %s"; - "%s: Sorry, no encryption support." = "%s: Sorry, no encryption support."; - "%s: Unable to connect to server." = "%s: Unable to connect to server."; - "%s: Unable to contact server." = "%s: Unable to contact server."; - "%s: Unable to determine MIME type of \"%s\"." = "%s: Unable to determine MIME type of \"%s\"."; - "%s: Unable to open %s: %s" = "%s: Unable to open %s: %s"; - "%s: Unable to open PPD file: %s on line %d." = "%s: Unable to open PPD file: %s on line %d."; - "%s: Unable to read MIME database from \"%s\" or \"%s\"." = "%s: Unable to read MIME database from \"%s\" or \"%s\"."; - "%s: Unknown destination \"%s\"." = "%s: Unknown destination \"%s\"."; - "%s: Unknown destination MIME type %s/%s." = "%s: Unknown destination MIME type %s/%s."; - "%s: Unknown option \"%c\"." = "%s: Unknown option \"%c\"."; - "%s: Unknown source MIME type %s/%s." = "%s: Unknown source MIME type %s/%s."; - "%s: Warning - \"%c\" format modifier not supported - output may not be correct." = "%s: Warning - \"%c\" format modifier not supported - output may not be correct."; - "%s: Warning - character set option ignored." = "%s: Warning - character set option ignored."; - "%s: Warning - content type option ignored." = "%s: Warning - content type option ignored."; - "%s: Warning - form option ignored." = "%s: Warning - form option ignored."; - "%s: Warning - mode option ignored." = "%s: Warning - mode option ignored."; - -"%s: error - %s environment variable names non-existent destination \"%s\"." = "%s: error - %s environment variable names non-existent destination \"%s\"."; - -"%s: error - expected option=value after \"-o\" option." = "%s: error - expected option=value after \"-o\" option."; - -"%s: error - no default destination available." = "%s: error - no default destination available."; - "-1" = "-1"; - "-10" = "-10"; - "-100" = "-100"; - "-105" = "-105"; - "-11" = "-11"; - "-110" = "-110"; - "-115" = "-115"; - "-12" = "-12"; - "-120" = "-120"; - "-13" = "-13"; - "-14" = "-14"; - "-15" = "-15"; - "-2" = "-2"; - "-20" = "-20"; - "-25" = "-25"; - "-3" = "-3"; - "-30" = "-30"; - "-35" = "-35"; - "-4" = "-4"; - "-40" = "-40"; - "-45" = "-45"; - "-5" = "-5"; - "-50" = "-50"; - "-55" = "-55"; - "-6" = "-6"; - "-60" = "-60"; - "-65" = "-65"; - "-7" = "-7"; - "-70" = "-70"; - "-75" = "-75"; - "-8" = "-8"; - "-80" = "-80"; - "-85" = "-85"; - "-9" = "-9"; - "-90" = "-90"; - "-95" = "-95"; - -"-F Run in the foreground but detach from console." = "-F Run in the foreground but detach from console."; - -"-c config-file Load alternate configuration file." = "-c config-file Load alternate configuration file."; - -"-f Run in the foreground." = "-f Run in the foreground."; - -"-h Show this usage message." = "-h Show this usage message."; - -"-l Run cupsd from launchd(8)." = "-l Run cupsd from launchd(8)."; - -"-t Test the configuration file." = "-t Test the configuration file."; - "0" = "0"; - "1" = "1"; - "1 inch/sec." = "1 inch/sec."; - "1.25x0.25\"" = "1.25x0.25\""; - "1.25x2.25\"" = "1.25x2.25\""; - "1.5 inch/sec." = "1.5 inch/sec."; - "1.50x0.25\"" = "1.50x0.25\""; - "1.50x0.50\"" = "1.50x0.50\""; - "1.50x1.00\"" = "1.50x1.00\""; - "1.50x2.00\"" = "1.50x2.00\""; - "10" = "10"; - "10 inches/sec." = "10 inches/sec."; - "10 x 11\"" = "10 x 11\""; - "10 x 13\"" = "10 x 13\""; - "10 x 14\"" = "10 x 14\""; - "100" = "100"; - "100 mm/sec." = "100 mm/sec."; - "105" = "105"; - "11" = "11"; - "11 inches/sec." = "11 inches/sec."; - "110" = "110"; - "115" = "115"; - "12" = "12"; - "12 inches/sec." = "12 inches/sec."; - "12 x 11\"" = "12 x 11\""; - "120" = "120"; - "120 mm/sec." = "120 mm/sec."; - "120x60dpi" = "120x60dpi"; - "120x72dpi" = "120x72dpi"; - "13" = "13"; - "136dpi" = "136dpi"; - "14" = "14"; - "15" = "15"; - "15 mm/sec." = "15 mm/sec."; - "15 x 11\"" = "15 x 11\""; - "150 mm/sec." = "150 mm/sec."; - "150dpi" = "150dpi"; - "16" = "16"; - "17" = "17"; - "18" = "18"; - "180dpi" = "180dpi"; - "19" = "19"; - "2" = "2"; - "2 inches/sec." = "2 inches/sec."; - "2-Sided Printing" = "2-Sided Printing"; - "2.00x0.37\"" = "2.00x0.37\""; - "2.00x0.50\"" = "2.00x0.50\""; - "2.00x1.00\"" = "2.00x1.00\""; - "2.00x1.25\"" = "2.00x1.25\""; - "2.00x2.00\"" = "2.00x2.00\""; - "2.00x3.00\"" = "2.00x3.00\""; - "2.00x4.00\"" = "2.00x4.00\""; - "2.00x5.50\"" = "2.00x5.50\""; - "2.25x0.50\"" = "2.25x0.50\""; - "2.25x1.25\"" = "2.25x1.25\""; - "2.25x4.00\"" = "2.25x4.00\""; - "2.25x5.50\"" = "2.25x5.50\""; - "2.38x5.50\"" = "2.38x5.50\""; - "2.5 inches/sec." = "2.5 inches/sec."; - "2.50x1.00\"" = "2.50x1.00\""; - "2.50x2.00\"" = "2.50x2.00\""; - "2.75x1.25\"" = "2.75x1.25\""; - "2.9 x 1\"" = "2.9 x 1\""; - "20" = "20"; - "20 mm/sec." = "20 mm/sec."; - "200 mm/sec." = "200 mm/sec."; - "203dpi" = "203dpi"; - "21" = "21"; - "22" = "22"; - "23" = "23"; - "24" = "24"; - "24-Pin Series" = "24-Pin Series"; - "240x72dpi" = "240x72dpi"; - "25" = "25"; - "250 mm/sec." = "250 mm/sec."; - "26" = "26"; - "27" = "27"; - "28" = "28"; - "29" = "29"; - "3" = "3"; - "3 inches/sec." = "3 inches/sec."; - "3.00x1.00\"" = "3.00x1.00\""; - "3.00x1.25\"" = "3.00x1.25\""; - "3.00x2.00\"" = "3.00x2.00\""; - "3.00x3.00\"" = "3.00x3.00\""; - "3.00x5.00\"" = "3.00x5.00\""; - "3.25x2.00\"" = "3.25x2.00\""; - "3.25x5.00\"" = "3.25x5.00\""; - "3.25x5.50\"" = "3.25x5.50\""; - "3.25x5.83\"" = "3.25x5.83\""; - "3.25x7.83\"" = "3.25x7.83\""; - "3.5\" Disk" = "3.5\" Disk"; - "3.5\" Disk - 2 1/8 x 2 3/4\"" = "3.5\" Disk - 2 1/8 x 2 3/4\""; - "3.50x1.00\"" = "3.50x1.00\""; - "30" = "30"; - "30 mm/sec." = "30 mm/sec."; - "300 mm/sec." = "300 mm/sec."; - "300dpi" = "300dpi"; - "35" = "35"; - "360dpi" = "360dpi"; - "360x180dpi" = "360x180dpi"; - "4" = "4"; - "4 inches/sec." = "4 inches/sec."; - "4.00x1.00\"" = "4.00x1.00\""; - "4.00x13.00\"" = "4.00x13.00\""; - "4.00x2.00\"" = "4.00x2.00\""; - "4.00x2.50\"" = "4.00x2.50\""; - "4.00x3.00\"" = "4.00x3.00\""; - "4.00x4.00\"" = "4.00x4.00\""; - "4.00x5.00\"" = "4.00x5.00\""; - "4.00x6.00\"" = "4.00x6.00\""; - "4.00x6.50\"" = "4.00x6.50\""; - "40" = "40"; - "40 mm/sec." = "40 mm/sec."; - "45" = "45"; - "5" = "5"; - "5 inches/sec." = "5 inches/sec."; - "50" = "50"; - "55" = "55"; - "6" = "6"; - "6 inches/sec." = "6 inches/sec."; - "6.00x1.00\"" = "6.00x1.00\""; - "6.00x2.00\"" = "6.00x2.00\""; - "6.00x3.00\"" = "6.00x3.00\""; - "6.00x4.00\"" = "6.00x4.00\""; - "6.00x5.00\"" = "6.00x5.00\""; - "6.00x6.00\"" = "6.00x6.00\""; - "6.00x6.50\"" = "6.00x6.50\""; - "60" = "60"; - "60 mm/sec." = "60 mm/sec."; - "600dpi" = "600dpi"; - "60dpi" = "60dpi"; - "60x72dpi" = "60x72dpi"; - "65" = "65"; - "7" = "7"; - "7 inches/sec." = "7 inches/sec."; - "7 x 9\"" = "7 x 9\""; - "70" = "70"; - "720dpi" = "720dpi"; - "75" = "75"; - "8" = "8"; - "8 inches/sec." = "8 inches/sec."; - "8 x 10\"" = "8 x 10\""; - "8.00x1.00\"" = "8.00x1.00\""; - "8.00x2.00\"" = "8.00x2.00\""; - "8.00x3.00\"" = "8.00x3.00\""; - "8.00x4.00\"" = "8.00x4.00\""; - "8.00x5.00\"" = "8.00x5.00\""; - "8.00x6.00\"" = "8.00x6.00\""; - "8.00x6.50\"" = "8.00x6.50\""; - "80" = "80"; - "80 mm/sec." = "80 mm/sec."; - "85" = "85"; - "9" = "9"; - "9 inches/sec." = "9 inches/sec."; - "9 x 11\"" = "9 x 11\""; - "9 x 12\"" = "9 x 12\""; - "9-Pin Series" = "9-Pin Series"; - "90" = "90"; - "95" = "95"; - "?Invalid help command unknown." = "?Invalid help command unknown."; - "A Samba password is required to export printer drivers" = "A Samba password is required to export printer drivers"; - "A Samba username is required to export printer drivers" = "A Samba username is required to export printer drivers"; - -"A class named \"%s\" already exists" = "A class named \"%s\" already exists"; - -"A printer named \"%s\" already exists" = "A printer named \"%s\" already exists"; - +"A class named \"%s\" already exists." = "A class named \"%s\" already exists."; +"A printer named \"%s\" already exists." = "A printer named \"%s\" already exists."; "A0" = "A0"; - "A1" = "A1"; - "A10" = "A10"; - "A2" = "A2"; - "A3" = "A3"; - -"A3 (Oversize)" = "A3 (Oversize)"; - +"A3 Oversize" = "A3 Oversize"; "A4" = "A4"; - -"A4 (Oversize)" = "A4 (Oversize)"; - -"A4 (Small)" = "A4 (Small)"; - +"A4 Oversize" = "A4 Oversize"; +"A4 Small" = "A4 Small"; "A5" = "A5"; - -"A5 (Oversize)" = "A5 (Oversize)"; - +"A5 Oversize" = "A5 Oversize"; "A6" = "A6"; - "A7" = "A7"; - "A8" = "A8"; - "A9" = "A9"; - "ANSI A" = "ANSI A"; - "ANSI B" = "ANSI B"; - "ANSI C" = "ANSI C"; - "ANSI D" = "ANSI D"; - "ANSI E" = "ANSI E"; - -"ARCH A" = "ARCH A"; - -"ARCH B" = "ARCH B"; - "ARCH C" = "ARCH C"; - "ARCH D" = "ARCH D"; - "ARCH E" = "ARCH E"; - "Accept Jobs" = "Accept Jobs"; - "Accepted" = "Accepted"; - "Add Class" = "Add Class"; - "Add Printer" = "Add Printer"; - "Add RSS Subscription" = "Add RSS Subscription"; - "Address" = "Address"; - "Address - 1 1/8 x 3 1/2\"" = "Address - 1 1/8 x 3 1/2\""; - "Administration" = "Administration"; - "Always" = "Always"; - "AppSocket/HP JetDirect" = "AppSocket/HP JetDirect"; - "Applicator" = "Applicator"; - -"Attempt to set %s printer-state to bad value %d" = "Attempt to set %s printer-state to bad value %d"; - -"Attribute groups are out of order (%x < %x)" = "Attribute groups are out of order (%x < %x)"; - +"Attempt to set %s printer-state to bad value %d." = "Attempt to set %s printer-state to bad value %d."; +"Attribute groups are out of order (%x < %x)." = "Attribute groups are out of order (%x < %x)."; "B0" = "B0"; - "B1" = "B1"; - "B10" = "B10"; - "B2" = "B2"; - "B3" = "B3"; - "B4" = "B4"; - "B5" = "B5"; - +"B5 JIS" = "B5 JIS"; +"B5 Oversize" = "B5 Oversize"; "B6" = "B6"; - "B7" = "B7"; - "B8" = "B8"; - "B9" = "B9"; - "Bad NULL dests pointer" = "Bad NULL dests pointer"; - "Bad OpenGroup" = "Bad OpenGroup"; - "Bad OpenUI/JCLOpenUI" = "Bad OpenUI/JCLOpenUI"; - "Bad OrderDependency" = "Bad OrderDependency"; - "Bad PPD cache file." = "Bad PPD cache file."; - "Bad Request" = "Bad Request"; - "Bad SNMP version number" = "Bad SNMP version number"; - "Bad UIConstraints" = "Bad UIConstraints"; - "Bad charset file \"%s\"." = "Bad charset file \"%s\"."; - "Bad charset type: %s" = "Bad charset type: %s"; - "Bad columns value %d." = "Bad columns value %d."; - "Bad copies value %d." = "Bad copies value %d."; - "Bad cpi value %f." = "Bad cpi value %f."; - "Bad custom parameter" = "Bad custom parameter"; - -"Bad device URI \"%s\"." = "Bad device URI \"%s\"."; - -"Bad device-uri \"%s\"" = "Bad device-uri \"%s\""; - -"Bad device-uri scheme \"%s\"" = "Bad device-uri scheme \"%s\""; - -"Bad document-format \"%s\"" = "Bad document-format \"%s\""; - +"Bad device-uri \"%s\"." = "Bad device-uri \"%s\"."; +"Bad device-uri scheme \"%s\"." = "Bad device-uri scheme \"%s\"."; +"Bad document-format \"%s\"." = "Bad document-format \"%s\"."; +"Bad document-format-default \"%s\"." = "Bad document-format-default \"%s\"."; "Bad filename buffer" = "Bad filename buffer"; - "Bad font description line \"%s\"." = "Bad font description line \"%s\"."; - "Bad font description line: %s" = "Bad font description line: %s"; - -"Bad job-priority value" = "Bad job-priority value"; - -"Bad job-sheets value \"%s\"" = "Bad job-sheets value \"%s\""; - -"Bad job-sheets value type" = "Bad job-sheets value type"; - -"Bad job-state value" = "Bad job-state value"; - -"Bad job-uri attribute \"%s\"" = "Bad job-uri attribute \"%s\""; - +"Bad job-priority value." = "Bad job-priority value."; +"Bad job-sheets value \"%s\"." = "Bad job-sheets value \"%s\"."; +"Bad job-sheets value type." = "Bad job-sheets value type."; +"Bad job-state value." = "Bad job-state value."; +"Bad job-uri \"%s\"." = "Bad job-uri \"%s\"."; "Bad lpi value %f." = "Bad lpi value %f."; - -"Bad notify-pull-method \"%s\"" = "Bad notify-pull-method \"%s\""; - -"Bad notify-recipient-uri URI \"%s\"" = "Bad notify-recipient-uri URI \"%s\""; - +"Bad notify-pull-method \"%s\"." = "Bad notify-pull-method \"%s\"."; +"Bad notify-recipient-uri \"%s\"." = "Bad notify-recipient-uri \"%s\"."; "Bad number-up value %d." = "Bad number-up value %d."; - -"Bad option + choice on line %d" = "Bad option + choice on line %d"; - +"Bad option + choice on line %d." = "Bad option + choice on line %d."; "Bad page-ranges values %d-%d." = "Bad page-ranges values %d-%d."; - -"Bad port-monitor \"%s\"" = "Bad port-monitor \"%s\""; - -"Bad printer-state value %d" = "Bad printer-state value %d"; - -"Bad request ID %d" = "Bad request ID %d"; - -"Bad request version number %d.%d" = "Bad request version number %d.%d"; - +"Bad port-monitor \"%s\"." = "Bad port-monitor \"%s\"."; +"Bad printer-state value %d." = "Bad printer-state value %d."; +"Bad request ID %d." = "Bad request ID %d."; +"Bad request version number %d.%d." = "Bad request version number %d.%d."; "Bad subscription ID" = "Bad subscription ID"; - "Bad text direction \"%s\"." = "Bad text direction \"%s\"."; - "Bad text direction: %s" = "Bad text direction: %s"; - "Bad text width \"%s\"." = "Bad text width \"%s\"."; - "Bad text width: %s" = "Bad text width: %s"; - "Bad value string" = "Bad value string"; - "Banners" = "Banners"; - "Billing Information: " = "Billing Information: "; - "Bond Paper" = "Bond Paper"; - "Boolean expected for waiteof option \"%s\"." = "Boolean expected for waiteof option \"%s\"."; - "Buffer overflow detected, aborting." = "Buffer overflow detected, aborting."; - -"C0 Envelope" = "C0 Envelope"; - -"C1 Envelope" = "C1 Envelope"; - -"C2 Envelope" = "C2 Envelope"; - -"C3 Envelope" = "C3 Envelope"; - -"C4" = "C4"; - -"C4 Envelope" = "C4 Envelope"; - -"C5" = "C5"; - -"C5 Envelope" = "C5 Envelope"; - -"C6" = "C6"; - -"C6 Envelope" = "C6 Envelope"; - -"C65 Envelope" = "C65 Envelope"; - -"C7 Envelope" = "C7 Envelope"; - "CMYK" = "CMYK"; - "CPCL Label Printer" = "CPCL Label Printer"; - "Cancel RSS Subscription" = "Cancel RSS Subscription"; - "Canceling print job." = "Canceling print job."; - "Cassette" = "Cassette"; - "Change Settings" = "Change Settings"; - -"Character set \"%s\" not supported" = "Character set \"%s\" not supported"; - -"Chou3 Envelope" = "Chou3 Envelope"; - -"Chou4 Envelope" = "Chou4 Envelope"; - +"Character set \"%s\" not supported." = "Character set \"%s\" not supported."; "Classes" = "Classes"; - "Clean Print Heads" = "Clean Print Heads"; - "Close-Job doesn't support the job-uri attribute." = "Close-Job doesn't support the job-uri attribute."; - "Color" = "Color"; - "Color Mode" = "Color Mode"; - "Commands may be abbreviated. Commands are:\n\nexit help quit status ?" = "Commands may be abbreviated. Commands are:\n\nexit help quit status ?"; - "Community name uses indefinite length" = "Community name uses indefinite length"; - "Connected to printer." = "Connected to printer."; - "Connecting to printer." = "Connecting to printer."; - "Continue" = "Continue"; - "Continuous" = "Continuous"; - "Control file sent successfully." = "Control file sent successfully."; - "Copying print data." = "Copying print data."; - -"Could not scan type \"%s\"" = "Could not scan type \"%s\""; - "Created" = "Created"; - "Created On: " = "Created On: "; - "Custom" = "Custom"; - "CustominCutInterval" = "CustominCutInterval"; - "CustominTearInterval" = "CustominTearInterval"; - "Cut" = "Cut"; - "Cutter" = "Cutter"; - -"DL" = "DL"; - -"DL Envelope" = "DL Envelope"; - "Dark" = "Dark"; - "Darkness" = "Darkness"; - "Data file sent successfully." = "Data file sent successfully."; - "Delete Class" = "Delete Class"; - "Delete Printer" = "Delete Printer"; - "Description: " = "Description: "; - "DeskJet Series" = "DeskJet Series"; - "Destination \"%s\" is not accepting jobs." = "Destination \"%s\" is not accepting jobs."; - "Device: uri = %s\n class = %s\n info = %s\n make-and-model = %s\n device-id = %s\n location = %s" = "Device: uri = %s\n class = %s\n info = %s\n make-and-model = %s\n device-id = %s\n location = %s"; - "Direct Thermal Media" = "Direct Thermal Media"; - "Disabled" = "Disabled"; - -"Document %d not found in job %d." = "Document %d not found in job %d."; - -"Double Postcard" = "Double Postcard"; - +"Document #%d does not exist in job #%d." = "Document #%d does not exist in job #%d."; "Driver Name: " = "Driver Name: "; - "Driver Version: " = "Driver Version: "; - "Duplexer" = "Duplexer"; - "Dymo" = "Dymo"; - "EPL1 Label Printer" = "EPL1 Label Printer"; - "EPL2 Label Printer" = "EPL2 Label Printer"; - "Edit Configuration File" = "Edit Configuration File"; - -"Empty PPD file" = "Empty PPD file"; - +"Empty PPD file." = "Empty PPD file."; "Ending Banner" = "Ending Banner"; - "English" = "English"; - "Enter old password:" = "Enter old password:"; - "Enter password again:" = "Enter password again:"; - "Enter password:" = "Enter password:"; - "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." = "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."; - +"Envelope #10 " = "Envelope #10 "; +"Envelope #11" = "Envelope #11"; +"Envelope #12" = "Envelope #12"; +"Envelope #14" = "Envelope #14"; +"Envelope #9" = "Envelope #9"; +"Envelope B4" = "Envelope B4"; +"Envelope B5" = "Envelope B5"; +"Envelope B6" = "Envelope B6"; +"Envelope C0" = "Envelope C0"; +"Envelope C1" = "Envelope C1"; +"Envelope C2" = "Envelope C2"; +"Envelope C3" = "Envelope C3"; +"Envelope C4" = "Envelope C4"; +"Envelope C5" = "Envelope C5"; +"Envelope C6" = "Envelope C6"; +"Envelope C65" = "Envelope C65"; +"Envelope C7" = "Envelope C7"; +"Envelope Choukei 3" = "Envelope Choukei 3"; +"Envelope Choukei 4" = "Envelope Choukei 4"; +"Envelope DL" = "Envelope DL"; "Envelope Feed" = "Envelope Feed"; - +"Envelope Invite" = "Envelope Invite"; +"Envelope Italian" = "Envelope Italian"; +"Envelope Kaku2" = "Envelope Kaku2"; +"Envelope Kaku3" = "Envelope Kaku3"; +"Envelope Monarch" = "Envelope Monarch"; +"Envelope PRC1 " = "Envelope PRC1 "; +"Envelope PRC10" = "Envelope PRC10"; +"Envelope PRC2" = "Envelope PRC2"; +"Envelope PRC3" = "Envelope PRC3"; +"Envelope PRC4" = "Envelope PRC4"; +"Envelope PRC5" = "Envelope PRC5"; +"Envelope PRC5PRC5" = "Envelope PRC5PRC5"; +"Envelope PRC6" = "Envelope PRC6"; +"Envelope PRC7" = "Envelope PRC7"; +"Envelope PRC8" = "Envelope PRC8"; +"Envelope PRC9" = "Envelope PRC9"; +"Envelope Personal" = "Envelope Personal"; +"Envelope You4" = "Envelope You4"; "Epson" = "Epson"; - "Error Policy" = "Error Policy"; - "Error: need hostname after \"-h\" option." = "Error: need hostname after \"-h\" option."; - "Every 10 Labels" = "Every 10 Labels"; - "Every 2 Labels" = "Every 2 Labels"; - "Every 3 Labels" = "Every 3 Labels"; - "Every 4 Labels" = "Every 4 Labels"; - "Every 5 Labels" = "Every 5 Labels"; - "Every 6 Labels" = "Every 6 Labels"; - "Every 7 Labels" = "Every 7 Labels"; - "Every 8 Labels" = "Every 8 Labels"; - "Every 9 Labels" = "Every 9 Labels"; - "Every Label" = "Every Label"; - +"Executive" = "Executive"; "Expectation Failed" = "Expectation Failed"; - "Export Printers to Samba" = "Export Printers to Samba"; - "FAIL" = "FAIL"; - +"FanFold German" = "FanFold German"; +"FanFold Legal German" = "FanFold Legal German"; +"Fanfold US" = "Fanfold US"; "File Folder" = "File Folder"; - "File Folder - 9/16 x 3 7/16\"" = "File Folder - 9/16 x 3 7/16\""; - -"File device URIs have been disabled! To enable, see the FileDevice directive in \"%s/cupsd.conf\"." = "File device URIs have been disabled! To enable, see the FileDevice directive in \"%s/cupsd.conf\"."; - +"File device URIs have been disabled. To enable, see the FileDevice directive in \"%s/cupsd.conf\"." = "File device URIs have been disabled. To enable, see the FileDevice directive in \"%s/cupsd.conf\"."; "Finished page %d." = "Finished page %d."; - "Folio" = "Folio"; - "Forbidden" = "Forbidden"; - "Formatting page %d." = "Formatting page %d."; - "General" = "General"; - "Generic" = "Generic"; - -"German FanFold" = "German FanFold"; - -"German FanFold Legal" = "German FanFold Legal"; - "Get-Response-PDU uses indefinite length" = "Get-Response-PDU uses indefinite length"; - "Glossy Paper" = "Glossy Paper"; - -"Got a printer-uri attribute but no job-id" = "Got a printer-uri attribute but no job-id"; - +"Got a printer-uri attribute but no job-id." = "Got a printer-uri attribute but no job-id."; "Grayscale" = "Grayscale"; - "HP" = "HP"; - "Hanging Folder" = "Hanging Folder"; - "Hanging Folder - 9/16 x 2\"" = "Hanging Folder - 9/16 x 2\""; - -"ISO B0" = "ISO B0"; - -"ISO B1" = "ISO B1"; - -"ISO B10" = "ISO B10"; - -"ISO B2" = "ISO B2"; - -"ISO B3" = "ISO B3"; - -"ISO B4" = "ISO B4"; - -"ISO B4 Envelope" = "ISO B4 Envelope"; - -"ISO B5" = "ISO B5"; - -"ISO B5 (Oversize)" = "ISO B5 (Oversize)"; - -"ISO B5 Envelope" = "ISO B5 Envelope"; - -"ISO B6" = "ISO B6"; - -"ISO B6 Envelope" = "ISO B6 Envelope"; - -"ISO B7" = "ISO B7"; - -"ISO B8" = "ISO B8"; - -"ISO B9" = "ISO B9"; - "ISOLatin1" = "ISOLatin1"; - "Illegal control character" = "Illegal control character"; - "Illegal main keyword string" = "Illegal main keyword string"; - "Illegal option keyword string" = "Illegal option keyword string"; - "Illegal translation string" = "Illegal translation string"; - "Illegal whitespace character" = "Illegal whitespace character"; - "Installable Options" = "Installable Options"; - "Installed" = "Installed"; - "IntelliBar Label Printer" = "IntelliBar Label Printer"; - "Intellitech" = "Intellitech"; - "Internal Server Error" = "Internal Server Error"; - "Internal error" = "Internal error"; - "Internet Postage 2-Part" = "Internet Postage 2-Part"; - "Internet Postage 2-Part - 2 1/4 x 7 1/2\"" = "Internet Postage 2-Part - 2 1/4 x 7 1/2\""; - "Internet Postage 3-Part" = "Internet Postage 3-Part"; - "Internet Postage 3-Part - 2 1/4 x 7\"" = "Internet Postage 3-Part - 2 1/4 x 7\""; - "Internet Printing Protocol" = "Internet Printing Protocol"; - -"Invite Envelope" = "Invite Envelope"; - -"Italian Envelope" = "Italian Envelope"; - +"JB0" = "JB0"; +"JB1" = "JB1"; +"JB10" = "JB10"; +"JB2" = "JB2"; +"JB3" = "JB3"; +"JB4" = "JB4"; +"JB6" = "JB6"; +"JB7" = "JB7"; +"JB8" = "JB8"; +"JB9" = "JB9"; "JCL" = "JCL"; - -"Job #%d cannot be restarted - no files" = "Job #%d cannot be restarted - no files"; - -"Job #%d does not exist" = "Job #%d does not exist"; - +"Job #%d cannot be restarted - no files." = "Job #%d cannot be restarted - no files."; +"Job #%d does not exist." = "Job #%d does not exist."; "Job #%d is already aborted - can't cancel." = "Job #%d is already aborted - can't cancel."; - "Job #%d is already canceled - can't cancel." = "Job #%d is already canceled - can't cancel."; - "Job #%d is already completed - can't cancel." = "Job #%d is already completed - can't cancel."; - -"Job #%d is finished and cannot be altered" = "Job #%d is finished and cannot be altered"; - -"Job #%d is not complete" = "Job #%d is not complete"; - -"Job #%d is not held" = "Job #%d is not held"; - -"Job #%d is not held for authentication" = "Job #%d is not held for authentication"; - -"Job #%s does not exist" = "Job #%s does not exist"; - -"Job %d not found" = "Job %d not found"; - +"Job #%d is finished and cannot be altered." = "Job #%d is finished and cannot be altered."; +"Job #%d is not complete." = "Job #%d is not complete."; +"Job #%d is not held for authentication." = "Job #%d is not held for authentication."; +"Job #%d is not held." = "Job #%d is not held."; "Job Completed" = "Job Completed"; - "Job Created" = "Job Created"; - "Job ID: " = "Job ID: "; - "Job Options Changed" = "Job Options Changed"; - "Job Stopped" = "Job Stopped"; - "Job UUID: " = "Job UUID: "; - "Job is completed and cannot be changed." = "Job is completed and cannot be changed."; - "Job operation failed:" = "Job operation failed:"; - "Job state cannot be changed." = "Job state cannot be changed."; - -"Job subscriptions cannot be renewed" = "Job subscriptions cannot be renewed"; - +"Job subscriptions cannot be renewed." = "Job subscriptions cannot be renewed."; "Jobs" = "Jobs"; - -"Kaku2 Envelope" = "Kaku2 Envelope"; - -"Kaku3 Envelope" = "Kaku3 Envelope"; - "LPD/LPR Host or Printer" = "LPD/LPR Host or Printer"; - "Label Printer" = "Label Printer"; - "Label Top" = "Label Top"; - -"Language \"%s\" not supported" = "Language \"%s\" not supported"; - +"Language \"%s\" not supported." = "Language \"%s\" not supported."; "Large Address" = "Large Address"; - "Large Address - 1 4/10 x 3 1/2\"" = "Large Address - 1 4/10 x 3 1/2\""; - "LaserJet Series PCL 4/5" = "LaserJet Series PCL 4/5"; - +"Letter Oversize" = "Letter Oversize"; "Light" = "Light"; - "Line longer than the maximum allowed (255 characters)" = "Line longer than the maximum allowed (255 characters)"; - "List Available Printers" = "List Available Printers"; - "Loading print file." = "Loading print file."; - "Location: " = "Location: "; - "Long-Edge (Portrait)" = "Long-Edge (Portrait)"; - "Looking for printer." = "Looking for printer."; - "Make and Model: " = "Make and Model: "; - "Manual Feed" = "Manual Feed"; - "Media Dimensions: " = "Media Dimensions: "; - "Media Limits: " = "Media Limits: "; - "Media Name: " = "Media Name: "; - "Media Size" = "Media Size"; - "Media Source" = "Media Source"; - "Media Tracking" = "Media Tracking"; - "Media Type" = "Media Type"; - "Medium" = "Medium"; - "Memory allocation error" = "Memory allocation error"; - "Missing CloseGroup" = "Missing CloseGroup"; - "Missing PPD-Adobe-4.x header" = "Missing PPD-Adobe-4.x header"; - "Missing asterisk in column 1" = "Missing asterisk in column 1"; - -"Missing document-number attribute" = "Missing document-number attribute"; - -"Missing double quote on line %d" = "Missing double quote on line %d"; - +"Missing document-number attribute." = "Missing document-number attribute."; +"Missing double quote on line %d." = "Missing double quote on line %d."; "Missing form variable" = "Missing form variable"; - "Missing media or media-col." = "Missing media or media-col."; - "Missing media-size in media-col." = "Missing media-size in media-col."; - -"Missing notify-subscription-ids attribute" = "Missing notify-subscription-ids attribute"; - +"Missing notify-subscription-ids attribute." = "Missing notify-subscription-ids attribute."; "Missing option keyword" = "Missing option keyword"; - -"Missing requesting-user-name attribute" = "Missing requesting-user-name attribute"; - -"Missing required attributes" = "Missing required attributes"; - -"Missing value on line %d" = "Missing value on line %d"; - +"Missing requesting-user-name attribute." = "Missing requesting-user-name attribute."; +"Missing required attributes." = "Missing required attributes."; "Missing value on line %d of banner file." = "Missing value on line %d of banner file."; - +"Missing value on line %d." = "Missing value on line %d."; "Missing value string" = "Missing value string"; - "Missing x-dimension in media-size." = "Missing x-dimension in media-size."; - "Missing y-dimension in media-size." = "Missing y-dimension in media-size."; - "Model: name = %s\n natural_language = %s\n make-and-model = %s\n device-id = %s" = "Model: name = %s\n natural_language = %s\n make-and-model = %s\n device-id = %s"; - "Modify Class" = "Modify Class"; - "Modify Printer" = "Modify Printer"; - "Monarch" = "Monarch"; - -"Monarch Envelope" = "Monarch Envelope"; - "Move All Jobs" = "Move All Jobs"; - "Move Job" = "Move Job"; - "Moved Permanently" = "Moved Permanently"; - "NULL PPD file pointer" = "NULL PPD file pointer"; - "Name OID uses indefinite length" = "Name OID uses indefinite length"; - -"Nested classes are not allowed" = "Nested classes are not allowed"; - +"Nested classes are not allowed." = "Nested classes are not allowed."; "Network host \"%s\" is busy; will retry in %d seconds." = "Network host \"%s\" is busy; will retry in %d seconds."; - "Network printer \"%s\" is busy." = "Network printer \"%s\" is busy."; - "Network printer \"%s\" is not responding." = "Network printer \"%s\" is not responding."; - "Network printer \"%s\" is unreachable at this time." = "Network printer \"%s\" is unreachable at this time."; - "Network printer \"%s\" may not exist or is unavailable at this time." = "Network printer \"%s\" may not exist or is unavailable at this time."; - "Never" = "Never"; - "New Stylus Color Series" = "New Stylus Color Series"; - "New Stylus Photo Series" = "New Stylus Photo Series"; - "No" = "No"; - "No Content" = "No Content"; - "No PPD name" = "No PPD name"; - "No VarBind SEQUENCE" = "No VarBind SEQUENCE"; - -"No Windows printer drivers are installed" = "No Windows printer drivers are installed"; - +"No Windows printer drivers are installed." = "No Windows printer drivers are installed."; "No active connection" = "No active connection"; - -"No active jobs on %s" = "No active jobs on %s"; - -"No attributes in request" = "No attributes in request"; - -"No authentication information provided" = "No authentication information provided"; - +"No active jobs on %s." = "No active jobs on %s."; +"No attributes in request." = "No attributes in request."; +"No authentication information provided." = "No authentication information provided."; "No community name" = "No community name"; - -"No default printer" = "No default printer"; - +"No default printer." = "No default printer."; "No destinations added." = "No destinations added."; - "No device URI found in argv[0] or in DEVICE_URI environment variable." = "No device URI found in argv[0] or in DEVICE_URI environment variable."; - "No error-index" = "No error-index"; - "No error-status" = "No error-status"; - -"No file!?" = "No file!?"; - +"No file in print request." = "No file in print request."; "No fonts in charset file." = "No fonts in charset file."; - "No modification time" = "No modification time"; - "No name OID" = "No name OID"; - "No pages were found." = "No pages were found."; - "No printer name" = "No printer name"; - "No printer-uri found" = "No printer-uri found"; - "No printer-uri found for class" = "No printer-uri found for class"; - -"No printer-uri in request" = "No printer-uri in request"; - +"No printer-uri in request." = "No printer-uri in request."; "No request-id" = "No request-id"; - -"No subscription attributes in request" = "No subscription attributes in request"; - +"No subscription attributes in request." = "No subscription attributes in request."; "No subscriptions found." = "No subscriptions found."; - "No variable-bindings SEQUENCE" = "No variable-bindings SEQUENCE"; - "No version number" = "No version number"; - "Non-continuous (Mark sensing)" = "Non-continuous (Mark sensing)"; - "Non-continuous (Web sensing)" = "Non-continuous (Web sensing)"; - "Normal" = "Normal"; - "Not Found" = "Not Found"; - "Not Implemented" = "Not Implemented"; - "Not Installed" = "Not Installed"; - "Not Modified" = "Not Modified"; - "Not Supported" = "Not Supported"; - "Not allowed to print." = "Not allowed to print."; - "Note" = "Note"; - "Note: this program only validates the DSC comments, not the PostScript itself." = "Note: this program only validates the DSC comments, not the PostScript itself."; - "OK" = "OK"; - "Off (1-Sided)" = "Off (1-Sided)"; - "Oki" = "Oki"; - "Online Help" = "Online Help"; - "Open of %s failed: %s" = "Open of %s failed: %s"; - "OpenGroup without a CloseGroup first" = "OpenGroup without a CloseGroup first"; - "OpenUI/JCLOpenUI without a CloseUI/JCLCloseUI first" = "OpenUI/JCLOpenUI without a CloseUI/JCLCloseUI first"; - "Operation Policy" = "Operation Policy"; - "Option \"%s\" cannot be included via %%%%IncludeFeature." = "Option \"%s\" cannot be included via %%%%IncludeFeature."; - "Options Installed" = "Options Installed"; - "Options:" = "Options:"; - "Options: " = "Options: "; - "Out of memory." = "Out of memory."; - "Output Mode" = "Output Mode"; - "Output for printer %s is sent to %s" = "Output for printer %s is sent to %s"; - "Output for printer %s is sent to remote printer %s on %s" = "Output for printer %s is sent to remote printer %s on %s"; - "Output for printer %s/%s is sent to %s" = "Output for printer %s/%s is sent to %s"; - "Output for printer %s/%s is sent to remote printer %s on %s" = "Output for printer %s/%s is sent to remote printer %s on %s"; - "PASS" = "PASS"; - "PCL Laser Printer" = "PCL Laser Printer"; - -"PRC1 Envelope" = "PRC1 Envelope"; - -"PRC10 Envelope" = "PRC10 Envelope"; - "PRC16K" = "PRC16K"; - -"PRC2 Envelope" = "PRC2 Envelope"; - -"PRC3 Envelope" = "PRC3 Envelope"; - "PRC32K" = "PRC32K"; - -"PRC32K (Oversize)" = "PRC32K (Oversize)"; - -"PRC4 Envelope" = "PRC4 Envelope"; - -"PRC5 Envelope" = "PRC5 Envelope"; - -"PRC6 Envelope" = "PRC6 Envelope"; - -"PRC7 Envelope" = "PRC7 Envelope"; - -"PRC8 Envelope" = "PRC8 Envelope"; - -"PRC9 Envelope" = "PRC9 Envelope"; - +"PRC32K Oversize" = "PRC32K Oversize"; "Packet does not contain a Get-Response-PDU" = "Packet does not contain a Get-Response-PDU"; - "Packet does not start with SEQUENCE" = "Packet does not start with SEQUENCE"; - "ParamCustominCutInterval" = "ParamCustominCutInterval"; - "ParamCustominTearInterval" = "ParamCustominTearInterval"; - "Password for %s on %s? " = "Password for %s on %s? "; - "Password for %s required to access %s via SAMBA: " = "Password for %s required to access %s via SAMBA: "; - "Pause Class" = "Pause Class"; - "Pause Printer" = "Pause Printer"; - "Peel-Off" = "Peel-Off"; - -"Personal Envelope" = "Personal Envelope"; - "Photo" = "Photo"; - "Photo Labels" = "Photo Labels"; - "Plain Paper" = "Plain Paper"; - "Policies" = "Policies"; - "Port Monitor" = "Port Monitor"; - "PostScript Printer" = "PostScript Printer"; - "Postcard" = "Postcard"; - +"Postcard Double" = "Postcard Double"; +"Postcard Double " = "Postcard Double "; "Print Density" = "Print Density"; - "Print Job:" = "Print Job:"; - "Print Mode" = "Print Mode"; - "Print Rate" = "Print Rate"; - "Print Self-Test Page" = "Print Self-Test Page"; - "Print Speed" = "Print Speed"; - "Print Test Page" = "Print Test Page"; - "Print and Cut" = "Print and Cut"; - "Print and Tear" = "Print and Tear"; - "Print file accepted - job ID %d." = "Print file accepted - job ID %d."; - "Print file accepted - job ID unknown." = "Print file accepted - job ID unknown."; - "Print file sent." = "Print file sent."; - "Print file was not accepted: %s" = "Print file was not accepted: %s"; - "Printed For: " = "Printed For: "; - "Printed From: " = "Printed From: "; - "Printed On: " = "Printed On: "; - "Printer Added" = "Printer Added"; - "Printer Default" = "Printer Default"; - "Printer Deleted" = "Printer Deleted"; - "Printer Modified" = "Printer Modified"; - "Printer Name: " = "Printer Name: "; - "Printer Paused" = "Printer Paused"; - "Printer Settings" = "Printer Settings"; - "Printer busy, will retry in 10 seconds." = "Printer busy, will retry in 10 seconds."; - "Printer busy; will retry in 10 seconds." = "Printer busy; will retry in 10 seconds."; - "Printer busy; will retry in 30 seconds." = "Printer busy; will retry in 30 seconds."; - "Printer did not respond after %d seconds." = "Printer did not respond after %d seconds."; - "Printer does not support IPP/%d.%d, trying IPP/%s." = "Printer does not support IPP/%d.%d, trying IPP/%s."; - "Printer is busy, will retry in 5 seconds." = "Printer is busy, will retry in 5 seconds."; - "Printer is not currently connected." = "Printer is not currently connected."; - "Printer is now connected." = "Printer is now connected."; - "Printer is now online." = "Printer is now online."; - "Printer is offline." = "Printer is offline."; - "Printer not connected, will retry in 30 seconds." = "Printer not connected, will retry in 30 seconds."; - "Printer not connected; will retry in 30 seconds." = "Printer not connected; will retry in 30 seconds."; - "Printer:" = "Printer:"; - "Printers" = "Printers"; - "Printing page %d, %d%% complete." = "Printing page %d, %d%% complete."; - "Printing page %d." = "Printing page %d."; - "Purge Jobs" = "Purge Jobs"; - "Quarto" = "Quarto"; - "Quota limit reached." = "Quota limit reached."; - "Rank Owner Job File(s) Total Size" = "Rank Owner Job File(s) Total Size"; - "Rank Owner Pri Job Files Total Size" = "Rank Owner Pri Job Files Total Size"; - "Ready to print." = "Ready to print."; - "Reject Jobs" = "Reject Jobs"; - "Remote host did not accept control file (%d)." = "Remote host did not accept control file (%d)."; - "Remote host did not accept data file (%d)." = "Remote host did not accept data file (%d)."; - "Reprint After Error" = "Reprint After Error"; - "Request Entity Too Large" = "Request Entity Too Large"; - "Resolution" = "Resolution"; - "Resume Class" = "Resume Class"; - "Resume Printer" = "Resume Printer"; - "Return Address" = "Return Address"; - "Return Address - 3/4 x 2\"" = "Return Address - 3/4 x 2\""; - "Rewind" = "Rewind"; - "Running command: %s %s -N -A %s -c '%s'" = "Running command: %s %s -N -A %s -c '%s'"; - "SEQUENCE uses indefinite length" = "SEQUENCE uses indefinite length"; - "SSL/TLS Negotiation Error" = "SSL/TLS Negotiation Error"; - "See Other" = "See Other"; - "Sending data to printer." = "Sending data to printer."; - "Serial Port #%d" = "Serial Port #%d"; - "Server Restarted" = "Server Restarted"; - "Server Security Auditing" = "Server Security Auditing"; - "Server Started" = "Server Started"; - "Server Stopped" = "Server Stopped"; - "Service Unavailable" = "Service Unavailable"; - "Set Allowed Users" = "Set Allowed Users"; - "Set As Server Default" = "Set As Server Default"; - "Set Class Options" = "Set Class Options"; - "Set Printer Options" = "Set Printer Options"; - "Set Publishing" = "Set Publishing"; - "Shipping Address" = "Shipping Address"; - "Shipping Address - 2 5/16 x 4\"" = "Shipping Address - 2 5/16 x 4\""; - "Short-Edge (Landscape)" = "Short-Edge (Landscape)"; - "Special Paper" = "Special Paper"; - "Spooling job, %.0f%% complete." = "Spooling job, %.0f%% complete."; - "Standard" = "Standard"; - "Starting Banner" = "Starting Banner"; - "Starting page %d." = "Starting page %d."; - "Statement" = "Statement"; - "Stylus Color Series" = "Stylus Color Series"; - "Stylus Photo Series" = "Stylus Photo Series"; - +"Subscription #%d does not exist." = "Subscription #%d does not exist."; "Super A" = "Super A"; - "Super B" = "Super B"; - "Super B/A3" = "Super B/A3"; - "Switching Protocols" = "Switching Protocols"; - "Tabloid" = "Tabloid"; - -"Tabloid (Oversize)" = "Tabloid (Oversize)"; - +"Tabloid Oversize" = "Tabloid Oversize"; "Tear" = "Tear"; - "Tear-Off" = "Tear-Off"; - "Tear-Off Adjust Position" = "Tear-Off Adjust Position"; - "The %s attribute cannot be provided with job-ids." = "The %s attribute cannot be provided with job-ids."; - "The PPD file \"%s\" could not be found." = "The PPD file \"%s\" could not be found."; - "The PPD file \"%s\" could not be opened: %s" = "The PPD file \"%s\" could not be opened: %s"; - "The PPD file could not be opened." = "The PPD file could not be opened."; - "The class name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#)." = "The class name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#)."; - "The developer unit needs to be replaced." = "The developer unit needs to be replaced."; - "The developer unit will need to be replaced soon." = "The developer unit will need to be replaced soon."; - "The fuser's temperature is high." = "The fuser's temperature is high."; - "The fuser's temperature is low." = "The fuser's temperature is low."; - "The notify-lease-duration attribute cannot be used with job subscriptions." = "The notify-lease-duration attribute cannot be used with job subscriptions."; - -"The notify-user-data value is too large (%d > 63 octets)" = "The notify-user-data value is too large (%d > 63 octets)"; - +"The notify-user-data value is too large (%d > 63 octets)." = "The notify-user-data value is too large (%d > 63 octets)."; "The optical photoconductor needs to be replaced." = "The optical photoconductor needs to be replaced."; - "The optical photoconductor will need to be replaced soon." = "The optical photoconductor will need to be replaced soon."; - "The output bin is almost full." = "The output bin is almost full."; - "The output bin is full." = "The output bin is full."; - "The output bin is missing." = "The output bin is missing."; - "The page setup information was not valid." = "The page setup information was not valid."; - "The paper tray is almost empty." = "The paper tray is almost empty."; - "The paper tray is empty." = "The paper tray is empty."; - "The paper tray is missing." = "The paper tray is missing."; - "The paper tray needs to be filled." = "The paper tray needs to be filled."; - "The print file could not be opened." = "The print file could not be opened."; - "The printer URI is incorrect or no longer exists." = "The printer URI is incorrect or no longer exists."; - "The printer is almost out of ink." = "The printer is almost out of ink."; - "The printer is low on toner." = "The printer is low on toner."; - +"The printer is not connected." = "The printer is not connected."; "The printer is not responding." = "The printer is not responding."; - -"The printer is offline." = "The printer is offline."; - "The printer is out of ink." = "The printer is out of ink."; - "The printer is out of toner." = "The printer is out of toner."; - "The printer name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#)." = "The printer name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#)."; - -"The printer or class is not shared" = "The printer or class is not shared"; - -"The printer or class was not found." = "The printer or class was not found."; - +"The printer or class does not exist." = "The printer or class does not exist."; +"The printer or class is not shared." = "The printer or class is not shared."; "The printer's cover is open." = "The printer's cover is open."; - "The printer's door is open." = "The printer's door is open."; - "The printer's interlock is open." = "The printer's interlock is open."; - "The printer's waste bin is almost full." = "The printer's waste bin is almost full."; - "The printer's waste bin is full." = "The printer's waste bin is full."; - "The printer-uri \"%s\" contains invalid characters." = "The printer-uri \"%s\" contains invalid characters."; - -"The printer-uri attribute is required" = "The printer-uri attribute is required"; - +"The printer-uri attribute is required." = "The printer-uri attribute is required."; "The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"." = "The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"."; - "The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"." = "The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"."; - "The subscription name may not contain spaces, slashes (/), question marks (?), or the pound sign (#)." = "The subscription name may not contain spaces, slashes (/), question marks (?), or the pound sign (#)."; - "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to enable it." = "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to enable it."; - "The which-jobs value \"%s\" is not supported." = "The which-jobs value \"%s\" is not supported."; - "There are too many subscriptions." = "There are too many subscriptions."; - "There is a paper jam." = "There is a paper jam."; - "There was an unrecoverable USB error." = "There was an unrecoverable USB error."; - "Thermal Transfer Media" = "Thermal Transfer Media"; - "This printer does not conform to the IPP standard and may not work." = "This printer does not conform to the IPP standard and may not work."; - +"This printer does not conform to the IPP standard. Please contact the manufacturer of your printer for assistance." = "This printer does not conform to the IPP standard. Please contact the manufacturer of your printer for assistance."; "Title: " = "Title: "; - "Too many active jobs." = "Too many active jobs."; - -"Too many job-sheets values (%d > 2)" = "Too many job-sheets values (%d > 2)"; - -"Too many printer-state-reasons values (%d > %d)" = "Too many printer-state-reasons values (%d > %d)"; - +"Too many job-sheets values (%d > 2)." = "Too many job-sheets values (%d > 2)."; +"Too many printer-state-reasons values (%d > %d)." = "Too many printer-state-reasons values (%d > %d)."; "Transparency" = "Transparency"; - "Tray" = "Tray"; - "Tray 1" = "Tray 1"; - "Tray 2" = "Tray 2"; - "Tray 3" = "Tray 3"; - "Tray 4" = "Tray 4"; - "URI Too Long" = "URI Too Long"; - -"US Executive" = "US Executive"; - -"US Fanfold" = "US Fanfold"; - "US Ledger" = "US Ledger"; - "US Legal" = "US Legal"; - -"US Legal (Oversize)" = "US Legal (Oversize)"; - +"US Legal Oversize" = "US Legal Oversize"; "US Letter" = "US Letter"; - -"US Letter (Oversize)" = "US Letter (Oversize)"; - -"US Letter (Small)" = "US Letter (Small)"; - +"US Letter Oversize" = "US Letter Oversize"; +"US Letter Small" = "US Letter Small"; "USB Serial Port #%d" = "USB Serial Port #%d"; - "Unable to access cupsd.conf file:" = "Unable to access cupsd.conf file:"; - "Unable to add RSS subscription:" = "Unable to add RSS subscription:"; - "Unable to add class:" = "Unable to add class:"; - "Unable to add file to job: %s" = "Unable to add file to job: %s"; - -"Unable to add job for destination \"%s\"" = "Unable to add job for destination \"%s\""; - +"Unable to add job for destination \"%s\"." = "Unable to add job for destination \"%s\"."; "Unable to add printer:" = "Unable to add printer:"; - -"Unable to allocate memory for file types" = "Unable to allocate memory for file types"; - +"Unable to allocate memory for file types." = "Unable to allocate memory for file types."; "Unable to allocate memory for page info" = "Unable to allocate memory for page info"; - "Unable to allocate memory for pages array" = "Unable to allocate memory for pages array"; - "Unable to cancel RSS subscription:" = "Unable to cancel RSS subscription:"; - "Unable to cancel job: %s" = "Unable to cancel job: %s"; - "Unable to change printer-is-shared attribute:" = "Unable to change printer-is-shared attribute:"; - "Unable to change printer:" = "Unable to change printer:"; - "Unable to change server settings:" = "Unable to change server settings:"; - "Unable to connect to host." = "Unable to connect to host."; - "Unable to connect to server" = "Unable to connect to server"; - "Unable to contact printer, queuing on next printer in class." = "Unable to contact printer, queuing on next printer in class."; - -"Unable to copy 64-bit CUPS printer driver files (%d)" = "Unable to copy 64-bit CUPS printer driver files (%d)"; - -"Unable to copy 64-bit Windows printer driver files (%d)" = "Unable to copy 64-bit Windows printer driver files (%d)"; - -"Unable to copy CUPS printer driver files (%d)" = "Unable to copy CUPS printer driver files (%d)"; - -"Unable to copy PPD file" = "Unable to copy PPD file"; - +"Unable to copy 64-bit CUPS printer driver files (%d)." = "Unable to copy 64-bit CUPS printer driver files (%d)."; +"Unable to copy 64-bit Windows printer driver files (%d)." = "Unable to copy 64-bit Windows printer driver files (%d)."; +"Unable to copy CUPS printer driver files (%d)." = "Unable to copy CUPS printer driver files (%d)."; "Unable to copy PPD file - %s" = "Unable to copy PPD file - %s"; - -"Unable to copy Windows 2000 printer driver files (%d)" = "Unable to copy Windows 2000 printer driver files (%d)"; - -"Unable to copy Windows 9x printer driver files (%d)" = "Unable to copy Windows 9x printer driver files (%d)"; - +"Unable to copy PPD file." = "Unable to copy PPD file."; +"Unable to copy Windows 2000 printer driver files (%d)." = "Unable to copy Windows 2000 printer driver files (%d)."; +"Unable to copy Windows 9x printer driver files (%d)." = "Unable to copy Windows 9x printer driver files (%d)."; "Unable to copy interface script - %s" = "Unable to copy interface script - %s"; - "Unable to copy print file" = "Unable to copy print file"; - "Unable to create compressed print file" = "Unable to create compressed print file"; - "Unable to create pipes for filters" = "Unable to create pipes for filters"; - "Unable to create printer-uri" = "Unable to create printer-uri"; - "Unable to create temporary file" = "Unable to create temporary file"; - "Unable to create temporary file:" = "Unable to create temporary file:"; - "Unable to delete class:" = "Unable to delete class:"; - "Unable to delete printer:" = "Unable to delete printer:"; - "Unable to do maintenance command:" = "Unable to do maintenance command:"; - "Unable to edit cupsd.conf files larger than 1MB" = "Unable to edit cupsd.conf files larger than 1MB"; - "Unable to establish a secure connection to host (certificate chain invalid)." = "Unable to establish a secure connection to host (certificate chain invalid)."; - "Unable to establish a secure connection to host (certificate not yet valid)." = "Unable to establish a secure connection to host (certificate not yet valid)."; - "Unable to establish a secure connection to host (expired certificate)." = "Unable to establish a secure connection to host (expired certificate)."; - "Unable to establish a secure connection to host (host name mismatch)." = "Unable to establish a secure connection to host (host name mismatch)."; - "Unable to establish a secure connection to host (peer dropped connection before responding)." = "Unable to establish a secure connection to host (peer dropped connection before responding)."; - "Unable to establish a secure connection to host (self-signed certificate)." = "Unable to establish a secure connection to host (self-signed certificate)."; - "Unable to establish a secure connection to host (untrusted certificate)." = "Unable to establish a secure connection to host (untrusted certificate)."; - "Unable to establish a secure connection to host." = "Unable to establish a secure connection to host."; - "Unable to find destination for job" = "Unable to find destination for job"; - "Unable to find printer." = "Unable to find printer."; - "Unable to fork filter" = "Unable to fork filter"; - "Unable to generate compressed print file" = "Unable to generate compressed print file"; - "Unable to get class list:" = "Unable to get class list:"; - "Unable to get class status:" = "Unable to get class status:"; - "Unable to get job attributes: %s" = "Unable to get job attributes: %s"; - "Unable to get list of printer drivers:" = "Unable to get list of printer drivers:"; - "Unable to get printer attributes:" = "Unable to get printer attributes:"; - "Unable to get printer list:" = "Unable to get printer list:"; - "Unable to get printer status:" = "Unable to get printer status:"; - "Unable to get printer status: %s" = "Unable to get printer status: %s"; - -"Unable to install Windows 2000 printer driver files (%d)" = "Unable to install Windows 2000 printer driver files (%d)"; - -"Unable to install Windows 9x printer driver files (%d)" = "Unable to install Windows 9x printer driver files (%d)"; - +"Unable to install Windows 2000 printer driver files (%d)." = "Unable to install Windows 2000 printer driver files (%d)."; +"Unable to install Windows 9x printer driver files (%d)." = "Unable to install Windows 9x printer driver files (%d)."; "Unable to locate printer \"%s\"." = "Unable to locate printer \"%s\"."; - "Unable to locate printer." = "Unable to locate printer."; - "Unable to modify class:" = "Unable to modify class:"; - "Unable to modify printer:" = "Unable to modify printer:"; - "Unable to move job" = "Unable to move job"; - "Unable to move jobs" = "Unable to move jobs"; - "Unable to open PPD file" = "Unable to open PPD file"; - "Unable to open PPD file:" = "Unable to open PPD file:"; - "Unable to open charset file" = "Unable to open charset file"; - "Unable to open compressed print file" = "Unable to open compressed print file"; - "Unable to open cupsd.conf file:" = "Unable to open cupsd.conf file:"; - "Unable to open device file" = "Unable to open device file"; - -"Unable to open document %d in job %d" = "Unable to open document %d in job %d"; - +"Unable to open document #%d in job #%d." = "Unable to open document #%d in job #%d."; "Unable to open print file" = "Unable to open print file"; - "Unable to open psglyphs" = "Unable to open psglyphs"; - "Unable to open raster file" = "Unable to open raster file"; - "Unable to print %d text columns." = "Unable to print %d text columns."; - "Unable to print %dx%d text page." = "Unable to print %dx%d text page."; - "Unable to print test page:" = "Unable to print test page:"; - -"Unable to print: the printer does not conform to the IPP standard." = "Unable to print: the printer does not conform to the IPP standard."; - "Unable to read print data" = "Unable to read print data"; - "Unable to read print data." = "Unable to read print data."; - "Unable to run \"%s\": %s" = "Unable to run \"%s\": %s"; - "Unable to see in file" = "Unable to see in file"; - "Unable to send command to printer driver" = "Unable to send command to printer driver"; - "Unable to send data to printer." = "Unable to send data to printer."; - "Unable to send raster data to the driver." = "Unable to send raster data to the driver."; - -"Unable to set Windows printer driver (%d)" = "Unable to set Windows printer driver (%d)"; - +"Unable to set Windows printer driver (%d)." = "Unable to set Windows printer driver (%d)."; "Unable to set options:" = "Unable to set options:"; - "Unable to set server default:" = "Unable to set server default:"; - "Unable to upload cupsd.conf file:" = "Unable to upload cupsd.conf file:"; - "Unable to use legacy USB class driver." = "Unable to use legacy USB class driver."; - "Unable to write print data" = "Unable to write print data"; - "Unable to write uncompressed print data: %s" = "Unable to write uncompressed print data: %s"; - "Unauthorized" = "Unauthorized"; - "Units" = "Units"; - "Unknown" = "Unknown"; - "Unknown choice \"%s\" for option \"%s\"." = "Unknown choice \"%s\" for option \"%s\"."; - "Unknown encryption option value: \"%s\"." = "Unknown encryption option value: \"%s\"."; - "Unknown file order: \"%s\"." = "Unknown file order: \"%s\"."; - "Unknown format character: \"%c\"." = "Unknown format character: \"%c\"."; - "Unknown option \"%s\" with value \"%s\"." = "Unknown option \"%s\" with value \"%s\"."; - "Unknown option \"%s\"." = "Unknown option \"%s\"."; - "Unknown print mode: \"%s\"." = "Unknown print mode: \"%s\"."; - "Unknown printer-error-policy \"%s\"." = "Unknown printer-error-policy \"%s\"."; - "Unknown printer-op-policy \"%s\"." = "Unknown printer-op-policy \"%s\"."; - "Unknown version option value: \"%s\"." = "Unknown version option value: \"%s\"."; - "Unsupported baud rate: %s" = "Unsupported baud rate: %s"; - "Unsupported brightness value %s, using brightness=100." = "Unsupported brightness value %s, using brightness=100."; - -"Unsupported character set \"%s\"" = "Unsupported character set \"%s\""; - -"Unsupported compression \"%s\"" = "Unsupported compression \"%s\""; - -"Unsupported document-format \"%s\"" = "Unsupported document-format \"%s\""; - -"Unsupported format '%s'" = "Unsupported format '%s'"; - -"Unsupported format '%s/%s'" = "Unsupported format '%s/%s'"; - +"Unsupported character set \"%s\"." = "Unsupported character set \"%s\"."; +"Unsupported compression \"%s\"." = "Unsupported compression \"%s\"."; +"Unsupported document-format \"%s\"." = "Unsupported document-format \"%s\"."; +"Unsupported document-format \"%s/%s\"." = "Unsupported document-format \"%s/%s\"."; +"Unsupported format \"%s\"." = "Unsupported format \"%s\"."; "Unsupported gamma value %s, using gamma=1000." = "Unsupported gamma value %s, using gamma=1000."; - "Unsupported margins." = "Unsupported margins."; - "Unsupported media value." = "Unsupported media value."; - "Unsupported number-up value %d, using number-up=1." = "Unsupported number-up value %d, using number-up=1."; - "Unsupported number-up-layout value %s, using number-up-layout=lrtb." = "Unsupported number-up-layout value %s, using number-up-layout=lrtb."; - "Unsupported page-border value %s, using page-border=none." = "Unsupported page-border value %s, using page-border=none."; - "Unsupported value type" = "Unsupported value type"; - "Upgrade Required" = "Upgrade Required"; - "Usage:\n\n lpadmin [-h server] -d destination\n lpadmin [-h server] -x destination\n lpadmin [-h server] -p printer [-c add-class] [-i interface] [-m model]\n [-r remove-class] [-v device] [-D description]\n [-P ppd-file] [-o name=value]\n [-u allow:user,user] [-u deny:user,user]" = "Usage:\n\n lpadmin [-h server] -d destination\n lpadmin [-h server] -x destination\n lpadmin [-h server] -p printer [-c add-class] [-i interface] [-m model]\n [-r remove-class] [-v device] [-D description]\n [-P ppd-file] [-o name=value]\n [-u allow:user,user] [-u deny:user,user]"; - "Usage: %s job user title copies options [filename]" = "Usage: %s job user title copies options [filename]"; - "Usage: %s job-id user title copies options [file]" = "Usage: %s job-id user title copies options [file]"; - "Usage: %s job-id user title copies options file" = "Usage: %s job-id user title copies options file"; - "Usage: convert [ options ]" = "Usage: convert [ options ]"; - "Usage: cupsaddsmb [options] printer1 ... printerN" = "Usage: cupsaddsmb [options] printer1 ... printerN"; - "Usage: cupsctl [options] [param=value ... paramN=valueN]" = "Usage: cupsctl [options] [param=value ... paramN=valueN]"; - "Usage: cupsd [options]" = "Usage: cupsd [options]"; - -"Usage: cupsfilter -m mime/type [ options ] filename" = "Usage: cupsfilter -m mime/type [ 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: ipptool [options] URI filename [ ... filenameN ]" = "Usage: ipptool [options] URI filename [ ... filenameN ]"; - "Usage: lpmove job/src dest" = "Usage: lpmove job/src dest"; - "Usage: lpoptions [-h server] [-E] -d printer\n lpoptions [-h server] [-E] [-p printer] -l\n lpoptions [-h server] [-E] -p printer -o option[=value] ...\n lpoptions [-h server] [-E] -x printer" = "Usage: lpoptions [-h server] [-E] -d printer\n lpoptions [-h server] [-E] [-p printer] -l\n lpoptions [-h server] [-E] -p printer -o option[=value] ...\n lpoptions [-h server] [-E] -x printer"; - "Usage: lppasswd [-g groupname]" = "Usage: lppasswd [-g groupname]"; - "Usage: lppasswd [-g groupname] [username]\n lppasswd [-g groupname] -a [username]\n lppasswd [-g groupname] -x [username]" = "Usage: lppasswd [-g groupname] [username]\n lppasswd [-g groupname] -a [username]\n lppasswd [-g groupname] -x [username]"; - "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]" = "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]"; - "Usage: ppdc [options] filename.drv [ ... filenameN.drv ]" = "Usage: ppdc [options] filename.drv [ ... filenameN.drv ]"; - "Usage: ppdhtml [options] filename.drv >filename.html" = "Usage: ppdhtml [options] filename.drv >filename.html"; - "Usage: ppdi [options] filename.ppd [ ... filenameN.ppd ]" = "Usage: ppdi [options] filename.ppd [ ... filenameN.ppd ]"; - "Usage: ppdmerge [options] filename.ppd [ ... filenameN.ppd ]" = "Usage: ppdmerge [options] filename.ppd [ ... filenameN.ppd ]"; - "Usage: ppdpo [options] -o filename.po filename.drv [ ... filenameN.drv ]" = "Usage: ppdpo [options] -o filename.po filename.drv [ ... filenameN.drv ]"; - "Usage: snmp [host-or-ip-address]" = "Usage: snmp [host-or-ip-address]"; - "Value uses indefinite length" = "Value uses indefinite length"; - "VarBind uses indefinite length" = "VarBind uses indefinite length"; - "Version uses indefinite length" = "Version uses indefinite length"; - "Waiting for job to complete." = "Waiting for job to complete."; - "Waiting for printer to become available." = "Waiting for printer to become available."; - "Waiting for printer to finish." = "Waiting for printer to finish."; - -"Warning, no Windows 2000 printer drivers are installed" = "Warning, no Windows 2000 printer drivers are installed"; - +"Warning, no Windows 2000 printer drivers are installed." = "Warning, no Windows 2000 printer drivers are installed."; "Web Interface is Disabled" = "Web Interface is Disabled"; - "Yes" = "Yes"; - "You must access this page using the URL https://%s:%d%s." = "You must access this page using the URL https://%s:%d%s."; - -"You4 Envelope" = "You4 Envelope"; - "Your password must be at least 6 characters long, cannot contain your username, and must contain at least one letter and number." = "Your password must be at least 6 characters long, cannot contain your username, and must contain at least one letter and number."; - "ZPL Label Printer" = "ZPL Label Printer"; - "Zebra" = "Zebra"; - "aborted" = "aborted"; - "canceled" = "canceled"; - "completed" = "completed"; - "convert: Use the -f option to specify a file to convert." = "convert: Use the -f option to specify a file to convert."; - "cups-deviced failed to execute." = "cups-deviced failed to execute."; - "cups-driverd failed to execute." = "cups-driverd failed to execute."; - "cupsaddsmb: No PPD file for printer \"%s\" - %s" = "cupsaddsmb: No PPD file for printer \"%s\" - %s"; - "cupsctl: Cannot set Listen or Port directly." = "cupsctl: Cannot set Listen or Port directly."; - "cupsctl: Unable to connect to server: %s" = "cupsctl: Unable to connect to server: %s"; - "cupsctl: Unknown option \"%s\"" = "cupsctl: Unknown option \"%s\""; - "cupsctl: Unknown option \"-%c\"" = "cupsctl: Unknown option \"-%c\""; - "cupsd: Expected config filename after \"-c\" option." = "cupsd: Expected config filename after \"-c\" option."; - "cupsd: Unable to get current directory." = "cupsd: Unable to get current directory."; - "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."; - "cupsfilter: Unable to get job file - %s" = "cupsfilter: Unable to get job file - %s"; - "cupstestppd: The -q option is incompatible with the -v option." = "cupstestppd: The -q option is incompatible with the -v option."; - "cupstestppd: The -v option is incompatible with the -q option." = "cupstestppd: The -v option is incompatible with the -q option."; - "device for %s/%s: %s" = "device for %s/%s: %s"; - "device for %s: %s" = "device for %s: %s"; - "error-index uses indefinite length" = "error-index uses indefinite length"; - "error-status uses indefinite length" = "error-status uses indefinite length"; - "held" = "held"; - "help\t\tGet help on commands." = "help\t\tGet help on commands."; - "idle" = "idle"; - "ipptool: \"-i\" and \"-n\" are incompatible with -X\"." = "ipptool: \"-i\" and \"-n\" are incompatible with -X\"."; - "ipptool: \"-i\" is incompatible with \"-X\"." = "ipptool: \"-i\" is incompatible with \"-X\"."; - "ipptool: \"-n\" is incompatible with \"-X\"." = "ipptool: \"-n\" is incompatible with \"-X\"."; - "ipptool: Bad URI - %s." = "ipptool: Bad URI - %s."; - "ipptool: Bad version %s for \"-V\"." = "ipptool: Bad version %s for \"-V\"."; - "ipptool: Invalid seconds for \"-i\"." = "ipptool: Invalid seconds for \"-i\"."; - "ipptool: May only specify a single URI." = "ipptool: May only specify a single URI."; - "ipptool: Missing count for \"-n\"." = "ipptool: Missing count for \"-n\"."; - "ipptool: Missing filename for \"-f\"." = "ipptool: Missing filename for \"-f\"."; - "ipptool: Missing name=value for \"-d\"." = "ipptool: Missing name=value for \"-d\"."; - "ipptool: Missing seconds for \"-i\"." = "ipptool: Missing seconds for \"-i\"."; - "ipptool: Missing timeout for \"-T\"." = "ipptool: Missing timeout for \"-T\"."; - "ipptool: Missing version for \"-V\"." = "ipptool: Missing version for \"-V\"."; - "ipptool: URI required before test file." = "ipptool: URI required before test file."; - "ipptool: Unknown option \"-%c\"." = "ipptool: Unknown option \"-%c\"."; - -"job-id %d not found." = "job-id %d not found."; - -"job-printer-uri attribute missing" = "job-printer-uri attribute missing"; - +"job-printer-uri attribute missing." = "job-printer-uri attribute missing."; "lpadmin: Class name can only contain printable characters." = "lpadmin: Class name can only contain printable characters."; - "lpadmin: Expected PPD after \"-P\" option." = "lpadmin: Expected PPD after \"-P\" option."; - "lpadmin: Expected allow/deny:userlist after \"-u\" option." = "lpadmin: Expected allow/deny:userlist after \"-u\" option."; - "lpadmin: Expected class after \"-r\" option." = "lpadmin: Expected class after \"-r\" option."; - "lpadmin: Expected class name after \"-c\" option." = "lpadmin: Expected class name after \"-c\" option."; - "lpadmin: Expected description after \"-D\" option." = "lpadmin: Expected description after \"-D\" option."; - "lpadmin: Expected device URI after \"-v\" option." = "lpadmin: Expected device URI after \"-v\" option."; - "lpadmin: Expected file type(s) after \"-I\" option." = "lpadmin: Expected file type(s) after \"-I\" option."; - "lpadmin: Expected hostname after \"-h\" option." = "lpadmin: Expected hostname after \"-h\" option."; - "lpadmin: Expected interface after \"-i\" option." = "lpadmin: Expected interface after \"-i\" option."; - "lpadmin: Expected location after \"-L\" option." = "lpadmin: Expected location after \"-L\" option."; - "lpadmin: Expected model after \"-m\" option." = "lpadmin: Expected model after \"-m\" option."; - "lpadmin: Expected name=value after \"-o\" option." = "lpadmin: Expected name=value after \"-o\" option."; - "lpadmin: Expected printer after \"-p\" option." = "lpadmin: Expected printer after \"-p\" option."; - "lpadmin: Expected printer name after \"-d\" option." = "lpadmin: Expected printer name after \"-d\" option."; - "lpadmin: Expected printer or class after \"-x\" option." = "lpadmin: Expected printer or class after \"-x\" option."; - "lpadmin: No member names were seen." = "lpadmin: No member names were seen."; - "lpadmin: Printer %s is already a member of class %s." = "lpadmin: Printer %s is already a member of class %s."; - "lpadmin: Printer %s is not a member of class %s." = "lpadmin: Printer %s is not a member of class %s."; - "lpadmin: Printer name can only contain printable characters." = "lpadmin: Printer name can only contain printable characters."; - "lpadmin: Unable to add a printer to the class:\n You must specify a printer name first." = "lpadmin: Unable to add a printer to the class:\n You must specify a printer name first."; - "lpadmin: Unable to connect to server: %s" = "lpadmin: Unable to connect to server: %s"; - "lpadmin: Unable to create temporary file" = "lpadmin: Unable to create temporary file"; - "lpadmin: Unable to open PPD file \"%s\" - %s" = "lpadmin: Unable to open PPD file \"%s\" - %s"; - "lpadmin: Unable to remove a printer from the class:\n You must specify a printer name first." = "lpadmin: Unable to remove a printer from the class:\n You must specify a printer name first."; - "lpadmin: Unable to set the printer options:\n You must specify a printer name first." = "lpadmin: Unable to set the printer options:\n You must specify a printer name first."; - "lpadmin: Unknown allow/deny option \"%s\"." = "lpadmin: Unknown allow/deny option \"%s\"."; - "lpadmin: Unknown argument \"%s\"." = "lpadmin: Unknown argument \"%s\"."; - "lpadmin: Unknown option \"%c\"." = "lpadmin: Unknown option \"%c\"."; - "lpadmin: Warning - content type list ignored." = "lpadmin: Warning - content type list ignored."; - "lpc> " = "lpc> "; - "lpinfo: Expected 1284 device ID string after \"--device-id\"." = "lpinfo: Expected 1284 device ID string after \"--device-id\"."; - "lpinfo: Expected language after \"--language\"." = "lpinfo: Expected language after \"--language\"."; - "lpinfo: Expected make and model after \"--make-and-model\"." = "lpinfo: Expected make and model after \"--make-and-model\"."; - "lpinfo: Expected product string after \"--product\"." = "lpinfo: Expected product string after \"--product\"."; - "lpinfo: Expected scheme list after \"--exclude-schemes\"." = "lpinfo: Expected scheme list after \"--exclude-schemes\"."; - "lpinfo: Expected scheme list after \"--include-schemes\"." = "lpinfo: Expected scheme list after \"--include-schemes\"."; - "lpinfo: Expected timeout after \"--timeout\"." = "lpinfo: Expected timeout after \"--timeout\"."; - "lpinfo: Unknown argument \"%s\"." = "lpinfo: Unknown argument \"%s\"."; - "lpinfo: Unknown option \"%c\"." = "lpinfo: Unknown option \"%c\"."; - "lpinfo: Unknown option \"%s\"." = "lpinfo: Unknown option \"%s\"."; - "lpmove: Unable to connect to server: %s" = "lpmove: Unable to connect to server: %s"; - "lpmove: Unknown argument \"%s\"." = "lpmove: Unknown argument \"%s\"."; - "lpmove: Unknown option \"%c\"." = "lpmove: Unknown option \"%c\"."; - "lpoptions: No printers." = "lpoptions: No printers."; - "lpoptions: Unable to add printer or instance: %s" = "lpoptions: Unable to add printer or instance: %s"; - "lpoptions: Unable to get PPD file for %s: %s" = "lpoptions: Unable to get PPD file for %s: %s"; - "lpoptions: Unable to open PPD file for %s." = "lpoptions: Unable to open PPD file for %s."; - "lpoptions: Unknown printer or class." = "lpoptions: Unknown printer or class."; - "lppasswd: Only root can add or delete passwords." = "lppasswd: Only root can add or delete passwords."; - "lppasswd: Password file busy." = "lppasswd: Password file busy."; - "lppasswd: Password file not updated." = "lppasswd: Password file not updated."; - "lppasswd: Sorry, password doesn't match." = "lppasswd: Sorry, password doesn't match."; - "lppasswd: Sorry, password rejected." = "lppasswd: Sorry, password rejected."; - "lppasswd: Sorry, passwords don't match." = "lppasswd: Sorry, passwords don't match."; - "lppasswd: Unable to copy password string: %s" = "lppasswd: Unable to copy password string: %s"; - "lppasswd: Unable to open password file: %s" = "lppasswd: Unable to open password file: %s"; - "lppasswd: Unable to write to password file: %s" = "lppasswd: Unable to write to password file: %s"; - "lppasswd: failed to backup old password file: %s" = "lppasswd: failed to backup old password file: %s"; - "lppasswd: failed to rename password file: %s" = "lppasswd: failed to rename password file: %s"; - "lppasswd: user \"%s\" and group \"%s\" do not exist." = "lppasswd: user \"%s\" and group \"%s\" do not exist."; - "lpstat: error - %s environment variable names non-existent destination \"%s\"." = "lpstat: error - %s environment variable names non-existent destination \"%s\"."; - "members of class %s:" = "members of class %s:"; - "no entries" = "no entries"; - "no system default destination" = "no system default destination"; - -"notify-events not specified" = "notify-events not specified"; - -"notify-recipient-uri URI \"%s\" is already used" = "notify-recipient-uri URI \"%s\" is already used"; - -"notify-recipient-uri URI \"%s\" uses unknown scheme" = "notify-recipient-uri URI \"%s\" uses unknown scheme"; - -"notify-subscription-id %d no good" = "notify-subscription-id %d no good"; - +"notify-events not specified." = "notify-events not specified."; +"notify-recipient-uri URI \"%s\" is already used." = "notify-recipient-uri URI \"%s\" is already used."; +"notify-recipient-uri URI \"%s\" uses unknown scheme." = "notify-recipient-uri URI \"%s\" uses unknown scheme."; "pending" = "pending"; - "ppdc: Adding include directory \"%s\"." = "ppdc: Adding include directory \"%s\"."; - "ppdc: Adding/updating UI text from %s." = "ppdc: Adding/updating UI text from %s."; - "ppdc: Bad boolean value (%s) on line %d of %s." = "ppdc: Bad boolean value (%s) on line %d of %s."; - "ppdc: Bad font attribute: %s" = "ppdc: Bad font attribute: %s"; - "ppdc: Bad resolution name \"%s\" on line %d of %s." = "ppdc: Bad resolution name \"%s\" on line %d of %s."; - "ppdc: Bad status keyword %s on line %d of %s." = "ppdc: Bad status keyword %s on line %d of %s."; - "ppdc: Bad variable substitution ($%c) on line %d of %s." = "ppdc: Bad variable substitution ($%c) on line %d of %s."; - "ppdc: Choice found on line %d of %s with no Option." = "ppdc: Choice found on line %d of %s with no Option."; - "ppdc: Duplicate #po for locale %s on line %d of %s." = "ppdc: Duplicate #po for locale %s on line %d of %s."; - "ppdc: Expected a filter definition on line %d of %s." = "ppdc: Expected a filter definition on line %d of %s."; - "ppdc: Expected a program name on line %d of %s." = "ppdc: Expected a program name on line %d of %s."; - "ppdc: Expected boolean value on line %d of %s." = "ppdc: Expected boolean value on line %d of %s."; - "ppdc: Expected charset after Font on line %d of %s." = "ppdc: Expected charset after Font on line %d of %s."; - "ppdc: Expected choice code on line %d of %s." = "ppdc: Expected choice code on line %d of %s."; - "ppdc: Expected choice name/text on line %d of %s." = "ppdc: Expected choice name/text on line %d of %s."; - "ppdc: Expected color order for ColorModel on line %d of %s." = "ppdc: Expected color order for ColorModel on line %d of %s."; - "ppdc: Expected colorspace for ColorModel on line %d of %s." = "ppdc: Expected colorspace for ColorModel on line %d of %s."; - "ppdc: Expected compression for ColorModel on line %d of %s." = "ppdc: Expected compression for ColorModel on line %d of %s."; - "ppdc: Expected constraints string for UIConstraints on line %d of %s." = "ppdc: Expected constraints string for UIConstraints on line %d of %s."; - "ppdc: Expected driver type keyword following DriverType on line %d of %s." = "ppdc: Expected driver type keyword following DriverType on line %d of %s."; - "ppdc: Expected duplex type after Duplex on line %d of %s." = "ppdc: Expected duplex type after Duplex on line %d of %s."; - "ppdc: Expected encoding after Font on line %d of %s." = "ppdc: Expected encoding after Font on line %d of %s."; - "ppdc: Expected filename after #po %s on line %d of %s." = "ppdc: Expected filename after #po %s on line %d of %s."; - "ppdc: Expected group name/text on line %d of %s." = "ppdc: Expected group name/text on line %d of %s."; - "ppdc: Expected include filename on line %d of %s." = "ppdc: Expected include filename on line %d of %s."; - "ppdc: Expected integer on line %d of %s." = "ppdc: Expected integer on line %d of %s."; - "ppdc: Expected locale after #po on line %d of %s." = "ppdc: Expected locale after #po on line %d of %s."; - "ppdc: Expected name after %s on line %d of %s." = "ppdc: Expected name after %s on line %d of %s."; - "ppdc: Expected name after FileName on line %d of %s." = "ppdc: Expected name after FileName on line %d of %s."; - "ppdc: Expected name after Font on line %d of %s." = "ppdc: Expected name after Font on line %d of %s."; - "ppdc: Expected name after Manufacturer on line %d of %s." = "ppdc: Expected name after Manufacturer on line %d of %s."; - "ppdc: Expected name after MediaSize on line %d of %s." = "ppdc: Expected name after MediaSize on line %d of %s."; - "ppdc: Expected name after ModelName on line %d of %s." = "ppdc: Expected name after ModelName on line %d of %s."; - "ppdc: Expected name after PCFileName on line %d of %s." = "ppdc: Expected name after PCFileName on line %d of %s."; - "ppdc: Expected name/text after %s on line %d of %s." = "ppdc: Expected name/text after %s on line %d of %s."; - "ppdc: Expected name/text after Installable on line %d of %s." = "ppdc: Expected name/text after Installable on line %d of %s."; - "ppdc: Expected name/text after Resolution on line %d of %s." = "ppdc: Expected name/text after Resolution on line %d of %s."; - "ppdc: Expected name/text combination for ColorModel on line %d of %s." = "ppdc: Expected name/text combination for ColorModel on line %d of %s."; - "ppdc: Expected option name/text on line %d of %s." = "ppdc: Expected option name/text on line %d of %s."; - "ppdc: Expected option section on line %d of %s." = "ppdc: Expected option section on line %d of %s."; - "ppdc: Expected option type on line %d of %s." = "ppdc: Expected option type on line %d of %s."; - "ppdc: Expected override field after Resolution on line %d of %s." = "ppdc: Expected override field after Resolution on line %d of %s."; - "ppdc: Expected quoted string on line %d of %s." = "ppdc: Expected quoted string on line %d of %s."; - "ppdc: Expected real number on line %d of %s." = "ppdc: Expected real number on line %d of %s."; - "ppdc: Expected resolution/mediatype following ColorProfile on line %d of %s." = "ppdc: Expected resolution/mediatype following ColorProfile on line %d of %s."; - "ppdc: Expected resolution/mediatype following SimpleColorProfile on line %d of %s." = "ppdc: Expected resolution/mediatype following SimpleColorProfile on line %d of %s."; - "ppdc: Expected selector after %s on line %d of %s." = "ppdc: Expected selector after %s on line %d of %s."; - "ppdc: Expected status after Font on line %d of %s." = "ppdc: Expected status after Font on line %d of %s."; - "ppdc: Expected string after Copyright on line %d of %s." = "ppdc: Expected string after Copyright on line %d of %s."; - "ppdc: Expected string after Version on line %d of %s." = "ppdc: Expected string after Version on line %d of %s."; - "ppdc: Expected two option names on line %d of %s." = "ppdc: Expected two option names on line %d of %s."; - "ppdc: Expected value after %s on line %d of %s." = "ppdc: Expected value after %s on line %d of %s."; - "ppdc: Expected version after Font on line %d of %s." = "ppdc: Expected version after Font on line %d of %s."; - "ppdc: Invalid #include/#po filename \"%s\"." = "ppdc: Invalid #include/#po filename \"%s\"."; - "ppdc: Invalid cost for filter on line %d of %s." = "ppdc: Invalid cost for filter on line %d of %s."; - "ppdc: Invalid empty MIME type for filter on line %d of %s." = "ppdc: Invalid empty MIME type for filter on line %d of %s."; - "ppdc: Invalid empty program name for filter on line %d of %s." = "ppdc: Invalid empty program name for filter on line %d of %s."; - "ppdc: Invalid option section \"%s\" on line %d of %s." = "ppdc: Invalid option section \"%s\" on line %d of %s."; - "ppdc: Invalid option type \"%s\" on line %d of %s." = "ppdc: Invalid option type \"%s\" on line %d of %s."; - "ppdc: Loading driver information file \"%s\"." = "ppdc: Loading driver information file \"%s\"."; - "ppdc: Loading messages for locale \"%s\"." = "ppdc: Loading messages for locale \"%s\"."; - "ppdc: Loading messages from \"%s\"." = "ppdc: Loading messages from \"%s\"."; - "ppdc: Missing #endif at end of \"%s\"." = "ppdc: Missing #endif at end of \"%s\"."; - "ppdc: Missing #if on line %d of %s." = "ppdc: Missing #if on line %d of %s."; - "ppdc: Need a msgid line before any translation strings on line %d of %s." = "ppdc: Need a msgid line before any translation strings on line %d of %s."; - "ppdc: No message catalog provided for locale %s." = "ppdc: No message catalog provided for locale %s."; - "ppdc: Option %s defined in two different groups on line %d of %s." = "ppdc: Option %s defined in two different groups on line %d of %s."; - "ppdc: Option %s redefined with a different type on line %d of %s." = "ppdc: Option %s redefined with a different type on line %d of %s."; - "ppdc: Option constraint must *name on line %d of %s." = "ppdc: Option constraint must *name on line %d of %s."; - "ppdc: Too many nested #if's on line %d of %s." = "ppdc: Too many nested #if's on line %d of %s."; - "ppdc: Unable to create PPD file \"%s\" - %s." = "ppdc: Unable to create PPD file \"%s\" - %s."; - "ppdc: Unable to create output directory %s: %s" = "ppdc: Unable to create output directory %s: %s"; - "ppdc: Unable to create output pipes: %s" = "ppdc: Unable to create output pipes: %s"; - "ppdc: Unable to execute cupstestppd: %s" = "ppdc: Unable to execute cupstestppd: %s"; - "ppdc: Unable to find #po file %s on line %d of %s." = "ppdc: Unable to find #po file %s on line %d of %s."; - "ppdc: Unable to find include file \"%s\" on line %d of %s." = "ppdc: Unable to find include file \"%s\" on line %d of %s."; - "ppdc: Unable to find localization for \"%s\" - %s" = "ppdc: Unable to find localization for \"%s\" - %s"; - "ppdc: Unable to load localization file \"%s\" - %s" = "ppdc: Unable to load localization file \"%s\" - %s"; - "ppdc: Unable to open %s: %s" = "ppdc: Unable to open %s: %s"; - "ppdc: Undefined variable (%s) on line %d of %s." = "ppdc: Undefined variable (%s) on line %d of %s."; - "ppdc: Unexpected text on line %d of %s." = "ppdc: Unexpected text on line %d of %s."; - "ppdc: Unknown driver type %s on line %d of %s." = "ppdc: Unknown driver type %s on line %d of %s."; - "ppdc: Unknown duplex type \"%s\" on line %d of %s." = "ppdc: Unknown duplex type \"%s\" on line %d of %s."; - "ppdc: Unknown media size \"%s\" on line %d of %s." = "ppdc: Unknown media size \"%s\" on line %d of %s."; - "ppdc: Unknown message catalog format for \"%s\"." = "ppdc: Unknown message catalog format for \"%s\"."; - "ppdc: Unknown token \"%s\" seen on line %d of %s." = "ppdc: Unknown token \"%s\" seen on line %d of %s."; - "ppdc: Unknown trailing characters in real number \"%s\" on line %d of %s." = "ppdc: Unknown trailing characters in real number \"%s\" on line %d of %s."; - "ppdc: Unterminated string starting with %c on line %d of %s." = "ppdc: Unterminated string starting with %c on line %d of %s."; - "ppdc: Warning - overlapping filename \"%s\"." = "ppdc: Warning - overlapping filename \"%s\"."; - "ppdc: Writing %s." = "ppdc: Writing %s."; - "ppdc: Writing PPD files to directory \"%s\"." = "ppdc: Writing PPD files to directory \"%s\"."; - "ppdmerge: Bad LanguageVersion \"%s\" in %s." = "ppdmerge: Bad LanguageVersion \"%s\" in %s."; - "ppdmerge: Ignoring PPD file %s." = "ppdmerge: Ignoring PPD file %s."; - "ppdmerge: Unable to backup %s to %s - %s" = "ppdmerge: Unable to backup %s to %s - %s"; - "printer %s disabled since %s -" = "printer %s disabled since %s -"; - "printer %s is idle. enabled since %s" = "printer %s is idle. enabled since %s"; - "printer %s now printing %s-%d. enabled since %s" = "printer %s now printing %s-%d. enabled since %s"; - "printer %s/%s disabled since %s -" = "printer %s/%s disabled since %s -"; - "printer %s/%s is idle. enabled since %s" = "printer %s/%s is idle. enabled since %s"; - "printer %s/%s now printing %s-%d. enabled since %s" = "printer %s/%s now printing %s-%d. enabled since %s"; - "processing" = "processing"; - "request id is %s-%d (%d file(s))" = "request id is %s-%d (%d file(s))"; - "request-id uses indefinite length" = "request-id uses indefinite length"; - "scheduler is not running" = "scheduler is not running"; - "scheduler is running" = "scheduler is running"; - "stat of %s failed: %s" = "stat of %s failed: %s"; - "status\t\tShow status of daemon and queue." = "status\t\tShow status of daemon and queue."; - "stopped" = "stopped"; - "system default destination: %s" = "system default destination: %s"; - "system default destination: %s/%s" = "system default destination: %s/%s"; - "unknown" = "unknown"; - "untitled" = "untitled"; - "variable-bindings uses indefinite length" = "variable-bindings uses indefinite length"; - diff --git a/locale/cups_zh_TW.po b/locale/cups_zh_TW.po index cab1fbdf1..d4a9352cc 100644 --- a/locale/cups_zh_TW.po +++ b/locale/cups_zh_TW.po @@ -2115,7 +2115,7 @@ msgid "Banners" msgstr "標語" msgid "Billing Information: " -msgstr "文件封面INFO: " +msgstr "帳單資訊：" msgid "Bond Paper" msgstr "證券紙" diff --git a/locale/po2strings.c b/locale/po2strings.c index ce89266e0..97f9cc337 100644 --- a/locale/po2strings.c +++ b/locale/po2strings.c @@ -130,21 +130,36 @@ main(int argc, /* I - Number of command-line args */ while (cupsFileGets(po, s, sizeof(s)) != NULL) { - if ((s[0] == '#' && s[0] != '.') || !s[0]) + if (s[0] == '#' && s[1] == '.') { /* - * Skip blank and file comment lines... + * Copy comment string... */ - continue; + if (msgid && msgstr) + { + /* + * First output the last localization string... + */ + + if (*msgid) + cupsFilePrintf(strings, "\"%s\" = \"%s\";\n", msgid, + (use_msgid || !*msgstr) ? msgid : msgstr); + + free(msgid); + free(msgstr); + msgid = msgstr = NULL; + } + + cupsFilePrintf(strings, "//%s\n", s + 2); } - else if (s[0] == '#') + else if (s[0] == '#' || !s[0]) { /* - * Copy comment string... + * Skip blank and file comment lines... */ - cupsFilePrintf(strings, "//%s\n", s + 2); + continue; } else { @@ -179,7 +194,7 @@ main(int argc, /* I - Number of command-line args */ if (msgid && msgstr) { if (*msgid) - cupsFilePrintf(strings, "\"%s\" = \"%s\";\n\n", msgid, + cupsFilePrintf(strings, "\"%s\" = \"%s\";\n", msgid, (use_msgid || !*msgstr) ? msgid : msgstr); free(msgid); @@ -247,7 +262,7 @@ main(int argc, /* I - Number of command-line args */ if (msgid && msgstr) { if (*msgid) - cupsFilePrintf(strings, "\"%s\" = \"%s\";\n\n", msgid, + cupsFilePrintf(strings, "\"%s\" = \"%s\";\n", msgid, (use_msgid || !*msgstr) ? msgid : msgstr); free(msgid); diff --git a/ppdc/ppdc.cxx b/ppdc/ppdc.cxx index 9d4b11e21..52b88dfa8 100644 --- a/ppdc/ppdc.cxx +++ b/ppdc/ppdc.cxx @@ -3,7 +3,7 @@ // // PPD file compiler main entry for the CUPS PPD Compiler. // -// Copyright 2007-2010 by Apple Inc. +// Copyright 2007-2011 by Apple Inc. // Copyright 2002-2007 by Easy Software Products. // // These coded instructions, statements, and computer programs are the @@ -435,30 +435,30 @@ usage(void) _cupsLangPuts(stdout, _("Usage: ppdc [options] filename.drv [ ... " "filenameN.drv ]")); _cupsLangPuts(stdout, _("Options:")); - _cupsLangPuts(stdout, _(" -D name=value Set named variable to " + _cupsLangPuts(stdout, _(" -D name=value Set named variable to " "value.")); - _cupsLangPuts(stdout, _(" -I include-dir Add include directory to " + _cupsLangPuts(stdout, _(" -I include-dir Add include directory to " "search path.")); - _cupsLangPuts(stdout, _(" -c catalog.po Load the specified message " - "catalog.")); - _cupsLangPuts(stdout, _(" -d output-dir Specify the output " + _cupsLangPuts(stdout, _(" -c catalog.po Load the specified " + "message catalog.")); + _cupsLangPuts(stdout, _(" -d output-dir Specify the output " "directory.")); - _cupsLangPuts(stdout, _(" -l lang[,lang,...] Specify the output " + _cupsLangPuts(stdout, _(" -l lang[,lang,...] Specify the output " "language(s) (locale).")); - _cupsLangPuts(stdout, _(" -m Use the ModelName value as " - "the filename.")); - _cupsLangPuts(stdout, _(" -t Test PPDs instead of " + _cupsLangPuts(stdout, _(" -m Use the ModelName value " + "as the filename.")); + _cupsLangPuts(stdout, _(" -t Test PPDs instead of " "generating them.")); - _cupsLangPuts(stdout, _(" -v Be verbose (more v's for " + _cupsLangPuts(stdout, _(" -v Be verbose (more v's for " "more verbosity).")); - _cupsLangPuts(stdout, _(" -z Compress PPD files using GNU " - "zip.")); - _cupsLangPuts(stdout, _(" --cr End lines with CR (Mac OS " - "9).")); - _cupsLangPuts(stdout, _(" --crlf End lines with CR + LF " + _cupsLangPuts(stdout, _(" -z Compress PPD files using " + "GNU zip.")); + _cupsLangPuts(stdout, _(" --cr End lines with CR (Mac " + "OS 9).")); + _cupsLangPuts(stdout, _(" --crlf End lines with CR + LF " "(Windows).")); - _cupsLangPuts(stdout, _(" --lf End lines with LF (UNIX/" - "Linux/Mac OS X).")); + _cupsLangPuts(stdout, _(" --lf End lines with LF " + "(UNIX/Linux/Mac OS X).")); exit(1); } diff --git a/ppdc/ppdhtml.cxx b/ppdc/ppdhtml.cxx index 33ee5d927..d5678898d 100644 --- a/ppdc/ppdhtml.cxx +++ b/ppdc/ppdhtml.cxx @@ -3,7 +3,7 @@ // // PPD to HTML utility for the CUPS PPD Compiler. // -// Copyright 2007-2010 by Apple Inc. +// Copyright 2007-2011 by Apple Inc. // Copyright 2002-2005 by Easy Software Products. // // These coded instructions, statements, and computer programs are the @@ -172,10 +172,10 @@ usage(void) _cupsLangPuts(stdout, _("Usage: ppdhtml [options] filename.drv " ">filename.html")); _cupsLangPuts(stdout, _("Options:")); - _cupsLangPuts(stdout, _(" -D name=value Set named variable to " + _cupsLangPuts(stdout, _(" -D name=value Set named variable to " "value.")); - _cupsLangPuts(stdout, _(" -I include-dir Add include directory to search " - "path.")); + _cupsLangPuts(stdout, _(" -I include-dir Add include directory " + "to search path.")); exit(1); } diff --git a/ppdc/ppdi.cxx b/ppdc/ppdi.cxx index abc4173f3..a411bfef5 100644 --- a/ppdc/ppdi.cxx +++ b/ppdc/ppdi.cxx @@ -3,7 +3,7 @@ // // PPD file import utility for the CUPS PPD Compiler. // -// Copyright 2007-2010 by Apple Inc. +// Copyright 2007-2011 by Apple Inc. // Copyright 2002-2005 by Easy Software Products. // // These coded instructions, statements, and computer programs are the @@ -128,8 +128,10 @@ usage(void) _cupsLangPuts(stdout, _("Usage: ppdi [options] filename.ppd [ ... " "filenameN.ppd ]")); _cupsLangPuts(stdout, _("Options:")); - _cupsLangPuts(stdout, _(" -I include-dir")); - _cupsLangPuts(stdout, _(" -o filename.drv")); + _cupsLangPuts(stdout, _(" -I include-dir Add include directory to " + "search path.")); + _cupsLangPuts(stdout, _(" -o filename.drv Set driver information " + "file (otherwise ppdi.drv).")); exit(1); } diff --git a/ppdc/ppdmerge.cxx b/ppdc/ppdmerge.cxx index bd5be92ac..923355c09 100644 --- a/ppdc/ppdmerge.cxx +++ b/ppdc/ppdmerge.cxx @@ -3,7 +3,7 @@ // // PPD file merge utility for the CUPS PPD Compiler. // -// Copyright 2007-2010 by Apple Inc. +// Copyright 2007-2011 by Apple Inc. // Copyright 2002-2007 by Easy Software Products. // // These coded instructions, statements, and computer programs are the @@ -367,7 +367,8 @@ usage(void) _cupsLangPuts(stdout, _("Usage: ppdmerge [options] filename.ppd [ ... " "filenameN.ppd ]")); _cupsLangPuts(stdout, _("Options:")); - _cupsLangPuts(stdout, _(" -o filename.ppd[.gz]")); + _cupsLangPuts(stdout, _(" -o filename.ppd[.gz] Set output file " + "(otherwise stdout).")); exit(1); } diff --git a/ppdc/ppdpo.cxx b/ppdc/ppdpo.cxx index b413e5d6e..3ab2111e0 100644 --- a/ppdc/ppdpo.cxx +++ b/ppdc/ppdpo.cxx @@ -3,7 +3,7 @@ // // PPD file message catalog program for the CUPS PPD Compiler. // -// Copyright 2007-2010 by Apple Inc. +// Copyright 2007-2011 by Apple Inc. // Copyright 2002-2005 by Easy Software Products. // // These coded instructions, statements, and computer programs are the @@ -252,12 +252,12 @@ usage(void) _cupsLangPuts(stdout, _("Usage: ppdpo [options] -o filename.po filename.drv " "[ ... filenameN.drv ]")); _cupsLangPuts(stdout, _("Options:")); - _cupsLangPuts(stdout, _(" -D name=value Set named variable to " + _cupsLangPuts(stdout, _(" -D name=value Set named variable to " "value.")); - _cupsLangPuts(stdout, _(" -I include-dir Add include directory to search " - "path.")); - _cupsLangPuts(stdout, _(" -v Be verbose (more v's for more " - "verbosity).")); + _cupsLangPuts(stdout, _(" -I include-dir Add include directory to " + "search path.")); + _cupsLangPuts(stdout, _(" -v Be verbose (more v's for " + "more verbosity).")); exit(1); } diff --git a/scheduler/Makefile b/scheduler/Makefile index 75a849949..b297aec0a 100644 --- a/scheduler/Makefile +++ b/scheduler/Makefile @@ -229,7 +229,7 @@ install-exec: $(INSTALL_BIN) cups-polld $(SERVERBIN)/daemon if test "x$(SYMROOT)" != "x"; then \ $(INSTALL_DIR) $(SYMROOT); \ - for file in $(DAEMONS); do \ + for file in $(PROGRAMS); do \ cp $$file $(SYMROOT); \ done \ fi @@ -558,6 +558,15 @@ testsub: testsub.o ../cups/$(LIBCUPSSTATIC) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) $(LIBGSSAPI) +# +# Lines of code computation... +# + +sloc: + echo "cupsd: \c" + sloccount $(CUPSDOBJS:.o=.c) $(LIBOBJS:.o=.c) cups-driverd.cxx cups-polld.c cups-lpd.c 2>/dev/null | grep "Total Physical" | awk '{print $$9}' + + # # Dependencies... # diff --git a/scheduler/conf.c b/scheduler/conf.c index 193c03f8f..8c0bd310b 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -84,6 +84,9 @@ static const cupsd_var_t variables[] = { { "AccessLog", &AccessLog, CUPSD_VARTYPE_STRING }, { "AutoPurgeJobs", &JobAutoPurge, CUPSD_VARTYPE_BOOLEAN }, +#ifdef HAVE_DNSSD + { "BrowseDNSSDRegType", &DNSSDRegType, CUPSD_VARTYPE_STRING }, +#endif /* HAVE_DNSSD */ { "BrowseInterval", &BrowseInterval, CUPSD_VARTYPE_INTEGER }, #ifdef HAVE_LDAP { "BrowseLDAPBindDN", &BrowseLDAPBindDN, CUPSD_VARTYPE_STRING }, @@ -643,6 +646,10 @@ cupsdReadConfiguration(void) Browsing = CUPS_DEFAULT_BROWSING; DefaultShared = CUPS_DEFAULT_DEFAULT_SHARED; +#ifdef HAVE_DNSSD + cupsdSetString(&DNSSDRegType, "_ipp._tcp,_cups"); +#endif /* HAVE_DNSSD */ + cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE); cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE); diff --git a/scheduler/cupsfilter.c b/scheduler/cupsfilter.c index 63b0c359e..94fc713fc 100644 --- a/scheduler/cupsfilter.c +++ b/scheduler/cupsfilter.c @@ -3,7 +3,7 @@ * * Filtering program for CUPS. * - * Copyright 2007-2010 by Apple Inc. + * Copyright 2007-2011 by Apple Inc. * Copyright 1997-2006 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -1352,44 +1352,56 @@ usage(const char *command, /* I - Command name */ if (!strcmp(command, "cupsfilter")) { - _cupsLangPuts(stdout, _("Usage: cupsfilter -m mime/type [ options ] " - "filename")); + _cupsLangPuts(stdout, _("Usage: cupsfilter [ options ] filename")); _cupsLangPuts(stdout, _("Options:")); - _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, _(" -j job-id[,N] Filter file N from the " + _cupsLangPuts(stdout, _(" -D Remove the input file " + "when finished.")); + _cupsLangPuts(stdout, _(" -P filename.ppd Set PPD file.")); + _cupsLangPuts(stdout, _(" -U username Set username for job.")); + _cupsLangPuts(stdout, _(" -c cupsd.conf Set cupsd.conf file to " + "use.")); + _cupsLangPuts(stdout, _(" -d printer Use the named " + "printer.")); + _cupsLangPuts(stdout, _(" -e Use every filter from " + "the PPD file.")); + _cupsLangPuts(stdout, _(" -i mime/type Set input MIME type " + "(otherwise auto-typed).")); + _cupsLangPuts(stdout, _(" -j job-id[,N] Filter file N from the " "specified job (default is file 1).")); - _cupsLangPuts(stdout, _(" -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, _(" -m mime/type Set output MIME type " + "(otherwise application/pdf).")); + _cupsLangPuts(stdout, _(" -n copies Set number of copies.")); + _cupsLangPuts(stdout, _(" -o name=value Set option(s).")); + _cupsLangPuts(stdout, _(" -p filename.ppd Set PPD file.")); + _cupsLangPuts(stdout, _(" -t title Set title.")); + _cupsLangPuts(stdout, _(" -u Remove the PPD file " + "when finished.")); } else { _cupsLangPuts(stdout, _("Usage: convert [ options ]")); _cupsLangPuts(stdout, _("Options:")); - _cupsLangPuts(stdout, _(" -d printer Use the named printer.")); - _cupsLangPuts(stdout, _(" -e Use every filter from the " - "PPD file.")); - _cupsLangPuts(stdout, _(" -f filename Set file to be converted " - "(otherwise stdin).")); - _cupsLangPuts(stdout, _(" -o filename Set file to be generated " - "(otherwise stdout).")); - _cupsLangPuts(stdout, _(" -i mime/type Set input MIME type " + _cupsLangPuts(stdout, _(" -D Remove the input file " + "when finished.")); + _cupsLangPuts(stdout, _(" -J title Set title.")); + _cupsLangPuts(stdout, _(" -P filename.ppd Set PPD file.")); + _cupsLangPuts(stdout, _(" -U username Set username for job.")); + _cupsLangPuts(stdout, _(" -a 'name=value ...' Set option(s).")); + _cupsLangPuts(stdout, _(" -c copies Set number of copies.")); + _cupsLangPuts(stdout, _(" -d printer Use the named " + "printer.")); + _cupsLangPuts(stdout, _(" -e Use every filter from " + "the PPD file.")); + _cupsLangPuts(stdout, _(" -f filename Set file to be " + "converted (otherwise stdin).")); + _cupsLangPuts(stdout, _(" -i mime/type Set input MIME type " "(otherwise auto-typed).")); - _cupsLangPuts(stdout, _(" -j mime/type Set output MIME type " + _cupsLangPuts(stdout, _(" -j mime/type Set output MIME type " "(otherwise application/pdf).")); - _cupsLangPuts(stdout, _(" -P filename.ppd Set PPD file.")); - _cupsLangPuts(stdout, _(" -a 'name=value ...' Set option(s).")); - _cupsLangPuts(stdout, _(" -U username Set username for job.")); - _cupsLangPuts(stdout, _(" -J title Set title.")); - _cupsLangPuts(stdout, _(" -c copies Set number of copies.")); - _cupsLangPuts(stdout, _(" -u Remove the PPD file when " - "finished.")); - _cupsLangPuts(stdout, _(" -D Remove the input file when " - "finished.")); + _cupsLangPuts(stdout, _(" -o filename Set file to be " + "generated (otherwise stdout).")); + _cupsLangPuts(stdout, _(" -u Remove the PPD file " + "when finished.")); } exit(1); diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c index 4ce083786..ad05fe4c3 100644 --- a/scheduler/dirsvc.c +++ b/scheduler/dirsvc.c @@ -2361,7 +2361,7 @@ dnssdBuildTxtRecord( int i; /* Looping var */ char admin_hostname[256], /* .local hostname for admin page */ adminurl_str[256], /* URL for the admin page */ - type_str[32], /* Type to string buffer */ + type_str[32], /* Type to string buffer */ state_str[32], /* State to string buffer */ rp_str[1024], /* Queue name string buffer */ air_str[1024], /* auth-info-required string buffer */ @@ -2759,11 +2759,10 @@ dnssdRegisterPrinter(cupsd_printer_t *p)/* I - Printer */ if (!p->ipp_ref) { /* - * Initial registration. Use the _fax subtype for fax queues... + * Initial registration. Use the _fax-ipp regtype for fax queues... */ - regtype = (p->type & CUPS_PRINTER_FAX) ? "_fax-ipp._tcp" : - "_ipp._tcp,_cups"; + regtype = (p->type & CUPS_PRINTER_FAX) ? "_fax-ipp._tcp" : DNSSDRegType; cupsdLogMessage(CUPSD_LOG_DEBUG, "Registering DNS-SD printer %s with name \"%s\" and " diff --git a/scheduler/dirsvc.h b/scheduler/dirsvc.h index cc4eb2047..933a057ba 100644 --- a/scheduler/dirsvc.h +++ b/scheduler/dirsvc.h @@ -134,8 +134,10 @@ VAR cupsd_statbuf_t *PollStatusBuffer VALUE(NULL); #ifdef HAVE_DNSSD VAR char *DNSSDComputerName VALUE(NULL), /* Computer/server name */ - *DNSSDHostName VALUE(NULL); + *DNSSDHostName VALUE(NULL), /* Hostname */ + *DNSSDRegType VALUE(NULL); + /* Bonjour registration type */ VAR cups_array_t *DNSSDAlias VALUE(NULL); /* List of dynamic ServerAlias's */ VAR int DNSSDPort VALUE(0); diff --git a/scheduler/ipp.c b/scheduler/ipp.c index 68dc680b0..ef466a1c8 100644 --- a/scheduler/ipp.c +++ b/scheduler/ipp.c @@ -306,7 +306,7 @@ cupsdProcessIPPRequest( con->request->request.any.version[1]); send_ipp_status(con, IPP_VERSION_NOT_SUPPORTED, - _("Bad request version number %d.%d"), + _("Bad request version number %d.%d."), con->request->request.any.version[0], con->request->request.any.version[1]); } @@ -321,7 +321,7 @@ cupsdProcessIPPRequest( IPP_BAD_REQUEST, con->http.hostname, con->request->request.any.request_id); - send_ipp_status(con, IPP_BAD_REQUEST, _("Bad request ID %d"), + send_ipp_status(con, IPP_BAD_REQUEST, _("Bad request ID %d."), con->request->request.any.request_id); } else if (!con->request->attrs) @@ -330,7 +330,7 @@ cupsdProcessIPPRequest( "%04X %s No attributes in request", IPP_BAD_REQUEST, con->http.hostname); - send_ipp_status(con, IPP_BAD_REQUEST, _("No attributes in request")); + send_ipp_status(con, IPP_BAD_REQUEST, _("No attributes in request.")); } else { @@ -353,7 +353,7 @@ cupsdProcessIPPRequest( IPP_BAD_REQUEST, con->http.hostname); send_ipp_status(con, IPP_BAD_REQUEST, - _("Attribute groups are out of order (%x < %x)"), + _("Attribute groups are out of order (%x < %x)."), attr->group_tag, group); break; } @@ -430,7 +430,7 @@ cupsdProcessIPPRequest( IPP_CHARSET, con->http.hostname, charset->values[0].string.text); send_ipp_status(con, IPP_BAD_REQUEST, - _("Unsupported character set \"%s\""), + _("Unsupported character set \"%s\"."), charset->values[0].string.text); } else if (!charset || !language || @@ -489,7 +489,7 @@ cupsdProcessIPPRequest( cupsdLogMessage(CUPSD_LOG_DEBUG, "End of attributes..."); send_ipp_status(con, IPP_BAD_REQUEST, - _("Missing required attributes")); + _("Missing required attributes.")); } else { @@ -719,7 +719,7 @@ cupsdProcessIPPRequest( ippOpString(con->request->request.op.operation_id)); send_ipp_status(con, IPP_OPERATION_NOT_SUPPORTED, - _("%s not supported"), + _("%s not supported."), ippOpString( con->request->request.op.operation_id)); break; @@ -905,7 +905,7 @@ accept_jobs(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_FOUND, - _("The printer or class was not found.")); + _("The printer or class does not exist.")); return; } @@ -1035,7 +1035,7 @@ add_class(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_POSSIBLE, - _("A printer named \"%s\" already exists"), + _("A printer named \"%s\" already exists."), resource + 9); return; } @@ -1160,7 +1160,7 @@ add_class(cupsd_client_t *con, /* I - Client connection */ attr->values[0].integer != IPP_PRINTER_STOPPED) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Attempt to set %s printer-state to bad value %d"), + _("Attempt to set %s printer-state to bad value %d."), pclass->name, attr->values[0].integer); return; } @@ -1217,13 +1217,13 @@ add_class(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_FOUND, - _("The printer or class was not found.")); + _("The printer or class does not exist.")); return; } else if (dtype & CUPS_PRINTER_CLASS) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Nested classes are not allowed")); + _("Nested classes are not allowed.")); return; } @@ -1327,7 +1327,7 @@ add_file(cupsd_client_t *con, /* I - Connection to client */ if (con) send_ipp_status(con, IPP_INTERNAL_ERROR, - _("Unable to allocate memory for file types")); + _("Unable to allocate memory for file types.")); return (-1); } @@ -1385,7 +1385,7 @@ add_job(cupsd_client_t *con, /* I - Client connection */ strcasecmp(con->http.hostname, ServerName)) { send_ipp_status(con, IPP_NOT_AUTHORIZED, - _("The printer or class is not shared")); + _("The printer or class is not shared.")); return (NULL); } @@ -1448,7 +1448,7 @@ add_job(cupsd_client_t *con, /* I - Client connection */ filetype->type); send_ipp_status(con, IPP_DOCUMENT_FORMAT, - _("Unsupported format \'%s\'"), mimetype); + _("Unsupported format \"%s\"."), mimetype); ippAddString(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_MIMETYPE, "document-format", NULL, mimetype); @@ -1475,14 +1475,14 @@ add_job(cupsd_client_t *con, /* I - Client connection */ if (attr->value_tag != IPP_TAG_KEYWORD && attr->value_tag != IPP_TAG_NAME) { - send_ipp_status(con, IPP_BAD_REQUEST, _("Bad job-sheets value type")); + send_ipp_status(con, IPP_BAD_REQUEST, _("Bad job-sheets value type.")); return (NULL); } if (attr->num_values > 2) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Too many job-sheets values (%d > 2)"), + _("Too many job-sheets values (%d > 2)."), attr->num_values); return (NULL); } @@ -1491,7 +1491,7 @@ add_job(cupsd_client_t *con, /* I - Client connection */ if (strcmp(attr->values[i].string.text, "none") && !cupsdFindBanner(attr->values[i].string.text)) { - send_ipp_status(con, IPP_BAD_REQUEST, _("Bad job-sheets value \"%s\""), + send_ipp_status(con, IPP_BAD_REQUEST, _("Bad job-sheets value \"%s\"."), attr->values[i].string.text); return (NULL); } @@ -1588,8 +1588,7 @@ add_job(cupsd_client_t *con, /* I - Client connection */ if (MaxJobs && cupsArrayCount(Jobs) >= MaxJobs) { - send_ipp_status(con, IPP_NOT_POSSIBLE, - _("Too many active jobs.")); + send_ipp_status(con, IPP_NOT_POSSIBLE, _("Too many active jobs.")); return (NULL); } @@ -1630,7 +1629,7 @@ add_job(cupsd_client_t *con, /* I - Client connection */ if ((job = cupsdAddJob(priority, printer->name)) == NULL) { send_ipp_status(con, IPP_INTERNAL_ERROR, - _("Unable to add job for destination \"%s\""), + _("Unable to add job for destination \"%s\"."), printer->name); return (NULL); } @@ -2160,7 +2159,7 @@ add_job_subscriptions( resource, sizeof(resource)) < HTTP_URI_OK) { send_ipp_status(con, IPP_NOT_POSSIBLE, - _("Bad notify-recipient-uri URI \"%s\""), recipient); + _("Bad notify-recipient-uri \"%s\"."), recipient); ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_ENUM, "notify-status-code", IPP_URI_SCHEME); return; @@ -2172,7 +2171,7 @@ add_job_subscriptions( { send_ipp_status(con, IPP_NOT_POSSIBLE, _("notify-recipient-uri URI \"%s\" uses unknown " - "scheme"), recipient); + "scheme."), recipient); ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_ENUM, "notify-status-code", IPP_URI_SCHEME); return; @@ -2181,7 +2180,7 @@ add_job_subscriptions( if (!strcmp(scheme, "rss") && !check_rss_recipient(recipient)) { send_ipp_status(con, IPP_NOT_POSSIBLE, - _("notify-recipient-uri URI \"%s\" is already used"), + _("notify-recipient-uri URI \"%s\" is already used."), recipient); ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_ENUM, "notify-status-code", IPP_ATTRIBUTES); @@ -2196,7 +2195,7 @@ add_job_subscriptions( if (strcmp(pullmethod, "ippget")) { send_ipp_status(con, IPP_NOT_POSSIBLE, - _("Bad notify-pull-method \"%s\""), pullmethod); + _("Bad notify-pull-method \"%s\"."), pullmethod); ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_ENUM, "notify-status-code", IPP_ATTRIBUTES); return; @@ -2208,7 +2207,7 @@ add_job_subscriptions( strcmp(attr->values[0].string.text, "utf-8")) { send_ipp_status(con, IPP_CHARSET, - _("Character set \"%s\" not supported"), + _("Character set \"%s\" not supported."), attr->values[0].string.text); return; } @@ -2217,7 +2216,7 @@ add_job_subscriptions( strcmp(attr->values[0].string.text, DefaultLanguage))) { send_ipp_status(con, IPP_CHARSET, - _("Language \"%s\" not supported"), + _("Language \"%s\" not supported."), attr->values[0].string.text); return; } @@ -2228,7 +2227,7 @@ add_job_subscriptions( { send_ipp_status(con, IPP_REQUEST_VALUE, _("The notify-user-data value is too large " - "(%d > 63 octets)"), + "(%d > 63 octets)."), attr->values[0].unknown.length); return; } @@ -2432,7 +2431,7 @@ add_printer(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_POSSIBLE, - _("A class named \"%s\" already exists"), + _("A class named \"%s\" already exists."), resource + 10); return; } @@ -2551,7 +2550,7 @@ add_printer(cupsd_client_t *con, /* I - Client connection */ if (uri_status < HTTP_URI_OK) { - send_ipp_status(con, IPP_NOT_POSSIBLE, _("Bad device-uri \"%s\""), + send_ipp_status(con, IPP_NOT_POSSIBLE, _("Bad device-uri \"%s\"."), attr->values[0].string.text); cupsdLogMessage(CUPSD_LOG_DEBUG, "add_printer: httpSeparateURI returned %d", uri_status); @@ -2571,7 +2570,7 @@ add_printer(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_POSSIBLE, - _("File device URIs have been disabled! " + _("File device URIs have been disabled. " "To enable, see the FileDevice directive in " "\"%s/cupsd.conf\"."), ServerRoot); @@ -2591,8 +2590,8 @@ add_printer(cupsd_client_t *con, /* I - Client connection */ * Could not find device in list! */ - send_ipp_status(con, IPP_NOT_POSSIBLE, _("Bad device-uri scheme \"%s\""), - scheme); + send_ipp_status(con, IPP_NOT_POSSIBLE, + _("Bad device-uri scheme \"%s\"."), scheme); return; } } @@ -2635,7 +2634,7 @@ add_printer(cupsd_client_t *con, /* I - Client connection */ if (!supported || i >= supported->num_values) { - send_ipp_status(con, IPP_NOT_POSSIBLE, _("Bad port-monitor \"%s\""), + send_ipp_status(con, IPP_NOT_POSSIBLE, _("Bad port-monitor \"%s\"."), attr->values[0].string.text); return; } @@ -2687,7 +2686,7 @@ add_printer(cupsd_client_t *con, /* I - Client connection */ if (attr->values[0].integer != IPP_PRINTER_IDLE && attr->values[0].integer != IPP_PRINTER_STOPPED) { - send_ipp_status(con, IPP_BAD_REQUEST, _("Bad printer-state value %d"), + send_ipp_status(con, IPP_BAD_REQUEST, _("Bad printer-state value %d."), attr->values[0].integer); return; } @@ -2721,7 +2720,7 @@ add_printer(cupsd_client_t *con, /* I - Client connection */ (int)(sizeof(printer->reasons) / sizeof(printer->reasons[0]))) { send_ipp_status(con, IPP_NOT_POSSIBLE, - _("Too many printer-state-reasons values (%d > %d)"), + _("Too many printer-state-reasons values (%d > %d)."), attr->num_values, (int)(sizeof(printer->reasons) / sizeof(printer->reasons[0]))); @@ -2896,7 +2895,7 @@ add_printer(cupsd_client_t *con, /* I - Client connection */ if (copy_model(con, attr->values[0].string.text, dstfile)) { - send_ipp_status(con, IPP_INTERNAL_ERROR, _("Unable to copy PPD file")); + send_ipp_status(con, IPP_INTERNAL_ERROR, _("Unable to copy PPD file.")); return; } @@ -4040,7 +4039,7 @@ authenticate_job(cupsd_client_t *con, /* I - Client connection */ IPP_TAG_INTEGER)) == NULL) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Got a printer-uri attribute but no job-id")); + _("Got a printer-uri attribute but no job-id.")); return; } @@ -4062,7 +4061,7 @@ authenticate_job(cupsd_client_t *con, /* I - Client connection */ * Not a valid URI! */ - send_ipp_status(con, IPP_BAD_REQUEST, _("Bad job-uri attribute \"%s\""), + send_ipp_status(con, IPP_BAD_REQUEST, _("Bad job-uri \"%s\"."), uri->values[0].string.text); return; } @@ -4080,8 +4079,7 @@ authenticate_job(cupsd_client_t *con, /* I - Client connection */ * Nope - return a "not found" error... */ - send_ipp_status(con, IPP_NOT_FOUND, - _("Job #%d does not exist"), jobid); + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist."), jobid); return; } @@ -4096,7 +4094,7 @@ authenticate_job(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_POSSIBLE, - _("Job #%d is not held for authentication"), + _("Job #%d is not held for authentication."), jobid); return; } @@ -4124,7 +4122,7 @@ authenticate_job(cupsd_client_t *con, /* I - Client connection */ send_http_error(con, HTTP_UNAUTHORIZED, printer); else send_ipp_status(con, IPP_NOT_AUTHORIZED, - _("No authentication information provided")); + _("No authentication information provided.")); return; } @@ -4223,7 +4221,7 @@ cancel_all_jobs(cupsd_client_t *con, /* I - Client connection */ else { send_ipp_status(con, IPP_BAD_REQUEST, - _("Missing requesting-user-name attribute")); + _("Missing requesting-user-name attribute.")); return; } } @@ -4248,7 +4246,7 @@ cancel_all_jobs(cupsd_client_t *con, /* I - Client connection */ else { send_ipp_status(con, IPP_BAD_REQUEST, - _("Missing requesting-user-name attribute")); + _("Missing requesting-user-name attribute.")); return; } @@ -4265,7 +4263,7 @@ cancel_all_jobs(cupsd_client_t *con, /* I - Client connection */ if (strcmp(uri->name, "printer-uri")) { send_ipp_status(con, IPP_BAD_REQUEST, - _("The printer-uri attribute is required")); + _("The printer-uri attribute is required.")); return; } @@ -4288,7 +4286,7 @@ cancel_all_jobs(cupsd_client_t *con, /* I - Client connection */ (!strncmp(resource, "/classes/", 9) && resource[9])) { send_ipp_status(con, IPP_NOT_FOUND, - _("The printer or class was not found.")); + _("The printer or class does not exist.")); return; } @@ -4312,7 +4310,7 @@ cancel_all_jobs(cupsd_client_t *con, /* I - Client connection */ if (i < job_ids->num_values) { - send_ipp_status(con, IPP_NOT_FOUND, _("job-id %d not found."), + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist."), job_ids->values[i].integer); return; } @@ -4367,7 +4365,7 @@ cancel_all_jobs(cupsd_client_t *con, /* I - Client connection */ if (i < job_ids->num_values) { - send_ipp_status(con, IPP_NOT_FOUND, _("job-id %d not found."), + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist."), job_ids->values[i].integer); return; } @@ -4442,7 +4440,7 @@ cancel_job(cupsd_client_t *con, /* I - Client connection */ IPP_TAG_INTEGER)) == NULL) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Got a printer-uri attribute but no job-id")); + _("Got a printer-uri attribute but no job-id.")); return; } @@ -4459,7 +4457,7 @@ cancel_job(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_FOUND, - _("The printer or class was not found.")); + _("The printer or class does not exist.")); return; } @@ -4493,7 +4491,7 @@ cancel_job(cupsd_client_t *con, /* I - Client connection */ jobid = job->id; else { - send_ipp_status(con, IPP_NOT_POSSIBLE, _("No active jobs on %s"), + send_ipp_status(con, IPP_NOT_POSSIBLE, _("No active jobs on %s."), printer->name); return; } @@ -4516,8 +4514,7 @@ cancel_job(cupsd_client_t *con, /* I - Client connection */ * Not a valid URI! */ - send_ipp_status(con, IPP_BAD_REQUEST, - _("Bad job-uri attribute \"%s\""), + send_ipp_status(con, IPP_BAD_REQUEST, _("Bad job-uri \"%s\"."), uri->values[0].string.text); return; } @@ -4545,7 +4542,7 @@ cancel_job(cupsd_client_t *con, /* I - Client connection */ * Nope - return a "not found" error... */ - send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist"), jobid); + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist."), jobid); return; } @@ -4640,7 +4637,7 @@ cancel_subscription( */ send_ipp_status(con, IPP_NOT_FOUND, - _("notify-subscription-id %d no good"), sub_id); + _("Subscription #%d does not exist."), sub_id); return; } @@ -4978,7 +4975,7 @@ close_job(cupsd_client_t *con, /* I - Client connection */ IPP_TAG_INTEGER)) == NULL) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Got a printer-uri attribute but no job-id")); + _("Got a printer-uri attribute but no job-id.")); return; } @@ -4988,7 +4985,7 @@ close_job(cupsd_client_t *con, /* I - Client connection */ * Nope - return a "not found" error... */ - send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist"), + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist."), attr->values[0].integer); return; } @@ -6353,7 +6350,7 @@ create_job(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_FOUND, - _("The printer or class was not found.")); + _("The printer or class does not exist.")); return; } @@ -6656,7 +6653,7 @@ create_subscription( */ send_ipp_status(con, IPP_NOT_FOUND, - _("The printer or class was not found.")); + _("The printer or class does not exist.")); return; } @@ -6697,7 +6694,7 @@ create_subscription( if (!attr) { send_ipp_status(con, IPP_BAD_REQUEST, - _("No subscription attributes in request")); + _("No subscription attributes in request.")); return; } @@ -6755,7 +6752,7 @@ create_subscription( resource, sizeof(resource)) < HTTP_URI_OK) { send_ipp_status(con, IPP_NOT_POSSIBLE, - _("Bad notify-recipient-uri URI \"%s\""), recipient); + _("Bad notify-recipient-uri \"%s\"."), recipient); ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_ENUM, "notify-status-code", IPP_URI_SCHEME); return; @@ -6767,7 +6764,7 @@ create_subscription( { send_ipp_status(con, IPP_NOT_POSSIBLE, _("notify-recipient-uri URI \"%s\" uses unknown " - "scheme"), recipient); + "scheme."), recipient); ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_ENUM, "notify-status-code", IPP_URI_SCHEME); return; @@ -6776,7 +6773,7 @@ create_subscription( if (!strcmp(scheme, "rss") && !check_rss_recipient(recipient)) { send_ipp_status(con, IPP_NOT_POSSIBLE, - _("notify-recipient-uri URI \"%s\" is already used"), + _("notify-recipient-uri URI \"%s\" is already used."), recipient); ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_ENUM, "notify-status-code", IPP_ATTRIBUTES); @@ -6791,7 +6788,7 @@ create_subscription( if (strcmp(pullmethod, "ippget")) { send_ipp_status(con, IPP_NOT_POSSIBLE, - _("Bad notify-pull-method \"%s\""), pullmethod); + _("Bad notify-pull-method \"%s\"."), pullmethod); ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_ENUM, "notify-status-code", IPP_ATTRIBUTES); return; @@ -6803,7 +6800,7 @@ create_subscription( strcmp(attr->values[0].string.text, "utf-8")) { send_ipp_status(con, IPP_CHARSET, - _("Character set \"%s\" not supported"), + _("Character set \"%s\" not supported."), attr->values[0].string.text); return; } @@ -6812,7 +6809,7 @@ create_subscription( strcmp(attr->values[0].string.text, DefaultLanguage))) { send_ipp_status(con, IPP_CHARSET, - _("Language \"%s\" not supported"), + _("Language \"%s\" not supported."), attr->values[0].string.text); return; } @@ -6823,7 +6820,7 @@ create_subscription( { send_ipp_status(con, IPP_REQUEST_VALUE, _("The notify-user-data value is too large " - "(%d > 63 octets)"), + "(%d > 63 octets)."), attr->values[0].unknown.length); return; } @@ -6871,7 +6868,7 @@ create_subscription( else { send_ipp_status(con, IPP_BAD_REQUEST, - _("notify-events not specified")); + _("notify-events not specified.")); return; } } @@ -6889,7 +6886,8 @@ create_subscription( { if ((job = cupsdFindJob(jobid)) == NULL) { - send_ipp_status(con, IPP_NOT_FOUND, _("Job %d not found"), jobid); + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist."), + jobid); return; } } @@ -6904,14 +6902,14 @@ create_subscription( } if (job) - cupsdLogMessage(CUPSD_LOG_DEBUG, "Added subscription %d for job %d", + cupsdLogMessage(CUPSD_LOG_DEBUG, "Added subscription #%d for job %d.", sub->id, job->id); else if (printer) cupsdLogMessage(CUPSD_LOG_DEBUG, - "Added subscription %d for printer \"%s\"", + "Added subscription #%d for printer \"%s\".", sub->id, printer->name); else - cupsdLogMessage(CUPSD_LOG_DEBUG, "Added subscription %d for server", + cupsdLogMessage(CUPSD_LOG_DEBUG, "Added subscription #%d for server.", sub->id); sub->interval = interval; @@ -6969,7 +6967,7 @@ delete_printer(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_FOUND, - _("The printer or class was not found.")); + _("The printer or class does not exist.")); return; } @@ -7089,7 +7087,7 @@ get_default(cupsd_client_t *con) /* I - Client connection */ con->response->request.status.status_code = IPP_OK; } else - send_ipp_status(con, IPP_NOT_FOUND, _("No default printer")); + send_ipp_status(con, IPP_NOT_FOUND, _("No default printer.")); } @@ -7226,7 +7224,7 @@ get_document(cupsd_client_t *con, /* I - Client connection */ IPP_TAG_INTEGER)) == NULL) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Got a printer-uri attribute but no job-id")); + _("Got a printer-uri attribute but no job-id.")); return; } @@ -7248,8 +7246,7 @@ get_document(cupsd_client_t *con, /* I - Client connection */ * Not a valid URI! */ - send_ipp_status(con, IPP_BAD_REQUEST, - _("Bad job-uri attribute \"%s\""), + send_ipp_status(con, IPP_BAD_REQUEST, _("Bad job-uri \"%s\"."), uri->values[0].string.text); return; } @@ -7267,7 +7264,7 @@ get_document(cupsd_client_t *con, /* I - Client connection */ * Nope - return a "not found" error... */ - send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist"), jobid); + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist."), jobid); return; } @@ -7290,15 +7287,16 @@ get_document(cupsd_client_t *con, /* I - Client connection */ IPP_TAG_INTEGER)) == NULL) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Missing document-number attribute")); + _("Missing document-number attribute.")); return; } if ((docnum = attr->values[0].integer) < 1 || docnum > job->num_files || attr->num_values > 1) { - send_ipp_status(con, IPP_NOT_FOUND, _("Document %d not found in job %d."), - docnum, jobid); + send_ipp_status(con, IPP_NOT_FOUND, + _("Document #%d does not exist in job #%d."), docnum, + jobid); return; } @@ -7310,7 +7308,8 @@ get_document(cupsd_client_t *con, /* I - Client connection */ "Unable to open document %d in job %d - %s", docnum, jobid, strerror(errno)); send_ipp_status(con, IPP_NOT_FOUND, - _("Unable to open document %d in job %d"), docnum, jobid); + _("Unable to open document #%d in job #%d."), docnum, + jobid); return; } @@ -7372,7 +7371,7 @@ get_job_attrs(cupsd_client_t *con, /* I - Client connection */ IPP_TAG_INTEGER)) == NULL) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Got a printer-uri attribute but no job-id")); + _("Got a printer-uri attribute but no job-id.")); return; } @@ -7394,8 +7393,7 @@ get_job_attrs(cupsd_client_t *con, /* I - Client connection */ * Not a valid URI! */ - send_ipp_status(con, IPP_BAD_REQUEST, - _("Bad job-uri attribute \"%s\""), + send_ipp_status(con, IPP_BAD_REQUEST, _("Bad job-uri \"%s\"."), uri->values[0].string.text); return; } @@ -7413,7 +7411,7 @@ get_job_attrs(cupsd_client_t *con, /* I - Client connection */ * Nope - return a "not found" error... */ - send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist"), jobid); + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist."), jobid); return; } @@ -7492,7 +7490,7 @@ get_jobs(cupsd_client_t *con, /* I - Client connection */ if (strcmp(uri->name, "printer-uri")) { - send_ipp_status(con, IPP_BAD_REQUEST, _("No printer-uri in request")); + send_ipp_status(con, IPP_BAD_REQUEST, _("No printer-uri in request.")); return; } @@ -7529,7 +7527,7 @@ get_jobs(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_FOUND, - _("The printer or class was not found.")); + _("The printer or class does not exist.")); return; } else @@ -7713,7 +7711,7 @@ get_jobs(cupsd_client_t *con, /* I - Client connection */ if (i < job_ids->num_values) { - send_ipp_status(con, IPP_NOT_FOUND, _("job-id %d not found."), + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist."), job_ids->values[i].integer); return; } @@ -7843,7 +7841,7 @@ get_notifications(cupsd_client_t *con) /* I - Client connection */ if (!ids) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Missing notify-subscription-ids attribute")); + _("Missing notify-subscription-ids attribute.")); return; } @@ -7859,8 +7857,7 @@ get_notifications(cupsd_client_t *con) /* I - Client connection */ * Bad subscription ID... */ - send_ipp_status(con, IPP_NOT_FOUND, - _("notify-subscription-id %d no good"), + send_ipp_status(con, IPP_NOT_FOUND, _("Subscription #%d does not exist."), ids->values[i].integer); return; } @@ -8296,7 +8293,7 @@ get_printer_attrs(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_FOUND, - _("The printer or class was not found.")); + _("The printer or class does not exist.")); return; } @@ -8352,7 +8349,7 @@ get_printer_supported( */ send_ipp_status(con, IPP_NOT_FOUND, - _("The printer or class was not found.")); + _("The printer or class does not exist.")); return; } @@ -8569,8 +8566,8 @@ get_subscription_attrs( * Bad subscription ID... */ - send_ipp_status(con, IPP_NOT_FOUND, - _("notify-subscription-id %d no good"), sub_id); + send_ipp_status(con, IPP_NOT_FOUND, _("Subscription #%d does not exist."), + sub_id); return; } @@ -8663,8 +8660,8 @@ get_subscriptions(cupsd_client_t *con, /* I - Client connection */ if (!job) { - send_ipp_status(con, IPP_NOT_FOUND, _("Job #%s does not exist"), - resource + 6); + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist."), + atoi(resource + 6)); return; } } @@ -8675,7 +8672,7 @@ get_subscriptions(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_FOUND, - _("The printer or class was not found.")); + _("The printer or class does not exist.")); return; } else if ((attr = ippFindAttribute(con->request, "notify-job-id", @@ -8685,7 +8682,7 @@ get_subscriptions(cupsd_client_t *con, /* I - Client connection */ if (!job) { - send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist"), + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist."), attr->values[0].integer); return; } @@ -8816,7 +8813,7 @@ hold_job(cupsd_client_t *con, /* I - Client connection */ IPP_TAG_INTEGER)) == NULL) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Got a printer-uri attribute but no job-id")); + _("Got a printer-uri attribute but no job-id.")); return; } @@ -8839,7 +8836,7 @@ hold_job(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_BAD_REQUEST, - _("Bad job-uri attribute \"%s\""), + _("Bad job-uri \"%s\"."), uri->values[0].string.text); return; } @@ -8857,7 +8854,7 @@ hold_job(cupsd_client_t *con, /* I - Client connection */ * Nope - return a "not found" error... */ - send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist"), jobid); + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist."), jobid); return; } @@ -8925,7 +8922,7 @@ hold_new_jobs(cupsd_client_t *con, /* I - Connection */ */ send_ipp_status(con, IPP_NOT_FOUND, - _("The printer or class was not found.")); + _("The printer or class does not exist.")); return; } @@ -9003,7 +9000,7 @@ move_job(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_BAD_REQUEST, - _("job-printer-uri attribute missing")); + _("job-printer-uri attribute missing.")); return; } @@ -9014,7 +9011,7 @@ move_job(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_FOUND, - _("The printer or class was not found.")); + _("The printer or class does not exist.")); return; } @@ -9047,7 +9044,7 @@ move_job(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_FOUND, - _("The printer or class was not found.")); + _("The printer or class does not exist.")); return; } @@ -9066,7 +9063,7 @@ move_job(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_FOUND, - _("Job #%d does not exist"), attr->values[0].integer); + _("Job #%d does not exist."), attr->values[0].integer); return; } else @@ -9092,8 +9089,7 @@ move_job(cupsd_client_t *con, /* I - Client connection */ * Not a valid URI! */ - send_ipp_status(con, IPP_BAD_REQUEST, - _("Bad job-uri attribute \"%s\""), + send_ipp_status(con, IPP_BAD_REQUEST, _("Bad job-uri \"%s\"."), uri->values[0].string.text); return; } @@ -9110,8 +9106,7 @@ move_job(cupsd_client_t *con, /* I - Client connection */ * Nope - return a "not found" error... */ - send_ipp_status(con, IPP_NOT_FOUND, - _("Job #%d does not exist"), jobid); + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist."), jobid); return; } else @@ -9153,7 +9148,7 @@ move_job(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_POSSIBLE, - _("Job #%d is finished and cannot be altered"), + _("Job #%d is finished and cannot be altered."), job->id); return; } @@ -9338,7 +9333,7 @@ print_job(cupsd_client_t *con, /* I - Client connection */ ) { send_ipp_status(con, IPP_ATTRIBUTES, - _("Unsupported compression \"%s\""), + _("Unsupported compression \"%s\"."), attr->values[0].string.text); ippAddString(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_KEYWORD, "compression", NULL, attr->values[0].string.text); @@ -9357,7 +9352,7 @@ print_job(cupsd_client_t *con, /* I - Client connection */ if (!con->filename) { - send_ipp_status(con, IPP_BAD_REQUEST, _("No file!?")); + send_ipp_status(con, IPP_BAD_REQUEST, _("No file in print request.")); return; } @@ -9372,7 +9367,7 @@ print_job(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_FOUND, - _("The printer or class was not found.")); + _("The printer or class does not exist.")); return; } @@ -9391,7 +9386,7 @@ print_job(cupsd_client_t *con, /* I - Client connection */ type) != 2) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Bad document-format \"%s\""), + _("Bad document-format \"%s\"."), format->values[0].string.text); return; } @@ -9407,7 +9402,7 @@ print_job(cupsd_client_t *con, /* I - Client connection */ if (sscanf(default_format, "%15[^/]/%31[^;]", super, type) != 2) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Bad document-format \"%s\""), + _("Bad document-format \"%s\"."), default_format); return; } @@ -9472,7 +9467,7 @@ print_job(cupsd_client_t *con, /* I - Client connection */ else if (!filetype) { send_ipp_status(con, IPP_DOCUMENT_FORMAT, - _("Unsupported document-format \"%s\""), + _("Unsupported document-format \"%s\"."), format ? format->values[0].string.text : "application/octet-stream"); cupsdLogMessage(CUPSD_LOG_INFO, @@ -9765,7 +9760,7 @@ reject_jobs(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_FOUND, - _("The printer or class was not found.")); + _("The printer or class does not exist.")); return; } @@ -9846,7 +9841,7 @@ release_held_new_jobs( */ send_ipp_status(con, IPP_NOT_FOUND, - _("The printer or class was not found.")); + _("The printer or class does not exist.")); return; } @@ -9920,7 +9915,7 @@ release_job(cupsd_client_t *con, /* I - Client connection */ IPP_TAG_INTEGER)) == NULL) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Got a printer-uri attribute but no job-id")); + _("Got a printer-uri attribute but no job-id.")); return; } @@ -9942,8 +9937,7 @@ release_job(cupsd_client_t *con, /* I - Client connection */ * Not a valid URI! */ - send_ipp_status(con, IPP_BAD_REQUEST, - _("Bad job-uri attribute \"%s\""), + send_ipp_status(con, IPP_BAD_REQUEST, _("Bad job-uri \"%s\"."), uri->values[0].string.text); return; } @@ -9961,7 +9955,7 @@ release_job(cupsd_client_t *con, /* I - Client connection */ * Nope - return a "not found" error... */ - send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist"), jobid); + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist."), jobid); return; } @@ -9975,7 +9969,7 @@ release_job(cupsd_client_t *con, /* I - Client connection */ * Nope - return a "not possible" error... */ - send_ipp_status(con, IPP_NOT_POSSIBLE, _("Job #%d is not held"), jobid); + send_ipp_status(con, IPP_NOT_POSSIBLE, _("Job #%d is not held."), jobid); return; } @@ -10054,8 +10048,8 @@ renew_subscription( * Bad subscription ID... */ - send_ipp_status(con, IPP_NOT_FOUND, - _("notify-subscription-id %d no good"), sub_id); + send_ipp_status(con, IPP_NOT_FOUND, _("Subscription #%d does not exist."), + sub_id); return; } @@ -10066,7 +10060,7 @@ renew_subscription( */ send_ipp_status(con, IPP_NOT_POSSIBLE, - _("Job subscriptions cannot be renewed")); + _("Job subscriptions cannot be renewed.")); return; } @@ -10146,7 +10140,7 @@ restart_job(cupsd_client_t *con, /* I - Client connection */ IPP_TAG_INTEGER)) == NULL) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Got a printer-uri attribute but no job-id")); + _("Got a printer-uri attribute but no job-id.")); return; } @@ -10168,8 +10162,7 @@ restart_job(cupsd_client_t *con, /* I - Client connection */ * Not a valid URI! */ - send_ipp_status(con, IPP_BAD_REQUEST, - _("Bad job-uri attribute \"%s\""), + send_ipp_status(con, IPP_BAD_REQUEST, _("Bad job-uri \"%s\"."), uri->values[0].string.text); return; } @@ -10187,7 +10180,7 @@ restart_job(cupsd_client_t *con, /* I - Client connection */ * Nope - return a "not found" error... */ - send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist"), jobid); + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist."), jobid); return; } @@ -10201,7 +10194,7 @@ restart_job(cupsd_client_t *con, /* I - Client connection */ * Nope - return a "not possible" error... */ - send_ipp_status(con, IPP_NOT_POSSIBLE, _("Job #%d is not complete"), + send_ipp_status(con, IPP_NOT_POSSIBLE, _("Job #%d is not complete."), jobid); return; } @@ -10219,7 +10212,7 @@ restart_job(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_POSSIBLE, - _("Job #%d cannot be restarted - no files"), jobid); + _("Job #%d cannot be restarted - no files."), jobid); return; } @@ -10501,7 +10494,7 @@ send_document(cupsd_client_t *con, /* I - Client connection */ IPP_TAG_INTEGER)) == NULL) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Got a printer-uri attribute but no job-id")); + _("Got a printer-uri attribute but no job-id.")); return; } @@ -10523,8 +10516,7 @@ send_document(cupsd_client_t *con, /* I - Client connection */ * Not a valid URI! */ - send_ipp_status(con, IPP_BAD_REQUEST, - _("Bad job-uri attribute \"%s\""), + send_ipp_status(con, IPP_BAD_REQUEST, _("Bad job-uri \"%s\"."), uri->values[0].string.text); return; } @@ -10542,7 +10534,7 @@ send_document(cupsd_client_t *con, /* I - Client connection */ * Nope - return a "not found" error... */ - send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist"), jobid); + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist."), jobid); return; } @@ -10575,7 +10567,7 @@ send_document(cupsd_client_t *con, /* I - Client connection */ #endif /* HAVE_LIBZ */ ) { - send_ipp_status(con, IPP_ATTRIBUTES, _("Unsupported compression \"%s\""), + send_ipp_status(con, IPP_ATTRIBUTES, _("Unsupported compression \"%s\"."), attr->values[0].string.text); ippAddString(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_KEYWORD, "compression", NULL, attr->values[0].string.text); @@ -10605,7 +10597,7 @@ send_document(cupsd_client_t *con, /* I - Client connection */ attr->values[0].boolean) goto last_document; - send_ipp_status(con, IPP_BAD_REQUEST, _("No file!?")); + send_ipp_status(con, IPP_BAD_REQUEST, _("No file in print request.")); return; } @@ -10623,7 +10615,7 @@ send_document(cupsd_client_t *con, /* I - Client connection */ if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]", super, type) != 2) { - send_ipp_status(con, IPP_BAD_REQUEST, _("Bad document-format \"%s\""), + send_ipp_status(con, IPP_BAD_REQUEST, _("Bad document-format \"%s\"."), format->values[0].string.text); return; } @@ -10639,8 +10631,7 @@ send_document(cupsd_client_t *con, /* I - Client connection */ if (sscanf(default_format, "%15[^/]/%31[^;]", super, type) != 2) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Could not scan type \"%s\""), - default_format); + _("Bad document-format-default \"%s\"."), default_format); return; } } @@ -10704,7 +10695,7 @@ send_document(cupsd_client_t *con, /* I - Client connection */ else if (!filetype) { send_ipp_status(con, IPP_DOCUMENT_FORMAT, - _("Unsupported format \'%s/%s\'"), super, type); + _("Unsupported document-format \"%s/%s\"."), super, type); cupsdLogMessage(CUPSD_LOG_INFO, "Hint: Do you have the raw file printing rules enabled?"); @@ -10721,7 +10712,7 @@ send_document(cupsd_client_t *con, /* I - Client connection */ filetype->type); send_ipp_status(con, IPP_DOCUMENT_FORMAT, - _("Unsupported format \'%s\'"), mimetype); + _("Unsupported document-format \"%s\"."), mimetype); ippAddString(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_MIMETYPE, "document-format", NULL, mimetype); @@ -11000,7 +10991,7 @@ set_default(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_FOUND, - _("The printer or class was not found.")); + _("The printer or class does not exist.")); return; } @@ -11091,7 +11082,7 @@ set_job_attrs(cupsd_client_t *con, /* I - Client connection */ IPP_TAG_INTEGER)) == NULL) { send_ipp_status(con, IPP_BAD_REQUEST, - _("Got a printer-uri attribute but no job-id")); + _("Got a printer-uri attribute but no job-id.")); return; } @@ -11113,8 +11104,7 @@ set_job_attrs(cupsd_client_t *con, /* I - Client connection */ * Not a valid URI! */ - send_ipp_status(con, IPP_BAD_REQUEST, - _("Bad job-uri attribute \"%s\""), + send_ipp_status(con, IPP_BAD_REQUEST, _("Bad job-uri \"%s\"."), uri->values[0].string.text); return; } @@ -11132,7 +11122,7 @@ set_job_attrs(cupsd_client_t *con, /* I - Client connection */ * Nope - return a "not found" error... */ - send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist"), jobid); + send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist."), jobid); return; } @@ -11147,7 +11137,7 @@ set_job_attrs(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_POSSIBLE, - _("Job #%d is finished and cannot be altered"), jobid); + _("Job #%d is finished and cannot be altered."), jobid); return; } @@ -11222,7 +11212,7 @@ set_job_attrs(cupsd_client_t *con, /* I - Client connection */ if (attr->value_tag != IPP_TAG_INTEGER) { - send_ipp_status(con, IPP_REQUEST_VALUE, _("Bad job-priority value")); + send_ipp_status(con, IPP_REQUEST_VALUE, _("Bad job-priority value.")); if ((attr2 = copy_attribute(con->response, attr, 0)) != NULL) attr2->group_tag = IPP_TAG_UNSUPPORTED_GROUP; @@ -11252,7 +11242,7 @@ set_job_attrs(cupsd_client_t *con, /* I - Client connection */ if (attr->value_tag != IPP_TAG_ENUM) { - send_ipp_status(con, IPP_REQUEST_VALUE, _("Bad job-state value")); + send_ipp_status(con, IPP_REQUEST_VALUE, _("Bad job-state value.")); if ((attr2 = copy_attribute(con->response, attr, 0)) != NULL) attr2->group_tag = IPP_TAG_UNSUPPORTED_GROUP; @@ -11456,7 +11446,7 @@ set_printer_attrs(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_FOUND, - _("The printer or class was not found.")); + _("The printer or class does not exist.")); return; } @@ -11786,7 +11776,7 @@ start_printer(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_FOUND, - _("The printer or class was not found.")); + _("The printer or class does not exist.")); return; } @@ -11868,7 +11858,7 @@ stop_printer(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_FOUND, - _("The printer or class was not found.")); + _("The printer or class does not exist.")); return; } @@ -12112,7 +12102,7 @@ validate_job(cupsd_client_t *con, /* I - Client connection */ ) { send_ipp_status(con, IPP_ATTRIBUTES, - _("Unsupported compression \"%s\""), + _("Unsupported compression \"%s\"."), attr->values[0].string.text); ippAddString(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_KEYWORD, "compression", NULL, attr->values[0].string.text); @@ -12130,7 +12120,7 @@ validate_job(cupsd_client_t *con, /* I - Client connection */ if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]", super, type) != 2) { - send_ipp_status(con, IPP_BAD_REQUEST, _("Bad document-format \"%s\""), + send_ipp_status(con, IPP_BAD_REQUEST, _("Bad document-format \"%s\"."), format->values[0].string.text); return; } @@ -12141,7 +12131,7 @@ validate_job(cupsd_client_t *con, /* I - Client connection */ cupsdLogMessage(CUPSD_LOG_INFO, "Hint: Do you have the raw file printing rules enabled?"); send_ipp_status(con, IPP_DOCUMENT_FORMAT, - _("Unsupported document-format \"%s\""), + _("Unsupported document-format \"%s\"."), format->values[0].string.text); ippAddString(con->response, IPP_TAG_UNSUPPORTED_GROUP, IPP_TAG_MIMETYPE, "document-format", NULL, format->values[0].string.text); @@ -12160,7 +12150,7 @@ validate_job(cupsd_client_t *con, /* I - Client connection */ */ send_ipp_status(con, IPP_NOT_FOUND, - _("The printer or class was not found.")); + _("The printer or class does not exist.")); return; } diff --git a/scheduler/job.c b/scheduler/job.c index d7f8d36f4..96d26e12f 100644 --- a/scheduler/job.c +++ b/scheduler/job.c @@ -3139,7 +3139,6 @@ get_options(cupsd_job_t *job, /* I - Job */ num_pwgppds = cupsAddOption("AP_D_InputSlot", "", num_pwgppds, &pwgppds); } - if (!ippFindAttribute(job->attrs, "MediaType", IPP_TAG_ZERO) && (ppd = _ppdCacheGetMediaType(pc, job->attrs, NULL)) != NULL) num_pwgppds = cupsAddOption("MediaType", ppd, num_pwgppds, &pwgppds); diff --git a/scheduler/main.c b/scheduler/main.c index de285fe30..d043875cc 100644 --- a/scheduler/main.c +++ b/scheduler/main.c @@ -2245,14 +2245,15 @@ usage(int status) /* O - Exit status */ _cupsLangPuts(fp, _("Usage: cupsd [options]")); _cupsLangPuts(fp, _("Options:")); - _cupsLangPuts(fp, _("-c config-file Load alternate configuration " + _cupsLangPuts(fp, _(" -c config-file Load alternate configuration " + "file.")); + _cupsLangPuts(fp, _(" -f Run in the foreground.")); + _cupsLangPuts(fp, _(" -F Run in the foreground but " + "detach from console.")); + _cupsLangPuts(fp, _(" -h Show this usage message.")); + _cupsLangPuts(fp, _(" -l Run cupsd from launchd(8).")); + _cupsLangPuts(fp, _(" -t Test the configuration " "file.")); - _cupsLangPuts(fp, _("-f Run in the foreground.")); - _cupsLangPuts(fp, _("-F Run in the foreground but detach " - "from console.")); - _cupsLangPuts(fp, _("-h Show this usage message.")); - _cupsLangPuts(fp, _("-l Run cupsd from launchd(8).")); - _cupsLangPuts(fp, _("-t Test the configuration file.")); exit(status); } diff --git a/scheduler/printers.c b/scheduler/printers.c index 7d17f9a4c..5331ca7bb 100644 --- a/scheduler/printers.c +++ b/scheduler/printers.c @@ -372,6 +372,18 @@ cupsdCreateCommonData(void) "printer-resolution", "sides" }; + static const char * const pdf_versions[] = + { /* pdf-versions-supported */ + "adobe-1.2", + "adobe-1.3", + "adobe-1.4", + "adobe-1.5", + "adobe-1.6", + "adobe-1.7", + "iso-19005-1_2005", + "iso-32000-1_2008", + "pwg-5102.3" + }; static const char * const printer_settable[] = { /* printer-settable-attributes-supported */ "printer-info", @@ -530,6 +542,18 @@ cupsdCreateCommonData(void) ippAddString(CommonData, IPP_TAG_PRINTER, IPP_TAG_NAME | IPP_TAG_COPY, "job-sheets-supported", NULL, "none"); + /* jpeg-k-octets-supported */ + ippAddRange(CommonData, IPP_TAG_PRINTER, "jpeg-k-octets-supported", 0, + k_supported); + + /* jpeg-x-dimension-supported */ + ippAddRange(CommonData, IPP_TAG_PRINTER, "jpeg-x-dimension-supported", 0, + 65535); + + /* jpeg-y-dimension-supported */ + ippAddRange(CommonData, IPP_TAG_PRINTER, "jpeg-y-dimension-supported", 1, + 65535); + /* media-col-supported */ ippAddStrings(CommonData, IPP_TAG_PRINTER, IPP_TAG_KEYWORD | IPP_TAG_COPY, "media-col-supported", @@ -624,6 +648,16 @@ cupsdCreateCommonData(void) /* page-ranges-supported */ ippAddBoolean(CommonData, IPP_TAG_PRINTER, "page-ranges-supported", 1); + /* pdf-k-octets-supported */ + ippAddRange(CommonData, IPP_TAG_PRINTER, "pdf-k-octets-supported", 0, + k_supported); + + /* pdf-versions-supported */ + ippAddStrings(CommonData, IPP_TAG_PRINTER, IPP_TAG_KEYWORD | IPP_TAG_COPY, + "pdf-versions-supported", + sizeof(pdf_versions) / sizeof(pdf_versions[0]), NULL, + pdf_versions); + /* pdl-override-supported */ ippAddString(CommonData, IPP_TAG_PRINTER, IPP_TAG_KEYWORD | IPP_TAG_COPY, "pdl-override-supported", NULL, "attempted"); diff --git a/scheduler/server.c b/scheduler/server.c index c913469f0..da98ffaa1 100644 --- a/scheduler/server.c +++ b/scheduler/server.c @@ -34,7 +34,7 @@ * Local globals... */ -static int started = 0; +static int started = 0; /* Did we start the server already? */ /* diff --git a/scheduler/sysman.c b/scheduler/sysman.c index 9bfc17abb..65cfc13c3 100644 --- a/scheduler/sysman.c +++ b/scheduler/sysman.c @@ -40,6 +40,12 @@ #ifdef HAVE_VPROC_TRANSACTION_BEGIN # include #endif /* HAVE_VPROC_TRANSACTION_BEGIN */ +#ifdef __APPLE__ +# include +# ifdef HAVE_IOKIT_PWR_MGT_IOPMLIBPRIVATE_H +# include +# endif /* HAVE_IOKIT_PWR_MGT_IOPMLIBPRIVATE_H */ +#endif /* __APPLE__ */ /* @@ -59,6 +65,14 @@ * to wake up in a new location/on a new wireless network. */ +/* + * Local globals... + */ + +#ifdef kIOPMAssertionTypeDenySystemSleep +static IOPMAssertionID dark_wake = 0; /* "Dark wake" assertion for sharing */ +#endif /* kIOPMAssertionTypeDenySystemSleep */ + /* * 'cupsdCleanDirty()' - Write dirty config and state files. @@ -136,8 +150,11 @@ cupsdMarkDirty(int what) /* I - What file(s) are dirty? */ void cupsdSetBusyState(void) { - int newbusy; /* New busy state */ - static int busy = 0; /* Current busy state */ + int i; /* Looping var */ + cupsd_job_t *job; /* Current job */ + cupsd_printer_t *p; /* Current printer */ + int newbusy; /* New busy state */ + static int busy = 0; /* Current busy state */ static const char * const busy_text[] = { /* Text for busy states */ "Not busy", @@ -154,10 +171,35 @@ cupsdSetBusyState(void) #endif /* HAVE_VPROC_TRANSACTION_BEGIN */ + /* + * Figure out how busy we are... + */ + newbusy = (DirtyCleanTime ? 1 : 0) | - (cupsArrayCount(PrintingJobs) ? 2 : 0) | (cupsArrayCount(ActiveClients) ? 4 : 0); + for (job = (cupsd_job_t *)cupsArrayFirst(PrintingJobs); + job; + job = (cupsd_job_t *)cupsArrayNext(PrintingJobs)) + { + if ((p = job->printer) != NULL) + { + for (i = 0; i < p->num_reasons; i ++) + if (!strcmp(p->reasons[i], "connecting-to-device")) + break; + + if (!p->num_reasons || i >= p->num_reasons) + break; + } + } + + if (job) + newbusy |= 2; + + /* + * Manage state changes... + */ + if (newbusy != busy) { busy = newbusy; @@ -172,6 +214,18 @@ cupsdSetBusyState(void) } #endif /* HAVE_VPROC_TRANSACTION_BEGIN */ +#ifdef kIOPMAssertionTypeDenySystemSleep + if ((busy & 2) && !dark_wake) + IOPMAssertionCreateWithName(kIOPMAssertionTypeDenySystemSleep, + kIOPMAssertionLevelOn, + CFSTR("org.cups.cupsd"), &dark_wake); + else if (!(busy & 2) && dark_wake) + { + IOPMAssertionRelease(dark_wake); + dark_wake = 0; + } +#endif /* kIOPMAssertionTypeDenySystemSleep */ + cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdSetBusyState: %s", busy_text[busy]); } } diff --git a/systemv/cancel.c b/systemv/cancel.c index 8d655b01b..2b5be210f 100644 --- a/systemv/cancel.c +++ b/systemv/cancel.c @@ -3,7 +3,7 @@ * * "cancel" command for CUPS. * - * Copyright 2007-2010 by Apple Inc. + * Copyright 2007-2011 by Apple Inc. * Copyright 1997-2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -234,7 +234,7 @@ main(int argc, /* I - Number of command-line arguments */ cupsEncryption())) == NULL) { _cupsLangPrintf(stderr, - _("%s: Unable to contact server."), argv[0]); + _("%s: Unable to connect to server."), argv[0]); return (1); } diff --git a/systemv/cupsaddsmb.c b/systemv/cupsaddsmb.c index 76204fd2c..18dc8df25 100644 --- a/systemv/cupsaddsmb.c +++ b/systemv/cupsaddsmb.c @@ -3,7 +3,7 @@ * * "cupsaddsmb" command for CUPS. * - * Copyright 2007-2010 by Apple Inc. + * Copyright 2007-2011 by Apple Inc. * Copyright 2001-2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -282,14 +282,17 @@ usage(void) _cupsLangPuts(stdout, _(" cupsaddsmb [options] -a")); _cupsLangPuts(stdout, ""); _cupsLangPuts(stdout, _("Options:")); - _cupsLangPuts(stdout, _(" -E Encrypt the connection to the " + _cupsLangPuts(stdout, _(" -E Encrypt the connection to " + "the server.")); + _cupsLangPuts(stdout, _(" -H samba-server Use the named SAMBA " "server.")); - _cupsLangPuts(stdout, _(" -H samba-server Use the named SAMBA server.")); - _cupsLangPuts(stdout, _(" -U samba-user Authenticate using the named " - "SAMBA user.")); - _cupsLangPuts(stdout, _(" -a Export all printers.")); - _cupsLangPuts(stdout, _(" -h cups-server Use the named CUPS server.")); - _cupsLangPuts(stdout, _(" -v Be verbose (show commands).")); + _cupsLangPuts(stdout, _(" -U samba-user Authenticate using the " + "named SAMBA user.")); + _cupsLangPuts(stdout, _(" -a Export all printers.")); + _cupsLangPuts(stdout, _(" -h cups-server Use the named CUPS " + "server.")); + _cupsLangPuts(stdout, _(" -v Be verbose (show " + "commands).")); exit(1); } diff --git a/systemv/cupsctl.c b/systemv/cupsctl.c index cae46d697..eabc6e479 100644 --- a/systemv/cupsctl.c +++ b/systemv/cupsctl.c @@ -208,22 +208,22 @@ usage(const char *opt) /* I - Option character/string */ _cupsLangPuts(stdout, ""); _cupsLangPuts(stdout, _("Options:")); _cupsLangPuts(stdout, ""); - _cupsLangPuts(stdout, _(" -E Enable encryption.")); - _cupsLangPuts(stdout, _(" -U username Specify username.")); - _cupsLangPuts(stdout, _(" -h server[:port] Specify server " + _cupsLangPuts(stdout, _(" -E Enable encryption.")); + _cupsLangPuts(stdout, _(" -U username Specify username.")); + _cupsLangPuts(stdout, _(" -h server[:port] Specify server " "address.")); _cupsLangPuts(stdout, ""); - _cupsLangPuts(stdout, _(" --[no-]debug-logging Turn debug logging " + _cupsLangPuts(stdout, _(" --[no-]debug-logging Turn debug logging " "on/off.")); - _cupsLangPuts(stdout, _(" --[no-]remote-admin Turn remote " + _cupsLangPuts(stdout, _(" --[no-]remote-admin Turn remote " "administration on/off.")); - _cupsLangPuts(stdout, _(" --[no-]remote-any Allow/prevent access " + _cupsLangPuts(stdout, _(" --[no-]remote-any Allow/prevent access " "from the Internet.")); - _cupsLangPuts(stdout, _(" --[no-]remote-printers Show/hide remote " + _cupsLangPuts(stdout, _(" --[no-]remote-printers Show/hide remote " "printers.")); - _cupsLangPuts(stdout, _(" --[no-]share-printers Turn printer sharing " + _cupsLangPuts(stdout, _(" --[no-]share-printers Turn printer sharing " "on/off.")); - _cupsLangPuts(stdout, _(" --[no-]user-cancel-any Allow/prevent users to " + _cupsLangPuts(stdout, _(" --[no-]user-cancel-any Allow/prevent users to " "cancel any job.")); exit(1); diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c index 22f7ce496..55ebb0f40 100644 --- a/systemv/cupstestppd.c +++ b/systemv/cupstestppd.c @@ -3,7 +3,7 @@ * * PPD test program for CUPS. * - * Copyright 2007-2010 by Apple Inc. + * Copyright 2007-2011 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -329,20 +329,22 @@ main(int argc, /* I - Number of command-line args */ status = ERROR_FILE_OPEN; if (verbose >= 0) + { + _cupsLangPuts(stdout, _(" FAIL")); _cupsLangPrintf(stdout, - _(" FAIL" - " **FAIL** Unable to open PPD file - %s"), + _(" **FAIL** Unable to open PPD file - %s"), strerror(errno)); + } } else { status = ERROR_PPD_FORMAT; if (verbose >= 0) - { + { + _cupsLangPuts(stdout, _(" FAIL")); _cupsLangPrintf(stdout, - _(" FAIL" - " **FAIL** Unable to open PPD file - " + _(" **FAIL** Unable to open PPD file - " "%s on line %d."), ppdErrorString(error), line); @@ -2352,8 +2354,8 @@ check_filters(ppd_file_t *ppd, /* I - PPD file */ _cupsLangPuts(stdout, _(" FAIL")); if (verbose >= 0) - _cupsLangPrintf(stdout, _(" %s Missing cupsFilter " - "file \"%s\"."), prefix, pathprog); + _cupsLangPrintf(stdout, _(" %s Missing %s file \"%s\"."), + prefix, "cupsFilter", pathprog); if (!warn) errors ++; @@ -2366,8 +2368,9 @@ check_filters(ppd_file_t *ppd, /* I - PPD file */ _cupsLangPuts(stdout, _(" FAIL")); if (verbose >= 0) - _cupsLangPrintf(stdout, _(" %s Bad permissions on cupsFilter " - "file \"%s\"."), prefix, pathprog); + _cupsLangPrintf(stdout, + _(" %s Bad permissions on %s file \"%s\"."), + prefix, "cupsFilter", pathprog); if (!warn) errors ++; @@ -2437,8 +2440,8 @@ check_filters(ppd_file_t *ppd, /* I - PPD file */ _cupsLangPuts(stdout, _(" FAIL")); if (verbose >= 0) - _cupsLangPrintf(stdout, _(" %s Missing cupsPreFilter " - "file \"%s\"."), prefix, pathprog); + _cupsLangPrintf(stdout, _(" %s Missing %s file \"%s\"."), + prefix, "cupsPreFilter", pathprog); if (!warn) errors ++; @@ -2451,9 +2454,9 @@ check_filters(ppd_file_t *ppd, /* I - PPD file */ _cupsLangPuts(stdout, _(" FAIL")); if (verbose >= 0) - _cupsLangPrintf(stdout, _(" %s Bad permissions on " - "cupsPreFilter file \"%s\"."), prefix, - pathprog); + _cupsLangPrintf(stdout, + _(" %s Bad permissions on %s file \"%s\"."), + prefix, "cupsPreFilter", pathprog); if (!warn) errors ++; @@ -2495,9 +2498,8 @@ check_filters(ppd_file_t *ppd, /* I - PPD file */ _cupsLangPuts(stdout, _(" FAIL")); if (verbose >= 0) - _cupsLangPrintf(stdout, _(" %s Missing " - "APDialogExtension file \"%s\"."), - prefix, pathprog); + _cupsLangPrintf(stdout, _(" %s Missing %s file \"%s\"."), + prefix, "APDialogExtension", pathprog); if (!warn) errors ++; @@ -2510,9 +2512,9 @@ check_filters(ppd_file_t *ppd, /* I - PPD file */ _cupsLangPuts(stdout, _(" FAIL")); if (verbose >= 0) - _cupsLangPrintf(stdout, _(" %s Bad permissions on " - "APDialogExtension file \"%s\"."), prefix, - pathprog); + _cupsLangPrintf(stdout, + _(" %s Bad permissions on %s file \"%s\"."), + prefix, "APDialogExtension", pathprog); if (!warn) errors ++; @@ -2551,9 +2553,8 @@ check_filters(ppd_file_t *ppd, /* I - PPD file */ _cupsLangPuts(stdout, _(" FAIL")); if (verbose >= 0) - _cupsLangPrintf(stdout, _(" %s Missing " - "APPrinterIconPath file \"%s\"."), - prefix, pathprog); + _cupsLangPrintf(stdout, _(" %s Missing %s file \"%s\"."), + prefix, "APPrinterIconPath", pathprog); if (!warn) errors ++; @@ -2566,9 +2567,9 @@ check_filters(ppd_file_t *ppd, /* I - PPD file */ _cupsLangPuts(stdout, _(" FAIL")); if (verbose >= 0) - _cupsLangPrintf(stdout, _(" %s Bad permissions on " - "APPrinterIconPath file \"%s\"."), prefix, - pathprog); + _cupsLangPrintf(stdout, + _(" %s Bad permissions on %s file \"%s\"."), + prefix, "APPrinterIconPath", pathprog); if (!warn) errors ++; @@ -2607,9 +2608,8 @@ check_filters(ppd_file_t *ppd, /* I - PPD file */ _cupsLangPuts(stdout, _(" FAIL")); if (verbose >= 0) - _cupsLangPrintf(stdout, _(" %s Missing " - "APPrinterLowInkTool file \"%s\"."), - prefix, pathprog); + _cupsLangPrintf(stdout, _(" %s Missing %s file \"%s\"."), + prefix, "APPrinterLowInkTool", pathprog); if (!warn) errors ++; @@ -2622,9 +2622,9 @@ check_filters(ppd_file_t *ppd, /* I - PPD file */ _cupsLangPuts(stdout, _(" FAIL")); if (verbose >= 0) - _cupsLangPrintf(stdout, _(" %s Bad permissions on " - "APPrinterLowInkTool file \"%s\"."), prefix, - pathprog); + _cupsLangPrintf(stdout, + _(" %s Bad permissions on %s file \"%s\"."), + prefix, "APPrinterLowInkTool", pathprog); if (!warn) errors ++; @@ -2663,9 +2663,8 @@ check_filters(ppd_file_t *ppd, /* I - PPD file */ _cupsLangPuts(stdout, _(" FAIL")); if (verbose >= 0) - _cupsLangPrintf(stdout, _(" %s Missing " - "APPrinterUtilityPath file \"%s\"."), - prefix, pathprog); + _cupsLangPrintf(stdout, _(" %s Missing %s file \"%s\"."), + prefix, "APPrinterUtilityPath", pathprog); if (!warn) errors ++; @@ -2678,9 +2677,9 @@ check_filters(ppd_file_t *ppd, /* I - PPD file */ _cupsLangPuts(stdout, _(" FAIL")); if (verbose >= 0) - _cupsLangPrintf(stdout, _(" %s Bad permissions on " - "APPrinterUtilityPath file \"%s\"."), prefix, - pathprog); + _cupsLangPrintf(stdout, + _(" %s Bad permissions on %s file \"%s\"."), + prefix, "APPrinterUtilityPath", pathprog); if (!warn) errors ++; @@ -2716,9 +2715,9 @@ check_filters(ppd_file_t *ppd, /* I - PPD file */ _cupsLangPuts(stdout, _(" FAIL")); if (verbose >= 0) - _cupsLangPrintf(stdout, _(" %s Missing " - "APScanAppPath file \"%s\"."), - prefix, attr->value ? attr->value : ""); + _cupsLangPrintf(stdout, _(" %s Missing %s file \"%s\"."), + prefix, "APScanAppPath", + attr->value ? attr->value : ""); if (!warn) errors ++; @@ -2731,9 +2730,9 @@ check_filters(ppd_file_t *ppd, /* I - PPD file */ _cupsLangPuts(stdout, _(" FAIL")); if (verbose >= 0) - _cupsLangPrintf(stdout, _(" %s Bad permissions on " - "APScanAppPath file \"%s\"."), prefix, - attr->value); + _cupsLangPrintf(stdout, + _(" %s Bad permissions on %s file \"%s\"."), + prefix, "APScanAppPath", attr->value); if (!warn) errors ++; @@ -2839,8 +2838,8 @@ check_profiles(ppd_file_t *ppd, /* I - PPD file */ _cupsLangPuts(stdout, _(" FAIL")); if (verbose >= 0) - _cupsLangPrintf(stdout, _(" %s Missing cupsICCProfile " - "file \"%s\"."), prefix, filename); + _cupsLangPrintf(stdout, _(" %s Missing %s file \"%s\"."), + prefix, "cupsICCProfile", filename); if (!warn) errors ++; @@ -2853,9 +2852,9 @@ check_profiles(ppd_file_t *ppd, /* I - PPD file */ _cupsLangPuts(stdout, _(" FAIL")); if (verbose >= 0) - _cupsLangPrintf(stdout, _(" %s Bad permissions on " - "cupsICCProfile file \"%s\"."), prefix, - filename); + _cupsLangPrintf(stdout, + _(" %s Bad permissions on %s file \"%s\"."), + prefix, "cupsICCProfile", filename); if (!warn) errors ++; @@ -3490,17 +3489,17 @@ usage(void) _cupsLangPuts(stdout, ""); _cupsLangPuts(stdout, _("Options:")); _cupsLangPuts(stdout, ""); - _cupsLangPuts(stdout, _(" -I {filename,filters,none,profiles}")); - _cupsLangPuts(stdout, _(" Ignore specific warnings.")); - _cupsLangPuts(stdout, _(" -R root-directory Set alternate root.")); - _cupsLangPuts(stdout, _(" -W {all,none,constraints,defaults,duplex," + _cupsLangPuts(stdout, _(" -I {filename,filters,none,profiles}")); + _cupsLangPuts(stdout, _(" Ignore specific warnings.")); + _cupsLangPuts(stdout, _(" -R root-directory Set alternate root.")); + _cupsLangPuts(stdout, _(" -W {all,none,constraints,defaults,duplex," "filters,profiles,sizes,translations}")); - _cupsLangPuts(stdout, _(" Issue warnings instead of " + _cupsLangPuts(stdout, _(" Issue warnings instead of " "errors.")); - _cupsLangPuts(stdout, _(" -q Run silently.")); - _cupsLangPuts(stdout, _(" -r Use 'relaxed' open mode.")); - _cupsLangPuts(stdout, _(" -v Be slightly verbose.")); - _cupsLangPuts(stdout, _(" -vv Be very verbose.")); + _cupsLangPuts(stdout, _(" -q Run silently.")); + _cupsLangPuts(stdout, _(" -r Use 'relaxed' open mode.")); + _cupsLangPuts(stdout, _(" -v Be slightly verbose.")); + _cupsLangPuts(stdout, _(" -vv Be very verbose.")); exit(ERROR_USAGE); } diff --git a/systemv/lp.c b/systemv/lp.c index 744a13acf..dcfab2413 100644 --- a/systemv/lp.c +++ b/systemv/lp.c @@ -3,7 +3,7 @@ * * "lp" command for CUPS. * - * Copyright 2007-2010 by Apple Inc. + * Copyright 2007-2011 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -285,7 +285,7 @@ main(int argc, /* I - Number of command-line arguments */ if (i >= argc) { _cupsLangPrintf(stderr, - _("%s: Error - expected option string after " + _("%s: Error - expected option=value after " "\"-o\" option."), argv[0]); return (1); } diff --git a/templates/pl/admin.tmpl b/templates/pl/admin.tmpl index 16840361f..b997357be 100644 --- a/templates/pl/admin.tmpl +++ b/templates/pl/admin.tmpl @@ -58,7 +58,7 @@ {HAVE_DNSSD? DNS-SD:} {HAVE_LDAP? LDAP:} {HAVE_LIBSLP? SLP:}
-         Zezwolenie na drukowanie z Internetu"
+         Zezwolenie na drukowanie z Internetu
         Rozgłaszanie interfejsu WWW
Zezwolenie na zdalną administrację
{have_gssapi? Używanie uwierzytelniania Kerberosa (FAQ)
:} diff --git a/templates/pl/help-header.tmpl b/templates/pl/help-header.tmpl index 88f552421..98b21676b 100644 --- a/templates/pl/help-header.tmpl +++ b/templates/pl/help-header.tmpl @@ -37,7 +37,7 @@ AUTOSAVE="org.cups.help" RESULTS="20">

Pomoc online

To jest interfejs pomocy online CUPS. Należy podać wyszukiwane słowa -powyżej lub nacisnąć na jeden z odnośników do dokumentacji, aby wyświetlić +powyżej lub kliknąć jeden z odnośników do dokumentacji, aby wyświetlić informacje o pomocy online.

Nowi użytkownicy CUPS powinni przeczytać stronę "