From: Michael Sweet Date: Fri, 8 Dec 2017 23:43:06 +0000 (-0500) Subject: Add missing HTTP status message for 302 (moved temporarily). X-Git-Tag: v2.3b1~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa0309120dba2ea538ea7c1bc1eeb6d42bbd3a89;p=thirdparty%2Fcups.git Add missing HTTP status message for 302 (moved temporarily). --- diff --git a/cups/http-support.c b/cups/http-support.c index 95135e0493..c49df399bb 100644 --- a/cups/http-support.c +++ b/cups/http-support.c @@ -1351,6 +1351,9 @@ _httpStatus(cups_lang_t *lang, /* I - Language */ case HTTP_STATUS_MOVED_PERMANENTLY : s = _("Moved Permanently"); break; + case HTTP_STATUS_MOVED_TEMPORARILY : + s = _("Moved Temporarily"); + break; case HTTP_STATUS_SEE_OTHER : s = _("See Other"); break; diff --git a/locale/cups.pot b/locale/cups.pot index 5c380ffe1a..cd2d992ea4 100644 --- a/locale/cups.pot +++ b/locale/cups.pot @@ -26,9 +26,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: CUPS 2.2.6\n" +"Project-Id-Version: CUPS 2.3b1\n" "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n" -"POT-Creation-Date: 2017-12-01 17:00-0500\n" +"POT-Creation-Date: 2017-12-08 18:41-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1834,7 +1834,7 @@ msgstr "" #: cups/langprintf.c:69 scheduler/cupsfilter.c:720 systemv/lpadmin.c:786 #: systemv/lpadmin.c:837 systemv/lpadmin.c:887 systemv/lpadmin.c:943 #: systemv/lpadmin.c:1041 systemv/lpadmin.c:1093 systemv/lpadmin.c:1149 -#: systemv/lpadmin.c:1564 +#: systemv/lpadmin.c:1587 #, c-format msgid "%s: %s" msgstr "" @@ -1844,7 +1844,7 @@ msgstr "" msgid "%s: %s failed: %s" msgstr "" -#: systemv/lpadmin.c:1199 +#: systemv/lpadmin.c:1210 #, c-format msgid "%s: Bad printer URI \"%s\"." msgstr "" @@ -2112,7 +2112,7 @@ msgstr "" msgid "%s: Sorry, no encryption support." msgstr "" -#: systemv/lpadmin.c:1206 +#: systemv/lpadmin.c:1217 #, c-format msgid "%s: Unable to connect to \"%s:%d\": %s" msgstr "" @@ -2128,7 +2128,7 @@ msgstr "" msgid "%s: Unable to contact server." msgstr "" -#: systemv/lpadmin.c:1219 +#: systemv/lpadmin.c:1242 #, c-format msgid "%s: Unable to create PPD file: %s" msgstr "" @@ -2158,7 +2158,7 @@ msgstr "" msgid "%s: Unable to read MIME database from \"%s\" or \"%s\"." msgstr "" -#: systemv/lpadmin.c:1190 +#: systemv/lpadmin.c:1201 #, c-format msgid "%s: Unable to resolve \"%s\"." msgstr "" @@ -3320,7 +3320,7 @@ msgstr "" msgid "Bad PPD file." msgstr "" -#: cups/http-support.c:1361 +#: cups/http-support.c:1364 msgid "Bad Request" msgstr "" @@ -3332,7 +3332,7 @@ msgstr "" msgid "Bad UIConstraints" msgstr "" -#: cups/hash.c:47 cups/http-support.c:1455 +#: cups/hash.c:47 cups/http-support.c:1458 msgid "Bad arguments to function" msgstr "" @@ -3345,7 +3345,7 @@ msgstr "" msgid "Bad custom parameter" msgstr "" -#: cups/http-support.c:1595 scheduler/ipp.c:2407 +#: cups/http-support.c:1598 scheduler/ipp.c:2407 #, c-format msgid "Bad device-uri \"%s\"." msgstr "" @@ -3369,7 +3369,7 @@ msgstr "" msgid "Bad filename buffer" msgstr "" -#: cups/http-support.c:1464 +#: cups/http-support.c:1467 msgid "Bad hostname/address in URI" msgstr "" @@ -3432,7 +3432,7 @@ msgstr "" msgid "Bad page-ranges values %d-%d." msgstr "" -#: cups/http-support.c:1461 +#: cups/http-support.c:1464 msgid "Bad port number in URI" msgstr "" @@ -3465,15 +3465,15 @@ msgstr "" msgid "Bad requesting-user-name value: %s" msgstr "" -#: cups/http-support.c:1458 +#: cups/http-support.c:1461 msgid "Bad resource in URI" msgstr "" -#: cups/http-support.c:1470 +#: cups/http-support.c:1473 msgid "Bad scheme in URI" msgstr "" -#: cups/http-support.c:1467 +#: cups/http-support.c:1470 msgid "Bad username in URI" msgstr "" @@ -3481,7 +3481,7 @@ msgstr "" msgid "Bad value string" msgstr "" -#: cups/http-support.c:1473 +#: cups/http-support.c:1476 msgid "Bad/empty URI" msgstr "" @@ -4051,7 +4051,7 @@ msgstr "" msgid "Executive" msgstr "" -#: cups/http-support.c:1389 +#: cups/http-support.c:1392 msgid "Expectation Failed" msgstr "" @@ -4129,7 +4129,7 @@ msgstr "" msgid "Folio" msgstr "" -#: cups/http-support.c:1368 +#: cups/http-support.c:1371 msgid "Forbidden" msgstr "" @@ -4312,7 +4312,7 @@ msgstr "" msgid "Intellitech" msgstr "" -#: cups/http-support.c:1395 +#: cups/http-support.c:1398 msgid "Internal Server Error" msgstr "" @@ -4556,7 +4556,7 @@ msgstr "" msgid "Long-Edge (Portrait)" msgstr "" -#: cups/http-support.c:1722 +#: cups/http-support.c:1725 msgid "Looking for printer." msgstr "" @@ -4648,11 +4648,11 @@ msgstr "" msgid "Missing required attributes." msgstr "" -#: cups/http-support.c:1485 +#: cups/http-support.c:1488 msgid "Missing resource in URI" msgstr "" -#: cups/http-support.c:1479 +#: cups/http-support.c:1482 msgid "Missing scheme in URI" msgstr "" @@ -4673,7 +4673,7 @@ msgstr "" msgid "Missing y-dimension in media-size." msgstr "" -#: systemv/lpinfo.c:439 +#: systemv/lpinfo.c:439 systemv/lpinfo.c:463 #, c-format msgid "" "Model: name = %s\n" @@ -4706,6 +4706,10 @@ msgstr "" msgid "Moved Permanently" msgstr "" +#: cups/http-support.c:1355 +msgid "Moved Temporarily" +msgstr "" + #: cups/ppd.c:303 msgid "NULL PPD file pointer" msgstr "" @@ -4894,11 +4898,11 @@ msgstr "" msgid "Normal" msgstr "" -#: cups/http-support.c:1371 +#: cups/http-support.c:1374 msgid "Not Found" msgstr "" -#: cups/http-support.c:1383 +#: cups/http-support.c:1386 msgid "Not Implemented" msgstr "" @@ -4906,11 +4910,11 @@ msgstr "" msgid "Not Installed" msgstr "" -#: cups/http-support.c:1358 +#: cups/http-support.c:1361 msgid "Not Modified" msgstr "" -#: cups/http-support.c:1386 +#: cups/http-support.c:1389 msgid "Not Supported" msgstr "" @@ -4926,7 +4930,7 @@ msgstr "" msgid "Note: this program only validates the DSC comments, not the PostScript itself." msgstr "" -#: cups/http-support.c:1340 cups/http-support.c:1476 cups/ppd.c:301 +#: cups/http-support.c:1340 cups/http-support.c:1479 cups/ppd.c:301 msgid "OK" msgstr "" @@ -5291,7 +5295,7 @@ msgstr "" msgid "Reprint After Error" msgstr "" -#: cups/http-support.c:1374 +#: cups/http-support.c:1377 msgid "Request Entity Too Large" msgstr "" @@ -5324,11 +5328,11 @@ msgstr "" msgid "SEQUENCE uses indefinite length" msgstr "" -#: cups/http-support.c:1398 +#: cups/http-support.c:1401 msgid "SSL/TLS Negotiation Error" msgstr "" -#: cups/http-support.c:1355 +#: cups/http-support.c:1358 msgid "See Other" msgstr "" @@ -5360,11 +5364,11 @@ msgstr "" msgid "Server Stopped" msgstr "" -#: cups/tls-darwin.c:1185 cups/tls-gnutls.c:1271 +#: cups/tls-darwin.c:1185 cups/tls-gnutls.c:1273 msgid "Server credentials not set." msgstr "" -#: cups/http-support.c:1392 +#: cups/http-support.c:1395 msgid "Service Unavailable" msgstr "" @@ -5732,11 +5736,11 @@ msgstr "" msgid "Trust on first use is disabled." msgstr "" -#: cups/http-support.c:1377 +#: cups/http-support.c:1380 msgid "URI Too Long" msgstr "" -#: cups/http-support.c:1452 +#: cups/http-support.c:1455 msgid "URI too large" msgstr "" @@ -5898,7 +5902,7 @@ msgstr "" msgid "Unable to create printer." msgstr "" -#: cups/tls-darwin.c:1476 cups/tls-gnutls.c:1483 +#: cups/tls-darwin.c:1476 cups/tls-gnutls.c:1485 msgid "Unable to create server credentials." msgstr "" @@ -5950,7 +5954,7 @@ msgstr "" msgid "Unable to establish a secure connection to host (untrusted certificate)." msgstr "" -#: cups/tls-darwin.c:1675 cups/tls-sspi.c:1275 cups/tls-sspi.c:1292 +#: cups/tls-darwin.c:1675 cups/tls-sspi.c:1277 cups/tls-sspi.c:1294 msgid "Unable to establish a secure connection to host." msgstr "" @@ -5958,7 +5962,7 @@ msgstr "" msgid "Unable to find destination for job" msgstr "" -#: cups/http-support.c:1946 +#: cups/http-support.c:1949 msgid "Unable to find printer." msgstr "" @@ -6083,7 +6087,7 @@ msgstr "" msgid "Unable to rename job document file." msgstr "" -#: cups/dest.c:3449 +#: cups/dest.c:3432 msgid "Unable to resolve printer-uri." msgstr "" @@ -6138,7 +6142,7 @@ msgstr "" msgid "Unable to write uncompressed print data: %s" msgstr "" -#: cups/http-support.c:1365 +#: cups/http-support.c:1368 msgid "Unauthorized" msgstr "" @@ -6146,7 +6150,7 @@ msgstr "" msgid "Units" msgstr "" -#: cups/http-support.c:1405 cups/http-support.c:1489 cups/ppd.c:329 +#: cups/http-support.c:1408 cups/http-support.c:1492 cups/ppd.c:329 msgid "Unknown" msgstr "" @@ -6211,7 +6215,7 @@ msgstr "" msgid "Unknown request version." msgstr "" -#: cups/http-support.c:1482 +#: cups/http-support.c:1485 msgid "Unknown scheme in URI" msgstr "" @@ -6295,7 +6299,7 @@ msgstr "" msgid "Unsupported value type" msgstr "" -#: cups/http-support.c:1380 +#: cups/http-support.c:1383 msgid "Upgrade Required" msgstr "" @@ -6423,7 +6427,7 @@ msgstr "" msgid "Warning, no Windows 2000 printer drivers are installed." msgstr "" -#: cups/http-support.c:1401 +#: cups/http-support.c:1404 msgid "Web Interface is Disabled" msgstr "" @@ -6832,7 +6836,7 @@ msgstr "" msgid "lpadmin: Unable to connect to server: %s" msgstr "" -#: systemv/lpadmin.c:1410 +#: systemv/lpadmin.c:1433 msgid "lpadmin: Unable to create temporary file" msgstr "" @@ -6842,12 +6846,12 @@ msgid "" " You must specify a printer name first." msgstr "" -#: systemv/lpadmin.c:1402 +#: systemv/lpadmin.c:1425 #, c-format msgid "lpadmin: Unable to open PPD \"%s\": %s on line %d." msgstr "" -#: systemv/lpadmin.c:1422 +#: systemv/lpadmin.c:1445 #, c-format msgid "lpadmin: Unable to open PPD file \"%s\" - %s" msgstr "" diff --git a/locale/cups.strings b/locale/cups.strings index 1063d38378..dfb700cdd1 100644 --- a/locale/cups.strings +++ b/locale/cups.strings @@ -1032,6 +1032,7 @@ "Move All Jobs" = "Move All Jobs"; "Move Job" = "Move Job"; "Moved Permanently" = "Moved Permanently"; +"Moved Temporarily" = "Moved Temporarily"; "NULL PPD file pointer" = "NULL PPD file pointer"; "Name OID uses indefinite length" = "Name OID uses indefinite length"; "Nested classes are not allowed." = "Nested classes are not allowed."; diff --git a/locale/cups_ca.po b/locale/cups_ca.po index 59251e0419..5492f458f1 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: https://github.com/apple/cups/issues\n" -"POT-Creation-Date: 2017-12-01 17:00-0500\n" +"POT-Creation-Date: 2017-12-08 18:41-0500\n" "PO-Revision-Date: 2012-09-29 11:21+0200\n" "Last-Translator: Àngel Mompó \n" "Language-Team: Catalan \n" @@ -3822,6 +3822,9 @@ msgstr "Mou la feina" msgid "Moved Permanently" msgstr "S'ha mogut de manera permanent" +msgid "Moved Temporarily" +msgstr "" + msgid "NULL PPD file pointer" msgstr "Punter del fitxer PPD NUL" diff --git a/locale/cups_cs.po b/locale/cups_cs.po index fdf80797ed..6bccb15bab 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: https://github.com/apple/cups/issues\n" -"POT-Creation-Date: 2017-12-01 17:00-0500\n" +"POT-Creation-Date: 2017-12-08 18:41-0500\n" "PO-Revision-Date: 2012-09-14 10:26+0100\n" "Last-Translator: Jan Bartos \n" "Language-Team: Czech\n" @@ -3613,6 +3613,9 @@ msgstr "Přesun úlohy" msgid "Moved Permanently" msgstr "Trvale přesunuto" +msgid "Moved Temporarily" +msgstr "" + msgid "NULL PPD file pointer" msgstr "Prázdný ukazatel PPD souboru" diff --git a/locale/cups_de.po b/locale/cups_de.po index b06577b62c..b431145e3b 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: https://github.com/apple/cups/issues\n" -"POT-Creation-Date: 2017-12-01 17:00-0500\n" +"POT-Creation-Date: 2017-12-08 18:41-0500\n" "PO-Revision-Date: 2017-10-25 14:57+0200\n" "Last-Translator: Michael Weghorn \n" "Language-Team: LANGUAGE \n" @@ -3694,6 +3694,9 @@ msgstr "Druckauftrag verschieben" msgid "Moved Permanently" msgstr "Dauerhaft verschoben" +msgid "Moved Temporarily" +msgstr "" + msgid "NULL PPD file pointer" msgstr "NULL PPD File Pointer" diff --git a/locale/cups_es.po b/locale/cups_es.po index af4c0ee4a8..b097317c4b 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: https://github.com/apple/cups/issues\n" -"POT-Creation-Date: 2017-12-01 17:00-0500\n" +"POT-Creation-Date: 2017-12-08 18:41-0500\n" "PO-Revision-Date: 2016-06-26 21:17+0100\n" "Last-Translator: Juan Pablo González Riopedre \n" "Language-Team: Spanish\n" @@ -3849,6 +3849,9 @@ msgstr "Mover trabajo" msgid "Moved Permanently" msgstr "Movido permanentemente" +msgid "Moved Temporarily" +msgstr "" + msgid "NULL PPD file pointer" msgstr "Puntero de archivo PPD NULO" diff --git a/locale/cups_fr.po b/locale/cups_fr.po index 3586c7a01a..422c3bb3f4 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: https://github.com/apple/cups/issues\n" -"POT-Creation-Date: 2017-12-01 17:00-0500\n" +"POT-Creation-Date: 2017-12-08 18:41-0500\n" "PO-Revision-Date: 2012-12-12 11:12+0100\n" "Last-Translator: Stéphane Blondon \n" "Language-Team: LANGUAGE \n" @@ -3675,6 +3675,9 @@ msgstr "Transférer la tâche" msgid "Moved Permanently" msgstr "Transférées de façon permanente" +msgid "Moved Temporarily" +msgstr "" + msgid "NULL PPD file pointer" msgstr "Pointeur de fichier PPD NULL." diff --git a/locale/cups_it.po b/locale/cups_it.po index 0d18ab8ee1..3c67f246e1 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: https://github.com/apple/cups/issues\n" -"POT-Creation-Date: 2017-12-01 17:00-0500\n" +"POT-Creation-Date: 2017-12-08 18:41-0500\n" "PO-Revision-Date: 2013-07-14 12:00+0200\n" "Last-Translator: Giovanni Scafora \n" "Language-Team: Arch Linux Italian Team \n" @@ -3847,6 +3847,9 @@ msgstr "Sposta il processo" msgid "Moved Permanently" msgstr "Spostato in modo permanente" +msgid "Moved Temporarily" +msgstr "" + msgid "NULL PPD file pointer" msgstr "Puntatore del file PPD NULL" diff --git a/locale/cups_ja.po b/locale/cups_ja.po index 946a609611..f910c0659b 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: https://github.com/apple/cups/issues\n" -"POT-Creation-Date: 2017-12-01 17:00-0500\n" +"POT-Creation-Date: 2017-12-08 18:41-0500\n" "PO-Revision-Date: 2014-11-15 19:27+0900\n" "Last-Translator: OPFC TRANSCUPS \n" "Language-Team: OPFC TRANSCUPS \n" @@ -3821,6 +3821,9 @@ msgstr "ジョブの移動" msgid "Moved Permanently" msgstr "別の場所へ移動しました" +msgid "Moved Temporarily" +msgstr "" + msgid "NULL PPD file pointer" msgstr "PPD ファイルポインターが NULL です" diff --git a/locale/cups_pt_BR.po b/locale/cups_pt_BR.po index b4d3e88d96..9ad7037b7d 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: https://github.com/apple/cups/issues\n" -"POT-Creation-Date: 2017-12-01 17:00-0500\n" +"POT-Creation-Date: 2017-12-08 18:41-0500\n" "PO-Revision-Date: 2016-01-31 16:45-0200\n" "Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" @@ -3850,6 +3850,9 @@ msgstr "Mover trabalho" msgid "Moved Permanently" msgstr "Mover permanentemente" +msgid "Moved Temporarily" +msgstr "" + msgid "NULL PPD file pointer" msgstr "Ponteiro NULO para arquivo PPD" diff --git a/locale/cups_ru.po b/locale/cups_ru.po index 3ecd984351..dadf7a79ab 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: https://github.com/apple/cups/issues\n" -"POT-Creation-Date: 2017-12-01 17:00-0500\n" +"POT-Creation-Date: 2017-12-08 18:41-0500\n" "PO-Revision-Date: 2015-01-28 12:00-0800\n" "Last-Translator: Aleksandr Proklov\n" "Language-Team: PuppyRus Linux Team\n" @@ -3778,6 +3778,9 @@ msgstr "Переместить задание" msgid "Moved Permanently" msgstr "Перемещено окончательно" +msgid "Moved Temporarily" +msgstr "" + msgid "NULL PPD file pointer" msgstr "Указатель PPD-файла установлен на NULL" diff --git a/locale/cups_zh_CN.po b/locale/cups_zh_CN.po index 62dd9e1b6c..37c73f47bd 100644 --- a/locale/cups_zh_CN.po +++ b/locale/cups_zh_CN.po @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.6\n" "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n" -"POT-Creation-Date: 2017-12-01 17:00-0500\n" +"POT-Creation-Date: 2017-12-08 18:41-0500\n" "PO-Revision-Date: 2017-06-11 12:38+0800\n" "Last-Translator: Mingcong Bai \n" "Language-Team: \n" @@ -3760,6 +3760,9 @@ msgstr "移动任务" msgid "Moved Permanently" msgstr "已永久移动" +msgid "Moved Temporarily" +msgstr "" + msgid "NULL PPD file pointer" msgstr "PPD 文件指针为 NULL"