Polish template CSS

diff --git a/errors/bg.po b/errors/bg.po
index 845fe2b450f05dc2221a57c2ce1efebefd0f0a3a..ce832affa00426624110c6f7908a15afc567b1c0 100644 (file)
--- a/errors/bg.po
+++ b/errors/bg.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-29 15:05+1300\n"
+"POT-Creation-Date: 2008-10-27 17:13+1300\n"
 "PO-Revision-Date: 2008-10-01 01:06+1200\n"
 "Last-Translator: Evgeni Gechev <etg@setcom.bg>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
@@ -142,6 +142,7 @@ msgid "ERROR: Cache Manager Access Denied"
 msgstr "ГРЕШКА: Отказан достъп до кеш мениджъра."
 
 #: templates/ERR_FTP_PUT_ERROR:1
+#, fuzzy
 msgid "ERROR: FTP upload failed"
 msgstr "ГРЕШКА: Неуспешен опит за качване на файл."
 
@@ -174,7 +175,8 @@ msgid "FTP PUT Successful: File Created"
 msgstr "Файлът е създаден успешно."
 
 #: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File updated"
+#, fuzzy
+msgid "FTP PUT Successful: File Updated"
 msgstr "Файлът е обновен успешно."
 
 #: templates/ERR_FTP_PUT_ERROR:3
@@ -397,8 +399,8 @@ msgstr "Обработката на ESI заявката върна следни
 #: templates/ERR_FTP_UNAVAILABLE:4
 msgid "The FTP server was too busy to retrieve the URL: <a href=\"%U\">%U</a>"
 msgstr ""
-"FTP сървърът е претоварен и не може да бъде изтеглен файлът: <a "
-"href=\"%U\">%U</a>"
+"FTP сървърът е претоварен и не може да бъде изтеглен файлът: <a href=\"%U\">%"
+"U</a>"
 
 #: templates/ERR_INVALID_RESP:5
 msgid ""

diff --git a/errors/ca.po b/errors/ca.po
index a8a7f1cd45fdca3bb52e2f56e23f1aeb94a5e3ba..10e68baa805bdc31368725893bcf9861230cbcbf 100644 (file)
--- a/errors/ca.po
+++ b/errors/ca.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-29 15:05+1300\n"
+"POT-Creation-Date: 2008-10-27 17:13+1300\n"
 "PO-Revision-Date: 2008-08-17 19:57+1200\n"
 "Last-Translator: Jordi Bruguera <jordi@dns1.grn.es>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
@@ -138,6 +138,7 @@ msgid "ERROR: Cache Manager Access Denied"
 msgstr "ERROR: Acc&eacute;s denegat a l'administraci&oacute; de la cache"
 
 #: templates/ERR_FTP_PUT_ERROR:1
+#, fuzzy
 msgid "ERROR: FTP upload failed"
 msgstr "ERROR: Ha fallat l'enviament del fitxer FTP"
 
@@ -170,7 +171,8 @@ msgid "FTP PUT Successful: File Created"
 msgstr "Comanda FTP PUT executada amb &egrave;xit: Fitxer creat"
 
 #: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File updated"
+#, fuzzy
+msgid "FTP PUT Successful: File Updated"
 msgstr "Comanda FTP PUT completada amb &eacute;xit: Fitxer actualitzat"
 
 #: templates/ERR_FTP_PUT_ERROR:3

diff --git a/errors/cs.po b/errors/cs.po
index 51f6d6f83aa9c80f00500bd408a21745bee4d115..27e5afcc739c11b10b3aa13437af8d5db4e6fd4e 100644 (file)
--- a/errors/cs.po
+++ b/errors/cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-29 15:05+1300\n"
+"POT-Creation-Date: 2008-10-27 17:13+1300\n"
 "PO-Revision-Date: 2008-09-29 00:23+1200\n"
 "Last-Translator: Amos Jeffries <squid3@treenet.co.nz>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
@@ -137,6 +137,7 @@ msgid "ERROR: Cache Manager Access Denied"
 msgstr "CHYBA: Přístup ke správci cache odepřen"
 
 #: templates/ERR_FTP_PUT_ERROR:1
+#, fuzzy
 msgid "ERROR: FTP upload failed"
 msgstr "CHYBA: Selhalo nahrávání na FTP"
 
@@ -169,7 +170,8 @@ msgid "FTP PUT Successful: File Created"
 msgstr "FTP PUT uspěl: soubor vytvořen"
 
 #: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File updated"
+#, fuzzy
+msgid "FTP PUT Successful: File Updated"
 msgstr "FTP PUT uspěl: soubor aktualizován"
 
 #: templates/ERR_FTP_PUT_ERROR:3

diff --git a/errors/da.po b/errors/da.po
index 89c01149ee74488d9906f1be31dfdbbfbe55ad10..6f17c61aa2bebc64656e89c9d1af8848c4b832a5 100644 (file)
--- a/errors/da.po
+++ b/errors/da.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-29 15:05+1300\n"
+"POT-Creation-Date: 2008-10-27 17:13+1300\n"
 "PO-Revision-Date: 2008-08-23 18:07+1200\n"
 "Last-Translator: Morten S. Nielsen <mortensn@geocities.com>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
@@ -135,6 +135,7 @@ msgid "ERROR: Cache Manager Access Denied"
 msgstr "FEJL: Cache Administrator Adgang N&aelig;gtet"
 
 #: templates/ERR_FTP_PUT_ERROR:1
+#, fuzzy
 msgid "ERROR: FTP upload failed"
 msgstr "FEJL: FTP upload fejlede"
 
@@ -167,7 +168,8 @@ msgid "FTP PUT Successful: File Created"
 msgstr "FTP PUT Lykkedes: Fil Oprettet"
 
 #: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File updated"
+#, fuzzy
+msgid "FTP PUT Successful: File Updated"
 msgstr "FTP PUT Lykkedes: Fil Opdateret"
 
 #: templates/ERR_FTP_PUT_ERROR:3

diff --git a/errors/de.po b/errors/de.po
index fee424c7358bf23c586db978219043b6de493ee4..f6c1926944fcabaa2d48282fcc7c306cced9b973 100644 (file)
--- a/errors/de.po
+++ b/errors/de.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-29 15:05+1300\n"
+"POT-Creation-Date: 2008-10-27 17:13+1300\n"
 "PO-Revision-Date: 2008-09-13 11:56+1200\n"
 "Last-Translator: Robert Förster <Dessa@gmake.de>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
@@ -141,6 +141,7 @@ msgid "ERROR: Cache Manager Access Denied"
 msgstr "FEHLER: Cache Manager Zugriff verweigert"
 
 #: templates/ERR_FTP_PUT_ERROR:1
+#, fuzzy
 msgid "ERROR: FTP upload failed"
 msgstr "FEHLER: FTP Upload fehlgeschlagen"
 
@@ -173,7 +174,8 @@ msgid "FTP PUT Successful: File Created"
 msgstr "FTP PUT Erfolgreich: Datei Erstellt"
 
 #: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File updated"
+#, fuzzy
+msgid "FTP PUT Successful: File Updated"
 msgstr "FTP PUT Erfolgreich: Datei aktualisiert"
 
 #: templates/ERR_FTP_PUT_ERROR:3

diff --git a/errors/dictionary.pot b/errors/dictionary.pot
index f4d70caffc1ddc5c98433192aa7ac6af8ee77378..b6a1bf81083c29adbfd42d21913dc0622f1de8a0 100644 (file)
--- a/errors/dictionary.pot
+++ b/errors/dictionary.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-29 15:05+1300\n"
+"POT-Creation-Date: 2008-10-27 17:13+1300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
@@ -157,7 +157,7 @@ msgid "FTP PUT Successful: File Created"
 msgstr ""
 
 #: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File updated"
+msgid "FTP PUT Successful: File Updated"
 msgstr ""
 
 #: templates/ERR_FTP_PUT_ERROR:3

diff --git a/errors/en-au.po b/errors/en-au.po
index 140c0a2515a4ccc17bc1672490049abdcca99bac..eb9ec02207592fdd35f7e40dbb35ba27c8389550 100644 (file)
--- a/errors/en-au.po
+++ b/errors/en-au.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-29 15:05+1300\n"
-"PO-Revision-Date: 2008-08-07 16:21+1200\n"
+"POT-Creation-Date: 2008-10-27 17:13+1300\n"
+"PO-Revision-Date: 2008-10-27 17:16+1300\n"
 "Last-Translator: Amos Jeffries <squid3@treenet.co.nz>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
 "MIME-Version: 1.0\n"
@@ -174,8 +174,8 @@ msgid "FTP PUT Successful: File Created"
 msgstr "FTP PUT Successful: File Created"
 
 #: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File updated"
-msgstr "FTP PUT Successful: File updated"
+msgid "FTP PUT Successful: File Updated"
+msgstr "FTP PUT Successful: File Updated"
 
 #: templates/ERR_FTP_PUT_ERROR:3
 msgid "FTP PUT/upload failed"

diff --git a/errors/en-gb.po b/errors/en-gb.po
index a91ac4079c84ca10142cd5fd6d476cfa47066bc0..c46603371783c0c5b049079e861d2c8c356303f5 100644 (file)
--- a/errors/en-gb.po
+++ b/errors/en-gb.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-29 15:05+1300\n"
-"PO-Revision-Date: 2008-08-07 16:23+1200\n"
+"POT-Creation-Date: 2008-10-27 17:13+1300\n"
+"PO-Revision-Date: 2008-10-27 17:17+1300\n"
 "Last-Translator: Amos Jeffries <squid3@treenet.co.nz>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
 "MIME-Version: 1.0\n"
@@ -174,8 +174,8 @@ msgid "FTP PUT Successful: File Created"
 msgstr "FTP PUT Successful: File Created"
 
 #: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File updated"
-msgstr "FTP PUT Successful: File updated"
+msgid "FTP PUT Successful: File Updated"
+msgstr "FTP PUT Successful: File Updated"
 
 #: templates/ERR_FTP_PUT_ERROR:3
 msgid "FTP PUT/upload failed"

diff --git a/errors/en-nz.po b/errors/en-nz.po
index c8f1bb053f7d9e51bdf8a757ee6221632c882598..87032ea787074b1144d695df3eff141fc1cc9b77 100644 (file)
--- a/errors/en-nz.po
+++ b/errors/en-nz.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-29 15:05+1300\n"
+"POT-Creation-Date: 2008-10-27 17:13+1300\n"
 "PO-Revision-Date: 2008-08-07 16:23+1200\n"
 "Last-Translator: Amos Jeffries <squid3@treenet.co.nz>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
@@ -141,6 +141,7 @@ msgid "ERROR: Cache Manager Access Denied"
 msgstr "ERROR: Cache Manager Access Denied"
 
 #: templates/ERR_FTP_PUT_ERROR:1
+#, fuzzy
 msgid "ERROR: FTP upload failed"
 msgstr "ERROR: FTP upload failed"
 
@@ -173,7 +174,8 @@ msgid "FTP PUT Successful: File Created"
 msgstr "FTP PUT Successful: File Created"
 
 #: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File updated"
+#, fuzzy
+msgid "FTP PUT Successful: File Updated"
 msgstr "FTP PUT Successful: File updated"
 
 #: templates/ERR_FTP_PUT_ERROR:3

diff --git a/errors/en-us.po b/errors/en-us.po
index c8f1bb053f7d9e51bdf8a757ee6221632c882598..87032ea787074b1144d695df3eff141fc1cc9b77 100644 (file)
--- a/errors/en-us.po
+++ b/errors/en-us.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-29 15:05+1300\n"
+"POT-Creation-Date: 2008-10-27 17:13+1300\n"
 "PO-Revision-Date: 2008-08-07 16:23+1200\n"
 "Last-Translator: Amos Jeffries <squid3@treenet.co.nz>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
@@ -141,6 +141,7 @@ msgid "ERROR: Cache Manager Access Denied"
 msgstr "ERROR: Cache Manager Access Denied"
 
 #: templates/ERR_FTP_PUT_ERROR:1
+#, fuzzy
 msgid "ERROR: FTP upload failed"
 msgstr "ERROR: FTP upload failed"
 
@@ -173,7 +174,8 @@ msgid "FTP PUT Successful: File Created"
 msgstr "FTP PUT Successful: File Created"
 
 #: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File updated"
+#, fuzzy
+msgid "FTP PUT Successful: File Updated"
 msgstr "FTP PUT Successful: File updated"
 
 #: templates/ERR_FTP_PUT_ERROR:3

diff --git a/errors/en.po b/errors/en.po
index c8f1bb053f7d9e51bdf8a757ee6221632c882598..7236897cd863c950615924023b895090da9882b1 100644 (file)
--- a/errors/en.po
+++ b/errors/en.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-29 15:05+1300\n"
-"PO-Revision-Date: 2008-08-07 16:23+1200\n"
+"POT-Creation-Date: 2008-10-27 17:13+1300\n"
+"PO-Revision-Date: 2008-10-27 17:14+1300\n"
 "Last-Translator: Amos Jeffries <squid3@treenet.co.nz>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
 "MIME-Version: 1.0\n"
@@ -173,8 +173,8 @@ msgid "FTP PUT Successful: File Created"
 msgstr "FTP PUT Successful: File Created"
 
 #: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File updated"
-msgstr "FTP PUT Successful: File updated"
+msgid "FTP PUT Successful: File Updated"
+msgstr "FTP PUT Successful: File Updated"
 
 #: templates/ERR_FTP_PUT_ERROR:3
 msgid "FTP PUT/upload failed"

diff --git a/errors/errorpage.css b/errors/errorpage.css
index 277411499fcdeb0239e56e79cdc0776ba49bb815..1c13ae145626914a0706852a7d7e8adc25e0f686 100644 (file)
--- a/errors/errorpage.css
+++ b/errors/errorpage.css
@@ -1,49 +1,56 @@
+/* Stylesheet for Squid Error pages */
 
-// page basics
+/* Page basics */
 html body {
-    background-color:#ffffff;
-    font-family:verdana,sans-serif
+       background-color: #ffffff;
+       font-family: verdana,sans-serif;
 }
 
-// initial title
-h1 {
+/* Page displayed title area */
+#titles {
 }
 
-// page sub-title
-h2 {
+/* initial title */
+#titles h1 {
+}
+#titles h2 {
+}
+
+/* special event: FTP success page titles */
+#titles ftpsuccess {
+       background-color:#00ff00;
+       width:100%;
+}
+
+/* Page displayed body content area */
+#content {
 }
 
-// general text
+/* General text */
 p {
 }
 
-// error brief description
+/* error brief description */
 #error p {
 }
 
-// some data which may have caused the prblem
+/* some data which may have caused the problem */
 #data {
 }
 
-// the error message received from the system or other software
+/* the error message received from the system or other software */
 #sysmsg {
 }
 
-
 pre {
-    font-family:sans-serif
+    font-family:sans-serif;
 }
 
-// horizontal lines
+/* horizontal lines */
 hr {
 }
 
-// page footer
+/* page displayed footer area */
 #footer {
-}
-
-// special event: FTP success page titles
-ftpsuccess {
-   background-color:#00ff00;
-   width:100%
+       width: 100%;
 }

diff --git a/errors/es.po b/errors/es.po
index 97f4417bcca4f344824155ab774104edc66bcf6f..c3618c6bd86dc5565ebf3267d10f17f288d2bb98 100644 (file)
--- a/errors/es.po
+++ b/errors/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-29 15:05+1300\n"
+"POT-Creation-Date: 2008-10-27 17:13+1300\n"
 "PO-Revision-Date: 2008-09-29 00:16+1200\n"
 "Last-Translator: Amos Jeffries <squid3@treenet.co.nz>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -147,6 +147,7 @@ msgid "ERROR: Cache Manager Access Denied"
 msgstr "ERROR: Acceso Denegado al Cach&eacute; Manager"
 
 #: templates/ERR_FTP_PUT_ERROR:1
+#, fuzzy
 msgid "ERROR: FTP upload failed"
 msgstr "ERROR: falla en envio FTP"
 
@@ -179,7 +180,8 @@ msgid "FTP PUT Successful: File Created"
 msgstr "FTP PUT Exitoso: Archivo Creado"
 
 #: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File updated"
+#, fuzzy
+msgid "FTP PUT Successful: File Updated"
 msgstr "FTP PUT Exitoso: Archivo actualizado"
 
 #: templates/ERR_FTP_PUT_ERROR:3

diff --git a/errors/fr.po b/errors/fr.po
index a450390325d9f3649d7de836499328d5a92c62c8..cb8c1c6af061143c9d9542d3a668bdd9b29a6d76 100644 (file)
--- a/errors/fr.po
+++ b/errors/fr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-29 15:05+1300\n"
+"POT-Creation-Date: 2008-10-27 17:13+1300\n"
 "PO-Revision-Date: 2008-08-17 17:39+1200\n"
 "Last-Translator: Frank Denia <j@4u.net>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
@@ -140,6 +140,7 @@ msgid "ERROR: Cache Manager Access Denied"
 msgstr "ERREUR: Acc&egrave;s au gestionnaire de cache interdit"
 
 #: templates/ERR_FTP_PUT_ERROR:1
+#, fuzzy
 msgid "ERROR: FTP upload failed"
 msgstr "ERREUR: envoi FTP d&eacute;fectueux"
 
@@ -172,7 +173,8 @@ msgid "FTP PUT Successful: File Created"
 msgstr "FTP PUT r&eacute;ussi: Fichier cr&eacute;&eacute;"
 
 #: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File updated"
+#, fuzzy
+msgid "FTP PUT Successful: File Updated"
 msgstr "FTP PUT r&eacute;ussi: Fichier mis &agrave; jour"
 
 #: templates/ERR_FTP_PUT_ERROR:3

diff --git a/errors/id.po b/errors/id.po
index 43dd12fef481b04fa25c1dc401221fadc0ad279e..1ce095f188ca2a21ee920d8a0668ca029119a96e 100644 (file)
--- a/errors/id.po
+++ b/errors/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-29 15:05+1300\n"
+"POT-Creation-Date: 2008-10-27 17:13+1300\n"
 "PO-Revision-Date: 2008-10-22 00:37+1300\n"
 "Last-Translator: Ramdhani Fathurrohman <kontak@ramdhani.net>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -63,16 +63,16 @@ msgid ""
 "An FTP authentication failure occurred while trying to retrieve the URL: <a "
 "href=\"%U\">%U</a>"
 msgstr ""
-"terjadi kegagalan otentikasi FTP ketika mencoba untuk mengambil URL: <a "
-"href=\"%U\">%U</a>"
+"terjadi kegagalan otentikasi FTP ketika mencoba untuk mengambil URL: <a href="
+"\"%U\">%U</a>"
 
 #: templates/ERR_FTP_FAILURE:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
 msgstr ""
-"terjadi kesalahan Protokol FTP ketika mencoba untuk mengambil URL: <a "
-"href=\"%U\">%U</a>"
+"terjadi kesalahan Protokol FTP ketika mencoba untuk mengambil URL: <a href="
+"\"%U\">%U</a>"
 
 #: templates/ERR_ICAP_FAILURE:10
 msgid "An Illegal response was received from the ICAP server."
@@ -178,7 +178,7 @@ msgid "FTP PUT Successful: File Created"
 msgstr ""
 
 #: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File updated"
+msgid "FTP PUT Successful: File Updated"
 msgstr ""
 
 #: templates/ERR_FTP_PUT_ERROR:3

diff --git a/errors/it.po b/errors/it.po
index 4f1084b84114934a5c3361f2aa72470d9e71897f..47d451b2c518c5f78637f86d94188713a883f0de 100644 (file)
--- a/errors/it.po
+++ b/errors/it.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-29 15:05+1300\n"
+"POT-Creation-Date: 2008-10-27 17:13+1300\n"
 "PO-Revision-Date: 2008-10-17 20:45+1300\n"
 "Last-Translator: Francesco Chemolli <kinkie@squid-cache.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -145,6 +145,7 @@ msgid "ERROR: Cache Manager Access Denied"
 msgstr "ERRORE: l'accesso al Cache Manager è negato."
 
 #: templates/ERR_FTP_PUT_ERROR:1
+#, fuzzy
 msgid "ERROR: FTP upload failed"
 msgstr "ERRORE: l'invio del file via FTP è fallito."
 
@@ -177,7 +178,8 @@ msgid "FTP PUT Successful: File Created"
 msgstr "L'invio dati (PUT) FTP ha avuto successo: il file è stato creato."
 
 #: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File updated"
+#, fuzzy
+msgid "FTP PUT Successful: File Updated"
 msgstr "L'invio dati (PUT) FTP ha avuto successo: il file è stato aggiornato."
 
 #: templates/ERR_FTP_PUT_ERROR:3

diff --git a/errors/ja.po b/errors/ja.po
index 8fd45ea65bffcc4f676dfaed2f153bc8be2bb843..819743836b5a7e405e42da8ec0108393c7ce3fc4 100644 (file)
--- a/errors/ja.po
+++ b/errors/ja.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-29 15:05+1300\n"
+"POT-Creation-Date: 2008-10-27 17:13+1300\n"
 "PO-Revision-Date: 2008-10-22 00:11+1300\n"
 "Last-Translator: Takahiro Kambe <taca@back-street.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -78,13 +78,17 @@ msgstr "ICAPサーバから不正な応答がありました。"
 msgid ""
 "An error condition occurred while reading data from the network.  Please "
 "retry your request."
-msgstr "ネットワークからデータを受信している間にエラーが発生しました。再度、リクエストしてください。"
+msgstr ""
+"ネットワークからデータを受信している間にエラーが発生しました。再度、リクエス"
+"トしてください。"
 
 #: templates/ERR_WRITE_ERROR:7
 msgid ""
 "An error condition occurred while writing to the network.  Please retry your "
 "request."
-msgstr "ネットワークにデータを送信している間にエラーが発生しました。再度リクエストしてください。"
+msgstr ""
+"ネットワークにデータを送信している間にエラーが発生しました。再度リクエストし"
+"てください。"
 
 #: templates/ERR_CACHE_ACCESS_DENIED:3 templates/ERR_CACHE_ACCESS_DENIED:5
 msgid "Cache Access Denied."
@@ -138,6 +142,7 @@ msgid "ERROR: Cache Manager Access Denied"
 msgstr "エラー: キャッシュ・マネージャにアクセスを拒否されました。"
 
 #: templates/ERR_FTP_PUT_ERROR:1
+#, fuzzy
 msgid "ERROR: FTP upload failed"
 msgstr "エラー: FTPのアップロードに失敗しました。"
 
@@ -170,7 +175,8 @@ msgid "FTP PUT Successful: File Created"
 msgstr "FTPのPUTに成功: ファイルを作成しました。"
 
 #: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File updated"
+#, fuzzy
+msgid "FTP PUT Successful: File Updated"
 msgstr "FTPのPUTに成功: ファイルを更新しました。"
 
 #: templates/ERR_FTP_PUT_ERROR:3

diff --git a/errors/nl.po b/errors/nl.po
index 452fceb59539305b6239df7a31d04c721fea67f6..7c9445923d41762cafc8fcb43a895c0eb9b41f68 100644 (file)
--- a/errors/nl.po
+++ b/errors/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-29 15:05+1300\n"
+"POT-Creation-Date: 2008-10-27 17:13+1300\n"
 "PO-Revision-Date: 2008-08-29 00:49+1200\n"
 "Last-Translator: Mark Visser <mark@cal026031.student.utwente.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -143,6 +143,7 @@ msgid "ERROR: Cache Manager Access Denied"
 msgstr "FOUT: Cache Manager toegang niet toegestaan"
 
 #: templates/ERR_FTP_PUT_ERROR:1
+#, fuzzy
 msgid "ERROR: FTP upload failed"
 msgstr "FOUT: FTP upload mislukt"
 
@@ -175,7 +176,8 @@ msgid "FTP PUT Successful: File Created"
 msgstr "FTP PUT Succesvol: Bestand aangemaakt"
 
 #: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File updated"
+#, fuzzy
+msgid "FTP PUT Successful: File Updated"
 msgstr "FTP PUT Succesvol: Bestand vernieuwd"
 
 #: templates/ERR_FTP_PUT_ERROR:3

diff --git a/errors/pt-br.po b/errors/pt-br.po
index ab3e515c44adbefa6749643f9329821c8bd27d6e..0670587a26f960ffef6c56ec071014d0de0e0e30 100644 (file)
--- a/errors/pt-br.po
+++ b/errors/pt-br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-29 15:05+1300\n"
+"POT-Creation-Date: 2008-10-27 17:13+1300\n"
 "PO-Revision-Date: 2008-09-26 07:29+1200\n"
 "Last-Translator: Aecio F. Neto <aecioneto@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -145,6 +145,7 @@ msgid "ERROR: Cache Manager Access Denied"
 msgstr "ERRO: Acesso ao gerenciador de cache negado"
 
 #: templates/ERR_FTP_PUT_ERROR:1
+#, fuzzy
 msgid "ERROR: FTP upload failed"
 msgstr "ERRO: upload via FTP falhou"
 
@@ -177,7 +178,8 @@ msgid "FTP PUT Successful: File Created"
 msgstr "FTP - PUT bem sucedido: Arquivo Criado"
 
 #: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File updated"
+#, fuzzy
+msgid "FTP PUT Successful: File Updated"
 msgstr "FTP - PUT bem sucedido: Arquivo Atualizado"
 
 #: templates/ERR_FTP_PUT_ERROR:3

diff --git a/errors/sv.po b/errors/sv.po
index b3605a738f72b365ecfb6af2e8754d9a195f4899..266e709d33375cd459764be9e3f7be3e0a6732ef 100644 (file)
--- a/errors/sv.po
+++ b/errors/sv.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-29 15:05+1300\n"
+"POT-Creation-Date: 2008-10-27 17:13+1300\n"
 "PO-Revision-Date: 2008-10-17 19:43+1300\n"
 "Last-Translator: Henrik Nordström <henrik@henriknordstrom.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,16 +16,16 @@ msgid ""
 "<b>Invalid Request</b> error was encountered while trying to process the "
 "request:"
 msgstr ""
-"<b>Felaktig F&ouml;rfr&aring;an</b> fel p&aring;tr&auml;ffades n&auml;r f&ouml;rfr&aring;gan "
-"skulle behandlas:"
+"<b>Felaktig F&ouml;rfr&aring;an</b> fel p&aring;tr&auml;ffades n&auml;r "
+"f&ouml;rfr&aring;gan skulle behandlas:"
 
 #: templates/ERR_INVALID_RESP:4
 msgid ""
 "<b>Invalid Response</b> error was encountered while trying to process the "
 "request:"
 msgstr ""
-"<b>Felaktigt Svarsmeddelande</b> fel p&aring;tr&auml;ffades n&auml;r f&ouml;rfr&aring;gan "
-"skulle behandlas:"
+"<b>Felaktigt Svarsmeddelande</b> fel p&aring;tr&auml;ffades n&auml;r f&ouml;"
+"rfr&aring;gan skulle behandlas:"
 
 #: templates/ERR_READ_TIMEOUT:7
 msgid ""
@@ -143,6 +143,7 @@ msgid "ERROR: Cache Manager Access Denied"
 msgstr "FEL: Tilltr&auml;de till Cachehanteraren Nekas"
 
 #: templates/ERR_FTP_PUT_ERROR:1
+#, fuzzy
 msgid "ERROR: FTP upload failed"
 msgstr "FEL: FTP uppladdning misslyckades"
 
@@ -175,7 +176,8 @@ msgid "FTP PUT Successful: File Created"
 msgstr "FTP PUT lyckades: Filen Skapades"
 
 #: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File updated"
+#, fuzzy
+msgid "FTP PUT Successful: File Updated"
 msgstr "FTP PUT lyckades: Filen uppdaterades"
 
 #: templates/ERR_FTP_PUT_ERROR:3
@@ -236,8 +238,8 @@ msgid ""
 "If you are making a GET request, then the item you are trying to download is "
 "too large."
 msgstr ""
-"Ifall du utf&ouml;rde en GET beg&auml;ran, s&aring; &auml;r svaret du "
-"f&ouml;rs&ouml;ker ladda ned f&ouml;r stort."
+"Ifall du utf&ouml;rde en GET beg&auml;ran, s&aring; &auml;r svaret du f&ouml;"
+"rs&ouml;ker ladda ned f&ouml;r stort."
 
 #: templates/ERR_TOO_BIG:6
 msgid ""
@@ -375,8 +377,8 @@ msgid ""
 "Squid has terminated the request because it has exceeded the maximum "
 "connection lifetime."
 msgstr ""
-"Squid har avbrutit beg&auml;ran p&aring; grund av att den har "
-"&ouml;verskridikt den till&aring;tna livstiden f&ouml;r en anslutning."
+"Squid har avbrutit beg&auml;ran p&aring; grund av att den har &ouml;"
+"verskridikt den till&aring;tna livstiden f&ouml;r en anslutning."
 
 #: templates/ERR_SOCKET_FAILURE:7
 msgid ""
@@ -437,13 +439,17 @@ msgstr "F&ouml;ljande URL kunde inte h&auml;mtas: <a href=\"%U\">%U</a>"
 msgid ""
 "The following error was encountered while trying to retrieve the URL: <a "
 "href=\"%U\">%U</a>"
-msgstr "F&ouml;ljande fel p&aring;tr&auml;ffades vid h&auml;mtning av URL: <a href=\"%U\">%U</a>"
+msgstr ""
+"F&ouml;ljande fel p&aring;tr&auml;ffades vid h&auml;mtning av URL: <a href="
+"\"%U\">%U</a>"
 
 #: templates/ERR_URN_RESOLVE:4
 msgid ""
 "The following error was encountered while trying to retrieve the URN: <a "
 "href=\"%U\">%U</a>"
-msgstr "F&ouml;ljande fel p&aring;tr&auml;ffades vid h&auml;mtning av URN: <a href=\"%U\">%U</a>"
+msgstr ""
+"F&ouml;ljande fel p&aring;tr&auml;ffades vid h&auml;mtning av URN: <a href="
+"\"%U\">%U</a>"
 
 #: templates/ERR_CONNECT_FAIL:7
 msgid "The remote host or network may be down.  Please try the request again."
@@ -534,9 +540,9 @@ msgid ""
 "This means that the FTP server may not have permission or space to store the "
 "file. Check the path, permissions, diskspace and try again."
 msgstr ""
-"Detta betyder att r&auml;ttighet eller utrymme saknas p&aring; FTP servern f&ouml;r att "
-"lagra filen. Kontrollera s&ouml;kv&auml;g, r&auml;ttigheter och diskutrymme och f&ouml;rs&ouml;k "
-"igen."
+"Detta betyder att r&auml;ttighet eller utrymme saknas p&aring; FTP servern "
+"f&ouml;r att lagra filen. Kontrollera s&ouml;kv&auml;g, r&auml;ttigheter och "
+"diskutrymme och f&ouml;rs&ouml;k igen."
 
 #: templates/ERR_DNS_FAIL:7
 msgid ""
@@ -571,11 +577,11 @@ msgid ""
 "host does not support secure connections, or the proxy is not satisfied with "
 "the host security credentials."
 msgstr ""
-"Denna proxy server och kontaktad server misslyckades med att f&ouml;rhandla fram "
-"en accepterbar s&auml;kerhetsinst&auml;llning f&ouml;r hanteringen av din beg&auml;ran. Det &auml;r "
-"m&ouml;jligt att kontaktad server inte st&ouml;djer s&auml;kra anslutningar, eller att "
-"proxy servern inte r n&ouml;jd med de s&auml;kerhets alternativ eller certifikat som "
-"presenterades av servern."
+"Denna proxy server och kontaktad server misslyckades med att f&ouml;rhandla "
+"fram en accepterbar s&auml;kerhetsinst&auml;llning f&ouml;r hanteringen av "
+"din beg&auml;ran. Det &auml;r m&ouml;jligt att kontaktad server inte st&ouml;"
+"djer s&auml;kra anslutningar, eller att proxy servern inte r n&ouml;jd med "
+"de s&auml;kerhets alternativ eller certifikat som presenterades av servern."
 
 #: templates/ERR_CANNOT_FORWARD:6
 msgid ""
@@ -614,8 +620,8 @@ msgstr ""
 #: templates/ERR_FTP_PUT_ERROR:4
 msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
 msgstr ""
-"Vid f&ouml;rs&ouml;ket att utföra PUT till f&ouml;ljande URL: <a "
-"href=\"%U\">%U</a>"
+"Vid f&ouml;rs&ouml;ket att utföra PUT till f&ouml;ljande URL: <a href=\"%U\">"
+"%U</a>"
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -628,9 +634,9 @@ msgid ""
 "revalidation prohibited by the <q>only-if-cached</q> directive."
 msgstr ""
 "Du har beg&auml;rt ett dokument med <q>only-if-cached</q> cache kontroll "
-"direktivet. Dokumentet &aring;terfanns inte i cache databasen, "
-"<em>eller</em> det kr&auml;vs en uppdatering av cache databasen, men "
-"f&ouml;rhindras av <q>only-if-cached</q> direktivet."
+"direktivet. Dokumentet &aring;terfanns inte i cache databasen, <em>eller</"
+"em> det kr&auml;vs en uppdatering av cache databasen, men f&ouml;rhindras av "
+"<q>only-if-cached</q> direktivet."
 
 #: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8

diff --git a/errors/templates/ERR_ACCESS_DENIED b/errors/templates/ERR_ACCESS_DENIED
index 97c9c94adf1c4593a3937eefd760792e7d51343f..3812c8690a3317d0320b035c9b1e38cfd3150c9d 100644 (file)
--- a/errors/templates/ERR_ACCESS_DENIED
+++ b/errors/templates/ERR_ACCESS_DENIED
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <blockquote id="error">
@@ -16,8 +20,12 @@
 <p>Access control configuration prevents your request from being allowed at this time.  Please contact your service provider if you feel this is incorrect.</p>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
-
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_CACHE_ACCESS_DENIED b/errors/templates/ERR_CACHE_ACCESS_DENIED
index 04f8dd5dec8b9b5c9207c141c89ee1d398f156d2..f6bd6a0926b980c738174dbad54fa9ffce69cd40 100644 (file)
--- a/errors/templates/ERR_CACHE_ACCESS_DENIED
+++ b/errors/templates/ERR_CACHE_ACCESS_DENIED
@@ -5,9 +5,13 @@
 <style type="text/css"><!-- %l --></style>
 </head>
 <body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>Cache Access Denied.</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <blockquote id="error">
@@ -19,6 +23,11 @@
 <p>Please contact the <a href="mailto:%w%W">cache administrator</a> if you have difficulties authenticating yourself or <a href="http://%h/cgi-bin/chpasswd.cgi">change</a> your default password.</p>
 
 <br>
+</div>
+
 <hr> 
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED b/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED
index b5d8588c44ae809f0a0392f60599b3ef6cbd3131..71a4621d2c27ad81567731ade817d6cdb181758c 100644 (file)
--- a/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED
+++ b/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED
@@ -4,9 +4,13 @@
 <title>ERROR: Cache Manager Access Denied</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>Cache Manager Access Denied.</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <blockquote id="error">
@@ -18,6 +22,11 @@
 <p>Please contact the <a href="mailto:%w%W">cache administrator</a> if you have difficulties authenticating yourself or, if you <em>are</em> the administrator, read Squid documentation on cache manager interface and check cache log for more detailed error messages.</p>
 
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_CANNOT_FORWARD b/errors/templates/ERR_CANNOT_FORWARD
index 2e11aecfd9945acb84361a1d3e8a900aa4ccb24b..027b8a808f49f3998246e6e0c40727f313613709 100644 (file)
--- a/errors/templates/ERR_CANNOT_FORWARD
+++ b/errors/templates/ERR_CANNOT_FORWARD
@@ -5,9 +5,13 @@
 <style type="text/css"><!-- %l --></style>
 </head>
 <body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <blockquote id="error">
@@ -19,6 +23,11 @@
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
 
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_CONNECT_FAIL b/errors/templates/ERR_CONNECT_FAIL
index c25f747e94fe3842352ac81d7cf94b4643c152cc..71fae8762d4ebb6a77a14430ae226bd24b5703c2 100644 (file)
--- a/errors/templates/ERR_CONNECT_FAIL
+++ b/errors/templates/ERR_CONNECT_FAIL
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <blockquote id="error">
@@ -20,6 +24,11 @@
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
 
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_DNS_FAIL b/errors/templates/ERR_DNS_FAIL
index eff729bba6031ef08f487768f07ecd4cad9a3d08..adcb022c38781e332163f2988884344df260d82b 100644 (file)
--- a/errors/templates/ERR_DNS_FAIL
+++ b/errors/templates/ERR_DNS_FAIL
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <blockquote id="error">
@@ -21,8 +25,12 @@
 <p>This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.</p>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
-
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_ESI b/errors/templates/ERR_ESI
index 53928bcc96098d757fdb8365ab9f1555e4b8b856..561503006d72173c57c8b633bb1d5a7b628354ba 100644 (file)
--- a/errors/templates/ERR_ESI
+++ b/errors/templates/ERR_ESI
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <blockquote id="error">
@@ -21,8 +25,12 @@
 <p>This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.</p>
 
 <p>Your webmaster is <a href="mailto:%w">%w</a>.</p>
-
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_FORWARDING_DENIED b/errors/templates/ERR_FORWARDING_DENIED
index e025f62d741eec429353b150b127dbfc25a48dcb..34e2a8be6a4b505aa9168b75793b545df239ca1e 100644 (file)
--- a/errors/templates/ERR_FORWARDING_DENIED
+++ b/errors/templates/ERR_FORWARDING_DENIED
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <blockquote id="error">
@@ -18,6 +22,11 @@
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
 
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_FTP_DISABLED b/errors/templates/ERR_FTP_DISABLED
index 4f3d7005d459b421bb54d1afdc4aa4f794151a68..35f230cc640c076bff3ff8b4c444a568bb2d83f8 100644 (file)
--- a/errors/templates/ERR_FTP_DISABLED
+++ b/errors/templates/ERR_FTP_DISABLED
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <blockquote id="error">
@@ -18,6 +22,11 @@
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
 
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_FTP_FAILURE b/errors/templates/ERR_FTP_FAILURE
index 277db453914d33556127917819856f4d9b7fd9dd..4d16a34a7ca350a5a35bd9bae1ae7fb0dbe6876a 100644 (file)
--- a/errors/templates/ERR_FTP_FAILURE
+++ b/errors/templates/ERR_FTP_FAILURE
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>An FTP protocol error occurred while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <p>Squid sent the following FTP command:</p>
@@ -21,8 +25,12 @@
 </blockquote>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
-
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_FTP_FORBIDDEN b/errors/templates/ERR_FTP_FORBIDDEN
index 9a38c1364e3440b0766b558717f34a018a782d2d..1bf0b1ecadce5b764228c36a614beda3a85c100a 100644 (file)
--- a/errors/templates/ERR_FTP_FORBIDDEN
+++ b/errors/templates/ERR_FTP_FORBIDDEN
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>An FTP authentication failure occurred while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <p>Squid sent the following FTP command:</p>
@@ -21,8 +25,12 @@
 </blockquote>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
-
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_FTP_NOT_FOUND b/errors/templates/ERR_FTP_NOT_FOUND
index fd1542fb6f0162987100c1c803536a0b9e848362..635170ccef2b3d584762821f1d9c540b229d6d42 100644 (file)
--- a/errors/templates/ERR_FTP_NOT_FOUND
+++ b/errors/templates/ERR_FTP_NOT_FOUND
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The following URL could not be retrieved: <a href="%U">%U</a></p>
 
 <p>Squid sent the following FTP command:</p>
@@ -23,8 +27,12 @@
 <p>This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738).  If this is the cause, then the file can be found at <a href="%B">%B</a>.</p>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
-
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_FTP_PUT_CREATED b/errors/templates/ERR_FTP_PUT_CREATED
index f53722be2c584fc800de08a3261b1ab0b22ed004..8bab56472d0a56e41bea07e45f524ee002fd4c7d 100644 (file)
--- a/errors/templates/ERR_FTP_PUT_CREATED
+++ b/errors/templates/ERR_FTP_PUT_CREATED
@@ -4,11 +4,17 @@
 <title>FTP PUT Successful: File Created</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1 id="ftpsuccess">Operation successful</h1>
 <h2>File created</h2>
+</div>
 <hr>
 
 <br>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_FTP_PUT_ERROR b/errors/templates/ERR_FTP_PUT_ERROR
index d0accc56d0e7085a9a7a7272b1d35d9bbc08eb62..6cb1a8ebd23f0ec70014964b1d4f5b7d3f213aeb 100644 (file)
--- a/errors/templates/ERR_FTP_PUT_ERROR
+++ b/errors/templates/ERR_FTP_PUT_ERROR
@@ -4,9 +4,13 @@
 <title>ERROR: FTP upload failed</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>FTP PUT/upload failed</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>While trying to PUT the following URL: <a href="%U">%U</a></p>
 
 <p>Squid sent the following FTP command:</p>
@@ -22,8 +26,12 @@
 <p>This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.</p>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
-
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_FTP_PUT_MODIFIED b/errors/templates/ERR_FTP_PUT_MODIFIED
index c4a369d98b7cf9cf067c6c6c4eea170a86fd168f..b4138c845c3054fffaeb1907ee9f452220842918 100644 (file)
--- a/errors/templates/ERR_FTP_PUT_MODIFIED
+++ b/errors/templates/ERR_FTP_PUT_MODIFIED
@@ -1,14 +1,20 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>FTP PUT Successful: File updated</title>
+<title>FTP PUT Successful: File Updated</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1 id="ftpsuccess">Operation successful</h1>
 <h2>File updated</h2>
+</div>
 <hr>
 
 <br>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_FTP_UNAVAILABLE b/errors/templates/ERR_FTP_UNAVAILABLE
index b367faff46df1a742ab3482f2d6d29f94d91c582..621e56d62956d7d3ff3a7136e889900a88f54838 100644 (file)
--- a/errors/templates/ERR_FTP_UNAVAILABLE
+++ b/errors/templates/ERR_FTP_UNAVAILABLE
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The FTP server was too busy to retrieve the URL: <a href="%U">%U</a></p>
 
 <p>Squid sent the following FTP command:</p>
@@ -22,8 +26,12 @@
 </blockquote>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
-
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_ICAP_FAILURE b/errors/templates/ERR_ICAP_FAILURE
index 3e95873dc1c9d1cb37d8c7b22ea0d62d2364693b..3b7b9450e3ca2e84081df451fda30b0a5bfedc12 100644 (file)
--- a/errors/templates/ERR_ICAP_FAILURE
+++ b/errors/templates/ERR_ICAP_FAILURE
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <blockquote id="error">
@@ -24,6 +28,11 @@
 </ul>
 
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_INVALID_REQ b/errors/templates/ERR_INVALID_REQ
index 07813f7863e2b24e4fe79dbf3310c9bf4575bb56..3a61aa86e80473bcefe1ddeed7e8677a436ebfca 100644 (file)
--- a/errors/templates/ERR_INVALID_REQ
+++ b/errors/templates/ERR_INVALID_REQ
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p><b>Invalid Request</b> error was encountered while trying to process the request:</p>
 
 <blockquote id="data">
@@ -24,8 +28,12 @@
 </ul>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
-
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_INVALID_RESP b/errors/templates/ERR_INVALID_RESP
index 8b754577e1f1b28781c477385df8715a670e6f93..23dfecb0f5873b603b0954f6f0cbadf25be51f2a 100644 (file)
--- a/errors/templates/ERR_INVALID_RESP
+++ b/errors/templates/ERR_INVALID_RESP
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p><b>Invalid Response</b> error was encountered while trying to process the request:</p>
 
 <blockquote id="data">
@@ -18,8 +22,12 @@
 <p>Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.</p>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
-
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_INVALID_URL b/errors/templates/ERR_INVALID_URL
index eac579c4eb215a0eabd9af3782094cee88f57055..652cb7841d758a9602477806dfc7b97e29f9936a 100644 (file)
--- a/errors/templates/ERR_INVALID_URL
+++ b/errors/templates/ERR_INVALID_URL
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <blockquote id="error">
@@ -24,8 +28,12 @@
 </ul>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
-
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_LIFETIME_EXP b/errors/templates/ERR_LIFETIME_EXP
index d2c6b46b8ff1af8265a90c97d45e5617048fbd57..d322f684ec9e2ee3ea94508af889a82785f2e93f 100644 (file)
--- a/errors/templates/ERR_LIFETIME_EXP
+++ b/errors/templates/ERR_LIFETIME_EXP
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <blockquote id="error">
@@ -16,8 +20,12 @@
 <p>Squid has terminated the request because it has exceeded the maximum connection lifetime.</p>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
-
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_NO_RELAY b/errors/templates/ERR_NO_RELAY
index 992497a56148192b253ff6e146047c77397fb42f..bfdb7f1e0b95e2051485e139e2d3bc7da31c8044 100644 (file)
--- a/errors/templates/ERR_NO_RELAY
+++ b/errors/templates/ERR_NO_RELAY
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <blockquote id="error">
@@ -16,8 +20,12 @@
 <p>There is no WAIS Relay host defined for this Cache!  Yell at the administrator.</p>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
-
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_ONLY_IF_CACHED_MISS b/errors/templates/ERR_ONLY_IF_CACHED_MISS
index 99200a0961e1119637c80f28d085f01d436c3b7a..5a5cebb46962323ecca66bb44ddaa40776bbb7ef 100644 (file)
--- a/errors/templates/ERR_ONLY_IF_CACHED_MISS
+++ b/errors/templates/ERR_ONLY_IF_CACHED_MISS
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <blockquote id="error">
@@ -16,8 +20,12 @@
 <p>You have issued a request with a <q>only-if-cached</q> cache control directive. The document was not found in the cache, <em>or</em> it required revalidation prohibited by the <q>only-if-cached</q> directive.</p>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
-
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_READ_ERROR b/errors/templates/ERR_READ_ERROR
index 56633bd436c761447b5d6f6c38455eb0c582c0e3..7945872cef548058f9cadcef2181a6537fcab634 100644 (file)
--- a/errors/templates/ERR_READ_ERROR
+++ b/errors/templates/ERR_READ_ERROR
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <blockquote id="error">
@@ -18,8 +22,12 @@
 <p>An error condition occurred while reading data from the network.  Please retry your request.</p>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
-
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_READ_TIMEOUT b/errors/templates/ERR_READ_TIMEOUT
index 6b9642490c962f7317c085e73aa83dae429b4fa1..3333f2481c7613141ea869a253d9e45898639608 100644 (file)
--- a/errors/templates/ERR_READ_TIMEOUT
+++ b/errors/templates/ERR_READ_TIMEOUT
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <blockquote id="error">
@@ -18,8 +22,12 @@
 <p>A Timeout occurred while waiting to read data from the network.  The network or server may be down or congested.  Please retry your request.</p>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
-
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_SECURE_CONNECT_FAIL b/errors/templates/ERR_SECURE_CONNECT_FAIL
index f6bc7787193795dfb48704c6a9f4bef11be96863..087f629d188a34803a90d5213582ade2653797f8 100644 (file)
--- a/errors/templates/ERR_SECURE_CONNECT_FAIL
+++ b/errors/templates/ERR_SECURE_CONNECT_FAIL
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <blockquote id="error">
@@ -18,8 +22,12 @@
 <p>This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.</p>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
-
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_SHUTTING_DOWN b/errors/templates/ERR_SHUTTING_DOWN
index 6b0e5c012e3d8cf67e2096bc3af10e8205e53eab..46f17f6a4d84c94885cffd0ea0cd4003b8363d3c 100644 (file)
--- a/errors/templates/ERR_SHUTTING_DOWN
+++ b/errors/templates/ERR_SHUTTING_DOWN
@@ -4,16 +4,24 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
-<p> The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p>
+
+<div id="content">
+<p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <p>This cache is in the process of shutting down and can not service your request at this time.  Please retry your request again soon.</p>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
-
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_SOCKET_FAILURE b/errors/templates/ERR_SOCKET_FAILURE
index c4d2adeb099c36a6411ca438e7bdc912b98d6bc5..19012a9a0a9611a0ec2d0c58d9d39003f6613e4d 100644 (file)
--- a/errors/templates/ERR_SOCKET_FAILURE
+++ b/errors/templates/ERR_SOCKET_FAILURE
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <blockquote id="error">
@@ -18,8 +22,12 @@
 <p>Squid is unable to create a TCP socket, presumably due to excessive load. Please retry your request.</p>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
-
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_TOO_BIG b/errors/templates/ERR_TOO_BIG
index bfb95b625792e16f4e49fbbe6c48ffac66674f0d..2995b2682562053c7778e7a2bb3d05573e423141 100644 (file)
--- a/errors/templates/ERR_TOO_BIG
+++ b/errors/templates/ERR_TOO_BIG
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <blockquote id="error">
@@ -18,8 +22,12 @@
 <p>These limits have been established by the Internet Service Provider who operates this cache.  Please contact them directly if you feel this is an error.</p>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
-
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_UNSUP_REQ b/errors/templates/ERR_UNSUP_REQ
index b4768a3a9af2f7133d97ad09b9a6754ee1bbe93c..7598d2be236c2e7461407985a74e64485dcbba6c 100644 (file)
--- a/errors/templates/ERR_UNSUP_REQ
+++ b/errors/templates/ERR_UNSUP_REQ
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <blockquote id="error">
@@ -16,8 +20,12 @@
 <p>Squid does not support all request methods for all access protocols. For example, you can not POST a Gopher request.</p>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
-
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_URN_RESOLVE b/errors/templates/ERR_URN_RESOLVE
index e71ecd7136b802da4807aed1a8ed384ae6b48c8b..cd2228f1d7e55f2a14a1aa9cd8cadadc114da4d0 100644 (file)
--- a/errors/templates/ERR_URN_RESOLVE
+++ b/errors/templates/ERR_URN_RESOLVE
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URN not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>A URL for the requested URN could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The following error was encountered while trying to retrieve the URN: <a href="%U">%U</a></p>
 
 <blockquote id="error">
@@ -16,8 +20,12 @@
 <p>Hey, don't expect too much from URNs on %T :)</p>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
-
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_WRITE_ERROR b/errors/templates/ERR_WRITE_ERROR
index 78b9b13d25572b8a16fb3666ed84148cbbc931a5..d47a0e222aa4e962b4dc7abc0637542384bf545d 100644 (file)
--- a/errors/templates/ERR_WRITE_ERROR
+++ b/errors/templates/ERR_WRITE_ERROR
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <blockquote id="error">
@@ -18,8 +22,12 @@
 <p>An error condition occurred while writing to the network.  Please retry your request.</p>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
-
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/ERR_ZERO_SIZE_OBJECT b/errors/templates/ERR_ZERO_SIZE_OBJECT
index 85cc32420e54c3165ef70c8113cb086ed84897b1..3f8579fae87900b820e0d9df75cea3c0cd9c5e1e 100644 (file)
--- a/errors/templates/ERR_ZERO_SIZE_OBJECT
+++ b/errors/templates/ERR_ZERO_SIZE_OBJECT
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <blockquote id="error">
@@ -16,8 +20,12 @@
 <p>Squid did not receive any data for this request.</p>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
-
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/templates/generic b/errors/templates/generic
index 8990c472551198537dc1bac440c50b5d13c66dbc..ed5e8b7d2a33d9b3bd892596be7e1ffca89e6c29 100644 (file)
--- a/errors/templates/generic
+++ b/errors/templates/generic
@@ -4,9 +4,13 @@
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- %l --></style>
 </head><body>
+<div id="titles">
 <h1>ERROR</h1>
 <h2>The requested URL could not be retrieved</h2>
+</div>
 <hr>
+
+<div id="content">
 <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p>
 
 <blockquote id="error">
@@ -21,6 +25,11 @@
 </blockquote>
 
 <br>
+</div>
+
 <hr>
-<div id="footer">Generated %T by %h (%s)</div>
+<div id="footer">
+<p>Generated %T by %h (%s)</p>
+<!-- %c -->
+</div>
 </body></html>

diff --git a/errors/uk.po b/errors/uk.po
index c6023f702eb74330f8ddb6f5fd7f974985221c99..d306cfddcd4a79d2ef4c5270789827f8885af7e9 100644 (file)
--- a/errors/uk.po
+++ b/errors/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-29 15:05+1300\n"
+"POT-Creation-Date: 2008-10-27 17:13+1300\n"
 "PO-Revision-Date: 2008-09-24 23:28+0000\n"
 "Last-Translator: FrenzY <frenzy.ivan@gmail.com>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -136,6 +136,7 @@ msgid "ERROR: Cache Manager Access Denied"
 msgstr "Доступ до Менеджеру Кешу Заборонено"
 
 #: templates/ERR_FTP_PUT_ERROR:1
+#, fuzzy
 msgid "ERROR: FTP upload failed"
 msgstr "ПОМИЛКА: FTP завантаження невдале"
 
@@ -168,7 +169,8 @@ msgid "FTP PUT Successful: File Created"
 msgstr "FTP PUT Вдалий: Файл Створено"
 
 #: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File updated"
+#, fuzzy
+msgid "FTP PUT Successful: File Updated"
 msgstr "FTP PUT Вдалий: Файл Оновлено"
 
 #: templates/ERR_FTP_PUT_ERROR:3

diff --git a/errors/zh-cn.po b/errors/zh-cn.po
index 9cef9ca5eb2aa373ae29775be61151c9c996bfd7..ef3d4447f9899164e4e2ff39acff066fadcc6005 100644 (file)
--- a/errors/zh-cn.po
+++ b/errors/zh-cn.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-29 15:05+1300\n"
+"POT-Creation-Date: 2008-10-27 17:13+1300\n"
 "PO-Revision-Date: 2008-10-24 02:32+0000\n"
 "Last-Translator: Mr.Lodar <Unknown>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
@@ -28,7 +28,8 @@ msgstr "<b>非法响应</b> 尝试处理请求时发生错误:"
 msgid ""
 "A Timeout occurred while waiting to read data from the network.  The network "
 "or server may be down or congested.  Please retry your request."
-msgstr "等待从网络读取数据时发生超时。 网络或服务器下线或拥挤。  请重新发送你的请求。"
+msgstr ""
+"等待从网络读取数据时发生超时。 网络或服务器下线或拥挤。  请重新发送你的请求。"
 
 #: templates/ERR_URN_RESOLVE:3
 msgid "A URL for the requested URN could not be retrieved"
@@ -53,8 +54,8 @@ msgstr "尝试获取 URL: <a href=\"%U\">%U</a> 时发生一个FTP认证错误"
 
 #: templates/ERR_FTP_FAILURE:4
 msgid ""
-"An FTP protocol error occurred while trying to retrieve the URL: <a "
-"href=\"%U\">%U</a>"
+"An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
+"\">%U</a>"
 msgstr "尝试获取该URL:<a href=\"%U\">%U</a>时发生一个FTP协议错误"
 
 #: templates/ERR_ICAP_FAILURE:10
@@ -125,6 +126,7 @@ msgid "ERROR: Cache Manager Access Denied"
 msgstr "错误: 缓存管理访问被拒绝"
 
 #: templates/ERR_FTP_PUT_ERROR:1
+#, fuzzy
 msgid "ERROR: FTP upload failed"
 msgstr "错误: FTP上传失败"
 
@@ -157,7 +159,8 @@ msgid "FTP PUT Successful: File Created"
 msgstr "FTP PUT 成功: 文件已创建"
 
 #: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File updated"
+#, fuzzy
+msgid "FTP PUT Successful: File Updated"
 msgstr "FTP PUT 成功: 文件已更新"
 
 #: templates/ERR_FTP_PUT_ERROR:3
@@ -267,8 +270,8 @@ msgstr ""
 #: templates/ERR_CACHE_ACCESS_DENIED:7
 msgid ""
 "Please contact the <a href=\"mailto:%w%W\">cache administrator</a> if you "
-"have difficulties authenticating yourself or <a href=\"http://%h/cgi-"
-"bin/chpasswd.cgi\">change</a> your default password."
+"have difficulties authenticating yourself or <a href=\"http://%h/cgi-bin/"
+"chpasswd.cgi\">change</a> your default password."
 msgstr ""
 
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:7
@@ -353,8 +356,7 @@ msgid "The ESI processor returned:"
 msgstr ""
 
 #: templates/ERR_FTP_UNAVAILABLE:4
-msgid ""
-"The FTP server was too busy to retrieve the URL: <a href=\"%U\">%U</a>"
+msgid "The FTP server was too busy to retrieve the URL: <a href=\"%U\">%U</a>"
 msgstr ""
 
 #: templates/ERR_INVALID_RESP:5
@@ -394,8 +396,7 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_CONNECT_FAIL:7
-msgid ""
-"The remote host or network may be down.  Please try the request again."
+msgid "The remote host or network may be down.  Please try the request again."
 msgstr ""
 
 #: templates/ERR_TOO_BIG:5