Rename HTTP_STATUS_REDIRECT_TEMPORARILY to HTTP_STATUS_FOUND, to match RFC 7231.

(still have a define for the old name...)

diff --git a/cups/http-support.c b/cups/http-support.c
index c49df399bb54057326a0794b9195176859e3860c..ca8fc87a194bad8a4b2fa00e675c76a84f914210 100644 (file)
--- a/cups/http-support.c
+++ b/cups/http-support.c
@@ -1351,8 +1351,8 @@ _httpStatus(cups_lang_t   *lang,  /* I - Language */
     case HTTP_STATUS_MOVED_PERMANENTLY :
         s = _("Moved Permanently");
        break;
-    case HTTP_STATUS_MOVED_TEMPORARILY :
-        s = _("Moved Temporarily");
+    case HTTP_STATUS_FOUND :
+        s = _("Found");
        break;
     case HTTP_STATUS_SEE_OTHER :
         s = _("See Other");

diff --git a/cups/http.h b/cups/http.h
index 16bda9835e86894e1e8a9ae5ecf1c1f8707e7298..0cb26eb344a6b759b285d7a2f142ce0a4d7fe613 100644 (file)
--- a/cups/http.h
+++ b/cups/http.h
@@ -242,10 +242,11 @@ typedef enum http_status_e                /**** HTTP status codes ****/
 
   HTTP_STATUS_MULTIPLE_CHOICES = 300,  /* Multiple files match request */
   HTTP_STATUS_MOVED_PERMANENTLY,       /* Document has moved permanently */
-  HTTP_STATUS_MOVED_TEMPORARILY,       /* Document has moved temporarily */
-  HTTP_STATUS_SEE_OTHER,               /* See this other link... */
+  HTTP_STATUS_FOUND,                   /* Document was found at a different URI */
+  HTTP_STATUS_SEE_OTHER,               /* See this other link */
   HTTP_STATUS_NOT_MODIFIED,            /* File not modified */
   HTTP_STATUS_USE_PROXY,               /* Must use a proxy to access this URI */
+  HTTP_STATUS_TEMPORARY_REDIRECT = 307,        /* Temporary redirection */
 
   HTTP_STATUS_BAD_REQUEST = 400,       /* Bad request */
   HTTP_STATUS_UNAUTHORIZED,            /* Unauthorized to access host */
@@ -279,6 +280,8 @@ typedef enum http_status_e          /**** HTTP status codes ****/
   HTTP_STATUS_CUPS_PKI_ERROR,          /* Error negotiating a secure connection @since CUPS 1.5/macOS 10.7@ */
   HTTP_STATUS_CUPS_WEBIF_DISABLED      /* Web interface is disabled @private@ */
 
+#  define HTTP_STATUS_MOVED_TEMPORARILY HTTP_STATUS_FOUND /* Renamed in RFC 7231 */
+
 #  ifndef _CUPS_NO_DEPRECATED
 /* Old names for this enumeration */
 #    define HTTP_ERROR                 HTTP_STATUS_ERROR

diff --git a/locale/cups.pot b/locale/cups.pot
index cd2d992ea42f10f68a96e74503b1ca55b04d7bcd..c7bcf3fa979c279f046a66a4b2ef62bad89f1ef0 100644 (file)
--- a/locale/cups.pot
+++ b/locale/cups.pot
@@ -28,7 +28,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CUPS 2.3b1\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-12-08 18:41-0500\n"
+"POT-Creation-Date: 2017-12-08 19:16-0500\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"
@@ -4133,6 +4133,10 @@ msgstr ""
 msgid "Forbidden"
 msgstr ""
 
+#: cups/http-support.c:1355
+msgid "Found"
+msgstr ""
+
 #: cups/ppd.c:771 cups/ppd.c:1329
 msgid "General"
 msgstr ""
@@ -4706,10 +4710,6 @@ msgstr ""
 msgid "Moved Permanently"
 msgstr ""
 
-#: cups/http-support.c:1355
-msgid "Moved Temporarily"
-msgstr ""
-
 #: cups/ppd.c:303
 msgid "NULL PPD file pointer"
 msgstr ""

diff --git a/locale/cups.strings b/locale/cups.strings
index dfb700cdd198b8e572c0c514fdf5d3f8a2d9bb03..2aba85614b161587ebe767625473a169bc018534 100644 (file)
--- a/locale/cups.strings
+++ b/locale/cups.strings
@@ -896,6 +896,7 @@
 "Fold" = "Fold";
 "Folio" = "Folio";
 "Forbidden" = "Forbidden";
+"Found" = "Found";
 "General" = "General";
 "Generic" = "Generic";
 "Get-Response-PDU uses indefinite length" = "Get-Response-PDU uses indefinite length";
@@ -1032,7 +1033,6 @@
 "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 5492f458f173a229cd41b3728f7aabe98983e7ec..cb56ae1d97dc09b57b7dba5b60d8172f98e260a3 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-12-08 18:41-0500\n"
+"POT-Creation-Date: 2017-12-08 19:16-0500\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"
@@ -3387,6 +3387,9 @@ msgstr "Foli"
 msgid "Forbidden"
 msgstr "Prohibit"
 
+msgid "Found"
+msgstr ""
+
 msgid "General"
 msgstr "General"
 
@@ -3822,9 +3825,6 @@ 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 6bccb15bab49b9f91a65a67a532e00f3b38359ac..2fc61106ee966794691f18f6df258df40e266cc6 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-12-08 18:41-0500\n"
+"POT-Creation-Date: 2017-12-08 19:16-0500\n"
 "PO-Revision-Date: 2012-09-14 10:26+0100\n"
 "Last-Translator: Jan Bartos <jan.bartos@madeta.cz>\n"
 "Language-Team: Czech\n"
@@ -3185,6 +3185,9 @@ msgstr "Fólie"
 msgid "Forbidden"
 msgstr "Zakázaný"
 
+msgid "Found"
+msgstr ""
+
 msgid "General"
 msgstr "Obecný"
 
@@ -3613,9 +3616,6 @@ 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 b431145e3b088c2c02a0a2e13ad933413a7796d1..33ef4f052491489a5cc816f316a3bd6eb969da34 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-12-08 18:41-0500\n"
+"POT-Creation-Date: 2017-12-08 19:16-0500\n"
 "PO-Revision-Date: 2017-10-25 14:57+0200\n"
 "Last-Translator: Michael Weghorn <m.weghorn@posteo.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3265,6 +3265,9 @@ msgstr "Folio"
 msgid "Forbidden"
 msgstr "Verboten"
 
+msgid "Found"
+msgstr ""
+
 msgid "General"
 msgstr "Allgemein"
 
@@ -3694,9 +3697,6 @@ 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 b097317c4bcbf43d2af2ecd2f1fc8bb314171a18..2ca9859ba8414799473ab309edde8209584d1d82 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-12-08 18:41-0500\n"
+"POT-Creation-Date: 2017-12-08 19:16-0500\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"
@@ -3417,6 +3417,9 @@ msgstr "Folio"
 msgid "Forbidden"
 msgstr "Prohibido"
 
+msgid "Found"
+msgstr ""
+
 msgid "General"
 msgstr "General"
 
@@ -3849,9 +3852,6 @@ 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 422c3bb3f4ed4b46739aad90bee11d8508295cf2..93f0cdc005097140c1140b42239ffcb262ffe272 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-12-08 18:41-0500\n"
+"POT-Creation-Date: 2017-12-08 19:16-0500\n"
 "PO-Revision-Date: 2012-12-12 11:12+0100\n"
 "Last-Translator: Stéphane Blondon <stephane.blondon@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3247,6 +3247,9 @@ msgstr "Folio"
 msgid "Forbidden"
 msgstr "Interdit"
 
+msgid "Found"
+msgstr ""
+
 msgid "General"
 msgstr "Général"
 
@@ -3675,9 +3678,6 @@ 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 3c67f246e1432572f6834b808f72b910c9394fa7..a159dbfc7dabf7a4f791f0cc39fe83d10e3c20c3 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-12-08 18:41-0500\n"
+"POT-Creation-Date: 2017-12-08 19:16-0500\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"
@@ -3415,6 +3415,9 @@ msgstr "Foglio"
 msgid "Forbidden"
 msgstr "Vietato"
 
+msgid "Found"
+msgstr ""
+
 msgid "General"
 msgstr "Generale"
 
@@ -3847,9 +3850,6 @@ 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 f910c0659bfe3c6f06efdbebf53486c1ba7de4ae..f0a867ddf61da6811f8b66c0cdeb181092b822ff 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-12-08 18:41-0500\n"
+"POT-Creation-Date: 2017-12-08 19:16-0500\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"
@@ -3389,6 +3389,9 @@ msgstr "フォリオ"
 msgid "Forbidden"
 msgstr "Forbidden"
 
+msgid "Found"
+msgstr ""
+
 msgid "General"
 msgstr "一般"
 
@@ -3821,9 +3824,6 @@ 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 9ad7037b7d61bdc852498ccaa7e212df70607de3..b23114c33f168ae7c16803354e9a5941eaf220f2 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-12-08 18:41-0500\n"
+"POT-Creation-Date: 2017-12-08 19:16-0500\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"
@@ -3418,6 +3418,9 @@ msgstr "Fólio"
 msgid "Forbidden"
 msgstr "Proibido"
 
+msgid "Found"
+msgstr ""
+
 msgid "General"
 msgstr "Geral"
 
@@ -3850,9 +3853,6 @@ 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 dadf7a79abc69964b236e668584410e6a49949cb..9afd88356a022bb77efc568670aa03d0cecb55b2 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: https://github.com/apple/cups/issues\n"
-"POT-Creation-Date: 2017-12-08 18:41-0500\n"
+"POT-Creation-Date: 2017-12-08 19:16-0500\n"
 "PO-Revision-Date: 2015-01-28 12:00-0800\n"
 "Last-Translator: Aleksandr Proklov\n"
 "Language-Team: PuppyRus Linux Team\n"
@@ -3346,6 +3346,9 @@ msgstr "Фолио"
 msgid "Forbidden"
 msgstr "Запрещено"
 
+msgid "Found"
+msgstr ""
+
 msgid "General"
 msgstr "Основные"
 
@@ -3778,9 +3781,6 @@ 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 37c73f47bdb75b0298fcf2dee6785514eddc64fe..e29dfa4217394b10b2bd69eb62514cd8450ecbb3 100644 (file)
--- 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-08 18:41-0500\n"
+"POT-Creation-Date: 2017-12-08 19:16-0500\n"
 "PO-Revision-Date: 2017-06-11 12:38+0800\n"
 "Last-Translator: Mingcong Bai <jeffbai@aosc.xyz>\n"
 "Language-Team: \n"
@@ -3328,6 +3328,9 @@ msgstr "对开本"
 msgid "Forbidden"
 msgstr "已禁止"
 
+msgid "Found"
+msgstr ""
+
 msgid "General"
 msgstr "常规"
 
@@ -3760,9 +3763,6 @@ msgstr "移动任务"
 msgid "Moved Permanently"
 msgstr "已永久移动"
 
-msgid "Moved Temporarily"
-msgstr ""
-
 msgid "NULL PPD file pointer"
 msgstr "PPD 文件指针为 NULL"