summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cups/dest.c14
-rw-r--r--cups/file-private.h4
-rw-r--r--cups/file.c25
-rw-r--r--cups/file.h4
-rw-r--r--cups/util.c2
-rw-r--r--locale/cups.pot544
-rw-r--r--locale/cups.strings74
-rw-r--r--locale/cups_ca.po99
-rw-r--r--locale/cups_cs.po89
-rw-r--r--locale/cups_de.po99
-rw-r--r--locale/cups_es.po353
-rw-r--r--locale/cups_fr.po89
-rw-r--r--locale/cups_it.po354
-rw-r--r--locale/cups_ja.po340
-rw-r--r--locale/cups_pt_BR.po351
-rw-r--r--locale/cups_ru.po348
-rw-r--r--man/ipptoolfile.man13
-rw-r--r--test/ipptool.c682
18 files changed, 2165 insertions, 1319 deletions
diff --git a/cups/dest.c b/cups/dest.c
index 41d766909..4ce5234fa 100644
--- a/cups/dest.c
+++ b/cups/dest.c
@@ -1117,6 +1117,8 @@ cupsEnumDests(
* Get Bonjour-shared printers...
*/
+ gettimeofday(&curtime, NULL);
+
# ifdef HAVE_DNSSD
if (DNSServiceCreateConnection(&data.main_ref) != kDNSServiceErr_NoError)
return (0);
@@ -1480,7 +1482,7 @@ _cupsGetDestResource(
int port; /* Port number */
- DEBUG_printf(("_cupsGetDestResource(dest=%p(%s), resource=%p, resourcesize=%d)", dest, dest->name, resource, (int)resourcesize));
+ DEBUG_printf(("_cupsGetDestResource(dest=%p(%s), resource=%p, resourcesize=%d)", (void *)dest, dest->name, (void *)resource, (int)resourcesize));
/*
* Range check input...
@@ -1743,7 +1745,7 @@ _cupsGetDests(http_t *http, /* I - Connection to server or
};
- DEBUG_printf(("_cupsGetDests(http=%p, op=%x(%s), name=\"%s\", dests=%p, type=%x, mask=%x)", http, op, ippOpString(op), name, dests, type, mask));
+ DEBUG_printf(("_cupsGetDests(http=%p, op=%x(%s), name=\"%s\", dests=%p, type=%x, mask=%x)", (void *)http, op, ippOpString(op), name, (void *)dests, type, mask));
#ifdef __APPLE__
/*
@@ -2188,7 +2190,7 @@ cupsGetNamedDest(http_t *http, /* I - Connection to server or @code CUPS_HTT
_cups_globals_t *cg = _cupsGlobals(); /* Pointer to library globals */
- DEBUG_printf(("cupsGetNamedDest(http=%p, name=\"%s\", instance=\"%s\")", http, name, instance));
+ DEBUG_printf(("cupsGetNamedDest(http=%p, name=\"%s\", instance=\"%s\")", (void *)http, name, instance));
/*
* If "name" is NULL, find the default destination...
@@ -2273,7 +2275,7 @@ cupsGetNamedDest(http_t *http, /* I - Connection to server or @code CUPS_HTT
return (NULL);
}
- DEBUG_printf(("1cupsGetNamedDest: Got dest=%p", dest));
+ DEBUG_printf(("1cupsGetNamedDest: Got dest=%p", (void *)dest));
if (instance)
dest->instance = _cupsStrAlloc(instance);
@@ -3856,7 +3858,7 @@ cups_elapsed(struct timeval *t) /* IO - Previous time */
gettimeofday(&nt, NULL);
- msecs = 1000 * (nt.tv_sec - t->tv_sec) + (nt.tv_usec - t->tv_usec) / 1000;
+ msecs = (int)(1000 * (nt.tv_sec - t->tv_sec) + (nt.tv_usec - t->tv_usec) / 1000);
*t = nt;
@@ -4312,7 +4314,7 @@ cups_name_cb(_cups_namedata_t *data, /* I - Data from cupsGetNamedDest */
unsigned flags, /* I - Enumeration flags */
cups_dest_t *dest) /* I - Destination */
{
- DEBUG_printf(("2cups_name_cb(data=%p(%s), flags=%x, dest=%p(%s)", data, data->name, flags, dest, dest->name));
+ DEBUG_printf(("2cups_name_cb(data=%p(%s), flags=%x, dest=%p(%s)", (void *)data, data->name, flags, (void *)dest, dest->name));
if (!(flags & CUPS_DEST_FLAGS_REMOVED) && !dest->instance && !strcasecmp(data->name, dest->name))
{
diff --git a/cups/file-private.h b/cups/file-private.h
index b8ca431fe..1f4db7989 100644
--- a/cups/file-private.h
+++ b/cups/file-private.h
@@ -4,9 +4,9 @@
* Since stdio files max out at 256 files on many systems, we have to
* write similar functions without this limit. At the same time, using
* our own file functions allows us to provide transparent support of
- * gzip'd print files, PPD files, etc.
+ * different line endings, gzip'd print files, PPD files, etc.
*
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
diff --git a/cups/file.c b/cups/file.c
index a027df405..731a7fafa 100644
--- a/cups/file.c
+++ b/cups/file.c
@@ -4,9 +4,9 @@
* Since stdio files max out at 256 files on many systems, we have to
* write similar functions without this limit. At the same time, using
* our own file functions allows us to provide transparent support of
- * gzip'd print files, PPD files, etc.
+ * different line endings, gzip'd print files, PPD files, etc.
*
- * Copyright 2007-2015 by Apple Inc.
+ * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
@@ -321,7 +321,6 @@ cupsFileClose(cups_file_t *fp) /* I - CUPS file */
int fd; /* File descriptor */
char mode; /* Open mode */
int status; /* Return status */
- int is_stdio; /* Is a stdio file? */
DEBUG_printf(("cupsFileClose(fp=%p)", (void *)fp));
@@ -410,12 +409,19 @@ cupsFileClose(cups_file_t *fp) /* I - CUPS file */
#endif /* HAVE_LIBZ */
/*
+ * If this is one of the cupsFileStdin/out/err files, return now and don't
+ * actually free memory or close (these last the life of the process...)
+ */
+
+ if (fp->is_stdio)
+ return (status);
+
+/*
* Save the file descriptor we used and free memory...
*/
- fd = fp->fd;
- mode = fp->mode;
- is_stdio = fp->is_stdio;
+ fd = fp->fd;
+ mode = fp->mode;
if (fp->printf_buffer)
free(fp->printf_buffer);
@@ -431,11 +437,8 @@ cupsFileClose(cups_file_t *fp) /* I - CUPS file */
if (httpAddrClose(NULL, fd) < 0)
status = -1;
}
- else if (!is_stdio)
- {
- if (close(fd) < 0)
- status = -1;
- }
+ else if (close(fd) < 0)
+ status = -1;
return (status);
}
diff --git a/cups/file.h b/cups/file.h
index 177c2e905..42abe2086 100644
--- a/cups/file.h
+++ b/cups/file.h
@@ -4,9 +4,9 @@
* Since stdio files max out at 256 files on many systems, we have to
* write similar functions without this limit. At the same time, using
* our own file functions allows us to provide transparent support of
- * gzip'd print files, PPD files, etc.
+ * different line endings, gzip'd print files, PPD files, etc.
*
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
diff --git a/cups/util.c b/cups/util.c
index c7163c2e0..2f5ebdf44 100644
--- a/cups/util.c
+++ b/cups/util.c
@@ -985,7 +985,7 @@ cups_create_cb(
unsigned flags, /* I - Enumeration flags */
cups_dest_t *dest) /* I - Destination */
{
- DEBUG_printf(("2cups_create_cb(data=%p(%s), flags=%08x, dest=%p(%s))", data, data->name, flags, dest, dest->name));
+ DEBUG_printf(("2cups_create_cb(data=%p(%s), flags=%08x, dest=%p(%s))", (void *)data, data->name, flags, (void *)dest, dest->name));
(void)flags;
diff --git a/locale/cups.pot b/locale/cups.pot
index f72bd4ee9..3d447f49a 100644
--- a/locale/cups.pot
+++ b/locale/cups.pot
@@ -28,7 +28,7 @@ msgid ""
msgstr ""
"Project-Id-Version: CUPS 1.6\n"
"Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-04-05 15:24-0400\n"
+"POT-Creation-Date: 2017-06-15 20:52-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,12 +37,12 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: systemv/lpstat.c:1861 systemv/lpstat.c:1980
+#: systemv/lpstat.c:1885 systemv/lpstat.c:2004
msgid "\t\t(all)"
msgstr ""
-#: systemv/lpstat.c:1864 systemv/lpstat.c:1867 systemv/lpstat.c:1983
-#: systemv/lpstat.c:1986
+#: systemv/lpstat.c:1888 systemv/lpstat.c:1891 systemv/lpstat.c:2007
+#: systemv/lpstat.c:2010
msgid "\t\t(none)"
msgstr ""
@@ -51,99 +51,99 @@ msgstr ""
msgid "\t%d entries"
msgstr ""
-#: systemv/lpstat.c:781 systemv/lpstat.c:797
+#: systemv/lpstat.c:805 systemv/lpstat.c:821
#, c-format
msgid "\t%s"
msgstr ""
-#: systemv/lpstat.c:1842 systemv/lpstat.c:1961
+#: systemv/lpstat.c:1866 systemv/lpstat.c:1985
msgid "\tAfter fault: continue"
msgstr ""
-#: systemv/lpstat.c:1469 systemv/lpstat.c:1815 systemv/lpstat.c:1935
+#: systemv/lpstat.c:1493 systemv/lpstat.c:1839 systemv/lpstat.c:1959
#, c-format
msgid "\tAlerts: %s"
msgstr ""
-#: systemv/lpstat.c:1865 systemv/lpstat.c:1984
+#: systemv/lpstat.c:1889 systemv/lpstat.c:2008
msgid "\tBanner required"
msgstr ""
-#: systemv/lpstat.c:1866 systemv/lpstat.c:1985
+#: systemv/lpstat.c:1890 systemv/lpstat.c:2009
msgid "\tCharset sets:"
msgstr ""
-#: systemv/lpstat.c:1834 systemv/lpstat.c:1953
+#: systemv/lpstat.c:1858 systemv/lpstat.c:1977
msgid "\tConnection: direct"
msgstr ""
-#: systemv/lpstat.c:1825 systemv/lpstat.c:1945
+#: systemv/lpstat.c:1849 systemv/lpstat.c:1969
msgid "\tConnection: remote"
msgstr ""
-#: systemv/lpstat.c:1791 systemv/lpstat.c:1911
+#: systemv/lpstat.c:1815 systemv/lpstat.c:1935
msgid "\tContent types: any"
msgstr ""
-#: systemv/lpstat.c:1869 systemv/lpstat.c:1988
+#: systemv/lpstat.c:1893 systemv/lpstat.c:2012
msgid "\tDefault page size:"
msgstr ""
-#: systemv/lpstat.c:1868 systemv/lpstat.c:1987
+#: systemv/lpstat.c:1892 systemv/lpstat.c:2011
msgid "\tDefault pitch:"
msgstr ""
-#: systemv/lpstat.c:1870 systemv/lpstat.c:1989
+#: systemv/lpstat.c:1894 systemv/lpstat.c:2013
msgid "\tDefault port settings:"
msgstr ""
-#: systemv/lpstat.c:1797 systemv/lpstat.c:1917
+#: systemv/lpstat.c:1821 systemv/lpstat.c:1941
#, c-format
msgid "\tDescription: %s"
msgstr ""
-#: systemv/lpstat.c:1790 systemv/lpstat.c:1910
+#: systemv/lpstat.c:1814 systemv/lpstat.c:1934
msgid "\tForm mounted:"
msgstr ""
-#: systemv/lpstat.c:1863 systemv/lpstat.c:1982
+#: systemv/lpstat.c:1887 systemv/lpstat.c:2006
msgid "\tForms allowed:"
msgstr ""
-#: systemv/lpstat.c:1829 systemv/lpstat.c:1949
+#: systemv/lpstat.c:1853 systemv/lpstat.c:1973
#, c-format
msgid "\tInterface: %s.ppd"
msgstr ""
-#: systemv/lpstat.c:1838 systemv/lpstat.c:1957
+#: systemv/lpstat.c:1862 systemv/lpstat.c:1981
#, c-format
msgid "\tInterface: %s/ppd/%s.ppd"
msgstr ""
-#: systemv/lpstat.c:1820 systemv/lpstat.c:1940
+#: systemv/lpstat.c:1844 systemv/lpstat.c:1964
#, c-format
msgid "\tLocation: %s"
msgstr ""
-#: systemv/lpstat.c:1841 systemv/lpstat.c:1960
+#: systemv/lpstat.c:1865 systemv/lpstat.c:1984
msgid "\tOn fault: no alert"
msgstr ""
-#: systemv/lpstat.c:1792 systemv/lpstat.c:1912
+#: systemv/lpstat.c:1816 systemv/lpstat.c:1936
msgid "\tPrinter types: unknown"
msgstr ""
-#: systemv/lpstat.c:1452
+#: systemv/lpstat.c:1476
#, c-format
msgid "\tStatus: %s"
msgstr ""
-#: systemv/lpstat.c:1846 systemv/lpstat.c:1860 systemv/lpstat.c:1965
-#: systemv/lpstat.c:1979
+#: systemv/lpstat.c:1870 systemv/lpstat.c:1884 systemv/lpstat.c:1989
+#: systemv/lpstat.c:2003
msgid "\tUsers allowed:"
msgstr ""
-#: systemv/lpstat.c:1853 systemv/lpstat.c:1972
+#: systemv/lpstat.c:1877 systemv/lpstat.c:1996
msgid "\tUsers denied:"
msgstr ""
@@ -168,7 +168,7 @@ msgstr ""
msgid "\tprinting is enabled"
msgstr ""
-#: systemv/lpstat.c:1472
+#: systemv/lpstat.c:1496
#, c-format
msgid "\tqueued for %s"
msgstr ""
@@ -181,7 +181,7 @@ msgstr ""
msgid "\tqueuing is enabled"
msgstr ""
-#: systemv/lpstat.c:1783 systemv/lpstat.c:1903
+#: systemv/lpstat.c:1807 systemv/lpstat.c:1927
msgid "\treason unknown"
msgstr ""
@@ -1018,7 +1018,7 @@ msgstr ""
msgid " --false Always false."
msgstr ""
-#: test/ipptool.c:4931
+#: test/ipptool.c:5061
msgid " --help Show help."
msgstr ""
@@ -1078,7 +1078,7 @@ msgstr ""
msgid " --remote True if service is remote."
msgstr ""
-#: test/ipptool.c:4932
+#: test/ipptool.c:5062
msgid ""
" --stop-after-include-error\n"
" Stop tests after a failed INCLUDE."
@@ -1104,19 +1104,19 @@ msgstr ""
msgid " --version Show program version."
msgstr ""
-#: test/ipptool.c:4934
+#: test/ipptool.c:5064
msgid " --version Show version."
msgstr ""
-#: test/ippfind.c:2752 test/ipptool.c:4935
+#: test/ippfind.c:2752 test/ipptool.c:5065
msgid " -4 Connect using IPv4."
msgstr ""
-#: test/ippfind.c:2753 test/ipptool.c:4936
+#: test/ippfind.c:2753 test/ipptool.c:5066
msgid " -6 Connect using IPv6."
msgstr ""
-#: test/ipptool.c:4937
+#: test/ipptool.c:5067
msgid " -C Send requests using chunking (default)."
msgstr ""
@@ -1132,11 +1132,11 @@ msgstr ""
msgid " -E Encrypt the connection."
msgstr ""
-#: test/ipptool.c:4939
-msgid " -E Test with HTTP Upgrade to TLS."
+#: test/ipptool.c:5069
+msgid " -E Test with encryption using HTTP Upgrade to TLS."
msgstr ""
-#: scheduler/main.c:2051
+#: scheduler/main.c:2084
msgid " -F Run in the foreground but detach from console."
msgstr ""
@@ -1144,7 +1144,7 @@ msgstr ""
msgid " -H samba-server Use the named SAMBA server."
msgstr ""
-#: test/ipptool.c:4941
+#: test/ipptool.c:5070
msgid " -I Ignore errors."
msgstr ""
@@ -1156,11 +1156,11 @@ msgstr ""
msgid " -I {filename,filters,none,profiles}"
msgstr ""
-#: test/ipptool.c:4942
+#: test/ipptool.c:5071
msgid " -L Send requests using content-length."
msgstr ""
-#: test/ipptool.c:4944
+#: test/ipptool.c:5072
msgid " -P filename.plist Produce XML plist to a file and test report to standard output."
msgstr ""
@@ -1176,15 +1176,15 @@ msgstr ""
msgid " -R root-directory Set alternate root."
msgstr ""
-#: test/ipptool.c:4945
-msgid " -S Test with SSL encryption."
+#: test/ipptool.c:5073
+msgid " -S Test with encryption using HTTPS."
msgstr ""
#: test/ippfind.c:2754
msgid " -T seconds Set the browse timeout in seconds."
msgstr ""
-#: test/ipptool.c:4947
+#: test/ipptool.c:5074
msgid " -T seconds Set the receive/send timeout in seconds."
msgstr ""
@@ -1192,7 +1192,7 @@ msgstr ""
msgid " -U username Specify username."
msgstr ""
-#: test/ippfind.c:2756 test/ipptool.c:4949
+#: test/ippfind.c:2756 test/ipptool.c:5075
msgid " -V version Set default IPP version."
msgstr ""
@@ -1200,7 +1200,7 @@ msgstr ""
msgid " -W {all,none,constraints,defaults,duplex,filters,profiles,sizes,translations}"
msgstr ""
-#: test/ipptool.c:4951
+#: test/ipptool.c:5076
msgid " -X Produce XML plist instead of plain text."
msgstr ""
@@ -1208,7 +1208,7 @@ msgstr ""
msgid " -a Export all printers."
msgstr ""
-#: test/ipptool.c:4953
+#: test/ipptool.c:5077
msgid " -c Produce CSV output."
msgstr ""
@@ -1220,11 +1220,11 @@ msgstr ""
msgid " -c cups-files.conf Set cups-files.conf file to use."
msgstr ""
-#: scheduler/main.c:2049
+#: scheduler/main.c:2082
msgid " -c cupsd.conf Set cupsd.conf file to use."
msgstr ""
-#: test/ipptool.c:4954
+#: test/ipptool.c:5078
msgid " -d name=value Set named variable to value."
msgstr ""
@@ -1244,15 +1244,15 @@ msgstr ""
msgid " -e Use every filter from the PPD file."
msgstr ""
-#: scheduler/main.c:2050
+#: scheduler/main.c:2083
msgid " -f Run in the foreground."
msgstr ""
-#: test/ipptool.c:4956
+#: test/ipptool.c:5079
msgid " -f filename Set default request filename."
msgstr ""
-#: scheduler/main.c:2052
+#: scheduler/main.c:2085
msgid " -h Show this usage message."
msgstr ""
@@ -1268,7 +1268,7 @@ msgstr ""
msgid " -i mime/type Set input MIME type (otherwise auto-typed)."
msgstr ""
-#: test/ipptool.c:4958
+#: test/ipptool.c:5080
msgid " -i seconds Repeat the last file with the given time interval."
msgstr ""
@@ -1280,11 +1280,11 @@ msgstr ""
msgid " -l List attributes."
msgstr ""
-#: test/ipptool.c:4960
+#: test/ipptool.c:5081
msgid " -l Produce plain text output."
msgstr ""
-#: scheduler/main.c:2054
+#: scheduler/main.c:2087
msgid " -l Run cupsd on demand."
msgstr ""
@@ -1304,7 +1304,7 @@ msgstr ""
msgid " -n copies Set number of copies."
msgstr ""
-#: test/ipptool.c:4961
+#: test/ipptool.c:5082
msgid " -n count Repeat the last file the given number of times."
msgstr ""
@@ -1336,7 +1336,7 @@ msgstr ""
msgid " -q Quietly report match via exit code."
msgstr ""
-#: systemv/cupstestppd.c:3868 test/ipptool.c:4963
+#: systemv/cupstestppd.c:3868 test/ipptool.c:5083
msgid " -q Run silently."
msgstr ""
@@ -1352,11 +1352,11 @@ msgstr ""
msgid " -s Print service name if true."
msgstr ""
-#: scheduler/main.c:2056
+#: scheduler/main.c:2089
msgid " -s cups-files.conf Set cups-files.conf file to use."
msgstr ""
-#: test/ipptool.c:4964
+#: test/ipptool.c:5084
msgid " -t Produce a test report."
msgstr ""
@@ -1364,7 +1364,7 @@ msgstr ""
msgid " -t Test PPDs instead of generating them."
msgstr ""
-#: scheduler/main.c:2057
+#: scheduler/main.c:2090
msgid " -t Test the configuration file."
msgstr ""
@@ -1384,7 +1384,7 @@ msgstr ""
msgid " -u regex Match URI to regular expression."
msgstr ""
-#: systemv/cupsaddsmb.c:283 systemv/cupstestppd.c:3870 test/ipptool.c:4965
+#: systemv/cupsaddsmb.c:283 systemv/cupstestppd.c:3870 test/ipptool.c:5085
#: ppdc/ppdc.cxx:445 ppdc/ppdpo.cxx:252
msgid " -v Be verbose."
msgstr ""
@@ -1553,172 +1553,172 @@ msgstr ""
#: cups/ipp.c:5202
#, c-format
-msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 2911 section 4.1.5)."
+msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 8011 section 5.1.6)."
msgstr ""
#: cups/ipp.c:5213
#, c-format
-msgid "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 2911 section 4.1.5)."
+msgid "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 8011 section 5.1.6)."
msgstr ""
#: cups/ipp.c:4833
#, c-format
-msgid "\"%s\": Bad attribute name - bad length %d (RFC 2911 section 4.1.3)."
+msgid "\"%s\": Bad attribute name - bad length %d (RFC 8011 section 5.1.4)."
msgstr ""
#: cups/ipp.c:4825
#, c-format
-msgid "\"%s\": Bad attribute name - invalid character (RFC 2911 section 4.1.3)."
+msgid "\"%s\": Bad attribute name - invalid character (RFC 8011 section 5.1.4)."
msgstr ""
#: cups/ipp.c:4851
#, c-format
-msgid "\"%s\": Bad boolen value %d (RFC 2911 section 4.1.11)."
+msgid "\"%s\": Bad boolen value %d (RFC 8011 section 5.1.21)."
msgstr ""
#: cups/ipp.c:5265
#, c-format
-msgid "\"%s\": Bad charset value \"%s\" - bad characters (RFC 2911 section 4.1.7)."
+msgid "\"%s\": Bad charset value \"%s\" - bad characters (RFC 8011 section 5.1.8)."
msgstr ""
#: cups/ipp.c:5274
#, c-format
-msgid "\"%s\": Bad charset value \"%s\" - bad length %d (RFC 2911 section 4.1.7)."
+msgid "\"%s\": Bad charset value \"%s\" - bad length %d (RFC 8011 section 5.1.8)."
msgstr ""
#: cups/ipp.c:4951
#, c-format
-msgid "\"%s\": Bad dateTime UTC hours %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC hours %u (RFC 8011 section 5.1.15)."
msgstr ""
#: cups/ipp.c:4959
#, c-format
-msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 8011 section 5.1.15)."
msgstr ""
#: cups/ipp.c:4943
#, c-format
-msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 8011 section 5.1.15)."
msgstr ""
#: cups/ipp.c:4903
#, c-format
-msgid "\"%s\": Bad dateTime day %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime day %u (RFC 8011 section 5.1.15)."
msgstr ""
#: cups/ipp.c:4935
#, c-format
-msgid "\"%s\": Bad dateTime deciseconds %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime deciseconds %u (RFC 8011 section 5.1.15)."
msgstr ""
#: cups/ipp.c:4911
#, c-format
-msgid "\"%s\": Bad dateTime hours %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime hours %u (RFC 8011 section 5.1.15)."
msgstr ""
#: cups/ipp.c:4919
#, c-format
-msgid "\"%s\": Bad dateTime minutes %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime minutes %u (RFC 8011 section 5.1.15)."
msgstr ""
#: cups/ipp.c:4895
#, c-format
-msgid "\"%s\": Bad dateTime month %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime month %u (RFC 8011 section 5.1.15)."
msgstr ""
#: cups/ipp.c:4927
#, c-format
-msgid "\"%s\": Bad dateTime seconds %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime seconds %u (RFC 8011 section 5.1.15)."
msgstr ""
#: cups/ipp.c:4865
#, c-format
-msgid "\"%s\": Bad enum value %d - out of range (RFC 2911 section 4.1.4)."
+msgid "\"%s\": Bad enum value %d - out of range (RFC 8011 section 5.1.5)."
msgstr ""
#: cups/ipp.c:5180
#, c-format
-msgid "\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 2911 section 4.1.3)."
+msgid "\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 8011 section 5.1.4)."
msgstr ""
#: cups/ipp.c:5171
#, c-format
-msgid "\"%s\": Bad keyword value \"%s\" - invalid character (RFC 2911 section 4.1.3)."
+msgid "\"%s\": Bad keyword value \"%s\" - invalid character (RFC 8011 section 5.1.4)."
msgstr ""
#: cups/ipp.c:5374
#, c-format
-msgid "\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 2911 section 4.1.9)."
+msgid "\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 8011 section 5.1.10)."
msgstr ""
#: cups/ipp.c:5384
#, c-format
-msgid "\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 2911 section 4.1.9)."
+msgid "\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 8011 section 5.1.10)."
msgstr ""
#: cups/ipp.c:5142
#, c-format
-msgid "\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.2)."
+msgid "\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."
msgstr ""
#: cups/ipp.c:5151
#, c-format
-msgid "\"%s\": Bad name value \"%s\" - bad length %d (RFC 2911 section 4.1.2)."
+msgid "\"%s\": Bad name value \"%s\" - bad length %d (RFC 8011 section 5.1.3)."
msgstr ""
#: cups/ipp.c:5320
#, c-format
-msgid "\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 2911 section 4.1.8)."
+msgid "\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 8011 section 5.1.9)."
msgstr ""
#: cups/ipp.c:5330
#, c-format
-msgid "\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 2911 section 4.1.8)."
+msgid "\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 8011 section 5.1.9)."
msgstr ""
#: cups/ipp.c:4879
#, c-format
-msgid "\"%s\": Bad octetString value - bad length %d (RFC 2911 section 4.1.10)."
+msgid "\"%s\": Bad octetString value - bad length %d (RFC 8011 section 5.1.20)."
msgstr ""
#: cups/ipp.c:5022
#, c-format
-msgid "\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 2911 section 4.1.13)."
+msgid "\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 8011 section 5.1.14)."
msgstr ""
#: cups/ipp.c:5003
#, c-format
-msgid "\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 2911 section 4.1.15)."
+msgid "\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 8011 section 5.1.16)."
msgstr ""
#: cups/ipp.c:4972
#, c-format
-msgid "\"%s\": Bad resolution value %dx%d%s - cross feed resolution must be positive (RFC 2911 section 4.1.15)."
+msgid "\"%s\": Bad resolution value %dx%d%s - cross feed resolution must be positive (RFC 8011 section 5.1.16)."
msgstr ""
#: cups/ipp.c:4987
#, c-format
-msgid "\"%s\": Bad resolution value %dx%d%s - feed resolution must be positive (RFC 2911 section 4.1.15)."
+msgid "\"%s\": Bad resolution value %dx%d%s - feed resolution must be positive (RFC 8011 section 5.1.16)."
msgstr ""
#: cups/ipp.c:5084
#, c-format
-msgid "\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.1)."
+msgid "\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."
msgstr ""
#: cups/ipp.c:5093
#, c-format
-msgid "\"%s\": Bad text value \"%s\" - bad length %d (RFC 2911 section 4.1.1)."
+msgid "\"%s\": Bad text value \"%s\" - bad length %d (RFC 8011 section 5.1.2)."
msgstr ""
#: cups/ipp.c:5236
#, c-format
-msgid "\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 2911 section 4.1.6)."
+msgid "\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 8011 section 5.1.7)."
msgstr ""
#: cups/ipp.c:5245
#, c-format
-msgid "\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 2911 section 4.1.6)."
+msgid "\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 8011 section 5.1.7)."
msgstr ""
#: berkeley/lpq.c:542
@@ -1761,12 +1761,12 @@ msgstr ""
msgid "%s (Borderless, %s, %s)"
msgstr ""
-#: systemv/lpstat.c:775
+#: systemv/lpstat.c:799
#, c-format
msgid "%s accepting requests since %s"
msgstr ""
-#: scheduler/ipp.c:10294
+#: scheduler/ipp.c:10297
#, c-format
msgid "%s cannot be changed."
msgstr ""
@@ -1797,7 +1797,7 @@ msgstr ""
msgid "%s job-id user title copies options [file]"
msgstr ""
-#: systemv/lpstat.c:779
+#: systemv/lpstat.c:803
#, c-format
msgid "%s not accepting requests since %s -"
msgstr ""
@@ -1807,12 +1807,12 @@ msgstr ""
msgid "%s not supported."
msgstr ""
-#: systemv/lpstat.c:790
+#: systemv/lpstat.c:814
#, c-format
msgid "%s/%s accepting requests since %s"
msgstr ""
-#: systemv/lpstat.c:795
+#: systemv/lpstat.c:819
#, c-format
msgid "%s/%s not accepting requests since %s -"
msgstr ""
@@ -1841,7 +1841,7 @@ msgstr ""
msgid "%s: Bad printer URI \"%s\"."
msgstr ""
-#: test/ippfind.c:775 test/ipptool.c:369
+#: test/ippfind.c:775 test/ipptool.c:370
#, c-format
msgid "%s: Bad version %s for \"-V\"."
msgstr ""
@@ -1858,11 +1858,11 @@ msgstr ""
#: berkeley/lpq.c:139 berkeley/lpq.c:212 berkeley/lpr.c:229 berkeley/lpr.c:340
#: systemv/lp.c:161 systemv/lp.c:581 systemv/lp.c:701 systemv/lp.c:750
-#: systemv/lpstat.c:190 systemv/lpstat.c:235 systemv/lpstat.c:333
-#: systemv/lpstat.c:360 systemv/lpstat.c:382 systemv/lpstat.c:442
-#: systemv/lpstat.c:508 systemv/lpstat.c:569 systemv/lpstat.c:694
-#: systemv/lpstat.c:878 systemv/lpstat.c:1139 systemv/lpstat.c:1337
-#: systemv/lpstat.c:1577
+#: systemv/lpstat.c:190 systemv/lpstat.c:235 systemv/lpstat.c:357
+#: systemv/lpstat.c:384 systemv/lpstat.c:406 systemv/lpstat.c:466
+#: systemv/lpstat.c:532 systemv/lpstat.c:593 systemv/lpstat.c:718
+#: systemv/lpstat.c:902 systemv/lpstat.c:1163 systemv/lpstat.c:1361
+#: systemv/lpstat.c:1601
#, c-format
msgid "%s: Error - add '/version=1.1' to server name."
msgstr ""
@@ -1933,7 +1933,7 @@ msgid "%s: Error - expected hostname after \"-H\" option."
msgstr ""
#: berkeley/lpq.c:173 berkeley/lprm.c:124 systemv/cancel.c:124
-#: systemv/cupsaccept.c:127 systemv/lp.c:198 systemv/lpstat.c:269
+#: systemv/cupsaccept.c:127 systemv/lp.c:198 systemv/lpstat.c:293
#, c-format
msgid "%s: Error - expected hostname after \"-h\" option."
msgstr ""
@@ -2036,7 +2036,7 @@ msgid "%s: Error - unknown destination \"%s/%s\"."
msgstr ""
#: berkeley/lpr.c:284 berkeley/lprm.c:139 systemv/cancel.c:162
-#: systemv/cupsaccept.c:155 systemv/lp.c:508 systemv/lpstat.c:452
+#: systemv/cupsaccept.c:155 systemv/lp.c:508 systemv/lpstat.c:476
#, c-format
msgid "%s: Error - unknown option \"%c\"."
msgstr ""
@@ -2051,7 +2051,7 @@ msgstr ""
msgid "%s: Expected job ID after \"-i\" option."
msgstr ""
-#: systemv/lpstat.c:512 systemv/lpstat.c:552
+#: systemv/lpstat.c:536 systemv/lpstat.c:576
#, c-format
msgid "%s: Invalid destination name in list \"%s\"."
msgstr ""
@@ -2061,17 +2061,17 @@ msgstr ""
msgid "%s: Invalid filter string \"%s\"."
msgstr ""
-#: test/ipptool.c:300
+#: test/ipptool.c:301
#, c-format
msgid "%s: Missing filename for \"-P\"."
msgstr ""
-#: test/ippfind.c:747 test/ipptool.c:337
+#: test/ippfind.c:747 test/ipptool.c:338
#, c-format
msgid "%s: Missing timeout for \"-T\"."
msgstr ""
-#: test/ippfind.c:760 test/ipptool.c:351
+#: test/ippfind.c:760 test/ipptool.c:352
#, c-format
msgid "%s: Missing version for \"-V\"."
msgstr ""
@@ -2094,7 +2094,7 @@ msgstr ""
#: berkeley/lpq.c:87 berkeley/lpr.c:69 berkeley/lprm.c:65 systemv/cancel.c:79
#: systemv/cupsaccept.c:89 systemv/cupsaddsmb.c:78 systemv/lp.c:99
#: systemv/lpadmin.c:232 systemv/lpinfo.c:192 systemv/lpmove.c:70
-#: systemv/lpstat.c:91 test/ipptool.c:282 test/ipptool.c:326
+#: systemv/lpstat.c:91 test/ipptool.c:283 test/ipptool.c:327
#, c-format
msgid "%s: Sorry, no encryption support."
msgstr ""
@@ -2125,7 +2125,7 @@ msgstr ""
msgid "%s: Unable to determine MIME type of \"%s\"."
msgstr ""
-#: test/ipptool.c:309
+#: test/ipptool.c:310
#, c-format
msgid "%s: Unable to open \"%s\": %s"
msgstr ""
@@ -2155,7 +2155,7 @@ msgstr ""
msgid "%s: Unknown argument \"%s\"."
msgstr ""
-#: berkeley/lpq.c:143 systemv/lpstat.c:573
+#: berkeley/lpq.c:143 systemv/lpstat.c:597
#, c-format
msgid "%s: Unknown destination \"%s\"."
msgstr ""
@@ -3208,7 +3208,7 @@ msgstr ""
msgid "Accept Jobs"
msgstr ""
-#: cups/http-support.c:1351
+#: cups/http-support.c:1355
msgid "Accepted"
msgstr ""
@@ -3357,12 +3357,12 @@ msgstr ""
msgid "Back Print Film"
msgstr ""
-#: scheduler/ipp.c:11241
+#: scheduler/ipp.c:11244
#, c-format
msgid "Bad 'document-format' value \"%s\"."
msgstr ""
-#: cups/dest.c:1846
+#: cups/dest.c:2021
msgid "Bad NULL dests pointer"
msgstr ""
@@ -3395,7 +3395,7 @@ msgstr ""
msgid "Bad PPD file."
msgstr ""
-#: cups/http-support.c:1366
+#: cups/http-support.c:1370
msgid "Bad Request"
msgstr ""
@@ -3407,7 +3407,7 @@ msgstr ""
msgid "Bad UIConstraints"
msgstr ""
-#: cups/hash.c:51 cups/http-support.c:1460
+#: cups/hash.c:51 cups/http-support.c:1464
msgid "Bad arguments to function"
msgstr ""
@@ -3420,7 +3420,7 @@ msgstr ""
msgid "Bad custom parameter"
msgstr ""
-#: cups/http-support.c:1600 scheduler/ipp.c:2378
+#: cups/http-support.c:1604 scheduler/ipp.c:2378
#, c-format
msgid "Bad device-uri \"%s\"."
msgstr ""
@@ -3430,12 +3430,12 @@ msgstr ""
msgid "Bad device-uri scheme \"%s\"."
msgstr ""
-#: scheduler/ipp.c:8449 scheduler/ipp.c:8467 scheduler/ipp.c:9695
+#: scheduler/ipp.c:8452 scheduler/ipp.c:8470 scheduler/ipp.c:9698
#, c-format
msgid "Bad document-format \"%s\"."
msgstr ""
-#: scheduler/ipp.c:9713
+#: scheduler/ipp.c:9716
#, c-format
msgid "Bad document-format-default \"%s\"."
msgstr ""
@@ -3444,7 +3444,7 @@ msgstr ""
msgid "Bad filename buffer"
msgstr ""
-#: cups/http-support.c:1469
+#: cups/http-support.c:1473
msgid "Bad hostname/address in URI"
msgstr ""
@@ -3457,7 +3457,7 @@ msgstr ""
msgid "Bad job-name value: Wrong type or count."
msgstr ""
-#: scheduler/ipp.c:10309
+#: scheduler/ipp.c:10312
msgid "Bad job-priority value."
msgstr ""
@@ -3470,24 +3470,24 @@ msgstr ""
msgid "Bad job-sheets value type."
msgstr ""
-#: scheduler/ipp.c:10339
+#: scheduler/ipp.c:10342
msgid "Bad job-state value."
msgstr ""
-#: scheduler/ipp.c:3008 scheduler/ipp.c:3470 scheduler/ipp.c:6234
-#: scheduler/ipp.c:6381 scheduler/ipp.c:7878 scheduler/ipp.c:8147
-#: scheduler/ipp.c:9013 scheduler/ipp.c:9237 scheduler/ipp.c:9589
-#: scheduler/ipp.c:10202
+#: scheduler/ipp.c:3008 scheduler/ipp.c:3470 scheduler/ipp.c:6237
+#: scheduler/ipp.c:6384 scheduler/ipp.c:7881 scheduler/ipp.c:8150
+#: scheduler/ipp.c:9016 scheduler/ipp.c:9240 scheduler/ipp.c:9592
+#: scheduler/ipp.c:10205
#, c-format
msgid "Bad job-uri \"%s\"."
msgstr ""
-#: scheduler/ipp.c:2064 scheduler/ipp.c:5773
+#: scheduler/ipp.c:2064 scheduler/ipp.c:5776
#, c-format
msgid "Bad notify-pull-method \"%s\"."
msgstr ""
-#: scheduler/ipp.c:2028 scheduler/ipp.c:5737
+#: scheduler/ipp.c:2028 scheduler/ipp.c:5740
#, c-format
msgid "Bad notify-recipient-uri \"%s\"."
msgstr ""
@@ -3507,7 +3507,7 @@ msgstr ""
msgid "Bad page-ranges values %d-%d."
msgstr ""
-#: cups/http-support.c:1466
+#: cups/http-support.c:1470
msgid "Bad port number in URI"
msgstr ""
@@ -3521,7 +3521,7 @@ msgstr ""
msgid "Bad printer-state value %d."
msgstr ""
-#: cups/dest.c:649 cups/dest.c:1406 cups/dest.c:1453
+#: cups/dest.c:671 cups/dest.c:1552 cups/dest.c:1603
msgid "Bad printer-uri."
msgstr ""
@@ -3535,11 +3535,11 @@ msgstr ""
msgid "Bad request version number %d.%d."
msgstr ""
-#: cups/http-support.c:1463
+#: cups/http-support.c:1467
msgid "Bad resource in URI"
msgstr ""
-#: cups/http-support.c:1475
+#: cups/http-support.c:1479
msgid "Bad scheme in URI"
msgstr ""
@@ -3547,7 +3547,7 @@ msgstr ""
msgid "Bad subscription ID"
msgstr ""
-#: cups/http-support.c:1472
+#: cups/http-support.c:1476
msgid "Bad username in URI"
msgstr ""
@@ -3555,7 +3555,7 @@ msgstr ""
msgid "Bad value string"
msgstr ""
-#: cups/http-support.c:1478
+#: cups/http-support.c:1482
msgid "Bad/empty URI"
msgstr ""
@@ -3677,7 +3677,7 @@ msgstr ""
msgid "Change Settings"
msgstr ""
-#: scheduler/ipp.c:2076 scheduler/ipp.c:5785
+#: scheduler/ipp.c:2076 scheduler/ipp.c:5788
#, c-format
msgid "Character set \"%s\" not supported."
msgstr ""
@@ -3738,7 +3738,7 @@ msgstr ""
msgid "Connecting to printer."
msgstr ""
-#: cups/http-support.c:1339
+#: cups/http-support.c:1343
msgid "Continue"
msgstr ""
@@ -3774,7 +3774,7 @@ msgstr ""
msgid "Cover"
msgstr ""
-#: cups/http-support.c:1348
+#: cups/http-support.c:1352
msgid "Created"
msgstr ""
@@ -3895,7 +3895,7 @@ msgstr ""
msgid "Disc"
msgstr ""
-#: scheduler/ipp.c:6283
+#: scheduler/ipp.c:6286
#, c-format
msgid "Document #%d does not exist in job #%d."
msgstr ""
@@ -3963,7 +3963,7 @@ msgstr ""
msgid "Empty PPD file."
msgstr ""
-#: cups/http.c:4617
+#: cups/http.c:4620
msgid "Encryption is not supported."
msgstr ""
@@ -4281,7 +4281,7 @@ msgstr ""
msgid "Executive"
msgstr ""
-#: cups/http-support.c:1394
+#: cups/http-support.c:1398
msgid "Expectation Failed"
msgstr ""
@@ -4407,7 +4407,7 @@ msgstr ""
msgid "Folio"
msgstr ""
-#: cups/http-support.c:1373
+#: cups/http-support.c:1377
msgid "Forbidden"
msgstr ""
@@ -4476,9 +4476,9 @@ msgid "Glossy Photo Paper"
msgstr ""
#: scheduler/ipp.c:2986 scheduler/ipp.c:3396 scheduler/ipp.c:3934
-#: scheduler/ipp.c:6212 scheduler/ipp.c:6359 scheduler/ipp.c:7855
-#: scheduler/ipp.c:8991 scheduler/ipp.c:9215 scheduler/ipp.c:9567
-#: scheduler/ipp.c:10180
+#: scheduler/ipp.c:6215 scheduler/ipp.c:6362 scheduler/ipp.c:7858
+#: scheduler/ipp.c:8994 scheduler/ipp.c:9218 scheduler/ipp.c:9570
+#: scheduler/ipp.c:10183
msgid "Got a printer-uri attribute but no job-id."
msgstr ""
@@ -4702,7 +4702,7 @@ msgstr ""
msgid "Intellitech"
msgstr ""
-#: cups/http-support.c:1400
+#: cups/http-support.c:1404
msgid "Internal Server Error"
msgstr ""
@@ -4726,11 +4726,11 @@ msgstr ""
msgid "Invalid media name arguments."
msgstr ""
-#: cups/dest-options.c:1031
+#: cups/dest-options.c:1096
msgid "Invalid media size."
msgstr ""
-#: scheduler/ipp.c:2719 scheduler/ipp.c:7026
+#: scheduler/ipp.c:2719 scheduler/ipp.c:7029
msgid "Invalid ppd-name value."
msgstr ""
@@ -4799,17 +4799,17 @@ msgstr ""
msgid "JIS B9"
msgstr ""
-#: scheduler/ipp.c:9287
+#: scheduler/ipp.c:9290
#, c-format
msgid "Job #%d cannot be restarted - no files."
msgstr ""
#: scheduler/ipp.c:3026 scheduler/ipp.c:3260 scheduler/ipp.c:3319
-#: scheduler/ipp.c:3498 scheduler/ipp.c:3944 scheduler/ipp.c:5871
-#: scheduler/ipp.c:6252 scheduler/ipp.c:6399 scheduler/ipp.c:6736
-#: scheduler/ipp.c:7696 scheduler/ipp.c:7718 scheduler/ipp.c:7896
-#: scheduler/ipp.c:8121 scheduler/ipp.c:8164 scheduler/ipp.c:9031
-#: scheduler/ipp.c:9255 scheduler/ipp.c:9607 scheduler/ipp.c:10220
+#: scheduler/ipp.c:3498 scheduler/ipp.c:3944 scheduler/ipp.c:5874
+#: scheduler/ipp.c:6255 scheduler/ipp.c:6402 scheduler/ipp.c:6739
+#: scheduler/ipp.c:7699 scheduler/ipp.c:7721 scheduler/ipp.c:7899
+#: scheduler/ipp.c:8124 scheduler/ipp.c:8167 scheduler/ipp.c:9034
+#: scheduler/ipp.c:9258 scheduler/ipp.c:9610 scheduler/ipp.c:10223
#, c-format
msgid "Job #%d does not exist."
msgstr ""
@@ -4829,12 +4829,12 @@ msgstr ""
msgid "Job #%d is already completed - can't cancel."
msgstr ""
-#: scheduler/ipp.c:7922 scheduler/ipp.c:8206 scheduler/ipp.c:10235
+#: scheduler/ipp.c:7925 scheduler/ipp.c:8209 scheduler/ipp.c:10238
#, c-format
msgid "Job #%d is finished and cannot be altered."
msgstr ""
-#: scheduler/ipp.c:9269
+#: scheduler/ipp.c:9272
#, c-format
msgid "Job #%d is not complete."
msgstr ""
@@ -4844,7 +4844,7 @@ msgstr ""
msgid "Job #%d is not held for authentication."
msgstr ""
-#: scheduler/ipp.c:9045
+#: scheduler/ipp.c:9048
#, c-format
msgid "Job #%d is not held."
msgstr ""
@@ -4865,7 +4865,7 @@ msgstr ""
msgid "Job Stopped"
msgstr ""
-#: scheduler/ipp.c:10317
+#: scheduler/ipp.c:10320
msgid "Job is completed and cannot be changed."
msgstr ""
@@ -4873,11 +4873,11 @@ msgstr ""
msgid "Job operation failed"
msgstr ""
-#: scheduler/ipp.c:10353 scheduler/ipp.c:10370 scheduler/ipp.c:10381
+#: scheduler/ipp.c:10356 scheduler/ipp.c:10373 scheduler/ipp.c:10384
msgid "Job state cannot be changed."
msgstr ""
-#: scheduler/ipp.c:9135
+#: scheduler/ipp.c:9138
msgid "Job subscriptions cannot be renewed."
msgstr ""
@@ -4913,7 +4913,7 @@ msgstr ""
msgid "Laminating Foil"
msgstr ""
-#: scheduler/ipp.c:2085 scheduler/ipp.c:5794
+#: scheduler/ipp.c:2085 scheduler/ipp.c:5797
#, c-format
msgid "Language \"%s\" not supported."
msgstr ""
@@ -4986,7 +4986,7 @@ msgstr ""
msgid "Load paper."
msgstr ""
-#: scheduler/ipp.c:5503
+#: scheduler/ipp.c:5506
msgid "Local printer created."
msgstr ""
@@ -4994,7 +4994,7 @@ msgstr ""
msgid "Long-Edge (Portrait)"
msgstr ""
-#: cups/http-support.c:1727
+#: cups/http-support.c:1731
msgid "Looking for printer."
msgstr ""
@@ -5146,7 +5146,7 @@ msgstr ""
msgid "Missing asterisk in column 1"
msgstr ""
-#: scheduler/ipp.c:6275
+#: scheduler/ipp.c:6278
msgid "Missing document-number attribute."
msgstr ""
@@ -5161,7 +5161,7 @@ msgstr ""
msgid "Missing form variable"
msgstr ""
-#: scheduler/ipp.c:9661
+#: scheduler/ipp.c:9664
msgid "Missing last-document attribute in request."
msgstr ""
@@ -5173,7 +5173,7 @@ msgstr ""
msgid "Missing media-size in media-col."
msgstr ""
-#: scheduler/ipp.c:6876
+#: scheduler/ipp.c:6879
msgid "Missing notify-subscription-ids attribute."
msgstr ""
@@ -5194,11 +5194,11 @@ msgstr ""
msgid "Missing required attributes."
msgstr ""
-#: cups/http-support.c:1490
+#: cups/http-support.c:1494
msgid "Missing resource in URI"
msgstr ""
-#: cups/http-support.c:1484
+#: cups/http-support.c:1488
msgid "Missing scheme in URI"
msgstr ""
@@ -5252,7 +5252,7 @@ msgstr ""
msgid "Move Job"
msgstr ""
-#: cups/http-support.c:1357
+#: cups/http-support.c:1361
msgid "Moved Permanently"
msgstr ""
@@ -5320,7 +5320,7 @@ msgstr ""
msgid "No"
msgstr ""
-#: cups/http-support.c:1354
+#: cups/http-support.c:1358
msgid "No Content"
msgstr ""
@@ -5369,11 +5369,11 @@ msgstr ""
msgid "No community name"
msgstr ""
-#: scheduler/ipp.c:6075
+#: scheduler/ipp.c:6078
msgid "No default printer."
msgstr ""
-#: cgi-bin/ipp-var.c:422 scheduler/ipp.c:7456
+#: cgi-bin/ipp-var.c:422 scheduler/ipp.c:7459
msgid "No destinations added."
msgstr ""
@@ -5389,7 +5389,7 @@ msgstr ""
msgid "No error-status"
msgstr ""
-#: scheduler/ipp.c:8411 scheduler/ipp.c:9675
+#: scheduler/ipp.c:8414 scheduler/ipp.c:9678
msgid "No file in print request."
msgstr ""
@@ -5418,7 +5418,7 @@ msgstr ""
msgid "No printer-uri found for class"
msgstr ""
-#: scheduler/ipp.c:6482
+#: scheduler/ipp.c:6485
msgid "No printer-uri in request."
msgstr ""
@@ -5442,11 +5442,11 @@ msgstr ""
msgid "No stored credentials, not valid for name."
msgstr ""
-#: scheduler/ipp.c:5679
+#: scheduler/ipp.c:5682
msgid "No subscription attributes in request."
msgstr ""
-#: scheduler/ipp.c:7795
+#: scheduler/ipp.c:7798
msgid "No subscriptions found."
msgstr ""
@@ -5475,11 +5475,11 @@ msgstr ""
msgid "Normal"
msgstr ""
-#: cups/http-support.c:1376
+#: cups/http-support.c:1380
msgid "Not Found"
msgstr ""
-#: cups/http-support.c:1388
+#: cups/http-support.c:1392
msgid "Not Implemented"
msgstr ""
@@ -5487,15 +5487,15 @@ msgstr ""
msgid "Not Installed"
msgstr ""
-#: cups/http-support.c:1363
+#: cups/http-support.c:1367
msgid "Not Modified"
msgstr ""
-#: cups/http-support.c:1391
+#: cups/http-support.c:1395
msgid "Not Supported"
msgstr ""
-#: scheduler/ipp.c:1535 scheduler/ipp.c:10936
+#: scheduler/ipp.c:1535 scheduler/ipp.c:10939
msgid "Not allowed to print."
msgstr ""
@@ -5507,7 +5507,7 @@ msgstr ""
msgid "Note: this program only validates the DSC comments, not the PostScript itself."
msgstr ""
-#: cups/http-support.c:1345 cups/http-support.c:1481 cups/ppd.c:313
+#: cups/http-support.c:1349 cups/http-support.c:1485 cups/ppd.c:313
msgid "OK"
msgstr ""
@@ -5561,9 +5561,9 @@ msgstr ""
msgid "Options Installed"
msgstr ""
-#: scheduler/cupsfilter.c:1480 scheduler/main.c:2048 systemv/cupsaddsmb.c:276
+#: scheduler/cupsfilter.c:1480 scheduler/main.c:2081 systemv/cupsaddsmb.c:276
#: systemv/cupsctl.c:196 systemv/cupstestdsc.c:421 systemv/cupstestppd.c:3859
-#: test/ippfind.c:2751 test/ipptool.c:4930 ppdc/ppdc.cxx:430
+#: test/ippfind.c:2751 test/ipptool.c:5060 ppdc/ppdc.cxx:430
#: ppdc/ppdhtml.cxx:177 ppdc/ppdi.cxx:123 ppdc/ppdmerge.cxx:361
#: ppdc/ppdpo.cxx:247
msgid "Options:"
@@ -5950,7 +5950,7 @@ msgstr ""
msgid "Quarto"
msgstr ""
-#: scheduler/ipp.c:1530 scheduler/ipp.c:10931
+#: scheduler/ipp.c:1530 scheduler/ipp.c:10934
msgid "Quota limit reached."
msgstr ""
@@ -5984,7 +5984,7 @@ msgstr ""
msgid "Reprint After Error"
msgstr ""
-#: cups/http-support.c:1379
+#: cups/http-support.c:1383
msgid "Request Entity Too Large"
msgstr ""
@@ -6073,7 +6073,7 @@ msgstr ""
msgid "SEQUENCE uses indefinite length"
msgstr ""
-#: cups/http-support.c:1403
+#: cups/http-support.c:1407
msgid "SSL/TLS Negotiation Error"
msgstr ""
@@ -6105,11 +6105,11 @@ msgstr ""
msgid "Security Labels"
msgstr ""
-#: cups/http-support.c:1360
+#: cups/http-support.c:1364
msgid "See Other"
msgstr ""
-#: scheduler/ipp.c:7080 scheduler/ipp.c:7099
+#: scheduler/ipp.c:7083 scheduler/ipp.c:7102
msgid "See remote printer."
msgstr ""
@@ -6165,7 +6165,7 @@ msgstr ""
msgid "Server credentials not set."
msgstr ""
-#: cups/http-support.c:1397
+#: cups/http-support.c:1401
msgid "Service Unavailable"
msgstr ""
@@ -6346,8 +6346,8 @@ msgstr ""
msgid "Statement"
msgstr ""
-#: scheduler/ipp.c:3593 scheduler/ipp.c:6892 scheduler/ipp.c:7602
-#: scheduler/ipp.c:9123
+#: scheduler/ipp.c:3593 scheduler/ipp.c:6895 scheduler/ipp.c:7605
+#: scheduler/ipp.c:9126
#, c-format
msgid "Subscription #%d does not exist."
msgstr ""
@@ -6368,7 +6368,7 @@ msgstr ""
msgid "Super B/A3"
msgstr ""
-#: cups/http-support.c:1342
+#: cups/http-support.c:1346
msgid "Switching Protocols"
msgstr ""
@@ -6405,8 +6405,8 @@ msgstr ""
msgid "The \"%s\" attribute is required for print jobs."
msgstr ""
-#: scheduler/ipp.c:6553 scheduler/ipp.c:6633 scheduler/ipp.c:6646
-#: scheduler/ipp.c:6658 scheduler/ipp.c:6673
+#: scheduler/ipp.c:6556 scheduler/ipp.c:6636 scheduler/ipp.c:6649
+#: scheduler/ipp.c:6661 scheduler/ipp.c:6676
#, c-format
msgid "The %s attribute cannot be provided with job-ids."
msgstr ""
@@ -6421,12 +6421,12 @@ msgstr ""
msgid "The '%s' operation attribute cannot be supplied in a Create-Job request."
msgstr ""
-#: scheduler/ipp.c:7122
+#: scheduler/ipp.c:7125
#, c-format
msgid "The PPD file \"%s\" could not be found."
msgstr ""
-#: scheduler/ipp.c:7111
+#: scheduler/ipp.c:7114
#, c-format
msgid "The PPD file \"%s\" could not be opened: %s"
msgstr ""
@@ -6460,7 +6460,7 @@ msgstr ""
msgid "The notify-lease-duration attribute cannot be used with job subscriptions."
msgstr ""
-#: scheduler/ipp.c:2095 scheduler/ipp.c:5804
+#: scheduler/ipp.c:2095 scheduler/ipp.c:5807
#, c-format
msgid "The notify-user-data value is too large (%d > 63 octets)."
msgstr ""
@@ -6537,13 +6537,13 @@ msgid "The printer name may only contain up to 127 printable characters and may
msgstr ""
#: scheduler/ipp.c:789 scheduler/ipp.c:1072 scheduler/ipp.c:3232
-#: scheduler/ipp.c:3413 scheduler/ipp.c:5213 scheduler/ipp.c:5638
-#: scheduler/ipp.c:5953 scheduler/ipp.c:6519 scheduler/ipp.c:7326
-#: scheduler/ipp.c:7382 scheduler/ipp.c:7708 scheduler/ipp.c:7980
-#: scheduler/ipp.c:8069 scheduler/ipp.c:8102 scheduler/ipp.c:8426
-#: scheduler/ipp.c:8833 scheduler/ipp.c:8915 scheduler/ipp.c:10089
-#: scheduler/ipp.c:10541 scheduler/ipp.c:10894 scheduler/ipp.c:10976
-#: scheduler/ipp.c:11351
+#: scheduler/ipp.c:3413 scheduler/ipp.c:5213 scheduler/ipp.c:5641
+#: scheduler/ipp.c:5956 scheduler/ipp.c:6522 scheduler/ipp.c:7329
+#: scheduler/ipp.c:7385 scheduler/ipp.c:7711 scheduler/ipp.c:7983
+#: scheduler/ipp.c:8072 scheduler/ipp.c:8105 scheduler/ipp.c:8429
+#: scheduler/ipp.c:8836 scheduler/ipp.c:8918 scheduler/ipp.c:10092
+#: scheduler/ipp.c:10544 scheduler/ipp.c:10897 scheduler/ipp.c:10979
+#: scheduler/ipp.c:11354
msgid "The printer or class does not exist."
msgstr ""
@@ -6596,12 +6596,12 @@ msgstr ""
msgid "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to enable it."
msgstr ""
-#: scheduler/ipp.c:6617
+#: scheduler/ipp.c:6620
#, c-format
msgid "The which-jobs value \"%s\" is not supported."
msgstr ""
-#: scheduler/ipp.c:5882
+#: scheduler/ipp.c:5885
msgid "There are too many subscriptions."
msgstr ""
@@ -6757,11 +6757,11 @@ msgstr ""
msgid "Trust on first use is disabled."
msgstr ""
-#: cups/http-support.c:1382
+#: cups/http-support.c:1386
msgid "URI Too Long"
msgstr ""
-#: cups/http-support.c:1457
+#: cups/http-support.c:1461
msgid "URI too large"
msgstr ""
@@ -6919,7 +6919,7 @@ msgstr ""
msgid "Unable to create credentials from array."
msgstr ""
-#: cups/ppd-util.c:542 cups/util.c:482
+#: cups/ppd-util.c:542 cups/util.c:500
msgid "Unable to create printer-uri"
msgstr ""
@@ -6987,7 +6987,7 @@ msgstr ""
msgid "Unable to find destination for job"
msgstr ""
-#: cups/http-support.c:1951
+#: cups/http-support.c:1955
msgid "Unable to find printer."
msgstr ""
@@ -7079,7 +7079,7 @@ msgstr ""
msgid "Unable to open device file"
msgstr ""
-#: scheduler/ipp.c:6296
+#: scheduler/ipp.c:6299
#, c-format
msgid "Unable to open document #%d in job #%d."
msgstr ""
@@ -7108,11 +7108,11 @@ msgstr ""
msgid "Unable to read print data."
msgstr ""
-#: scheduler/ipp.c:8585 scheduler/ipp.c:9828
+#: scheduler/ipp.c:8588 scheduler/ipp.c:9831
msgid "Unable to rename job document file."
msgstr ""
-#: cups/dest.c:3534
+#: cups/dest.c:3759
msgid "Unable to resolve printer-uri."
msgstr ""
@@ -7167,7 +7167,7 @@ msgstr ""
msgid "Unable to write uncompressed print data: %s"
msgstr ""
-#: cups/http-support.c:1370
+#: cups/http-support.c:1374
msgid "Unauthorized"
msgstr ""
@@ -7175,7 +7175,7 @@ msgstr ""
msgid "Units"
msgstr ""
-#: cups/http-support.c:1410 cups/http-support.c:1494 cups/ppd.c:341
+#: cups/http-support.c:1414 cups/http-support.c:1498 cups/ppd.c:341
msgid "Unknown"
msgstr ""
@@ -7203,7 +7203,7 @@ msgstr ""
msgid "Unknown hash algorithm."
msgstr ""
-#: cups/dest-options.c:963
+#: cups/dest-options.c:1021
msgid "Unknown media size name."
msgstr ""
@@ -7222,12 +7222,12 @@ msgstr ""
msgid "Unknown print mode: \"%s\"."
msgstr ""
-#: scheduler/ipp.c:10763
+#: scheduler/ipp.c:10766
#, c-format
msgid "Unknown printer-error-policy \"%s\"."
msgstr ""
-#: scheduler/ipp.c:10746
+#: scheduler/ipp.c:10749
#, c-format
msgid "Unknown printer-op-policy \"%s\"."
msgstr ""
@@ -7240,7 +7240,7 @@ msgstr ""
msgid "Unknown request version."
msgstr ""
-#: cups/http-support.c:1487
+#: cups/http-support.c:1491
msgid "Unknown scheme in URI"
msgstr ""
@@ -7253,17 +7253,17 @@ msgstr ""
msgid "Unknown version option value: \"%s\"."
msgstr ""
-#: scheduler/ipp.c:11222
+#: scheduler/ipp.c:11225
#, c-format
msgid "Unsupported 'compression' value \"%s\"."
msgstr ""
-#: scheduler/ipp.c:11252
+#: scheduler/ipp.c:11255
#, c-format
msgid "Unsupported 'document-format' value \"%s\"."
msgstr ""
-#: scheduler/ipp.c:11327
+#: scheduler/ipp.c:11330
msgid "Unsupported 'job-name' value."
msgstr ""
@@ -7272,17 +7272,17 @@ msgstr ""
msgid "Unsupported character set \"%s\"."
msgstr ""
-#: scheduler/ipp.c:8392 scheduler/ipp.c:9640
+#: scheduler/ipp.c:8395 scheduler/ipp.c:9643
#, c-format
msgid "Unsupported compression \"%s\"."
msgstr ""
-#: scheduler/ipp.c:8528 scheduler/ipp.c:9793
+#: scheduler/ipp.c:8531 scheduler/ipp.c:9796
#, c-format
msgid "Unsupported document-format \"%s\"."
msgstr ""
-#: scheduler/ipp.c:9776
+#: scheduler/ipp.c:9779
#, c-format
msgid "Unsupported document-format \"%s/%s\"."
msgstr ""
@@ -7324,7 +7324,7 @@ msgstr ""
msgid "Unsupported value type"
msgstr ""
-#: cups/http-support.c:1385
+#: cups/http-support.c:1389
msgid "Upgrade Required"
msgstr ""
@@ -7356,7 +7356,7 @@ msgstr ""
msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
msgstr ""
-#: scheduler/main.c:2047
+#: scheduler/main.c:2080
msgid "Usage: cupsd [options]"
msgstr ""
@@ -7380,7 +7380,7 @@ msgid ""
" ippfind --version"
msgstr ""
-#: test/ipptool.c:4928
+#: test/ipptool.c:5059
msgid "Usage: ipptool [options] URI filename [ ... filenameN ]"
msgstr ""
@@ -7460,7 +7460,7 @@ msgstr ""
msgid "Waterproof Fabric"
msgstr ""
-#: cups/http-support.c:1406
+#: cups/http-support.c:1410
msgid "Web Interface is Disabled"
msgstr ""
@@ -7505,11 +7505,11 @@ msgstr ""
msgid "completed"
msgstr ""
-#: scheduler/ipp.c:6168
+#: scheduler/ipp.c:6171
msgid "cups-deviced failed to execute."
msgstr ""
-#: scheduler/ipp.c:7054 scheduler/ipp.c:7293
+#: scheduler/ipp.c:7057 scheduler/ipp.c:7296
msgid "cups-driverd failed to execute."
msgstr ""
@@ -7537,36 +7537,36 @@ msgstr ""
msgid "cupsctl: Unknown option \"-%c\""
msgstr ""
-#: scheduler/main.c:178
+#: scheduler/main.c:180
msgid "cupsd: Expected config filename after \"-c\" option."
msgstr ""
-#: scheduler/main.c:274
+#: scheduler/main.c:276
msgid "cupsd: Expected cups-files.conf filename after \"-s\" option."
msgstr ""
-#: scheduler/main.c:248
+#: scheduler/main.c:250
msgid "cupsd: On-demand support not compiled in, running in normal mode."
msgstr ""
-#: scheduler/main.c:285
+#: scheduler/main.c:287
msgid "cupsd: Relative cups-files.conf filename not allowed."
msgstr ""
-#: scheduler/main.c:209 scheduler/main.c:216
+#: scheduler/main.c:211 scheduler/main.c:218
msgid "cupsd: Unable to get current directory."
msgstr ""
-#: scheduler/main.c:341 scheduler/main.c:350
+#: scheduler/main.c:343 scheduler/main.c:352
msgid "cupsd: Unable to get path to cups-files.conf file."
msgstr ""
-#: scheduler/main.c:323
+#: scheduler/main.c:325
#, c-format
msgid "cupsd: Unknown argument \"%s\" - aborting."
msgstr ""
-#: scheduler/main.c:316
+#: scheduler/main.c:318
#, c-format
msgid "cupsd: Unknown option \"%c\" - aborting."
msgstr ""
@@ -7598,12 +7598,12 @@ msgstr ""
msgid "cupstestppd: The -v option is incompatible with the -q option."
msgstr ""
-#: systemv/lpstat.c:1230 systemv/lpstat.c:1233 systemv/lpstat.c:1236
+#: systemv/lpstat.c:1254 systemv/lpstat.c:1257 systemv/lpstat.c:1260
#, c-format
msgid "device for %s/%s: %s"
msgstr ""
-#: systemv/lpstat.c:1216 systemv/lpstat.c:1219 systemv/lpstat.c:1222
+#: systemv/lpstat.c:1240 systemv/lpstat.c:1243 systemv/lpstat.c:1246
#, c-format
msgid "device for %s: %s"
msgstr ""
@@ -7727,49 +7727,49 @@ msgstr ""
msgid "ippfind: Unknown variable \"{%s}\"."
msgstr ""
-#: test/ipptool.c:317 test/ipptool.c:380 test/ipptool.c:535 test/ipptool.c:558
+#: test/ipptool.c:318 test/ipptool.c:381 test/ipptool.c:536 test/ipptool.c:559
msgid "ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\"."
msgstr ""
-#: test/ipptool.c:614
+#: test/ipptool.c:615
#, c-format
msgid "ipptool: Bad URI - %s."
msgstr ""
-#: test/ipptool.c:528
+#: test/ipptool.c:529
msgid "ipptool: Invalid seconds for \"-i\"."
msgstr ""
-#: test/ipptool.c:595
+#: test/ipptool.c:596
msgid "ipptool: May only specify a single URI."
msgstr ""
-#: test/ipptool.c:550
+#: test/ipptool.c:551
msgid "ipptool: Missing count for \"-n\"."
msgstr ""
-#: test/ipptool.c:414
+#: test/ipptool.c:415
msgid "ipptool: Missing filename for \"-f\"."
msgstr ""
-#: test/ipptool.c:395
+#: test/ipptool.c:396
msgid "ipptool: Missing name=value for \"-d\"."
msgstr ""
-#: test/ipptool.c:518
+#: test/ipptool.c:519
msgid "ipptool: Missing seconds for \"-i\"."
msgstr ""
-#: test/ipptool.c:640
+#: test/ipptool.c:641
msgid "ipptool: URI required before test file."
msgstr ""
-#: test/ipptool.c:576
+#: test/ipptool.c:577
#, c-format
msgid "ipptool: Unknown option \"-%c\"."
msgstr ""
-#: scheduler/ipp.c:8058
+#: scheduler/ipp.c:8061
msgid "job-printer-uri attribute missing."
msgstr ""
@@ -7985,12 +7985,12 @@ msgstr ""
msgid "lpoptions: Unknown printer or class."
msgstr ""
-#: systemv/lpstat.c:1072
+#: systemv/lpstat.c:1096
#, c-format
msgid "lpstat: error - %s environment variable names non-existent destination \"%s\"."
msgstr ""
-#: systemv/lpstat.c:1008
+#: systemv/lpstat.c:1032
#, c-format
msgid "members of class %s:"
msgstr ""
@@ -7999,20 +7999,20 @@ msgstr ""
msgid "no entries"
msgstr ""
-#: systemv/lpstat.c:1076
+#: systemv/lpstat.c:1100
msgid "no system default destination"
msgstr ""
-#: scheduler/ipp.c:5853
+#: scheduler/ipp.c:5856
msgid "notify-events not specified."
msgstr ""
-#: scheduler/ipp.c:2049 scheduler/ipp.c:5758
+#: scheduler/ipp.c:2049 scheduler/ipp.c:5761
#, c-format
msgid "notify-recipient-uri URI \"%s\" is already used."
msgstr ""
-#: scheduler/ipp.c:2039 scheduler/ipp.c:5748
+#: scheduler/ipp.c:2039 scheduler/ipp.c:5751
#, c-format
msgid "notify-recipient-uri URI \"%s\" uses unknown scheme."
msgstr ""
@@ -8494,32 +8494,32 @@ msgstr ""
msgid "ppdmerge: Unable to backup %s to %s - %s"
msgstr ""
-#: systemv/lpstat.c:1775
+#: systemv/lpstat.c:1799
#, c-format
msgid "printer %s disabled since %s -"
msgstr ""
-#: systemv/lpstat.c:1764
+#: systemv/lpstat.c:1788
#, c-format
msgid "printer %s is idle. enabled since %s"
msgstr ""
-#: systemv/lpstat.c:1769
+#: systemv/lpstat.c:1793
#, c-format
msgid "printer %s now printing %s-%d. enabled since %s"
msgstr ""
-#: systemv/lpstat.c:1894
+#: systemv/lpstat.c:1918
#, c-format
msgid "printer %s/%s disabled since %s -"
msgstr ""
-#: systemv/lpstat.c:1880
+#: systemv/lpstat.c:1904
#, c-format
msgid "printer %s/%s is idle. enabled since %s"
msgstr ""
-#: systemv/lpstat.c:1887
+#: systemv/lpstat.c:1911
#, c-format
msgid "printer %s/%s now printing %s-%d. enabled since %s"
msgstr ""
@@ -8537,11 +8537,11 @@ msgstr ""
msgid "request-id uses indefinite length"
msgstr ""
-#: systemv/lpstat.c:2022
+#: systemv/lpstat.c:2046
msgid "scheduler is not running"
msgstr ""
-#: systemv/lpstat.c:2018
+#: systemv/lpstat.c:2042
msgid "scheduler is running"
msgstr ""
@@ -8558,12 +8558,12 @@ msgstr ""
msgid "stopped"
msgstr ""
-#: systemv/lpstat.c:1050
+#: systemv/lpstat.c:1074
#, c-format
msgid "system default destination: %s"
msgstr ""
-#: systemv/lpstat.c:1047
+#: systemv/lpstat.c:1071
#, c-format
msgid "system default destination: %s/%s"
msgstr ""
diff --git a/locale/cups.strings b/locale/cups.strings
index acf6d6c3d..8f8270966 100644
--- a/locale/cups.strings
+++ b/locale/cups.strings
@@ -216,7 +216,7 @@
" -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 Encrypt the connection." = " -E Encrypt the connection.";
-" -E Test with HTTP Upgrade to TLS." = " -E Test with HTTP Upgrade to TLS.";
+" -E Test with encryption using HTTP Upgrade to TLS." = " -E Test with encryption using HTTP Upgrade to TLS.";
" -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.";
@@ -227,7 +227,7 @@
" -P filename.ppd Set PPD file." = " -P filename.ppd Set PPD file.";
" -P number[-number] Match port to number or range." = " -P number[-number] Match port to number or range.";
" -R root-directory Set alternate root." = " -R root-directory Set alternate root.";
-" -S Test with SSL encryption." = " -S Test with SSL encryption.";
+" -S Test with encryption using HTTPS." = " -S Test with encryption using HTTPS.";
" -T seconds Set the browse timeout in seconds." = " -T seconds Set the browse timeout in seconds.";
" -T seconds Set the receive/send timeout in seconds." = " -T seconds Set the receive/send timeout in seconds.";
" -U username Specify username." = " -U username Specify username.";
@@ -305,40 +305,40 @@
" {} URI" = " {} URI";
" FAIL" = " FAIL";
" PASS" = " PASS";
-"\"%s\": Bad URI value \"%s\" - %s (RFC 2911 section 4.1.5)." = "“%sâ€: Bad URI value “%s†- %s (RFC 2911 section 4.1.5).";
-"\"%s\": Bad URI value \"%s\" - bad length %d (RFC 2911 section 4.1.5)." = "“%sâ€: Bad URI value “%s†- bad length %d (RFC 2911 section 4.1.5).";
-"\"%s\": Bad attribute name - bad length %d (RFC 2911 section 4.1.3)." = "“%sâ€: Bad attribute name - bad length %d (RFC 2911 section 4.1.3).";
-"\"%s\": Bad attribute name - invalid character (RFC 2911 section 4.1.3)." = "“%sâ€: Bad attribute name - invalid character (RFC 2911 section 4.1.3).";
-"\"%s\": Bad boolen value %d (RFC 2911 section 4.1.11)." = "“%sâ€: Bad boolen value %d (RFC 2911 section 4.1.11).";
-"\"%s\": Bad charset value \"%s\" - bad characters (RFC 2911 section 4.1.7)." = "“%sâ€: Bad charset value “%s†- bad characters (RFC 2911 section 4.1.7).";
-"\"%s\": Bad charset value \"%s\" - bad length %d (RFC 2911 section 4.1.7)." = "“%sâ€: Bad charset value “%s†- bad length %d (RFC 2911 section 4.1.7).";
-"\"%s\": Bad dateTime UTC hours %u (RFC 2911 section 4.1.14)." = "“%sâ€: Bad dateTime UTC hours %u (RFC 2911 section 4.1.14).";
-"\"%s\": Bad dateTime UTC minutes %u (RFC 2911 section 4.1.14)." = "“%sâ€: Bad dateTime UTC minutes %u (RFC 2911 section 4.1.14).";
-"\"%s\": Bad dateTime UTC sign '%c' (RFC 2911 section 4.1.14)." = "“%sâ€: Bad dateTime UTC sign ‘c’(RFC 2911 section 4.1.14).";
-"\"%s\": Bad dateTime day %u (RFC 2911 section 4.1.14)." = "“%sâ€: Bad dateTime day %u (RFC 2911 section 4.1.14).";
-"\"%s\": Bad dateTime deciseconds %u (RFC 2911 section 4.1.14)." = "“%sâ€: Bad dateTime deciseconds %u (RFC 2911 section 4.1.14).";
-"\"%s\": Bad dateTime hours %u (RFC 2911 section 4.1.14)." = "“%sâ€: Bad dateTime hours %u (RFC 2911 section 4.1.14).";
-"\"%s\": Bad dateTime minutes %u (RFC 2911 section 4.1.14)." = "“%sâ€: Bad dateTime minutes %u (RFC 2911 section 4.1.14).";
-"\"%s\": Bad dateTime month %u (RFC 2911 section 4.1.14)." = "“%sâ€: Bad dateTime month %u (RFC 2911 section 4.1.14).";
-"\"%s\": Bad dateTime seconds %u (RFC 2911 section 4.1.14)." = "“%sâ€: Bad dateTime seconds %u (RFC 2911 section 4.1.14).";
-"\"%s\": Bad enum value %d - out of range (RFC 2911 section 4.1.4)." = "“%sâ€: Bad enum value %d - out of range (RFC 2911 section 4.1.4).";
-"\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 2911 section 4.1.3)." = "“%sâ€: Bad keyword value “%s†- bad length %d (RFC 2911 section 4.1.3).";
-"\"%s\": Bad keyword value \"%s\" - invalid character (RFC 2911 section 4.1.3)." = "“%sâ€: Bad keyword value “%s†- invalid character (RFC 2911 section 4.1.3).";
-"\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 2911 section 4.1.9)." = "“%sâ€: Bad mimeMediaType value “%s†- bad characters (RFC 2911 section 4.1.9).";
-"\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 2911 section 4.1.9)." = "“%sâ€: Bad mimeMediaType value “%s†- bad length %d (RFC 2911 section 4.1.9).";
-"\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.2)." = "“%sâ€: Bad name value “%s†- bad UTF-8 sequence (RFC 2911 section 4.1.2).";
-"\"%s\": Bad name value \"%s\" - bad length %d (RFC 2911 section 4.1.2)." = "“%sâ€: Bad name value “%s†- bad length %d (RFC 2911 section 4.1.2).";
-"\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 2911 section 4.1.8)." = "“%sâ€: Bad naturalLanguage value “%s†- bad characters (RFC 2911 section 4.1.8).";
-"\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 2911 section 4.1.8)." = "“%sâ€: Bad naturalLanguage value “%s†- bad length %d (RFC 2911 section 4.1.8).";
-"\"%s\": Bad octetString value - bad length %d (RFC 2911 section 4.1.10)." = "“%sâ€: Bad octetString value - bad length %d (RFC 2911 section 4.1.10).";
-"\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 2911 section 4.1.13)." = "“%sâ€: Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 2911 section 4.1.13).";
-"\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 2911 section 4.1.15)." = "“%sâ€: Bad resolution value %dx%d%s - bad units value (RFC 2911 section 4.1.15).";
-"\"%s\": Bad resolution value %dx%d%s - cross feed resolution must be positive (RFC 2911 section 4.1.15)." = "“%sâ€: Bad resolution value %dx%d%s - cross feed resolution must be positive (RFC 2911 section 4.1.15).";
-"\"%s\": Bad resolution value %dx%d%s - feed resolution must be positive (RFC 2911 section 4.1.15)." = "“%sâ€: Bad resolution value %dx%d%s - feed resolution must be positive (RFC 2911 section 4.1.15).";
-"\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.1)." = "“%sâ€: Bad text value “%s†- bad UTF-8 sequence (RFC 2911 section 4.1.1).";
-"\"%s\": Bad text value \"%s\" - bad length %d (RFC 2911 section 4.1.1)." = "“%sâ€: Bad text value “%s†- bad length %d (RFC 2911 section 4.1.1).";
-"\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 2911 section 4.1.6)." = "“%sâ€: Bad uriScheme value “%s†- bad characters (RFC 2911 section 4.1.6).";
-"\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 2911 section 4.1.6)." = "“%sâ€: Bad uriScheme value “%s†- bad length %d (RFC 2911 section 4.1.6).";
+"\"%s\": Bad URI value \"%s\" - %s (RFC 8011 section 5.1.6)." = "“%sâ€: Bad URI value “%s†- %s (RFC 8011 section 5.1.6).";
+"\"%s\": Bad URI value \"%s\" - bad length %d (RFC 8011 section 5.1.6)." = "“%sâ€: Bad URI value “%s†- bad length %d (RFC 8011 section 5.1.6).";
+"\"%s\": Bad attribute name - bad length %d (RFC 8011 section 5.1.4)." = "“%sâ€: Bad attribute name - bad length %d (RFC 8011 section 5.1.4).";
+"\"%s\": Bad attribute name - invalid character (RFC 8011 section 5.1.4)." = "“%sâ€: Bad attribute name - invalid character (RFC 8011 section 5.1.4).";
+"\"%s\": Bad boolen value %d (RFC 8011 section 5.1.21)." = "“%sâ€: Bad boolen value %d (RFC 8011 section 5.1.21).";
+"\"%s\": Bad charset value \"%s\" - bad characters (RFC 8011 section 5.1.8)." = "“%sâ€: Bad charset value “%s†- bad characters (RFC 8011 section 5.1.8).";
+"\"%s\": Bad charset value \"%s\" - bad length %d (RFC 8011 section 5.1.8)." = "“%sâ€: Bad charset value “%s†- bad length %d (RFC 8011 section 5.1.8).";
+"\"%s\": Bad dateTime UTC hours %u (RFC 8011 section 5.1.15)." = "“%sâ€: Bad dateTime UTC hours %u (RFC 8011 section 5.1.15).";
+"\"%s\": Bad dateTime UTC minutes %u (RFC 8011 section 5.1.15)." = "“%sâ€: Bad dateTime UTC minutes %u (RFC 8011 section 5.1.15).";
+"\"%s\": Bad dateTime UTC sign '%c' (RFC 8011 section 5.1.15)." = "“%sâ€: Bad dateTime UTC sign ‘c’(RFC 8011 section 5.1.15).";
+"\"%s\": Bad dateTime day %u (RFC 8011 section 5.1.15)." = "“%sâ€: Bad dateTime day %u (RFC 8011 section 5.1.15).";
+"\"%s\": Bad dateTime deciseconds %u (RFC 8011 section 5.1.15)." = "“%sâ€: Bad dateTime deciseconds %u (RFC 8011 section 5.1.15).";
+"\"%s\": Bad dateTime hours %u (RFC 8011 section 5.1.15)." = "“%sâ€: Bad dateTime hours %u (RFC 8011 section 5.1.15).";
+"\"%s\": Bad dateTime minutes %u (RFC 8011 section 5.1.15)." = "“%sâ€: Bad dateTime minutes %u (RFC 8011 section 5.1.15).";
+"\"%s\": Bad dateTime month %u (RFC 8011 section 5.1.15)." = "“%sâ€: Bad dateTime month %u (RFC 8011 section 5.1.15).";
+"\"%s\": Bad dateTime seconds %u (RFC 8011 section 5.1.15)." = "“%sâ€: Bad dateTime seconds %u (RFC 8011 section 5.1.15).";
+"\"%s\": Bad enum value %d - out of range (RFC 8011 section 5.1.5)." = "“%sâ€: Bad enum value %d - out of range (RFC 8011 section 5.1.5).";
+"\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 8011 section 5.1.4)." = "“%sâ€: Bad keyword value “%s†- bad length %d (RFC 8011 section 5.1.4).";
+"\"%s\": Bad keyword value \"%s\" - invalid character (RFC 8011 section 5.1.4)." = "“%sâ€: Bad keyword value “%s†- invalid character (RFC 8011 section 5.1.4).";
+"\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 8011 section 5.1.10)." = "“%sâ€: Bad mimeMediaType value “%s†- bad characters (RFC 8011 section 5.1.10).";
+"\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 8011 section 5.1.10)." = "“%sâ€: Bad mimeMediaType value “%s†- bad length %d (RFC 8011 section 5.1.10).";
+"\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)." = "“%sâ€: Bad name value “%s†- bad UTF-8 sequence (RFC 8011 section 5.1.3).";
+"\"%s\": Bad name value \"%s\" - bad length %d (RFC 8011 section 5.1.3)." = "“%sâ€: Bad name value “%s†- bad length %d (RFC 8011 section 5.1.3).";
+"\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 8011 section 5.1.9)." = "“%sâ€: Bad naturalLanguage value “%s†- bad characters (RFC 8011 section 5.1.9).";
+"\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 8011 section 5.1.9)." = "“%sâ€: Bad naturalLanguage value “%s†- bad length %d (RFC 8011 section 5.1.9).";
+"\"%s\": Bad octetString value - bad length %d (RFC 8011 section 5.1.20)." = "“%sâ€: Bad octetString value - bad length %d (RFC 8011 section 5.1.20).";
+"\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 8011 section 5.1.14)." = "“%sâ€: Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 8011 section 5.1.14).";
+"\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 8011 section 5.1.16)." = "“%sâ€: Bad resolution value %dx%d%s - bad units value (RFC 8011 section 5.1.16).";
+"\"%s\": Bad resolution value %dx%d%s - cross feed resolution must be positive (RFC 8011 section 5.1.16)." = "“%sâ€: Bad resolution value %dx%d%s - cross feed resolution must be positive (RFC 8011 section 5.1.16).";
+"\"%s\": Bad resolution value %dx%d%s - feed resolution must be positive (RFC 8011 section 5.1.16)." = "“%sâ€: Bad resolution value %dx%d%s - feed resolution must be positive (RFC 8011 section 5.1.16).";
+"\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)." = "“%sâ€: Bad text value “%s†- bad UTF-8 sequence (RFC 8011 section 5.1.2).";
+"\"%s\": Bad text value \"%s\" - bad length %d (RFC 8011 section 5.1.2)." = "“%sâ€: Bad text value “%s†- bad length %d (RFC 8011 section 5.1.2).";
+"\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 8011 section 5.1.7)." = "“%sâ€: Bad uriScheme value “%s†- bad characters (RFC 8011 section 5.1.7).";
+"\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 8011 section 5.1.7)." = "“%sâ€: Bad uriScheme value “%s†- bad length %d (RFC 8011 section 5.1.7).";
"%-7s %-7.7s %-7d %-31.31s %.0f bytes" = "%-7s %-7.7s %-7d %-31.31s %.0f bytes";
"%d x %d mm" = "%d x %d mm";
"%g x %g" = "%g x %g";
@@ -1368,7 +1368,7 @@
"Roll 7" = "Roll 7";
"Roll 8" = "Roll 8";
"Roll 9" = "Roll 9";
-"Running command: %s %s -N -A %s -c '%s'" = "Running command: %s %s -N -A %s -c ‘s’d/ù";
+"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";
"Saddle Stitch" = "Saddle Stitch";
diff --git a/locale/cups_ca.po b/locale/cups_ca.po
index 5682ba2e0..c4b40ceff 100644
--- a/locale/cups_ca.po
+++ b/locale/cups_ca.po
@@ -32,7 +32,7 @@ msgid ""
msgstr ""
"Project-Id-Version: CUPS 1.4.6\n"
"Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-04-05 15:24-0400\n"
+"POT-Creation-Date: 2017-06-15 20:52-0400\n"
"PO-Revision-Date: 2012-09-29 11:21+0200\n"
"Last-Translator: Àngel Mompó <mecatxis@gmail.com>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
@@ -1057,9 +1057,9 @@ msgstr " -D nom=valor Estableix la variable indicada al valor."
msgid " -E Encrypt the connection."
msgstr " -E Xifra la connexió."
-msgid " -E Test with HTTP Upgrade to TLS."
+msgid ""
+" -E Test with encryption using HTTP Upgrade to TLS."
msgstr ""
-" -E Fa una prova amb l'actualització d'HTTP a TLS."
msgid ""
" -F Run in the foreground but detach from console."
@@ -1096,8 +1096,8 @@ msgstr ""
msgid " -R root-directory Set alternate root."
msgstr " -R directori-arrel Estableix una arrel alternativa."
-msgid " -S Test with SSL encryption."
-msgstr " -S Fa una prova amb xifrat SSL."
+msgid " -S Test with encryption using HTTPS."
+msgstr ""
msgid " -T seconds Set the browse timeout in seconds."
msgstr ""
@@ -1373,166 +1373,166 @@ msgid " PASS"
msgstr " VÀLID"
#, c-format
-msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 2911 section 4.1.5)."
+msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 8011 section 5.1.6)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 2911 section 4.1.5)."
+msgid "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 8011 section 5.1.6)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad attribute name - bad length %d (RFC 2911 section 4.1.3)."
+msgid "\"%s\": Bad attribute name - bad length %d (RFC 8011 section 5.1.4)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad attribute name - invalid character (RFC 2911 section 4.1.3)."
+"\"%s\": Bad attribute name - invalid character (RFC 8011 section 5.1.4)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad boolen value %d (RFC 2911 section 4.1.11)."
+msgid "\"%s\": Bad boolen value %d (RFC 8011 section 5.1.21)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad charset value \"%s\" - bad characters (RFC 2911 section 4.1.7)."
+"\"%s\": Bad charset value \"%s\" - bad characters (RFC 8011 section 5.1.8)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad charset value \"%s\" - bad length %d (RFC 2911 section 4.1.7)."
+"\"%s\": Bad charset value \"%s\" - bad length %d (RFC 8011 section 5.1.8)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime UTC hours %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC hours %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime day %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime day %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime deciseconds %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime deciseconds %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime hours %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime hours %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime minutes %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime minutes %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime month %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime month %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime seconds %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime seconds %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad enum value %d - out of range (RFC 2911 section 4.1.4)."
+msgid "\"%s\": Bad enum value %d - out of range (RFC 8011 section 5.1.5)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 2911 section 4.1.3)."
+"\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 8011 section 5.1.4)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad keyword value \"%s\" - invalid character (RFC 2911 section "
-"4.1.3)."
+"\"%s\": Bad keyword value \"%s\" - invalid character (RFC 8011 section "
+"5.1.4)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 2911 section "
-"4.1.9)."
+"\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 8011 section "
+"5.1.10)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 2911 section "
-"4.1.9)."
+"\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 8011 section "
+"5.1.10)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.2)."
+"\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad name value \"%s\" - bad length %d (RFC 2911 section 4.1.2)."
+msgid "\"%s\": Bad name value \"%s\" - bad length %d (RFC 8011 section 5.1.3)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 2911 section "
-"4.1.8)."
+"\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 8011 section "
+"5.1.9)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 2911 section "
-"4.1.8)."
+"\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 8011 section "
+"5.1.9)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad octetString value - bad length %d (RFC 2911 section 4.1.10)."
+"\"%s\": Bad octetString value - bad length %d (RFC 8011 section 5.1.20)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 2911 "
-"section 4.1.13)."
+"\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 8011 "
+"section 5.1.14)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 2911 section "
-"4.1.15)."
+"\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 8011 section "
+"5.1.16)."
msgstr ""
#, c-format
msgid ""
"\"%s\": Bad resolution value %dx%d%s - cross feed resolution must be "
-"positive (RFC 2911 section 4.1.15)."
+"positive (RFC 8011 section 5.1.16)."
msgstr ""
#, c-format
msgid ""
"\"%s\": Bad resolution value %dx%d%s - feed resolution must be positive (RFC "
-"2911 section 4.1.15)."
+"8011 section 5.1.16)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.1)."
+"\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad text value \"%s\" - bad length %d (RFC 2911 section 4.1.1)."
+msgid "\"%s\": Bad text value \"%s\" - bad length %d (RFC 8011 section 5.1.2)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 2911 section 4.1.6)."
+"\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 8011 section 5.1.7)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 2911 section 4.1.6)."
+"\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 8011 section 5.1.7)."
msgstr ""
#, c-format
@@ -6922,9 +6922,16 @@ msgstr "La variable-bindings fa servir una longitud indefinida"
#~ msgid " -E Enable encryption."
#~ msgstr " -E Habilita el xifrat."
+#~ msgid " -E Test with HTTP Upgrade to TLS."
+#~ msgstr ""
+#~ " -E Fa una prova amb l'actualització d'HTTP a TLS."
+
#~ msgid " -J title Set title."
#~ msgstr " -J títol Estableix el títol."
+#~ msgid " -S Test with SSL encryption."
+#~ msgstr " -S Fa una prova amb xifrat SSL."
+
#~ msgid " -T Set the receive/send timeout in seconds."
#~ msgstr ""
#~ " -T Estableix el temps d'espera màxim per enviar i "
diff --git a/locale/cups_cs.po b/locale/cups_cs.po
index 096ad1860..4bdaea1e5 100644
--- a/locale/cups_cs.po
+++ b/locale/cups_cs.po
@@ -29,7 +29,7 @@ msgid ""
msgstr ""
"Project-Id-Version: CUPS 1.6\n"
"Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-04-05 15:24-0400\n"
+"POT-Creation-Date: 2017-06-15 20:52-0400\n"
"PO-Revision-Date: 2012-09-14 10:26+0100\n"
"Last-Translator: Jan Bartos <jan.bartos@madeta.cz>\n"
"Language-Team: Czech\n"
@@ -908,7 +908,8 @@ msgstr ""
msgid " -E Encrypt the connection."
msgstr ""
-msgid " -E Test with HTTP Upgrade to TLS."
+msgid ""
+" -E Test with encryption using HTTP Upgrade to TLS."
msgstr ""
msgid ""
@@ -944,7 +945,7 @@ msgstr ""
msgid " -R root-directory Set alternate root."
msgstr ""
-msgid " -S Test with SSL encryption."
+msgid " -S Test with encryption using HTTPS."
msgstr ""
msgid " -T seconds Set the browse timeout in seconds."
@@ -1195,166 +1196,166 @@ msgid " PASS"
msgstr ""
#, c-format
-msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 2911 section 4.1.5)."
+msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 8011 section 5.1.6)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 2911 section 4.1.5)."
+msgid "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 8011 section 5.1.6)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad attribute name - bad length %d (RFC 2911 section 4.1.3)."
+msgid "\"%s\": Bad attribute name - bad length %d (RFC 8011 section 5.1.4)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad attribute name - invalid character (RFC 2911 section 4.1.3)."
+"\"%s\": Bad attribute name - invalid character (RFC 8011 section 5.1.4)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad boolen value %d (RFC 2911 section 4.1.11)."
+msgid "\"%s\": Bad boolen value %d (RFC 8011 section 5.1.21)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad charset value \"%s\" - bad characters (RFC 2911 section 4.1.7)."
+"\"%s\": Bad charset value \"%s\" - bad characters (RFC 8011 section 5.1.8)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad charset value \"%s\" - bad length %d (RFC 2911 section 4.1.7)."
+"\"%s\": Bad charset value \"%s\" - bad length %d (RFC 8011 section 5.1.8)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime UTC hours %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC hours %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime day %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime day %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime deciseconds %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime deciseconds %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime hours %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime hours %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime minutes %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime minutes %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime month %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime month %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime seconds %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime seconds %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad enum value %d - out of range (RFC 2911 section 4.1.4)."
+msgid "\"%s\": Bad enum value %d - out of range (RFC 8011 section 5.1.5)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 2911 section 4.1.3)."
+"\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 8011 section 5.1.4)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad keyword value \"%s\" - invalid character (RFC 2911 section "
-"4.1.3)."
+"\"%s\": Bad keyword value \"%s\" - invalid character (RFC 8011 section "
+"5.1.4)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 2911 section "
-"4.1.9)."
+"\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 8011 section "
+"5.1.10)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 2911 section "
-"4.1.9)."
+"\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 8011 section "
+"5.1.10)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.2)."
+"\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad name value \"%s\" - bad length %d (RFC 2911 section 4.1.2)."
+msgid "\"%s\": Bad name value \"%s\" - bad length %d (RFC 8011 section 5.1.3)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 2911 section "
-"4.1.8)."
+"\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 8011 section "
+"5.1.9)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 2911 section "
-"4.1.8)."
+"\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 8011 section "
+"5.1.9)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad octetString value - bad length %d (RFC 2911 section 4.1.10)."
+"\"%s\": Bad octetString value - bad length %d (RFC 8011 section 5.1.20)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 2911 "
-"section 4.1.13)."
+"\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 8011 "
+"section 5.1.14)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 2911 section "
-"4.1.15)."
+"\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 8011 section "
+"5.1.16)."
msgstr ""
#, c-format
msgid ""
"\"%s\": Bad resolution value %dx%d%s - cross feed resolution must be "
-"positive (RFC 2911 section 4.1.15)."
+"positive (RFC 8011 section 5.1.16)."
msgstr ""
#, c-format
msgid ""
"\"%s\": Bad resolution value %dx%d%s - feed resolution must be positive (RFC "
-"2911 section 4.1.15)."
+"8011 section 5.1.16)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.1)."
+"\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad text value \"%s\" - bad length %d (RFC 2911 section 4.1.1)."
+msgid "\"%s\": Bad text value \"%s\" - bad length %d (RFC 8011 section 5.1.2)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 2911 section 4.1.6)."
+"\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 8011 section 5.1.7)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 2911 section 4.1.6)."
+"\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 8011 section 5.1.7)."
msgstr ""
#, c-format
diff --git a/locale/cups_de.po b/locale/cups_de.po
index e344f03b9..96884d3b6 100644
--- a/locale/cups_de.po
+++ b/locale/cups_de.po
@@ -29,7 +29,7 @@ msgid ""
msgstr ""
"Project-Id-Version: CUPS 2.0\n"
"Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-04-05 15:24-0400\n"
+"POT-Creation-Date: 2017-06-15 20:52-0400\n"
"PO-Revision-Date: 2016-09-17 18:45+0200\n"
"Last-Translator: Joachim Schwender <joachim.schwender@web.de>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -939,8 +939,9 @@ msgstr " -D Name=Wert Variable »Name« den »Wert« zuordnen."
msgid " -E Encrypt the connection."
msgstr " -E Verschlüssele die Verbindung."
-msgid " -E Test with HTTP Upgrade to TLS."
-msgstr " -E Teste mit HTTP Upgrade auf TLS."
+msgid ""
+" -E Test with encryption using HTTP Upgrade to TLS."
+msgstr ""
msgid ""
" -F Run in the foreground but detach from console."
@@ -983,8 +984,8 @@ msgid " -R root-directory Set alternate root."
msgstr ""
" -R Wurzelverz. Legt ein alternatives Wurzelverzeichnis fest."
-msgid " -S Test with SSL encryption."
-msgstr " -S Teste mit SSL Verschlüsselung."
+msgid " -S Test with encryption using HTTPS."
+msgstr ""
msgid " -T seconds Set the browse timeout in seconds."
msgstr ""
@@ -1259,166 +1260,166 @@ msgid " PASS"
msgstr ""
#, c-format
-msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 2911 section 4.1.5)."
+msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 8011 section 5.1.6)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 2911 section 4.1.5)."
+msgid "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 8011 section 5.1.6)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad attribute name - bad length %d (RFC 2911 section 4.1.3)."
+msgid "\"%s\": Bad attribute name - bad length %d (RFC 8011 section 5.1.4)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad attribute name - invalid character (RFC 2911 section 4.1.3)."
+"\"%s\": Bad attribute name - invalid character (RFC 8011 section 5.1.4)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad boolen value %d (RFC 2911 section 4.1.11)."
+msgid "\"%s\": Bad boolen value %d (RFC 8011 section 5.1.21)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad charset value \"%s\" - bad characters (RFC 2911 section 4.1.7)."
+"\"%s\": Bad charset value \"%s\" - bad characters (RFC 8011 section 5.1.8)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad charset value \"%s\" - bad length %d (RFC 2911 section 4.1.7)."
+"\"%s\": Bad charset value \"%s\" - bad length %d (RFC 8011 section 5.1.8)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime UTC hours %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC hours %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime day %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime day %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime deciseconds %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime deciseconds %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime hours %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime hours %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime minutes %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime minutes %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime month %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime month %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime seconds %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime seconds %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad enum value %d - out of range (RFC 2911 section 4.1.4)."
+msgid "\"%s\": Bad enum value %d - out of range (RFC 8011 section 5.1.5)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 2911 section 4.1.3)."
+"\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 8011 section 5.1.4)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad keyword value \"%s\" - invalid character (RFC 2911 section "
-"4.1.3)."
+"\"%s\": Bad keyword value \"%s\" - invalid character (RFC 8011 section "
+"5.1.4)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 2911 section "
-"4.1.9)."
+"\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 8011 section "
+"5.1.10)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 2911 section "
-"4.1.9)."
+"\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 8011 section "
+"5.1.10)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.2)."
+"\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad name value \"%s\" - bad length %d (RFC 2911 section 4.1.2)."
+msgid "\"%s\": Bad name value \"%s\" - bad length %d (RFC 8011 section 5.1.3)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 2911 section "
-"4.1.8)."
+"\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 8011 section "
+"5.1.9)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 2911 section "
-"4.1.8)."
+"\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 8011 section "
+"5.1.9)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad octetString value - bad length %d (RFC 2911 section 4.1.10)."
+"\"%s\": Bad octetString value - bad length %d (RFC 8011 section 5.1.20)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 2911 "
-"section 4.1.13)."
+"\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 8011 "
+"section 5.1.14)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 2911 section "
-"4.1.15)."
+"\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 8011 section "
+"5.1.16)."
msgstr ""
#, c-format
msgid ""
"\"%s\": Bad resolution value %dx%d%s - cross feed resolution must be "
-"positive (RFC 2911 section 4.1.15)."
+"positive (RFC 8011 section 5.1.16)."
msgstr ""
#, c-format
msgid ""
"\"%s\": Bad resolution value %dx%d%s - feed resolution must be positive (RFC "
-"2911 section 4.1.15)."
+"8011 section 5.1.16)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.1)."
+"\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad text value \"%s\" - bad length %d (RFC 2911 section 4.1.1)."
+msgid "\"%s\": Bad text value \"%s\" - bad length %d (RFC 8011 section 5.1.2)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 2911 section 4.1.6)."
+"\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 8011 section 5.1.7)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 2911 section 4.1.6)."
+"\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 8011 section 5.1.7)."
msgstr ""
#, c-format
@@ -6730,6 +6731,12 @@ msgstr "variable-bindings hat unbestimmte Länge"
#~ msgid " --lf End lines with LF (UNIX/Linux/OS X)."
#~ msgstr " --lf Zeilenenden mit LF (UNIX/Linux/OS X)"
+#~ msgid " -E Test with HTTP Upgrade to TLS."
+#~ msgstr " -E Teste mit HTTP Upgrade auf TLS."
+
+#~ msgid " -S Test with SSL encryption."
+#~ msgstr " -S Teste mit SSL Verschlüsselung."
+
#~ msgid " -a Browse for all services."
#~ msgstr " -a Browse für alle Dienste."
diff --git a/locale/cups_es.po b/locale/cups_es.po
index 26e71b1d9..18470f2cd 100644
--- a/locale/cups_es.po
+++ b/locale/cups_es.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: CUPS 2.2\n"
"Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-04-05 15:24-0400\n"
+"POT-Creation-Date: 2017-06-15 20:52-0400\n"
"PO-Revision-Date: 2016-06-26 21:17+0100\n"
"Last-Translator: Juan Pablo González Riopedre <jpgriopedre@yahoo.es>\n"
"Language-Team: Spanish\n"
@@ -1069,8 +1069,9 @@ msgstr " -D nombre=valor Establece la variable nombre al valor."
msgid " -E Encrypt the connection."
msgstr " -E Cifra la conexión."
-msgid " -E Test with HTTP Upgrade to TLS."
-msgstr " -E Prueba con actualización HTTP a TLS."
+msgid ""
+" -E Test with encryption using HTTP Upgrade to TLS."
+msgstr ""
msgid ""
" -F Run in the foreground but detach from console."
@@ -1112,8 +1113,8 @@ msgstr ""
msgid " -R root-directory Set alternate root."
msgstr " -R directorio-raíz Establece directorio raíz alternativo."
-msgid " -S Test with SSL encryption."
-msgstr " -S Prueba con cifrado SSL."
+msgid " -S Test with encryption using HTTPS."
+msgstr ""
msgid " -T seconds Set the browse timeout in seconds."
msgstr ""
@@ -1402,214 +1403,167 @@ msgid " PASS"
msgstr " PASA"
#, c-format
-msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 2911 section 4.1.5)."
-msgstr "\"%s\": Valor URI \"%s\" incorrecto - %s (RFC 2911 sección 4.1.5)."
+msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 8011 section 5.1.6)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 2911 section 4.1.5)."
+msgid "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 8011 section 5.1.6)."
msgstr ""
-"\"%s\": Valor URI \"%s\" incorrecto - longitud %d incorrecta (RFC 2911 "
-"sección 4.1.5)."
#, c-format
-msgid "\"%s\": Bad attribute name - bad length %d (RFC 2911 section 4.1.3)."
+msgid "\"%s\": Bad attribute name - bad length %d (RFC 8011 section 5.1.4)."
msgstr ""
-"\"%s\": Nombre de atributo incorrecto - longitud %d incorrecta (RFC 2911 "
-"sección 4.1.3)."
#, c-format
msgid ""
-"\"%s\": Bad attribute name - invalid character (RFC 2911 section 4.1.3)."
+"\"%s\": Bad attribute name - invalid character (RFC 8011 section 5.1.4)."
msgstr ""
-"\"%s\": Nombre de atributo incorrecto - carácter inválido (RFC 2911 sección "
-"4.1.3)."
#, c-format
-msgid "\"%s\": Bad boolen value %d (RFC 2911 section 4.1.11)."
-msgstr "\"%s\": Valor lógico \"%d\" incorrecto (RFC 2911 sección 4.1.11)."
+msgid "\"%s\": Bad boolen value %d (RFC 8011 section 5.1.21)."
+msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad charset value \"%s\" - bad characters (RFC 2911 section 4.1.7)."
+"\"%s\": Bad charset value \"%s\" - bad characters (RFC 8011 section 5.1.8)."
msgstr ""
-"\"%s\": Valor del juego de caracteres \"%s\" incorrecto - caracteres "
-"incorrectos (RFC 2911 sección 4.1.7)."
#, c-format
msgid ""
-"\"%s\": Bad charset value \"%s\" - bad length %d (RFC 2911 section 4.1.7)."
+"\"%s\": Bad charset value \"%s\" - bad length %d (RFC 8011 section 5.1.8)."
msgstr ""
-"\"%s\": Valor del juego de caracteres \"%s\" incorrecto - longitud %d "
-"incorrecta (RFC 2911 sección 4.1.7)."
#, c-format
-msgid "\"%s\": Bad dateTime UTC hours %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": Horas dateTime UTC %u incorrectas (RFC 2911 sección 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC hours %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": Minutos dateTime UTC %u incorrectos (RFC 2911 sección 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": Signo dateTime UTC %c incorrecto (RFC 2911 sección 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime day %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": Día dateTime %u incorrecto (RFC 2911 sección 4.1.14)."
+msgid "\"%s\": Bad dateTime day %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime deciseconds %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime deciseconds %u (RFC 8011 section 5.1.15)."
msgstr ""
-"\"%s\": Décimas de segundo dateTime %u incorrectas (RFC 2911 sección 4.1.14)."
#, c-format
-msgid "\"%s\": Bad dateTime hours %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": Horas dateTime %u incorrectas (RFC 2911 sección 4.1.14)."
+msgid "\"%s\": Bad dateTime hours %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime minutes %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": Minutos dateTime %u incorrectos (RFC 2911 sección 4.1.14)."
+msgid "\"%s\": Bad dateTime minutes %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime month %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": Mes dateTime %u incorrecto (RFC 2911 sección 4.1.14)."
+msgid "\"%s\": Bad dateTime month %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime seconds %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": Segundos dateTime %u incorrectos (RFC 2911 sección 4.1.14)."
+msgid "\"%s\": Bad dateTime seconds %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad enum value %d - out of range (RFC 2911 section 4.1.4)."
+msgid "\"%s\": Bad enum value %d - out of range (RFC 8011 section 5.1.5)."
msgstr ""
-"\"%s\": Valor enumerado %d incorrecto - fuera de intervalo (RFC 2911 sección "
-"4.1.4)."
#, c-format
msgid ""
-"\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 2911 section 4.1.3)."
+"\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 8011 section 5.1.4)."
msgstr ""
-"\"%s\": Valor clave \"%s\" incorrecto - longitud %d incorrecta (RFC 2911 "
-"sección 4.1.3)."
#, c-format
msgid ""
-"\"%s\": Bad keyword value \"%s\" - invalid character (RFC 2911 section "
-"4.1.3)."
+"\"%s\": Bad keyword value \"%s\" - invalid character (RFC 8011 section "
+"5.1.4)."
msgstr ""
-"\"%s\": Valor clave \"%s\" incorrecto - carácter inválido (RFC 2911 sección "
-"4.1.3)."
#, c-format
msgid ""
-"\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 2911 section "
-"4.1.9)."
+"\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 8011 section "
+"5.1.10)."
msgstr ""
-"\"%s\": Valor mimeMediaType \"%s\" incorrecto - caracteres incorrectos (RFC "
-"2911 sección 4.1.9)."
#, c-format
msgid ""
-"\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 2911 section "
-"4.1.9)."
+"\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 8011 section "
+"5.1.10)."
msgstr ""
-"\"%s\": Valor mimeMediaType \"%s\" incorrecto - longitud %d incorrecta (RFC "
-"2911 sección 4.1.9)."
#, c-format
msgid ""
-"\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.2)."
+"\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."
msgstr ""
-"\"%s\": Valor del nombre \"%s\" incorrecto - secuencia UTF-8 incorrecta (RFC "
-"2911 sección 4.1.2)."
#, c-format
-msgid "\"%s\": Bad name value \"%s\" - bad length %d (RFC 2911 section 4.1.2)."
+msgid "\"%s\": Bad name value \"%s\" - bad length %d (RFC 8011 section 5.1.3)."
msgstr ""
-"\"%s\": Valor del nombre \"%s\" incorrecto - longitud %d incorrecta (RFC "
-"2911 sección 4.1.2)."
#, c-format
msgid ""
-"\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 2911 section "
-"4.1.8)."
+"\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 8011 section "
+"5.1.9)."
msgstr ""
-"\"%s\": Valor naturalLanguage \"%s\" incorrecto - caracteres incorrectos "
-"(RFC 2911 sección 4.1.8)."
#, c-format
msgid ""
-"\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 2911 section "
-"4.1.8)."
+"\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 8011 section "
+"5.1.9)."
msgstr ""
-"\"%s\": Valor naturalLanguage \"%s\" incorrecto - longitud %d incorrecta "
-"(RFC 2911 sección 4.1.8)."
#, c-format
msgid ""
-"\"%s\": Bad octetString value - bad length %d (RFC 2911 section 4.1.10)."
+"\"%s\": Bad octetString value - bad length %d (RFC 8011 section 5.1.20)."
msgstr ""
-"\"%s\": Valor octetString incorrecto - longitud %d incorrecta (RFC 2911 "
-"sección 4.1.10)."
#, c-format
msgid ""
-"\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 2911 "
-"section 4.1.13)."
+"\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 8011 "
+"section 5.1.14)."
msgstr ""
-"\"%s\": Valor rangeOfInteger %d-%d incorrecto - el más bajo es mayor que el "
-"más alto (RFC 2911 section 4.1.13)."
#, c-format
msgid ""
-"\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 2911 section "
-"4.1.15)."
+"\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 8011 section "
+"5.1.16)."
msgstr ""
-"\"%s\": Valor de resolución %dx%d%s incorrecto - valores de unidades "
-"incorrectas (RFC 2911 section 4.1.15)."
#, c-format
msgid ""
"\"%s\": Bad resolution value %dx%d%s - cross feed resolution must be "
-"positive (RFC 2911 section 4.1.15)."
+"positive (RFC 8011 section 5.1.16)."
msgstr ""
-"\"%s\": Valor de resolución %dx%d%s incorrecto - la resolución de la "
-"alimentación cruzada debe ser positiva (RFC 2911 sección 4.1.15)."
#, c-format
msgid ""
"\"%s\": Bad resolution value %dx%d%s - feed resolution must be positive (RFC "
-"2911 section 4.1.15)."
+"8011 section 5.1.16)."
msgstr ""
-"\"%s\": Valor de resolución %dx%d%s incorrecto - la resolución de la "
-"alimentación debe ser positiva (RFC 2911 sección 4.1.15)."
#, c-format
msgid ""
-"\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.1)."
+"\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."
msgstr ""
-"\"%s\": Valor del texto \"%s\" incorrecto - secuencia UTF-8 incorrecta (RFC "
-"2911 sección 4.1.1)."
#, c-format
-msgid "\"%s\": Bad text value \"%s\" - bad length %d (RFC 2911 section 4.1.1)."
+msgid "\"%s\": Bad text value \"%s\" - bad length %d (RFC 8011 section 5.1.2)."
msgstr ""
-"\"%s\": Valor del texto \"%s\" incorrecto - longitud %d incorrecta (RFC 2911 "
-"sección 4.1.1)."
#, c-format
msgid ""
-"\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 2911 section 4.1.6)."
+"\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 8011 section 5.1.7)."
msgstr ""
-"\"%s\": Valor uriScheme \"%s\" incorrecto - caracteres incorrectos (RFC 2911 "
-"sección 4.1.6)."
#, c-format
msgid ""
-"\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 2911 section 4.1.6)."
+"\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 8011 section 5.1.7)."
msgstr ""
-"\"%s\": Valor uriScheme \"%s\" incorrecto - longitud %d incorrecta (RFC 2911 "
-"sección 4.1.6)."
#, c-format
msgid "%-7s %-7.7s %-7d %-31.31s %.0f bytes"
@@ -6992,6 +6946,199 @@ msgstr "sin título"
msgid "variable-bindings uses indefinite length"
msgstr "variable-bindings usa una longitud indefinida"
+#~ msgid " -E Test with HTTP Upgrade to TLS."
+#~ msgstr " -E Prueba con actualización HTTP a TLS."
+
+#~ msgid " -S Test with SSL encryption."
+#~ msgstr " -S Prueba con cifrado SSL."
+
+#~ msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 2911 section 4.1.5)."
+#~ msgstr "\"%s\": Valor URI \"%s\" incorrecto - %s (RFC 2911 sección 4.1.5)."
+
+#~ msgid ""
+#~ "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 2911 section 4.1.5)."
+#~ msgstr ""
+#~ "\"%s\": Valor URI \"%s\" incorrecto - longitud %d incorrecta (RFC 2911 "
+#~ "sección 4.1.5)."
+
+#~ msgid "\"%s\": Bad attribute name - bad length %d (RFC 2911 section 4.1.3)."
+#~ msgstr ""
+#~ "\"%s\": Nombre de atributo incorrecto - longitud %d incorrecta (RFC 2911 "
+#~ "sección 4.1.3)."
+
+#~ msgid ""
+#~ "\"%s\": Bad attribute name - invalid character (RFC 2911 section 4.1.3)."
+#~ msgstr ""
+#~ "\"%s\": Nombre de atributo incorrecto - carácter inválido (RFC 2911 "
+#~ "sección 4.1.3)."
+
+#~ msgid "\"%s\": Bad boolen value %d (RFC 2911 section 4.1.11)."
+#~ msgstr "\"%s\": Valor lógico \"%d\" incorrecto (RFC 2911 sección 4.1.11)."
+
+#~ msgid ""
+#~ "\"%s\": Bad charset value \"%s\" - bad characters (RFC 2911 section "
+#~ "4.1.7)."
+#~ msgstr ""
+#~ "\"%s\": Valor del juego de caracteres \"%s\" incorrecto - caracteres "
+#~ "incorrectos (RFC 2911 sección 4.1.7)."
+
+#~ msgid ""
+#~ "\"%s\": Bad charset value \"%s\" - bad length %d (RFC 2911 section 4.1.7)."
+#~ msgstr ""
+#~ "\"%s\": Valor del juego de caracteres \"%s\" incorrecto - longitud %d "
+#~ "incorrecta (RFC 2911 sección 4.1.7)."
+
+#~ msgid "\"%s\": Bad dateTime UTC hours %u (RFC 2911 section 4.1.14)."
+#~ msgstr ""
+#~ "\"%s\": Horas dateTime UTC %u incorrectas (RFC 2911 sección 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 2911 section 4.1.14)."
+#~ msgstr ""
+#~ "\"%s\": Minutos dateTime UTC %u incorrectos (RFC 2911 sección 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": Signo dateTime UTC %c incorrecto (RFC 2911 sección 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime day %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": Día dateTime %u incorrecto (RFC 2911 sección 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime deciseconds %u (RFC 2911 section 4.1.14)."
+#~ msgstr ""
+#~ "\"%s\": Décimas de segundo dateTime %u incorrectas (RFC 2911 sección "
+#~ "4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime hours %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": Horas dateTime %u incorrectas (RFC 2911 sección 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime minutes %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": Minutos dateTime %u incorrectos (RFC 2911 sección 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime month %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": Mes dateTime %u incorrecto (RFC 2911 sección 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime seconds %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": Segundos dateTime %u incorrectos (RFC 2911 sección 4.1.14)."
+
+#~ msgid "\"%s\": Bad enum value %d - out of range (RFC 2911 section 4.1.4)."
+#~ msgstr ""
+#~ "\"%s\": Valor enumerado %d incorrecto - fuera de intervalo (RFC 2911 "
+#~ "sección 4.1.4)."
+
+#~ msgid ""
+#~ "\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 2911 section 4.1.3)."
+#~ msgstr ""
+#~ "\"%s\": Valor clave \"%s\" incorrecto - longitud %d incorrecta (RFC 2911 "
+#~ "sección 4.1.3)."
+
+#~ msgid ""
+#~ "\"%s\": Bad keyword value \"%s\" - invalid character (RFC 2911 section "
+#~ "4.1.3)."
+#~ msgstr ""
+#~ "\"%s\": Valor clave \"%s\" incorrecto - carácter inválido (RFC 2911 "
+#~ "sección 4.1.3)."
+
+#~ msgid ""
+#~ "\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 2911 section "
+#~ "4.1.9)."
+#~ msgstr ""
+#~ "\"%s\": Valor mimeMediaType \"%s\" incorrecto - caracteres incorrectos "
+#~ "(RFC 2911 sección 4.1.9)."
+
+#~ msgid ""
+#~ "\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 2911 section "
+#~ "4.1.9)."
+#~ msgstr ""
+#~ "\"%s\": Valor mimeMediaType \"%s\" incorrecto - longitud %d incorrecta "
+#~ "(RFC 2911 sección 4.1.9)."
+
+#~ msgid ""
+#~ "\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 2911 section "
+#~ "4.1.2)."
+#~ msgstr ""
+#~ "\"%s\": Valor del nombre \"%s\" incorrecto - secuencia UTF-8 incorrecta "
+#~ "(RFC 2911 sección 4.1.2)."
+
+#~ msgid ""
+#~ "\"%s\": Bad name value \"%s\" - bad length %d (RFC 2911 section 4.1.2)."
+#~ msgstr ""
+#~ "\"%s\": Valor del nombre \"%s\" incorrecto - longitud %d incorrecta (RFC "
+#~ "2911 sección 4.1.2)."
+
+#~ msgid ""
+#~ "\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 2911 "
+#~ "section 4.1.8)."
+#~ msgstr ""
+#~ "\"%s\": Valor naturalLanguage \"%s\" incorrecto - caracteres incorrectos "
+#~ "(RFC 2911 sección 4.1.8)."
+
+#~ msgid ""
+#~ "\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 2911 "
+#~ "section 4.1.8)."
+#~ msgstr ""
+#~ "\"%s\": Valor naturalLanguage \"%s\" incorrecto - longitud %d incorrecta "
+#~ "(RFC 2911 sección 4.1.8)."
+
+#~ msgid ""
+#~ "\"%s\": Bad octetString value - bad length %d (RFC 2911 section 4.1.10)."
+#~ msgstr ""
+#~ "\"%s\": Valor octetString incorrecto - longitud %d incorrecta (RFC 2911 "
+#~ "sección 4.1.10)."
+
+#~ msgid ""
+#~ "\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC "
+#~ "2911 section 4.1.13)."
+#~ msgstr ""
+#~ "\"%s\": Valor rangeOfInteger %d-%d incorrecto - el más bajo es mayor que "
+#~ "el más alto (RFC 2911 section 4.1.13)."
+
+#~ msgid ""
+#~ "\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 2911 section "
+#~ "4.1.15)."
+#~ msgstr ""
+#~ "\"%s\": Valor de resolución %dx%d%s incorrecto - valores de unidades "
+#~ "incorrectas (RFC 2911 section 4.1.15)."
+
+#~ msgid ""
+#~ "\"%s\": Bad resolution value %dx%d%s - cross feed resolution must be "
+#~ "positive (RFC 2911 section 4.1.15)."
+#~ msgstr ""
+#~ "\"%s\": Valor de resolución %dx%d%s incorrecto - la resolución de la "
+#~ "alimentación cruzada debe ser positiva (RFC 2911 sección 4.1.15)."
+
+#~ msgid ""
+#~ "\"%s\": Bad resolution value %dx%d%s - feed resolution must be positive "
+#~ "(RFC 2911 section 4.1.15)."
+#~ msgstr ""
+#~ "\"%s\": Valor de resolución %dx%d%s incorrecto - la resolución de la "
+#~ "alimentación debe ser positiva (RFC 2911 sección 4.1.15)."
+
+#~ msgid ""
+#~ "\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 2911 section "
+#~ "4.1.1)."
+#~ msgstr ""
+#~ "\"%s\": Valor del texto \"%s\" incorrecto - secuencia UTF-8 incorrecta "
+#~ "(RFC 2911 sección 4.1.1)."
+
+#~ msgid ""
+#~ "\"%s\": Bad text value \"%s\" - bad length %d (RFC 2911 section 4.1.1)."
+#~ msgstr ""
+#~ "\"%s\": Valor del texto \"%s\" incorrecto - longitud %d incorrecta (RFC "
+#~ "2911 sección 4.1.1)."
+
+#~ msgid ""
+#~ "\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 2911 section "
+#~ "4.1.6)."
+#~ msgstr ""
+#~ "\"%s\": Valor uriScheme \"%s\" incorrecto - caracteres incorrectos (RFC "
+#~ "2911 sección 4.1.6)."
+
+#~ msgid ""
+#~ "\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 2911 section "
+#~ "4.1.6)."
+#~ msgstr ""
+#~ "\"%s\": Valor uriScheme \"%s\" incorrecto - longitud %d incorrecta (RFC "
+#~ "2911 sección 4.1.6)."
+
#~ msgid "CD/DVD/Bluray"
#~ msgstr "CD/DVD/Bluray"
diff --git a/locale/cups_fr.po b/locale/cups_fr.po
index 2deff009b..b4b29d305 100644
--- a/locale/cups_fr.po
+++ b/locale/cups_fr.po
@@ -29,7 +29,7 @@ msgid ""
msgstr ""
"Project-Id-Version: CUPS 1.6\n"
"Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-04-05 15:24-0400\n"
+"POT-Creation-Date: 2017-06-15 20:52-0400\n"
"PO-Revision-Date: 2012-12-12 11:12+0100\n"
"Last-Translator: denis meramdjougoma <dcmeram@libertysurf.fr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -908,7 +908,8 @@ msgstr ""
msgid " -E Encrypt the connection."
msgstr ""
-msgid " -E Test with HTTP Upgrade to TLS."
+msgid ""
+" -E Test with encryption using HTTP Upgrade to TLS."
msgstr ""
msgid ""
@@ -944,7 +945,7 @@ msgstr ""
msgid " -R root-directory Set alternate root."
msgstr ""
-msgid " -S Test with SSL encryption."
+msgid " -S Test with encryption using HTTPS."
msgstr ""
msgid " -T seconds Set the browse timeout in seconds."
@@ -1195,166 +1196,166 @@ msgid " PASS"
msgstr ""
#, c-format
-msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 2911 section 4.1.5)."
+msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 8011 section 5.1.6)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 2911 section 4.1.5)."
+msgid "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 8011 section 5.1.6)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad attribute name - bad length %d (RFC 2911 section 4.1.3)."
+msgid "\"%s\": Bad attribute name - bad length %d (RFC 8011 section 5.1.4)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad attribute name - invalid character (RFC 2911 section 4.1.3)."
+"\"%s\": Bad attribute name - invalid character (RFC 8011 section 5.1.4)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad boolen value %d (RFC 2911 section 4.1.11)."
+msgid "\"%s\": Bad boolen value %d (RFC 8011 section 5.1.21)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad charset value \"%s\" - bad characters (RFC 2911 section 4.1.7)."
+"\"%s\": Bad charset value \"%s\" - bad characters (RFC 8011 section 5.1.8)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad charset value \"%s\" - bad length %d (RFC 2911 section 4.1.7)."
+"\"%s\": Bad charset value \"%s\" - bad length %d (RFC 8011 section 5.1.8)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime UTC hours %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC hours %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime day %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime day %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime deciseconds %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime deciseconds %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime hours %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime hours %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime minutes %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime minutes %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime month %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime month %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime seconds %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime seconds %u (RFC 8011 section 5.1.15)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad enum value %d - out of range (RFC 2911 section 4.1.4)."
+msgid "\"%s\": Bad enum value %d - out of range (RFC 8011 section 5.1.5)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 2911 section 4.1.3)."
+"\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 8011 section 5.1.4)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad keyword value \"%s\" - invalid character (RFC 2911 section "
-"4.1.3)."
+"\"%s\": Bad keyword value \"%s\" - invalid character (RFC 8011 section "
+"5.1.4)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 2911 section "
-"4.1.9)."
+"\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 8011 section "
+"5.1.10)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 2911 section "
-"4.1.9)."
+"\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 8011 section "
+"5.1.10)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.2)."
+"\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad name value \"%s\" - bad length %d (RFC 2911 section 4.1.2)."
+msgid "\"%s\": Bad name value \"%s\" - bad length %d (RFC 8011 section 5.1.3)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 2911 section "
-"4.1.8)."
+"\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 8011 section "
+"5.1.9)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 2911 section "
-"4.1.8)."
+"\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 8011 section "
+"5.1.9)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad octetString value - bad length %d (RFC 2911 section 4.1.10)."
+"\"%s\": Bad octetString value - bad length %d (RFC 8011 section 5.1.20)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 2911 "
-"section 4.1.13)."
+"\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 8011 "
+"section 5.1.14)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 2911 section "
-"4.1.15)."
+"\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 8011 section "
+"5.1.16)."
msgstr ""
#, c-format
msgid ""
"\"%s\": Bad resolution value %dx%d%s - cross feed resolution must be "
-"positive (RFC 2911 section 4.1.15)."
+"positive (RFC 8011 section 5.1.16)."
msgstr ""
#, c-format
msgid ""
"\"%s\": Bad resolution value %dx%d%s - feed resolution must be positive (RFC "
-"2911 section 4.1.15)."
+"8011 section 5.1.16)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.1)."
+"\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."
msgstr ""
#, c-format
-msgid "\"%s\": Bad text value \"%s\" - bad length %d (RFC 2911 section 4.1.1)."
+msgid "\"%s\": Bad text value \"%s\" - bad length %d (RFC 8011 section 5.1.2)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 2911 section 4.1.6)."
+"\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 8011 section 5.1.7)."
msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 2911 section 4.1.6)."
+"\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 8011 section 5.1.7)."
msgstr ""
#, c-format
diff --git a/locale/cups_it.po b/locale/cups_it.po
index 1963f7f37..f0efba96c 100644
--- a/locale/cups_it.po
+++ b/locale/cups_it.po
@@ -29,7 +29,7 @@ msgid ""
msgstr ""
"Project-Id-Version: CUPS 1.6\n"
"Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-04-05 15:24-0400\n"
+"POT-Creation-Date: 2017-06-15 20:52-0400\n"
"PO-Revision-Date: 2013-07-14 12:00+0200\n"
"Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
"Language-Team: Arch Linux Italian Team <giovanni@archlinux.org>\n"
@@ -1072,8 +1072,9 @@ msgstr " -D name=value Imposta la variabile chiamata al valore."
msgid " -E Encrypt the connection."
msgstr " -E Crittografa la connessione."
-msgid " -E Test with HTTP Upgrade to TLS."
-msgstr " -E Prova con l'aggiornamento HTTP a TLS."
+msgid ""
+" -E Test with encryption using HTTP Upgrade to TLS."
+msgstr ""
msgid ""
" -F Run in the foreground but detach from console."
@@ -1112,8 +1113,8 @@ msgstr ""
msgid " -R root-directory Set alternate root."
msgstr " -R root-directory Imposta una root alternativa."
-msgid " -S Test with SSL encryption."
-msgstr " -S Prova con crittografia SSL."
+msgid " -S Test with encryption using HTTPS."
+msgstr ""
msgid " -T seconds Set the browse timeout in seconds."
msgstr " -T seconds Imposta il timeout in secondi."
@@ -1397,216 +1398,167 @@ msgid " PASS"
msgstr " OPERAZIONE RIUSCITA CON SUCCESSO"
#, c-format
-msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 2911 section 4.1.5)."
+msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 8011 section 5.1.6)."
msgstr ""
-"\"%s\": il valore dell'URI non è valido \"%s\" - %s (RFC 2911 sezione 4.1.5)."
#, c-format
-msgid "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 2911 section 4.1.5)."
+msgid "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 8011 section 5.1.6)."
msgstr ""
-"\"%s\": il valore dell'URI non è valido \"%s\" - la lunghezza non è valida "
-"%d (RFC 2911 sezione 4.1.5)."
#, c-format
-msgid "\"%s\": Bad attribute name - bad length %d (RFC 2911 section 4.1.3)."
+msgid "\"%s\": Bad attribute name - bad length %d (RFC 8011 section 5.1.4)."
msgstr ""
-"\"%s\": il nome dell'attributo non è valido - la lunghezza non è valida %d "
-"(RFC 2911 sezione 4.1.3)."
#, c-format
msgid ""
-"\"%s\": Bad attribute name - invalid character (RFC 2911 section 4.1.3)."
+"\"%s\": Bad attribute name - invalid character (RFC 8011 section 5.1.4)."
msgstr ""
-"\"%s\": il nome dell'attributo non è valido - il carattere non è valido (RFC "
-"2911 sezione 4.1.3)."
#, c-format
-msgid "\"%s\": Bad boolen value %d (RFC 2911 section 4.1.11)."
-msgstr "\"%s\": il valore booleano non è valido %d (RFC 2911 sezione 4.1.11)."
+msgid "\"%s\": Bad boolen value %d (RFC 8011 section 5.1.21)."
+msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad charset value \"%s\" - bad characters (RFC 2911 section 4.1.7)."
+"\"%s\": Bad charset value \"%s\" - bad characters (RFC 8011 section 5.1.8)."
msgstr ""
-"\"%s\": il valore del set dei caratteri non è valido \"%s\" - i caratteri "
-"non sono validi (RFC 2911 sezione 4.1.7)."
#, c-format
msgid ""
-"\"%s\": Bad charset value \"%s\" - bad length %d (RFC 2911 section 4.1.7)."
+"\"%s\": Bad charset value \"%s\" - bad length %d (RFC 8011 section 5.1.8)."
msgstr ""
-"\"%s\": il valore del set dei caratteri non è valido \"%s\" - la lunghezza "
-"non è valida %d (RFC 2911 sezione 4.1.7)."
#, c-format
-msgid "\"%s\": Bad dateTime UTC hours %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": dateTime UTC non è valido ore %u (RFC 2911 sezione 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC hours %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": dateTime UTC non è valido minuti %u (RFC 2911 sezione 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 8011 section 5.1.15)."
msgstr ""
-"\"%s\": dateTime UTC non è valido segno '%c' (RFC 2911 sezione 4.1.14)."
#, c-format
-msgid "\"%s\": Bad dateTime day %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": dateTime non è valido giorno %u (RFC 2911 sezione 4.1.14)."
+msgid "\"%s\": Bad dateTime day %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime deciseconds %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime deciseconds %u (RFC 8011 section 5.1.15)."
msgstr ""
-"\"%s\": dateTime non è valido decimi di secondi %u (RFC 2911 sezione 4.1.14)."
#, c-format
-msgid "\"%s\": Bad dateTime hours %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": dateTime non è valido ore %u (RFC 2911 sezione 4.1.14)."
+msgid "\"%s\": Bad dateTime hours %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime minutes %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": dateTime non è valido minuti %u (RFC 2911 sezione 4.1.14)."
+msgid "\"%s\": Bad dateTime minutes %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime month %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": dateTime non è valido mese %u (RFC 2911 sezione 4.1.14)."
+msgid "\"%s\": Bad dateTime month %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime seconds %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": dateTime non è valido secondi %u (RFC 2911 sezione 4.1.14)."
+msgid "\"%s\": Bad dateTime seconds %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad enum value %d - out of range (RFC 2911 section 4.1.4)."
+msgid "\"%s\": Bad enum value %d - out of range (RFC 8011 section 5.1.5)."
msgstr ""
-"\"%s\": il valore enum non è valido %d - fuori intervallo (RFC 2911 sezione "
-"4.1.4)."
#, c-format
msgid ""
-"\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 2911 section 4.1.3)."
+"\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 8011 section 5.1.4)."
msgstr ""
-"\"%s\": il valore della parola chiave non è valido \"%s\" - la lunghezza non "
-"è valida %d (RFC 2911 sezione 4.1.3)."
#, c-format
msgid ""
-"\"%s\": Bad keyword value \"%s\" - invalid character (RFC 2911 section "
-"4.1.3)."
+"\"%s\": Bad keyword value \"%s\" - invalid character (RFC 8011 section "
+"5.1.4)."
msgstr ""
-"\"%s\": il valore della parola chiave non è valido \"%s\" - il carattere non "
-"è valido (RFC 2911 sezione 4.1.3)."
#, c-format
msgid ""
-"\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 2911 section "
-"4.1.9)."
+"\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 8011 section "
+"5.1.10)."
msgstr ""
-"\"%s\": il valore di mimeMediaType non è valido \"%s\" - i caratteri non "
-"sono validi (RFC 2911 sezione 4.1.9)."
#, c-format
msgid ""
-"\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 2911 section "
-"4.1.9)."
+"\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 8011 section "
+"5.1.10)."
msgstr ""
-"\"%s\": il valore di mimeMediaType non è valido \"%s\" - la lunghezza non è "
-"valida %d (RFC 2911 sezione 4.1.9)."
#, c-format
msgid ""
-"\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.2)."
+"\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."
msgstr ""
-"\"%s\": il valore del nome non è valido \"%s\" - la sequenza UTF-8 non è "
-"valida (RFC 2911 sezione 4.1.2)."
#, c-format
-msgid "\"%s\": Bad name value \"%s\" - bad length %d (RFC 2911 section 4.1.2)."
+msgid "\"%s\": Bad name value \"%s\" - bad length %d (RFC 8011 section 5.1.3)."
msgstr ""
-"\"%s\": il valore del nome non è valido \"%s\" - la lunghezza non è valida "
-"%d (RFC 2911 sezione 4.1.2)."
#, c-format
msgid ""
-"\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 2911 section "
-"4.1.8)."
+"\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 8011 section "
+"5.1.9)."
msgstr ""
-"\"%s\": il valore di naturalLanguage non è valido \"%s\" - i caratteri non "
-"sono validi (RFC 2911 sezione 4.1.8)."
#, c-format
msgid ""
-"\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 2911 section "
-"4.1.8)."
+"\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 8011 section "
+"5.1.9)."
msgstr ""
-"\"%s\": il valore di naturalLanguage non è valido \"%s\" - la lunghezza non "
-"è valida %d (RFC 2911 sezione 4.1.8)."
#, c-format
msgid ""
-"\"%s\": Bad octetString value - bad length %d (RFC 2911 section 4.1.10)."
+"\"%s\": Bad octetString value - bad length %d (RFC 8011 section 5.1.20)."
msgstr ""
-"\"%s\": il valore di octetString non è valido - la lunghezza non è valida %d "
-"(RFC 2911 sezione 4.1.10)."
#, c-format
msgid ""
-"\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 2911 "
-"section 4.1.13)."
+"\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 8011 "
+"section 5.1.14)."
msgstr ""
-"\"%s\": il valore di rangeOfInteger non è valido %d-%d - il più piccolo è "
-"superiore al più grande (RFC 2911 sezione 4.1.13)."
#, c-format
msgid ""
-"\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 2911 section "
-"4.1.15)."
+"\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 8011 section "
+"5.1.16)."
msgstr ""
-"\"%s\": il valore di resolution non è valido %dx%d%s - il valore dell'unità "
-"non è valida (RFC 2911 sezione 4.1.15)."
#, c-format
msgid ""
"\"%s\": Bad resolution value %dx%d%s - cross feed resolution must be "
-"positive (RFC 2911 section 4.1.15)."
+"positive (RFC 8011 section 5.1.16)."
msgstr ""
-"\"%s\": il valore della risoluzione non è valido %dx%d%s - la risoluzione "
-"del feed deve essere positiva (RFC 2911 sezione 4.1.15)."
#, c-format
msgid ""
"\"%s\": Bad resolution value %dx%d%s - feed resolution must be positive (RFC "
-"2911 section 4.1.15)."
+"8011 section 5.1.16)."
msgstr ""
-"\"%s\": il valore della risoluzione non è valido %dx%d%s - la risoluzione "
-"del feed deve essere positiva (RFC 2911 sezione 4.1.15)."
#, c-format
msgid ""
-"\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.1)."
+"\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."
msgstr ""
-"\"%s\": il valore del testo non è valido \"%s\" - la sequenza UTF-8 non è "
-"valida (RFC 2911 sezione 4.1.1)."
#, c-format
-msgid "\"%s\": Bad text value \"%s\" - bad length %d (RFC 2911 section 4.1.1)."
+msgid "\"%s\": Bad text value \"%s\" - bad length %d (RFC 8011 section 5.1.2)."
msgstr ""
-"\"%s\": il valore del testo non è valido \"%s\" - la lunghezza non è valida "
-"%d (RFC 2911 sezione 4.1.1)."
#, c-format
msgid ""
-"\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 2911 section 4.1.6)."
+"\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 8011 section 5.1.7)."
msgstr ""
-"\"%s\": il valore di uriScheme non è valido \"%s\" - i caratteri non sono "
-"validi (RFC 2911 sezione 4.1.6)."
#, c-format
msgid ""
-"\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 2911 section 4.1.6)."
+"\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 8011 section 5.1.7)."
msgstr ""
-"\"%s\": il valore di uriScheme non è valido \"%s\" - la lunghezza non è "
-"valida %d (RFC 2911 sezione 4.1.6)."
#, c-format
msgid "%-7s %-7.7s %-7d %-31.31s %.0f bytes"
@@ -6971,6 +6923,12 @@ msgstr "variable-bindings utilizza una lunghezza indefinita"
#~ msgstr ""
#~ " --lf Termina le righe con LF (UNIX/Linux/OS X)."
+#~ msgid " -E Test with HTTP Upgrade to TLS."
+#~ msgstr " -E Prova con l'aggiornamento HTTP a TLS."
+
+#~ msgid " -S Test with SSL encryption."
+#~ msgstr " -S Prova con crittografia SSL."
+
#~ msgid " -a Browse for all services."
#~ msgstr " -a Mostra tutti i servizi."
@@ -6988,6 +6946,196 @@ msgstr "variable-bindings utilizza una lunghezza indefinita"
#~ msgid " -t type Browse/resolve with specified type."
#~ msgstr " -t type Mostra/risolve con il tipo specificato."
+#~ msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 2911 section 4.1.5)."
+#~ msgstr ""
+#~ "\"%s\": il valore dell'URI non è valido \"%s\" - %s (RFC 2911 sezione "
+#~ "4.1.5)."
+
+#~ msgid ""
+#~ "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 2911 section 4.1.5)."
+#~ msgstr ""
+#~ "\"%s\": il valore dell'URI non è valido \"%s\" - la lunghezza non è "
+#~ "valida %d (RFC 2911 sezione 4.1.5)."
+
+#~ msgid "\"%s\": Bad attribute name - bad length %d (RFC 2911 section 4.1.3)."
+#~ msgstr ""
+#~ "\"%s\": il nome dell'attributo non è valido - la lunghezza non è valida "
+#~ "%d (RFC 2911 sezione 4.1.3)."
+
+#~ msgid ""
+#~ "\"%s\": Bad attribute name - invalid character (RFC 2911 section 4.1.3)."
+#~ msgstr ""
+#~ "\"%s\": il nome dell'attributo non è valido - il carattere non è valido "
+#~ "(RFC 2911 sezione 4.1.3)."
+
+#~ msgid "\"%s\": Bad boolen value %d (RFC 2911 section 4.1.11)."
+#~ msgstr ""
+#~ "\"%s\": il valore booleano non è valido %d (RFC 2911 sezione 4.1.11)."
+
+#~ msgid ""
+#~ "\"%s\": Bad charset value \"%s\" - bad characters (RFC 2911 section "
+#~ "4.1.7)."
+#~ msgstr ""
+#~ "\"%s\": il valore del set dei caratteri non è valido \"%s\" - i caratteri "
+#~ "non sono validi (RFC 2911 sezione 4.1.7)."
+
+#~ msgid ""
+#~ "\"%s\": Bad charset value \"%s\" - bad length %d (RFC 2911 section 4.1.7)."
+#~ msgstr ""
+#~ "\"%s\": il valore del set dei caratteri non è valido \"%s\" - la "
+#~ "lunghezza non è valida %d (RFC 2911 sezione 4.1.7)."
+
+#~ msgid "\"%s\": Bad dateTime UTC hours %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": dateTime UTC non è valido ore %u (RFC 2911 sezione 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 2911 section 4.1.14)."
+#~ msgstr ""
+#~ "\"%s\": dateTime UTC non è valido minuti %u (RFC 2911 sezione 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 2911 section 4.1.14)."
+#~ msgstr ""
+#~ "\"%s\": dateTime UTC non è valido segno '%c' (RFC 2911 sezione 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime day %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": dateTime non è valido giorno %u (RFC 2911 sezione 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime deciseconds %u (RFC 2911 section 4.1.14)."
+#~ msgstr ""
+#~ "\"%s\": dateTime non è valido decimi di secondi %u (RFC 2911 sezione "
+#~ "4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime hours %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": dateTime non è valido ore %u (RFC 2911 sezione 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime minutes %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": dateTime non è valido minuti %u (RFC 2911 sezione 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime month %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": dateTime non è valido mese %u (RFC 2911 sezione 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime seconds %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": dateTime non è valido secondi %u (RFC 2911 sezione 4.1.14)."
+
+#~ msgid "\"%s\": Bad enum value %d - out of range (RFC 2911 section 4.1.4)."
+#~ msgstr ""
+#~ "\"%s\": il valore enum non è valido %d - fuori intervallo (RFC 2911 "
+#~ "sezione 4.1.4)."
+
+#~ msgid ""
+#~ "\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 2911 section 4.1.3)."
+#~ msgstr ""
+#~ "\"%s\": il valore della parola chiave non è valido \"%s\" - la lunghezza "
+#~ "non è valida %d (RFC 2911 sezione 4.1.3)."
+
+#~ msgid ""
+#~ "\"%s\": Bad keyword value \"%s\" - invalid character (RFC 2911 section "
+#~ "4.1.3)."
+#~ msgstr ""
+#~ "\"%s\": il valore della parola chiave non è valido \"%s\" - il carattere "
+#~ "non è valido (RFC 2911 sezione 4.1.3)."
+
+#~ msgid ""
+#~ "\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 2911 section "
+#~ "4.1.9)."
+#~ msgstr ""
+#~ "\"%s\": il valore di mimeMediaType non è valido \"%s\" - i caratteri non "
+#~ "sono validi (RFC 2911 sezione 4.1.9)."
+
+#~ msgid ""
+#~ "\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 2911 section "
+#~ "4.1.9)."
+#~ msgstr ""
+#~ "\"%s\": il valore di mimeMediaType non è valido \"%s\" - la lunghezza non "
+#~ "è valida %d (RFC 2911 sezione 4.1.9)."
+
+#~ msgid ""
+#~ "\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 2911 section "
+#~ "4.1.2)."
+#~ msgstr ""
+#~ "\"%s\": il valore del nome non è valido \"%s\" - la sequenza UTF-8 non è "
+#~ "valida (RFC 2911 sezione 4.1.2)."
+
+#~ msgid ""
+#~ "\"%s\": Bad name value \"%s\" - bad length %d (RFC 2911 section 4.1.2)."
+#~ msgstr ""
+#~ "\"%s\": il valore del nome non è valido \"%s\" - la lunghezza non è "
+#~ "valida %d (RFC 2911 sezione 4.1.2)."
+
+#~ msgid ""
+#~ "\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 2911 "
+#~ "section 4.1.8)."
+#~ msgstr ""
+#~ "\"%s\": il valore di naturalLanguage non è valido \"%s\" - i caratteri "
+#~ "non sono validi (RFC 2911 sezione 4.1.8)."
+
+#~ msgid ""
+#~ "\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 2911 "
+#~ "section 4.1.8)."
+#~ msgstr ""
+#~ "\"%s\": il valore di naturalLanguage non è valido \"%s\" - la lunghezza "
+#~ "non è valida %d (RFC 2911 sezione 4.1.8)."
+
+#~ msgid ""
+#~ "\"%s\": Bad octetString value - bad length %d (RFC 2911 section 4.1.10)."
+#~ msgstr ""
+#~ "\"%s\": il valore di octetString non è valido - la lunghezza non è valida "
+#~ "%d (RFC 2911 sezione 4.1.10)."
+
+#~ msgid ""
+#~ "\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC "
+#~ "2911 section 4.1.13)."
+#~ msgstr ""
+#~ "\"%s\": il valore di rangeOfInteger non è valido %d-%d - il più piccolo è "
+#~ "superiore al più grande (RFC 2911 sezione 4.1.13)."
+
+#~ msgid ""
+#~ "\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 2911 section "
+#~ "4.1.15)."
+#~ msgstr ""
+#~ "\"%s\": il valore di resolution non è valido %dx%d%s - il valore "
+#~ "dell'unità non è valida (RFC 2911 sezione 4.1.15)."
+
+#~ msgid ""
+#~ "\"%s\": Bad resolution value %dx%d%s - cross feed resolution must be "
+#~ "positive (RFC 2911 section 4.1.15)."
+#~ msgstr ""
+#~ "\"%s\": il valore della risoluzione non è valido %dx%d%s - la risoluzione "
+#~ "del feed deve essere positiva (RFC 2911 sezione 4.1.15)."
+
+#~ msgid ""
+#~ "\"%s\": Bad resolution value %dx%d%s - feed resolution must be positive "
+#~ "(RFC 2911 section 4.1.15)."
+#~ msgstr ""
+#~ "\"%s\": il valore della risoluzione non è valido %dx%d%s - la risoluzione "
+#~ "del feed deve essere positiva (RFC 2911 sezione 4.1.15)."
+
+#~ msgid ""
+#~ "\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 2911 section "
+#~ "4.1.1)."
+#~ msgstr ""
+#~ "\"%s\": il valore del testo non è valido \"%s\" - la sequenza UTF-8 non è "
+#~ "valida (RFC 2911 sezione 4.1.1)."
+
+#~ msgid ""
+#~ "\"%s\": Bad text value \"%s\" - bad length %d (RFC 2911 section 4.1.1)."
+#~ msgstr ""
+#~ "\"%s\": il valore del testo non è valido \"%s\" - la lunghezza non è "
+#~ "valida %d (RFC 2911 sezione 4.1.1)."
+
+#~ msgid ""
+#~ "\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 2911 section "
+#~ "4.1.6)."
+#~ msgstr ""
+#~ "\"%s\": il valore di uriScheme non è valido \"%s\" - i caratteri non sono "
+#~ "validi (RFC 2911 sezione 4.1.6)."
+
+#~ msgid ""
+#~ "\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 2911 section "
+#~ "4.1.6)."
+#~ msgstr ""
+#~ "\"%s\": il valore di uriScheme non è valido \"%s\" - la lunghezza non è "
+#~ "valida %d (RFC 2911 sezione 4.1.6)."
+
#~ msgid "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes"
#~ msgstr "%-6s %-10.10s %-4d %-10d %-27.27s %.0f byte"
diff --git a/locale/cups_ja.po b/locale/cups_ja.po
index 1df25d361..d60b5984d 100644
--- a/locale/cups_ja.po
+++ b/locale/cups_ja.po
@@ -28,7 +28,7 @@ msgid ""
msgstr ""
"Project-Id-Version: CUPS 2.0\n"
"Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-04-05 15:24-0400\n"
+"POT-Creation-Date: 2017-06-15 20:52-0400\n"
"PO-Revision-Date: 2014-11-15 19:27+0900\n"
"Last-Translator: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"
"Language-Team: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"
@@ -1061,9 +1061,9 @@ msgstr ""
msgid " -E Encrypt the connection."
msgstr " -E 接続を暗å·åŒ–ã™ã‚‹ã€‚"
-msgid " -E Test with HTTP Upgrade to TLS."
+msgid ""
+" -E Test with encryption using HTTP Upgrade to TLS."
msgstr ""
-" -E HTTP ã‹ã‚‰ TLS ã¸ã®ã‚¢ãƒƒãƒ—グレードã§ãƒ†ã‚¹ãƒˆã™ã‚‹ã€‚"
msgid ""
" -F Run in the foreground but detach from console."
@@ -1104,8 +1104,8 @@ msgstr ""
msgid " -R root-directory Set alternate root."
msgstr " -R root-directory 別ã®ãƒ«ãƒ¼ãƒˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãƒ¼ã‚’指定ã™ã‚‹ã€‚"
-msgid " -S Test with SSL encryption."
-msgstr " -S SSL æš—å·åŒ–ã§ãƒ†ã‚¹ãƒˆã™ã‚‹ã€‚"
+msgid " -S Test with encryption using HTTPS."
+msgstr ""
msgid " -T seconds Set the browse timeout in seconds."
msgstr " -T <秒> ブラウズã®ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆã‚’秒ã§æŒ‡å®šã™ã‚‹ã€‚"
@@ -1374,204 +1374,167 @@ msgid " PASS"
msgstr " åˆæ ¼"
#, c-format
-msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 2911 section 4.1.5)."
-msgstr "\"%s\": URI ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - %s (RFC 2911 4.1.5 節)。"
+msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 8011 section 5.1.6)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 2911 section 4.1.5)."
+msgid "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 8011 section 5.1.6)."
msgstr ""
-"\"%s\": URI ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - é•·ã•ã®èª¤ã‚Š %d (RFC 2911 4.1.5 節)。"
#, c-format
-msgid "\"%s\": Bad attribute name - bad length %d (RFC 2911 section 4.1.3)."
-msgstr "\"%s\": 属性åãŒèª¤ã£ã¦ã„ã¾ã™ - é•·ã•ã®èª¤ã‚Š %d (RFC 2911 4.1.3 節)。"
+msgid "\"%s\": Bad attribute name - bad length %d (RFC 8011 section 5.1.4)."
+msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad attribute name - invalid character (RFC 2911 section 4.1.3)."
-msgstr "\"%s\": 属性åãŒèª¤ã£ã¦ã„ã¾ã™ - ä¸æ­£ãªæ–‡å­— (RFC 2911 4.1.3 節)。"
+"\"%s\": Bad attribute name - invalid character (RFC 8011 section 5.1.4)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad boolen value %d (RFC 2911 section 4.1.11)."
-msgstr "\"%s\": 真å½å€¤ %d ãŒèª¤ã£ã¦ã„ã¾ã™ (RFC 2911 4.1.11 節)。"
+msgid "\"%s\": Bad boolen value %d (RFC 8011 section 5.1.21)."
+msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad charset value \"%s\" - bad characters (RFC 2911 section 4.1.7)."
+"\"%s\": Bad charset value \"%s\" - bad characters (RFC 8011 section 5.1.8)."
msgstr ""
-"\"%s\": charset ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - ä¸æ­£ãªæ–‡å­— (RFC 2911 4.1.7 節)。"
#, c-format
msgid ""
-"\"%s\": Bad charset value \"%s\" - bad length %d (RFC 2911 section 4.1.7)."
+"\"%s\": Bad charset value \"%s\" - bad length %d (RFC 8011 section 5.1.8)."
msgstr ""
-"\"%s\": charset ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - ä¸æ­£ãªé•·ã• %d (RFC 2911 section "
-"4.1.7)."
#, c-format
-msgid "\"%s\": Bad dateTime UTC hours %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC hours %u (RFC 8011 section 5.1.15)."
msgstr ""
-"\"%s\": dateTime UTC ã®æ™‚間指定 %u ãŒèª¤ã£ã¦ã„ã¾ã™ (RFC 2911 4.1.14 節)."
#, c-format
-msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": dateTime UTC ã®åˆ†æŒ‡å®š %u ãŒèª¤ã£ã¦ã„ã¾ã™ (RFC 2911 4.1.14 節)。"
+msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 8011 section 5.1.15)."
msgstr ""
-"\"%s\": dateTime UTC ã®ç¬¦å·æŒ‡å®š '%c' ãŒèª¤ã£ã¦ã„ã¾ã™ (RFC 2911 4.1.14 節)。"
#, c-format
-msgid "\"%s\": Bad dateTime day %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": dateTime ã®æ—¥ä»˜æŒ‡å®š %u ãŒèª¤ã£ã¦ã„ã¾ã™ (RFC 2911 4.1.14 節)."
+msgid "\"%s\": Bad dateTime day %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime deciseconds %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime deciseconds %u (RFC 8011 section 5.1.15)."
msgstr ""
-"\"%s\": dateTime ã® 0.1 秒ã®æŒ‡å®š %u ãŒèª¤ã£ã¦ã„ã¾ã™ (RFC 2911 4.1.14 節)。"
#, c-format
-msgid "\"%s\": Bad dateTime hours %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": dateTime ã®æ™‚間指定 %u ãŒèª¤ã£ã¦ã„ã¾ã™ (RFC 2911 4.1.14 節)。"
+msgid "\"%s\": Bad dateTime hours %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime minutes %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": dateTime ã®åˆ†æŒ‡å®šãŒèª¤ã£ã¦ã„ã¾ã™ %u (RFC 2911 4.1.14 節)。"
+msgid "\"%s\": Bad dateTime minutes %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime month %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": dateTime ã®æœˆæŒ‡å®š %u ãŒèª¤ã£ã¦ã„ã¾ã™ (RFC 2911 4.1.14 節)。"
+msgid "\"%s\": Bad dateTime month %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime seconds %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": 日時ã®ç§’指定 %u ãŒèª¤ã£ã¦ã„ã¾ã™ (RFC 2911 4.1.14 節)。"
+msgid "\"%s\": Bad dateTime seconds %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad enum value %d - out of range (RFC 2911 section 4.1.4)."
-msgstr "\"%s\": enum ã®å€¤ %d ãŒèª¤ã£ã¦ã„ã¾ã™ - 範囲外ã®å€¤ (RFC 2911 4.1.4 節)。"
+msgid "\"%s\": Bad enum value %d - out of range (RFC 8011 section 5.1.5)."
+msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 2911 section 4.1.3)."
+"\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 8011 section 5.1.4)."
msgstr ""
-"\"%s\": keyword ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - %d (RFC 2911 section 4.1.3)."
#, c-format
msgid ""
-"\"%s\": Bad keyword value \"%s\" - invalid character (RFC 2911 section "
-"4.1.3)."
+"\"%s\": Bad keyword value \"%s\" - invalid character (RFC 8011 section "
+"5.1.4)."
msgstr ""
-"\"%s\": keyword ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - ä¸æ­£ãªæ–‡å­— (RFC 2911 4.1.3 節)。"
#, c-format
msgid ""
-"\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 2911 section "
-"4.1.9)."
+"\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 8011 section "
+"5.1.10)."
msgstr ""
-"\"%s\": mimeMediaType ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - 誤ã£ãŸæ–‡å­— (RFC 2911 "
-"4.1.9 節)。"
#, c-format
msgid ""
-"\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 2911 section "
-"4.1.9)."
+"\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 8011 section "
+"5.1.10)."
msgstr ""
-"\"%s\": mimeMediaType ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - é•·ã•ã®èª¤ã‚Š %d (RFC 2911 "
-"4.1.9 節)。"
#, c-format
msgid ""
-"\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.2)."
+"\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."
msgstr ""
-"\"%s\": name ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - UTF-8 ã¨ã—ã¦èª¤ã£ãŸä¸¦ã³ (RFC 2911 "
-"4.1.2 節)。"
#, c-format
-msgid "\"%s\": Bad name value \"%s\" - bad length %d (RFC 2911 section 4.1.2)."
+msgid "\"%s\": Bad name value \"%s\" - bad length %d (RFC 8011 section 5.1.3)."
msgstr ""
-"\"%s\": name ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - 誤ã£ãŸé•·ã• %d (RFC 2911 section "
-"4.1.2)。"
#, c-format
msgid ""
-"\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 2911 section "
-"4.1.8)."
+"\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 8011 section "
+"5.1.9)."
msgstr ""
-"\"%s\": naturalLanguage ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - 誤ã£ãŸæ–‡å­— (RFC 2911 "
-"4.1.8 節)。"
#, c-format
msgid ""
-"\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 2911 section "
-"4.1.8)."
+"\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 8011 section "
+"5.1.9)."
msgstr ""
-"\"%s\": naturalLanguage ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - 誤ã£ãŸé•·ã• %d (RFC 2911 "
-"4.1.8 節)。"
#, c-format
msgid ""
-"\"%s\": Bad octetString value - bad length %d (RFC 2911 section 4.1.10)."
+"\"%s\": Bad octetString value - bad length %d (RFC 8011 section 5.1.20)."
msgstr ""
-"\"%s\": octetString 値ãŒèª¤ã£ã¦ã„ã¾ã™ - 誤ã£ãŸé•·ã• %d (RFC 2911 4.1.10 節)。"
#, c-format
msgid ""
-"\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 2911 "
-"section 4.1.13)."
+"\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 8011 "
+"section 5.1.14)."
msgstr ""
-"\"%s\": rangeOfInteger ã®å€¤ %d-%d ãŒèª¤ã£ã¦ã„ã¾ã™ - 下é™ãŒä¸Šé™ã‚ˆã‚Šã‚‚大ãã„ "
-"(RFC 2911 4.1.13 節)。"
#, c-format
msgid ""
-"\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 2911 section "
-"4.1.15)."
+"\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 8011 section "
+"5.1.16)."
msgstr ""
-"\"%s\": resolution ã®å€¤ %dx%d%s ãŒèª¤ã£ã¦ã„ã¾ã™ - å˜ä½å€¤ã®èª¤ã‚Š (RFC 2911 "
-"4.1.15 節)。"
#, c-format
msgid ""
"\"%s\": Bad resolution value %dx%d%s - cross feed resolution must be "
-"positive (RFC 2911 section 4.1.15)."
+"positive (RFC 8011 section 5.1.16)."
msgstr ""
-"\"%s\": resolution ã®å€¤ %dx%d%s ãŒèª¤ã£ã¦ã„ã¾ã™ - 主走査解åƒåº¦ãŒè²  (RFC 2911 "
-"4.1.15 節)。"
#, c-format
msgid ""
"\"%s\": Bad resolution value %dx%d%s - feed resolution must be positive (RFC "
-"2911 section 4.1.15)."
+"8011 section 5.1.16)."
msgstr ""
-"\"%s\": resolution ã®å€¤ %dx%d%s ãŒèª¤ã£ã¦ã„ã¾ã™ - 副走査解åƒåº¦ãŒè²  (RFC 2911 "
-"4.1.15 節)。"
#, c-format
msgid ""
-"\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.1)."
+"\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."
msgstr ""
-"\"%s\": text ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - UTF-8 ã¨ã—ã¦èª¤ã£ãŸä¸¦ã³ (RFC 2911 "
-"4.1.1 節)。"
#, c-format
-msgid "\"%s\": Bad text value \"%s\" - bad length %d (RFC 2911 section 4.1.1)."
+msgid "\"%s\": Bad text value \"%s\" - bad length %d (RFC 8011 section 5.1.2)."
msgstr ""
-"\"%s\": text ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - ä¸æ­£ãªé•·ã• %d (RFC 2911 4.1.1 節)。"
#, c-format
msgid ""
-"\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 2911 section 4.1.6)."
+"\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 8011 section 5.1.7)."
msgstr ""
-"\"%s\": uriScheme ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - 誤ã£ãŸæ–‡å­— (RFC 2911 4.1.6 "
-"節)."
#, c-format
msgid ""
-"\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 2911 section 4.1.6)."
+"\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 8011 section 5.1.7)."
msgstr ""
-"\"%s\": uriScheme ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - ä¸æ­£ãªé•·ã• %d (RFC 2911 4.1.6 "
-"節)."
#, c-format
msgid "%-7s %-7.7s %-7d %-31.31s %.0f bytes"
@@ -6954,6 +6917,13 @@ msgstr "variable-bindings ã®é•·ã•ãŒä¸å®š"
#~ msgid " --lf End lines with LF (UNIX/Linux/OS X)."
#~ msgstr " --lf 行末を LF ã¨ã™ã‚‹ (UNIX/Linux/OS X)。"
+#~ msgid " -E Test with HTTP Upgrade to TLS."
+#~ msgstr ""
+#~ " -E HTTP ã‹ã‚‰ TLS ã¸ã®ã‚¢ãƒƒãƒ—グレードã§ãƒ†ã‚¹ãƒˆã™ã‚‹ã€‚"
+
+#~ msgid " -S Test with SSL encryption."
+#~ msgstr " -S SSL æš—å·åŒ–ã§ãƒ†ã‚¹ãƒˆã™ã‚‹ã€‚"
+
#~ msgid " -a Browse for all services."
#~ msgstr " -a ã™ã¹ã¦ã®ã‚µãƒ¼ãƒ“スをブラウズã™ã‚‹ã€‚"
@@ -6972,12 +6942,194 @@ msgstr "variable-bindings ã®é•·ã•ãŒä¸å®š"
#~ msgid " -t type Browse/resolve with specified type."
#~ msgstr " -t タイプ 指定ã•ã‚ŒãŸã‚¿ã‚¤ãƒ—ã§ãƒ–ラウズ/åå‰è§£æ±ºã™ã‚‹ã€‚"
+#~ msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 2911 section 4.1.5)."
+#~ msgstr "\"%s\": URI ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - %s (RFC 2911 4.1.5 節)。"
+
+#~ msgid ""
+#~ "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 2911 section 4.1.5)."
+#~ msgstr ""
+#~ "\"%s\": URI ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - é•·ã•ã®èª¤ã‚Š %d (RFC 2911 4.1.5 "
+#~ "節)。"
+
+#~ msgid "\"%s\": Bad attribute name - bad length %d (RFC 2911 section 4.1.3)."
+#~ msgstr "\"%s\": 属性åãŒèª¤ã£ã¦ã„ã¾ã™ - é•·ã•ã®èª¤ã‚Š %d (RFC 2911 4.1.3 節)。"
+
+#~ msgid ""
+#~ "\"%s\": Bad attribute name - invalid character (RFC 2911 section 4.1.3)."
+#~ msgstr "\"%s\": 属性åãŒèª¤ã£ã¦ã„ã¾ã™ - ä¸æ­£ãªæ–‡å­— (RFC 2911 4.1.3 節)。"
+
+#~ msgid "\"%s\": Bad boolen value %d (RFC 2911 section 4.1.11)."
+#~ msgstr "\"%s\": 真å½å€¤ %d ãŒèª¤ã£ã¦ã„ã¾ã™ (RFC 2911 4.1.11 節)。"
+
+#~ msgid ""
+#~ "\"%s\": Bad charset value \"%s\" - bad characters (RFC 2911 section "
+#~ "4.1.7)."
+#~ msgstr ""
+#~ "\"%s\": charset ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - ä¸æ­£ãªæ–‡å­— (RFC 2911 4.1.7 "
+#~ "節)。"
+
+#~ msgid ""
+#~ "\"%s\": Bad charset value \"%s\" - bad length %d (RFC 2911 section 4.1.7)."
+#~ msgstr ""
+#~ "\"%s\": charset ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - ä¸æ­£ãªé•·ã• %d (RFC 2911 "
+#~ "section 4.1.7)."
+
+#~ msgid "\"%s\": Bad dateTime UTC hours %u (RFC 2911 section 4.1.14)."
+#~ msgstr ""
+#~ "\"%s\": dateTime UTC ã®æ™‚間指定 %u ãŒèª¤ã£ã¦ã„ã¾ã™ (RFC 2911 4.1.14 節)."
+
+#~ msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 2911 section 4.1.14)."
+#~ msgstr ""
+#~ "\"%s\": dateTime UTC ã®åˆ†æŒ‡å®š %u ãŒèª¤ã£ã¦ã„ã¾ã™ (RFC 2911 4.1.14 節)。"
+
+#~ msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 2911 section 4.1.14)."
+#~ msgstr ""
+#~ "\"%s\": dateTime UTC ã®ç¬¦å·æŒ‡å®š '%c' ãŒèª¤ã£ã¦ã„ã¾ã™ (RFC 2911 4.1.14 節)。"
+
+#~ msgid "\"%s\": Bad dateTime day %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": dateTime ã®æ—¥ä»˜æŒ‡å®š %u ãŒèª¤ã£ã¦ã„ã¾ã™ (RFC 2911 4.1.14 節)."
+
+#~ msgid "\"%s\": Bad dateTime deciseconds %u (RFC 2911 section 4.1.14)."
+#~ msgstr ""
+#~ "\"%s\": dateTime ã® 0.1 秒ã®æŒ‡å®š %u ãŒèª¤ã£ã¦ã„ã¾ã™ (RFC 2911 4.1.14 節)。"
+
+#~ msgid "\"%s\": Bad dateTime hours %u (RFC 2911 section 4.1.14)."
+#~ msgstr ""
+#~ "\"%s\": dateTime ã®æ™‚間指定 %u ãŒèª¤ã£ã¦ã„ã¾ã™ (RFC 2911 4.1.14 節)。"
+
+#~ msgid "\"%s\": Bad dateTime minutes %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": dateTime ã®åˆ†æŒ‡å®šãŒèª¤ã£ã¦ã„ã¾ã™ %u (RFC 2911 4.1.14 節)。"
+
+#~ msgid "\"%s\": Bad dateTime month %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": dateTime ã®æœˆæŒ‡å®š %u ãŒèª¤ã£ã¦ã„ã¾ã™ (RFC 2911 4.1.14 節)。"
+
+#~ msgid "\"%s\": Bad dateTime seconds %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": 日時ã®ç§’指定 %u ãŒèª¤ã£ã¦ã„ã¾ã™ (RFC 2911 4.1.14 節)。"
+
+#~ msgid "\"%s\": Bad enum value %d - out of range (RFC 2911 section 4.1.4)."
+#~ msgstr ""
+#~ "\"%s\": enum ã®å€¤ %d ãŒèª¤ã£ã¦ã„ã¾ã™ - 範囲外ã®å€¤ (RFC 2911 4.1.4 節)。"
+
+#~ msgid ""
+#~ "\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 2911 section 4.1.3)."
+#~ msgstr ""
+#~ "\"%s\": keyword ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - %d (RFC 2911 section 4.1.3)."
+
+#~ msgid ""
+#~ "\"%s\": Bad keyword value \"%s\" - invalid character (RFC 2911 section "
+#~ "4.1.3)."
+#~ msgstr ""
+#~ "\"%s\": keyword ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - ä¸æ­£ãªæ–‡å­— (RFC 2911 4.1.3 "
+#~ "節)。"
+
+#~ msgid ""
+#~ "\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 2911 section "
+#~ "4.1.9)."
+#~ msgstr ""
+#~ "\"%s\": mimeMediaType ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - 誤ã£ãŸæ–‡å­— (RFC 2911 "
+#~ "4.1.9 節)。"
+
+#~ msgid ""
+#~ "\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 2911 section "
+#~ "4.1.9)."
+#~ msgstr ""
+#~ "\"%s\": mimeMediaType ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - é•·ã•ã®èª¤ã‚Š %d (RFC "
+#~ "2911 4.1.9 節)。"
+
+#~ msgid ""
+#~ "\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 2911 section "
+#~ "4.1.2)."
+#~ msgstr ""
+#~ "\"%s\": name ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - UTF-8 ã¨ã—ã¦èª¤ã£ãŸä¸¦ã³ (RFC "
+#~ "2911 4.1.2 節)。"
+
+#~ msgid ""
+#~ "\"%s\": Bad name value \"%s\" - bad length %d (RFC 2911 section 4.1.2)."
+#~ msgstr ""
+#~ "\"%s\": name ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - 誤ã£ãŸé•·ã• %d (RFC 2911 section "
+#~ "4.1.2)。"
+
+#~ msgid ""
+#~ "\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 2911 "
+#~ "section 4.1.8)."
+#~ msgstr ""
+#~ "\"%s\": naturalLanguage ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - 誤ã£ãŸæ–‡å­— (RFC 2911 "
+#~ "4.1.8 節)。"
+
+#~ msgid ""
+#~ "\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 2911 "
+#~ "section 4.1.8)."
+#~ msgstr ""
+#~ "\"%s\": naturalLanguage ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - 誤ã£ãŸé•·ã• %d (RFC "
+#~ "2911 4.1.8 節)。"
+
+#~ msgid ""
+#~ "\"%s\": Bad octetString value - bad length %d (RFC 2911 section 4.1.10)."
+#~ msgstr ""
+#~ "\"%s\": octetString 値ãŒèª¤ã£ã¦ã„ã¾ã™ - 誤ã£ãŸé•·ã• %d (RFC 2911 4.1.10 "
+#~ "節)。"
+
+#~ msgid ""
+#~ "\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC "
+#~ "2911 section 4.1.13)."
+#~ msgstr ""
+#~ "\"%s\": rangeOfInteger ã®å€¤ %d-%d ãŒèª¤ã£ã¦ã„ã¾ã™ - 下é™ãŒä¸Šé™ã‚ˆã‚Šã‚‚大ã"
+#~ "ㄠ(RFC 2911 4.1.13 節)。"
+
+#~ msgid ""
+#~ "\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 2911 section "
+#~ "4.1.15)."
+#~ msgstr ""
+#~ "\"%s\": resolution ã®å€¤ %dx%d%s ãŒèª¤ã£ã¦ã„ã¾ã™ - å˜ä½å€¤ã®èª¤ã‚Š (RFC 2911 "
+#~ "4.1.15 節)。"
+
+#~ msgid ""
+#~ "\"%s\": Bad resolution value %dx%d%s - cross feed resolution must be "
+#~ "positive (RFC 2911 section 4.1.15)."
+#~ msgstr ""
+#~ "\"%s\": resolution ã®å€¤ %dx%d%s ãŒèª¤ã£ã¦ã„ã¾ã™ - 主走査解åƒåº¦ãŒè²  (RFC "
+#~ "2911 4.1.15 節)。"
+
+#~ msgid ""
+#~ "\"%s\": Bad resolution value %dx%d%s - feed resolution must be positive "
+#~ "(RFC 2911 section 4.1.15)."
+#~ msgstr ""
+#~ "\"%s\": resolution ã®å€¤ %dx%d%s ãŒèª¤ã£ã¦ã„ã¾ã™ - 副走査解åƒåº¦ãŒè²  (RFC "
+#~ "2911 4.1.15 節)。"
+
+#~ msgid ""
+#~ "\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 2911 section "
+#~ "4.1.1)."
+#~ msgstr ""
+#~ "\"%s\": text ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - UTF-8 ã¨ã—ã¦èª¤ã£ãŸä¸¦ã³ (RFC "
+#~ "2911 4.1.1 節)。"
+
+#~ msgid ""
+#~ "\"%s\": Bad text value \"%s\" - bad length %d (RFC 2911 section 4.1.1)."
+#~ msgstr ""
+#~ "\"%s\": text ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - ä¸æ­£ãªé•·ã• %d (RFC 2911 4.1.1 "
+#~ "節)。"
+
+#~ msgid ""
+#~ "\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 2911 section "
+#~ "4.1.6)."
+#~ msgstr ""
+#~ "\"%s\": uriScheme ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - 誤ã£ãŸæ–‡å­— (RFC 2911 4.1.6 "
+#~ "節)."
+
#~ msgid ""
#~ "\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 2911 4.1.6 節)."
#~ msgstr ""
#~ "\"%s\": uriScheme 値 \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - 誤ã£ãŸé•·ã• %d (RFC 2911 "
#~ "4.1.6 節)."
+#~ msgid ""
+#~ "\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 2911 section "
+#~ "4.1.6)."
+#~ msgstr ""
+#~ "\"%s\": uriScheme ã®å€¤ \"%s\" ãŒèª¤ã£ã¦ã„ã¾ã™ - ä¸æ­£ãªé•·ã• %d (RFC 2911 "
+#~ "4.1.6 節)."
+
#~ msgid "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes"
#~ msgstr "%-6s %-10.10s %-4d %-10d %-27.27s %.0f ãƒã‚¤ãƒˆ"
diff --git a/locale/cups_pt_BR.po b/locale/cups_pt_BR.po
index 04e5f80c9..93d6af507 100644
--- a/locale/cups_pt_BR.po
+++ b/locale/cups_pt_BR.po
@@ -40,7 +40,7 @@ msgid ""
msgstr ""
"Project-Id-Version: CUPS 2.1.2\n"
"Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-04-05 15:24-0400\n"
+"POT-Creation-Date: 2017-06-15 20:52-0400\n"
"PO-Revision-Date: 2016-01-31 16:45-0200\n"
"Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
"Language-Team: Brazilian Portuguese <traducao-cups-pt-br@googlegroups.com>\n"
@@ -1078,8 +1078,9 @@ msgstr " -D nome=valor Define a variável \"nome\" com \"valor\"."
msgid " -E Encrypt the connection."
msgstr " -E Criptografa a conexão."
-msgid " -E Test with HTTP Upgrade to TLS."
-msgstr " -E Testa com HTTP Upgrade para TLS."
+msgid ""
+" -E Test with encryption using HTTP Upgrade to TLS."
+msgstr ""
msgid ""
" -F Run in the foreground but detach from console."
@@ -1121,8 +1122,8 @@ msgstr " -P número[-número] Corresponde a porta ao número ou faixa."
msgid " -R root-directory Set alternate root."
msgstr " -R diretório-raiz Define diretório-raiz alternativo."
-msgid " -S Test with SSL encryption."
-msgstr " -S Testa com criptografia SSL."
+msgid " -S Test with encryption using HTTPS."
+msgstr ""
msgid " -T seconds Set the browse timeout in seconds."
msgstr ""
@@ -1406,213 +1407,167 @@ msgid " PASS"
msgstr " PASSOU"
#, c-format
-msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 2911 section 4.1.5)."
-msgstr "\"%s\": Valor inválido de URI \"%s\" - %s (RFC 2911 seção 4.1.5)."
+msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 8011 section 5.1.6)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 2911 section 4.1.5)."
+msgid "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 8011 section 5.1.6)."
msgstr ""
-"\"%s\": Valor inválido de URI \"%s\" - comprimento inválido %d (RFC 2911 "
-"seção 4.1.5)."
#, c-format
-msgid "\"%s\": Bad attribute name - bad length %d (RFC 2911 section 4.1.3)."
+msgid "\"%s\": Bad attribute name - bad length %d (RFC 8011 section 5.1.4)."
msgstr ""
-"\"%s\": Nome de atributo inválido - comprimento inválido %d (RFC 2911 seção "
-"4.1.3)."
#, c-format
msgid ""
-"\"%s\": Bad attribute name - invalid character (RFC 2911 section 4.1.3)."
+"\"%s\": Bad attribute name - invalid character (RFC 8011 section 5.1.4)."
msgstr ""
-"\"%s\": Nome de atributo inválido - caractere inválido (RFC 2911 seção "
-"4.1.3)."
#, c-format
-msgid "\"%s\": Bad boolen value %d (RFC 2911 section 4.1.11)."
-msgstr "\"%s\": Valor booleano inválido %d (RFC 2911 seção 4.1.11)."
+msgid "\"%s\": Bad boolen value %d (RFC 8011 section 5.1.21)."
+msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad charset value \"%s\" - bad characters (RFC 2911 section 4.1.7)."
+"\"%s\": Bad charset value \"%s\" - bad characters (RFC 8011 section 5.1.8)."
msgstr ""
-"\"%s\": Valor de conjunto de caracteres inválido \"%s\" - caracteres "
-"inválido (RFC 2911 seção 4.1.7)."
#, c-format
msgid ""
-"\"%s\": Bad charset value \"%s\" - bad length %d (RFC 2911 section 4.1.7)."
+"\"%s\": Bad charset value \"%s\" - bad length %d (RFC 8011 section 5.1.8)."
msgstr ""
-"\"%s\": Valor de conjunto de caracteres inválido \"%s\" - comprimento "
-"inválido %d (RFC 2911 seção 4.1.7)."
#, c-format
-msgid "\"%s\": Bad dateTime UTC hours %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": Horas de UTC dateTime inválidas %u (RFC 2911 seção 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC hours %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": Minutos de UTC dateTime inválidos %u (RFC 2911 seção 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": Sinal de UTC dateTime inválido \"%c\" (RFC 2911 seção 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime day %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": Dia de dateTime inválido %u (RFC 2911 seção 4.1.14)."
+msgid "\"%s\": Bad dateTime day %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime deciseconds %u (RFC 2911 section 4.1.14)."
+msgid "\"%s\": Bad dateTime deciseconds %u (RFC 8011 section 5.1.15)."
msgstr ""
-"\"%s\": Décimos de segundos de dateTime inválidos %u (RFC 2911 seção 4.1.14)."
#, c-format
-msgid "\"%s\": Bad dateTime hours %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": Horas de dateTime inválidas %u (RFC 2911 seção 4.1.14)."
+msgid "\"%s\": Bad dateTime hours %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime minutes %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": Minutos de dateTime inválidos %u (RFC 2911 seção 4.1.14)."
+msgid "\"%s\": Bad dateTime minutes %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime month %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": Mês de dateTime inválido %u (RFC 2911 seção 4.1.14)."
+msgid "\"%s\": Bad dateTime month %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime seconds %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": Segundos de dateTime inválidos %u (RFC 2911 seção 4.1.14)."
+msgid "\"%s\": Bad dateTime seconds %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad enum value %d - out of range (RFC 2911 section 4.1.4)."
+msgid "\"%s\": Bad enum value %d - out of range (RFC 8011 section 5.1.5)."
msgstr ""
-"\"%s\": Valor de enum inválido %d - fora da faixa (RFC 2911 seção 4.1.4)."
#, c-format
msgid ""
-"\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 2911 section 4.1.3)."
+"\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 8011 section 5.1.4)."
msgstr ""
-"\"%s\": Valor de keyword inválido \"%s\" - comprimento inválido %d (RFC 2911 "
-"seção 4.1.3)."
#, c-format
msgid ""
-"\"%s\": Bad keyword value \"%s\" - invalid character (RFC 2911 section "
-"4.1.3)."
+"\"%s\": Bad keyword value \"%s\" - invalid character (RFC 8011 section "
+"5.1.4)."
msgstr ""
-"\"%s\": Valor de keyword inválido \"%s\" - caractere inválido (RFC 2911 "
-"seção 4.1.3)."
#, c-format
msgid ""
-"\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 2911 section "
-"4.1.9)."
+"\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 8011 section "
+"5.1.10)."
msgstr ""
-"\"%s\": Valor de mimeMediaType inválido \"%s\" - caracteres inválidos (RFC "
-"2911 seção 4.1.9)."
#, c-format
msgid ""
-"\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 2911 section "
-"4.1.9)."
+"\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 8011 section "
+"5.1.10)."
msgstr ""
-"\"%s\": Valor de mimeMediaType inválido \"%s\" - comprimento inválido %d "
-"(RFC 2911 seção 4.1.9)."
#, c-format
msgid ""
-"\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.2)."
+"\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."
msgstr ""
-"\"%s\": Valor de name inválido \"%s\" - sequência UTF-8 inválida (RFC 2911 "
-"seção 4.1.2)."
#, c-format
-msgid "\"%s\": Bad name value \"%s\" - bad length %d (RFC 2911 section 4.1.2)."
+msgid "\"%s\": Bad name value \"%s\" - bad length %d (RFC 8011 section 5.1.3)."
msgstr ""
-"\"%s\": Valor de name inválido \"%s\" - comprimento inválido %d (RFC 2911 "
-"seção 4.1.2)."
#, c-format
msgid ""
-"\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 2911 section "
-"4.1.8)."
+"\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 8011 section "
+"5.1.9)."
msgstr ""
-"\"%s\": Valor de naturalLanguage inválido \"%s\" - caracteres inválidos (RFC "
-"2911 seção 4.1.8)."
#, c-format
msgid ""
-"\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 2911 section "
-"4.1.8)."
+"\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 8011 section "
+"5.1.9)."
msgstr ""
-"\"%s\": Valor de naturalLanguage inválido \"%s\" - comprimento inválido %d "
-"(RFC 2911 seção 4.1.8)."
#, c-format
msgid ""
-"\"%s\": Bad octetString value - bad length %d (RFC 2911 section 4.1.10)."
+"\"%s\": Bad octetString value - bad length %d (RFC 8011 section 5.1.20)."
msgstr ""
-"\"%s\": Valor de octetString inválido - comprimento inválido %d (RFC 2911 "
-"seção 4.1.10)."
#, c-format
msgid ""
-"\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 2911 "
-"section 4.1.13)."
+"\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 8011 "
+"section 5.1.14)."
msgstr ""
-"\"%s\": Valor de rangeOfInteger inválido %d-%d - inferior maior do que o "
-"superior (RFC 2911 seção 4.1.13)."
#, c-format
msgid ""
-"\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 2911 section "
-"4.1.15)."
+"\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 8011 section "
+"5.1.16)."
msgstr ""
-"\"%s\": Valor de resolução inválido %dx%d%s - valor de unidades inválido "
-"(RFC 2911 seção 4.1.15)."
#, c-format
msgid ""
"\"%s\": Bad resolution value %dx%d%s - cross feed resolution must be "
-"positive (RFC 2911 section 4.1.15)."
+"positive (RFC 8011 section 5.1.16)."
msgstr ""
-"\"%s\": Valor de resolução inválido %dx%d%s - resolução de cross-feed deve "
-"ser positiva (RFC 2911 seção 4.1.15)."
#, c-format
msgid ""
"\"%s\": Bad resolution value %dx%d%s - feed resolution must be positive (RFC "
-"2911 section 4.1.15)."
+"8011 section 5.1.16)."
msgstr ""
-"\"%s\": Valor de resolução inválido %dx%d%s - resolução de feed deve ser "
-"positiva (RFC 2911 seção 4.1.15)."
#, c-format
msgid ""
-"\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.1)."
+"\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."
msgstr ""
-"\"%s\": Valor de texto inválido \"%s\" - sequência UTF-8 inválida (RFC 2911 "
-"seção 4.1.1)."
#, c-format
-msgid "\"%s\": Bad text value \"%s\" - bad length %d (RFC 2911 section 4.1.1)."
+msgid "\"%s\": Bad text value \"%s\" - bad length %d (RFC 8011 section 5.1.2)."
msgstr ""
-"\"%s\": Valor de texto inválido \"%s\" - comprimento inválido %d (RFC 2911 "
-"seção 4.1.1)."
#, c-format
msgid ""
-"\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 2911 section 4.1.6)."
+"\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 8011 section 5.1.7)."
msgstr ""
-"\"%s\": Valor de uriScheme inválido \"%s\" - caracteres inválidos (RFC 2911 "
-"seção 4.1.6)."
#, c-format
msgid ""
-"\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 2911 section 4.1.6)."
+"\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 8011 section 5.1.7)."
msgstr ""
-"\"%s\": Valor de uriScheme inválido \"%s\" - comprimento inválido %d (RFC "
-"2911 seção 4.1.6)."
#, c-format
msgid "%-7s %-7.7s %-7d %-31.31s %.0f bytes"
@@ -6959,6 +6914,12 @@ msgstr "variable-bindings usa comprimento indefinido"
#~ msgid " --lf End lines with LF (UNIX/Linux/OS X)."
#~ msgstr " --lf Fim de linhas com LF (UNIX/Linux/OS X)."
+#~ msgid " -E Test with HTTP Upgrade to TLS."
+#~ msgstr " -E Testa com HTTP Upgrade para TLS."
+
+#~ msgid " -S Test with SSL encryption."
+#~ msgstr " -S Testa com criptografia SSL."
+
#~ msgid " -a Browse for all services."
#~ msgstr " -a Navega por todos os serviços."
@@ -6976,6 +6937,192 @@ msgstr "variable-bindings usa comprimento indefinido"
#~ msgid " -t type Browse/resolve with specified type."
#~ msgstr " -t tipo Navega/resolve com o tipo especificado."
+#~ msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 2911 section 4.1.5)."
+#~ msgstr "\"%s\": Valor inválido de URI \"%s\" - %s (RFC 2911 seção 4.1.5)."
+
+#~ msgid ""
+#~ "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 2911 section 4.1.5)."
+#~ msgstr ""
+#~ "\"%s\": Valor inválido de URI \"%s\" - comprimento inválido %d (RFC 2911 "
+#~ "seção 4.1.5)."
+
+#~ msgid "\"%s\": Bad attribute name - bad length %d (RFC 2911 section 4.1.3)."
+#~ msgstr ""
+#~ "\"%s\": Nome de atributo inválido - comprimento inválido %d (RFC 2911 "
+#~ "seção 4.1.3)."
+
+#~ msgid ""
+#~ "\"%s\": Bad attribute name - invalid character (RFC 2911 section 4.1.3)."
+#~ msgstr ""
+#~ "\"%s\": Nome de atributo inválido - caractere inválido (RFC 2911 seção "
+#~ "4.1.3)."
+
+#~ msgid "\"%s\": Bad boolen value %d (RFC 2911 section 4.1.11)."
+#~ msgstr "\"%s\": Valor booleano inválido %d (RFC 2911 seção 4.1.11)."
+
+#~ msgid ""
+#~ "\"%s\": Bad charset value \"%s\" - bad characters (RFC 2911 section "
+#~ "4.1.7)."
+#~ msgstr ""
+#~ "\"%s\": Valor de conjunto de caracteres inválido \"%s\" - caracteres "
+#~ "inválido (RFC 2911 seção 4.1.7)."
+
+#~ msgid ""
+#~ "\"%s\": Bad charset value \"%s\" - bad length %d (RFC 2911 section 4.1.7)."
+#~ msgstr ""
+#~ "\"%s\": Valor de conjunto de caracteres inválido \"%s\" - comprimento "
+#~ "inválido %d (RFC 2911 seção 4.1.7)."
+
+#~ msgid "\"%s\": Bad dateTime UTC hours %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": Horas de UTC dateTime inválidas %u (RFC 2911 seção 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 2911 section 4.1.14)."
+#~ msgstr ""
+#~ "\"%s\": Minutos de UTC dateTime inválidos %u (RFC 2911 seção 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 2911 section 4.1.14)."
+#~ msgstr ""
+#~ "\"%s\": Sinal de UTC dateTime inválido \"%c\" (RFC 2911 seção 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime day %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": Dia de dateTime inválido %u (RFC 2911 seção 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime deciseconds %u (RFC 2911 section 4.1.14)."
+#~ msgstr ""
+#~ "\"%s\": Décimos de segundos de dateTime inválidos %u (RFC 2911 seção "
+#~ "4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime hours %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": Horas de dateTime inválidas %u (RFC 2911 seção 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime minutes %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": Minutos de dateTime inválidos %u (RFC 2911 seção 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime month %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": Mês de dateTime inválido %u (RFC 2911 seção 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime seconds %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": Segundos de dateTime inválidos %u (RFC 2911 seção 4.1.14)."
+
+#~ msgid "\"%s\": Bad enum value %d - out of range (RFC 2911 section 4.1.4)."
+#~ msgstr ""
+#~ "\"%s\": Valor de enum inválido %d - fora da faixa (RFC 2911 seção 4.1.4)."
+
+#~ msgid ""
+#~ "\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 2911 section 4.1.3)."
+#~ msgstr ""
+#~ "\"%s\": Valor de keyword inválido \"%s\" - comprimento inválido %d (RFC "
+#~ "2911 seção 4.1.3)."
+
+#~ msgid ""
+#~ "\"%s\": Bad keyword value \"%s\" - invalid character (RFC 2911 section "
+#~ "4.1.3)."
+#~ msgstr ""
+#~ "\"%s\": Valor de keyword inválido \"%s\" - caractere inválido (RFC 2911 "
+#~ "seção 4.1.3)."
+
+#~ msgid ""
+#~ "\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 2911 section "
+#~ "4.1.9)."
+#~ msgstr ""
+#~ "\"%s\": Valor de mimeMediaType inválido \"%s\" - caracteres inválidos "
+#~ "(RFC 2911 seção 4.1.9)."
+
+#~ msgid ""
+#~ "\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 2911 section "
+#~ "4.1.9)."
+#~ msgstr ""
+#~ "\"%s\": Valor de mimeMediaType inválido \"%s\" - comprimento inválido %d "
+#~ "(RFC 2911 seção 4.1.9)."
+
+#~ msgid ""
+#~ "\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 2911 section "
+#~ "4.1.2)."
+#~ msgstr ""
+#~ "\"%s\": Valor de name inválido \"%s\" - sequência UTF-8 inválida (RFC "
+#~ "2911 seção 4.1.2)."
+
+#~ msgid ""
+#~ "\"%s\": Bad name value \"%s\" - bad length %d (RFC 2911 section 4.1.2)."
+#~ msgstr ""
+#~ "\"%s\": Valor de name inválido \"%s\" - comprimento inválido %d (RFC 2911 "
+#~ "seção 4.1.2)."
+
+#~ msgid ""
+#~ "\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 2911 "
+#~ "section 4.1.8)."
+#~ msgstr ""
+#~ "\"%s\": Valor de naturalLanguage inválido \"%s\" - caracteres inválidos "
+#~ "(RFC 2911 seção 4.1.8)."
+
+#~ msgid ""
+#~ "\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 2911 "
+#~ "section 4.1.8)."
+#~ msgstr ""
+#~ "\"%s\": Valor de naturalLanguage inválido \"%s\" - comprimento inválido "
+#~ "%d (RFC 2911 seção 4.1.8)."
+
+#~ msgid ""
+#~ "\"%s\": Bad octetString value - bad length %d (RFC 2911 section 4.1.10)."
+#~ msgstr ""
+#~ "\"%s\": Valor de octetString inválido - comprimento inválido %d (RFC 2911 "
+#~ "seção 4.1.10)."
+
+#~ msgid ""
+#~ "\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC "
+#~ "2911 section 4.1.13)."
+#~ msgstr ""
+#~ "\"%s\": Valor de rangeOfInteger inválido %d-%d - inferior maior do que o "
+#~ "superior (RFC 2911 seção 4.1.13)."
+
+#~ msgid ""
+#~ "\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 2911 section "
+#~ "4.1.15)."
+#~ msgstr ""
+#~ "\"%s\": Valor de resolução inválido %dx%d%s - valor de unidades inválido "
+#~ "(RFC 2911 seção 4.1.15)."
+
+#~ msgid ""
+#~ "\"%s\": Bad resolution value %dx%d%s - cross feed resolution must be "
+#~ "positive (RFC 2911 section 4.1.15)."
+#~ msgstr ""
+#~ "\"%s\": Valor de resolução inválido %dx%d%s - resolução de cross-feed "
+#~ "deve ser positiva (RFC 2911 seção 4.1.15)."
+
+#~ msgid ""
+#~ "\"%s\": Bad resolution value %dx%d%s - feed resolution must be positive "
+#~ "(RFC 2911 section 4.1.15)."
+#~ msgstr ""
+#~ "\"%s\": Valor de resolução inválido %dx%d%s - resolução de feed deve ser "
+#~ "positiva (RFC 2911 seção 4.1.15)."
+
+#~ msgid ""
+#~ "\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 2911 section "
+#~ "4.1.1)."
+#~ msgstr ""
+#~ "\"%s\": Valor de texto inválido \"%s\" - sequência UTF-8 inválida (RFC "
+#~ "2911 seção 4.1.1)."
+
+#~ msgid ""
+#~ "\"%s\": Bad text value \"%s\" - bad length %d (RFC 2911 section 4.1.1)."
+#~ msgstr ""
+#~ "\"%s\": Valor de texto inválido \"%s\" - comprimento inválido %d (RFC "
+#~ "2911 seção 4.1.1)."
+
+#~ msgid ""
+#~ "\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 2911 section "
+#~ "4.1.6)."
+#~ msgstr ""
+#~ "\"%s\": Valor de uriScheme inválido \"%s\" - caracteres inválidos (RFC "
+#~ "2911 seção 4.1.6)."
+
+#~ msgid ""
+#~ "\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 2911 section "
+#~ "4.1.6)."
+#~ msgstr ""
+#~ "\"%s\": Valor de uriScheme inválido \"%s\" - comprimento inválido %d (RFC "
+#~ "2911 seção 4.1.6)."
+
#~ msgid "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes"
#~ msgstr "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes"
diff --git a/locale/cups_ru.po b/locale/cups_ru.po
index 66a6eafd1..f8f76b79d 100644
--- a/locale/cups_ru.po
+++ b/locale/cups_ru.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: CUPS 2.0\n"
"Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2017-04-05 15:24-0400\n"
+"POT-Creation-Date: 2017-06-15 20:52-0400\n"
"PO-Revision-Date: 2015-01-28 12:00-0800\n"
"Last-Translator: Aleksandr Proklov\n"
"Language-Team: PuppyRus Linux Team\n"
@@ -1018,8 +1018,9 @@ msgstr " -D name=value Определение переменной."
msgid " -E Encrypt the connection."
msgstr " -E Подключение к Ñерверу шифруетÑÑ."
-msgid " -E Test with HTTP Upgrade to TLS."
-msgstr " -E ПроверÑÑ‚ÑŒ что HTTP иÑпользует TLS."
+msgid ""
+" -E Test with encryption using HTTP Upgrade to TLS."
+msgstr ""
msgid ""
" -F Run in the foreground but detach from console."
@@ -1060,8 +1061,8 @@ msgstr ""
msgid " -R root-directory Set alternate root."
msgstr " -R root-directory Задать корневой каталог."
-msgid " -S Test with SSL encryption."
-msgstr " -S ПроверÑÑ‚ÑŒ шифрование SSL."
+msgid " -S Test with encryption using HTTPS."
+msgstr ""
msgid " -T seconds Set the browse timeout in seconds."
msgstr " -T seconds Задать Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð² Ñекундах."
@@ -1334,211 +1335,167 @@ msgid " PASS"
msgstr " PASS"
#, c-format
-msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 2911 section 4.1.5)."
-msgstr "\"%s\": Ðеправильное значение URI \"%s\" - %s (RFC 2911 раздел 4.1.5)."
+msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 8011 section 5.1.6)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 2911 section 4.1.5)."
+msgid "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 8011 section 5.1.6)."
msgstr ""
-"\"%s\": Ðеправильное значение URI \"%s\" - ошибка длины %d (RFC 2911 раздел "
-"4.1.5)."
#, c-format
-msgid "\"%s\": Bad attribute name - bad length %d (RFC 2911 section 4.1.3)."
+msgid "\"%s\": Bad attribute name - bad length %d (RFC 8011 section 5.1.4)."
msgstr ""
-"\"%s\": Ðеправильный атрибут имени - ошибка длины %d (RFC 2911 раздел 4.1.3)."
#, c-format
msgid ""
-"\"%s\": Bad attribute name - invalid character (RFC 2911 section 4.1.3)."
+"\"%s\": Bad attribute name - invalid character (RFC 8011 section 5.1.4)."
msgstr ""
-"\"%s\": Ðеправильный атрибут имени - недопуÑтимый Ñимвол (RFC 2911 раздел "
-"4.1.3)."
#, c-format
-msgid "\"%s\": Bad boolen value %d (RFC 2911 section 4.1.11)."
-msgstr "\"%s\": Ðеправильное двоичное значение %d (RFC 2911 раздел 4.1.11)."
+msgid "\"%s\": Bad boolen value %d (RFC 8011 section 5.1.21)."
+msgstr ""
#, c-format
msgid ""
-"\"%s\": Bad charset value \"%s\" - bad characters (RFC 2911 section 4.1.7)."
+"\"%s\": Bad charset value \"%s\" - bad characters (RFC 8011 section 5.1.8)."
msgstr ""
-"\"%s\": Ðеправильное Ñимвольное значение \"%s\" - недопуÑтимые Ñимволы (RFC "
-"2911 раздел 4.1.7)."
#, c-format
msgid ""
-"\"%s\": Bad charset value \"%s\" - bad length %d (RFC 2911 section 4.1.7)."
+"\"%s\": Bad charset value \"%s\" - bad length %d (RFC 8011 section 5.1.8)."
msgstr ""
-"\"%s\": Ðеправильное Ñимвольное значение \"%s\" - ошибка длины %d (RFC 2911 "
-"раздел 4.1.7)."
#, c-format
-msgid "\"%s\": Bad dateTime UTC hours %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": Ошибка в dateTime UTC чаÑов %u (RFC 2911 раздел 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC hours %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": Ошибка в dateTime UTC минут %u (RFC 2911 раздел 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": Ошибка в dateTime UTC sign '%c' (RFC 2911 раздел 4.1.14)."
+msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime day %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": Ошибка в dateTime дни %u (RFC 2911 раздел 4.1.14)."
+msgid "\"%s\": Bad dateTime day %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime deciseconds %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": Ошибка в dateTime миллиÑекунды %u (RFC 2911 раздел 4.1.14)."
+msgid "\"%s\": Bad dateTime deciseconds %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime hours %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": Ошибка в dateTime чаÑÑ‹ %u (RFC 2911 раздел 4.1.14)."
+msgid "\"%s\": Bad dateTime hours %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime minutes %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": Ошибка в dateTime минуты %u (RFC 2911 раздел 4.1.14)."
+msgid "\"%s\": Bad dateTime minutes %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime month %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": Ошибка в dateTime меÑÑц %u (RFC 2911 раздел 4.1.14)."
+msgid "\"%s\": Bad dateTime month %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad dateTime seconds %u (RFC 2911 section 4.1.14)."
-msgstr "\"%s\": Ошибка в dateTime Ñекунды %u (RFC 2911 раздел 4.1.14)."
+msgid "\"%s\": Bad dateTime seconds %u (RFC 8011 section 5.1.15)."
+msgstr ""
#, c-format
-msgid "\"%s\": Bad enum value %d - out of range (RFC 2911 section 4.1.4)."
+msgid "\"%s\": Bad enum value %d - out of range (RFC 8011 section 5.1.5)."
msgstr ""
-"\"%s\": Ошибка в значении %d - за пределами диапазона (RFC 2911 раздел "
-"4.1.4)."
#, c-format
msgid ""
-"\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 2911 section 4.1.3)."
+"\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 8011 section 5.1.4)."
msgstr ""
-"\"%s\": Ошибка в значении \"%s\" - Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° %d (RFC 2911 раздел "
-"4.1.3)."
#, c-format
msgid ""
-"\"%s\": Bad keyword value \"%s\" - invalid character (RFC 2911 section "
-"4.1.3)."
+"\"%s\": Bad keyword value \"%s\" - invalid character (RFC 8011 section "
+"5.1.4)."
msgstr ""
-"\"%s\": Ошибка в значении \"%s\" - недопуÑтимый Ñимвол (RFC 2911 раздел "
-"4.1.3)."
#, c-format
msgid ""
-"\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 2911 section "
-"4.1.9)."
+"\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 8011 section "
+"5.1.10)."
msgstr ""
-"\"%s\": Ошибка mimeMediaType значение \"%s\" - недопуÑтимые Ñимволы (RFC "
-"2911 раздел 4.1.9)."
#, c-format
msgid ""
-"\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 2911 section "
-"4.1.9)."
+"\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 8011 section "
+"5.1.10)."
msgstr ""
-"\"%s\": Ошибка mimeMediaType значение \"%s\" - Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° %d (RFC "
-"2911 раздел 4.1.9)."
#, c-format
msgid ""
-"\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.2)."
+"\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."
msgstr ""
-"\"%s\": Ðеправильное Ð¸Ð¼Ñ \"%s\" - ошибка в UTF-8 (RFC 2911 раздел 4.1.2)."
#, c-format
-msgid "\"%s\": Bad name value \"%s\" - bad length %d (RFC 2911 section 4.1.2)."
+msgid "\"%s\": Bad name value \"%s\" - bad length %d (RFC 8011 section 5.1.3)."
msgstr ""
-"\"%s\": Ðеправильное Ð¸Ð¼Ñ \"%s\" - Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° %d (RFC 2911 раздел "
-"4.1.2)."
#, c-format
msgid ""
-"\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 2911 section "
-"4.1.8)."
+"\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 8011 section "
+"5.1.9)."
msgstr ""
-"\"%s\": Ошибка naturalLanguage значение \"%s\" - недопуÑтимые Ñимволы (RFC "
-"2911 раздел 4.1.8)."
#, c-format
msgid ""
-"\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 2911 section "
-"4.1.8)."
+"\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 8011 section "
+"5.1.9)."
msgstr ""
-"\"%s\": Ошибка naturalLanguage значение \"%s\" - Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° %d (RFC "
-"2911 раздел 4.1.8)."
#, c-format
msgid ""
-"\"%s\": Bad octetString value - bad length %d (RFC 2911 section 4.1.10)."
+"\"%s\": Bad octetString value - bad length %d (RFC 8011 section 5.1.20)."
msgstr ""
-"\"%s\": Ошибка Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ octetString - Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° %d (RFC 2911 раздел "
-"4.1.10)."
#, c-format
msgid ""
-"\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 2911 "
-"section 4.1.13)."
+"\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 8011 "
+"section 5.1.14)."
msgstr ""
-"\"%s\": Ошибка rangeOfInteger значение %d-%d - первое больше чем второе (RFC "
-"2911 раздел 4.1.13)."
#, c-format
msgid ""
-"\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 2911 section "
-"4.1.15)."
+"\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 8011 section "
+"5.1.16)."
msgstr ""
-"\"%s\": Ðеправильное значение Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ %dx%d%s - ошибка в значении units "
-"(RFC 2911 раздел 4.1.15)."
#, c-format
msgid ""
"\"%s\": Bad resolution value %dx%d%s - cross feed resolution must be "
-"positive (RFC 2911 section 4.1.15)."
+"positive (RFC 8011 section 5.1.16)."
msgstr ""
-"\"%s\": Ðеправильное значение Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ %dx%d%s - значение cross feed "
-"должно быть положительным (RFC 2911 раздел 4.1.15)."
#, c-format
msgid ""
"\"%s\": Bad resolution value %dx%d%s - feed resolution must be positive (RFC "
-"2911 section 4.1.15)."
+"8011 section 5.1.16)."
msgstr ""
-"\"%s\": Ðеправильное значение Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ %dx%d%s - значение feed должно быть "
-"положительным (RFC 2911 раздел 4.1.15)."
#, c-format
msgid ""
-"\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 2911 section 4.1.1)."
+"\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."
msgstr ""
-"\"%s\": Ðеправильное текÑтовое значение \"%s\" - ошибка в UTF-8 (RFC 2911 "
-"раздел 4.1.1)."
#, c-format
-msgid "\"%s\": Bad text value \"%s\" - bad length %d (RFC 2911 section 4.1.1)."
+msgid "\"%s\": Bad text value \"%s\" - bad length %d (RFC 8011 section 5.1.2)."
msgstr ""
-"\"%s\": Ðеправильное текÑтовое значение \"%s\" - ошибка длины %d (RFC 2911 "
-"раздел 4.1.1)."
#, c-format
msgid ""
-"\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 2911 section 4.1.6)."
+"\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 8011 section 5.1.7)."
msgstr ""
-"\"%s\": Ошибка uriScheme значение \"%s\" - недопуÑтимые Ñимволы (RFC 2911 "
-"раздел 4.1.6)."
#, c-format
msgid ""
-"\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 2911 section 4.1.6)."
+"\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 8011 section 5.1.7)."
msgstr ""
-"\"%s\": Ошибка uriScheme значение \"%s\" - ошибка длины %d (RFC 2911 раздел "
-"4.1.6)."
#, c-format
msgid "%-7s %-7.7s %-7d %-31.31s %.0f bytes"
@@ -6883,6 +6840,12 @@ msgstr "Ð”Ð»Ñ variable-bindings длина не уÑтановлена"
#~ " --lf Строки заканчиваютÑÑ Ð½Ð° LF (UNIX/Linux/Mac OS "
#~ "X)."
+#~ msgid " -E Test with HTTP Upgrade to TLS."
+#~ msgstr " -E ПроверÑÑ‚ÑŒ что HTTP иÑпользует TLS."
+
+#~ msgid " -S Test with SSL encryption."
+#~ msgstr " -S ПроверÑÑ‚ÑŒ шифрование SSL."
+
#~ msgid " -a Browse for all services."
#~ msgstr " -a Обзор вÑех ÑервиÑов."
@@ -6895,6 +6858,189 @@ msgstr "Ð”Ð»Ñ variable-bindings длина не уÑтановлена"
#~ msgid " -t type Browse/resolve with specified type."
#~ msgstr " -t type ПроÑмотр/определение по указанному типу."
+#~ msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 2911 section 4.1.5)."
+#~ msgstr ""
+#~ "\"%s\": Ðеправильное значение URI \"%s\" - %s (RFC 2911 раздел 4.1.5)."
+
+#~ msgid ""
+#~ "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 2911 section 4.1.5)."
+#~ msgstr ""
+#~ "\"%s\": Ðеправильное значение URI \"%s\" - ошибка длины %d (RFC 2911 "
+#~ "раздел 4.1.5)."
+
+#~ msgid "\"%s\": Bad attribute name - bad length %d (RFC 2911 section 4.1.3)."
+#~ msgstr ""
+#~ "\"%s\": Ðеправильный атрибут имени - ошибка длины %d (RFC 2911 раздел "
+#~ "4.1.3)."
+
+#~ msgid ""
+#~ "\"%s\": Bad attribute name - invalid character (RFC 2911 section 4.1.3)."
+#~ msgstr ""
+#~ "\"%s\": Ðеправильный атрибут имени - недопуÑтимый Ñимвол (RFC 2911 раздел "
+#~ "4.1.3)."
+
+#~ msgid "\"%s\": Bad boolen value %d (RFC 2911 section 4.1.11)."
+#~ msgstr "\"%s\": Ðеправильное двоичное значение %d (RFC 2911 раздел 4.1.11)."
+
+#~ msgid ""
+#~ "\"%s\": Bad charset value \"%s\" - bad characters (RFC 2911 section "
+#~ "4.1.7)."
+#~ msgstr ""
+#~ "\"%s\": Ðеправильное Ñимвольное значение \"%s\" - недопуÑтимые Ñимволы "
+#~ "(RFC 2911 раздел 4.1.7)."
+
+#~ msgid ""
+#~ "\"%s\": Bad charset value \"%s\" - bad length %d (RFC 2911 section 4.1.7)."
+#~ msgstr ""
+#~ "\"%s\": Ðеправильное Ñимвольное значение \"%s\" - ошибка длины %d (RFC "
+#~ "2911 раздел 4.1.7)."
+
+#~ msgid "\"%s\": Bad dateTime UTC hours %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": Ошибка в dateTime UTC чаÑов %u (RFC 2911 раздел 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": Ошибка в dateTime UTC минут %u (RFC 2911 раздел 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": Ошибка в dateTime UTC sign '%c' (RFC 2911 раздел 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime day %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": Ошибка в dateTime дни %u (RFC 2911 раздел 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime deciseconds %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": Ошибка в dateTime миллиÑекунды %u (RFC 2911 раздел 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime hours %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": Ошибка в dateTime чаÑÑ‹ %u (RFC 2911 раздел 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime minutes %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": Ошибка в dateTime минуты %u (RFC 2911 раздел 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime month %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": Ошибка в dateTime меÑÑц %u (RFC 2911 раздел 4.1.14)."
+
+#~ msgid "\"%s\": Bad dateTime seconds %u (RFC 2911 section 4.1.14)."
+#~ msgstr "\"%s\": Ошибка в dateTime Ñекунды %u (RFC 2911 раздел 4.1.14)."
+
+#~ msgid "\"%s\": Bad enum value %d - out of range (RFC 2911 section 4.1.4)."
+#~ msgstr ""
+#~ "\"%s\": Ошибка в значении %d - за пределами диапазона (RFC 2911 раздел "
+#~ "4.1.4)."
+
+#~ msgid ""
+#~ "\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 2911 section 4.1.3)."
+#~ msgstr ""
+#~ "\"%s\": Ошибка в значении \"%s\" - Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° %d (RFC 2911 раздел "
+#~ "4.1.3)."
+
+#~ msgid ""
+#~ "\"%s\": Bad keyword value \"%s\" - invalid character (RFC 2911 section "
+#~ "4.1.3)."
+#~ msgstr ""
+#~ "\"%s\": Ошибка в значении \"%s\" - недопуÑтимый Ñимвол (RFC 2911 раздел "
+#~ "4.1.3)."
+
+#~ msgid ""
+#~ "\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 2911 section "
+#~ "4.1.9)."
+#~ msgstr ""
+#~ "\"%s\": Ошибка mimeMediaType значение \"%s\" - недопуÑтимые Ñимволы (RFC "
+#~ "2911 раздел 4.1.9)."
+
+#~ msgid ""
+#~ "\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 2911 section "
+#~ "4.1.9)."
+#~ msgstr ""
+#~ "\"%s\": Ошибка mimeMediaType значение \"%s\" - Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° %d (RFC "
+#~ "2911 раздел 4.1.9)."
+
+#~ msgid ""
+#~ "\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 2911 section "
+#~ "4.1.2)."
+#~ msgstr ""
+#~ "\"%s\": Ðеправильное Ð¸Ð¼Ñ \"%s\" - ошибка в UTF-8 (RFC 2911 раздел 4.1.2)."
+
+#~ msgid ""
+#~ "\"%s\": Bad name value \"%s\" - bad length %d (RFC 2911 section 4.1.2)."
+#~ msgstr ""
+#~ "\"%s\": Ðеправильное Ð¸Ð¼Ñ \"%s\" - Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° %d (RFC 2911 раздел "
+#~ "4.1.2)."
+
+#~ msgid ""
+#~ "\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 2911 "
+#~ "section 4.1.8)."
+#~ msgstr ""
+#~ "\"%s\": Ошибка naturalLanguage значение \"%s\" - недопуÑтимые Ñимволы "
+#~ "(RFC 2911 раздел 4.1.8)."
+
+#~ msgid ""
+#~ "\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 2911 "
+#~ "section 4.1.8)."
+#~ msgstr ""
+#~ "\"%s\": Ошибка naturalLanguage значение \"%s\" - Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° %d "
+#~ "(RFC 2911 раздел 4.1.8)."
+
+#~ msgid ""
+#~ "\"%s\": Bad octetString value - bad length %d (RFC 2911 section 4.1.10)."
+#~ msgstr ""
+#~ "\"%s\": Ошибка Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ octetString - Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° %d (RFC 2911 "
+#~ "раздел 4.1.10)."
+
+#~ msgid ""
+#~ "\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC "
+#~ "2911 section 4.1.13)."
+#~ msgstr ""
+#~ "\"%s\": Ошибка rangeOfInteger значение %d-%d - первое больше чем второе "
+#~ "(RFC 2911 раздел 4.1.13)."
+
+#~ msgid ""
+#~ "\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 2911 section "
+#~ "4.1.15)."
+#~ msgstr ""
+#~ "\"%s\": Ðеправильное значение Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ %dx%d%s - ошибка в значении "
+#~ "units (RFC 2911 раздел 4.1.15)."
+
+#~ msgid ""
+#~ "\"%s\": Bad resolution value %dx%d%s - cross feed resolution must be "
+#~ "positive (RFC 2911 section 4.1.15)."
+#~ msgstr ""
+#~ "\"%s\": Ðеправильное значение Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ %dx%d%s - значение cross feed "
+#~ "должно быть положительным (RFC 2911 раздел 4.1.15)."
+
+#~ msgid ""
+#~ "\"%s\": Bad resolution value %dx%d%s - feed resolution must be positive "
+#~ "(RFC 2911 section 4.1.15)."
+#~ msgstr ""
+#~ "\"%s\": Ðеправильное значение Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ %dx%d%s - значение feed должно "
+#~ "быть положительным (RFC 2911 раздел 4.1.15)."
+
+#~ msgid ""
+#~ "\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 2911 section "
+#~ "4.1.1)."
+#~ msgstr ""
+#~ "\"%s\": Ðеправильное текÑтовое значение \"%s\" - ошибка в UTF-8 (RFC 2911 "
+#~ "раздел 4.1.1)."
+
+#~ msgid ""
+#~ "\"%s\": Bad text value \"%s\" - bad length %d (RFC 2911 section 4.1.1)."
+#~ msgstr ""
+#~ "\"%s\": Ðеправильное текÑтовое значение \"%s\" - ошибка длины %d (RFC "
+#~ "2911 раздел 4.1.1)."
+
+#~ msgid ""
+#~ "\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 2911 section "
+#~ "4.1.6)."
+#~ msgstr ""
+#~ "\"%s\": Ошибка uriScheme значение \"%s\" - недопуÑтимые Ñимволы (RFC 2911 "
+#~ "раздел 4.1.6)."
+
+#~ msgid ""
+#~ "\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 2911 section "
+#~ "4.1.6)."
+#~ msgstr ""
+#~ "\"%s\": Ошибка uriScheme значение \"%s\" - ошибка длины %d (RFC 2911 "
+#~ "раздел 4.1.6)."
+
#~ msgid "File Folder "
#~ msgstr "Каталог файла "
diff --git a/man/ipptoolfile.man b/man/ipptoolfile.man
index 795995da0..35b050419 100644
--- a/man/ipptoolfile.man
+++ b/man/ipptoolfile.man
@@ -9,7 +9,7 @@
.\" which should have been included with this file. If this file is
.\" file is missing or damaged, see the license at "http://www.cups.org/".
.\"
-.TH ipptoolfile 5 "CUPS" "13 June 2017" "Apple Inc."
+.TH ipptoolfile 5 "CUPS" "15 June 2017" "Apple Inc."
.SH NAME
ipptoolfile \- ipptool file format
.SH DESCRIPTION
@@ -164,9 +164,12 @@ Specifies the default IPP version number to use for the tests that follow.
.SS TEST DIRECTIVES
The following directives are understood within a \fItest\fR:
.TP 5
+\fBATTR \fIout-of-band-tag attribute-name\fR
+.TP 5
\fBATTR \fItag attribute-name value(s)\fR
Adds an attribute to the test request.
-Values are separated by the comma (",") character - escape commas using the "\" character.
+Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
+Values for other tags are separated by the comma (",") character - escape commas using the "\" character.
Common attributes and values are listed in the IANA IPP registry - see references below.
.TP 5
\fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
@@ -406,7 +409,7 @@ Specifies the maximum number of times to repeat. The default value is 1000.
\fBREPEAT\-NO\-MATCH\fR
Specifies that the current test should be repeated when the response status-code matches or does not match the value specified by the STATUS directive.
.SS OPERATION CODES
-Operation codes correspond to the hexadecimal numbers (0xHHHH) and names from RFC 2911 and other IPP extension specifications. Here is a complete list of names supported by
+Operation codes correspond to the hexadecimal numbers (0xHHHH) and names from RFC 8011 and other IPP extension specifications. Here is a complete list of names supported by
.BR ipptool (8):
.nf
@@ -479,7 +482,7 @@ Operation codes correspond to the hexadecimal numbers (0xHHHH) and names from RF
Validate\-Job
.fi
.SS STATUS CODES
-Status codes correspond to the hexadecimal numbers (0xHHHH) and names from RFC 2911 and other IPP extension specifications. Here is a complete list of the names supported by
+Status codes correspond to the hexadecimal numbers (0xHHHH) and names from RFC 8011 and other IPP extension specifications. Here is a complete list of the names supported by
.BR ipptool (8):
.nf
@@ -542,7 +545,7 @@ Status codes correspond to the hexadecimal numbers (0xHHHH) and names from RFC 2
successful\-ok\-too\-many\-events
.fi
.SS TAGS
-Value and group tags correspond to the names from RFC 2911 and other IPP extension specifications. Here are the group tags:
+Value and group tags correspond to the names from RFC 8011 and other IPP extension specifications. Here are the group tags:
.nf
document\-attributes\-tag
diff --git a/test/ipptool.c b/test/ipptool.c
index b70162711..46dd44d18 100644
--- a/test/ipptool.c
+++ b/test/ipptool.c
@@ -1,7 +1,7 @@
/*
* ipptool command for CUPS.
*
- * Copyright 2007-2016 by Apple Inc.
+ * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
@@ -152,33 +152,34 @@ static int PasswordTries = 0; /* Number of tries with password */
*/
static void add_stringf(cups_array_t *a, const char *s, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
+static int compare_uris(const char *a, const char *b);
static int compare_vars(_cups_var_t *a, _cups_var_t *b);
-static int do_tests(FILE *outfile, _cups_vars_t *vars, const char *testfile);
+static int do_tests(cups_file_t *outfile, _cups_vars_t *vars, const char *testfile);
static void expand_variables(_cups_vars_t *vars, char *dst, const char *src, size_t dstsize) __attribute__((nonnull(1,2,3)));
static int expect_matches(_cups_expect_t *expect, ipp_tag_t value_tag);
-static ipp_t *get_collection(FILE *outfile, _cups_vars_t *vars, FILE *fp, int *linenum);
+static ipp_t *get_collection(cups_file_t *outfile, _cups_vars_t *vars, cups_file_t *fp, int *linenum);
static char *get_filename(const char *testfile, char *dst, const char *src, size_t dstsize);
static const char *get_string(ipp_attribute_t *attr, int element, int flags, char *buffer, size_t bufsize);
-static char *get_token(FILE *fp, char *buf, int buflen, int *linenum);
+static char *get_token(cups_file_t *fp, char *buf, int buflen, int *linenum);
static char *get_variable(_cups_vars_t *vars, const char *name);
static char *iso_date(ipp_uchar_t *date);
static const char *password_cb(const char *prompt);
static void pause_message(const char *message);
-static void print_attr(FILE *outfile, int format, ipp_attribute_t *attr, ipp_tag_t *group);
-static void print_csv(FILE *outfile, ipp_attribute_t *attr, int num_displayed, char **displayed, size_t *widths);
-static void print_fatal_error(FILE *outfile, const char *s, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
-static void print_line(FILE *outfile, ipp_attribute_t *attr, int num_displayed, char **displayed, size_t *widths);
-static void print_xml_header(FILE *outfile);
-static void print_xml_string(FILE *outfile, const char *element, const char *s);
-static void print_xml_trailer(FILE *outfile, int success, const char *message);
-static void set_variable(FILE *outfile, _cups_vars_t *vars, const char *name, const char *value);
+static void print_attr(cups_file_t *outfile, int format, ipp_attribute_t *attr, ipp_tag_t *group);
+static void print_csv(cups_file_t *outfile, ipp_attribute_t *attr, int num_displayed, char **displayed, size_t *widths);
+static void print_fatal_error(cups_file_t *outfile, const char *s, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
+static void print_line(cups_file_t *outfile, ipp_attribute_t *attr, int num_displayed, char **displayed, size_t *widths);
+static void print_xml_header(cups_file_t *outfile);
+static void print_xml_string(cups_file_t *outfile, const char *element, const char *s);
+static void print_xml_trailer(cups_file_t *outfile, int success, const char *message);
+static void set_variable(cups_file_t *outfile, _cups_vars_t *vars, const char *name, const char *value);
#ifndef WIN32
static void sigterm_handler(int sig);
#endif /* WIN32 */
static int timeout_cb(http_t *http, void *user_data);
static void usage(void) __attribute__((noreturn));
-static int validate_attr(FILE *outfile, cups_array_t *errors, ipp_attribute_t *attr);
-static int with_value(FILE *outfile, cups_array_t *errors, char *value, int flags, ipp_attribute_t *attr, char *matchbuf, size_t matchlen);
+static int validate_attr(cups_file_t *outfile, cups_array_t *errors, ipp_attribute_t *attr);
+static int with_value(cups_file_t *outfile, cups_array_t *errors, char *value, int flags, ipp_attribute_t *attr, char *matchbuf, size_t matchlen);
static int with_value_from(cups_array_t *errors, ipp_attribute_t *fromattr, ipp_attribute_t *attr, char *matchbuf, size_t matchlen);
@@ -192,8 +193,8 @@ main(int argc, /* I - Number of command-line args */
{
int i; /* Looping var */
int status; /* Status of tests... */
- FILE *outfile = stdout;
- /* Output file */
+ cups_file_t *outfile = cupsFileStdout();
+ /* Output file */
char *opt, /* Current option */
name[1024], /* Name/value buffer */
*value, /* Pointer to value */
@@ -301,10 +302,10 @@ main(int argc, /* I - Number of command-line args */
usage();
}
- if (outfile != stdout)
+ if (outfile != cupsFileStdout())
usage();
- if ((outfile = fopen(argv[i], "w")) == NULL)
+ if ((outfile = cupsFileOpen(argv[i], "w")) == NULL)
{
_cupsLangPrintf(stderr, _("%s: Unable to open \"%s\": %s"), "ipptool", argv[i], strerror(errno));
exit(1);
@@ -746,6 +747,71 @@ add_stringf(cups_array_t *a, /* I - Array */
/*
+ * 'compare_uris()' - Compare two URIs...
+ */
+
+static int /* O - Result of comparison */
+compare_uris(const char *a, /* I - First URI */
+ const char *b) /* I - Second URI */
+{
+ char ascheme[32], /* Components of first URI */
+ auserpass[256],
+ ahost[256],
+ aresource[256];
+ int aport;
+ char bscheme[32], /* Components of second URI */
+ buserpass[256],
+ bhost[256],
+ bresource[256];
+ int bport;
+ char *ptr; /* Pointer into string */
+ int result; /* Result of comparison */
+
+
+ /*
+ * Separate the URIs into their components...
+ */
+
+ if (httpSeparateURI(HTTP_URI_CODING_ALL, a, ascheme, sizeof(ascheme), auserpass, sizeof(auserpass), ahost, sizeof(ahost), &aport, aresource, sizeof(aresource)) < HTTP_URI_STATUS_OK)
+ return (-1);
+
+ if (httpSeparateURI(HTTP_URI_CODING_ALL, b, bscheme, sizeof(bscheme), buserpass, sizeof(buserpass), bhost, sizeof(bhost), &bport, bresource, sizeof(bresource)) < HTTP_URI_STATUS_OK)
+ return (-1);
+
+ /*
+ * Strip trailing dots from the host components, if present...
+ */
+
+ if ((ptr = ahost + strlen(ahost) - 1) > ahost && *ptr == '.')
+ *ptr = '\0';
+
+ if ((ptr = bhost + strlen(bhost) - 1) > bhost && *ptr == '.')
+ *ptr = '\0';
+
+ /*
+ * Compare each component...
+ */
+
+ if ((result = _cups_strcasecmp(ascheme, bscheme)) != 0)
+ return (result);
+
+ if ((result = strcmp(auserpass, buserpass)) != 0)
+ return (result);
+
+ if ((result = _cups_strcasecmp(ahost, bhost)) != 0)
+ return (result);
+
+ if (aport != bport)
+ return (aport - bport);
+
+ if (!_cups_strcasecmp(ascheme, "mailto") || !_cups_strcasecmp(ascheme, "urn"))
+ return (_cups_strcasecmp(aresource, bresource));
+ else
+ return (strcmp(aresource, bresource));
+}
+
+
+/*
* 'compare_vars()' - Compare two variables.
*/
@@ -762,7 +828,7 @@ compare_vars(_cups_var_t *a, /* I - First variable */
*/
static int /* 1 = success, 0 = failure */
-do_tests(FILE *outfile, /* I - Output file */
+do_tests(cups_file_t *outfile, /* I - Output file */
_cups_vars_t *vars, /* I - Variables */
const char *testfile) /* I - Test file to use */
{
@@ -779,7 +845,7 @@ do_tests(FILE *outfile, /* I - Output file */
useconds_t delay, /* Initial delay */
repeat_interval; /* Repeat interval (delay) */
http_t *http = NULL; /* HTTP connection to server */
- FILE *fp = NULL; /* Test file */
+ cups_file_t *fp = NULL; /* Test file */
char resource[512], /* Resource for request */
token[1024], /* Token from file */
*tokenptr, /* Pointer into token */
@@ -809,7 +875,8 @@ do_tests(FILE *outfile, /* I - Output file */
int num_statuses = 0; /* Number of valid status codes */
_cups_status_t statuses[100], /* Valid status codes */
*last_status; /* Last STATUS (for predicates) */
- int num_expects = 0; /* Number of expected attributes */
+ int status_ok, /* Did we get a matching status? */
+ num_expects = 0; /* Number of expected attributes */
_cups_expect_t expects[200], /* Expected attributes */
*expect, /* Current expected attribute */
*last_expect; /* Last EXPECT (for predicates) */
@@ -825,7 +892,7 @@ do_tests(FILE *outfile, /* I - Output file */
* Open the test file...
*/
- if ((fp = fopen(testfile, "r")) == NULL)
+ if ((fp = cupsFileOpen(testfile, "r")) == NULL)
{
print_fatal_error(outfile, "Unable to open test file %s - %s", testfile,
strerror(errno));
@@ -1197,7 +1264,7 @@ do_tests(FILE *outfile, /* I - Output file */
{
if (Output == _CUPS_OUTPUT_PLIST)
print_xml_header(outfile);
- if (Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile != stdout))
+ if (Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile != cupsFileStdout()))
printf("\"%s\":\n", testfile);
show_header = 0;
@@ -1618,7 +1685,7 @@ do_tests(FILE *outfile, /* I - Output file */
goto test_exit;
}
- if ((value = ippTagValue(token)) < 0)
+ if ((value = ippTagValue(token)) == IPP_TAG_ZERO || value >= IPP_TAG_UNSUPPORTED_VALUE)
{
print_fatal_error(outfile, "Bad GROUP tag \"%s\" on line %d.", token, linenum);
pass = 0;
@@ -1671,14 +1738,6 @@ do_tests(FILE *outfile, /* I - Output file */
}
else
repeat_interval = delay;
-
- if (delay > 0)
- {
- if (Output == _CUPS_OUTPUT_TEST)
- printf(" [%g second delay]\n", delay * 0.000001);
-
- usleep(delay);
- }
}
else if (!_cups_strcasecmp(token, "ATTR"))
{
@@ -1693,7 +1752,7 @@ do_tests(FILE *outfile, /* I - Output file */
goto test_exit;
}
- if ((value = ippTagValue(token)) == IPP_TAG_ZERO)
+ if ((value = ippTagValue(token)) < IPP_TAG_UNSUPPORTED_VALUE)
{
print_fatal_error(outfile, "Bad ATTR value tag \"%s\" on line %d.", token,
linenum);
@@ -1708,18 +1767,46 @@ do_tests(FILE *outfile, /* I - Output file */
goto test_exit;
}
- if (!get_token(fp, temp, sizeof(temp), &linenum))
+ if (value < IPP_TAG_INTEGER)
+ {
+ /*
+ * Add out-of-band value - no value string needed...
+ */
+
+ token[0] = '\0';
+ }
+ else if (!get_token(fp, temp, sizeof(temp), &linenum))
{
print_fatal_error(outfile, "Missing ATTR value on line %d.", linenum);
pass = 0;
goto test_exit;
}
+ else
+ {
+ expand_variables(vars, token, temp, sizeof(token));
+ }
- expand_variables(vars, token, temp, sizeof(token));
attrptr = NULL;
switch (value)
{
+ default :
+ if (value < IPP_TAG_INTEGER)
+ {
+ /*
+ * Add out-of-band value...
+ */
+
+ attrptr = ippAddOutOfBand(request, group, value, attr);
+ }
+ else
+ {
+ print_fatal_error(outfile, "Unsupported ATTR value tag %s for \"%s\" on line %d.", ippTagString(value), attr, linenum);
+ pass = 0;
+ goto test_exit;
+ }
+ break;
+
case IPP_TAG_BOOLEAN :
if (!_cups_strcasecmp(token, "true"))
attrptr = ippAddBoolean(request, group, attr, 1);
@@ -1901,16 +1988,16 @@ do_tests(FILE *outfile, /* I - Output file */
do
{
- ipp_t *col; /* Collection value */
- long savepos = ftell(fp); /* Save position of file */
- int savelinenum = linenum; /* Save line number */
+ ipp_t *col; /* Collection value */
+ off_t savepos = cupsFileTell(fp); /* Save position of file */
+ int savelinenum = linenum; /* Save line number */
if (!get_token(fp, token, sizeof(token), &linenum))
break;
if (strcmp(token, ","))
{
- fseek(fp, savepos, SEEK_SET);
+ cupsFileSeek(fp, savepos);
linenum = savelinenum;
break;
}
@@ -1936,11 +2023,6 @@ do_tests(FILE *outfile, /* I - Output file */
attrptr = ippAddOctetString(request, group, attr, token, (int)strlen(token));
break;
- default :
- print_fatal_error(outfile, "Unsupported ATTR value tag %s for \"%s\" on line %d.", ippTagString(value), attr, linenum);
- pass = 0;
- goto test_exit;
-
case IPP_TAG_TEXTLANG :
case IPP_TAG_NAMELANG :
case IPP_TAG_TEXT :
@@ -2222,15 +2304,17 @@ do_tests(FILE *outfile, /* I - Output file */
goto test_exit;
}
- if ((in_group = ippTagValue(token)) == (ipp_tag_t)-1)
+ if ((in_group = ippTagValue(token)) == IPP_TAG_ZERO || in_group >= IPP_TAG_UNSUPPORTED_VALUE)
{
+ print_fatal_error(outfile, "Bad IN-GROUP group tag \"%s\" on line %d.", token, linenum);
+ pass = 0;
+ goto test_exit;
}
else if (last_expect)
last_expect->in_group = in_group;
else
{
- print_fatal_error(outfile, "IN-GROUP without a preceding EXPECT on line %d.",
- linenum);
+ print_fatal_error(outfile, "IN-GROUP without a preceding EXPECT on line %d.", linenum);
pass = 0;
goto test_exit;
}
@@ -2256,8 +2340,7 @@ do_tests(FILE *outfile, /* I - Output file */
last_expect->repeat_limit = atoi(token);
else
{
- print_fatal_error(outfile, "REPEAT-LIMIT without a preceding EXPECT or STATUS "
- "on line %d.", linenum);
+ print_fatal_error(outfile, "REPEAT-LIMIT without a preceding EXPECT or STATUS on line %d.", linenum);
pass = 0;
goto test_exit;
}
@@ -2270,8 +2353,7 @@ do_tests(FILE *outfile, /* I - Output file */
last_expect->repeat_match = 1;
else
{
- print_fatal_error(outfile, "REPEAT-MATCH without a preceding EXPECT or STATUS "
- "on line %d.", linenum);
+ print_fatal_error(outfile, "REPEAT-MATCH without a preceding EXPECT or STATUS on line %d.", linenum);
pass = 0;
goto test_exit;
}
@@ -2284,8 +2366,7 @@ do_tests(FILE *outfile, /* I - Output file */
last_expect->repeat_no_match = 1;
else
{
- print_fatal_error(outfile, "REPEAT-NO-MATCH without a preceding EXPECT or "
- "STATUS on ine %d.", linenum);
+ print_fatal_error(outfile, "REPEAT-NO-MATCH without a preceding EXPECT or STATUS on ine %d.", linenum);
pass = 0;
goto test_exit;
}
@@ -2324,8 +2405,7 @@ do_tests(FILE *outfile, /* I - Output file */
last_status->if_defined = strdup(token);
else
{
- print_fatal_error(outfile, "IF-DEFINED without a preceding EXPECT or STATUS "
- "on line %d.", linenum);
+ print_fatal_error(outfile, "IF-DEFINED without a preceding EXPECT or STATUS on line %d.", linenum);
pass = 0;
goto test_exit;
}
@@ -2345,8 +2425,7 @@ do_tests(FILE *outfile, /* I - Output file */
last_status->if_not_defined = strdup(token);
else
{
- print_fatal_error(outfile, "IF-NOT-DEFINED without a preceding EXPECT or STATUS "
- "on line %d.", linenum);
+ print_fatal_error(outfile, "IF-NOT-DEFINED without a preceding EXPECT or STATUS on line %d.", linenum);
pass = 0;
goto test_exit;
}
@@ -2431,8 +2510,7 @@ do_tests(FILE *outfile, /* I - Output file */
}
else
{
- print_fatal_error(outfile, "%s without a preceding EXPECT on line %d.", token,
- linenum);
+ print_fatal_error(outfile, "%s without a preceding EXPECT on line %d.", token, linenum);
pass = 0;
goto test_exit;
}
@@ -2459,8 +2537,7 @@ do_tests(FILE *outfile, /* I - Output file */
}
else
{
- print_fatal_error(outfile, "%s without a preceding EXPECT on line %d.", token,
- linenum);
+ print_fatal_error(outfile, "%s without a preceding EXPECT on line %d.", token, linenum);
pass = 0;
goto test_exit;
}
@@ -2490,8 +2567,7 @@ do_tests(FILE *outfile, /* I - Output file */
}
else
{
- print_fatal_error(outfile, "Unexpected token %s seen on line %d.", token,
- linenum);
+ print_fatal_error(outfile, "Unexpected token %s seen on line %d.", token, linenum);
pass = 0;
goto test_exit;
}
@@ -2509,52 +2585,52 @@ do_tests(FILE *outfile, /* I - Output file */
if (Output == _CUPS_OUTPUT_PLIST)
{
- fputs("<dict>\n", outfile);
- fputs("<key>Name</key>\n", outfile);
+ cupsFilePuts(outfile, "<dict>\n");
+ cupsFilePuts(outfile, "<key>Name</key>\n");
print_xml_string(outfile, "string", name);
if (file_id[0])
{
- fputs("<key>FileId</key>\n", outfile);
+ cupsFilePuts(outfile, "<key>FileId</key>\n");
print_xml_string(outfile, "string", file_id);
}
if (test_id[0])
{
- fputs("<key>TestId</key>\n", outfile);
+ cupsFilePuts(outfile, "<key>TestId</key>\n");
print_xml_string(outfile, "string", test_id);
}
- fputs("<key>Version</key>\n", outfile);
- fprintf(outfile, "<string>%d.%d</string>\n", version / 10, version % 10);
- fputs("<key>Operation</key>\n", outfile);
+ cupsFilePuts(outfile, "<key>Version</key>\n");
+ cupsFilePrintf(outfile, "<string>%d.%d</string>\n", version / 10, version % 10);
+ cupsFilePuts(outfile, "<key>Operation</key>\n");
print_xml_string(outfile, "string", ippOpString(op));
- fputs("<key>RequestId</key>\n", outfile);
- fprintf(outfile, "<integer>%d</integer>\n", request_id);
- fputs("<key>RequestAttributes</key>\n", outfile);
- fputs("<array>\n", outfile);
+ cupsFilePuts(outfile, "<key>RequestId</key>\n");
+ cupsFilePrintf(outfile, "<integer>%d</integer>\n", request_id);
+ cupsFilePuts(outfile, "<key>RequestAttributes</key>\n");
+ cupsFilePuts(outfile, "<array>\n");
if (request->attrs)
{
- fputs("<dict>\n", outfile);
+ cupsFilePuts(outfile, "<dict>\n");
for (attrptr = request->attrs,
group = attrptr ? attrptr->group_tag : IPP_TAG_ZERO;
attrptr;
attrptr = attrptr->next)
print_attr(outfile, Output, attrptr, &group);
- fputs("</dict>\n", outfile);
+ cupsFilePuts(outfile, "</dict>\n");
}
- fputs("</array>\n", outfile);
+ cupsFilePuts(outfile, "</array>\n");
}
- if (Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile != stdout))
+ if (Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile != cupsFileStdout()))
{
if (Verbosity)
{
printf(" %s:\n", ippOpString(op));
for (attrptr = request->attrs; attrptr; attrptr = attrptr->next)
- print_attr(stdout, _CUPS_OUTPUT_TEST, attrptr, NULL);
+ print_attr(cupsFileStdout(), _CUPS_OUTPUT_TEST, attrptr, NULL);
}
- printf(" %-68.68s [", name);
- fflush(stdout);
+ cupsFilePrintf(cupsFileStdout(), " %-68.68s [", name);
+ cupsFileFlush(cupsFileStdout());
}
if ((skip_previous && !prev_pass) || skip_test)
@@ -2566,18 +2642,18 @@ do_tests(FILE *outfile, /* I - Output file */
if (Output == _CUPS_OUTPUT_PLIST)
{
- fputs("<key>Successful</key>\n", outfile);
- fputs("<true />\n", outfile);
- fputs("<key>Skipped</key>\n", outfile);
- fputs("<true />\n", outfile);
- fputs("<key>StatusCode</key>\n", outfile);
+ cupsFilePuts(outfile, "<key>Successful</key>\n");
+ cupsFilePuts(outfile, "<true />\n");
+ cupsFilePuts(outfile, "<key>Skipped</key>\n");
+ cupsFilePuts(outfile, "<true />\n");
+ cupsFilePuts(outfile, "<key>StatusCode</key>\n");
print_xml_string(outfile, "string", "skip");
- fputs("<key>ResponseAttributes</key>\n", outfile);
- fputs("<dict />\n", outfile);
+ cupsFilePuts(outfile, "<key>ResponseAttributes</key>\n");
+ cupsFilePuts(outfile, "<dict />\n");
}
- if (Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile != stdout))
- puts("SKIP]");
+ if (Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile != cupsFileStdout()))
+ cupsFilePuts(cupsFileStdout(), "SKIP]");
goto skip_error;
}
@@ -2586,6 +2662,10 @@ do_tests(FILE *outfile, /* I - Output file */
do
{
+ if (delay > 0)
+ usleep(delay);
+
+ delay = repeat_interval;
repeat_count ++;
status = HTTP_STATUS_OK;
@@ -2963,7 +3043,7 @@ do_tests(FILE *outfile, /* I - Output file */
* values...
*/
- for (i = 0; i < num_statuses; i ++)
+ for (i = 0, status_ok = 0; i < num_statuses; i ++)
{
if (statuses[i].if_defined &&
!get_variable(vars, statuses[i].if_defined))
@@ -2973,32 +3053,30 @@ do_tests(FILE *outfile, /* I - Output file */
get_variable(vars, statuses[i].if_not_defined))
continue;
- if (response->request.status.status_code == statuses[i].status)
+ if (ippGetStatusCode(response) == statuses[i].status)
{
- if (statuses[i].repeat_match &&
- repeat_count < statuses[i].repeat_limit)
- repeat_test = 1;
+ status_ok = 1;
+
+ if (statuses[i].repeat_match && repeat_count < statuses[i].repeat_limit)
+ repeat_test = 1;
if (statuses[i].define_match)
set_variable(outfile, vars, statuses[i].define_match, "1");
-
- break;
}
else
{
- if (statuses[i].repeat_no_match &&
- repeat_count < statuses[i].repeat_limit)
- repeat_test = 1;
+ if (statuses[i].repeat_no_match && repeat_count < statuses[i].repeat_limit)
+ repeat_test = 1;
if (statuses[i].define_no_match)
{
set_variable(outfile, vars, statuses[i].define_no_match, "1");
- break;
+ status_ok = 1;
}
}
}
- if (i == num_statuses && num_statuses > 0)
+ if (!status_ok && num_statuses > 0)
{
for (i = 0; i < num_statuses; i ++)
{
@@ -3010,7 +3088,7 @@ do_tests(FILE *outfile, /* I - Output file */
get_variable(vars, statuses[i].if_not_defined))
continue;
- if (!statuses[i].repeat_match)
+ if (!statuses[i].repeat_match || repeat_count >= statuses[i].repeat_limit)
add_stringf(errors, "EXPECTED: STATUS %s (got %s)",
ippErrorString(statuses[i].status),
ippErrorString(cupsLastError()));
@@ -3063,9 +3141,8 @@ do_tests(FILE *outfile, /* I - Output file */
}
}
- if (expect->repeat_no_match &&
- repeat_count < expect->repeat_limit)
- repeat_test = 1;
+ if (expect->repeat_no_match && repeat_count < expect->repeat_limit)
+ repeat_test = 1;
break;
}
@@ -3077,7 +3154,7 @@ do_tests(FILE *outfile, /* I - Output file */
{
if (expect->define_no_match)
set_variable(outfile, vars, expect->define_no_match, "1");
- else if (!expect->define_match && !expect->define_value && !expect->repeat_match && !expect->repeat_no_match)
+ else if (!expect->define_match && !expect->define_value && ((!expect->repeat_match && !expect->repeat_no_match) || repeat_count >= expect->repeat_limit))
{
add_stringf(errors, "EXPECTED: %s WITH-VALUES-FROM %s", expect->name, expect->with_value_from);
@@ -3094,7 +3171,7 @@ do_tests(FILE *outfile, /* I - Output file */
if (expect->define_no_match)
set_variable(outfile, vars, expect->define_no_match, "1");
else if (!expect->define_match && !expect->define_value &&
- !expect->repeat_match && !expect->repeat_no_match)
+ !expect->repeat_match && (!expect->repeat_no_match || repeat_count >= expect->repeat_limit))
{
if (expect->with_flags & _CUPS_WITH_REGEX)
add_stringf(errors, "EXPECTED: %s %s /%s/",
@@ -3245,10 +3322,10 @@ do_tests(FILE *outfile, /* I - Output file */
if (repeat_test)
{
- if (Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile != stdout))
+ if (Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile != cupsFileStdout()))
{
- printf("%04d]\n", repeat_count);
- fflush(stdout);
+ cupsFilePrintf(cupsFileStdout(), "%04d]\n", repeat_count);
+ cupsFileFlush(cupsFileStdout());
if (num_displayed > 0)
{
@@ -3261,7 +3338,7 @@ do_tests(FILE *outfile, /* I - Output file */
{
if (!strcmp(displayed[i], attrname))
{
- print_attr(stdout, _CUPS_OUTPUT_TEST, attrptr, NULL);
+ print_attr(cupsFileStdout(), _CUPS_OUTPUT_TEST, attrptr, NULL);
break;
}
}
@@ -3270,12 +3347,10 @@ do_tests(FILE *outfile, /* I - Output file */
}
}
- usleep(repeat_interval);
-
- if (Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile != stdout))
+ if (Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile != cupsFileStdout()))
{
- printf(" %-68.68s [", name);
- fflush(stdout);
+ cupsFilePrintf(cupsFileStdout(), " %-68.68s [", name);
+ cupsFileFlush(cupsFileStdout());
}
}
}
@@ -3295,39 +3370,37 @@ do_tests(FILE *outfile, /* I - Output file */
if (Output == _CUPS_OUTPUT_PLIST)
{
- fputs("<key>Successful</key>\n", outfile);
- fputs(prev_pass ? "<true />\n" : "<false />\n", outfile);
- fputs("<key>StatusCode</key>\n", outfile);
+ cupsFilePuts(outfile, "<key>Successful</key>\n");
+ cupsFilePuts(outfile, prev_pass ? "<true />\n" : "<false />\n");
+ cupsFilePuts(outfile, "<key>StatusCode</key>\n");
print_xml_string(outfile, "string", ippErrorString(cupsLastError()));
- fputs("<key>ResponseAttributes</key>\n", outfile);
- fputs("<array>\n", outfile);
- fputs("<dict>\n", outfile);
+ cupsFilePuts(outfile, "<key>ResponseAttributes</key>\n");
+ cupsFilePuts(outfile, "<array>\n");
+ cupsFilePuts(outfile, "<dict>\n");
for (attrptr = response ? response->attrs : NULL,
group = attrptr ? attrptr->group_tag : IPP_TAG_ZERO;
attrptr;
attrptr = attrptr->next)
print_attr(outfile, Output, attrptr, &group);
- fputs("</dict>\n", outfile);
- fputs("</array>\n", outfile);
+ cupsFilePuts(outfile, "</dict>\n");
+ cupsFilePuts(outfile, "</array>\n");
}
- if (Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile != stdout))
+ if (Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile != cupsFileStdout()))
{
- puts(prev_pass ? "PASS]" : "FAIL]");
+ cupsFilePuts(cupsFileStdout(), prev_pass ? "PASS]" : "FAIL]");
if (!prev_pass || (Verbosity && response))
{
- printf(" RECEIVED: %lu bytes in response\n",
- (unsigned long)ippLength(response));
- printf(" status-code = %s (%s)\n", ippErrorString(cupsLastError()),
- cupsLastErrorString());
+ cupsFilePrintf(cupsFileStdout(), " RECEIVED: %lu bytes in response\n", (unsigned long)ippLength(response));
+ cupsFilePrintf(cupsFileStdout(), " status-code = %s (%s)\n", ippErrorString(cupsLastError()), cupsLastErrorString());
if (Verbosity && response)
{
for (attrptr = response->attrs;
attrptr != NULL;
attrptr = attrptr->next)
- print_attr(stdout, _CUPS_OUTPUT_TEST, attrptr, NULL);
+ print_attr(cupsFileStdout(), _CUPS_OUTPUT_TEST, attrptr, NULL);
}
}
}
@@ -3382,27 +3455,27 @@ do_tests(FILE *outfile, /* I - Output file */
{
if (Output == _CUPS_OUTPUT_PLIST)
{
- fputs("<key>Errors</key>\n", outfile);
- fputs("<array>\n", outfile);
+ cupsFilePuts(outfile, "<key>Errors</key>\n");
+ cupsFilePuts(outfile, "<array>\n");
for (error = (char *)cupsArrayFirst(errors);
error;
error = (char *)cupsArrayNext(errors))
print_xml_string(outfile, "string", error);
- fputs("</array>\n", outfile);
+ cupsFilePuts(outfile, "</array>\n");
}
- if (Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile != stdout))
+ if (Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile != cupsFileStdout()))
{
for (error = (char *)cupsArrayFirst(errors);
error;
error = (char *)cupsArrayNext(errors))
- printf(" %s\n", error);
+ cupsFilePrintf(cupsFileStdout(), " %s\n", error);
}
}
- if (num_displayed > 0 && !Verbosity && response && (Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile != stdout)))
+ if (num_displayed > 0 && !Verbosity && response && (Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile != cupsFileStdout())))
{
for (attrptr = response->attrs;
attrptr != NULL;
@@ -3425,9 +3498,9 @@ do_tests(FILE *outfile, /* I - Output file */
skip_error:
if (Output == _CUPS_OUTPUT_PLIST)
- fputs("</dict>\n", outfile);
+ cupsFilePuts(outfile, "</dict>\n");
- fflush(stdout);
+ cupsFileFlush(cupsFileStdout());
ippDelete(response);
response = NULL;
@@ -3480,7 +3553,7 @@ do_tests(FILE *outfile, /* I - Output file */
cupsArrayDelete(errors);
if (fp)
- fclose(fp);
+ cupsFileClose(fp);
httpClose(http);
ippDelete(request);
@@ -3703,9 +3776,9 @@ expect_matches(
*/
static ipp_t * /* O - Collection value */
-get_collection(FILE *outfile, /* I - Output file */
+get_collection(cups_file_t *outfile, /* I - Output file */
_cups_vars_t *vars, /* I - Variables */
- FILE *fp, /* I - File to read from */
+ cups_file_t *fp, /* I - File to read from */
int *linenum) /* IO - Line number */
{
char token[1024], /* Token from file */
@@ -3748,7 +3821,7 @@ get_collection(FILE *outfile, /* I - Output file */
goto col_error;
}
- if ((value = ippTagValue(token)) == IPP_TAG_ZERO)
+ if ((value = ippTagValue(token)) < IPP_TAG_UNSUPPORTED_VALUE)
{
print_fatal_error(outfile, "Bad MEMBER value tag \"%s\" on line %d.", token,
*linenum);
@@ -3761,17 +3834,43 @@ get_collection(FILE *outfile, /* I - Output file */
goto col_error;
}
- if (!get_token(fp, temp, sizeof(temp), linenum))
+ if (value < IPP_TAG_INTEGER)
+ {
+ /*
+ * Out-of-band member attributes have no value...
+ */
+
+ token[0] = '\0';
+ }
+ else if (!get_token(fp, temp, sizeof(temp), linenum))
{
print_fatal_error(outfile, "Missing MEMBER value on line %d.", *linenum);
goto col_error;
}
-
- expand_variables(vars, token, temp, sizeof(token));
+ else
+ {
+ expand_variables(vars, token, temp, sizeof(token));
+ }
switch (value)
{
- case IPP_TAG_BOOLEAN :
+ default :
+ if (value < IPP_TAG_INTEGER)
+ {
+ /*
+ * Add out-of-band value...
+ */
+
+ ippAddOutOfBand(col, IPP_TAG_ZERO, value, attr);
+ }
+ else
+ {
+ print_fatal_error(outfile, "Unsupported MEMBER value tag %s for \"%s\" on line %d.", ippTagString(value), attr, *linenum);
+ goto col_error;
+ }
+ break;
+
+ case IPP_TAG_BOOLEAN :
if (!_cups_strcasecmp(token, "true"))
ippAddBoolean(col, IPP_TAG_ZERO, attr, 1);
else
@@ -3855,11 +3954,21 @@ get_collection(FILE *outfile, /* I - Output file */
goto col_error;
}
break;
- case IPP_TAG_STRING :
+
+ case IPP_TAG_STRING :
ippAddOctetString(col, IPP_TAG_ZERO, attr, token, (int)strlen(token));
break;
- default :
+ case IPP_TAG_TEXTLANG :
+ case IPP_TAG_NAMELANG :
+ case IPP_TAG_TEXT :
+ case IPP_TAG_NAME :
+ case IPP_TAG_KEYWORD :
+ case IPP_TAG_URI :
+ case IPP_TAG_URISCHEME :
+ case IPP_TAG_CHARSET :
+ case IPP_TAG_LANGUAGE :
+ case IPP_TAG_MIMETYPE :
if (!strchr(token, ','))
ippAddString(col, IPP_TAG_ZERO, value, attr, NULL, token);
else
@@ -3878,9 +3987,14 @@ get_collection(FILE *outfile, /* I - Output file */
for (ptr = strchr(token, ','); ptr; ptr = strchr(ptr, ','))
{
- *ptr++ = '\0';
- values[num_values] = ptr;
- num_values ++;
+ if (ptr > token && ptr[-1] == '\\')
+ _cups_strcpy(ptr - 1, ptr);
+ else
+ {
+ *ptr++ = '\0';
+ values[num_values] = ptr;
+ num_values ++;
+ }
}
ippAddStrings(col, IPP_TAG_ZERO, value, attr, num_values,
@@ -4050,10 +4164,10 @@ get_string(ipp_attribute_t *attr, /* I - IPP attribute */
*/
static char * /* O - Token from file or NULL on EOF */
-get_token(FILE *fp, /* I - File to read from */
- char *buf, /* I - Buffer to read into */
- int buflen, /* I - Length of buffer */
- int *linenum) /* IO - Current line number */
+get_token(cups_file_t *fp, /* I - File to read from */
+ char *buf, /* I - Buffer to read into */
+ int buflen, /* I - Length of buffer */
+ int *linenum) /* IO - Current line number */
{
int ch, /* Character from file */
quote; /* Quoting character */
@@ -4067,7 +4181,7 @@ get_token(FILE *fp, /* I - File to read from */
* Skip whitespace...
*/
- while (isspace(ch = getc(fp)))
+ while (isspace(ch = cupsFileGetChar(fp)))
{
if (ch == '\n')
(*linenum) ++;
@@ -4089,7 +4203,7 @@ get_token(FILE *fp, /* I - File to read from */
bufptr = buf;
bufend = buf + buflen - 1;
- while ((ch = getc(fp)) != EOF)
+ while ((ch = cupsFileGetChar(fp)) != EOF)
{
if (ch == '\\')
{
@@ -4100,7 +4214,7 @@ get_token(FILE *fp, /* I - File to read from */
if (bufptr < bufend)
*bufptr++ = (char)ch;
- if ((ch = getc(fp)) != EOF && bufptr < bufend)
+ if ((ch = cupsFileGetChar(fp)) != EOF && bufptr < bufend)
*bufptr++ = (char)ch;
}
else if (ch == quote)
@@ -4119,7 +4233,7 @@ get_token(FILE *fp, /* I - File to read from */
* Comment...
*/
- while ((ch = getc(fp)) != EOF)
+ while ((ch = cupsFileGetChar(fp)) != EOF)
if (ch == '\n')
break;
@@ -4138,19 +4252,19 @@ get_token(FILE *fp, /* I - File to read from */
* Whitespace delimited text...
*/
- ungetc(ch, fp);
+ cupsFileSeek(fp, cupsFileTell(fp) - 1);
bufptr = buf;
bufend = buf + buflen - 1;
- while ((ch = getc(fp)) != EOF)
+ while ((ch = cupsFileGetChar(fp)) != EOF)
if (isspace(ch) || ch == '#')
break;
else if (bufptr < bufend)
*bufptr++ = (char)ch;
if (ch == '#')
- ungetc(ch, fp);
+ cupsFileSeek(fp, cupsFileTell(fp) - 1);
else if (ch == '\n')
(*linenum) ++;
@@ -4289,7 +4403,7 @@ pause_message(const char *message) /* I - Message */
*/
printf("%s\n---- PRESS ANY KEY ----", message);
- fflush(stdout);
+ cupsFileFlush(cupsFileStdout());
#ifdef WIN32
/*
@@ -4323,8 +4437,8 @@ pause_message(const char *message) /* I - Message */
* Erase the "press any key" prompt...
*/
- fputs("\r \r", stdout);
- fflush(stdout);
+ cupsFilePuts(cupsFileStdout(), "\r \r");
+ cupsFileFlush(cupsFileStdout());
}
@@ -4333,7 +4447,7 @@ pause_message(const char *message) /* I - Message */
*/
static void
-print_attr(FILE *outfile, /* I - Output file */
+print_attr(cups_file_t *outfile, /* I - Output file */
int format, /* I - Output format */
ipp_attribute_t *attr, /* I - Attribute to print */
ipp_tag_t *group) /* IO - Current group */
@@ -4348,8 +4462,8 @@ print_attr(FILE *outfile, /* I - Output file */
{
if (attr->group_tag != IPP_TAG_ZERO)
{
- fputs("</dict>\n", outfile);
- fputs("<dict>\n", outfile);
+ cupsFilePuts(outfile, "</dict>\n");
+ cupsFilePuts(outfile, "<dict>\n");
}
if (group)
@@ -4361,31 +4475,31 @@ print_attr(FILE *outfile, /* I - Output file */
print_xml_string(outfile, "key", attr->name);
if (attr->num_values > 1)
- fputs("<array>\n", outfile);
+ cupsFilePuts(outfile, "<array>\n");
switch (attr->value_tag)
{
case IPP_TAG_INTEGER :
case IPP_TAG_ENUM :
for (i = 0; i < attr->num_values; i ++)
- fprintf(outfile, "<integer>%d</integer>\n", attr->values[i].integer);
+ cupsFilePrintf(outfile, "<integer>%d</integer>\n", attr->values[i].integer);
break;
case IPP_TAG_BOOLEAN :
for (i = 0; i < attr->num_values; i ++)
- fputs(attr->values[i].boolean ? "<true />\n" : "<false />\n", outfile);
+ cupsFilePuts(outfile, attr->values[i].boolean ? "<true />\n" : "<false />\n");
break;
case IPP_TAG_RANGE :
for (i = 0; i < attr->num_values; i ++)
- fprintf(outfile, "<dict><key>lower</key><integer>%d</integer>"
+ cupsFilePrintf(outfile, "<dict><key>lower</key><integer>%d</integer>"
"<key>upper</key><integer>%d</integer></dict>\n",
attr->values[i].range.lower, attr->values[i].range.upper);
break;
case IPP_TAG_RESOLUTION :
for (i = 0; i < attr->num_values; i ++)
- fprintf(outfile, "<dict><key>xres</key><integer>%d</integer>"
+ cupsFilePrintf(outfile, "<dict><key>xres</key><integer>%d</integer>"
"<key>yres</key><integer>%d</integer>"
"<key>units</key><string>%s</string></dict>\n",
attr->values[i].resolution.xres,
@@ -4396,7 +4510,7 @@ print_attr(FILE *outfile, /* I - Output file */
case IPP_TAG_DATE :
for (i = 0; i < attr->num_values; i ++)
- fprintf(outfile, "<date>%s</date>\n", iso_date(attr->values[i].date));
+ cupsFilePrintf(outfile, "<date>%s</date>\n", iso_date(attr->values[i].date));
break;
case IPP_TAG_STRING :
@@ -4405,7 +4519,7 @@ print_attr(FILE *outfile, /* I - Output file */
char buffer[IPP_MAX_LENGTH * 5 / 4 + 1];
/* Output buffer */
- fprintf(outfile, "<data>%s</data>\n",
+ cupsFilePrintf(outfile, "<data>%s</data>\n",
httpEncode64_2(buffer, sizeof(buffer),
attr->values[i].unknown.data,
attr->values[i].unknown.length));
@@ -4428,33 +4542,33 @@ print_attr(FILE *outfile, /* I - Output file */
case IPP_TAG_NAMELANG :
for (i = 0; i < attr->num_values; i ++)
{
- fputs("<dict><key>language</key><string>", outfile);
+ cupsFilePuts(outfile, "<dict><key>language</key><string>");
print_xml_string(outfile, NULL, attr->values[i].string.language);
- fputs("</string><key>string</key><string>", outfile);
+ cupsFilePuts(outfile, "</string><key>string</key><string>");
print_xml_string(outfile, NULL, attr->values[i].string.text);
- fputs("</string></dict>\n", outfile);
+ cupsFilePuts(outfile, "</string></dict>\n");
}
break;
case IPP_TAG_BEGIN_COLLECTION :
for (i = 0; i < attr->num_values; i ++)
{
- fputs("<dict>\n", outfile);
+ cupsFilePuts(outfile, "<dict>\n");
for (colattr = attr->values[i].collection->attrs;
colattr;
colattr = colattr->next)
print_attr(outfile, format, colattr, NULL);
- fputs("</dict>\n", outfile);
+ cupsFilePuts(outfile, "</dict>\n");
}
break;
default :
- fprintf(outfile, "<string>&lt;&lt;%s&gt;&gt;</string>\n", ippTagString(attr->value_tag));
+ cupsFilePrintf(outfile, "<string>&lt;&lt;%s&gt;&gt;</string>\n", ippTagString(attr->value_tag));
break;
}
if (attr->num_values > 1)
- fputs("</array>\n", outfile);
+ cupsFilePuts(outfile, "</array>\n");
}
else
{
@@ -4464,15 +4578,15 @@ print_attr(FILE *outfile, /* I - Output file */
{
if (!attr->name)
{
- fputs(" -- separator --\n", outfile);
+ cupsFilePuts(outfile, " -- separator --\n");
return;
}
- fprintf(outfile, " %s (%s%s) = ", attr->name, attr->num_values > 1 ? "1setOf " : "", ippTagString(attr->value_tag));
+ cupsFilePrintf(outfile, " %s (%s%s) = ", attr->name, attr->num_values > 1 ? "1setOf " : "", ippTagString(attr->value_tag));
}
ippAttributeString(attr, buffer, sizeof(buffer));
- fprintf(outfile, "%s\n", buffer);
+ cupsFilePrintf(outfile, "%s\n", buffer);
}
}
@@ -4483,7 +4597,7 @@ print_attr(FILE *outfile, /* I - Output file */
static void
print_csv(
- FILE *outfile, /* I - Output file */
+ cups_file_t *outfile, /* I - Output file */
ipp_attribute_t *attr, /* I - First attribute for line */
int num_displayed, /* I - Number of attributes to display */
char **displayed, /* I - Attributes to display */
@@ -4518,7 +4632,7 @@ print_csv(
for (i = 0; i < num_displayed; i ++)
{
if (i)
- fputc(',', outfile);
+ cupsFilePutChar(outfile, ',');
buffer[0] = '\0';
@@ -4536,30 +4650,30 @@ print_csv(
if (strchr(buffer, ',') != NULL || strchr(buffer, '\"') != NULL ||
strchr(buffer, '\\') != NULL)
{
- putc('\"', outfile);
+ cupsFilePutChar(cupsFileStdout(), '\"');
for (bufptr = buffer; *bufptr; bufptr ++)
{
if (*bufptr == '\\' || *bufptr == '\"')
- putc('\\', outfile);
- putc(*bufptr, outfile);
+ cupsFilePutChar(cupsFileStdout(), '\\');
+ cupsFilePutChar(cupsFileStdout(), *bufptr);
}
- putc('\"', outfile);
+ cupsFilePutChar(cupsFileStdout(), '\"');
}
else
- fputs(buffer, outfile);
+ cupsFilePuts(outfile, buffer);
}
- putc('\n', outfile);
+ cupsFilePutChar(cupsFileStdout(), '\n');
}
else
{
for (i = 0; i < num_displayed; i ++)
{
if (i)
- putc(',', outfile);
+ cupsFilePutChar(cupsFileStdout(), ',');
- fputs(displayed[i], outfile);
+ cupsFilePuts(outfile, displayed[i]);
}
- putc('\n', outfile);
+ cupsFilePutChar(cupsFileStdout(), '\n');
}
free(buffer);
@@ -4571,8 +4685,8 @@ print_csv(
*/
static void
-print_fatal_error(FILE *outfile, /* I - Output file */
- const char *s, /* I - Printf-style format string */
+print_fatal_error(cups_file_t *outfile, /* I - Output file */
+ const char *s, /* I - Printf-style format string */
...) /* I - Additional arguments as needed */
{
char buffer[10240]; /* Format buffer */
@@ -4607,7 +4721,7 @@ print_fatal_error(FILE *outfile, /* I - Output file */
static void
print_line(
- FILE *outfile, /* I - Output file */
+ cups_file_t *outfile, /* I - Output file */
ipp_attribute_t *attr, /* I - First attribute for line */
int num_displayed, /* I - Number of attributes to display */
char **displayed, /* I - Attributes to display */
@@ -4641,7 +4755,7 @@ print_line(
for (i = 0; i < num_displayed; i ++)
{
if (i)
- putc(' ', outfile);
+ cupsFilePutChar(cupsFileStdout(), ' ');
buffer[0] = '\0';
@@ -4656,31 +4770,31 @@ print_line(
}
}
- fprintf(outfile, "%*s", (int)-widths[i], buffer);
+ cupsFilePrintf(outfile, "%*s", (int)-widths[i], buffer);
}
- putc('\n', outfile);
+ cupsFilePutChar(cupsFileStdout(), '\n');
}
else
{
for (i = 0; i < num_displayed; i ++)
{
if (i)
- putc(' ', outfile);
+ cupsFilePutChar(cupsFileStdout(), ' ');
- fprintf(outfile, "%*s", (int)-widths[i], displayed[i]);
+ cupsFilePrintf(outfile, "%*s", (int)-widths[i], displayed[i]);
}
- putc('\n', outfile);
+ cupsFilePutChar(cupsFileStdout(), '\n');
for (i = 0; i < num_displayed; i ++)
{
if (i)
- putc(' ', outfile);
+ cupsFilePutChar(cupsFileStdout(), ' ');
memset(buffer, '-', widths[i]);
buffer[widths[i]] = '\0';
- fputs(buffer, outfile);
+ cupsFilePuts(outfile, buffer);
}
- putc('\n', outfile);
+ cupsFilePutChar(cupsFileStdout(), '\n');
}
free(buffer);
@@ -4692,23 +4806,23 @@ print_line(
*/
static void
-print_xml_header(FILE *outfile) /* I - Output file */
+print_xml_header(cups_file_t *outfile) /* I - Output file */
{
if (!XMLHeader)
{
- fputs("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", outfile);
- fputs("<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" "
- "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n", outfile);
- fputs("<plist version=\"1.0\">\n", outfile);
- fputs("<dict>\n", outfile);
- fputs("<key>ipptoolVersion</key>\n", outfile);
- fputs("<string>" CUPS_SVERSION "</string>\n", outfile);
- fputs("<key>Transfer</key>\n", outfile);
- fprintf(outfile, "<string>%s</string>\n",
+ cupsFilePuts(outfile, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+ cupsFilePuts(outfile, "<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" "
+ "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n");
+ cupsFilePuts(outfile, "<plist version=\"1.0\">\n");
+ cupsFilePuts(outfile, "<dict>\n");
+ cupsFilePuts(outfile, "<key>ipptoolVersion</key>\n");
+ cupsFilePuts(outfile, "<string>" CUPS_SVERSION "</string>\n");
+ cupsFilePuts(outfile, "<key>Transfer</key>\n");
+ cupsFilePrintf(outfile, "<string>%s</string>\n",
Transfer == _CUPS_TRANSFER_AUTO ? "auto" :
Transfer == _CUPS_TRANSFER_CHUNKED ? "chunked" : "length");
- fputs("<key>Tests</key>\n", outfile);
- fputs("<array>\n", outfile);
+ cupsFilePuts(outfile, "<key>Tests</key>\n");
+ cupsFilePuts(outfile, "<array>\n");
XMLHeader = 1;
}
@@ -4720,21 +4834,21 @@ print_xml_header(FILE *outfile) /* I - Output file */
*/
static void
-print_xml_string(FILE *outfile, /* I - Output file */
- const char *element, /* I - Element name or NULL */
- const char *s) /* I - String to print */
+print_xml_string(cups_file_t *outfile, /* I - Output file */
+ const char *element, /* I - Element name or NULL */
+ const char *s) /* I - String to print */
{
if (element)
- fprintf(outfile, "<%s>", element);
+ cupsFilePrintf(outfile, "<%s>", element);
while (*s)
{
if (*s == '&')
- fputs("&amp;", outfile);
+ cupsFilePuts(outfile, "&amp;");
else if (*s == '<')
- fputs("&lt;", outfile);
+ cupsFilePuts(outfile, "&lt;");
else if (*s == '>')
- fputs("&gt;", outfile);
+ cupsFilePuts(outfile, "&gt;");
else if ((*s & 0xe0) == 0xc0)
{
/*
@@ -4743,13 +4857,13 @@ print_xml_string(FILE *outfile, /* I - Output file */
if ((s[1] & 0xc0) != 0x80)
{
- putc('?', outfile);
+ cupsFilePutChar(cupsFileStdout(), '?');
s ++;
}
else
{
- putc(*s++, outfile);
- putc(*s, outfile);
+ cupsFilePutChar(cupsFileStdout(), *s++);
+ cupsFilePutChar(cupsFileStdout(), *s);
}
}
else if ((*s & 0xf0) == 0xe0)
@@ -4760,14 +4874,14 @@ print_xml_string(FILE *outfile, /* I - Output file */
if ((s[1] & 0xc0) != 0x80 || (s[2] & 0xc0) != 0x80)
{
- putc('?', outfile);
+ cupsFilePutChar(cupsFileStdout(), '?');
s += 2;
}
else
{
- putc(*s++, outfile);
- putc(*s++, outfile);
- putc(*s, outfile);
+ cupsFilePutChar(cupsFileStdout(), *s++);
+ cupsFilePutChar(cupsFileStdout(), *s++);
+ cupsFilePutChar(cupsFileStdout(), *s);
}
}
else if ((*s & 0xf8) == 0xf0)
@@ -4779,15 +4893,15 @@ print_xml_string(FILE *outfile, /* I - Output file */
if ((s[1] & 0xc0) != 0x80 || (s[2] & 0xc0) != 0x80 ||
(s[3] & 0xc0) != 0x80)
{
- putc('?', outfile);
+ cupsFilePutChar(cupsFileStdout(), '?');
s += 3;
}
else
{
- putc(*s++, outfile);
- putc(*s++, outfile);
- putc(*s++, outfile);
- putc(*s, outfile);
+ cupsFilePutChar(cupsFileStdout(), *s++);
+ cupsFilePutChar(cupsFileStdout(), *s++);
+ cupsFilePutChar(cupsFileStdout(), *s++);
+ cupsFilePutChar(cupsFileStdout(), *s);
}
}
else if ((*s & 0x80) || (*s < ' ' && !isspace(*s & 255)))
@@ -4796,16 +4910,16 @@ print_xml_string(FILE *outfile, /* I - Output file */
* Invalid control character...
*/
- putc('?', outfile);
+ cupsFilePutChar(cupsFileStdout(), '?');
}
else
- putc(*s, outfile);
+ cupsFilePutChar(cupsFileStdout(), *s);
s ++;
}
if (element)
- fprintf(outfile, "</%s>\n", element);
+ cupsFilePrintf(outfile, "</%s>\n", element);
}
@@ -4814,22 +4928,22 @@ print_xml_string(FILE *outfile, /* I - Output file */
*/
static void
-print_xml_trailer(FILE *outfile, /* I - Output file */
- int success, /* I - 1 on success, 0 on failure */
- const char *message) /* I - Error message or NULL */
+print_xml_trailer(cups_file_t *outfile, /* I - Output file */
+ int success, /* I - 1 on success, 0 on failure */
+ const char *message) /* I - Error message or NULL */
{
if (XMLHeader)
{
- fputs("</array>\n", outfile);
- fputs("<key>Successful</key>\n", outfile);
- fputs(success ? "<true />\n" : "<false />\n", outfile);
+ cupsFilePuts(outfile, "</array>\n");
+ cupsFilePuts(outfile, "<key>Successful</key>\n");
+ cupsFilePuts(outfile, success ? "<true />\n" : "<false />\n");
if (message)
{
- fputs("<key>ErrorMessage</key>\n", outfile);
+ cupsFilePuts(outfile, "<key>ErrorMessage</key>\n");
print_xml_string(outfile, "string", message);
}
- fputs("</dict>\n", outfile);
- fputs("</plist>\n", outfile);
+ cupsFilePuts(outfile, "</dict>\n");
+ cupsFilePuts(outfile, "</plist>\n");
XMLHeader = 0;
}
@@ -4841,7 +4955,7 @@ print_xml_trailer(FILE *outfile, /* I - Output file */
*/
static void
-set_variable(FILE *outfile, /* I - Output file */
+set_variable(cups_file_t *outfile, /* I - Output file */
_cups_vars_t *vars, /* I - Variables */
const char *name, /* I - Variable name */
const char *value) /* I - Value string */
@@ -4942,8 +5056,7 @@ timeout_cb(http_t *http, /* I - Connection to server */
static void
usage(void)
{
- _cupsLangPuts(stderr, _("Usage: ipptool [options] URI filename [ ... "
- "filenameN ]"));
+ _cupsLangPuts(stderr, _("Usage: ipptool [options] URI filename [ ... filenameN ]"));
_cupsLangPuts(stderr, _("Options:"));
_cupsLangPuts(stderr, _(" --help Show help."));
_cupsLangPuts(stderr, _(" --stop-after-include-error\n"
@@ -4953,30 +5066,20 @@ usage(void)
_cupsLangPuts(stderr, _(" -6 Connect using IPv6."));
_cupsLangPuts(stderr, _(" -C Send requests using "
"chunking (default)."));
- _cupsLangPuts(stdout, _(" -E Test with HTTP Upgrade to "
- "TLS."));
+ _cupsLangPuts(stderr, _(" -E Test with encryption using HTTP Upgrade to TLS."));
_cupsLangPuts(stderr, _(" -I Ignore errors."));
- _cupsLangPuts(stderr, _(" -L Send requests using "
- "content-length."));
+ _cupsLangPuts(stderr, _(" -L Send requests using content-length."));
_cupsLangPuts(stderr, _(" -P filename.plist Produce XML plist to a file and test report to standard output."));
- _cupsLangPuts(stderr, _(" -S Test with SSL "
- "encryption."));
- _cupsLangPuts(stderr, _(" -T seconds Set the receive/send "
- "timeout in seconds."));
- _cupsLangPuts(stderr, _(" -V version Set default IPP "
- "version."));
- _cupsLangPuts(stderr, _(" -X Produce XML plist instead "
- "of plain text."));
+ _cupsLangPuts(stderr, _(" -S Test with encryption using HTTPS."));
+ _cupsLangPuts(stderr, _(" -T seconds Set the receive/send timeout in seconds."));
+ _cupsLangPuts(stderr, _(" -V version Set default IPP version."));
+ _cupsLangPuts(stderr, _(" -X Produce XML plist instead of plain text."));
_cupsLangPuts(stderr, _(" -c Produce CSV output."));
- _cupsLangPuts(stderr, _(" -d name=value Set named variable to "
- "value."));
- _cupsLangPuts(stderr, _(" -f filename Set default request "
- "filename."));
- _cupsLangPuts(stderr, _(" -i seconds Repeat the last file with "
- "the given time interval."));
+ _cupsLangPuts(stderr, _(" -d name=value Set named variable to value."));
+ _cupsLangPuts(stderr, _(" -f filename Set default request filename."));
+ _cupsLangPuts(stderr, _(" -i seconds Repeat the last file with the given time interval."));
_cupsLangPuts(stderr, _(" -l Produce plain text output."));
- _cupsLangPuts(stderr, _(" -n count Repeat the last file the "
- "given number of times."));
+ _cupsLangPuts(stderr, _(" -n count Repeat the last file the given number of times."));
_cupsLangPuts(stderr, _(" -q Run silently."));
_cupsLangPuts(stderr, _(" -t Produce a test report."));
_cupsLangPuts(stderr, _(" -v Be verbose."));
@@ -4990,7 +5093,7 @@ usage(void)
*/
static int /* O - 1 if valid, 0 otherwise */
-validate_attr(FILE *outfile, /* I - Output file */
+validate_attr(cups_file_t *outfile, /* I - Output file */
cups_array_t *errors, /* I - Errors array */
ipp_attribute_t *attr) /* I - Attribute to validate */
{
@@ -5651,7 +5754,7 @@ validate_attr(FILE *outfile, /* I - Output file */
*/
static int /* O - 1 on match, 0 on non-match */
-with_value(FILE *outfile, /* I - Output file */
+with_value(cups_file_t *outfile, /* I - Output file */
cups_array_t *errors, /* I - Errors array */
char *value, /* I - Value string */
int flags, /* I - Flags for match */
@@ -5964,34 +6067,13 @@ with_value(FILE *outfile, /* I - Output file */
}
else if (ippGetValueTag(attr) == IPP_TAG_URI)
{
- if (!strncmp(value, "ipp://", 6) || !strncmp(value, "http://", 7) || !strncmp(value, "ipps://", 7) || !strncmp(value, "https://", 8))
- {
- char scheme[256], /* URI scheme */
- userpass[256], /* username:password, if any */
- hostname[256], /* hostname */
- *hostptr, /* Pointer into hostname */
- resource[1024]; /* Resource path */
- int port; /* Port number */
-
- if (httpSeparateURI(HTTP_URI_CODING_ALL, value, scheme, sizeof(scheme), userpass, sizeof(userpass), hostname, sizeof(hostname), &port, resource, sizeof(resource)) >= HTTP_URI_STATUS_OK && (hostptr = hostname + strlen(hostname) - 1) > hostname && *hostptr == '.')
- {
- /*
- * Strip trailing "." in hostname of URI...
- */
-
- *hostptr = '\0';
- httpAssembleURI(HTTP_URI_CODING_ALL, temp, sizeof(temp), scheme, userpass, hostname, port, resource);
- value = temp;
- }
- }
-
/*
* Value is a literal URI string, see if the value(s) match...
*/
for (i = 0; i < attr->num_values; i ++)
{
- if (!strcmp(value, get_string(attr, i, flags, temp, sizeof(temp))))
+ if (!compare_uris(value, get_string(attr, i, flags, temp, sizeof(temp))))
{
if (!matchbuf[0])
strlcpy(matchbuf,
View Lorry Controller Status