From: Amos Jeffries Date: Mon, 14 Jul 2008 16:07:30 +0000 (+1200) Subject: Boost English error pages to HTML 4.01 Strict compliance X-Git-Tag: SQUID_3_1_0_1~49^2~144 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c3b7082ae959bb7d246c18d56be0154ad5498a8e;p=thirdparty%2Fsquid.git Boost English error pages to HTML 4.01 Strict compliance Same old error layouts and messages. Just the minimal polish required for current HTML standards compliance at this time. non-English are not updated at this time. --- diff --git a/errors/English/ERR_ACCESS_DENIED b/errors/English/ERR_ACCESS_DENIED index 806d4559c3..a2eb6d0559 100644 --- a/errors/English/ERR_ACCESS_DENIED +++ b/errors/English/ERR_ACCESS_DENIED @@ -1,25 +1,18 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-While trying to retrieve the URL: -%U -

-The following error was encountered: -

-

Your cache administrator is %w. + + + +ERROR: The requested URL could not be retrieved + + +

ERROR

+

The requested URL could not be retrieved

+
+

The following error was encountered while trying to retrieve the URL: %U

+
+

Access Denied.

+
+ +

Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect.

+ +

Your cache administrator is %w.

diff --git a/errors/English/ERR_CACHE_ACCESS_DENIED b/errors/English/ERR_CACHE_ACCESS_DENIED index 38c9faea19..434a160cf7 100644 --- a/errors/English/ERR_CACHE_ACCESS_DENIED +++ b/errors/English/ERR_CACHE_ACCESS_DENIED @@ -1,34 +1,20 @@ - - -ERROR: Cache Access Denied - - - -

ERROR

-

Cache Access Denied

-
-

-While trying to retrieve the URL: -%U -

-The following error was encountered: -

-

+ + + +ERROR: Cache Access Denied + + + +

ERROR

+

Cache Access Denied

+
+

The following error was encountered while trying to retrieve the URL: %U

-

Sorry, you are not currently allowed to request: -

    %U
-from this cache until you have authenticated yourself. -

+
+

Cache Access Denied.

+
-

-You need to use Netscape version 2.0 or greater, or Microsoft Internet -Explorer 3.0, or an HTTP/1.1 compliant browser for this to work. Please -contact the cache administrator if you have -difficulties authenticating yourself or -change your default password. -

+

Sorry, you are not currently allowed to request %U from this cache until you have authenticated yourself.

+ +

You need to use Netscape version 2.0 or greater, or Microsoft Internet Explorer 3.0, or an HTTP/1.1 compliant browser for this to work.

+

Please contact the cache administrator if you have difficulties authenticating yourself or change your default password.

diff --git a/errors/English/ERR_CACHE_MGR_ACCESS_DENIED b/errors/English/ERR_CACHE_MGR_ACCESS_DENIED index d45840dc0a..dbd4bfe4f6 100644 --- a/errors/English/ERR_CACHE_MGR_ACCESS_DENIED +++ b/errors/English/ERR_CACHE_MGR_ACCESS_DENIED @@ -1,33 +1,19 @@ - - -ERROR: Cache Manager Access Denied - - - -

ERROR

-

Cache Manager Access Denied

-
-

-While trying to retrieve the URL: -%U -

-The following error was encountered: -

-

+ + + +ERROR: Cache Manager Access Denied + + +

ERROR

+

Cache Manager Access Denied

+
+

The following error was encountered while trying to retrieve the URL: %U

-

Sorry, you are not currently allowed to request: -

    %U
-from this cache manager until you have authenticated yourself. -

+
+

Cache Manager Access Denied.

+
-

You need to use Netscape version 2.0 or greater, or Microsoft Internet -Explorer 3.0, or an HTTP/1.1 compliant browser for this to work. Please -contact the cache administrator if you have -difficulties authenticating yourself or, if you are the -administrator, read Squid documentation on cache manager interface and check -cache log for more detailed error messages.

+

Sorry, you are not currently allowed to request %U from this cache manager until you have authenticated yourself.

+ +

You need to use Netscape version 2.0 or greater, or Microsoft Internet Explorer 3.0, or an HTTP/1.1 compliant browser for this to work.

+

Please contact the cache administrator if you have difficulties authenticating yourself or, if you are the administrator, read Squid documentation on cache manager interface and check cache log for more detailed error messages.

diff --git a/errors/English/ERR_CANNOT_FORWARD b/errors/English/ERR_CANNOT_FORWARD index 43ccc8a4f0..1f49d9578b 100644 --- a/errors/English/ERR_CANNOT_FORWARD +++ b/errors/English/ERR_CANNOT_FORWARD @@ -1,29 +1,19 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-While trying to retrieve the URL: -%U -

-The following error was encountered: -

+ + + +ERROR: The requested URL could not be retrieved + + + +

ERROR

+

The requested URL could not be retrieved

+
+

The following error was encountered while trying to retrieve the URL: %U

-

-This request could not be forwarded to the origin server or to any -parent caches. The most likely cause for this error is that: -

-

Your cache administrator is %w. +

+

Unable to forward this request at this time.

+
+ +

This request could not be forwarded to the origin server or to any parent caches. The most likely cause for this error is that the cache administrator does not allow this cache to make direct connections to origin servers, and all configured parent caches are currently unreachable.

+ +

Your cache administrator is %w.

diff --git a/errors/English/ERR_CONNECT_FAIL b/errors/English/ERR_CONNECT_FAIL index 43e04be4d3..9d061e5f97 100644 --- a/errors/English/ERR_CONNECT_FAIL +++ b/errors/English/ERR_CONNECT_FAIL @@ -1,27 +1,22 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-While trying to retrieve the URL: -%U -

-The following error was encountered: -

+ + + +ERROR: The requested URL could not be retrieved + + +

ERROR

+

The requested URL could not be retrieved

+
+

The following error was encountered while trying to retrieve the URL: %U

+
+

Connection to %I Failed.

+
-

-The system returned: -

    %E
+

The system returned:

-

-The remote host or network may be down. Please try the request again. -

Your cache administrator is %w. +

+

%E

+
+ +

The remote host or network may be down. Please try the request again.

+

Your cache administrator is %w.

diff --git a/errors/English/ERR_DNS_FAIL b/errors/English/ERR_DNS_FAIL index 006bbb17b9..78e97040df 100644 --- a/errors/English/ERR_DNS_FAIL +++ b/errors/English/ERR_DNS_FAIL @@ -1,30 +1,22 @@ - - -ERROR: The requested URL could not be retrieved - - -

The requested URL could not be retrieved

-
-

-While trying to retrieve the URL: -%U -

-The following error was encountered: -

-Unable to determine IP address from host name for -%H -
+ + + +ERROR: The requested URL could not be retrieved + + +

ERROR

+

The requested URL could not be retrieved

+
+

The following error was encountered while trying to retrieve the URL: %U

-

-The dnsserver returned: -

-%z -
+
+

Unable to determine IP address from host name %H

+
-

-This means that: -

- The cache was not able to resolve the hostname presented in the URL. 
- Check if the address is correct. 
-
-

Your cache administrator is %w. +

The dnsserver returned:

+
+

%z

+
+ +

This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.

+

Your cache administrator is %w.

diff --git a/errors/English/ERR_ESI b/errors/English/ERR_ESI index c3da99021e..90595bddc6 100644 --- a/errors/English/ERR_ESI +++ b/errors/English/ERR_ESI @@ -1,28 +1,23 @@ - - -ERROR: The requested URL could not be retrieved - - -

The requested URL could not be retrieved

-
-

-While trying to retrieve the URL: -%U -

-The following error was encountered: -

-ESI Processing failed. -
+ + + +ERROR: The requested URL could not be retrieved + + +

ERROR

+

The requested URL could not be retrieved

+
+

The following error was encountered while trying to retrieve the URL: %U

-

-The ESI processor returned: -

-%Z -
+
+

ESI Processing failed.

+
-

-This means that: -

- The surrogate was not able to process the ESI template. Please report this error to the webmaster. 
-
-

Your webmaster is %w. +

The ESI processor returned:

+
+

%Z

+
+ +

This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.

+ +

Your webmaster is %w.

diff --git a/errors/English/ERR_FORWARDING_DENIED b/errors/English/ERR_FORWARDING_DENIED index 3fb8dbfcad..d735afefd8 100644 --- a/errors/English/ERR_FORWARDING_DENIED +++ b/errors/English/ERR_FORWARDING_DENIED @@ -1,25 +1,17 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-While trying to retrieve the URL: -%U -

-The following error was encountered: -

+ + + +ERROR: The requested URL could not be retrieved + + +

ERROR

+

The requested URL could not be retrieved

+
+

The following error was encountered while trying to retrieve the URL: %U

-

-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. -

Your cache administrator is %w. +

+

Forwarding Denied.

+
+ +

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.

+

Your cache administrator is %w.

diff --git a/errors/English/ERR_FTP_DISABLED b/errors/English/ERR_FTP_DISABLED index 4dbe2bf209..8fdf33532a 100644 --- a/errors/English/ERR_FTP_DISABLED +++ b/errors/English/ERR_FTP_DISABLED @@ -1,23 +1,17 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-While trying to retrieve the URL: -%U -

-The following error was encountered: -

+ + + +ERROR: The requested URL could not be retrieved + + +

ERROR

+

The requested URL could not be retrieved

+
+

The following error was encountered while trying to retrieve the URL: %U

-

-This cache does not support FTP. -

Your cache administrator is %w. +

+

FTP is Disabled

+
+ +

This cache does not support FTP.

+

Your cache administrator is %w.

diff --git a/errors/English/ERR_FTP_FAILURE b/errors/English/ERR_FTP_FAILURE index 67c861386d..debe66754c 100644 --- a/errors/English/ERR_FTP_FAILURE +++ b/errors/English/ERR_FTP_FAILURE @@ -1,19 +1,23 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-An FTP protocol error occurred -while trying to retrieve the URL: -%U -

-Squid sent the following FTP command: -

%f
-and then received this reply -
%F
-
%g
-

Your cache administrator is %w. + + + +ERROR: The requested URL could not be retrieved + + +

ERROR

+

The requested URL could not be retrieved

+
+

An FTP protocol error occurred while trying to retrieve the URL: %U

+ +

Squid sent the following FTP command:

+
+

%f

+
+ +

The server responded with:

+
+

%F

+

%g

+
+ +

Your cache administrator is %w.

diff --git a/errors/English/ERR_FTP_FORBIDDEN b/errors/English/ERR_FTP_FORBIDDEN index ca8cff3899..6dfccc5907 100644 --- a/errors/English/ERR_FTP_FORBIDDEN +++ b/errors/English/ERR_FTP_FORBIDDEN @@ -1,19 +1,23 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-An FTP authentication failure occurred -while trying to retrieve the URL: -%U -

-Squid sent the following FTP command: -

%f
-and then received this reply -
%F
-
%g
-

Your cache administrator is %w. + + + +ERROR: The requested URL could not be retrieved + + +

ERROR

+

The requested URL could not be retrieved

+
+

An FTP authentication failure occurred while trying to retrieve the URL: %U

+ +

Squid sent the following FTP command: +

+

%f

+
+ +

The server responded with:

+
+

%F

+

%g

+
+ +

Your cache administrator is %w.

diff --git a/errors/English/ERR_FTP_NOT_FOUND b/errors/English/ERR_FTP_NOT_FOUND index f7a1941a56..b56afa0d25 100644 --- a/errors/English/ERR_FTP_NOT_FOUND +++ b/errors/English/ERR_FTP_NOT_FOUND @@ -1,22 +1,25 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-The following URL could not be retrieved: -%U -

-Squid sent the following FTP command: -

%f
-and then received this reply -
%F
-
%g
-

-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 %B. -

Your cache administrator is %w. + + + +ERROR: The requested URL could not be retrieved + + +

ERROR

+

The requested URL could not be retrieved

+
+

The following URL could not be retrieved: %U

+ +

Squid sent the following FTP command:

+
+

%f

+
+ +

The server responded with:

+
+

%F

+

%g

+
+ +

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 %B.

+ +

Your cache administrator is %w.

diff --git a/errors/English/ERR_FTP_PUT_CREATED b/errors/English/ERR_FTP_PUT_CREATED index c63300221f..af06cc168e 100644 --- a/errors/English/ERR_FTP_PUT_CREATED +++ b/errors/English/ERR_FTP_PUT_CREATED @@ -1,8 +1,9 @@ - - -FTP PUT Successful: File Created - - -

Operation successful

-

File created

-
+ + + +FTP PUT Successful: File Created + + +

Operation successful

+

File created

+
diff --git a/errors/English/ERR_FTP_PUT_ERROR b/errors/English/ERR_FTP_PUT_ERROR index cb105b86e0..9e9f8ea2de 100644 --- a/errors/English/ERR_FTP_PUT_ERROR +++ b/errors/English/ERR_FTP_PUT_ERROR @@ -1,26 +1,24 @@ - - -ERROR: FTP upload failed - - -

ERROR

-

FTP PUT/upload failed

-
-

-While trying to PUT the following URL: -%U -

-Squid sent the following FTP command: -


-        %f
-
-and then received this reply -

-        %F
-
-

-This means that: -

-Check path, permissions, diskspace and try again.
-
-

Your cache administrator is %w. + + + +ERROR: FTP upload failed + + +

ERROR

+

FTP PUT/upload failed

+
+

While trying to PUT the following URL: %U

+ +

Squid sent the following FTP command:

+
+

%f

+
+ +

The server responded with:

+
+

%F

+
+ +

This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

+ +

Your cache administrator is %w.

diff --git a/errors/English/ERR_FTP_PUT_MODIFIED b/errors/English/ERR_FTP_PUT_MODIFIED index 7fc242bb8e..3107485ac7 100644 --- a/errors/English/ERR_FTP_PUT_MODIFIED +++ b/errors/English/ERR_FTP_PUT_MODIFIED @@ -1,8 +1,9 @@ - - -FTP PUT Successful: File updated - - -

Operation successful

-

File updated

-
+ + + +FTP PUT Successful: File updated + + +

Operation successful

+

File updated

+
diff --git a/errors/English/ERR_FTP_UNAVAILABLE b/errors/English/ERR_FTP_UNAVAILABLE index daf035c097..b4837a4a40 100644 --- a/errors/English/ERR_FTP_UNAVAILABLE +++ b/errors/English/ERR_FTP_UNAVAILABLE @@ -1,18 +1,24 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-The FTP server was too busy while trying to retrieve the URL: -%U -

-Squid sent the following FTP command: -

%f
-and then received this reply -
%F
-
%g
-

Your cache administrator is %w. + + + +ERROR: The requested URL could not be retrieved + + +

ERROR

+

The requested URL could not be retrieved

+
+

The FTP server was too busy to retrieve the URL: %U

+ +

Squid sent the following FTP command:

+ +
+

%f

+
+ +

The server responded with:

+
+

%F

+

%g

+
+ +

Your cache administrator is %w.

diff --git a/errors/English/ERR_ICAP_FAILURE b/errors/English/ERR_ICAP_FAILURE index 86334e6dc5..d17eee950b 100644 --- a/errors/English/ERR_ICAP_FAILURE +++ b/errors/English/ERR_ICAP_FAILURE @@ -1,33 +1,24 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-While trying to retrieve the URL: -%U -

-The following error was encountered: -

+ + + +ERROR: The requested URL could not be retrieved + + +

ERROR

+

The requested URL could not be retrieved

+
+

The following error was encountered while trying to retrieve the URL: %U

-

-The system returned: -

    %E
+
+

ICAP protocol error.

+
-

-This means that: -Some aspect of the ICAP communication failed. Possible problems: -

-

+

The system returned: %E

+

This means that some aspect of the ICAP communication failed.

+ +

Possible problems may be:

+ diff --git a/errors/English/ERR_INVALID_REQ b/errors/English/ERR_INVALID_REQ index 15842a0eeb..9e987752b4 100644 --- a/errors/English/ERR_INVALID_REQ +++ b/errors/English/ERR_INVALID_REQ @@ -1,33 +1,28 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-While trying to process the request: -

+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
ERROR

+
The requested URL could not be retrieved

+

+
Invalid Request error was encountered while trying to process the request:

+
+

+
 %R
-

-

-The following error was encountered:
-
    
-
  • 
-
-Invalid Request
-
-

+
+ + +

Some possible problems are:

+ -

-Some aspect of the HTTP Request is invalid. Possible problems: -

-

Your cache administrator is %w. +

Your cache administrator is %w.

diff --git a/errors/English/ERR_INVALID_RESP b/errors/English/ERR_INVALID_RESP index 960968c405..9f59c16f89 100644 --- a/errors/English/ERR_INVALID_RESP +++ b/errors/English/ERR_INVALID_RESP @@ -1,29 +1,22 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-While trying to process the request: -

+
+
+
+ERROR: The requested URL could not be retrieved
+
+
+
ERROR

+
The requested URL could not be retrieved

+

+
Invalid Response error was encountered while trying to process the request:

+
+

+
 %R
-

-

-The following error was encountered:
-
    
-
  • 
-
-Invalid Response
-
-

+
+ + +

The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.

-

-The HTTP Response message received from the contacted server -could not be understood or was otherwise malformed. Please contact -the site operator. Your cache administrator may be able to provide -you with more details about the exact nature of the problem if needed. +

Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.

-

Your cache administrator is %w. +

Your cache administrator is %w.

diff --git a/errors/English/ERR_INVALID_URL b/errors/English/ERR_INVALID_URL index 0b53a18d9b..bf5db834f2 100644 --- a/errors/English/ERR_INVALID_URL +++ b/errors/English/ERR_INVALID_URL @@ -1,29 +1,26 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-While trying to retrieve the URL: -%U -

-The following error was encountered: -

+ + + +ERROR: The requested URL could not be retrieved + + +

ERROR

+

The requested URL could not be retrieved

+
+

The following error was encountered while trying to retrieve the URL: %U

-

-Some aspect of the requested URL is incorrect. Possible problems: -

-

Your cache administrator is %w. +

+

Invalid URL

+
+ +

Some aspect of the requested URL is incorrect.

+ +

Some possible problems are:

+ + +

Your cache administrator is %w.

diff --git a/errors/English/ERR_LIFETIME_EXP b/errors/English/ERR_LIFETIME_EXP index aed65d35d7..55994f7fd5 100644 --- a/errors/English/ERR_LIFETIME_EXP +++ b/errors/English/ERR_LIFETIME_EXP @@ -1,24 +1,18 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-While trying to retrieve the URL: -%U -

-The following error was encountered: -

+ + + +ERROR: The requested URL could not be retrieved + + +

ERROR

+

The requested URL could not be retrieved

+
+

The following error was encountered while trying to retrieve the URL: %U

-

-Squid has terminated the request because it has exceeded the maximum -connection lifetime. -

Your cache administrator is %w. +

+

Connection Lifetime Expired

+
+ +

Squid has terminated the request because it has exceeded the maximum connection lifetime.

+ +

Your cache administrator is %w.

diff --git a/errors/English/ERR_NO_RELAY b/errors/English/ERR_NO_RELAY index a3906576a3..eefd6c2afb 100644 --- a/errors/English/ERR_NO_RELAY +++ b/errors/English/ERR_NO_RELAY @@ -1,23 +1,18 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-While trying to retrieve the URL: -%U -

-The following error was encountered: -

+ + + +ERROR: The requested URL could not be retrieved + + +

ERROR

+

The requested URL could not be retrieved

+
+

The following error was encountered while trying to retrieve the URL: %U

-

-There is no WAIS Relay host defined for this Cache! Yell at the administrator. -

Your cache administrator is %w. +

+

No Wais Relay

+
+ +

There is no WAIS Relay host defined for this Cache! Yell at the administrator.

+ +

Your cache administrator is %w.

diff --git a/errors/English/ERR_ONLY_IF_CACHED_MISS b/errors/English/ERR_ONLY_IF_CACHED_MISS index 958ae54566..b4b133aabb 100644 --- a/errors/English/ERR_ONLY_IF_CACHED_MISS +++ b/errors/English/ERR_ONLY_IF_CACHED_MISS @@ -1,28 +1,18 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-While trying to retrieve the URL: -%U -

-The following error was encountered: -

+ + + +ERROR: The requested URL could not be retrieved + + +

ERROR

+

The requested URL could not be retrieved

+
+

The following error was encountered while trying to retrieve the URL: %U

-

+

+

Valid document was not found in the cache and only-if-cached directive was specified.

+
-You have issued a request with a only-if-cached cache control -directive. The document was not found in the cache, or it required -revalidation prohibited by only-if-cached directive. +

You have issued a request with a only-if-cached cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached directive.

-

Your cache administrator is %w. +

Your cache administrator is %w.

diff --git a/errors/English/ERR_READ_ERROR b/errors/English/ERR_READ_ERROR index c2a8efecb1..73cf257baa 100644 --- a/errors/English/ERR_READ_ERROR +++ b/errors/English/ERR_READ_ERROR @@ -1,28 +1,20 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-While trying to retrieve the URL: -%U -

-The following error was encountered: -

+ + + +ERROR: The requested URL could not be retrieved + + +

ERROR

+

The requested URL could not be retrieved

+
+

The following error was encountered while trying to retrieve the URL: %U

-

-The system returned: -

    %E
+
+

Read Error

+
-

-An error condition occurred while reading data from the network. Please -retry your request. -

Your cache administrator is %w. +

The system returned: %E

+ +

An error condition occurred while reading data from the network. Please retry your request.

+ +

Your cache administrator is %w.

diff --git a/errors/English/ERR_READ_TIMEOUT b/errors/English/ERR_READ_TIMEOUT index 8ce6de1fad..29d172c77f 100644 --- a/errors/English/ERR_READ_TIMEOUT +++ b/errors/English/ERR_READ_TIMEOUT @@ -1,28 +1,20 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-While trying to retrieve the URL: -%U -

-The following error was encountered: -

+ + + +ERROR: The requested URL could not be retrieved + + +

ERROR

+

The requested URL could not be retrieved

+
+

The following error was encountered while trying to retrieve the URL: %U

-

-The system returned: -

    %E
+
+

Read Timeout

+
-

-A Timeout occurred while waiting to read data from the network. The network -or server may be down or congested. Please retry your request. -

Your cache administrator is %w. +

The system returned: %E

+ +

A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request.

+ +

Your cache administrator is %w.

diff --git a/errors/English/ERR_SECURE_CONNECT_FAIL b/errors/English/ERR_SECURE_CONNECT_FAIL index 0cbbe670e9..926579ab1a 100644 --- a/errors/English/ERR_SECURE_CONNECT_FAIL +++ b/errors/English/ERR_SECURE_CONNECT_FAIL @@ -1,31 +1,20 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-While trying to retrieve the URL: -%U -

-The following error was encountered: -

+ + + +ERROR: The requested URL could not be retrieved + + +

ERROR

+

The requested URL could not be retrieved

+
+

The following error was encountered while trying to retrieve the URL: %U

-

-The system returned: -

    %E
+
+

Failed to establish a secure connection to %I

+
-

-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. +

The system returned: %E

-

Your cache administrator is %w. +

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.

+ +

Your cache administrator is %w.

diff --git a/errors/English/ERR_SHUTTING_DOWN b/errors/English/ERR_SHUTTING_DOWN index 8e4b39a9cc..eb5cd7e1c4 100644 --- a/errors/English/ERR_SHUTTING_DOWN +++ b/errors/English/ERR_SHUTTING_DOWN @@ -1,18 +1,14 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-While trying to retrieve the URL: -%U -

-The following error was encountered: -

-This cache is in the process of shutting down and can not -service your request at this time. Please retry your -request again soon. -

Your cache administrator is %w. + + + +ERROR: The requested URL could not be retrieved + + +

ERROR

+

The requested URL could not be retrieved

+
+

The following error was encountered while trying to retrieve the URL: %U

+ +

This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.

+ +

Your cache administrator is %w.

diff --git a/errors/English/ERR_SOCKET_FAILURE b/errors/English/ERR_SOCKET_FAILURE index 186a7658c8..f47a3ade8b 100644 --- a/errors/English/ERR_SOCKET_FAILURE +++ b/errors/English/ERR_SOCKET_FAILURE @@ -1,28 +1,20 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-While trying to retrieve the URL: -%U -

-The following error was encountered: -

+ + + +ERROR: The requested URL could not be retrieved + + +

ERROR

+

The requested URL could not be retrieved

+
+

The following error was encountered while trying to retrieve the URL: %U

-

-The system returned: -

    %E
+
+

Socket Failure

+
-

-Squid is unable to create a TCP socket, presumably due to excessive load. -Please retry your request. -

Your cache administrator is %w. +

The system returned: %E

+ +

Squid is unable to create a TCP socket, presumably due to excessive load. Please retry your request.

+ +

Your cache administrator is %w.

diff --git a/errors/English/ERR_TOO_BIG b/errors/English/ERR_TOO_BIG index e5cdbbf80b..938b0a9827 100644 --- a/errors/English/ERR_TOO_BIG +++ b/errors/English/ERR_TOO_BIG @@ -1,28 +1,20 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-While trying to retrieve the URL: -%U -

-The following error was encountered: -

-

-Your cache administrator is %w. + + + +ERROR: The requested URL could not be retrieved + + +

ERROR

+

The requested URL could not be retrieved

+
+

The following error was encountered while trying to retrieve the URL: %U

+ +
+

The request or reply is too large.

+
+ +

If you are making a POST or PUT request, then the item you are trying to upload is too large.

+

If you are making a GET request, then the item you are trying to download is too large.

+

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.

+ +

Your cache administrator is %w.

diff --git a/errors/English/ERR_UNSUP_REQ b/errors/English/ERR_UNSUP_REQ index 0e727aca8d..7fc4d8cac7 100644 --- a/errors/English/ERR_UNSUP_REQ +++ b/errors/English/ERR_UNSUP_REQ @@ -1,24 +1,18 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-While trying to retrieve the URL: -%U -

-The following error was encountered: -

+ + + +ERROR: The requested URL could not be retrieved + + +

ERROR

+

The requested URL could not be retrieved

+
+

The following error was encountered while trying to retrieve the URL: %U

-

-Squid does not support all request methods for all access protocols. -For example, you can not POST a Gopher request. -

Your cache administrator is %w. +

+

Unsupported Request Method and Protocol

+
+ +

Squid does not support all request methods for all access protocols. For example, you can not POST a Gopher request.

+ +

Your cache administrator is %w.

diff --git a/errors/English/ERR_URN_RESOLVE b/errors/English/ERR_URN_RESOLVE index 01659c7375..639a297dbd 100644 --- a/errors/English/ERR_URN_RESOLVE +++ b/errors/English/ERR_URN_RESOLVE @@ -1,23 +1,18 @@ - - -ERROR: The requested URN not be retrieved - - -

ERROR

-

A URL for the requested URN could not be retrieved

-
-

-While trying to retrieve the URN: -%U -

-The following error was encountered: -

+ + + +ERROR: The requested URN not be retrieved + + +

ERROR

+

A URL for the requested URN could not be retrieved

+
+

The following error was encountered while trying to retrieve the URN: %U

-

-Hey, don't expect too much from URNs on %T :) -

Your cache administrator is %w. +

+

Cannot Resolve URN

+
+ +

Hey, don't expect too much from URNs on %T :)

+ +

Your cache administrator is %w.

diff --git a/errors/English/ERR_WRITE_ERROR b/errors/English/ERR_WRITE_ERROR index 87be117d6d..ad0a212336 100644 --- a/errors/English/ERR_WRITE_ERROR +++ b/errors/English/ERR_WRITE_ERROR @@ -1,28 +1,20 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-While trying to retrieve the URL: -%U -

-The following error was encountered: -

+ + + +ERROR: The requested URL could not be retrieved + + +

ERROR

+

The requested URL could not be retrieved

+
+

The following error was encountered while trying to retrieve the URL: %U

-

-The system returned: -

    %E
+
+

Write Error

+
-

-An error condition occurred while writing to the network. Please retry your -request. -

Your cache administrator is %w. +

The system returned: %E

+ +

An error condition occurred while writing to the network. Please retry your request.

+ +

Your cache administrator is %w.

diff --git a/errors/English/ERR_ZERO_SIZE_OBJECT b/errors/English/ERR_ZERO_SIZE_OBJECT index 2ba1c3251b..1c6643bbcd 100644 --- a/errors/English/ERR_ZERO_SIZE_OBJECT +++ b/errors/English/ERR_ZERO_SIZE_OBJECT @@ -1,23 +1,18 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-While trying to retrieve the URL: -%U -

-The following error was encountered: -

+ + + +ERROR: The requested URL could not be retrieved + + +

ERROR

+

The requested URL could not be retrieved

+
+

The following error was encountered while trying to retrieve the URL: %U

-

-Squid did not receive any data for this request. -

Your cache administrator is %w. +

+

Zero Sized Reply

+
+ +

Squid did not receive any data for this request.

+ +

Your cache administrator is %w.

diff --git a/errors/English/generic b/errors/English/generic index e0dc04b992..a275c3b083 100644 --- a/errors/English/generic +++ b/errors/English/generic @@ -1,31 +1,21 @@ - - -ERROR: The requested URL could not be retrieved - - -

ERROR

-

The requested URL could not be retrieved

-
-

-While trying to retrieve the URL: -%U -

-The following error was encountered: -

+ + + +ERROR: The requested URL could not be retrieved + + +

ERROR

+

The requested URL could not be retrieved

+
+

The following error was encountered while trying to retrieve the URL: %U

-

-The system returned: -

    %E
+
+

@SHORT_DESCRIPTION@

+
-

-This means that: -

-    @LONG_DESCRIPTION@
-
-

+

The system returned: %E

+

This means:

+
+

@LONG_DESCRIPTION@

+