Sync up GNU TLS and Darwin TLS certificate validation code.

diff --git a/CHANGES.txt b/CHANGES.txt
index aa8f525d370bfaceceed8e8ead7a8a7621702121..1c57d71af8d1ad81d0ad8576e1a434e39f25606a 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,11 @@
-CHANGES.txt - 2.2rc1 - 2016-08-08
----------------------------------
+CHANGES.txt - 2.2.0 - 2016-08-25
+--------------------------------
+
+CHANGES IN CUPS V2.2.0
+
+       - Normalized the TLS certificate validation code and added additional
+         error messages to aid troubleshooting.
+
 
 CHANGES IN CUPS V2.2rc1
 

diff --git a/cups/tls-darwin.c b/cups/tls-darwin.c
index 0dfe73a9556c2cd4d183f0bb9f03204eb94340be..fa33f8383a31b9d054051315544cc461d87c656d 100644 (file)
--- a/cups/tls-darwin.c
+++ b/cups/tls-darwin.c
@@ -600,10 +600,16 @@ httpCredentialsGetTrust(
 
 
   if (!common_name)
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("No common name specified."), 1);
     return (HTTP_TRUST_UNKNOWN);
+  }
 
   if ((secCert = http_cdsa_create_credential((http_credential_t *)cupsArrayFirst(credentials))) == NULL)
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Unable to create credentials from array."), 1);
     return (HTTP_TRUST_UNKNOWN);
+  }
 
   if (cg->any_root < 0)
     _cupsSetDefaults();
@@ -635,15 +641,28 @@ httpCredentialsGetTrust(
         * Do not trust certificates on first use...
        */
 
+        _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Trust on first use is disabled."), 1);
+
         trust = HTTP_TRUST_INVALID;
       }
-      else if (httpCredentialsGetExpiration(credentials) <= httpCredentialsGetExpiration(tcreds) || !httpCredentialsAreValidForName(credentials, common_name))
+      else if (httpCredentialsGetExpiration(credentials) <= httpCredentialsGetExpiration(tcreds))
       {
        /*
-        * Either the new credentials are not newly issued, or the common name
-       * does not match the issued certificate...
+        * The new credentials are not newly issued...
        */
 
+        _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("New credentials are older than stored credentials."), 1);
+
+        trust = HTTP_TRUST_INVALID;
+      }
+      else if (!httpCredentialsAreValidForName(credentials, common_name))
+      {
+       /*
+        * The common name does not match the issued certificate...
+       */
+
+        _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("New credentials are not valid for name."), 1);
+
         trust = HTTP_TRUST_INVALID;
       }
       else if (httpCredentialsGetExpiration(tcreds) < time(NULL))
@@ -661,14 +680,27 @@ httpCredentialsGetTrust(
     httpFreeCredentials(tcreds);
   }
   else if (cg->validate_certs && !httpCredentialsAreValidForName(credentials, common_name))
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("No stored credentials, not valid for name."), 1);
     trust = HTTP_TRUST_INVALID;
+  }
+  else if (!cg->trust_first)
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Trust on first use is disabled."), 1);
+    trust = HTTP_TRUST_INVALID;
+  }
 
-  if (!cg->expired_certs && !SecCertificateIsValid(secCert, CFAbsoluteTimeGetCurrent()))
+  if (trust == HTTP_TRUST_OK && !cg->expired_certs && !SecCertificateIsValid(secCert, CFAbsoluteTimeGetCurrent()))
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Credentials have expired."), 1);
     trust = HTTP_TRUST_EXPIRED;
-  else if (!cg->any_root && cupsArrayCount(credentials) == 1)
-    trust = HTTP_TRUST_INVALID;
-  else if (!cg->trust_first)
+  }
+
+  if (trust == HTTP_TRUST_OK && !cg->any_root && cupsArrayCount(credentials) == 1)
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Self-signed credentials are blocked."), 1);
     trust = HTTP_TRUST_INVALID;
+  }
 
   CFRelease(secCert);
 

diff --git a/cups/tls-gnutls.c b/cups/tls-gnutls.c
index 70515f20e79e99f45537de2b465cc07b35485ed1..cb3865bb5abae4a28d03d801e1ac13cb7fa78545 100644 (file)
--- a/cups/tls-gnutls.c
+++ b/cups/tls-gnutls.c
@@ -522,6 +522,11 @@ httpCredentialsGetTrust(
     _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("No stored credentials, not valid for name."), 1);
     trust = HTTP_TRUST_INVALID;
   }
+  else if (!cg->trust_first)
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Trust on first use is disabled."), 1);
+    trust = HTTP_TRUST_INVALID;
+  }
 
   if (trust == HTTP_TRUST_OK && !cg->expired_certs)
   {

diff --git a/locale/cups.pot b/locale/cups.pot
index d51a62010bb97b5c1037c5a68df2e8bbe97800bc..2f0e471d2e9323ed4009ad4d0e206baa8956142b 100644 (file)
--- 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: 2016-08-08 12:26-0400\n"
+"POT-Creation-Date: 2016-08-25 09:50-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"
@@ -3750,6 +3750,10 @@ msgstr ""
 msgid "Created"
 msgstr ""
 
+#: cups/tls-darwin.c:695 cups/tls-gnutls.c:539
+msgid "Credentials have expired."
+msgstr ""
+
 #: cups/ppd.c:1136 cups/ppd.c:1176 cups/ppd.c:1421 cups/ppd.c:1524
 msgid "Custom"
 msgstr ""
@@ -5151,6 +5155,14 @@ msgstr ""
 msgid "Never"
 msgstr ""
 
+#: cups/tls-darwin.c:664 cups/tls-gnutls.c:502
+msgid "New credentials are not valid for name."
+msgstr ""
+
+#: cups/tls-darwin.c:654 cups/tls-gnutls.c:492
+msgid "New credentials are older than stored credentials."
+msgstr ""
+
 #: cups/ppd.c:1971
 msgid "No"
 msgstr ""
@@ -5196,6 +5208,10 @@ msgstr ""
 msgid "No authentication information provided."
 msgstr ""
 
+#: cups/tls-darwin.c:604 cups/tls-gnutls.c:439
+msgid "No common name specified."
+msgstr ""
+
 #: cups/snmp.c:954
 msgid "No community name"
 msgstr ""
@@ -5269,6 +5285,10 @@ msgstr ""
 msgid "No request-id"
 msgstr ""
 
+#: cups/tls-darwin.c:684 cups/tls-gnutls.c:522
+msgid "No stored credentials, not valid for name."
+msgstr ""
+
 #: scheduler/ipp.c:5679
 msgid "No subscription attributes in request."
 msgstr ""
@@ -5911,6 +5931,10 @@ msgstr ""
 msgid "Self Adhesive Film"
 msgstr ""
 
+#: cups/tls-darwin.c:701 cups/tls-gnutls.c:546
+msgid "Self-signed credentials are blocked."
+msgstr ""
+
 #: cups/ppd-cache.c:3375
 msgid "Semi-Gloss Fabric"
 msgstr ""
@@ -5947,7 +5971,7 @@ msgstr ""
 msgid "Server Stopped"
 msgstr ""
 
-#: cups/tls-darwin.c:1101 cups/tls-gnutls.c:1192
+#: cups/tls-darwin.c:1133 cups/tls-gnutls.c:1225
 msgid "Server credentials not set."
 msgstr ""
 
@@ -6510,6 +6534,11 @@ msgstr ""
 msgid "Triple Wall Cardboard"
 msgstr ""
 
+#: cups/tls-darwin.c:644 cups/tls-darwin.c:689 cups/tls-gnutls.c:482
+#: cups/tls-gnutls.c:527
+msgid "Trust on first use is disabled."
+msgstr ""
+
 #: cups/http-support.c:1382
 msgid "URI Too Long"
 msgstr ""
@@ -6668,6 +6697,10 @@ msgstr ""
 msgid "Unable to copy Windows 9x printer driver files (%d)."
 msgstr ""
 
+#: cups/tls-darwin.c:610 cups/tls-gnutls.c:445
+msgid "Unable to create credentials from array."
+msgstr ""
+
 #: cups/ppd-util.c:542 cups/util.c:482
 msgid "Unable to create printer-uri"
 msgstr ""
@@ -6676,7 +6709,7 @@ msgstr ""
 msgid "Unable to create printer."
 msgstr ""
 
-#: cups/tls-darwin.c:1362 cups/tls-gnutls.c:1380
+#: cups/tls-darwin.c:1394 cups/tls-gnutls.c:1413
 msgid "Unable to create server credentials."
 msgstr ""
 
@@ -6700,35 +6733,35 @@ msgstr ""
 msgid "Unable to edit cupsd.conf files larger than 1MB"
 msgstr ""
 
-#: cups/tls-darwin.c:1529
+#: cups/tls-darwin.c:1561
 msgid "Unable to establish a secure connection to host (certificate chain invalid)."
 msgstr ""
 
-#: cups/tls-darwin.c:1519
+#: cups/tls-darwin.c:1551
 msgid "Unable to establish a secure connection to host (certificate not yet valid)."
 msgstr ""
 
-#: cups/tls-darwin.c:1514
+#: cups/tls-darwin.c:1546
 msgid "Unable to establish a secure connection to host (expired certificate)."
 msgstr ""
 
-#: cups/tls-darwin.c:1524
+#: cups/tls-darwin.c:1556
 msgid "Unable to establish a secure connection to host (host name mismatch)."
 msgstr ""
 
-#: cups/tls-darwin.c:1534
+#: cups/tls-darwin.c:1566
 msgid "Unable to establish a secure connection to host (peer dropped connection before responding)."
 msgstr ""
 
-#: cups/tls-darwin.c:1509
+#: cups/tls-darwin.c:1541
 msgid "Unable to establish a secure connection to host (self-signed certificate)."
 msgstr ""
 
-#: cups/tls-darwin.c:1504
+#: cups/tls-darwin.c:1536
 msgid "Unable to establish a secure connection to host (untrusted certificate)."
 msgstr ""
 
-#: cups/tls-darwin.c:1561 cups/tls-sspi.c:1277 cups/tls-sspi.c:1294
+#: cups/tls-darwin.c:1593 cups/tls-sspi.c:1277 cups/tls-sspi.c:1294
 msgid "Unable to establish a secure connection to host."
 msgstr ""
 
@@ -6740,7 +6773,7 @@ msgstr ""
 msgid "Unable to find printer."
 msgstr ""
 
-#: cups/tls-darwin.c:1375
+#: cups/tls-darwin.c:1407
 msgid "Unable to find server credentials."
 msgstr ""
 
@@ -6993,7 +7026,7 @@ msgstr ""
 msgid "Unknown scheme in URI"
 msgstr ""
 
-#: cups/http-addrlist.c:775
+#: cups/http-addrlist.c:781
 msgid "Unknown service name."
 msgstr ""
 

diff --git a/locale/cups.strings b/locale/cups.strings
index 738bb46c10ebf8deb9f6c8e228fbcd0c3d6b55cd..61f2a939974414f8fc809b475688f7bd341378db 100644 (file)
--- a/locale/cups.strings
+++ b/locale/cups.strings
@@ -808,6 +808,7 @@
 "Cotton Envelope" = "Cotton Envelope";
 "Cover" = "Cover";
 "Created" = "Created";
+"Credentials have expired." = "Credentials have expired.";
 "Custom" = "Custom";
 "CustominCutInterval" = "CustominCutInterval";
 "CustominTearInterval" = "CustominTearInterval";
@@ -1144,6 +1145,8 @@
 "Name OID uses indefinite length" = "Name OID uses indefinite length";
 "Nested classes are not allowed." = "Nested classes are not allowed.";
 "Never" = "Never";
+"New credentials are not valid for name." = "New credentials are not valid for name.";
+"New credentials are older than stored credentials." = "New credentials are older than stored credentials.";
 "No" = "No";
 "No Content" = "No Content";
 "No Finishing" = "No Finishing";
@@ -1155,6 +1158,7 @@
 "No active jobs on %s." = "No active jobs on %s.";
 "No attributes in request." = "No attributes in request.";
 "No authentication information provided." = "No authentication information provided.";
+"No common name specified." = "No common name specified.";
 "No community name" = "No community name";
 "No default printer." = "No default printer.";
 "No destinations added." = "No destinations added.";
@@ -1173,6 +1177,7 @@
 "No request protocol version." = "No request protocol version.";
 "No request sent." = "No request sent.";
 "No request-id" = "No request-id";
+"No stored credentials, not valid for name." = "No stored credentials, not valid for name.";
 "No subscription attributes in request." = "No subscription attributes in request.";
 "No subscriptions found." = "No subscriptions found.";
 "No variable-bindings SEQUENCE" = "No variable-bindings SEQUENCE";
@@ -1330,6 +1335,7 @@
 "See remote printer." = "See remote printer.";
 "Self Adhesive" = "Self Adhesive";
 "Self Adhesive Film" = "Self Adhesive Film";
+"Self-signed credentials are blocked." = "Self-signed credentials are blocked.";
 "Semi-Gloss Fabric" = "Semi-Gloss Fabric";
 "Semi-Gloss Labels" = "Semi-Gloss Labels";
 "Semi-Gloss Optical Disc" = "Semi-Gloss Optical Disc";
@@ -1473,6 +1479,7 @@
 "Triple Staple (Reverse Landscape)" = "Triple Staple (Reverse Landscape)";
 "Triple Staple (Reverse Portrait)" = "Triple Staple (Reverse Portrait)";
 "Triple Wall Cardboard" = "Triple Wall Cardboard";
+"Trust on first use is disabled." = "Trust on first use is disabled.";
 "URI Too Long" = "URI Too Long";
 "URI too large" = "URI too large";
 "US Ledger" = "US Ledger";
@@ -1510,6 +1517,7 @@
 "Unable to copy PPD file." = "Unable to copy PPD file.";
 "Unable to copy Windows 2000 printer driver files (%d)." = "Unable to copy Windows 2000 printer driver files (%d).";
 "Unable to copy Windows 9x printer driver files (%d)." = "Unable to copy Windows 9x printer driver files (%d).";
+"Unable to create credentials from array." = "Unable to create credentials from array.";
 "Unable to create printer-uri" = "Unable to create printer-uri";
 "Unable to create printer." = "Unable to create printer.";
 "Unable to create server credentials." = "Unable to create server credentials.";

diff --git a/locale/cups_ca.po b/locale/cups_ca.po
index 0b41db2ec474376a307c10173aafe160068141ed..0c43c9e1f74fda56cc4464eaa8f4f54e5fea4929 100644 (file)
--- 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: 2016-08-08 12:26-0400\n"
+"POT-Creation-Date: 2016-08-25 09:50-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"
@@ -3086,6 +3086,9 @@ msgstr ""
 msgid "Created"
 msgstr "Creat"
 
+msgid "Credentials have expired."
+msgstr ""
+
 msgid "Custom"
 msgstr "Personalitzat"
 
@@ -4154,6 +4157,12 @@ msgstr "No es permeten les classes imbricades."
 msgid "Never"
 msgstr "Mai"
 
+msgid "New credentials are not valid for name."
+msgstr ""
+
+msgid "New credentials are older than stored credentials."
+msgstr ""
+
 msgid "No"
 msgstr "No"
 
@@ -4188,6 +4197,9 @@ msgstr "No hi ha atributs en demanda."
 msgid "No authentication information provided."
 msgstr "No s'ha donat cap informació d'autenticació."
 
+msgid "No common name specified."
+msgstr ""
+
 msgid "No community name"
 msgstr "Ho hi na cap nom de comunitat"
 
@@ -4244,6 +4256,9 @@ msgstr ""
 msgid "No request-id"
 msgstr "No hi ha cap request-id"
 
+msgid "No stored credentials, not valid for name."
+msgstr ""
+
 msgid "No subscription attributes in request."
 msgstr "No hi ha cap atribut de la subscripció a la sol·licitud."
 
@@ -4728,6 +4743,9 @@ msgstr ""
 msgid "Self Adhesive Film"
 msgstr ""
 
+msgid "Self-signed credentials are blocked."
+msgstr ""
+
 msgid "Semi-Gloss Fabric"
 msgstr ""
 
@@ -5199,6 +5217,9 @@ msgstr ""
 msgid "Triple Wall Cardboard"
 msgstr ""
 
+msgid "Trust on first use is disabled."
+msgstr ""
+
 msgid "URI Too Long"
 msgstr "L'URI és massa llarg"
 
@@ -5328,6 +5349,9 @@ msgid "Unable to copy Windows 9x printer driver files (%d)."
 msgstr ""
 "No es poden copiar els fitxers del controlador d'impressora Windows 9x (%d)."
 
+msgid "Unable to create credentials from array."
+msgstr ""
+
 msgid "Unable to create printer-uri"
 msgstr "No es pot crear el printer-uri"
 

diff --git a/locale/cups_cs.po b/locale/cups_cs.po
index be21ae25000bb248b13d784088a6d336a68de63c..3709c7e778b85b2f964a5fbde703aae4cdd8da18 100644 (file)
--- 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: 2016-08-08 12:26-0400\n"
+"POT-Creation-Date: 2016-08-25 09:50-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"
@@ -2890,6 +2890,9 @@ msgstr ""
 msgid "Created"
 msgstr "Vytvořeno"
 
+msgid "Credentials have expired."
+msgstr ""
+
 msgid "Custom"
 msgstr "Uživatelský"
 
@@ -3944,6 +3947,12 @@ msgstr ""
 msgid "Never"
 msgstr "Nikdy"
 
+msgid "New credentials are not valid for name."
+msgstr ""
+
+msgid "New credentials are older than stored credentials."
+msgstr ""
+
 msgid "No"
 msgstr "Ne"
 
@@ -3978,6 +3987,9 @@ msgstr ""
 msgid "No authentication information provided."
 msgstr ""
 
+msgid "No common name specified."
+msgstr ""
+
 msgid "No community name"
 msgstr "Žádný název komunity"
 
@@ -4032,6 +4044,9 @@ msgstr ""
 msgid "No request-id"
 msgstr "Žádný ID požadavek"
 
+msgid "No stored credentials, not valid for name."
+msgstr ""
+
 msgid "No subscription attributes in request."
 msgstr ""
 
@@ -4514,6 +4529,9 @@ msgstr ""
 msgid "Self Adhesive Film"
 msgstr ""
 
+msgid "Self-signed credentials are blocked."
+msgstr ""
+
 msgid "Semi-Gloss Fabric"
 msgstr ""
 
@@ -4975,6 +4993,9 @@ msgstr ""
 msgid "Triple Wall Cardboard"
 msgstr ""
 
+msgid "Trust on first use is disabled."
+msgstr ""
+
 msgid "URI Too Long"
 msgstr "URI je příliš dlouhá"
 
@@ -5095,6 +5116,9 @@ msgstr ""
 msgid "Unable to copy Windows 9x printer driver files (%d)."
 msgstr ""
 
+msgid "Unable to create credentials from array."
+msgstr ""
+
 msgid "Unable to create printer-uri"
 msgstr ""
 

diff --git a/locale/cups_de.po b/locale/cups_de.po
index b5fb99a98db350e51571fac144a37be0f09fa074..83c6011929c5ca95ab70bbd0a315caf1d8323592 100644 (file)
--- 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: 2016-08-08 12:26-0400\n"
+"POT-Creation-Date: 2016-08-25 09:50-0400\n"
 "PO-Revision-Date: 2016-04-22 12:25+0100\n"
 "Last-Translator: Joachim Schwender <joachim.schwender@web.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2957,6 +2957,9 @@ msgstr ""
 msgid "Created"
 msgstr "Erstellt"
 
+msgid "Credentials have expired."
+msgstr ""
+
 msgid "Custom"
 msgstr "Eigene"
 
@@ -4013,6 +4016,12 @@ msgstr "Geschachtelte Klassen sind nicht erlaubt."
 msgid "Never"
 msgstr "Nie"
 
+msgid "New credentials are not valid for name."
+msgstr ""
+
+msgid "New credentials are older than stored credentials."
+msgstr ""
+
 msgid "No"
 msgstr "Nein"
 
@@ -4047,6 +4056,9 @@ msgstr "Keine Attribute in der Anfrage."
 msgid "No authentication information provided."
 msgstr "Keine Authentifizierungsinformation bereitgestellt."
 
+msgid "No common name specified."
+msgstr ""
+
 msgid "No community name"
 msgstr "Kein Community-Name"
 
@@ -4102,6 +4114,9 @@ msgstr "Keine Anfrage gesendet."
 msgid "No request-id"
 msgstr "Keine Anfrage-ID"
 
+msgid "No stored credentials, not valid for name."
+msgstr ""
+
 msgid "No subscription attributes in request."
 msgstr "Keine Subskriptions-Attribute in der Anfrage."
 
@@ -4586,6 +4601,9 @@ msgstr ""
 msgid "Self Adhesive Film"
 msgstr ""
 
+msgid "Self-signed credentials are blocked."
+msgstr ""
+
 msgid "Semi-Gloss Fabric"
 msgstr ""
 
@@ -5060,6 +5078,9 @@ msgstr ""
 msgid "Triple Wall Cardboard"
 msgstr ""
 
+msgid "Trust on first use is disabled."
+msgstr ""
+
 msgid "URI Too Long"
 msgstr "URI zu lang"
 
@@ -5185,6 +5206,9 @@ msgstr ""
 msgid "Unable to copy Windows 9x printer driver files (%d)."
 msgstr "Druckertrieberdateien für Windows 9x können nicht kopiert werden (%d)."
 
+msgid "Unable to create credentials from array."
+msgstr ""
+
 msgid "Unable to create printer-uri"
 msgstr "Drucker-URI kann nicht erzeugt werden"
 

diff --git a/locale/cups_es.po b/locale/cups_es.po
index e78f8f5b68dfc831f9a3a01ad6fb3d5ade4be009..205b6535aed53a4c4b2b4fadf45eff99f5cdc362 100644 (file)
--- 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: 2016-08-08 12:26-0400\n"
+"POT-Creation-Date: 2016-08-25 09:50-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"
@@ -3161,6 +3161,9 @@ msgstr "Carátula"
 msgid "Created"
 msgstr "Creado"
 
+msgid "Credentials have expired."
+msgstr ""
+
 msgid "Custom"
 msgstr "A medida"
 
@@ -4227,6 +4230,12 @@ msgstr "No se permiten clases anidadas."
 msgid "Never"
 msgstr "Nunca"
 
+msgid "New credentials are not valid for name."
+msgstr ""
+
+msgid "New credentials are older than stored credentials."
+msgstr ""
+
 msgid "No"
 msgstr "No"
 
@@ -4261,6 +4270,9 @@ msgstr "No hay atributos en la solicitud."
 msgid "No authentication information provided."
 msgstr "No se ha proporcionado información de autentificación."
 
+msgid "No common name specified."
+msgstr ""
+
 msgid "No community name"
 msgstr "No hay nombre de comunidad"
 
@@ -4317,6 +4329,9 @@ msgstr "No se ha enviado solicitud."
 msgid "No request-id"
 msgstr "No hay request-id"
 
+msgid "No stored credentials, not valid for name."
+msgstr ""
+
 msgid "No subscription attributes in request."
 msgstr "No hay atributos de subscripción en la solicitud."
 
@@ -4800,6 +4815,9 @@ msgstr ""
 msgid "Self Adhesive Film"
 msgstr ""
 
+msgid "Self-signed credentials are blocked."
+msgstr ""
+
 msgid "Semi-Gloss Fabric"
 msgstr ""
 
@@ -5273,6 +5291,9 @@ msgstr "Grapado triple (retrato invertido)"
 msgid "Triple Wall Cardboard"
 msgstr ""
 
+msgid "Trust on first use is disabled."
+msgstr ""
+
 msgid "URI Too Long"
 msgstr "URI demasiado largo"
 
@@ -5405,6 +5426,9 @@ msgstr ""
 "No se han podido copiar los archivos del controlador de impresora de Windows "
 "9x (%d)."
 
+msgid "Unable to create credentials from array."
+msgstr ""
+
 msgid "Unable to create printer-uri"
 msgstr "No se ha podido crear printer-uri"
 
@@ -5786,8 +5810,8 @@ msgstr "Uso: cupstestdsc [opciones] nombre_archivo.ps [... nombre_archivo.ps]"
 msgid ""
 "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]"
 msgstr ""
-"Uso: cupstestppd [opciones] nombre_archivo1.ppd[.gz] [... nombre_archivoN.ppd"
-"[.gz]]"
+"Uso: cupstestppd [opciones] nombre_archivo1.ppd[.gz] [... nombre_archivoN."
+"ppd[.gz]]"
 
 msgid ""
 "Usage: ippfind [options] regtype[,subtype][.domain.] ... [expression]\n"

diff --git a/locale/cups_fr.po b/locale/cups_fr.po
index 0c048c446f114de53ea979495db1659c64ce6695..568e892435956ab195b5c2b7ae7d8704a4d57b56 100644 (file)
--- 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: 2016-08-08 12:26-0400\n"
+"POT-Creation-Date: 2016-08-25 09:50-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"
@@ -2890,6 +2890,9 @@ msgstr ""
 msgid "Created"
 msgstr "Créé"
 
+msgid "Credentials have expired."
+msgstr ""
+
 msgid "Custom"
 msgstr "Personnalisation"
 
@@ -3941,6 +3944,12 @@ msgstr ""
 msgid "Never"
 msgstr "Jamais"
 
+msgid "New credentials are not valid for name."
+msgstr ""
+
+msgid "New credentials are older than stored credentials."
+msgstr ""
+
 msgid "No"
 msgstr "Non"
 
@@ -3975,6 +3984,9 @@ msgstr ""
 msgid "No authentication information provided."
 msgstr ""
 
+msgid "No common name specified."
+msgstr ""
+
 msgid "No community name"
 msgstr "Aucun nom de communauté"
 
@@ -4029,6 +4041,9 @@ msgstr ""
 msgid "No request-id"
 msgstr "Paramètre request-id absent"
 
+msgid "No stored credentials, not valid for name."
+msgstr ""
+
 msgid "No subscription attributes in request."
 msgstr ""
 
@@ -4511,6 +4526,9 @@ msgstr ""
 msgid "Self Adhesive Film"
 msgstr ""
 
+msgid "Self-signed credentials are blocked."
+msgstr ""
+
 msgid "Semi-Gloss Fabric"
 msgstr ""
 
@@ -4977,6 +4995,9 @@ msgstr ""
 msgid "Triple Wall Cardboard"
 msgstr ""
 
+msgid "Trust on first use is disabled."
+msgstr ""
+
 msgid "URI Too Long"
 msgstr "URI trop long"
 
@@ -5097,6 +5118,9 @@ msgstr ""
 msgid "Unable to copy Windows 9x printer driver files (%d)."
 msgstr ""
 
+msgid "Unable to create credentials from array."
+msgstr ""
+
 msgid "Unable to create printer-uri"
 msgstr ""
 

diff --git a/locale/cups_it.po b/locale/cups_it.po
index db4e7eb729222c1e5097d112dcf095f3297cdddb..244208c20b9a36640818e736dee1e3460b4f4b91 100644 (file)
--- 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: 2016-08-08 12:26-0400\n"
+"POT-Creation-Date: 2016-08-25 09:50-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"
@@ -3160,6 +3160,9 @@ msgstr ""
 msgid "Created"
 msgstr "Creato"
 
+msgid "Credentials have expired."
+msgstr ""
+
 msgid "Custom"
 msgstr "Personalizzato"
 
@@ -4227,6 +4230,12 @@ msgstr "Le classi nidificate non sono consentite."
 msgid "Never"
 msgstr "Mai"
 
+msgid "New credentials are not valid for name."
+msgstr ""
+
+msgid "New credentials are older than stored credentials."
+msgstr ""
+
 msgid "No"
 msgstr "No"
 
@@ -4261,6 +4270,9 @@ msgstr "Nessun attributo nella richiesta."
 msgid "No authentication information provided."
 msgstr "Nessuna informazione di autenticazione fornita."
 
+msgid "No common name specified."
+msgstr ""
+
 msgid "No community name"
 msgstr "Nessun nome della comunità"
 
@@ -4317,6 +4329,9 @@ msgstr ""
 msgid "No request-id"
 msgstr "Nessun request-id"
 
+msgid "No stored credentials, not valid for name."
+msgstr ""
+
 msgid "No subscription attributes in request."
 msgstr "Nessun attributo della sottoscrizione nella richiesta."
 
@@ -4801,6 +4816,9 @@ msgstr ""
 msgid "Self Adhesive Film"
 msgstr ""
 
+msgid "Self-signed credentials are blocked."
+msgstr ""
+
 msgid "Semi-Gloss Fabric"
 msgstr ""
 
@@ -5275,6 +5293,9 @@ msgstr ""
 msgid "Triple Wall Cardboard"
 msgstr ""
 
+msgid "Trust on first use is disabled."
+msgstr ""
+
 msgid "URI Too Long"
 msgstr "L'URI è troppo lungo"
 
@@ -5399,6 +5420,9 @@ msgstr "Non è possibile copiare i driver di Windows 2000 della stampante (%d)."
 msgid "Unable to copy Windows 9x printer driver files (%d)."
 msgstr "Non è possibile copiare i driver di Windows 9x della stampante (%d)."
 
+msgid "Unable to create credentials from array."
+msgstr ""
+
 msgid "Unable to create printer-uri"
 msgstr "Non è possibile creare il printer-uri"
 

diff --git a/locale/cups_ja.po b/locale/cups_ja.po
index d28e07fea7bdc86971d039b1b7e64923b184b1b2..7ee964a319bde33d111c4630246a8a741a27e302 100644 (file)
--- 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: 2016-08-08 12:26-0400\n"
+"POT-Creation-Date: 2016-08-25 09:50-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"
@@ -3119,6 +3119,9 @@ msgstr ""
 msgid "Created"
 msgstr "ジョブ作成"
 
+msgid "Credentials have expired."
+msgstr ""
+
 msgid "Custom"
 msgstr "カスタム"
 
@@ -4190,6 +4193,12 @@ msgstr "入れ子になったクラスは許可されていません。"
 msgid "Never"
 msgstr "Never"
 
+msgid "New credentials are not valid for name."
+msgstr ""
+
+msgid "New credentials are older than stored credentials."
+msgstr ""
+
 msgid "No"
 msgstr "いいえ"
 
@@ -4224,6 +4233,9 @@ msgstr "リクエストに属性がありません。"
 msgid "No authentication information provided."
 msgstr "認証情報が提供されていません。"
 
+msgid "No common name specified."
+msgstr ""
+
 msgid "No community name"
 msgstr "コミュニティ名がありません"
 
@@ -4278,6 +4290,9 @@ msgstr "リクエストが送られませんでした。"
 msgid "No request-id"
 msgstr "リクエストID がありません"
 
+msgid "No stored credentials, not valid for name."
+msgstr ""
+
 msgid "No subscription attributes in request."
 msgstr "リクエストにサブスクリプション属性がありません。"
 
@@ -4762,6 +4777,9 @@ msgstr ""
 msgid "Self Adhesive Film"
 msgstr ""
 
+msgid "Self-signed credentials are blocked."
+msgstr ""
+
 msgid "Semi-Gloss Fabric"
 msgstr ""
 
@@ -5230,6 +5248,9 @@ msgstr ""
 msgid "Triple Wall Cardboard"
 msgstr ""
 
+msgid "Trust on first use is disabled."
+msgstr ""
+
 msgid "URI Too Long"
 msgstr "URI が長すぎます"
 
@@ -5352,6 +5373,9 @@ msgid "Unable to copy Windows 9x printer driver files (%d)."
 msgstr ""
 "複数の Windows 9x プリンタードライバーファイルをコピーできません (%d)。"
 
+msgid "Unable to create credentials from array."
+msgstr ""
+
 msgid "Unable to create printer-uri"
 msgstr "printer-uri を作成できません"
 

diff --git a/locale/cups_pt_BR.po b/locale/cups_pt_BR.po
index 62df721c4548969558c757c0187d8748ff5410e5..4e9e5ec1c05f2490cab1a8efd617d64b1746f7f8 100644 (file)
--- 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: 2016-08-08 12:26-0400\n"
+"POT-Creation-Date: 2016-08-25 09:50-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"
@@ -3161,6 +3161,9 @@ msgstr ""
 msgid "Created"
 msgstr "Criada"
 
+msgid "Credentials have expired."
+msgstr ""
+
 msgid "Custom"
 msgstr "Personalizar"
 
@@ -4227,6 +4230,12 @@ msgstr "Classes aninhadas não são permitidas."
 msgid "Never"
 msgstr "Nunca"
 
+msgid "New credentials are not valid for name."
+msgstr ""
+
+msgid "New credentials are older than stored credentials."
+msgstr ""
+
 msgid "No"
 msgstr "Não"
 
@@ -4261,6 +4270,9 @@ msgstr "Nenhum atributo na requisição."
 msgid "No authentication information provided."
 msgstr "Nenhuma informação de autenticação foi fornecida."
 
+msgid "No common name specified."
+msgstr ""
+
 msgid "No community name"
 msgstr "Nenhum nome de comunidade"
 
@@ -4317,6 +4329,9 @@ msgstr "Nenhuma requisição enviada."
 msgid "No request-id"
 msgstr "Nenhum request-id"
 
+msgid "No stored credentials, not valid for name."
+msgstr ""
+
 msgid "No subscription attributes in request."
 msgstr "Nenhum atributo de inscrição na requisição."
 
@@ -4801,6 +4816,9 @@ msgstr ""
 msgid "Self Adhesive Film"
 msgstr ""
 
+msgid "Self-signed credentials are blocked."
+msgstr ""
+
 msgid "Semi-Gloss Fabric"
 msgstr ""
 
@@ -5273,6 +5291,9 @@ msgstr ""
 msgid "Triple Wall Cardboard"
 msgstr ""
 
+msgid "Trust on first use is disabled."
+msgstr ""
+
 msgid "URI Too Long"
 msgstr "URI muito longa"
 
@@ -5401,6 +5422,9 @@ msgid "Unable to copy Windows 9x printer driver files (%d)."
 msgstr ""
 "Não foi possível copiar arquivos de driver de impressora (%d) de Windows 9x."
 
+msgid "Unable to create credentials from array."
+msgstr ""
+
 msgid "Unable to create printer-uri"
 msgstr "Não foi possível criar uri de impressora"
 

diff --git a/locale/cups_ru.po b/locale/cups_ru.po
index 6b41ba8ba06c542fe0bade92f53cadc73db8a5d9..e0de8bfadc4649de4e451f465bea88b0a4368309 100644 (file)
--- 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: 2016-08-08 12:26-0400\n"
+"POT-Creation-Date: 2016-08-25 09:50-0400\n"
 "PO-Revision-Date: 2015-01-28 12:00-0800\n"
 "Last-Translator: Aleksandr Proklov\n"
 "Language-Team: PuppyRus Linux Team\n"
@@ -3093,6 +3093,9 @@ msgstr ""
 msgid "Created"
 msgstr "Создано"
 
+msgid "Credentials have expired."
+msgstr ""
+
 msgid "Custom"
 msgstr "Индивидуальный"
 
@@ -4153,6 +4156,12 @@ msgstr "Вложенные группы не допускаются."
 msgid "Never"
 msgstr "Никогда"
 
+msgid "New credentials are not valid for name."
+msgstr ""
+
+msgid "New credentials are older than stored credentials."
+msgstr ""
+
 msgid "No"
 msgstr "Нет"
 
@@ -4187,6 +4196,9 @@ msgstr "Нет атрибутов в запросе."
 msgid "No authentication information provided."
 msgstr "Нет информации для проверки подлинности."
 
+msgid "No common name specified."
+msgstr ""
+
 msgid "No community name"
 msgstr "Нет имени сообщества"
 
@@ -4242,6 +4254,9 @@ msgstr "Не отправлен запрос."
 msgid "No request-id"
 msgstr "Нет идентификатора request-id"
 
+msgid "No stored credentials, not valid for name."
+msgstr ""
+
 msgid "No subscription attributes in request."
 msgstr "Нет атрибутов подписки в запросе."
 
@@ -4727,6 +4742,9 @@ msgstr ""
 msgid "Self Adhesive Film"
 msgstr ""
 
+msgid "Self-signed credentials are blocked."
+msgstr ""
+
 msgid "Semi-Gloss Fabric"
 msgstr ""
 
@@ -5191,6 +5209,9 @@ msgstr ""
 msgid "Triple Wall Cardboard"
 msgstr ""
 
+msgid "Trust on first use is disabled."
+msgstr ""
+
 msgid "URI Too Long"
 msgstr "Слишком длинный адрес URI"
 
@@ -5314,6 +5335,9 @@ msgstr "Не удается копировать файлы драйвера п
 msgid "Unable to copy Windows 9x printer driver files (%d)."
 msgstr "Не удается копировать файлы драйвера принтера Windows 9x (%d)"
 
+msgid "Unable to create credentials from array."
+msgstr ""
+
 msgid "Unable to create printer-uri"
 msgstr "Не удается создать printer-uri"