From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Fri, 9 May 2014 21:25:04 +0000 (+0000)
Subject: Add localized error message for failed TLS negotiation.
X-Git-Tag: v2.2b1~636
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;ds=sidebyside;h=4cecbbe83692e1bb7eb225515b6792867b26fa0c;p=thirdparty%2Fcups.git

Add localized error message for failed TLS negotiation.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11872 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/cups/http.c b/cups/http.c
index 377610e78..39d1e7947 100644
--- a/cups/http.c
+++ b/cups/http.c
@@ -4605,6 +4605,7 @@ http_tls_upgrade(http_t *http)		/* I - HTTP connection */
 
     DEBUG_puts("8http_tls_upgrade: Server does not support HTTP upgrade!");
 
+    _cupsSetError(IPP_STATUS_ERROR_CUPS_PKI, _("Encryption is not supported."), 1);
     httpAddrClose(NULL, http->fd);
 
     http->fd = -1;
diff --git a/locale/cups.pot b/locale/cups.pot
index 20eb432fd..070cad210 100644
--- a/locale/cups.pot
+++ b/locale/cups.pot
@@ -30,7 +30,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2014-05-08 15:57-0700\n"
+"POT-Creation-Date: 2014-05-09 14:24-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3403,7 +3403,7 @@ msgstr ""
 msgid "Cancel RSS Subscription"
 msgstr ""
 
-#: backend/ipp.c:2182
+#: backend/ipp.c:2183
 msgid "Canceling print job."
 msgstr ""
 
@@ -3608,6 +3608,10 @@ msgstr ""
 msgid "Empty PPD file."
 msgstr ""
 
+#: cups/http.c:4608
+msgid "Encryption is not supported."
+msgstr ""
+
 #. TRANSLATORS: Banner/cover sheet after the print job.
 #: cgi-bin/admin.c:3541
 msgid "Ending Banner"
@@ -4572,7 +4576,7 @@ msgstr ""
 msgid "No Windows printer drivers are installed."
 msgstr ""
 
-#: cups/request.c:570 cups/request.c:919
+#: cups/request.c:570 cups/request.c:933
 msgid "No active connection"
 msgstr ""
 
@@ -4970,15 +4974,15 @@ msgstr ""
 msgid "Print file sent."
 msgstr ""
 
-#: backend/ipp.c:2156
+#: backend/ipp.c:2157
 msgid "Print job canceled at printer."
 msgstr ""
 
-#: backend/ipp.c:2148
+#: backend/ipp.c:2149
 msgid "Print job too large."
 msgstr ""
 
-#: backend/ipp.c:1626
+#: backend/ipp.c:1627
 msgid "Print job was not accepted."
 msgstr ""
 
@@ -5006,11 +5010,11 @@ msgstr ""
 msgid "Printer Settings"
 msgstr ""
 
-#: backend/ipp.c:2151
+#: backend/ipp.c:2152
 msgid "Printer cannot print supplied content."
 msgstr ""
 
-#: backend/ipp.c:2154
+#: backend/ipp.c:2155
 msgid "Printer cannot print with supplied options."
 msgstr ""
 
@@ -5328,7 +5332,7 @@ msgid "The printer did not respond."
 msgstr ""
 
 #: backend/ipp.c:810 backend/ipp.c:929 backend/ipp.c:1043 backend/ipp.c:1434
-#: backend/ipp.c:1598 backend/lpd.c:836 backend/socket.c:379
+#: backend/ipp.c:1599 backend/lpd.c:836 backend/socket.c:379
 #: backend/usb-unix.c:124 backend/usb-unix.c:414 backend/usb-unix.c:497
 msgid "The printer is in use."
 msgstr ""
@@ -5554,7 +5558,7 @@ msgstr ""
 msgid "Unable to add class"
 msgstr ""
 
-#: backend/ipp.c:1780
+#: backend/ipp.c:1781
 msgid "Unable to add document to print job."
 msgstr ""
 
@@ -5583,7 +5587,7 @@ msgstr ""
 msgid "Unable to cancel RSS subscription"
 msgstr ""
 
-#: backend/ipp.c:2061 backend/ipp.c:2496
+#: backend/ipp.c:2062 backend/ipp.c:2497
 msgid "Unable to cancel print job."
 msgstr ""
 
@@ -5613,7 +5617,7 @@ msgstr ""
 msgid "Unable to configure printer options."
 msgstr ""
 
-#: cups/adminutil.c:900 cups/request.c:1052
+#: cups/adminutil.c:900 cups/request.c:1066
 msgid "Unable to connect to host."
 msgstr ""
 
@@ -5734,7 +5738,7 @@ msgstr ""
 msgid "Unable to find server credentials."
 msgstr ""
 
-#: backend/ipp.c:3474
+#: backend/ipp.c:3475
 msgid "Unable to get backend exit status."
 msgstr ""
 
@@ -5827,7 +5831,7 @@ msgstr ""
 msgid "Unable to open help file."
 msgstr ""
 
-#: backend/ipp.c:376 backend/ipp.c:1527 backend/ipp.c:1735 backend/lpd.c:496
+#: backend/ipp.c:376 backend/ipp.c:1528 backend/ipp.c:1736 backend/lpd.c:496
 #: backend/socket.c:150 backend/usb.c:237 filter/gziptoany.c:67
 #: filter/pstops.c:267
 msgid "Unable to open print file"
@@ -5881,7 +5885,7 @@ msgstr ""
 msgid "Unable to set server default"
 msgstr ""
 
-#: backend/ipp.c:3333 backend/ipp.c:3410 backend/ipp.c:3418
+#: backend/ipp.c:3334 backend/ipp.c:3411 backend/ipp.c:3419
 msgid "Unable to start backend process."
 msgstr ""
 
@@ -6174,7 +6178,7 @@ msgstr ""
 msgid "Version uses indefinite length"
 msgstr ""
 
-#: backend/ipp.c:1897
+#: backend/ipp.c:1898
 msgid "Waiting for job to complete."
 msgstr ""
 
diff --git a/locale/cups.strings b/locale/cups.strings
index 7e8d5eba9..0d6d53308 100644
--- a/locale/cups.strings
+++ b/locale/cups.strings
@@ -773,6 +773,7 @@
 "EPL2 Label Printer" = "EPL2 Label Printer";
 "Edit Configuration File" = "Edit Configuration File";
 "Empty PPD file." = "Empty PPD file.";
+"Encryption is not supported." = "Encryption is not supported.";
 // TRANSLATORS: Banner/cover sheet after the print job.
 "Ending Banner" = "Ending Banner";
 "English" = "English";
diff --git a/locale/cups_ca.po b/locale/cups_ca.po
index 18a677f99..cd2110f68 100644
--- a/locale/cups_ca.po
+++ b/locale/cups_ca.po
@@ -32,7 +32,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.4.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2014-05-08 15:57-0700\n"
+"POT-Creation-Date: 2014-05-09 14:24-0700\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"
@@ -2981,6 +2981,9 @@ msgstr "Edita el fitxer de configuració"
 msgid "Empty PPD file."
 msgstr "El fitxer PPD és buit."
 
+msgid "Encryption is not supported."
+msgstr ""
+
 #. TRANSLATORS: Banner/cover sheet after the print job.
 msgid "Ending Banner"
 msgstr "S'està acabant el bàner"
diff --git a/locale/cups_cs.po b/locale/cups_cs.po
index 76fb4f5ab..5efe5be3d 100644
--- a/locale/cups_cs.po
+++ b/locale/cups_cs.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2014-05-08 15:57-0700\n"
+"POT-Creation-Date: 2014-05-09 14:24-0700\n"
 "PO-Revision-Date: 2012-09-14 10:26+0100\n"
 "Last-Translator: Jan Bartos <jan.bartos@madeta.cz>\n"
 "Language-Team: Czech\n"
@@ -2779,6 +2779,9 @@ msgstr "Úprava konfiguračního souboru"
 msgid "Empty PPD file."
 msgstr ""
 
+msgid "Encryption is not supported."
+msgstr ""
+
 #. TRANSLATORS: Banner/cover sheet after the print job.
 msgid "Ending Banner"
 msgstr "Ukončení baneru"
diff --git a/locale/cups_es.po b/locale/cups_es.po
index b12e2d595..499a86120 100644
--- a/locale/cups_es.po
+++ b/locale/cups_es.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2014-05-08 15:57-0700\n"
+"POT-Creation-Date: 2014-05-09 14:24-0700\n"
 "PO-Revision-Date: 2012-07-01 20:21+0100\n"
 "Last-Translator: Juan Pablo González Riopedre <riopedre13@yahoo.es>\n"
 "Language-Team: Spanish\n"
@@ -2970,6 +2970,9 @@ msgstr "Editar archivo de configuración"
 msgid "Empty PPD file."
 msgstr "Archivo PPD vacío."
 
+msgid "Encryption is not supported."
+msgstr ""
+
 #. TRANSLATORS: Banner/cover sheet after the print job.
 msgid "Ending Banner"
 msgstr "Rótulo final"
diff --git a/locale/cups_fr.po b/locale/cups_fr.po
index 76700f761..c2a8e6bef 100644
--- a/locale/cups_fr.po
+++ b/locale/cups_fr.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2014-05-08 15:57-0700\n"
+"POT-Creation-Date: 2014-05-09 14:24-0700\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"
@@ -2779,6 +2779,9 @@ msgstr "Modifier le fichier de configuration"
 msgid "Empty PPD file."
 msgstr ""
 
+msgid "Encryption is not supported."
+msgstr ""
+
 #. TRANSLATORS: Banner/cover sheet after the print job.
 msgid "Ending Banner"
 msgstr "Fin de la bannière"
diff --git a/locale/cups_it.po b/locale/cups_it.po
index 1ded3aea4..96d2ee000 100644
--- a/locale/cups_it.po
+++ b/locale/cups_it.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.6\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2014-05-08 15:57-0700\n"
+"POT-Creation-Date: 2014-05-09 14:24-0700\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"
@@ -3057,6 +3057,9 @@ msgstr "Edita il file di configurazione"
 msgid "Empty PPD file."
 msgstr "Il file PPD è vuoto."
 
+msgid "Encryption is not supported."
+msgstr ""
+
 #. TRANSLATORS: Banner/cover sheet after the print job.
 msgid "Ending Banner"
 msgstr "Termine del banner"
diff --git a/locale/cups_ja.po b/locale/cups_ja.po
index 6f421abf4..787a2be99 100644
--- a/locale/cups_ja.po
+++ b/locale/cups_ja.po
@@ -28,7 +28,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.7\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2014-05-08 15:57-0700\n"
+"POT-Creation-Date: 2014-05-09 14:24-0700\n"
 "PO-Revision-Date: 2013-08-19 11:51+0900\n"
 "Last-Translator: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"
 "Language-Team: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n"
@@ -3013,6 +3013,9 @@ msgstr "設定ファイルの編集"
 msgid "Empty PPD file."
 msgstr "PPD ファイルが空です。"
 
+msgid "Encryption is not supported."
+msgstr ""
+
 #. TRANSLATORS: Banner/cover sheet after the print job.
 msgid "Ending Banner"
 msgstr "終了バナー"
diff --git a/locale/cups_ru.po b/locale/cups_ru.po
index 3285d797b..c12c7b654 100644
--- a/locale/cups_ru.po
+++ b/locale/cups_ru.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 1.4\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
-"POT-Creation-Date: 2014-05-08 15:57-0700\n"
+"POT-Creation-Date: 2014-05-09 14:24-0700\n"
 "PO-Revision-Date: 2009-02-16 12:00-0800\n"
 "Last-Translator: Apple Inc.\n"
 "Language-Team: Apple Inc.\n"
@@ -2752,6 +2752,9 @@ msgstr "Редактировать файл конфигурации"
 msgid "Empty PPD file."
 msgstr ""
 
+msgid "Encryption is not supported."
+msgstr ""
+
 #. TRANSLATORS: Banner/cover sheet after the print job.
 msgid "Ending Banner"
 msgstr "Конечный баннер"