From: wessels <> Date: Tue, 14 Oct 1997 23:52:31 +0000 (+0000) Subject: finish giving content to error messages X-Git-Tag: SQUID_3_0_PRE1~4797 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6635d4e6416d5611f912e13aff5f51f119a309f;p=thirdparty%2Fsquid.git finish giving content to error messages deleted some which we don't need any longer --- diff --git a/errors/English/ERR_ACCESS_DENIED b/errors/English/ERR_ACCESS_DENIED index 5a07ef0141..cd83f2e0b3 100644 --- a/errors/English/ERR_ACCESS_DENIED +++ b/errors/English/ERR_ACCESS_DENIED @@ -6,23 +6,17 @@
While trying to retrieve the URL: -%u +%U
The following error was encountered:
-The system returned: -
@XSTRERROR@- -
-This means that: -
- @LONG_DESCRIPTION@ -+Access control configuration prevents your request from +being allowed at this time. Please contact your service provider if +you feel this is incorrect. + diff --git a/errors/English/ERR_CANNOT_FORWARD b/errors/English/ERR_CANNOT_FORWARD index 5a07ef0141..de107e06e5 100644 --- a/errors/English/ERR_CANNOT_FORWARD +++ b/errors/English/ERR_CANNOT_FORWARD @@ -6,23 +6,17 @@
While trying to retrieve the URL: -%u +%U
The following error was encountered:
-The system returned: -
@XSTRERROR@- -
-This means that: -
- @LONG_DESCRIPTION@ -- +This cache will not forward your request because it is trying to enforce a +sibling relationship. Perhaps the client at %i is a cache which has been +misconfigured. diff --git a/errors/English/ERR_CONNECT_FAIL b/errors/English/ERR_CONNECT_FAIL index 5a07ef0141..bf4dbefa72 100644 --- a/errors/English/ERR_CONNECT_FAIL +++ b/errors/English/ERR_CONNECT_FAIL @@ -6,23 +6,19 @@
While trying to retrieve the URL: -%u +%U
The following error was encountered:
The system returned: -
@XSTRERROR@+
%E
-This means that: -
- @LONG_DESCRIPTION@ -- +The remote host or network may be down. Please try the request again. diff --git a/errors/English/ERR_FTP_DISABLED b/errors/English/ERR_FTP_DISABLED index 5a07ef0141..53d038d5c4 100644 --- a/errors/English/ERR_FTP_DISABLED +++ b/errors/English/ERR_FTP_DISABLED @@ -6,23 +6,15 @@
While trying to retrieve the URL: -%u +%U
The following error was encountered:
-The system returned: -
@XSTRERROR@- -
-This means that: -
- @LONG_DESCRIPTION@ -- +This cache does not support FTP. diff --git a/errors/English/ERR_INVALID_REQ b/errors/English/ERR_INVALID_REQ index 5a07ef0141..f215c15e70 100644 --- a/errors/English/ERR_INVALID_REQ +++ b/errors/English/ERR_INVALID_REQ @@ -6,23 +6,23 @@
While trying to retrieve the URL: -%u +%U
The following error was encountered:
-The system returned: -
@XSTRERROR@- -
-This means that: -
- @LONG_DESCRIPTION@ -- +Some aspect of the HTTP Request is invalid. Possible problems: +
While trying to retrieve the URL: -%u +%U
The following error was encountered:
-The system returned: -
@XSTRERROR@- -
-This means that: -
- @LONG_DESCRIPTION@ -- +Some aspect of the requested URL is incorrect. Possible problems: +
While trying to retrieve the URL: -%u +%U
The following error was encountered:
-The system returned: -
@XSTRERROR@- -
-This means that: -
- @LONG_DESCRIPTION@ -- +Squid has terminated the request because it has exceeded the maximum +connection lifetime. diff --git a/errors/English/ERR_NO_RELAY b/errors/English/ERR_NO_RELAY index 5a07ef0141..eba4c7dedc 100644 --- a/errors/English/ERR_NO_RELAY +++ b/errors/English/ERR_NO_RELAY @@ -6,23 +6,15 @@
While trying to retrieve the URL: -%u +%U
The following error was encountered:
-The system returned: -
@XSTRERROR@- -
-This means that: -
- @LONG_DESCRIPTION@ -- +There is no WAIS Relay host defined for this Cache! Yell at the administrator. diff --git a/errors/English/ERR_READ_ERROR b/errors/English/ERR_READ_ERROR index 5a07ef0141..cb56339edc 100644 --- a/errors/English/ERR_READ_ERROR +++ b/errors/English/ERR_READ_ERROR @@ -6,23 +6,20 @@
While trying to retrieve the URL: -%u +%U
The following error was encountered:
The system returned: -
@XSTRERROR@+
%E
-This means that: -
- @LONG_DESCRIPTION@ -- +An error condition occurred while reading data from the network. Please +retry your request. diff --git a/errors/English/ERR_READ_TIMEOUT b/errors/English/ERR_READ_TIMEOUT index 5a07ef0141..99606f61da 100644 --- a/errors/English/ERR_READ_TIMEOUT +++ b/errors/English/ERR_READ_TIMEOUT @@ -6,23 +6,20 @@
While trying to retrieve the URL: -%u +%U
The following error was encountered:
The system returned: -
@XSTRERROR@+
%E
-This means that: -
- @LONG_DESCRIPTION@ -- +A Timeout occurred while waiting to read data from the network. The network +or server may be down or congested. Please retry your request. diff --git a/errors/English/ERR_SOCKET_FAILURE b/errors/English/ERR_SOCKET_FAILURE index 5a07ef0141..a7c4a1bc97 100644 --- a/errors/English/ERR_SOCKET_FAILURE +++ b/errors/English/ERR_SOCKET_FAILURE @@ -6,23 +6,20 @@
While trying to retrieve the URL: -%u +%U
The following error was encountered:
The system returned: -
@XSTRERROR@+
%E
-This means that: -
- @LONG_DESCRIPTION@ -- +Squid is unable to create a TCP socket, presumably due to excessive load. +Please retry your request. diff --git a/errors/English/ERR_UNSUP_REQ b/errors/English/ERR_UNSUP_REQ index 5a07ef0141..bea2be04df 100644 --- a/errors/English/ERR_UNSUP_REQ +++ b/errors/English/ERR_UNSUP_REQ @@ -6,23 +6,16 @@
While trying to retrieve the URL: -%u +%U
The following error was encountered:
-The system returned: -
@XSTRERROR@- -
-This means that: -
- @LONG_DESCRIPTION@ -- +Squid does not support all request methods for all access protocols. +For example, you can not POST a Gopher request. diff --git a/errors/English/ERR_WRITE_ERROR b/errors/English/ERR_WRITE_ERROR index 5a07ef0141..967089e188 100644 --- a/errors/English/ERR_WRITE_ERROR +++ b/errors/English/ERR_WRITE_ERROR @@ -6,23 +6,20 @@
While trying to retrieve the URL: -%u +%U
The following error was encountered:
The system returned: -
@XSTRERROR@+
%E
-This means that: -
- @LONG_DESCRIPTION@ -- +An error condition occurred while writing to the network. Please retry your +request. diff --git a/errors/English/ERR_ZERO_SIZE_OBJECT b/errors/English/ERR_ZERO_SIZE_OBJECT index 5a07ef0141..6e391636f4 100644 --- a/errors/English/ERR_ZERO_SIZE_OBJECT +++ b/errors/English/ERR_ZERO_SIZE_OBJECT @@ -6,23 +6,15 @@
While trying to retrieve the URL: -%u +%U
The following error was encountered:
-The system returned: -
@XSTRERROR@- -
-This means that: -
- @LONG_DESCRIPTION@ -- +Squid did not receive any data for this request. diff --git a/errors/English/generic b/errors/English/generic index 5a07ef0141..0810751f51 100644 --- a/errors/English/generic +++ b/errors/English/generic @@ -6,7 +6,7 @@
While trying to retrieve the URL: -%u +%U
The following error was encountered:
The system returned: -
@XSTRERROR@+
%E
This means that: