From ea4c2772aa6764311ed8da122766285c3e413b5a Mon Sep 17 00:00:00 2001
From: maniacikarus
Date: Sat, 12 May 2007 21:36:36 +0000
Subject: [PATCH] Design der Fehlermeldungen nochmal etwas angepasst
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@555 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---
.../errors.ipfire/English/ERR_ACCESS_DENIED | 6 ++-
.../English/ERR_CACHE_ACCESS_DENIED | 6 ++-
.../English/ERR_CACHE_MGR_ACCESS_DENIED | 40 +++----------------
.../errors.ipfire/English/ERR_CANNOT_FORWARD | 6 ++-
.../errors.ipfire/English/ERR_CONNECT_FAIL | 6 ++-
.../proxy/errors.ipfire/English/ERR_DNS_FAIL | 6 ++-
.../English/ERR_FORWARDING_DENIED | 6 ++-
.../errors.ipfire/English/ERR_FTP_DISABLED | 6 ++-
.../errors.ipfire/English/ERR_FTP_FAILURE | 6 ++-
.../errors.ipfire/English/ERR_FTP_FORBIDDEN | 6 ++-
.../errors.ipfire/English/ERR_FTP_NOT_FOUND | 6 ++-
.../errors.ipfire/English/ERR_FTP_PUT_CREATED | 6 ++-
.../errors.ipfire/English/ERR_FTP_PUT_ERROR | 6 ++-
.../English/ERR_FTP_PUT_MODIFIED | 6 ++-
.../errors.ipfire/English/ERR_FTP_UNAVAILABLE | 6 ++-
.../errors.ipfire/English/ERR_INVALID_REQ | 6 ++-
.../errors.ipfire/English/ERR_INVALID_RESP | 6 ++-
.../errors.ipfire/English/ERR_INVALID_URL | 6 ++-
.../errors.ipfire/English/ERR_LIFETIME_EXP | 6 ++-
.../proxy/errors.ipfire/English/ERR_NO_RELAY | 6 ++-
.../English/ERR_ONLY_IF_CACHED_MISS | 6 ++-
.../errors.ipfire/English/ERR_READ_ERROR | 6 ++-
.../errors.ipfire/English/ERR_READ_TIMEOUT | 6 ++-
.../errors.ipfire/English/ERR_SHUTTING_DOWN | 6 ++-
.../errors.ipfire/English/ERR_SOCKET_FAILURE | 6 ++-
.../proxy/errors.ipfire/English/ERR_TOO_BIG | 6 ++-
.../proxy/errors.ipfire/English/ERR_UNSUP_REQ | 6 ++-
.../errors.ipfire/English/ERR_URN_RESOLVE | 6 ++-
.../errors.ipfire/English/ERR_WRITE_ERROR | 6 ++-
.../English/ERR_ZERO_SIZE_OBJECT | 6 ++-
.../errors.ipfire/German/ERR_ACCESS_DENIED | 6 ++-
.../German/ERR_CACHE_ACCESS_DENIED | 6 ++-
.../German/ERR_CACHE_MGR_ACCESS_DENIED | 6 ++-
.../errors.ipfire/German/ERR_CANNOT_FORWARD | 6 ++-
.../errors.ipfire/German/ERR_CONNECT_FAIL | 6 ++-
.../proxy/errors.ipfire/German/ERR_DNS_FAIL | 10 +++--
.../German/ERR_FORWARDING_DENIED | 6 ++-
.../errors.ipfire/German/ERR_FTP_DISABLED | 6 ++-
.../errors.ipfire/German/ERR_FTP_FAILURE | 6 ++-
.../errors.ipfire/German/ERR_FTP_FORBIDDEN | 6 ++-
.../errors.ipfire/German/ERR_FTP_NOT_FOUND | 6 ++-
.../errors.ipfire/German/ERR_FTP_PUT_CREATED | 6 ++-
.../errors.ipfire/German/ERR_FTP_PUT_ERROR | 8 +++-
.../errors.ipfire/German/ERR_FTP_PUT_MODIFIED | 6 ++-
.../errors.ipfire/German/ERR_FTP_UNAVAILABLE | 7 +++-
.../errors.ipfire/German/ERR_INVALID_REQ | 6 ++-
.../errors.ipfire/German/ERR_INVALID_RESP | 6 ++-
.../errors.ipfire/German/ERR_INVALID_URL | 6 ++-
.../errors.ipfire/German/ERR_LIFETIME_EXP | 6 ++-
.../proxy/errors.ipfire/German/ERR_NO_RELAY | 6 ++-
.../German/ERR_ONLY_IF_CACHED_MISS | 6 ++-
.../proxy/errors.ipfire/German/ERR_READ_ERROR | 6 ++-
.../errors.ipfire/German/ERR_READ_TIMEOUT | 6 ++-
.../errors.ipfire/German/ERR_SHUTTING_DOWN | 6 ++-
.../errors.ipfire/German/ERR_SOCKET_FAILURE | 6 ++-
config/proxy/errors.ipfire/German/ERR_TOO_BIG | 6 ++-
.../proxy/errors.ipfire/German/ERR_UNSUP_REQ | 6 ++-
.../errors.ipfire/German/ERR_URN_RESOLVE | 6 ++-
.../errors.ipfire/German/ERR_WRITE_ERROR | 6 ++-
.../errors.ipfire/German/ERR_ZERO_SIZE_OBJECT | 6 ++-
html/cgi-bin/proxy.cgi | 1 -
61 files changed, 303 insertions(+), 99 deletions(-)
diff --git a/config/proxy/errors.ipfire/English/ERR_ACCESS_DENIED b/config/proxy/errors.ipfire/English/ERR_ACCESS_DENIED
index 33439497b4..45b686b3e2 100644
--- a/config/proxy/errors.ipfire/English/ERR_ACCESS_DENIED
+++ b/config/proxy/errors.ipfire/English/ERR_ACCESS_DENIED
@@ -1,11 +1,13 @@
ERROR: The requested URL could not be retrieved
-
+
+
Sorry ... The requested URL could not be retrieved
+
|
@@ -32,9 +34,11 @@ you feel this is incorrect.
|
+
Generated %T by %h (%s)
+
diff --git a/config/proxy/errors.ipfire/English/ERR_CACHE_ACCESS_DENIED b/config/proxy/errors.ipfire/English/ERR_CACHE_ACCESS_DENIED
index a89387057f..beccfe332d 100644
--- a/config/proxy/errors.ipfire/English/ERR_CACHE_ACCESS_DENIED
+++ b/config/proxy/errors.ipfire/English/ERR_CACHE_ACCESS_DENIED
@@ -1,11 +1,13 @@
ERROR: Cache Access Denied
-
+
+
Sorry ... Cache Access Denied
+
|
@@ -41,9 +43,11 @@ difficulties authenticating yourself or
|
+
Generated %T by %h (%s)
+
diff --git a/config/proxy/errors.ipfire/English/ERR_CACHE_MGR_ACCESS_DENIED b/config/proxy/errors.ipfire/English/ERR_CACHE_MGR_ACCESS_DENIED
index 510405c572..b8beae0841 100644
--- a/config/proxy/errors.ipfire/English/ERR_CACHE_MGR_ACCESS_DENIED
+++ b/config/proxy/errors.ipfire/English/ERR_CACHE_MGR_ACCESS_DENIED
@@ -1,45 +1,13 @@
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
--
-
-Cache Manager Access Denied.
-
-
-
-
-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.
-
-
-
-
-Generated %T by %h (%s)
-
-
-
-