From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 27 Jul 2010 11:22:48 +0000 (+1200)
Subject: Author: Various Translators
X-Git-Tag: SQUID_3_1_5_1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d32a72dea667bc050ab0738e1e562d25b7a2308;p=thirdparty%2Fsquid.git

Author: Various Translators
Translations: sync with 3.HEAD language updates
---

diff --git a/errors/Makefile.am b/errors/Makefile.am
index 171b87f979..83d932a3a7 100644
--- a/errors/Makefile.am
+++ b/errors/Makefile.am
@@ -12,41 +12,41 @@ DEFAULT_STYLESHEET	= $(sysconfdir)/errorpage.css
 
 ## List of automated translations possible:
 ERROR_TEMPLATES =  \
-	templates/ERR_FTP_PUT_MODIFIED \
-	templates/ERR_ESI \
-	templates/ERR_SECURE_CONNECT_FAIL \
-	templates/ERR_ZERO_SIZE_OBJECT \
-	templates/ERR_SHUTTING_DOWN \
-	templates/ERR_URN_RESOLVE \
+	templates/ERR_ACCESS_DENIED \
+	templates/ERR_CACHE_ACCESS_DENIED \
+	templates/ERR_CACHE_MGR_ACCESS_DENIED \
+	templates/ERR_CANNOT_FORWARD \
 	templates/ERR_CONNECT_FAIL \
-	templates/ERR_SOCKET_FAILURE \
+	templates/ERR_DIR_LISTING \
+	templates/ERR_DNS_FAIL \
+	templates/ERR_ESI \
+	templates/ERR_FORWARDING_DENIED \
+	templates/ERR_FTP_DISABLED \
+	templates/ERR_FTP_FAILURE \
+	templates/ERR_FTP_FORBIDDEN \
 	templates/ERR_FTP_NOT_FOUND \
+	templates/ERR_FTP_PUT_CREATED \
+	templates/ERR_FTP_PUT_ERROR \
+	templates/ERR_FTP_PUT_MODIFIED \
 	templates/ERR_FTP_UNAVAILABLE \
+	templates/ERR_ICAP_FAILURE \
+	templates/ERR_INVALID_REQ \
+	templates/ERR_INVALID_RESP \
+	templates/ERR_INVALID_URL \
 	templates/ERR_LIFETIME_EXP \
-	templates/ERR_READ_ERROR \
+	templates/ERR_NO_RELAY \
 	templates/ERR_ONLY_IF_CACHED_MISS \
-	templates/ERR_UNSUP_HTTPVERSION \
+	templates/ERR_READ_ERROR \
 	templates/ERR_READ_TIMEOUT \
-	templates/ERR_ICAP_FAILURE \
-	templates/ERR_DIR_LISTING \
-	templates/ERR_FTP_FORBIDDEN \
-	templates/ERR_ACCESS_DENIED \
-	templates/ERR_FORWARDING_DENIED \
-	templates/ERR_CANNOT_FORWARD \
-	templates/ERR_CACHE_MGR_ACCESS_DENIED \
-	templates/ERR_INVALID_REQ \
-	templates/ERR_CACHE_ACCESS_DENIED \
-	templates/ERR_FTP_PUT_ERROR \
-	templates/ERR_FTP_PUT_CREATED \
+	templates/ERR_SECURE_CONNECT_FAIL \
+	templates/ERR_SHUTTING_DOWN \
+	templates/ERR_SOCKET_FAILURE \
 	templates/ERR_TOO_BIG \
+	templates/ERR_UNSUP_HTTPVERSION \
 	templates/ERR_UNSUP_REQ \
-	templates/ERR_FTP_FAILURE \
-	templates/ERR_DNS_FAIL \
-	templates/ERR_FTP_DISABLED \
-	templates/ERR_NO_RELAY \
-	templates/ERR_INVALID_URL \
-	templates/ERR_INVALID_RESP \
-	templates/ERR_WRITE_ERROR
+	templates/ERR_URN_RESOLVE \
+	templates/ERR_WRITE_ERROR \
+	templates/ERR_ZERO_SIZE_OBJECT
 
 TRANSLATE_LANGUAGES = \
 	af.lang \
@@ -81,7 +81,7 @@ TRANSLATE_LANGUAGES = \
 	ro.lang \
 	ru.lang \
 	sk.lang \
-	sr.lang \
+	sr-latn.lang \
 	sv.lang \
 	th.lang \
 	tr.lang \
diff --git a/errors/af.po b/errors/af.po
index 7f431fef98..d3c1cc2d77 100644
--- a/errors/af.po
+++ b/errors/af.po
@@ -1,53 +1,61 @@
-#, fuzzy
+# F Wolff <friedel@translate.org.za>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+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"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
+"PO-Revision-Date: 2010-07-26 10:33+0200\n"
+"Last-Translator: F Wolff <friedel@translate.org.za>\n"
+"Language-Team: translate-discuss-af@lists.sourceforge.net\n"
+"Language: af\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.0-beta1\n"
 
 #: templates/ERR_DIR_LISTING:6
 msgid "<a href=\"../\">Parent Directory</a> (<a href=\"/\">Root Directory</a>)"
-msgstr ""
+msgstr "<a href=\"../\">Ouergids</a> (<a href=\"/\">Wortelgids</a>)"
 
 #: templates/ERR_INVALID_REQ:4
 msgid ""
 "<b>Invalid Request</b> error was encountered while trying to process the "
 "request:"
 msgstr ""
+"<b>Ongeldige versoek</b>-fout is teëgekom tydens verwerking van die navraag:"
 
 #: templates/ERR_INVALID_RESP:4
 msgid ""
 "<b>Invalid Response</b> error was encountered while trying to process the "
 "request:"
 msgstr ""
+"<b>Ongeldige antwoord</b>-fout is teëgekom tydens verwerking van die navraag:"
 
 #: templates/ERR_READ_TIMEOUT:7
 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."
+"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 ""
+"Die tyd het verstryk tydens die lees van data van die netwerk. Die netwerk "
+"of bediener is dalk af of verstop. Probeer die navraag gerus weer."
 
 #: templates/ERR_URN_RESOLVE:3
 msgid "A URL for the requested URN could not be retrieved"
-msgstr ""
+msgstr "'n URL vir die aangevraagde URN kon nie verkry word nie"
 
 #: templates/ERR_ACCESS_DENIED:5
 msgid "Access Denied."
-msgstr ""
+msgstr "Toegang geweier."
 
 #: templates/ERR_ACCESS_DENIED:6
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
+"Die opstelling van toegangsbeheer keer dat u navraag nou toegelaat kan word. "
+"Kontak gerus u diensverskaffer indien u voel dit is verkeerd."
 
 #: templates/ERR_FTP_FORBIDDEN:4
 msgid ""
@@ -55,56 +63,62 @@ msgid ""
 "href=\"%U\">%U</a>"
 msgstr ""
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
 msgstr ""
+"'n FTP-protokolfout het voorgekom tydens verkryging van die URL: <a href=\"%U"
+"\">%U</a>"
 
 #: templates/ERR_ICAP_FAILURE:10
 msgid "An Illegal response was received from the ICAP server."
-msgstr ""
+msgstr "'n Onwettige antwoord is ontvang vanaf die ICAP-bediener."
 
 #: templates/ERR_READ_ERROR:7
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
+"'n Fouttoestand het voorgekom tydens lees van data van die netwerk. Probeer "
+"die versoek gerus weer."
 
 #: templates/ERR_WRITE_ERROR:7
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
+"'n Fouttoestand het voorgekom tydens skryf van data van die netwerk. Probeer "
+"die versoek gerus weer."
 
 #: templates/ERR_CACHE_ACCESS_DENIED:3 templates/ERR_CACHE_ACCESS_DENIED:5
 msgid "Cache Access Denied."
-msgstr ""
+msgstr "Toegang tot kasgeheue geweier."
 
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:3
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:5
 msgid "Cache Manager Access Denied."
-msgstr ""
+msgstr "Toegang tot kasbestuur geweier."
 
 #: templates/ERR_URN_RESOLVE:5
 msgid "Cannot Resolve URN"
-msgstr ""
+msgstr "Kan nie URN oplos nie"
 
 #: templates/ERR_LIFETIME_EXP:5
 msgid "Connection Lifetime Expired"
-msgstr ""
+msgstr "Verbinding se leeftyd het verstryk"
 
 #: templates/ERR_CONNECT_FAIL:5
 msgid "Connection to %I failed."
-msgstr ""
+msgstr "Verbinding na %I het misluk"
 
 #: templates/ERR_INVALID_REQ:10
 msgid "Content-Length missing for POST or PUT requests."
-msgstr ""
+msgstr "\"Content-Length\" ontbreek vir POST- of PUT-navrae."
 
 #: templates/ERR_DIR_LISTING:3
 msgid "Directory Content:"
-msgstr ""
+msgstr "Gidsinhoud:"
 
 #: templates/ERR_DIR_LISTING:4
 msgid "Directory Listing"
@@ -112,13 +126,14 @@ msgstr ""
 
 #: templates/ERR_DIR_LISTING:1
 msgid "Directory: %U"
-msgstr ""
+msgstr "Gids: %U"
 
 #: templates/ERR_DIR_LISTING:2
 msgid "Directory: <a href=\"%U\">%U</a>/"
-msgstr ""
+msgstr "Gids: <a href=\"%U\">%U</a>/"
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -135,19 +150,19 @@ msgstr ""
 #: templates/ERR_URN_RESOLVE:2 templates/ERR_WRITE_ERROR:2
 #: templates/ERR_ZERO_SIZE_OBJECT:2
 msgid "ERROR"
-msgstr ""
+msgstr "FOUT"
 
 #: templates/ERR_CACHE_ACCESS_DENIED:1
 msgid "ERROR: Cache Access Denied"
-msgstr ""
+msgstr "FOUT: Toegang tot kasgeheue geweier."
 
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:1
 msgid "ERROR: Cache Manager Access Denied"
-msgstr ""
+msgstr "FOUT: Toegang tot kasbestuur geweier."
 
 #: templates/ERR_FTP_PUT_ERROR:1
 msgid "ERROR: FTP upload failed"
-msgstr ""
+msgstr "FOUT: Oplaai na FTP het misluk"
 
 #: templates/ERR_ACCESS_DENIED:1 templates/ERR_CANNOT_FORWARD:1
 #: templates/ERR_CONNECT_FAIL:1 templates/ERR_DNS_FAIL:1 templates/ERR_ESI:1
@@ -164,49 +179,60 @@ msgstr ""
 #: templates/ERR_UNSUP_REQ:1 templates/ERR_WRITE_ERROR:1
 #: templates/ERR_ZERO_SIZE_OBJECT:1
 msgid "ERROR: The requested URL could not be retrieved"
-msgstr ""
+msgstr "FOUT: Die aangevraagde URL kon nie verkry word nie"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr ""
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "FOUT: Die aangevraagde URN kon nie verkry word nie"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
-msgstr ""
-
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
-msgstr ""
+msgstr "ESI-verwerking het misluk."
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr ""
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
+msgstr "FTP PUT suksesvol: Lêer is geskep"
 
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
-msgstr ""
+#, fuzzy
+msgid "FTP PUT upload failed"
+msgstr "FTP PUT/oplaai het misluk"
 
 #: templates/ERR_FTP_DISABLED:5
 msgid "FTP is Disabled"
-msgstr ""
+msgstr "FTP is gedeaktiveerd"
 
 #: templates/ERR_SECURE_CONNECT_FAIL:5
 msgid "Failed to establish a secure connection to %I"
-msgstr ""
+msgstr "Kon nie 'n beveiligde verbinding skep na %I nie"
 
 #: templates/ERR_FTP_PUT_CREATED:3
 msgid "File created"
-msgstr ""
+msgstr "Lêer is geskep"
 
 #: templates/ERR_FTP_PUT_MODIFIED:3
 msgid "File updated"
+msgstr "Lêer is opgedateer"
+
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
 msgstr ""
 
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
-msgstr ""
+msgstr "Aanstuur geweier."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -225,64 +251,79 @@ msgstr ""
 #: templates/ERR_URN_RESOLVE:8 templates/ERR_WRITE_ERROR:9
 #: templates/ERR_ZERO_SIZE_OBJECT:8
 msgid "Generated %T by %h (%s)"
-msgstr ""
+msgstr "Gegenereer op %T deur %h (%s)"
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
+msgstr "Moet eerder nie te veel verwag van URN'e op %T nie :)"
+
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
 msgstr ""
 
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
-msgstr ""
+msgstr "ICAP-protokolfout."
 
 #: templates/ERR_TOO_BIG:7
 msgid ""
 "If you are making a GET request, then the item you are trying to download is "
 "too large."
 msgstr ""
+"Indien u 'n GET-navraag maak, is die item wat u probeer aflaai te groot."
 
 #: templates/ERR_TOO_BIG:6
 msgid ""
 "If you are making a POST or PUT request, then the item you are trying to "
 "upload is too large."
 msgstr ""
+"Indien u 'n POST- of PUT-navraag maak, is die item wat u probeer oplaai te "
+"groot."
 
 #: templates/ERR_INVALID_REQ:11 templates/ERR_INVALID_URL:11
 msgid "Illegal character in hostname; underscores are not allowed."
-msgstr ""
+msgstr "Ongeldige karakter in gasheernaam; onderstreep word nie toegelaat nie."
 
 #: templates/ERR_INVALID_URL:10
 msgid "Illegal double-escape in the URL-Path"
 msgstr ""
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
-msgstr ""
+msgstr "Ongeldige URL"
 
 #: templates/ERR_INVALID_REQ:8
 msgid "Missing HTTP Identifier (HTTP/1.0)."
-msgstr ""
+msgstr "Ontbrekende HTTP-identifiseerder (HTTP/1.0)"
 
 #: templates/ERR_INVALID_REQ:7
 msgid "Missing URL."
-msgstr ""
+msgstr "Ontbrekende URL."
 
 #: templates/ERR_INVALID_URL:9
 msgid "Missing hostname"
-msgstr ""
+msgstr "Ontbrekende gasheernaam"
 
 #: templates/ERR_INVALID_URL:8
 msgid ""
 "Missing or incorrect access protocol (should be <q>http://</q> or similar)"
 msgstr ""
+"Ontbrekende of verkeerde toegangsprotokol (moet <q>http://</q> of soortgelyk "
+"wees)"
 
 #: templates/ERR_INVALID_REQ:6
 msgid "Missing or unknown request method."
-msgstr ""
+msgstr "Ontbrekende of onbekende navraagmetode."
 
 #: templates/ERR_NO_RELAY:5
 msgid "No Wais Relay"
@@ -290,11 +331,11 @@ msgstr ""
 
 #: templates/ERR_FTP_PUT_CREATED:2 templates/ERR_FTP_PUT_MODIFIED:2
 msgid "Operation successful"
-msgstr ""
+msgstr "Bewerking suksesvol"
 
 #: templates/ERR_DIR_LISTING:5
 msgid "Parent Directory"
-msgstr ""
+msgstr "Ouergids"
 
 #: templates/ERR_CACHE_ACCESS_DENIED:7
 msgid ""
@@ -313,28 +354,36 @@ msgstr ""
 
 #: templates/ERR_READ_ERROR:5
 msgid "Read Error"
-msgstr ""
+msgstr "Leesfout"
 
 #: templates/ERR_READ_TIMEOUT:5
 msgid "Read Timeout"
-msgstr ""
+msgstr "Tyd verstreke tydens lees"
 
 #: templates/ERR_INVALID_REQ:9
 msgid "Request is too large."
+msgstr "Navraag is te groot."
+
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
 msgstr ""
 
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
-msgstr ""
+msgstr "Sokfout"
 
 #: templates/ERR_INVALID_URL:6
 msgid "Some aspect of the requested URL is incorrect."
-msgstr ""
+msgstr "'n Sekere aspek van die aangevraagde URL is verkeerd."
 
 #: templates/ERR_ICAP_FAILURE:8 templates/ERR_INVALID_REQ:5
 #: templates/ERR_INVALID_URL:7
 msgid "Some possible problems are:"
-msgstr ""
+msgstr "Enkele moontlike probleme is:"
 
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:6
 msgid ""
@@ -350,57 +399,68 @@ msgstr ""
 
 #: templates/ERR_ZERO_SIZE_OBJECT:6
 msgid "Squid did not receive any data for this request."
-msgstr ""
+msgstr "Squid het geen data vir hierdie navraag ontvang nie."
 
 #: templates/ERR_UNSUP_REQ:6
 msgid ""
 "Squid does not support all request methods for all access protocols. For "
 "example, you can not POST a Gopher request."
 msgstr ""
+"Squid ondersteun nie alle navraagmetodes vir alle toegangsprotokolle nie. "
+"Mens kan by voorbeeld nie 'n Gopher-navraag POST nie."
 
 #: templates/ERR_LIFETIME_EXP:6
 msgid ""
 "Squid has terminated the request because it has exceeded the maximum "
 "connection lifetime."
 msgstr ""
+"Squid het die navraag afgesluit omdat dit die maksimumleeftyd vir 'n "
+"verbinding oorskry het."
 
 #: templates/ERR_SOCKET_FAILURE:7
+#, fuzzy
 msgid ""
 "Squid is unable to create a TCP socket, presumably due to excessive load. "
 "Please retry your request."
 msgstr ""
+"Squid kan nie 'n TCP-sok skep nie, vermoedelik weens hoë lading. Probeer die "
+"navraag gerus weer."
 
 #: templates/ERR_FTP_FAILURE:5 templates/ERR_FTP_FORBIDDEN:5
 #: templates/ERR_FTP_NOT_FOUND:5 templates/ERR_FTP_PUT_ERROR:5
 #: templates/ERR_FTP_UNAVAILABLE:5
 msgid "Squid sent the following FTP command:"
-msgstr ""
+msgstr "Squid het die volgende FTP-opdrag gestuur:"
 
 #: templates/ERR_DNS_FAIL:6
 msgid "The DNS server returned:"
-msgstr ""
+msgstr "Die DNS-bediener het geantwoord:"
 
 #: templates/ERR_ESI:6
 msgid "The ESI processor returned:"
-msgstr ""
+msgstr "Die ESI-verwerker het geantwoord:"
 
 #: templates/ERR_FTP_UNAVAILABLE:4
 msgid "The FTP server was too busy to retrieve the URL: <a href=\"%U\">%U</a>"
 msgstr ""
+"Die FTP-bediener was te besig om die URL te verkry: <a href=\"%U\">%U</a>"
 
 #: templates/ERR_INVALID_RESP:5
 msgid ""
 "The HTTP Response message received from the contacted server could not be "
 "understood or was otherwise malformed. Please contact the site operator."
 msgstr ""
+"Die ontvangde HTTP-antwoordboodskap van die bediener wat gekontak is, kon "
+"nie verstaan word nie of was op 'n ander manier misvormd. Kontak die "
+"werfoperateur."
 
 #: templates/ERR_ICAP_FAILURE:9
 msgid "The ICAP server is not reachable."
-msgstr ""
+msgstr "Die ICAP-bediener is nie bereikbaar nie."
 
 #: templates/ERR_FTP_NOT_FOUND:4
 msgid "The following URL could not be retrieved: <a href=\"%U\">%U</a>"
-msgstr ""
+msgstr "Die volgende URL kon nie opgespoor word nie: <a href=\"%U\">%U</a>"
 
 #: templates/ERR_ACCESS_DENIED:4 templates/ERR_CACHE_ACCESS_DENIED:4
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:4 templates/ERR_CANNOT_FORWARD:4
@@ -418,20 +478,25 @@ msgid ""
 "The following error was encountered while trying to retrieve the URL: <a "
 "href=\"%U\">%U</a>"
 msgstr ""
+"Die volgende fout is teëgekom tydens verkryging van die 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 ""
+"Die volgende fout is teëgekom tydens verkryging van die 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."
+msgid "The remote host or network may be down. Please try the request again."
 msgstr ""
+"Die afgeleë gasheer of netwerk is dalk af. Probeer die navraag gerus weer."
 
 #: templates/ERR_TOO_BIG:5
 msgid "The request or reply is too large."
-msgstr ""
+msgstr "Die navraag of antwoord is te groot."
 
 #: templates/ERR_ACCESS_DENIED:3 templates/ERR_CANNOT_FORWARD:3
 #: templates/ERR_CONNECT_FAIL:3 templates/ERR_DNS_FAIL:3 templates/ERR_ESI:3
@@ -447,70 +512,79 @@ msgstr ""
 #: templates/ERR_TOO_BIG:3 templates/ERR_UNSUP_REQ:3
 #: templates/ERR_WRITE_ERROR:3 templates/ERR_ZERO_SIZE_OBJECT:3
 msgid "The requested URL could not be retrieved"
-msgstr ""
+msgstr "Die aangevraagde URL kon nie verkry word nie"
 
 #: templates/ERR_FTP_FAILURE:6 templates/ERR_FTP_FORBIDDEN:6
 #: templates/ERR_FTP_NOT_FOUND:6 templates/ERR_FTP_PUT_ERROR:6
 #: templates/ERR_FTP_UNAVAILABLE:6
 msgid "The server responded with:"
-msgstr ""
+msgstr "Die bediener het geantwoord met:"
 
 #: templates/ERR_CONNECT_FAIL:6 templates/ERR_ICAP_FAILURE:6
 #: templates/ERR_READ_ERROR:6 templates/ERR_READ_TIMEOUT:6
 #: templates/ERR_SECURE_CONNECT_FAIL:6 templates/ERR_SOCKET_FAILURE:6
 #: templates/ERR_WRITE_ERROR:6
 msgid "The system returned: <i>%E</i>"
-msgstr ""
+msgstr "Die stelsel het die volgende teruggestuur: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 
 #: templates/ERR_TOO_BIG:8
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 
 #: templates/ERR_UNSUP_HTTPVERSION:6
 msgid "This Squid does not accept the HTTP version you are attempting to use."
-msgstr ""
+msgstr "Hierdie Squid aanvaar nie die HTTP-weergawe wat u probeer gebruik nie."
 
 #: templates/ERR_FTP_DISABLED:6
 msgid "This cache does not support FTP."
-msgstr ""
+msgstr "Hierdie kasbediener ondersteun nie FTP nie."
 
 #: templates/ERR_SHUTTING_DOWN:5
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
+"Hierdie kasbediener skakel tans af en kan nie nou u navraag bedien nie. "
+"Probeer gerus u navraag weer binnekort."
 
 #: templates/ERR_FORWARDING_DENIED:6
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 
 #: templates/ERR_ICAP_FAILURE:7
 msgid "This means that some aspect of the ICAP communication failed."
 msgstr ""
+"Dit beteken dat een of ander aspek van die ICAP-kommunikasie misluk het."
 
 #: templates/ERR_FTP_PUT_ERROR:7
 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 ""
+"Dit beteken dat die FTP-bediener dalk nie toestemming of ruimte het om die "
+"lêer te stoor nie. Kontroleer die pad, toestemmings, skyfspasie en probeer "
+"weer."
 
 #: templates/ERR_DNS_FAIL:7
+#, fuzzy
 msgid ""
 "This means that the cache was not able to resolve the hostname presented in "
 "the URL. Check if the address is correct."
 msgstr ""
+"Dit beteken dat die kasbediener nie in staat was om die gasheernaam in die "
+"URL op te los nie. Kyk of die adres korrek is."
 
 #: templates/ERR_ESI:7
 msgid ""
@@ -521,7 +595,7 @@ msgstr ""
 #: templates/ERR_FTP_NOT_FOUND:7
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 
@@ -536,22 +610,37 @@ msgstr ""
 #: templates/ERR_CANNOT_FORWARD:6
 msgid ""
 "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."
+"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."
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
 msgstr ""
 
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
-msgstr ""
+msgstr "Kan nie IP-adres vanaf gasheernaam <q>%H</q> bepaal nie"
 
 #: templates/ERR_CANNOT_FORWARD:5
 msgid "Unable to forward this request at this time."
-msgstr ""
+msgstr "Kan nie dié versoek nou aanstuur nie"
 
 #: templates/ERR_UNSUP_HTTPVERSION:3 templates/ERR_UNSUP_HTTPVERSION:5
 msgid "Unsupported HTTP version"
-msgstr ""
+msgstr "Niegesteunde HTTP-weergawe"
 
 #: templates/ERR_UNSUP_REQ:5
 msgid "Unsupported Request Method and Protocol"
@@ -563,13 +652,14 @@ msgid ""
 "directive was specified."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr ""
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr "Webblaaier se opstelling"
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
-msgstr ""
+msgstr "Skryffout"
 
 #: templates/ERR_ONLY_IF_CACHED_MISS:6
 msgid ""
@@ -578,7 +668,13 @@ msgid ""
 "revalidation prohibited by the <q>only-if-cached</q> directive."
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -593,18 +689,23 @@ msgstr ""
 #: templates/ERR_UNSUP_REQ:7 templates/ERR_URN_RESOLVE:7
 #: templates/ERR_WRITE_ERROR:8 templates/ERR_ZERO_SIZE_OBJECT:7
 msgid "Your cache administrator is <a href=\"mailto:%w%W\">%w</a>."
-msgstr ""
+msgstr "Die kasbediener se administrateur is <a href=\"mailto:%w%W\">%w</a>."
 
 #: templates/ERR_INVALID_RESP:6
 msgid ""
 "Your cache administrator may be able to provide you with more details about "
 "the exact nature of the problem if needed."
 msgstr ""
+"Die kasbediener se administrateur kan dalk meer detail verskaf oor die "
+"presiese aard van die probleem indien nodig."
 
 #: templates/ERR_ESI:8
 msgid "Your webmaster is <a href=\"mailto:%w\">%w</a>."
-msgstr ""
+msgstr "U webmeester is <a href=\"mailto:%w\">%w</a>."
 
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
-msgstr ""
+msgstr "Antwoord het nul-lengte"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTP PUT suksesvol: Lêer is opgedateer"
diff --git a/errors/aliases b/errors/aliases
index 22613fbbf1..72f8b28b0e 100644
--- a/errors/aliases
+++ b/errors/aliases
@@ -32,5 +32,6 @@ sv	sv-fi sv-se
 th	th-th
 tr	tr-tr
 uk	uk-ua
+vi	vi-vn
 zh-tw	zh-hk zh-mo
 zh-cn	zh-sg
diff --git a/errors/ar.po b/errors/ar.po
index d7fc4f0c1c..dbbf40c660 100644
--- a/errors/ar.po
+++ b/errors/ar.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2009-01-27 20:36+0000\n"
 "Last-Translator: MaXeR <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,8 +36,8 @@ msgstr ""
 
 #: templates/ERR_READ_TIMEOUT:7
 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."
+"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 ""
 
 #: templates/ERR_URN_RESOLVE:3
@@ -50,7 +51,7 @@ msgstr ""
 #: templates/ERR_ACCESS_DENIED:6
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 
@@ -60,7 +61,7 @@ msgid ""
 "href=\"%U\">%U</a>"
 msgstr ""
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -72,13 +73,13 @@ msgstr ""
 
 #: templates/ERR_READ_ERROR:7
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 
 #: templates/ERR_WRITE_ERROR:7
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 
@@ -123,7 +124,8 @@ msgstr ""
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -172,23 +174,19 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
+msgid "ERROR: The requested URN could not be retrieved"
 msgstr ""
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
-msgstr ""
-
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+msgid "FTP PUT Successful."
 msgstr ""
 
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+msgid "FTP PUT upload failed"
 msgstr ""
 
 #: templates/ERR_FTP_DISABLED:5
@@ -207,11 +205,24 @@ msgstr ""
 msgid "File updated"
 msgstr ""
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -233,13 +244,18 @@ msgid "Generated %T by %h (%s)"
 msgstr ""
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr ""
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr ""
@@ -264,6 +280,11 @@ msgstr ""
 msgid "Illegal double-escape in the URL-Path"
 msgstr ""
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "مسار غير صحيح"
@@ -328,6 +349,14 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr ""
@@ -431,7 +460,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
@@ -469,14 +498,14 @@ msgstr ""
 
 #: templates/ERR_NO_RELAY:6
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 
 #: templates/ERR_TOO_BIG:8
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 
@@ -491,13 +520,13 @@ msgstr ""
 #: templates/ERR_SHUTTING_DOWN:5
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 
 #: templates/ERR_FORWARDING_DENIED:6
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 
@@ -526,7 +555,7 @@ msgstr ""
 #: templates/ERR_FTP_NOT_FOUND:7
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 
@@ -541,9 +570,24 @@ msgstr ""
 #: templates/ERR_CANNOT_FORWARD:6
 msgid ""
 "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."
+"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."
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
 msgstr ""
 
 #: templates/ERR_DNS_FAIL:5
@@ -568,8 +612,9 @@ msgid ""
 "directive was specified."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
 msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
@@ -583,7 +628,13 @@ msgid ""
 "revalidation prohibited by the <q>only-if-cached</q> directive."
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
diff --git a/errors/az.po b/errors/az.po
index 6374e773a8..c8774a1928 100644
--- a/errors/az.po
+++ b/errors/az.po
@@ -2,16 +2,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2009-10-05 17:49+0000\n"
 "Last-Translator: Elxan İsmayılov <elxan.i@gmail.com>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
+"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2009-11-07 08:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-"Language: az\n"
 
 #: templates/ERR_DIR_LISTING:6
 msgid "<a href=\"../\">Parent Directory</a> (<a href=\"/\">Root Directory</a>)"
@@ -30,9 +30,10 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "Məlumatlar şəbəkədən oxunan zaman gözləmə müddəti bitmişdir. Şəbəkə və ya "
 "server işləmir, yaxud həddindən arıq yüklənmişdir. Xahiş edirik, sorğunu "
@@ -47,9 +48,10 @@ msgid "Access Denied."
 msgstr "Giriş qadağandır."
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "Hal-hazirda giriş nəzarəti qaydaları sorğunuzun cavablandırılmasına qadağa "
@@ -64,7 +66,7 @@ msgstr ""
 "URL ilə əlaqə zamanı FTP protokolu uzrə aşağıdakı səhv baş vermişdir: <a "
 "href=\"%U\">%U</a>"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -77,16 +79,18 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr ""
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 "Məlumatlar şəbəkədən oxunan zaman səhv baş vermişdir. Xahiş edirik, "
 "sorğunuzu təkrar edin."
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 "İnformasiya şəbəkəyə ötürülərkən xəta olmuşdur.Xahiş edirik, sorğunu təkrar "
@@ -133,7 +137,8 @@ msgstr ""
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -182,23 +187,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "SƏHV: Sorğulanan URN ilə əlaqə yaradılmadı"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "FTP PUT müvəfəqiyyətlə başa çatdı: Fayl yarandı"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "FTP PUT müvəfəqiyyətlə başa çatdı: Fayl yeniləndi"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "FTP yükləmə uğursuzluqla başa çatdı"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -217,11 +221,24 @@ msgstr "Fayl yarandı"
 msgid "File updated"
 msgstr "Fayl yeniləndi"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Yönləndirmə qadağandır."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -243,13 +260,18 @@ msgid "Generated %T by %h (%s)"
 msgstr ""
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "%T texnologiyasından çox şey gözləməyə dəyməz :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr "İCAP protokol s�^�hvi"
@@ -279,6 +301,11 @@ msgstr "Server adında qadağan edilmiş simvol; altxətt yol verilməzdir."
 msgid "Illegal double-escape in the URL-Path"
 msgstr ""
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 #, fuzzy
 msgid "Invalid URL"
@@ -353,6 +380,14 @@ msgstr "Gözləmə müddəti bitmişdir"
 msgid "Request is too large."
 msgstr "Sorğu həddən ziyadə böyükdür."
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 #, fuzzy
 msgid "Socket Failure"
@@ -475,7 +510,8 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_CONNECT_FAIL:7
-msgid "The remote host or network may be down.  Please try the request again."
+#, fuzzy
+msgid "The remote host or network may be down. Please try the request again."
 msgstr ""
 "Hədəf server və ya şəbəkə cavab vermir. Xahiş edirik, sorğunu təkrarlayın."
 
@@ -513,17 +549,19 @@ msgid "The system returned: <i>%E</i>"
 msgstr "Sistemdən gələn cavab: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
+#, fuzzy
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 "Bu keş serveri üçün WAIS ötürücü təyin edilməyib. Administratora əlaqə "
 "saxlayın."
 
 #: templates/ERR_TOO_BIG:8
+#, fuzzy
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 "Bu limitlər sizin keşi idarə edən Internet xidməti provayderi tərəfindən "
@@ -539,17 +577,19 @@ msgid "This cache does not support FTP."
 msgstr "Bu keş FTP protokolunu təmin etmir."
 
 #: templates/ERR_SHUTTING_DOWN:5
+#, fuzzy
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "Keş hal-hazırda işini dayandırır və bu səbəbdən sizin sorğunuzu cavablandıra "
 "bilməyəcək. Xahiş edirik, sorğunuzu tezliklə bir daha təkrarlayın."
 
 #: templates/ERR_FORWARDING_DENIED:6
+#, fuzzy
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "Sibling tipli əlaqə yaratmaq cəhdinə görə keş sorğunuzu yönləndirməyəcəkdir. "
@@ -583,12 +623,12 @@ msgstr ""
 #, fuzzy
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "Mümkün səbəblərdən biri sorğu zamanı istifadə olunan FTP adresin RFC 1738 "
-"standartlarına uyğun gəlməməsidir. Əgər səbəb budursa faylı <a href=\"%B\">%"
-"B</a> adresində tapa bilersiniz."
+"standartlarına uyğun gəlməməsidir. Əgər səbəb budursa faylı <a href=\"%B\">"
+"%B</a> adresində tapa bilersiniz."
 
 #: templates/ERR_SECURE_CONNECT_FAIL:7
 msgid ""
@@ -602,15 +642,30 @@ msgstr ""
 #, fuzzy
 msgid ""
 "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."
+"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."
 msgstr ""
 "Sorğu hədəf serverə, və ya digər yuxarı səviyyəli keş serverələrə göndərilə "
 "bilməz.  Səhvin mümkün səbəbləri keş administratoru bu keşin hədəf "
 "serverləri birbaşa sorğulamasını qadağan etmişdir və ya bütün yuxarı "
 "səviyyəli keş-serverlər hal-hazırda əlçatmazdılar."
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr "Uzaqda yerləşən kompyuterin İP adresini təyin mumkun olmadı <q>%H</q>"
@@ -633,8 +688,9 @@ msgid ""
 "directive was specified."
 msgstr "Obyekt keşdə tapılmadı və <q>only-if-cached</q> əmri təyin olunmuşdur."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
 msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
@@ -651,7 +707,13 @@ msgstr ""
 "tapılmadı, <em>və ya</em> <q>only-if-cached</q> əmri ilə qadağan olunmuş "
 "obyektin yenilənməsi tələb olunur."
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -684,3 +746,9 @@ msgstr ""
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "Sıfır Uzunluqlu Cavab"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "SƏHV: Sorğulanan URN ilə əlaqə yaradılmadı"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTP PUT müvəfəqiyyətlə başa çatdı: Fayl yeniləndi"
diff --git a/errors/bg.po b/errors/bg.po
index 16bed4b727..2ef4fb1252 100644
--- a/errors/bg.po
+++ b/errors/bg.po
@@ -2,16 +2,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
-"PO-Revision-Date: 2009-09-27 15:50+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
+"PO-Revision-Date: 2010-05-06 12:49+0200\n"
 "Last-Translator: Evgeni Gechev <etg@setcom.bg>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 1.2.1\n"
+"X-Generator: Pootle 2.0.1\n"
 
 #: templates/ERR_DIR_LISTING:6
 msgid "<a href=\"../\">Parent Directory</a> (<a href=\"/\">Root Directory</a>)"
@@ -36,8 +36,8 @@ msgstr ""
 
 #: templates/ERR_READ_TIMEOUT:7
 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."
+"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 ""
 "Изтече максимално допустимото време за четене на данни от мрежата. Мрежата "
 "или сървърът са недостъпни или претоварени. Моля, опитайте отново да "
@@ -54,7 +54,7 @@ msgstr "Отказан достъп"
 #: templates/ERR_ACCESS_DENIED:6
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "Конфигурацията за контрол на достъпа не позволява да бъде изпълнена Вашата "
@@ -69,7 +69,7 @@ msgstr ""
 "Възникна грешка при ауторизация към отдалечения FTP сървър при доставката на "
 "URL:<a href=\"%U\">%U</a>"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -83,7 +83,7 @@ msgstr "Невалиден отговор от ICAP сървъра."
 
 #: templates/ERR_READ_ERROR:7
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 "Възникна грешка при четене на данни от мрежата. Моля, опитайте отново да "
@@ -91,7 +91,7 @@ msgstr ""
 
 #: templates/ERR_WRITE_ERROR:7
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 "Възникна грешка при изпращане на данни в мрежата. Моля, опитайте отново да "
@@ -138,7 +138,8 @@ msgstr "директория: %U"
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr "директория: <a href=\"%U\">%U</a>/"
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -187,23 +188,21 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "ГРЕШКА: Заявената страница е недостъпна."
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "ГРЕШКА: Заявеният адрес е недостъпен."
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "ГРЕШКА: Заявената страница не може да бъде изтеглена"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr "Неуспешна обработка на ESI заявка."
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "Файлът е създаден успешно."
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "FTP PUT заявката е успешна: файлът е обновен"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "Заявката за качване на файл е неуспешна."
 
 #: templates/ERR_FTP_DISABLED:5
@@ -222,11 +221,24 @@ msgstr "Файлът е създаден"
 msgid "File updated"
 msgstr "Файлът е обновен"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr "За браузер Firefox идете на: <ul>"
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr "За браузер Internet Explorer идете на: <ul>"
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr "За браузер Opera идете на: <ul>"
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Пренасочването на заявката е отказано."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -248,13 +260,18 @@ msgid "Generated %T by %h (%s)"
 msgstr "Генерирано на %T от %h (%s)"
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "Не очаквайте прекалено много на този етап :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr "Как да намерите тези настройки на Вашия браузер:"
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr "Грешка на ICAP протокола."
@@ -285,6 +302,11 @@ msgstr ""
 msgid "Illegal double-escape in the URL-Path"
 msgstr "Невалиден double-escape символ в адреса"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr "В полето HTTP proxy напишете име на proxy сървър %h и порт 3128."
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "Невалиден адрес"
@@ -358,6 +380,14 @@ msgstr "Изтече максимално допустимото време за
 msgid "Request is too large."
 msgstr "Заявката е прекалено голяма."
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr "Изберете Автоматично откриване на настройките."
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr "Изберете Използване на Автоматично конфигуриране на прокси сървър."
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Грешка при Socket операция"
@@ -432,8 +462,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 ""
@@ -475,7 +505,7 @@ msgid ""
 msgstr "Възникна следната грешка при опит за достъп до: <a href=\"%U\">%U</a>"
 
 #: 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 ""
 "Вероятно отдалеченият сървър или мрежа са недостъпни. Моля, опитайте отново "
 "да направите Вашата заявка."
@@ -515,7 +545,7 @@ msgstr "Операционната система даде следното съ
 
 #: templates/ERR_NO_RELAY:6
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 "Няма дефиниран WAIS Relay за този кеш сървър. Обърнете се към администратора."
@@ -523,7 +553,7 @@ msgstr ""
 #: templates/ERR_TOO_BIG:8
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 "Тези ограничения са поставени от Интернет доставчика, който администрира "
@@ -543,7 +573,7 @@ msgstr "Този кеш сървър не поддържа FTP"
 #: templates/ERR_SHUTTING_DOWN:5
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "Кеш сървърът е в процес на рестартиране и в момента не може да изпълни "
 "вашата заявка. Моля опитайте отново след няколко минути."
@@ -551,7 +581,7 @@ msgstr ""
 #: templates/ERR_FORWARDING_DENIED:6
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "Този кеш сървър няма да пренасочи Вашата заявка, защото не е висшестоящ кеш "
@@ -588,11 +618,11 @@ msgstr ""
 #: templates/ERR_FTP_NOT_FOUND:7
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
-"Това би могло да бъде причинено от заявка, в която е посочен абсолютен път "
-"(което е неправилно според документ RFC 1738). Ако това е причината, то "
+"Това би могло да бъде причинено от FTP заявка, в която е посочен абсолютен "
+"път (което е неправилно според документ RFC 1738). Ако това е причината, то "
 "файлът би могъл да бъде намерен на адрес <a href=\"%B\">%B</a>."
 
 #: templates/ERR_SECURE_CONNECT_FAIL:7
@@ -610,15 +640,32 @@ msgstr ""
 #: templates/ERR_CANNOT_FORWARD:6
 msgid ""
 "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."
+"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."
 msgstr ""
 "Заявката не може да бъде пренасочена към сървъра източник или към някой от "
 "висшестоящите кеш сървъри.  Най-вероятно причината за тази грешка е, че "
 "администратора не позволява директни обръщения към сървъра източник, и "
 "всички кеш сървъри от по-горно ниво в момента са недостъпни."
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+"Инструменти -&gt; Опции за интернет -&gt; Връзки -&gt; LAN настройки -&gt; "
+"Прокси сървър"
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr "Не може да бъде намерен IP адресът на сървъра <q>%H</q>"
@@ -643,9 +690,10 @@ msgstr ""
 "Подадена е заявка за обект, който не се намира в кеша, а попада в обсега на "
 "директивата <q>only-if-cached</q>."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr "При опит да бъде записан файлът: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -662,7 +710,13 @@ msgstr ""
 "трябва да бъде изтеглен наново или да бъде проверена неговата валидност, "
 "което е недопустимо поради директивата <q>only-if-cached</q>."
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -694,3 +748,12 @@ msgstr "Вашият web администратор е <a href=\"mailto:%w\">%w<
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "Отговор с нулева големина"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "ГРЕШКА: Заявеният адрес е недостъпен."
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTP PUT заявката е успешна: файлът е обновен"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr "При опит да бъде записан файлът: <a href=\"%U\">%U</a>"
diff --git a/errors/ca.po b/errors/ca.po
index 2d42578d4a..21cc122975 100644
--- a/errors/ca.po
+++ b/errors/ca.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2010-02-04 18:35+1300\n"
 "Last-Translator: Jordi Bruguera <jordi@dns1.grn.es>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,9 +29,10 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "Hi ha hagut un exc&eacute;s en el temps de lectura de dades de la xarxa.Hi "
 "ha congesti&oacute; o indisposici&oacute; del servidor i/o la xarxa.Intenteu-"
@@ -45,9 +47,10 @@ msgid "Access Denied."
 msgstr "Acc&eacute;s no autoritzat."
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "La configuració del control d'acc&eacute;s impedeix realitzar aquesta "
@@ -62,7 +65,7 @@ msgstr ""
 "S'ha produ&iuml;t un error en l'autentificaci&oacute; FTP mentre s'intentava "
 "llegir la URL: <a href=\"%U\">%U</a>"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -75,16 +78,18 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr ""
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 "S'ha produ&iuml;t un error quan es llegien les dades de la xarxa.  Repetiu "
 "la petici&oacute;"
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 "S'ha produ&iuml;t un error mentre s'intentava escriure a la xarxa.  "
@@ -131,7 +136,8 @@ msgstr ""
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -181,24 +187,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "ERROR: No es pot mostrar la URL que heu sol.licitat"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "ERROR: No es pot mostrar la URN que heu sol.licitat"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "ERROR: No es pot mostrar la URL que heu sol.licitat"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
-msgstr "Comanda FTP PUT executada amb &egrave;xit: Fitxer creat"
-
-#: templates/ERR_FTP_PUT_MODIFIED:1
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
 #, fuzzy
-msgid "FTP PUT Successful: File Updated"
-msgstr "Comanda FTP PUT completada amb &eacute;xit: Fitxer actualitzat"
+msgid "FTP PUT Successful."
+msgstr "Comanda FTP PUT executada amb &egrave;xit: Fitxer creat"
 
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "Ha fallat la comanda FTP d'enviament de fitxer"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -217,11 +221,24 @@ msgstr "Fitxer creat"
 msgid "File updated"
 msgstr "Fitxer actualitzat"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Reenviament denegat."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -243,13 +260,18 @@ msgid "Generated %T by %h (%s)"
 msgstr ""
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "Ei :) no esperis massa de les URN a %T !!"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr ""
@@ -277,6 +299,11 @@ msgstr "Car&agrave;cter no perm&egrave;s en el nom del servidor."
 msgid "Illegal double-escape in the URL-Path"
 msgstr "La URL cont&eacute; un doble car&agrave;cter d'escapament."
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "URL incorrecte."
@@ -347,6 +374,14 @@ msgstr "S'ha excedit el temps de lectura"
 msgid "Request is too large."
 msgstr "La petici&ocute; &eacute;s massa llarga."
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Errada de connexi&oacute; de xarxa"
@@ -470,7 +505,8 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_CONNECT_FAIL:7
-msgid "The remote host or network may be down.  Please try the request again."
+#, fuzzy
+msgid "The remote host or network may be down. Please try the request again."
 msgstr ""
 "El servidor o la xarxa remota no es troben disponibles. Torneu-ho a provar "
 "d'aqui a una estona."
@@ -509,17 +545,19 @@ msgid "The system returned: <i>%E</i>"
 msgstr "El sistema diu: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
+#, fuzzy
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 "No hi ha un reenviador de protocol WAIS per a aquesta cache. Comenta-li a "
 "l'administrador."
 
 #: templates/ERR_TOO_BIG:8
+#, fuzzy
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 "Aquests l&iacute;mits han estat establerts pel prove&iuml;dor Internet que "
@@ -534,18 +572,20 @@ msgid "This cache does not support FTP."
 msgstr "Aquesta cache no accepta connexions FTP."
 
 #: templates/ERR_SHUTTING_DOWN:5
+#, fuzzy
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "Aquesta <i>cache</i> est&agrave; en proc&eacute;s d'aturada inmediata i no "
 "pot atendre la vostra petici&oacute;.  Reintenteu la petici&oacute; d'aqui a "
 "uns minuts."
 
 #: templates/ERR_FORWARDING_DENIED:6
+#, fuzzy
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "Aquesta cache no reenviar&agrave; la vostra petici&oacute; donat que "
@@ -579,9 +619,10 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_FTP_NOT_FOUND:7
+#, fuzzy
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "Aquest error pot ser causat per una URL del protocol FTP amb un cam&iacute; "
@@ -600,15 +641,30 @@ msgstr ""
 #, fuzzy
 msgid ""
 "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."
+"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."
 msgstr ""
 "Aquesta petició no s'ha pogut enviar al servidor d'origen o a una cache "
 "superior. La causa m&eacute;s probable per aquest error &eacute;s "
 "l'administrador de la cache no permet connexions directes amb els servidors "
 "d'origen, o no hi ha cap cache superior disponible."
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr ""
@@ -634,9 +690,10 @@ msgstr ""
 "S'ha especificat una directiva <q>only-if-cached</q> i no s'ha trobat un "
 "document v&agrave;lid a la cache."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr "Mentre s'intentava la comanda PUT a la URL: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -652,7 +709,13 @@ msgstr ""
 "q>. El document no s'ha trobat a la cache, o necessitava revalidaci&oacute;, "
 "expressament prohibida per la directiva <q>only-if-cached</q>."
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -684,3 +747,13 @@ msgstr ""
 #, fuzzy
 msgid "Zero Sized Reply"
 msgstr "Resposta de longitut ZERO :)"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "ERROR: No es pot mostrar la URN que heu sol.licitat"
+
+#, fuzzy
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "Comanda FTP PUT completada amb &eacute;xit: Fitxer actualitzat"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr "Mentre s'intentava la comanda PUT a la URL: <a href=\"%U\">%U</a>"
diff --git a/errors/cs.po b/errors/cs.po
index 1d5aab7a03..fa19fbd35d 100644
--- a/errors/cs.po
+++ b/errors/cs.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2009-11-20 17:14+0000\n"
 "Last-Translator: Kuvaly <kuvaly@seznam.cz>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,9 +33,10 @@ msgstr ""
 "požadavku:"
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "Došlo k překročení časového limitu během čtení dat ze sítě. Síť nebo server "
 "mohou být mimo provoz nebo přetížené. Prosím zkuste požadavek zopakovat."
@@ -48,9 +50,10 @@ msgid "Access Denied."
 msgstr "Přístup odepřen."
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "Nastavení přístupových práv aktuálně neumožňuje zpracovat požadavek. Prosím "
@@ -64,7 +67,7 @@ msgstr ""
 "Došlo k chybě při autentizaci FTP při pokusu získat URL: <a href=\"%U\">%U</"
 "a>"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -76,15 +79,17 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr "Ze serveru ICAP byla přijata neplatná odpověď."
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 "Nastala chyba při čtení dat ze sítě. Prosím zkuste požadavek zopakovat."
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 "Nastala chyba při odesílání dat na síť. Prosím zkuste požadavek zopakovat."
@@ -130,7 +135,8 @@ msgstr "Adresář: %U"
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr "Adresář: <a href=\"%U\">%U</a>/"
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -179,23 +185,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "CHYBA: Nelze získat požadované URL"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "CHYBA: Nelze získat požadované URN"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "CHYBA: Nelze získat požadované URL"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr "Selhalo zpracování ESI."
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "FTP PUT uspěl: soubor vytvořen"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "FTP PUT úspešný: Soubor nahrán"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "FTP PUT/nahrávání selhalo"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -214,11 +219,24 @@ msgstr "Soubor vytvořen"
 msgid "File updated"
 msgstr "Soubor aktualizován"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -240,13 +258,18 @@ msgid "Generated %T by %h (%s)"
 msgstr ""
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "Hey, neočekáváte příliš mnoho od URN na %T :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr "Chyba protokolu ICAP."
@@ -280,6 +303,11 @@ msgstr "Chybný znak v hostname (podtržítko ??)"
 msgid "Illegal double-escape in the URL-Path"
 msgstr "Chybný double-escape v URL cestě"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "Neplatná URL"
@@ -348,6 +376,14 @@ msgstr ""
 msgid "Request is too large."
 msgstr "Požadavek může být příliš velký"
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr ""
@@ -421,8 +457,8 @@ msgstr ""
 #, fuzzy
 msgid "The FTP server was too busy to retrieve the URL: <a href=\"%U\">%U</a>"
 msgstr ""
-"FTP server je přetížen a nemůže poslat nasledující dokument: <a href=\"%U\">%"
-"U</a>"
+"FTP server je přetížen a nemůže poslat nasledující dokument: <a href=\"%U\">"
+"%U</a>"
 
 #: templates/ERR_INVALID_RESP:5
 #, fuzzy
@@ -466,7 +502,8 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_CONNECT_FAIL:7
-msgid "The remote host or network may be down.  Please try the request again."
+#, fuzzy
+msgid "The remote host or network may be down. Please try the request again."
 msgstr "Vzdálený systém nebo síť jsou nedostupné. Zkuste to znova."
 
 #: templates/ERR_TOO_BIG:5
@@ -503,15 +540,17 @@ msgid "The system returned: <i>%E</i>"
 msgstr "Vzdálený systém odpověděl: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
+#, fuzzy
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr "Cache server nemá definovaný WAIS Relay! Vyhubujte administratorovi."
 
 #: templates/ERR_TOO_BIG:8
+#, fuzzy
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 "Tento limit byl nastaven administrátorem této cache. Pokud si myslíte, že je "
@@ -526,17 +565,19 @@ msgid "This cache does not support FTP."
 msgstr "Tento cache server nepodporuje protokol FTP."
 
 #: templates/ERR_SHUTTING_DOWN:5
+#, fuzzy
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "Tento cache server je právě restartován a nemůže obsloužit Váš požadavek. "
 "Zkuste to za chvíli znova."
 
 #: templates/ERR_FORWARDING_DENIED:6
+#, fuzzy
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "Cache server nepřesměruje Váš požadavek, protože to nedovolují vztahy v "
@@ -569,9 +610,10 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_FTP_NOT_FOUND:7
+#, fuzzy
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "To může být zapříčiněno použitím absolutní cesty v FTP URL (což odporuje RFC "
@@ -589,14 +631,29 @@ msgstr ""
 #, fuzzy
 msgid ""
 "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."
+"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."
 msgstr ""
 "Požadavek nemůže být přesměrován k dotazovanému serveru nebo nadřazeným "
 "cache serverům. Příčinou může být Administrátor zakázal přímý přístup k "
 "dotazovaným serverům Všechny nadřazené cache servery jsou nedostupné."
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr "Jméno serveru není možno převést na IP adresu. <q>%H</q>"
@@ -621,9 +678,10 @@ msgstr ""
 "Požadovaný dokument se nenachází v cachi, přičemž byla specifikována "
 "direktiva <q>only-if-cached</q>."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr "Při pokusu o PUT následujícího URL: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -636,7 +694,13 @@ msgid ""
 "revalidation prohibited by the <q>only-if-cached</q> directive."
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -666,3 +730,12 @@ msgstr ""
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr ""
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "CHYBA: Nelze získat požadované URN"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTP PUT úspešný: Soubor nahrán"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr "Při pokusu o PUT následujícího URL: <a href=\"%U\">%U</a>"
diff --git a/errors/da.po b/errors/da.po
index 9d6df1f76b..e63dc723f4 100644
--- a/errors/da.po
+++ b/errors/da.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2008-11-07 17:17+1300\n"
 "Last-Translator: Morten S. Nielsen <mortensn@geocities.com>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,9 +29,10 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "En timeout opstod mens der der blev ventet p&aelig; at l&aelig;se data fra "
 "netv&aelig;rket.  Netv&aelig;rket kan v&aelig;re nede eller forstoppet.  "
@@ -45,9 +47,10 @@ msgid "Access Denied."
 msgstr "Adgang N&aelig;gtet."
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "Adgangs kontrollen tillader ikke din foresp&oslash;rgsel.  Kontakt din "
@@ -61,28 +64,30 @@ msgstr ""
 "En FTP autenticierings fejl opstod under hentning af f&oslash;gende URL: <a "
 "href=\"%U\">%U</a>"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
 msgstr ""
-"En FTP protokol fejl opstod under hentning af f&oslash;gende URL: <a href=\"%"
-"U\">%U</a>"
+"En FTP protokol fejl opstod under hentning af f&oslash;gende URL: <a href="
+"\"%U\">%U</a>"
 
 #: templates/ERR_ICAP_FAILURE:10
 msgid "An Illegal response was received from the ICAP server."
 msgstr ""
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 "En fejl opstod mens der blev l&aelig;st data fra nettet.  Pr&oslash;v igen."
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 "En fejl opstod mens der blev skrevet data til nettet.  Pr&oslash;v igen."
@@ -128,7 +133,8 @@ msgstr ""
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -178,23 +184,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "FEJL: Den angivne URL kunne ikke hentes"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "FEJL: Den angivne URN kunne ikke hentes"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "FEJL: Den angivne URL kunne ikke hentes"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "FTP PUT Lykkedes: Fil Oprettet"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "FTP PUT Lykkedes: Fil Opdateret"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "FTP PUT/upload fejlede"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -213,11 +218,24 @@ msgstr "Fil oprettet"
 msgid "File updated"
 msgstr "Fil opdateret"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Videresendelse N&aelig;gtet."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -239,13 +257,18 @@ msgid "Generated %T by %h (%s)"
 msgstr ""
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "Hallo, forvent nu ikke for meget af URNs p&aring; %T :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr ""
@@ -270,6 +293,11 @@ msgstr ""
 msgid "Illegal double-escape in the URL-Path"
 msgstr "Ugyldig dobbelt-escape i URL sti"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "Ugyldig URL"
@@ -343,6 +371,14 @@ msgstr ""
 msgid "Request is too large."
 msgstr "Foresp&oslash;rgslen er for stor."
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Socket Fejl"
@@ -458,7 +494,8 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_CONNECT_FAIL:7
-msgid "The remote host or network may be down.  Please try the request again."
+#, fuzzy
+msgid "The remote host or network may be down. Please try the request again."
 msgstr ""
 "Der kunne ikke opn&aring;s forbindelse til den anden computer. Netv&aelig;"
 "rket eller computeren kan v&aelig;re nede.  Pr&oslash;v eventuelt igen."
@@ -499,7 +536,7 @@ msgstr "Systemet returnerede: <i>%E</i>"
 #: templates/ERR_NO_RELAY:6
 #, fuzzy
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 "Der er ikke nogen WAIS Rel&aelig; maskine defineret for denne proxy cache!  "
@@ -508,7 +545,7 @@ msgstr ""
 #: templates/ERR_TOO_BIG:8
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 
@@ -521,17 +558,19 @@ msgid "This cache does not support FTP."
 msgstr "Denne cache underst&oslash;tter ikke FTP."
 
 #: templates/ERR_SHUTTING_DOWN:5
+#, fuzzy
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "Proxy cachen er i gang med at lukke ned og kan derfor ikke betjene din "
 "foresp&oslash;rgsel nu.  Pr&oslash;v venligst igen snart."
 
 #: templates/ERR_FORWARDING_DENIED:6
+#, fuzzy
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "Denne cache vil ikke videresende din foresp&oslash;rgsel fordi den pr&oslash;"
@@ -564,9 +603,10 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_FTP_NOT_FOUND:7
+#, fuzzy
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "Dette kan muligvis for&aring;rsages af en FTP URL med en absolut sti "
@@ -582,11 +622,12 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_CANNOT_FORWARD:6
+#, fuzzy
 msgid ""
 "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."
+"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."
 msgstr ""
 "Denne foresp&oslash;rgsel kunne ikke videresendes til den oprindelige server "
 "eller en af for&aelig;ldre cache'ene.  Dette skyldes sandsynligvis at cache "
@@ -594,6 +635,21 @@ msgstr ""
 "forbindelser til servere og alle for&aelig;ldre cache'er kan ikke n&aring;s "
 "for &oslash;jeblikket."
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr "Kunne ikke finde IP nummeret for navnet <q>%H</q>"
@@ -618,11 +674,10 @@ msgstr ""
 "Dokumentet blev ikke fundet i cachen og <q>only-if-cached</q> (kun-hvis-gemt-"
 "i-cachen) direktivet var specificeret."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
 msgstr ""
-"Under udf&oslash;relse af PUT kommando (sending) p&aring; f&oslash;lgende "
-"URL: <a href=\"%U\">%U</a>"
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -639,7 +694,13 @@ msgstr ""
 "kr&aelig;ver en bekr&aelig;ftelse af gyldighed som bliver forbudt af <q>only-"
 "if-cached</q> direktivet."
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -669,3 +730,14 @@ msgstr ""
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "Nul St&oslash;rrelse Svar"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "FEJL: Den angivne URN kunne ikke hentes"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTP PUT Lykkedes: Fil Opdateret"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr ""
+#~ "Under udf&oslash;relse af PUT kommando (sending) p&aring; f&oslash;lgende "
+#~ "URL: <a href=\"%U\">%U</a>"
diff --git a/errors/de.po b/errors/de.po
index fcd275c3ef..475eee3fa3 100644
--- a/errors/de.po
+++ b/errors/de.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
-"PO-Revision-Date: 2010-03-07 13:19+0200\n"
-"Last-Translator: Constantin Rack <info@vigos.com>\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
+"PO-Revision-Date: 2010-06-10 10:13+0200\n"
+"Last-Translator: Robert Förster <Dessa@gmake.de>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgid ""
 "request:"
 msgstr ""
 "<b>Ungültige Anfrage</b> Fehler erhalten als versucht wurde die Anfrage zu "
-"Bearbeiten:"
+"bearbeiten:"
 
 #: templates/ERR_INVALID_RESP:4
 msgid ""
@@ -37,12 +37,12 @@ msgstr ""
 
 #: templates/ERR_READ_TIMEOUT:7
 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."
+"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 ""
-"Zeitüberschreitung beim Warten auf Daten des Netzwerks.  Das Netzwerk oder "
-"der Server könnten nicht Verfügbar oder überlastet sein.  Bitte versuchen "
-"sie es erneut."
+"Zeitüberschreitung beim Warten auf Daten des Netzwerks. Das Netzwerk oder "
+"der Server könnten nicht verfügbar oder überlastet sein. Bitte versuchen sie "
+"es erneut."
 
 #: templates/ERR_URN_RESOLVE:3
 msgid "A URL for the requested URN could not be retrieved"
@@ -55,10 +55,10 @@ msgstr "Zugriff verweigert."
 #: templates/ERR_ACCESS_DENIED:6
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
-"Die Anfrage wurde aufgrund mangelnder Zugriffsrechte verweigert.  Bitte "
+"Die Anfrage wurde aufgrund mangelnder Zugriffsrechte verweigert. Bitte "
 "kontaktieren Sie Ihren Dienstanbieter falls sie denken, dass dies ein Fehler "
 "ist."
 
@@ -70,7 +70,7 @@ msgstr ""
 "Die FTP Authentifizierung bei der URL <a href=\"%U\">%U</a> ist "
 "Fehlgeschlagen."
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -83,18 +83,18 @@ msgstr "Die Antwort des ICAP Servers war ungültig."
 
 #: templates/ERR_READ_ERROR:7
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
-"Ein Fehler ist beim Lesen vom Netzwerk aufgetreten.  Bitte wiederholen sie "
+"Ein Fehler ist beim Lesen vom Netzwerk aufgetreten. Bitte wiederholen sie "
 "die Anfrage."
 
 #: templates/ERR_WRITE_ERROR:7
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
-"Ein Fehler ist beim Schreiben auf das Netzwerk aufgetreten.  Bitte "
+"Ein Fehler ist beim Schreiben auf das Netzwerk aufgetreten. Bitte "
 "wiederholen sie die Anfrage."
 
 #: templates/ERR_CACHE_ACCESS_DENIED:3 templates/ERR_CACHE_ACCESS_DENIED:5
@@ -138,7 +138,8 @@ msgstr "Verzeichnis: %U"
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr "Verzeichnis: <a href=\"%U\">%U</a>/"
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -187,23 +188,21 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "FEHLER: Die angeforderte URL konnte nicht gefunden werden"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "FEHLER: Die angeforderte URN konnte nicht gefunden werden"
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "FEHLER: Der angeforderte URN konnte nicht gefunden werden"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr "ESI-Verarbeitung fehlgeschlagen."
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
-msgstr "FTP PUT Erfolgreich: Datei erstellt"
-
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "FTP PUT Erfolgreich: Datei aktualisiert"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
+msgstr "FTP PUT erfolgreich: Datei erstellt"
 
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "FTP PUT/Upload fehlgeschlagen"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -222,11 +221,24 @@ msgstr "Datei erstellt"
 msgid "File updated"
 msgstr "Datei aktualisiert"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr "Für Firefox Browser gehen sie zu: <ul>"
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr "Für Internet Explorer Browser gehen sie zu: <ul>"
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr "Für Opera Browser gehen sie zu: <ul>"
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Weiterleitung verweigert."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -248,12 +260,17 @@ msgid "Generated %T by %h (%s)"
 msgstr "Erzeugt am %T von %h (%s)"
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
-msgstr "HTTP/1.1 Expect wird von einer HTTP/1.0 Software erfragt"
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
+msgstr "HTTP/1.1 <q>Expect</q> wird von einer HTTP/1.0 Software erfragt"
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
-msgstr "Hey, erwarte nicht zuviel von URNs am %T :)"
+msgstr "Hey, erwarten sie nicht zuviel von URNs auf %T :)"
+
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr "Wie sie diese Einstellung in ihrem Browser finden:"
 
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
@@ -279,6 +296,11 @@ msgstr "Ungültiges Zeichen im Hostname; Unterstriche sind nicht erlaubt."
 msgid "Illegal double-escape in the URL-Path"
 msgstr "Ungültiger Doppel-Escape im URL-Pfad"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr "Im HTTP Proxy Feld geben sie den Proxy Namen %h und Port 3128 ein."
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "Ungültige URL"
@@ -353,6 +375,14 @@ msgstr "Zeitüberschreitung beim Lesen"
 msgid "Request is too large."
 msgstr "Anfrage ist zu lang."
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr "Automatische Suche von Einstellungen"
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr "Automatisches Konfigurationsskript verwenden"
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Socketfehler"
@@ -473,9 +503,9 @@ msgstr ""
 "holen festgestellt:"
 
 #: 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 ""
-"Der Zielhost oder das Zielnetzwerk ist momentan nicht verfügbar.  Bitte "
+"Der Zielhost oder das Zielnetzwerk ist momentan nicht verfügbar. Bitte "
 "wiederholen sie die Anfrage."
 
 #: templates/ERR_TOO_BIG:5
@@ -513,20 +543,20 @@ msgstr "Das System antwortete: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
-"Es ist kein WAIS Relay für diesen Cache definiert!  Sagen sie dies dem "
+"Es ist kein WAIS Relay für diesen Cache definiert! Sagen sie dies dem "
 "Administrator."
 
 #: templates/ERR_TOO_BIG:8
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 "Diese Einschränkungen wurden vom Internetdienstanbieter eingerichtet der "
-"diesen Cache betreibt.  Bitte kontaktieren sie ihn falls sie denken, dass "
+"diesen Cache betreibt. Bitte kontaktieren sie ihn falls sie denken, dass "
 "dies ein Fehler ist."
 
 #: templates/ERR_UNSUP_HTTPVERSION:6
@@ -540,19 +570,19 @@ msgstr "Dieser Cache unterstützt kein FTP."
 #: templates/ERR_SHUTTING_DOWN:5
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "Dieser Cache wird momentan heruntergefahren und kann daher die Anfrage nicht "
-"bearbeiten.  Bitte wiederholen sie die Anfrage gleich noch einmal."
+"bearbeiten. Bitte wiederholen sie die Anfrage gleich noch einmal."
 
 #: templates/ERR_FORWARDING_DENIED:6
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "Dieser Cache wird ihre Anfrage nicht weiterleiten da er versucht ein "
-"Geschwisterverhältnis zu erzwingen.  Warscheinlich ist der Client auf %i ein "
+"Geschwisterverhältnis zu erzwingen. Warscheinlich ist der Client auf %i ein "
 "Cache der falsch konfiguriert wurde."
 
 #: templates/ERR_ICAP_FAILURE:7
@@ -587,11 +617,11 @@ msgstr ""
 #: templates/ERR_FTP_NOT_FOUND:7
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "Die Ursache kann eine FTP URL mit einem Absoluten Pfad sein (was nicht RFC "
-"1738 konform ist).  Wenn dies der Fall ist, ist die Datei unter <a href=\"%B"
+"1738 konform ist). Wenn dies der Fall ist, ist die Datei unter <a href=\"%B"
 "\">%B</a> zu finden."
 
 #: templates/ERR_SECURE_CONNECT_FAIL:7
@@ -609,16 +639,36 @@ msgstr ""
 #: templates/ERR_CANNOT_FORWARD:6
 msgid ""
 "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."
+"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."
 msgstr ""
-"Die Anfrage kann nicht an den Quellserver oder irgendeinen Vergeschalteten "
-"Cache weitergeleitet werden.  Der wahrscheinlichste Grund ist, dass der "
+"Die Anfrage kann nicht an den Quellserver oder irgendeinen vorgeschalteten "
+"Cache weitergeleitet werden. Der wahrscheinlichste Grund ist, dass der "
 "Administrator diesem Cache nicht erlaubt direkte Verbindungen zu "
 "Quellservern herzustellen oder alle vorgeschalteten Cache Server momentan "
 "nicht erreichbar sind."
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+"Extras -&gt; Internetoptionen -&gt; Verbindung -&gt; LAN Einstellungen -&gt;"
+"Proxy"
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+"Extras -&gt; Optionen -&gt; Erweitert -&gt; Netzwerk -&gt; "
+"Verbindungseinstellungen"
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+"Extras -&gt; Einstellungen -&gt; Erweitert -&gt; Netzwerk -&gt; Proxyserver"
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr "Konnte keine IP Adresse vom Hostnamen <q>%H</q> ermitteln."
@@ -643,11 +693,10 @@ msgstr ""
 "Kein gültiges Dokument wurde im Cache gefunden und <q>only-if-cached</q> "
 "Option wurde angegeben."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr ""
-"Als versucht wurde eine PUT Anfrage an die folgende URL zu senden: <a href="
-"\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr "Webbrowserkonfiguration"
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -660,11 +709,19 @@ msgid ""
 "revalidation prohibited by the <q>only-if-cached</q> directive."
 msgstr ""
 "Sie haben eine Anfrage mit der <q>only-if-cached</q> Cache Kontrolloption "
-"getätigt. Das Dokument wurde nicht im Cache gefunden, <em>oder</em> ioder es "
+"getätigt. Das Dokument wurde nicht im Cache gefunden, <em>oder</em> es "
 "forderte eine Aktualisierung an welche durch die <q>only-if-cached</q> "
 "Option unterbunden wurde."
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+"Ihre Webbrowserkonfiguration muss korrigiert werden um dieses Netzwerk zu "
+"nutzen."
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -696,3 +753,14 @@ msgstr "Ihr Webmaster ist <a href=\"mailto:%w\">%w</a>."
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "Nullgrößenantwort"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "FEHLER: Die angeforderte URN konnte nicht gefunden werden"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTP PUT erfolgreich: Datei aktualisiert"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr ""
+#~ "Als versucht wurde eine PUT Anfrage an die folgende URL zu senden: <a "
+#~ "href=\"%U\">%U</a>"
diff --git a/errors/el.po b/errors/el.po
index f5f5f08f0e..f7436c987c 100644
--- a/errors/el.po
+++ b/errors/el.po
@@ -2,14 +2,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2009-02-25 14:35+1300\n"
 "Last-Translator: George Papamichelakis <george@step.gr>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 1.2.0\n"
 
@@ -30,9 +30,10 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "Προέκυψε χρονικό όριο κατά την ανάγνωση δεδομένων από το δίκτυο. Το δίκτυο ή "
 "ο εξυπηρετητής δεν λειτουργεί ή υπολειτουργεί. Παρακαλώ ξαναδοκιμάστε."
@@ -47,9 +48,10 @@ msgid "Access Denied."
 msgstr "Απαγορεύεται η Πρόσβαση."
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "Οι ρυθμίσεις του μηχανισμού πρόσβασης αποτρέπουν την ολοκλήρωση της αιτήσεως "
@@ -64,7 +66,7 @@ msgstr ""
 "Κατά την προσπάθεια πρόσβασης στη διεύθυνση Προέκυψε σφάλμα εξακρίβωσης FTP: "
 "<a href=\"%U\">%U</a>"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -77,16 +79,18 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr ""
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 "Προέκυψε σφάλμα κατά την ανάγνωση δεδομένων από το δίκτυο. Παρακαλώ "
 "ξαναδοκιμάστε το αίτημα σας."
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 "Προέκυψε σφάλμα κατά την εγγραφή στο δίκτυο. Παρακαλώ δοκιμάστε ξανά το "
@@ -133,7 +137,8 @@ msgstr ""
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -183,24 +188,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "ΣΦΑΛΜΑ: Αδύνατη η πρόσβαση στην αιτούμενη διεύθυνση"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "ΣΦΑΛΜΑ: Δεν βρέθηκε διεύθυνση για το ζητούμενο όνομα"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "ΣΦΑΛΜΑ: Αδύνατη η πρόσβαση στην αιτούμενη διεύθυνση"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
-msgstr "Η εντολή FTP PUT ήταν επιτυχής: Το αρχείο δημιουργήθηκε"
-
-#: templates/ERR_FTP_PUT_MODIFIED:1
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
 #, fuzzy
-msgid "FTP PUT Successful: File Updated"
-msgstr "Η εντολή FTP PUT ήταν επιτυχής Το αρχείο ανανεώθηκε"
+msgid "FTP PUT Successful."
+msgstr "Η εντολή FTP PUT ήταν επιτυχής: Το αρχείο δημιουργήθηκε"
 
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "Η εντολή FTP PUT/upload απέτυχε"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -219,11 +222,24 @@ msgstr "Το αρχείο δημιουργήθηκε"
 msgid "File updated"
 msgstr "Το αρχείο ανανεώθηκε"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Απαγορεύεται η προώθηση."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -245,13 +261,18 @@ msgid "Generated %T by %h (%s)"
 msgstr ""
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "Μεταξύ μας, μην περιμένετε και πολλά από URNs στο %T :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr ""
@@ -282,6 +303,11 @@ msgstr ""
 msgid "Illegal double-escape in the URL-Path"
 msgstr "Λανθασμένοι χαρακτήρες διαφυγής στη διεύθυνση"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "Λανθασμένη Διεύθυνση"
@@ -357,6 +383,14 @@ msgstr "Τέλος Χρόνου Ανάγνωσης"
 msgid "Request is too large."
 msgstr "Η αίτηση είναι υπερμεγέθης."
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Σφάλμα Σύνδεσης"
@@ -436,8 +470,8 @@ msgstr ""
 #, fuzzy
 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 ""
@@ -477,7 +511,8 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_CONNECT_FAIL:7
-msgid "The remote host or network may be down.  Please try the request again."
+#, fuzzy
+msgid "The remote host or network may be down. Please try the request again."
 msgstr ""
 "Ο απομακρυσμένος υπολογιστής (ή δίκτυο) μάλλον δεν λειτουργεί. Δοκιμάστε "
 "αργότερα."
@@ -517,17 +552,19 @@ msgid "The system returned: <i>%E</i>"
 msgstr "Το σύστημα ενημέρωσε ότι: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
+#, fuzzy
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 "Δεν έχει καθοριστεί υπολογιστής WAIS Relay για αυτό το μεσολαβητή! "
 "Παραπονεθείτε στον Διαχειριστή. "
 
 #: templates/ERR_TOO_BIG:8
+#, fuzzy
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 "Τα όρια αυτά καθορίζονται από τον Παροχέα Υπηρεσιών Διαδικτύου που "
@@ -543,17 +580,19 @@ msgid "This cache does not support FTP."
 msgstr "Αυτός ο μεσολαβητής δεν υποστηρίζει FTP."
 
 #: templates/ERR_SHUTTING_DOWN:5
+#, fuzzy
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "Το σύστημα είναι σε διαδικασία τερματισμού και δεν μπορεί να εξυπηρετήσει το "
 "αίτημα σας αυτή τη στιγμή. Παρακαλώ δοκιμάστε ξανά σε λίγο."
 
 #: templates/ERR_FORWARDING_DENIED:6
+#, fuzzy
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "Ο μεσολαβητής δεν θα προωθήσει το αίτημα σας γιατί προσπαθεί να επιβάλει μια "
@@ -586,9 +625,10 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_FTP_NOT_FOUND:7
+#, fuzzy
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "Αυτό μπορεί να συμβαίνει από μια διεύθυνση FTP με απόλυτή διαδρομή (το οποίο "
@@ -607,9 +647,9 @@ msgstr ""
 #, fuzzy
 msgid ""
 "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."
+"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."
 msgstr ""
 "Το αίτημα σας δεν ήταν δυνατό να προωθηθεί στον αρχικό εξυπηρετητή αλλά και "
 "ούτε σε κάποιο γονικό μεσολαβητή. Η πιο πιθανές αιτίες είναι Ο διαχειριστής "
@@ -617,6 +657,21 @@ msgstr ""
 "εξυπηρετητές, και Όλοι οι διαθέσιμοι γονικοί μεσολαβητές, δεν είναι "
 "διαθέσιμοι."
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr "Δεν ήταν δυνατόν να εξακριβωθεί η διεύθυνση IP για το όνομα <q>%H</q>"
@@ -641,9 +696,10 @@ msgstr ""
 "Δεν βρέθηκε έγκυρο αντίγραφο στην μνήμη και έχει καθοριστεί η επιλογή "
 "<q>only-if-cached</q>."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr "Κατα τη διάρκεια μεταφόρτωσης στη διεύθυνση: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -660,7 +716,13 @@ msgstr ""
 "βρέθηκε αντίγραφο στη μνήμη, <em>ή</em> ήταν απαραίτητη η επαναφόρτωσή του "
 "που απαγορεύεται από την επιλογή <q>only-if-cached</q>. "
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -691,3 +753,13 @@ msgstr ""
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "Απάντηση Μηδενικού Μεγέθους"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "ΣΦΑΛΜΑ: Δεν βρέθηκε διεύθυνση για το ζητούμενο όνομα"
+
+#, fuzzy
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "Η εντολή FTP PUT ήταν επιτυχής Το αρχείο ανανεώθηκε"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr "Κατα τη διάρκεια μεταφόρτωσης στη διεύθυνση: <a href=\"%U\">%U</a>"
diff --git a/errors/en.po b/errors/en.po
index 123d5623ed..d9fb3acb16 100644
--- a/errors/en.po
+++ b/errors/en.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
-"PO-Revision-Date: 2010-03-07 13:24+0200\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
+"PO-Revision-Date: 2010-05-01 00:17+1300\n"
 "Last-Translator: Amos <squid3@treenet.co.nz>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
 "Language: en\n"
@@ -36,11 +36,11 @@ msgstr ""
 
 #: templates/ERR_READ_TIMEOUT:7
 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."
+"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 ""
-"A Timeout occurred while waiting to read data from the network.  The network "
-"or server may be down or congested.  Please retry your request."
+"A Timeout occurred while waiting to read data from the network. The network "
+"or server may be down or congested. Please retry your request."
 
 #: templates/ERR_URN_RESOLVE:3
 msgid "A URL for the requested URN could not be retrieved"
@@ -53,11 +53,11 @@ msgstr "Access Denied."
 #: templates/ERR_ACCESS_DENIED:6
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 
 #: templates/ERR_FTP_FORBIDDEN:4
@@ -68,7 +68,7 @@ msgstr ""
 "An FTP authentication failure occurred while trying to retrieve the URL: <a "
 "href=\"%U\">%U</a>"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -82,18 +82,18 @@ msgstr "An Illegal response was received from the ICAP server."
 
 #: templates/ERR_READ_ERROR:7
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 
 #: templates/ERR_WRITE_ERROR:7
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 
 #: templates/ERR_CACHE_ACCESS_DENIED:3 templates/ERR_CACHE_ACCESS_DENIED:5
@@ -137,7 +137,8 @@ msgstr "Directory: %U"
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr "Directory: <a href=\"%U\">%U</a>/"
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -186,23 +187,21 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "ERROR: The requested URL could not be retrieved"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "ERROR: The requested URN not be retrieved"
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "ERROR: The requested URN could not be retrieved"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr "ESI Processing failed."
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "FTP PUT Successful: File Created"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "FTP PUT Successful: File Updated"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "FTP PUT/upload failed"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -221,11 +220,24 @@ msgstr "File created"
 msgid "File updated"
 msgstr "File updated"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr "For Firefox browsers go to: <ul>"
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr "For Internet Explorer browsers go to: <ul>"
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr "For Opera browsers go to: <ul>"
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Forwarding Denied."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -247,13 +259,19 @@ msgid "Generated %T by %h (%s)"
 msgstr "Generated %T by %h (%s)"
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
-msgstr "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
+msgstr ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "Hey, don't expect too much from URNs on %T :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr "How to find these settings in your browser:"
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr "ICAP protocol error."
@@ -282,6 +300,11 @@ msgstr "Illegal character in hostname; underscores are not allowed."
 msgid "Illegal double-escape in the URL-Path"
 msgstr "Illegal double-escape in the URL-Path"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "Invalid URL"
@@ -354,6 +377,14 @@ msgstr "Read Timeout"
 msgid "Request is too large."
 msgstr "Request is too large."
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr "Select Automatically detect settings"
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr "Select Use Automatic proxy configuration"
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Socket Failure"
@@ -473,8 +504,8 @@ msgstr ""
 "href=\"%U\">%U</a>"
 
 #: templates/ERR_CONNECT_FAIL:7
-msgid "The remote host or network may be down.  Please try the request again."
-msgstr "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 "The remote host or network may be down. Please try the request again."
 
 #: templates/ERR_TOO_BIG:5
 msgid "The request or reply is too large."
@@ -511,20 +542,20 @@ msgstr "The system returned: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 
 #: templates/ERR_TOO_BIG:8
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 
 #: templates/ERR_UNSUP_HTTPVERSION:6
@@ -538,19 +569,19 @@ msgstr "This cache does not support FTP."
 #: templates/ERR_SHUTTING_DOWN:5
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 
 #: templates/ERR_FORWARDING_DENIED:6
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 
 #: templates/ERR_ICAP_FAILURE:7
@@ -584,11 +615,11 @@ msgstr ""
 #: templates/ERR_FTP_NOT_FOUND:7
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 
 #: templates/ERR_SECURE_CONNECT_FAIL:7
@@ -606,14 +637,32 @@ msgstr ""
 #: templates/ERR_CANNOT_FORWARD:6
 msgid ""
 "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."
+"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."
 msgstr ""
 "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."
+"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."
+
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
 
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
@@ -639,9 +688,10 @@ msgstr ""
 "Valid document was not found in the cache and <q>only-if-cached</q> "
 "directive was specified."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr "Web Browser Configuration"
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -657,7 +707,14 @@ msgstr ""
 "directive. The document was not found in the cache, <em>or</em> it required "
 "revalidation prohibited by the <q>only-if-cached</q> directive."
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+"Your Web Browser configuration needs to be corrected to use this network."
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -689,3 +746,12 @@ msgstr "Your webmaster is <a href=\"mailto:%w\">%w</a>."
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "Zero Sized Reply"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "ERROR: The requested URN not be retrieved"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTP PUT Successful: File Updated"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
diff --git a/errors/errorpage.css b/errors/errorpage.css
index 8cfa802c8c..8ecc4c8279 100644
--- a/errors/errorpage.css
+++ b/errors/errorpage.css
@@ -67,6 +67,15 @@ pre {
 }
 
 /* special event: FTP / Gopher directory listing */
+#dirmsg {
+    font-family: courier;
+    color: black;
+    font-size: 10pt;
+}
+#dirlisting {
+    margin-left: 2%;
+    margin-right: 2%;
+}
 #dirlisting tr.entry td.icon,td.filename,td.size,td.date {
     border-bottom: groove;
 }
diff --git a/errors/errpages.pot b/errors/errpages.pot
index d3e96d55eb..48a1034f75 100644
--- a/errors/errpages.pot
+++ b/errors/errpages.pot
@@ -1,384 +1,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  ERR_ACCESS_DENIED.pot (Squid-3)  #-#-#-#-#\n"
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_CACHE_ACCESS_DENIED.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_CACHE_MGR_ACCESS_DENIED.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_CANNOT_FORWARD.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_CONNECT_FAIL.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_DIR_LISTING.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_DNS_FAIL.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_ESI.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_FORWARDING_DENIED.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_FTP_DISABLED.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_FTP_FAILURE.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_FTP_FORBIDDEN.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_FTP_NOT_FOUND.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_FTP_PUT_CREATED.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_FTP_PUT_ERROR.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_FTP_PUT_MODIFIED.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_FTP_UNAVAILABLE.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:05+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_ICAP_FAILURE.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:05+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_INVALID_REQ.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:05+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_INVALID_RESP.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:05+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_INVALID_URL.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:05+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_LIFETIME_EXP.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:05+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_NO_RELAY.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:05+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_ONLY_IF_CACHED_MISS.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:05+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_READ_ERROR.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:05+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_READ_TIMEOUT.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:05+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_SECURE_CONNECT_FAIL.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:05+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_SHUTTING_DOWN.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:05+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_SOCKET_FAILURE.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:05+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_TOO_BIG.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:05+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_UNSUP_HTTPVERSION.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:05+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_UNSUP_REQ.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:05+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_URN_RESOLVE.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:05+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_WRITE_ERROR.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:05+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-"#-#-#-#-#  ERR_ZERO_SIZE_OBJECT.pot (Squid-3)  #-#-#-#-#\n"
-"Project-Id-Version: Squid-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:05+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+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"
@@ -405,8 +30,8 @@ msgstr ""
 
 #: templates/ERR_READ_TIMEOUT:7
 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."
+"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 ""
 
 #: templates/ERR_URN_RESOLVE:3
@@ -420,7 +45,7 @@ msgstr ""
 #: templates/ERR_ACCESS_DENIED:6
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 
@@ -430,7 +55,7 @@ msgid ""
 "href=\"%U\">%U</a>"
 msgstr ""
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -442,13 +67,13 @@ msgstr ""
 
 #: templates/ERR_READ_ERROR:7
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 
 #: templates/ERR_WRITE_ERROR:7
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 
@@ -493,7 +118,8 @@ msgstr ""
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -542,23 +168,19 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
+msgid "ERROR: The requested URN could not be retrieved"
 msgstr ""
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
-msgstr ""
-
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+msgid "FTP PUT Successful."
 msgstr ""
 
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+msgid "FTP PUT upload failed"
 msgstr ""
 
 #: templates/ERR_FTP_DISABLED:5
@@ -577,11 +199,24 @@ msgstr ""
 msgid "File updated"
 msgstr ""
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -603,13 +238,18 @@ msgid "Generated %T by %h (%s)"
 msgstr ""
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr ""
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr ""
@@ -634,6 +274,11 @@ msgstr ""
 msgid "Illegal double-escape in the URL-Path"
 msgstr ""
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr ""
@@ -698,6 +343,14 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr ""
@@ -801,7 +454,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
@@ -839,14 +492,14 @@ msgstr ""
 
 #: templates/ERR_NO_RELAY:6
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 
 #: templates/ERR_TOO_BIG:8
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 
@@ -861,13 +514,13 @@ msgstr ""
 #: templates/ERR_SHUTTING_DOWN:5
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 
 #: templates/ERR_FORWARDING_DENIED:6
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 
@@ -896,7 +549,7 @@ msgstr ""
 #: templates/ERR_FTP_NOT_FOUND:7
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 
@@ -911,9 +564,24 @@ msgstr ""
 #: templates/ERR_CANNOT_FORWARD:6
 msgid ""
 "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."
+"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."
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
 msgstr ""
 
 #: templates/ERR_DNS_FAIL:5
@@ -938,8 +606,9 @@ msgid ""
 "directive was specified."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
 msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
@@ -953,7 +622,13 @@ msgid ""
 "revalidation prohibited by the <q>only-if-cached</q> directive."
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
diff --git a/errors/es.po b/errors/es.po
index 639dd61cdc..ee3bbee36b 100644
--- a/errors/es.po
+++ b/errors/es.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2009-03-06 00:14+0000\n"
 "Last-Translator: juancarlospaco <juancarlospaco@hotmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -40,12 +41,12 @@ msgstr ""
 
 #: templates/ERR_READ_TIMEOUT:7
 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."
+"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 ""
-"Se acab&oacute; el tiempo m&aacute;ximo de lectura mientras se le&iacute;an "
-"datos de la red.  La red o el servidor pueden estar congestionados.  Por "
-"favor, int&eacute;ntelo de nuevo"
+"Un tiempo de espera se produjo mientras se esperaba leer datos de la red. La "
+"red o el servidor puede estar caído o congestionado. Por favor, inténtelo de "
+"nuevo."
 
 #: templates/ERR_URN_RESOLVE:3
 msgid "A URL for the requested URN could not be retrieved"
@@ -58,12 +59,12 @@ msgstr "Acceso Denegado"
 #: templates/ERR_ACCESS_DENIED:6
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
-"Las reglas de control de acceso impiden que su petici&oacute;n sea permitida "
-"en este momento.  Contacte con su proveedor de servicios si cree que esto es "
-"incorrecto."
+"La configuración de control de acceso evita que su solicitud sea permitida "
+"en este momento. Por favor, póngase en contacto con su proveedor de "
+"servicios si cree que esto es incorrecto."
 
 #: templates/ERR_FTP_FORBIDDEN:4
 msgid ""
@@ -73,7 +74,7 @@ msgstr ""
 "Ha ocurrido una falla de autenticaci&oacute;n cuando se trataba de conseguir "
 "el URL: <a href=\"%U\">%U</a>"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -87,19 +88,19 @@ msgstr "Se ha recibido una respuesta ilegal desde el servidor ICAP."
 
 #: templates/ERR_READ_ERROR:7
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
-"Ha ocurrido alg&uacute;n problema mientras se le&iacute;an datos de la red.  "
-"Por favor, int&eacute;ntelo de nuevo."
+"Se ha producido un error al leer datos de la red. Por favor, inténtelo de "
+"nuevo."
 
 #: templates/ERR_WRITE_ERROR:7
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
-"Se ha producido un error mientras se escrib&iacute;an datos en la red.  Por "
-"favor, int&eacute;ntelo de nuevo."
+"Se ha producido un error al escribir datos de la red. Por favor, inténtelo "
+"de nuevo."
 
 #: templates/ERR_CACHE_ACCESS_DENIED:3 templates/ERR_CACHE_ACCESS_DENIED:5
 msgid "Cache Access Denied."
@@ -139,11 +140,11 @@ msgid "Directory: %U"
 msgstr "Directorio: %U"
 
 #: templates/ERR_DIR_LISTING:2
-#, fuzzy
 msgid "Directory: <a href=\"%U\">%U</a>/"
-msgstr "Directorio: <a href=\"/\">%U</a>/"
+msgstr "Directorio: <a href=\"%U\">%U</a>/"
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -192,23 +193,21 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "ERROR: El URL solicitado no se ha podido conseguir"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "ERROR: El URN solicitado no se ha podido conseguir"
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "ERROR: La URN requerida no pudo ser obtenida."
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr "El procesado ESI falló"
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "FTP PUT Correcto: Archivo Creado"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "FTP PUT Correcto: Archivo actualizado"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "FTP PUT/envio fallido"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -227,11 +226,24 @@ msgstr "Archivo creado"
 msgid "File updated"
 msgstr "Archivo actualizado"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr "Para navegadores basados en Firefox vaya a:"
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr "Para navegadores Internet Explorer vaya a:"
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr "Para navegadores Opera vaya a:"
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Reenv&iacute;o denegado."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -253,13 +265,20 @@ msgid "Generated %T by %h (%s)"
 msgstr "Generado %T por %h (%s)"
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
+"HTTP/1.1 <q>Esperado:</q> la característica ha sido requerida desde un "
+"software HTTP/1.0."
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "Hey, no espere mucho de URNs en %T :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr "Como encontrar estas preferencias en su navegador:"
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr "Error de protocolo ICAP."
@@ -290,6 +309,13 @@ msgstr ""
 msgid "Illegal double-escape in the URL-Path"
 msgstr "Hay un doble-escape ilegal en la ruta de la URL"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+"En la caja de entrada de HTTP proxy escriba el nombre del proxy %h y el "
+"puerto 3128"
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "URL Inválida"
@@ -367,6 +393,14 @@ msgstr ""
 msgid "Request is too large."
 msgstr "La petición es demasiado grande."
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr "Seleccione Detectar preferencias automáticamente"
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr "Seleccione Usar Configuración automática de Proxy"
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Fallo en el puerto (socket)"
@@ -489,10 +523,10 @@ msgstr ""
 "href=\"%U\">%U</a>"
 
 #: 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 ""
-"El equipo remoto o la red deben estar caídas.  Por favor intenta la petición "
-"de nuevo."
+"El host remoto o la red se ha caído. Por favor, inténtelo de nuevo la "
+"petición."
 
 #: templates/ERR_TOO_BIG:5
 msgid "The request or reply is too large."
@@ -529,21 +563,21 @@ msgstr "El sistema ha devuelto: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
-"Este cach&eacute; no tiene definido ninguna pasarela para el protocolo "
-"WAIS !!  &iexcl;Gr&iacute;tele al administrador del cach&eacute; !"
+"No esta definido el host wais relay para este cache. comentar con el "
+"administrador"
 
 #: templates/ERR_TOO_BIG:8
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
-"Estos l&iacute;mites fueron establecidos por el Proveedor de Servicios de "
-"Internet que opera este cach&eacute;.  Por favor, contacte con &eacute;l "
-"directamente si cree que esto es un error."
+"Estos límites han sido establecidos por el proveedor de servicios de "
+"Internet que opera este caché. Por favor, comuníquese con ellos directamente "
+"si cree que esto es un error"
 
 #: templates/ERR_UNSUP_HTTPVERSION:6
 msgid "This Squid does not accept the HTTP version you are attempting to use."
@@ -556,20 +590,19 @@ msgstr "Esta caché no soporta FTP."
 #: templates/ERR_SHUTTING_DOWN:5
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
-"Esta caché está en proceso de apagarse y no puede servir tu petición en este "
-"momento.  Por favor vuelve a intentar tu petición de nuevo pronto."
+"Este caché está en el proceso de apagado y no puede atender su solicitud en "
+"este momento. Por favor, inténtelo de nuevo pronto."
 
 #: templates/ERR_FORWARDING_DENIED:6
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
-"Este cach&eacute; no permite reenviar su petici&oacute;n porque trata de "
-"obligar a mantener una relaci&oacute;n de hermandad.  Quiz&aacute;s el "
-"cliente en %i es un cach&eacute; que ha sido mal configurado."
+"Este caché no transmitirá su solicitud, ya que intenta imponer una relación "
+"de conexión. Quizás el cliente en% i es un caché que se ha desconfigurado."
 
 #: templates/ERR_ICAP_FAILURE:7
 msgid "This means that some aspect of the ICAP communication failed."
@@ -604,12 +637,12 @@ msgstr ""
 #: templates/ERR_FTP_NOT_FOUND:7
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
-"Esto puede ser causado por un URL FTP con un camino absoluto (y por lo tanto "
-"no cumple con RFC 1738).  Si esta es la causa, entonces el  archivo puede "
-"ser obtenido en <a href=\"%B\">%B</a>."
+"Esto podria ser causado por una URL del FTP con ruta absoluta (La cual no "
+"cumple con el RFC 1738). si esto es la causa, entonces el archivo puede ser "
+"buscado en <a href=\"%B\">%B</a>."
 
 #: templates/ERR_SECURE_CONNECT_FAIL:7
 msgid ""
@@ -626,16 +659,35 @@ msgstr ""
 #: templates/ERR_CANNOT_FORWARD:6
 msgid ""
 "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."
+"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."
 msgstr ""
-"La petici&oacute;n no ha podido ser enviada al servidor origen o a alguno de "
-"los cach&eacute;s padres.  Las razones m&aacute;s probables de que haya "
-"ocurrido este error son el administrador de lo cach&eacute; no permite que "
-"este cach&eacute; realice conexiones directas a los servidores origen, y "
-"todos los cach&eacute;s configurados como padres son inalcanzables en este "
-"momento."
+"Esta solicitud no ha podido comunicarse con el servidor de origen o de "
+"alguna de los cachés padres. La causa más probable de este error es que el "
+"administrador de caché no permite que este caché realice conexiones directas "
+"a los servidores de origen, y todos los cachés configurados como padres son "
+"inalcanzables en este momento."
+
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+"Herramientas -&gt; Opciones de Internet  -&gt; Conexión -&gt; Preferencias "
+"de RED -&gt;Proxy"
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+"Herramientas -&gt; Opciones -&gt; Avanzado -&gt; Red -&gt; Ajustes de "
+"conexión"
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+"Herramientas -&gt; Opciones -&gt; Avanzado -&gt; Red -&gt; Servidores Proxy"
 
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
@@ -663,10 +715,10 @@ msgstr ""
 "No se encontr&oacute; un documento v&aacute;lido en el cach&eacute; y se "
 "especific&oacute; la directiva <q>only-if-cached</q>."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr ""
-"Mientras se intentaba hacer un PUT del siguiente URL: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr "Configuración del Navegador de Internet"
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -683,7 +735,15 @@ msgstr ""
 "<em>o</em> requiere revalidaci&oacute;n prohibida por la directiva <q>only-"
 "if-cached</q>"
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+"Su configuración de Navegador de Internet necesita ser corregida para usar "
+"esta red."
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -716,3 +776,14 @@ msgstr "Su administrador web es <a href=\"mailto:%w\">%w</a>."
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "Respuesta vac&iacute;a (tama&ntilde;o cero)"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "ERROR: El URN solicitado no se ha podido conseguir"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTP PUT Correcto: Archivo actualizado"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr ""
+#~ "Mientras se intentaba hacer un PUT del siguiente URL: <a href=\"%U\">%U</"
+#~ "a>"
diff --git a/errors/et.po b/errors/et.po
index 9718e0a55e..ae4283708c 100644
--- a/errors/et.po
+++ b/errors/et.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2009-01-29 22:14+0000\n"
 "Last-Translator: Tanel Kurvits <Unknown>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,9 +32,10 @@ msgid ""
 msgstr "<b>Vigane vastus</b> j&auml;rgnev viga sooritades p&auml;ringut:"
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "Lugejal katkes v&otilde;rgust andmeid lugedes kannatus. V&otilde;rk v&otilde;"
 "iserver v&otilde;ib olla maas v&otilde;i umbes. Proovige uuesti."
@@ -47,9 +49,10 @@ msgid "Access Denied."
 msgstr "Juurdep&auml;&auml;s keelatud."
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "Juurdep&auml;&auml;su kontrolli konfiguratsioon blokeerib teie p&auml;ringut."
@@ -64,7 +67,7 @@ msgid ""
 msgstr ""
 "URLi <a href=\"%U\">%U</a> lugemisel tekkis t&otilde;rge FTP autentimisel."
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 #, fuzzy
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
@@ -78,14 +81,16 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr ""
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr "Andmete lugemisel tekkis veasituatsioon. Palun korrake p&auml;ringut."
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr "V&otilde;rku kirjutades tekkis viga. Palun korrake p&auml;ringut."
 
@@ -131,7 +136,8 @@ msgstr ""
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -180,23 +186,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "VIGA: P&auml;ring URLile ei saa vastust"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "VIGA: P&auml;ring URNile ei saa vastust"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "VIGA: P&auml;ring URLile ei saa vastust"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "FTP PUT &Otilde;nnestus: fail loodi"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "FTP PUT &Otilde;nnestus: fail on uuendatud"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "FTP PUT eba&otilde;nnestus"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -215,11 +220,24 @@ msgstr "Fail on loodud"
 msgid "File updated"
 msgstr "Fail on uuendatud"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Edastamine keelatud."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -241,13 +259,18 @@ msgid "Generated %T by %h (%s)"
 msgstr ""
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "Hei, mida sa ootad URNidelt %T peal:)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr ""
@@ -278,6 +301,11 @@ msgstr "keelatud s&uuml;mbolid hosti nimes; alakriipsud pole lubatud"
 msgid "Illegal double-escape in the URL-Path"
 msgstr "Vigane topelt-kaldkriips URLi teel"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "Vigane URL"
@@ -352,6 +380,14 @@ msgstr "Lugeja kannatus katkes"
 msgid "Request is too large."
 msgstr "P&auml;ring v&otilde;ib olla liiga suur"
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Pistiku viga"
@@ -477,7 +513,8 @@ msgstr ""
 "a>"
 
 #: templates/ERR_CONNECT_FAIL:7
-msgid "The remote host or network may be down.  Please try the request again."
+#, fuzzy
+msgid "The remote host or network may be down. Please try the request again."
 msgstr ""
 "Server v&otilde;i arvutiv&otilde;rk ei t&ouml;&ouml;ta. Palun korrake p&auml;"
 "ringut."
@@ -516,17 +553,19 @@ msgid "The system returned: <i>%E</i>"
 msgstr "S&uuml;steem vastas: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
+#, fuzzy
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 "Selles vahemälu serveris on WAISi edastav host kirjeldamata!  Kontakteeruge "
 "administraatoriga."
 
 #: templates/ERR_TOO_BIG:8
+#, fuzzy
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 "Need piirangus on seadnud teie teenusepakkuja, keshaldab seda vahemälu "
@@ -542,18 +581,20 @@ msgid "This cache does not support FTP."
 msgstr "See vahemälu server ei toeta FTPd."
 
 #: templates/ERR_SHUTTING_DOWN:5
+#, fuzzy
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "Meie server on saanud k&auml;su t&ouml;&ouml; l&otilde;petada ja ei saa teie "
 "p&auml;ringut hetkel teenindada. Palun korrake oma p&auml;ringut motilde;ne "
 "aja p&auml;rast."
 
 #: templates/ERR_FORWARDING_DENIED:6
+#, fuzzy
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "Meie vahemälu server ei edasta teie p&auml;ringut, kuna ta kasutab andmete "
@@ -585,9 +626,10 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_FTP_NOT_FOUND:7
+#, fuzzy
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "See olukord v&otilde;ib olla tekkinud, kui FTP URL on antud absoluutse teega "
@@ -606,9 +648,9 @@ msgstr ""
 #, fuzzy
 msgid ""
 "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."
+"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."
 msgstr ""
 "P&auml;ringut ei &otilde;nnestunud edastada ei originaali serverile ega "
 "&uuml;helegi vanem vahemälu serverile. Ilmselt on p&otilde;hjus vahemälu "
@@ -616,6 +658,21 @@ msgstr ""
 "originaali serverile ja k&otilde;ik kirjeldatud vanem vahemälu serverid on "
 "hetkel k&auml;ttesaamatud."
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr "Ei &otilde;nnestu saada hosti <q>%H</q> nimele vastavat IP aadressi"
@@ -640,10 +697,10 @@ msgstr ""
 "Kehtiv dokument puudub vahemälu serverist ja p&auml;ring sisaldas <q>only-if-"
 "cached</q> direktiivi."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-#, fuzzy
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr "PUT operatsioon URLil <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -660,7 +717,13 @@ msgstr ""
 "n&otilde;udis uuendamist, mis on aga keelatud <q>only-if-cached</q> "
 "direktiiviga."
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -692,3 +755,13 @@ msgstr ""
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "Vastus on t&uuml;hi"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "VIGA: P&auml;ring URNile ei saa vastust"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTP PUT &Otilde;nnestus: fail on uuendatud"
+
+#, fuzzy
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr "PUT operatsioon URLil <a href=\"%U\">%U</a>"
diff --git a/errors/fa.po b/errors/fa.po
index 30bace2995..2292613cf5 100644
--- a/errors/fa.po
+++ b/errors/fa.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
-"PO-Revision-Date: 2009-02-27 23:14+0330\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
+"PO-Revision-Date: 2010-06-07 23:05+0330\n"
 "Last-Translator: Mohsen Saeedi <mohsen.saeedi@gmail.com>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,9 +29,10 @@ msgid ""
 msgstr "<b>پاسخ نامعتبر</b> این خطا در زمان پردازش درخواست روی‌ داده بود:"
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "زمان مجاز جهت خواندن اطلاعات از روی شبکه سپری شده است. شبکه یا سرور مورد نظر "
 "احتمالا از کار افتاده یا دارای بار زیاد است. لطفا دوباره تلاش کنید."
@@ -44,9 +46,10 @@ msgid "Access Denied."
 msgstr "دسترسی رد شد."
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "تنظیمات سطح دسترسی هم‌اکنون به شما اجازه این درخواست را نمی‌دهد. در صورتی که "
@@ -60,7 +63,7 @@ msgstr ""
 "موقع تلاش جهت دسترسی به آدرس مورد نظر عمل شناسایی کاربر بر روی FTP با عدم "
 "موفقیت همراه بود. : <a href=\"%U\">%U</a>"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -73,15 +76,17 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr "یک جواب نامعتبر از خادم ICAP دریافت شد. "
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 "یک خطا در هنگام خواندن اطلاعات از روی شبکه روی داد. لطفا دوباره تلاش کنید. "
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 "یک خطا در هنگام فرستادن اطلاعات در شبکه روی داد. لطفا دوباره تلاش کنید. "
@@ -101,7 +106,7 @@ msgstr "عدم توانایی در ترجمه URN."
 
 #: templates/ERR_LIFETIME_EXP:5
 msgid "Connection Lifetime Expired"
-msgstr "زمان ارتباط منقضی شد."
+msgstr "دوره عمر ارتباط شما به پایان رسید."
 
 #: templates/ERR_CONNECT_FAIL:5
 msgid "Connection to %I failed."
@@ -109,27 +114,26 @@ msgstr "برقراری ارتباط به l% با عدم موفقیت همراه
 
 #: templates/ERR_INVALID_REQ:10
 msgid "Content-Length missing for POST or PUT requests."
-msgstr ""
+msgstr "طول محتویات درخواست برای PUT  یا POST کم است."
 
 #: templates/ERR_DIR_LISTING:3
 msgid "Directory Content:"
 msgstr "محتویات مسیر:"
 
 #: templates/ERR_DIR_LISTING:4
-#, fuzzy
 msgid "Directory Listing"
-msgstr "محتویات مسیر:"
+msgstr "محتویات مسیر"
 
 #: templates/ERR_DIR_LISTING:1
-#, fuzzy
 msgid "Directory: %U"
-msgstr "محتویات مسیر:"
+msgstr "مسیر : U%"
 
 #: templates/ERR_DIR_LISTING:2
 msgid "Directory: <a href=\"%U\">%U</a>/"
-msgstr ""
+msgstr "مسیر: <a href=\"%U\">%U</a>/"
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -154,7 +158,7 @@ msgstr "خطا: رد شدن دسترسی به نهانگاه"
 
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:1
 msgid "ERROR: Cache Manager Access Denied"
-msgstr "خطا: رد شدن دسترسی برای مدیریت نهانگاه"
+msgstr "خطا: اجازه دسترسی به مدیریت Cache وجود ندارد."
 
 #: templates/ERR_FTP_PUT_ERROR:1
 msgid "ERROR: FTP upload failed"
@@ -178,46 +182,58 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "خطا: آدرس درخواست شده را نمی‌توانست دریافت شود"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "خطا: URN درخواست شده نمی‌توانست دریافت شود"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "خطا: آدرس درخواست شده را نمی‌توانست دریافت شود"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
-msgstr ""
-
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
-msgstr ""
+msgstr "پردازش ESI با عدم موفقیت همراه بود."
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr ""
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
+msgstr "عمل بارگذاری روی FTP با موفقیت همراه بود: فایل ساخته شد."
 
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
-msgstr ""
+#, fuzzy
+msgid "FTP PUT upload failed"
+msgstr "باگذاری روی FTP/ بارگذاری با عدم موفقیت همراه بود."
 
 #: templates/ERR_FTP_DISABLED:5
 msgid "FTP is Disabled"
-msgstr ""
+msgstr "FTP قابل دسترس نیست."
 
 #: templates/ERR_SECURE_CONNECT_FAIL:5
 msgid "Failed to establish a secure connection to %I"
-msgstr ""
+msgstr "ایجاد یک ارتباط امن به I% با عدم موفقیت همراه بود."
 
 #: templates/ERR_FTP_PUT_CREATED:3
 msgid "File created"
-msgstr ""
+msgstr "فایل ایجاد شد."
 
 #: templates/ERR_FTP_PUT_MODIFIED:3
 msgid "File updated"
+msgstr "فایل بروزرسانی شد."
+
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
 msgstr ""
 
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
-msgstr ""
+msgstr "امکان Forward بسته شده است."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -236,76 +252,94 @@ msgstr ""
 #: templates/ERR_URN_RESOLVE:8 templates/ERR_WRITE_ERROR:9
 #: templates/ERR_ZERO_SIZE_OBJECT:8
 msgid "Generated %T by %h (%s)"
-msgstr ""
+msgstr "%T توسط %h(%s) تولید شد."
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+#, fuzzy
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
+"انتظار برای HTTP/1.1 : این ویژگی از یک نرم افزار با HTTP/1.0 درخواست شده است."
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
+msgstr "آهای، انتظار زیادی از URNها بر روی T% نداشته باش :)"
+
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
 msgstr ""
 
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
-msgstr ""
+msgstr "خطا در قرارداد ICAP"
 
 #: templates/ERR_TOO_BIG:7
 msgid ""
 "If you are making a GET request, then the item you are trying to download is "
 "too large."
 msgstr ""
+"اگر شما یک درخواست GET دارید، موردی که شما در تلاش برای دریافت آن هستید "
+"بسیار بزرگ است."
 
 #: templates/ERR_TOO_BIG:6
 msgid ""
 "If you are making a POST or PUT request, then the item you are trying to "
 "upload is too large."
 msgstr ""
+"اگر شما یک درخواست PUT یا POST دارید، موردی که شما در تلاش برای بارگذاری "
+"هستید بسیار بزرگ است."
 
 #: templates/ERR_INVALID_REQ:11 templates/ERR_INVALID_URL:11
 msgid "Illegal character in hostname; underscores are not allowed."
-msgstr ""
+msgstr "کاراکتر غیرمجاز در نام دستگاه، زیرین خط (ـ) اجازه داده نشده است."
 
 #: templates/ERR_INVALID_URL:10
 msgid "Illegal double-escape in the URL-Path"
+msgstr "۲ فاصله خالی غیر مجاز در مسیر نشانی اینترنتی"
+
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
 msgstr ""
 
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
-msgstr ""
+msgstr "نشانی اینترنتی نامعتبر"
 
 #: templates/ERR_INVALID_REQ:8
 msgid "Missing HTTP Identifier (HTTP/1.0)."
-msgstr ""
+msgstr "فقدان شناسه HTTP (نسخه 1.0)"
 
 #: templates/ERR_INVALID_REQ:7
 msgid "Missing URL."
-msgstr ""
+msgstr "فقدان نشانی اینترنتی"
 
 #: templates/ERR_INVALID_URL:9
 msgid "Missing hostname"
-msgstr ""
+msgstr "فقدان hostname"
 
 #: templates/ERR_INVALID_URL:8
 msgid ""
 "Missing or incorrect access protocol (should be <q>http://</q> or similar)"
 msgstr ""
+"فقدان یا ناصحیح بودن قرارداد دست‌یابی (باید به فرم<q>http://</q> یا شبیه آن "
+"باشد)"
 
 #: templates/ERR_INVALID_REQ:6
 msgid "Missing or unknown request method."
-msgstr ""
+msgstr "فقدان یا ناشناخته بودن روش درخواست."
 
 #: templates/ERR_NO_RELAY:5
 msgid "No Wais Relay"
-msgstr ""
+msgstr "عدم رله Wais"
 
 #: templates/ERR_FTP_PUT_CREATED:2 templates/ERR_FTP_PUT_MODIFIED:2
 msgid "Operation successful"
-msgstr ""
+msgstr "عملیات موفقیت‌آمیز"
 
 #: templates/ERR_DIR_LISTING:5
 msgid "Parent Directory"
-msgstr ""
+msgstr "شاخه والد"
 
 #: templates/ERR_CACHE_ACCESS_DENIED:7
 msgid ""
@@ -313,6 +347,9 @@ msgid ""
 "have difficulties authenticating yourself or <a href=\"http://%h/cgi-bin/"
 "chpasswd.cgi\">change</a> your default password."
 msgstr ""
+"لطفا در صورت داشتن مشکلاتی در زمینه شناسایی خودتان با <a href=\"mailto:%w%W"
+"\">cache administrator</a> تماس حاصل فرمایید یا از طریق <a href=\"http://%h/"
+"cgi-bin/chpasswd.cgi\">تغییر</a> رمز خود مشکل را حل نمایید."
 
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:7
 msgid ""
@@ -324,28 +361,36 @@ msgstr ""
 
 #: templates/ERR_READ_ERROR:5
 msgid "Read Error"
-msgstr ""
+msgstr "خطا در خواندن"
 
 #: templates/ERR_READ_TIMEOUT:5
 msgid "Read Timeout"
-msgstr ""
+msgstr "سپری شدن زمان مجاز خواندن"
 
 #: templates/ERR_INVALID_REQ:9
 msgid "Request is too large."
+msgstr "درخواست بسیار بزرگ است."
+
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
 msgstr ""
 
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
-msgstr ""
+msgstr "خرابی سوکت"
 
 #: templates/ERR_INVALID_URL:6
 msgid "Some aspect of the requested URL is incorrect."
-msgstr ""
+msgstr "برخی از صُور نشانی اینترنتی درخواست شده ناصحیح است."
 
 #: templates/ERR_ICAP_FAILURE:8 templates/ERR_INVALID_REQ:5
 #: templates/ERR_INVALID_URL:7
 msgid "Some possible problems are:"
-msgstr ""
+msgstr "بعضی از مشکلات احتمالی:"
 
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:6
 msgid ""
@@ -385,15 +430,15 @@ msgstr ""
 #: templates/ERR_FTP_NOT_FOUND:5 templates/ERR_FTP_PUT_ERROR:5
 #: templates/ERR_FTP_UNAVAILABLE:5
 msgid "Squid sent the following FTP command:"
-msgstr ""
+msgstr "اسکویید  دستور  FTP روبرو را فرستاد:"
 
 #: templates/ERR_DNS_FAIL:6
 msgid "The DNS server returned:"
-msgstr ""
+msgstr "کارگزار DNS برگشت داده‌ : "
 
 #: templates/ERR_ESI:6
 msgid "The ESI processor returned:"
-msgstr ""
+msgstr "پردازش ESI برگشت داده:"
 
 #: templates/ERR_FTP_UNAVAILABLE:4
 msgid "The FTP server was too busy to retrieve the URL: <a href=\"%U\">%U</a>"
@@ -407,7 +452,7 @@ msgstr ""
 
 #: templates/ERR_ICAP_FAILURE:9
 msgid "The ICAP server is not reachable."
-msgstr ""
+msgstr "کارگزار ICAP قابل دسترس نیست."
 
 #: templates/ERR_FTP_NOT_FOUND:4
 msgid "The following URL could not be retrieved: <a href=\"%U\">%U</a>"
@@ -437,7 +482,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
@@ -475,14 +520,14 @@ msgstr ""
 
 #: templates/ERR_NO_RELAY:6
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 
 #: templates/ERR_TOO_BIG:8
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 
@@ -492,18 +537,18 @@ msgstr ""
 
 #: templates/ERR_FTP_DISABLED:6
 msgid "This cache does not support FTP."
-msgstr ""
+msgstr "این کارگزار Cache از قرارداد FTP پشتیبانی نمی‌کند."
 
 #: templates/ERR_SHUTTING_DOWN:5
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 
 #: templates/ERR_FORWARDING_DENIED:6
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 
@@ -532,7 +577,7 @@ msgstr ""
 #: templates/ERR_FTP_NOT_FOUND:7
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 
@@ -547,9 +592,24 @@ msgstr ""
 #: templates/ERR_CANNOT_FORWARD:6
 msgid ""
 "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."
+"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."
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
 msgstr ""
 
 #: templates/ERR_DNS_FAIL:5
@@ -562,11 +622,11 @@ msgstr ""
 
 #: templates/ERR_UNSUP_HTTPVERSION:3 templates/ERR_UNSUP_HTTPVERSION:5
 msgid "Unsupported HTTP version"
-msgstr ""
+msgstr "نسخه HTTP پشتیبانی نشده"
 
 #: templates/ERR_UNSUP_REQ:5
 msgid "Unsupported Request Method and Protocol"
-msgstr ""
+msgstr "روش پشتیبانی‌نشده درخواست و قرارداد"
 
 #: templates/ERR_ONLY_IF_CACHED_MISS:5
 msgid ""
@@ -574,13 +634,14 @@ msgid ""
 "directive was specified."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
 msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
-msgstr ""
+msgstr "خطا در نوشتن"
 
 #: templates/ERR_ONLY_IF_CACHED_MISS:6
 msgid ""
@@ -589,7 +650,13 @@ msgid ""
 "revalidation prohibited by the <q>only-if-cached</q> directive."
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -619,3 +686,9 @@ msgstr ""
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr ""
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "خطا: URN درخواست شده نمی‌توانست دریافت شود"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "عمل بارگذاری روی FTP با موفقیت همراه بود. فایل بروزرسانی شد."
diff --git a/errors/fi.po b/errors/fi.po
index 6c5285ca41..af8ac8aaf5 100644
--- a/errors/fi.po
+++ b/errors/fi.po
@@ -2,14 +2,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2009-01-19 17:55+1300\n"
 "Last-Translator: Panu H_llfors <panupa@iki.fi>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 1.2.0\n"
 
@@ -30,9 +30,10 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "Odotettaessa tietoa verkosta yhteys aikakatkaistiin. Verkko tai palvelin "
 "saattaa olla alhaalla tai ruuhkautunut. Uusi hakupyyntösi."
@@ -46,9 +47,10 @@ msgid "Access Denied."
 msgstr "Pääsy evätty."
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "Pääsynvalvonnan asetukset eväävät pyyntösi. Jos koet, että tämä on väärin, "
@@ -60,7 +62,7 @@ msgid ""
 "href=\"%U\">%U</a>"
 msgstr ""
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -73,14 +75,16 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr ""
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr "On ilmennyt virhetila luettaessa tietoa verkosta. Uusi hakupyyntösi."
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 "Kirjoitettaessa tietoa verkkoon ilmeni virhetilanne. Uusi hakupyyntösi."
@@ -126,7 +130,8 @@ msgstr ""
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -175,23 +180,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "VIRHE: Pyydettyä URL-osoitetta ei voitu hakea"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr ""
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "VIRHE: Pyydettyä URL-osoitetta ei voitu hakea"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "FTP PUT onnistui: Tiedosto luotu"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "FTP PUT onnistui: Tiedosto päivitetty"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "FTP PUT/lähetys epäonnistui"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -210,11 +214,24 @@ msgstr "Tiedosto luotu"
 msgid "File updated"
 msgstr "Tiedosto päivitetty"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Edelleenohjaus evätty."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -236,13 +253,18 @@ msgid "Generated %T by %h (%s)"
 msgstr ""
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "Hei, älä odota liikaa URN:iltä kun kyseessä on %T :-)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr ""
@@ -267,6 +289,11 @@ msgstr "Virheellinen merkki palvelinnimessä; alaviivat eivät ole sallittuja"
 msgid "Illegal double-escape in the URL-Path"
 msgstr "Kielletty kaksois-escape URL-osoitteessa"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "Virheellinen URL-osoite"
@@ -313,8 +340,8 @@ msgid ""
 "chpasswd.cgi\">change</a> your default password."
 msgstr ""
 "Jos sinulla on hankaluuksia hekilöllisyytesi todentamisessa, ota yhteyttä <a "
-"href=\"mailto:%w%W\">välityspalvelimen ylläpitoon</a> tai <a href=\"http://%"
-"h/cgi-bin/chpasswd.cgi\">vaihda</a> oletussalasanasi."
+"href=\"mailto:%w%W\">välityspalvelimen ylläpitoon</a> tai <a href=\"http://"
+"%h/cgi-bin/chpasswd.cgi\">vaihda</a> oletussalasanasi."
 
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:7
 msgid ""
@@ -341,6 +368,14 @@ msgstr "Lukemisen aikakatkaisu"
 msgid "Request is too large."
 msgstr "Hakupyyntö on liian suuri"
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Sokettivirhe"
@@ -457,7 +492,8 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_CONNECT_FAIL:7
-msgid "The remote host or network may be down.  Please try the request again."
+#, fuzzy
+msgid "The remote host or network may be down. Please try the request again."
 msgstr "Kohdepalvelin tai -verkko saattaa olla alhaalla. Uusi hakupyyntösi."
 
 #: templates/ERR_TOO_BIG:5
@@ -494,8 +530,9 @@ msgid "The system returned: <i>%E</i>"
 msgstr "Järjestelmä palautti viestin:<i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
+#, fuzzy
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 "Tälle välityspalvelimelle ei ole määritelty WAIS-linkkipalvelinta. Komenna "
@@ -504,7 +541,7 @@ msgstr ""
 #: templates/ERR_TOO_BIG:8
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 
@@ -519,13 +556,14 @@ msgstr "FTP on poistettu käytöstä."
 #: templates/ERR_SHUTTING_DOWN:5
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 
 #: templates/ERR_FORWARDING_DENIED:6
+#, fuzzy
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "Tämä välityspalvelin ei edelleenohjaa pyyntöäsi koska se yrittää vahvistaa "
@@ -559,7 +597,7 @@ msgstr ""
 #: templates/ERR_FTP_NOT_FOUND:7
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 
@@ -572,11 +610,12 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_CANNOT_FORWARD:6
+#, fuzzy
 msgid ""
 "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."
+"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."
 msgstr ""
 "Pyyntöäsi ei voitu edelleenohjata lähdepalvelimelle tai yhdellekään "
 "ylemmälle välityspalvelimelle. Todennäköisin syy tähän on, että "
@@ -584,6 +623,21 @@ msgstr ""
 "yhteyksiä lähdepalvelimiin ja kaikki käytössä olevat ylemmät "
 "välityspalvelimet ovat tavoittamattomissa."
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr "Nimelle <q>%H</q> ei voitu määrittää IP-osoitetta."
@@ -609,9 +663,10 @@ msgstr ""
 "Sopivaa dokumenttia ei löytynyt välityspalvelimesta, ja pyynnössäsi oli "
 "<q>only-if-cached</q> (vain välityspalvelimesta) -määritys. "
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr "Yritettäessä lähettää seuraavaa URL-osoitetta: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -629,7 +684,13 @@ msgstr ""
 "löytynyt välityspalvelimesta <em>tai</em> se vaati uudellenvahvistuksen, "
 "jonka <q>only-if-cached</q> (vain välityspalvelimesta) -määritys kieltää."
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -662,3 +723,10 @@ msgstr ""
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "Nollan pituinen vastaus"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTP PUT onnistui: Tiedosto päivitetty"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr ""
+#~ "Yritettäessä lähettää seuraavaa URL-osoitetta: <a href=\"%U\">%U</a>"
diff --git a/errors/fr.po b/errors/fr.po
index dea2d2660b..9ee8a36f11 100644
--- a/errors/fr.po
+++ b/errors/fr.po
@@ -2,14 +2,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
-"PO-Revision-Date: 2009-11-20 13:49+0000\n"
-"Last-Translator: Quentin THEURET <quentin.theuret@gmail.com>\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
+"PO-Revision-Date: 2010-05-04 13:49+0200\n"
+"Last-Translator:  <fli4l.charrier@free.fr>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.4.0\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.1\n"
 
 #: templates/ERR_DIR_LISTING:6
 msgid "<a href=\"../\">Parent Directory</a> (<a href=\"/\">Root Directory</a>)"
@@ -33,9 +35,10 @@ msgstr ""
 "la requête :"
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "Un délai critique s'est écoulé en attendant des données du réseau. Le réseau "
 "ou le serveur sont peut-être hors service ou défaillants. Veuillez réitérer "
@@ -50,9 +53,10 @@ msgid "Access Denied."
 msgstr "Accès interdit."
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "La configuration du contrôle d'accès interdit à votre requête d'être "
@@ -67,7 +71,7 @@ msgstr ""
 "Une erreur d'authentification sur un FTP a eu lieu en tentant de charger "
 "l'URL : <a href=\"%U\">%U</a>"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -80,16 +84,18 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr "Une réponse illégale a été reçue du serveur ICAP."
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 "Une erreur est survenue en essayant d'accéder au réseau.Veuillez réitérer "
 "votre requête."
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 "Une erreur s'est produite lors de l'accès au réseau. Veuillez réitérer votre "
@@ -136,7 +142,8 @@ msgstr "Répertoir : %U"
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr "Répertoire: <a href=\"%U\">%U</a>/"
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -185,23 +192,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "ERREUR : L'URL demandée n'a pu être chargée"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "ERREUR : L'URN demandée n'a pu être chargée"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "ERREUR : L'URL demandée n'a pu être chargée"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr "Le traitement ESI a échoué."
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "FTP PUT Réussi: Fichier Créé"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "La commande FTP PUT a réussie : Fichier envoyé"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "FTP PUT/échec de l'envoi"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -220,11 +226,24 @@ msgstr "Fichier créé"
 msgid "File updated"
 msgstr "Fichier mis à jour"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Relais interdit."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -246,13 +265,18 @@ msgid "Generated %T by %h (%s)"
 msgstr "Générée le %T par %h (%s)"
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "Hé ! N'espérez pas trop des URNs de %T :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr "Erreur de protocole ICAP."
@@ -283,6 +307,11 @@ msgstr ""
 msgid "Illegal double-escape in the URL-Path"
 msgstr "Double échappement illégal dans le chemin de l'URL"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "URL invalide"
@@ -357,6 +386,14 @@ msgstr "Délai de lecture dépassé"
 msgid "Request is too large."
 msgstr "La requête est peut-être trop volumineuse"
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Erreur de socket"
@@ -477,7 +514,8 @@ msgstr ""
 "\"%U\">%U</a>"
 
 #: templates/ERR_CONNECT_FAIL:7
-msgid "The remote host or network may be down.  Please try the request again."
+#, fuzzy
+msgid "The remote host or network may be down. Please try the request again."
 msgstr ""
 "La machine distante ou le réseau sont peut-être hors service. Veuillez "
 "réitérer votre requête."
@@ -516,17 +554,19 @@ msgid "The system returned: <i>%E</i>"
 msgstr "Le système a retourné : <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
+#, fuzzy
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 "Il n'y a pas de machine définie comme relais WAIS sur ce cache !Adressez-"
 "vous à votre administrateur."
 
 #: templates/ERR_TOO_BIG:8
+#, fuzzy
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 "Ces limites ont été établies par le Fournisseur d'Accès à Internet qui opère "
@@ -543,18 +583,20 @@ msgid "This cache does not support FTP."
 msgstr "Ce cache ne prend pas en compte le protocole FTP."
 
 #: templates/ERR_SHUTTING_DOWN:5
+#, fuzzy
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "Ce cache est en cours de mise hors-service temporaire et il lui est "
 "impossible de satisfaire votre requête actuellement. Veuillez réiterer votre "
 "requête ultérieurement."
 
 #: templates/ERR_FORWARDING_DENIED:6
+#, fuzzy
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "Ce cache ne fera pas suivre votre requête car il tente de respecter une "
@@ -591,9 +633,10 @@ msgstr ""
 "modèle ESI. Veuillez reporter cette erreur au webmaster."
 
 #: templates/ERR_FTP_NOT_FOUND:7
+#, fuzzy
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "Ceci pourrait etre causé par une URL de FTP avec un chemin absolu (ce qui "
@@ -613,11 +656,12 @@ msgstr ""
 "proxy n'est pas satisfait des droits de l'hôte."
 
 #: templates/ERR_CANNOT_FORWARD:6
+#, fuzzy
 msgid ""
 "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."
+"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."
 msgstr ""
 "Cette requête ne peut pas être transférée au serveur d'origine ou à tous les "
 "caches parent. La cause la plus fréquente pour cette erreur est que "
@@ -625,6 +669,21 @@ msgstr ""
 "connexions directe vers les serveurs d'origine, et tous les caches parents "
 "configurés sont actuellement innacessibles."
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr "Impossible d'associer une adresse IP à la machine <q>%H</q>"
@@ -649,9 +708,10 @@ msgstr ""
 "Aucun document valide n'a été trouvé dans le cache et la directive <q>only-"
 "if-cached</q> a été spécifiée."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr "En essayant d'envoyer (PUT) l'URL suivante : <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -667,7 +727,13 @@ msgstr ""
 "cached</q>. Le document n'a pas été trouvé dans le cache, <em>ou</em> il "
 "nécessite une revalidation, interdite par la directive <q>only-if-cached</q>."
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -699,3 +765,12 @@ msgstr "Votre webmaster est <a href=\"mailto:%w\">%w</a>."
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "Réponse de taille nulle"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "ERREUR : L'URN demandée n'a pu être chargée"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "La commande FTP PUT a réussie : Fichier envoyé"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr "En essayant d'envoyer (PUT) l'URL suivante : <a href=\"%U\">%U</a>"
diff --git a/errors/he.po b/errors/he.po
index eda4a0fbaf..2aaaca7ac8 100644
--- a/errors/he.po
+++ b/errors/he.po
@@ -2,14 +2,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2009-06-07 15:11+1300\n"
 "Last-Translator: yoav <yoavb@zavit.net.il>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 1.2.1\n"
 
@@ -30,9 +30,10 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "נוצר פסק-זמן בעת המתנה לקריאת מידע מהרשת. יכול להיות שהרשת או השרת למטה או "
 "עמוסים. אנא נסה שוב."
@@ -46,9 +47,10 @@ msgid "Access Denied."
 msgstr "הגישה נדחית"
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "הגדרות הגישה מונעות אישור בקשתך. במקרה ולדעתך זוהי טעות אנא צור קשר עם מנהל "
@@ -61,7 +63,7 @@ msgid ""
 msgstr ""
 "שגיאה בזיהוי משתמש FTP כאשר ניסיתי לגשת אל הכתובת: <a href=\"%U\">%U</a>"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -73,14 +75,16 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr ""
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr "ארעה שגיאת תנאי בזמן קריאת מידע מהשרת. אנא נסה שוב."
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr "ארעה שגיאת תנאי בזמן כתיבת מידע לרשת. אנא נסה שוב."
 
@@ -126,7 +130,8 @@ msgstr ""
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -175,23 +180,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "שגיאה: הכתובת המבוקשת לא נגישה"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr ""
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "שגיאה: הכתובת המבוקשת לא נגישה"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "פעולת FTP PUT עברה בהצלחה: הקובץ נוצר"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "פעולת FTP PUT עברה בהצלחה: הקובץ עודכן"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "העלאת קובץ ל-FTP נכשלה"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -210,11 +214,24 @@ msgstr "הקובץ נוצר"
 msgid "File updated"
 msgstr "הקובץ עודכן"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "העברה נדחית."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -236,13 +253,18 @@ msgid "Generated %T by %h (%s)"
 msgstr ""
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "אל תצפה יותר מדי מ-URN על %T :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr ""
@@ -272,6 +294,11 @@ msgstr "תווים לא חוקיים בשם השרת; קווים תחתונים
 msgid "Illegal double-escape in the URL-Path"
 msgstr "בריחה כפולה שגויה בנתיב"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "כתובת שגויה"
@@ -345,6 +372,14 @@ msgstr "קריאה הופסקה"
 msgid "Request is too large."
 msgstr "הבקשה ארוכה מדי"
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "שגיאת חיבור"
@@ -455,7 +490,8 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_CONNECT_FAIL:7
-msgid "The remote host or network may be down.  Please try the request again."
+#, fuzzy
+msgid "The remote host or network may be down. Please try the request again."
 msgstr "יכול להיות שהשרת המרוחק למטה. אנא נסה שוב."
 
 #: templates/ERR_TOO_BIG:5
@@ -494,7 +530,7 @@ msgstr "הודעת המערכת: <i>%E</i>"
 #: templates/ERR_NO_RELAY:6
 #, fuzzy
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr "לא הוגדר שרת WAIS!"
 
@@ -502,7 +538,7 @@ msgstr "לא הוגדר שרת WAIS!"
 #, fuzzy
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 "הגבלות אלו הוצבו ע\"י ספק האינטרנט אשר מתחזק שרת זה. אנא צור עמם רשק אם "
@@ -517,16 +553,18 @@ msgid "This cache does not support FTP."
 msgstr "שרת זה אינו תוצך ב-FTP."
 
 #: templates/ERR_SHUTTING_DOWN:5
+#, fuzzy
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "השרת נמצא במצב של כיבוי ואינו יכול להשיב לבקשתך כעת. אנא נסה שוב בקרוב."
 
 #: templates/ERR_FORWARDING_DENIED:6
+#, fuzzy
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "השרת לא יעביר את בקשתך בגלל שהיא מנסה לחייב קשרי ילדים. אולי הלקוח ב %i הוא "
@@ -555,9 +593,10 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_FTP_NOT_FOUND:7
+#, fuzzy
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "יכול להיות שהשגיאה נוצרה בגלל נתיב מוחלט (אשר לא עונה לדרישות RFC 1738). אם "
@@ -574,9 +613,24 @@ msgstr ""
 #: templates/ERR_CANNOT_FORWARD:6
 msgid ""
 "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."
+"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."
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
 msgstr ""
 
 #: templates/ERR_DNS_FAIL:5
@@ -604,9 +658,10 @@ msgstr ""
 "לא נמצא מסמך מתאים בזכרון והשרת הוגדר להראות רק דפים שבזכרון <q>only-if-"
 "cached</q>. "
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr "שגיאה כאשר ניסיתי לשלוח את: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -619,7 +674,13 @@ msgid ""
 "revalidation prohibited by the <q>only-if-cached</q> directive."
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -650,3 +711,9 @@ msgstr ""
 #, fuzzy
 msgid "Zero Sized Reply"
 msgstr "תשובה בגודל אפס"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "פעולת FTP PUT עברה בהצלחה: הקובץ עודכן"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr "שגיאה כאשר ניסיתי לשלוח את: <a href=\"%U\">%U</a>"
diff --git a/errors/hu.po b/errors/hu.po
index ffec702a10..7db0ee28a6 100644
--- a/errors/hu.po
+++ b/errors/hu.po
@@ -2,16 +2,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2009-09-30 09:51+0000\n"
 "Last-Translator: Muszela Balázs <bazsi86@gmail.com>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2009-10-04 07:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-"Language: hu\n"
 
 #: templates/ERR_DIR_LISTING:6
 msgid "<a href=\"../\">Parent Directory</a> (<a href=\"/\">Root Directory</a>)"
@@ -30,9 +30,10 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "Időtúllépés történt mialatt az adatok hálózatról való olvasására várakozott "
 "a cache. A hálózat vagy a szerver nem elérhető vagy túlterhelt állapotban "
@@ -47,9 +48,10 @@ msgid "Access Denied."
 msgstr "Hozzáférés megtagadva."
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "A hozzáférési konfigurációban beállítottak alapján kérését jelenleg nem "
@@ -61,10 +63,10 @@ msgid ""
 "An FTP authentication failure occurred while trying to retrieve the URL: <a "
 "href=\"%U\">%U</a>"
 msgstr ""
-"FTP autentikációs hiba történt az alábbi URL letöltésekor: <a href=\"%U\">%"
-"U</a>"
+"FTP autentikációs hiba történt az alábbi URL letöltésekor: <a href=\"%U\">"
+"%U</a>"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -76,15 +78,17 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr ""
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 "Hiba történt az adatok hálózatról való olvasásakor. Ismételje meg kérését!"
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr "Hiba történt az adatok hálózatra való írásakor. Ismételje meg kérését!"
 
@@ -107,7 +111,7 @@ msgstr "Kapcsolat maximális időtartama lejárt"
 
 #: templates/ERR_CONNECT_FAIL:5
 msgid "Connection to %I failed."
-msgstr ""
+msgstr "Csatlakozás a(z) %I-hez/hoz meghiúsult."
 
 #: templates/ERR_INVALID_REQ:10
 msgid "Content-Length missing for POST or PUT requests."
@@ -115,24 +119,23 @@ msgstr "Content-Length hiányzik a POST vagy PUT kérésből"
 
 #: templates/ERR_DIR_LISTING:3
 msgid "Directory Content:"
-msgstr ""
+msgstr "Könyvtár tartalom:"
 
 #: templates/ERR_DIR_LISTING:4
-#, fuzzy
 msgid "Directory Listing"
-msgstr "FTP Könyvtár Listázás"
+msgstr "Könyvtár listázás"
 
 #: templates/ERR_DIR_LISTING:1
-#, fuzzy
 msgid "Directory: %U"
-msgstr "FTP Könyvtár: %U"
+msgstr "Könyvtár: %U"
 
 #: templates/ERR_DIR_LISTING:2
 #, fuzzy
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr "FTP Könyvtár: <a href=\"/\">%U</a>/"
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -181,23 +184,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "HIBA: A kért URL nem tölthető le"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "HIBA: A kért URN nem tölthető le"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "HIBA: A kért URL nem tölthető le"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "FTP PUT sikeresen megtörtént: az állományt létrehoztuk"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "FTP PUT sikeresen megtörtént: az állományt frissítettük"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "FTP PUT/feltöltés hiba"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -216,11 +218,24 @@ msgstr "Az állományt létrehoztuk"
 msgid "File updated"
 msgstr "Az állomány frissítése megtörtént"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Kéréstovábbítás megtagadva."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -242,16 +257,21 @@ msgid "Generated %T by %h (%s)"
 msgstr ""
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "Nem érdemes túl sokat várni a %T-n lévő URN-ektől :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
-msgstr ""
+msgstr "ICAP protokoll hiba."
 
 #: templates/ERR_TOO_BIG:7
 #, fuzzy
@@ -281,6 +301,11 @@ msgstr ""
 msgid "Illegal double-escape in the URL-Path"
 msgstr "Az URL elérési út részében dupla escape szekvencia található"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "Érvénytelen URL"
@@ -356,6 +381,14 @@ msgstr "Olvasási időtúllépés"
 msgid "Request is too large."
 msgstr "A kérés vagy a válasz túl nagy méretű."
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Socket hiba"
@@ -367,9 +400,8 @@ msgstr "A megadott URL formátuma bizonyos szempontból nem megfelelő."
 
 #: templates/ERR_ICAP_FAILURE:8 templates/ERR_INVALID_REQ:5
 #: templates/ERR_INVALID_URL:7
-#, fuzzy
 msgid "Some possible problems are:"
-msgstr "Lehetséges problémák:"
+msgstr "Néhány lehetséges probléma:"
 
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:6
 msgid ""
@@ -474,7 +506,8 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_CONNECT_FAIL:7
-msgid "The remote host or network may be down.  Please try the request again."
+#, fuzzy
+msgid "The remote host or network may be down. Please try the request again."
 msgstr ""
 "A kiszolgáló szerver vagy az adott hálózat valószínűleg nem működik. Kérjük, "
 "ismételje meg kérését!"
@@ -513,16 +546,18 @@ msgid "The system returned: <i>%E</i>"
 msgstr "A rendszer válasza: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
+#, fuzzy
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 "Nincs a cache számára WAIS szerver megadva! Szóljon az adminisztrátornak."
 
 #: templates/ERR_TOO_BIG:8
+#, fuzzy
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 "A cache-t működtető Internet szolgáltató vezette be ezeket a korlátozásokat. "
@@ -538,9 +573,10 @@ msgid "This cache does not support FTP."
 msgstr "Ez a cache szerver nem szolgál ki FTP kéréseket."
 
 #: templates/ERR_SHUTTING_DOWN:5
+#, fuzzy
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "A cache leállásra készül és ezért nem tudja kiszolgálni a kérését. Kérjük, "
 "rövid idő múlva ismételje meg kérését!"
@@ -549,7 +585,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "Ez a cache szerver nem továbbítja kérését mivel szomszédsági kapcsolatot "
@@ -582,9 +618,10 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_FTP_NOT_FOUND:7
+#, fuzzy
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "A hibát lehet hogy az okozta, hogy az FTP URL abszolút elérési utat "
@@ -603,15 +640,30 @@ msgstr ""
 #, fuzzy
 msgid ""
 "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."
+"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."
 msgstr ""
 "A kérés nem továbbítható a forrás, illetve egyik szülő cache szerverhez sem. "
 "A hiba oka valószínűleg alábbiakban rejlik a cache adminisztrátor nem "
 "engedélyezi a forrás szerverekhez való közvetlen kapcsolat felépítését és "
 "egyik általunk használt szülő cache szerver sem érhető el jelenleg."
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+
 #: templates/ERR_DNS_FAIL:5
 #, fuzzy
 msgid "Unable to determine IP address from host name <q>%H</q>"
@@ -637,9 +689,10 @@ msgstr ""
 "A cache-ben érvényes dokumentum nem található és a kérésben <q>only-if-"
 "cached</q> direktíva volt beállítva."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr "Az alábbi URL-re történő PUT műveletnél: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr "Webböngésző konfiguráció"
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -656,7 +709,13 @@ msgstr ""
 "dokumentum érvényesség-ellenőrzést igényelt volna, ezt azonban az <q>only-if-"
 "cached</q> direktíva megtiltotta."
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -686,3 +745,12 @@ msgstr ""
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "Üres válasz"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "HIBA: A kért URN nem tölthető le"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTP PUT sikeresen megtörtént: az állományt frissítettük"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr "Az alábbi URL-re történő PUT műveletnél: <a href=\"%U\">%U</a>"
diff --git a/errors/hy.po b/errors/hy.po
index d7985e872d..4754ae5245 100644
--- a/errors/hy.po
+++ b/errors/hy.po
@@ -2,14 +2,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2008-12-18 01:19+1300\n"
 "Last-Translator: Arthur Tumanyan <arthurtumanyan@yahoo.com>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
+"Language: hy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hy\n"
 "X-Generator: Pootle 1.2.0\n"
 
 #: templates/ERR_DIR_LISTING:6
@@ -29,9 +29,10 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "Ցանցից տվյալների ընթերցման ընթացքում սպասման առավելագույն ժամանակը "
 "գերազանցվեց․Ցանցը կամ հանգույցը չեն աշխատում կամ գերբեռնված են։ Խնդրվում է "
@@ -46,9 +47,10 @@ msgid "Access Denied."
 msgstr "Մուտքն արգելված է."
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "Մուտքի կառավարման պարամետրերը թույլ չեն տալիս կատարել Ձեր հարցումը տվյալ "
@@ -62,28 +64,30 @@ msgstr ""
 "URL ի առաքման ժամանակ տեղի ունեցավ FTP աութենտիֆիկացիայի սխալ: <a href=\"%U"
 "\">%U</a>"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
 msgstr ""
-"URL ի առաքման ժամանակ տեղի ունեցավ FTP արձանագրության սխալ: <a href=\"%U\">%"
-"U</a>"
+"URL ի առաքման ժամանակ տեղի ունեցավ FTP արձանագրության սխալ: <a href=\"%U\">"
+"%U</a>"
 
 #: templates/ERR_ICAP_FAILURE:10
 msgid "An Illegal response was received from the ICAP server."
 msgstr ""
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 "Ցանցից տվյալների ընթերցման ժամանակ առաջացավ սխալ.Խնդրվում է կրկնել հարցումը."
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 "Տվյալները ցանց ուղարկելու ժամանակ առաջացավ սխալ․ Խնդրվում է կրկնել հարցումը․"
@@ -129,7 +133,8 @@ msgstr ""
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -178,23 +183,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "ՍԽԱԼ: Պահանջվող URN չի կարող առաքվել"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "FTP PUT Գործողությունը հաջողվեց: Ֆայլը ստեղծված է"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "FTP PUT գործողությունը հաջողվեց: Ֆայլը թարմացված "
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "FTP upload գործողությունը խափանվեց"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -213,11 +217,24 @@ msgstr "Ֆայլը ստեղծված է"
 msgid "File updated"
 msgstr "Ֆայլը թարմացված է"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Վերահասցեագրումն արգելված է."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -239,13 +256,18 @@ msgid "Generated %T by %h (%s)"
 msgstr ""
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "Չարժե շատ բան սպասել URN-ից %T -ի վրա :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr ""
@@ -270,6 +292,11 @@ msgstr "Անթույլատրելի նիշ սերվերի անվան մեջ;ըն
 msgid "Illegal double-escape in the URL-Path"
 msgstr "Անթույլատրելի կրկնակի կառավարող նիշ URL ուղղում"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr ""
@@ -342,6 +369,14 @@ msgstr "Պատասխան սպասելու առավելագույն ժամանա
 msgid "Request is too large."
 msgstr "Հարցման ծավալը շատ մեծ է"
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Socket ձախողում "
@@ -467,7 +502,8 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_CONNECT_FAIL:7
-msgid "The remote host or network may be down.  Please try the request again."
+#, fuzzy
+msgid "The remote host or network may be down. Please try the request again."
 msgstr ""
 "Հեռակա հանգույցը կամ ցանցը չեն պատասխանում. Խնդրվում է կրկնել հարցումը. "
 
@@ -505,15 +541,16 @@ msgid "The system returned: <i>%E</i>"
 msgstr "Ստացված պատասխանը: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
+#, fuzzy
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr "Այս քեշի համար WAIS Relay որոշված չէ! Հայտնեք կառավարիչին. "
 
 #: templates/ERR_TOO_BIG:8
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 
@@ -526,17 +563,19 @@ msgid "This cache does not support FTP."
 msgstr ""
 
 #: templates/ERR_SHUTTING_DOWN:5
+#, fuzzy
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "Այս քեշը տվյալ պահին գտնվում է անջատման պրոցեսում և չի կարող սպասարկել Ձեր "
 "հարցումը․Կրկնեք հարցումը որոշ ժամանակ անց․"
 
 #: templates/ERR_FORWARDING_DENIED:6
+#, fuzzy
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "Այս քեշը անկարող է վերահասցեագրել Ձեր հարցումը sibling տիպի "
@@ -569,9 +608,10 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_FTP_NOT_FOUND:7
+#, fuzzy
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "Սա կարող է լինել FTP URL -ի բացարձակ ուղղով հարցման արդյունք (ինչը չի "
@@ -590,15 +630,30 @@ msgstr ""
 #, fuzzy
 msgid ""
 "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."
+"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."
 msgstr ""
 "Այս հարցումը հնարավոր չէ վերահասցեագրել սկզբնաղբյուր սերվերին կամ ծնողական "
 "քեշերից որևէ մեկին․Սխալի ամենահավանական պատճառներն են Այս սերվերի կառավարիչը "
 "արգելել է բոլոր ուղիղ միացումները սկզբնաղբյուր սերվերների հետ Բոլոր ծնողական "
 "քեշերը տվյալ պահին անհասանելի են."
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr "Անհնար է որոշել <q>%H</q> հանգույցի IP հասցեն."
@@ -621,12 +676,10 @@ msgid ""
 "directive was specified."
 msgstr "Օբյեկտը քեշում գտնված չէ; ձևավորվեց <q>only-if-cached</q> դիրեկտիվը."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-#, fuzzy
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
 msgstr ""
-"URL-ի PUT գործողության իրականացման ժամանակ տեղի ունեցավ  սխալ: <a href=\"%U"
-"\">%U</a>"
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -639,7 +692,13 @@ msgid ""
 "revalidation prohibited by the <q>only-if-cached</q> directive."
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -673,3 +732,15 @@ msgstr ""
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "Զրոյական երկարությամբ պատասխան "
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "ՍԽԱԼ: Պահանջվող URN չի կարող առաքվել"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTP PUT գործողությունը հաջողվեց: Ֆայլը թարմացված "
+
+#, fuzzy
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr ""
+#~ "URL-ի PUT գործողության իրականացման ժամանակ տեղի ունեցավ  սխալ: <a href="
+#~ "\"%U\">%U</a>"
diff --git a/errors/id.po b/errors/id.po
index 2a84a2025b..bf13afede0 100644
--- a/errors/id.po
+++ b/errors/id.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2008-11-02 03:46+1300\n"
 "Last-Translator: Ramdhani Fathurrohman <kontak@ramdhani.net>\n"
 "Language-Team: Indonesian <id@li.org>\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,9 +39,10 @@ msgstr ""
 "permintaan:"
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "Timeout terjadi ketika menunggu untuk membaca data dari jaringan. Jaringan "
 "atau server mungkin mati atau tersumbat. Coba coba lagi permintaan anda."
@@ -54,9 +56,10 @@ msgid "Access Denied."
 msgstr "Akses Ditolak"
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "Konfigurasi kontrol akses mencegah permintaan anda dibolehkan pada waktu "
@@ -70,7 +73,7 @@ msgstr ""
 "terjadi kegagalan otentikasi FTP ketika mencoba untuk mengambil URL: <a href="
 "\"%U\">%U</a>"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -83,16 +86,18 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr "Sebuah tanggapan Illegal diterima dari ICAP server."
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 "Kondisi kesalahan terjadi sedangkan membaca data dari jaringan. Silahkan "
 "coba lagi permintaan anda."
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 "Kondisi kesalahan terjadi ketika sedang menulis kepada jaringan. Silahkan "
@@ -139,7 +144,8 @@ msgstr ""
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -188,23 +194,20 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr ""
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "URL untuk URN yang diminta tidak bisa didapatkan kembali"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
-msgstr ""
-
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+msgid "FTP PUT Successful."
 msgstr ""
 
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+msgid "FTP PUT upload failed"
 msgstr ""
 
 #: templates/ERR_FTP_DISABLED:5
@@ -223,11 +226,24 @@ msgstr ""
 msgid "File updated"
 msgstr "File sudah diperbaharui"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -249,13 +265,18 @@ msgid "Generated %T by %h (%s)"
 msgstr ""
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr ""
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr ""
@@ -280,6 +301,11 @@ msgstr ""
 msgid "Illegal double-escape in the URL-Path"
 msgstr ""
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr ""
@@ -344,6 +370,14 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr ""
@@ -447,7 +481,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
@@ -485,14 +519,14 @@ msgstr ""
 
 #: templates/ERR_NO_RELAY:6
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 
 #: templates/ERR_TOO_BIG:8
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 
@@ -507,13 +541,13 @@ msgstr ""
 #: templates/ERR_SHUTTING_DOWN:5
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 
 #: templates/ERR_FORWARDING_DENIED:6
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 
@@ -542,7 +576,7 @@ msgstr ""
 #: templates/ERR_FTP_NOT_FOUND:7
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 
@@ -557,9 +591,24 @@ msgstr ""
 #: templates/ERR_CANNOT_FORWARD:6
 msgid ""
 "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."
+"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."
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
 msgstr ""
 
 #: templates/ERR_DNS_FAIL:5
@@ -584,8 +633,9 @@ msgid ""
 "directive was specified."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
 msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
@@ -599,7 +649,13 @@ msgid ""
 "revalidation prohibited by the <q>only-if-cached</q> directive."
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
diff --git a/errors/it.po b/errors/it.po
index ee94ea82e7..3d06df8720 100644
--- a/errors/it.po
+++ b/errors/it.po
@@ -2,22 +2,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
-"PO-Revision-Date: 2009-11-02 23:27+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
+"PO-Revision-Date: 2010-05-05 13:38+0200\n"
 "Last-Translator: Francesco Chemolli <kinkie@squid-cache.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 1.2.1\n"
+"X-Generator: Pootle 2.0.1\n"
 "X-Launchpad-Export-Date: 2009-07-22 10:00+0000\n"
 
 #: templates/ERR_DIR_LISTING:6
 msgid "<a href=\"../\">Parent Directory</a> (<a href=\"/\">Root Directory</a>)"
 msgstr ""
-"<a href=\"../\">Directory superiore</a> (<a href=\"/\">Directory radice</a>)"
+"<a href=\"../\">Directory superiore</a> (<a href=\"/\">Directory principale</"
+"a>)"
 
 #: templates/ERR_INVALID_REQ:4
 msgid ""
@@ -37,12 +38,12 @@ msgstr ""
 
 #: templates/ERR_READ_TIMEOUT:7
 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."
+"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 ""
-"Si è verificato un timeout durante la ricezione dei dati dalla rete. La rete "
-"o il server potrebbero essere scollegati o in congestione. Riprovare più "
-"tardi."
+"Si è verificato un errore di time-out durante la lettura delle informazioni. "
+"La rete o il server potrebbero essere inaccessibili o sovraccarichi. "
+"Riprovare più tardi."
 
 #: templates/ERR_URN_RESOLVE:3
 msgid "A URL for the requested URN could not be retrieved"
@@ -56,12 +57,11 @@ msgstr "Accesso negato."
 #: templates/ERR_ACCESS_DENIED:6
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
-"La configurazione di controllo d'accesso non consente di soddisfare la "
-"richiesta. Si prega di contattare il fornitore del servizio nel caso questo "
-"comportamento sia scorretto."
+"La richiesta non è permessa dalle impostazioni di sicurezza. Se ritieni sia "
+"un errore, contatta il fornitore del servizio."
 
 #: templates/ERR_FTP_FORBIDDEN:4
 msgid ""
@@ -71,7 +71,7 @@ msgstr ""
 "Le credenziali fornite per l'accesso al server FTP relativo alla URL <a href="
 "\"%U\">%U</a> sono invalide."
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -85,19 +85,19 @@ msgstr "Il server ICAP ha dato una risposta non valida (illegal response)."
 
 #: templates/ERR_READ_ERROR:7
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
-"Si è verificato un errore nella ricezione dei dati dalla rete. Si prega di "
-"ritentare la richiesta."
+"Si è verificato un errore durante la lettura delle informazioni dalla rete. "
+"Riprova più tardi."
 
 #: templates/ERR_WRITE_ERROR:7
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
-"Si è verificato un errore durante la ricezione dei dati dalla rete. Si prega "
-"di ritentare la richiesta."
+"Si è verificato un errore durante la scrittura di informazioni sulla rete. "
+"Riprova più tardi."
 
 #: templates/ERR_CACHE_ACCESS_DENIED:3 templates/ERR_CACHE_ACCESS_DENIED:5
 msgid "Cache Access Denied."
@@ -114,7 +114,7 @@ msgstr "Impossibile risolvere la URN."
 
 #: templates/ERR_LIFETIME_EXP:5
 msgid "Connection Lifetime Expired"
-msgstr "Il timeout di mantenimento della connessione è scaduto."
+msgstr "Il tempo di mantenimento di connessioni inattive è scaduto."
 
 #: templates/ERR_CONNECT_FAIL:5
 msgid "Connection to %I failed."
@@ -122,7 +122,7 @@ msgstr "La connessione a %I non è riuscita."
 
 #: templates/ERR_INVALID_REQ:10
 msgid "Content-Length missing for POST or PUT requests."
-msgstr "Una richiesta di tipo POST o PUT non contiene il campo Content-Length."
+msgstr "La richiesta di tipo POST o PUT non contiene il campo Content-Length."
 
 #: templates/ERR_DIR_LISTING:3
 msgid "Directory Content:"
@@ -140,7 +140,8 @@ msgstr "Directory: %U"
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr "Directory: <a href=\"%U\">%U</a>/"
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -165,11 +166,11 @@ msgstr "ERRORE: accesso alla cache negato."
 
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:1
 msgid "ERROR: Cache Manager Access Denied"
-msgstr "ERRORE: l'accesso al Cache Manager è negato."
+msgstr "ERRORE: accesso al Cache Manager negato."
 
 #: templates/ERR_FTP_PUT_ERROR:1
 msgid "ERROR: FTP upload failed"
-msgstr "ERRORE: l'invio del file via FTP non ha avuto successo."
+msgstr "ERRORE: l'invio del file via FTP non è riuscito."
 
 #: templates/ERR_ACCESS_DENIED:1 templates/ERR_CANNOT_FORWARD:1
 #: templates/ERR_CONNECT_FAIL:1 templates/ERR_DNS_FAIL:1 templates/ERR_ESI:1
@@ -189,23 +190,21 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "ERRORE: non è possibile accedere alla URL richiesta"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
+msgid "ERROR: The requested URN could not be retrieved"
 msgstr "ERRORE: non è possibile accedere alla URN richiesta"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr "L'elaborazione ESI è fallita."
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "Comando FTP PUT eseguito correttamente: il file è stato creato."
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "Comando FTP PUT eseguito correttamente: il file è stato aggiornato."
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "Comando FTP PUT non riuscito."
 
 #: templates/ERR_FTP_DISABLED:5
@@ -224,11 +223,24 @@ msgstr "Il file è stato creato."
 msgid "File updated"
 msgstr "Il file è stato aggiornato."
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr "Per configurare Mozilla Firefox accedere a: <ul>"
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr "Per configurare Microsoft Internet Explorer: <ul>"
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr "Per configurare i browser Opera: <ul>"
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Inoltro negato."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -250,12 +262,19 @@ msgid "Generated %T by %h (%s)"
 msgstr "Generato da %h (%s) il %T."
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
+"Un software HTTP/1.0 sta cercando di utilizzare le funzionalità <q>Expect</"
+"q> di HTTP/1.1."
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
-msgstr "Hey, non ci si deve aspettare granchè dalle URN su %T :)"
+msgstr "Ehi, non ci si deve aspettare granché dalle URN su %T :)"
+
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr "Indicazioni su come configurare il tuo browser sono disponibili a:"
 
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
@@ -280,13 +299,18 @@ msgstr ""
 #: templates/ERR_INVALID_REQ:11 templates/ERR_INVALID_URL:11
 msgid "Illegal character in hostname; underscores are not allowed."
 msgstr ""
-"C'è un carattere irregolare nel nome host: gli underscore \"_\" non sono "
-"consentiti."
+"Nome host non valido: i caratteri underscore (\"_\") non sono consentiti."
 
 #: templates/ERR_INVALID_URL:10
 msgid "Illegal double-escape in the URL-Path"
 msgstr "Doppia codifica (\"double-escape\") non valida nella path della URL."
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+"Nel box \"Proxy HTTP\" inserisci l'indirizzo del proxy (%h) e la porta 3128."
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "URL non valida"
@@ -362,13 +386,21 @@ msgstr "Timeout nella lettura"
 msgid "Request is too large."
 msgstr "La richiesta è di dimensioni troppo grandi."
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr "Seleziona \"Rileva automaticamente impostazioni\""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr "Seleziona \"Usa script di configurazione automatica\""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "L'operazione di rete (socket) è fallita."
 
 #: templates/ERR_INVALID_URL:6
 msgid "Some aspect of the requested URL is incorrect."
-msgstr "Qualche aspetto della URL richiesta è scorretto"
+msgstr "Qualcosa nella URL richiesta non è corretto."
 
 #: templates/ERR_ICAP_FAILURE:8 templates/ERR_INVALID_REQ:5
 #: templates/ERR_INVALID_URL:7
@@ -390,7 +422,7 @@ msgstr "Per richiedere %U da questa cache è necessario prima identificarsi."
 
 #: templates/ERR_ZERO_SIZE_OBJECT:6
 msgid "Squid did not receive any data for this request."
-msgstr "Squid non ha ricevuto risposta a questa richiesta."
+msgstr "Squid non ha ricevuto dati per questa richiesta."
 
 #: templates/ERR_UNSUP_REQ:6
 msgid ""
@@ -405,16 +437,16 @@ msgid ""
 "Squid has terminated the request because it has exceeded the maximum "
 "connection lifetime."
 msgstr ""
-"La richiesta è stata interrotta perchè è stato superato il limite di durata "
-"massimo della connessione."
+"La richiesta è stata interrotta perché è stato superato il limite di durata "
+"massima della connessione."
 
 #: templates/ERR_SOCKET_FAILURE:7
 msgid ""
 "Squid is unable to create a TCP socket, presumably due to excessive load. "
 "Please retry your request."
 msgstr ""
-"Squid non è in grado di aprire un socket TCP, probabilmente a causa del "
-"sovraccarico. Si prega di ritentare la richiesta."
+"Squid non è in grado di aprire un socket TCP, probabilmente per un "
+"sovraccarico. Riprovare più tardi."
 
 #: templates/ERR_FTP_FAILURE:5 templates/ERR_FTP_FORBIDDEN:5
 #: templates/ERR_FTP_NOT_FOUND:5 templates/ERR_FTP_PUT_ERROR:5
@@ -481,10 +513,10 @@ msgstr ""
 "il seguente errore:"
 
 #: 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 ""
-"Il server remoto o un tratto di rete necessario a raggiungerlo potrebbero "
-"essere guasti. Si prega di ritentare la richiesta tra qualche minuto."
+"Il server remoto e` irraggiungibile, forse per un guasto di rete. Riprova "
+"tra qualche minuto."
 
 #: templates/ERR_TOO_BIG:5
 msgid "The request or reply is too large."
@@ -521,20 +553,20 @@ msgstr "Il sistema ha risposto: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
-"Non è stato configurato alcun server di relay per il protocollo WAIS su "
-"questa Cache! Prenditela con l'amministratore."
+"Non è stato definito nessun host per il relay del servizio WAIS! Prenditela "
+"con l'amministratore."
 
 #: templates/ERR_TOO_BIG:8
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
-"Questi limiti sono stati imposti dal provider che gestisce questo Proxy. Se "
-"ritenete che questo sia scorretto si prega di contattarlo."
+"Questi limiti sono stati stabiliti dall'ISP che gestisce questo proxy. Se "
+"ritieni sia un errore, contatta il fornitore del servizio."
 
 #: templates/ERR_UNSUP_HTTPVERSION:6
 msgid "This Squid does not accept the HTTP version you are attempting to use."
@@ -549,20 +581,20 @@ msgstr "Questo proxy non supporta il protocollo FTP."
 #: templates/ERR_SHUTTING_DOWN:5
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
-"Questo Proxy non è in grado di soddisfare la richiesta perchè è in fase di "
-"spegnimento. si prega di riprovare tra qualche minuto."
+"Non è possibile eseguire la richiesta perché è in corso lo spegnimento del "
+"proxy. Riprova tra poco."
 
 #: templates/ERR_FORWARDING_DENIED:6
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
-"Il proxy non inoltrerà questa richiesta, perchè tenta di stabilire una "
-"relazione di parentela. Probabilmente il client all'indirizzo %i è una cache "
-"configurata in modo sbagliato."
+"Questo proxy non inoltrerà questa richiesta perché tenta di forzare una "
+"relazione di parentela. Forse il client all'indirizzo %i è un proxy "
+"configurato in modo errato."
 
 #: templates/ERR_ICAP_FAILURE:7
 msgid "This means that some aspect of the ICAP communication failed."
@@ -599,12 +631,12 @@ msgstr ""
 #: templates/ERR_FTP_NOT_FOUND:7
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
-"Questo potrebbe essere causato da una URL FTP con un percorso completo, "
-"comportamento questo non conforme allo standard imposto dalla RFC 1738. Se "
-"questo è il caso, il file è disponibile alla URL <a href=\"%B\">%B</a>."
+"Questo potrebbe essere causato da una URL FTP contenente percorsi assoluti "
+"(il che non è compatibile con la RFC 1738). Se è questa la causa, il file "
+"può essere disponibile all'indirizzo <a href=\"%B\">%B</a>."
 
 #: templates/ERR_SECURE_CONNECT_FAIL:7
 msgid ""
@@ -613,23 +645,41 @@ msgid ""
 "host does not support secure connections, or the proxy is not satisfied with "
 "the host security credentials."
 msgstr ""
-"Questo Proxy e il server remoto non sono riusciti a negoziare una "
-"connessione cifrata con caratteristiche mutuamente accettabili. È possibile "
-"che il server non supporti le connessioni cifrate, o che il proxy non sia "
-"soddisfatto dalle credenziali di sicurezza proposte dal server."
+"Questo proxy e l'host remoto non sono riusciti a negoziare una connessione "
+"sicura. Probabilmente il server remoto non supporta connessioni sicure, o il "
+"proxy non è soddisfatto delle credenziali di sicurezza proposte dall'host."
 
 #: templates/ERR_CANNOT_FORWARD:6
 msgid ""
 "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."
+"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."
+msgstr ""
+"La richiesta non può essere inoltrata al server di origine dei dati né ad "
+"alcun proxy di livello superiore. La causa più probabile è che "
+"l'amministratore del proxy abbia bloccato le connessioni dirette al server "
+"originario, e che tutti i proxy di livello superiore siano inaccessibili."
+
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
 msgstr ""
-"Non è stato possibile inoltrare la richiesta al server di origine nè ad "
-"alcun proxy di tipo <em>parent</em> noto. La causa più probabile è che "
-"questo proxy sia configurato per non contattare mai direttamente il server "
-"di origine, e che tutti i proxy <em>parent</em> non siano disponibili in "
-"questo momento."
+"Strumenti -&gt; Opzioni Internet -&gt; Connessioni -&gt; Impostazioni LAN -"
+"&gt;Proxy"
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+"Strumenti -&gt; Opzioni -&gt; Avanzate -&gt; Rete -&gt; Impostazioni di "
+"connessione"
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+"Strumenti -&gt; Preferenze -&gt; Avanzate -&gt; Rete -&gt; Server proxy"
 
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
@@ -654,14 +704,13 @@ msgid ""
 "Valid document was not found in the cache and <q>only-if-cached</q> "
 "directive was specified."
 msgstr ""
-"Non è stato possibile reperire un documento aggiornato nella cache e la "
+"Non è stato possibile reperire un documento valido nella cache, e la "
 "richiesta contiene la direttiva <q>only-if-cached</q>."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr ""
-"Mentre si cercava di effettuare un'operazione di FTP PUT verso la URL <a "
-"href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr "Configurazione del browser"
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -678,7 +727,15 @@ msgstr ""
 "<em>oppure</em> richiedeva una operazione di verifica, non consentita dalla "
 "direttiva."
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+"La configurazione del tuo browser dev'essere modificata prima di poter "
+"utilizzare questa rete."
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -709,4 +766,15 @@ msgstr "Il webmaster è <a href=\"mailto:%w\">%w</a>."
 
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
-msgstr "Risposta di dimensione nulla."
+msgstr "Risposta di dimensione nulla"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "ERRORE: non è possibile accedere alla URN richiesta"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "Comando FTP PUT eseguito correttamente: il file è stato aggiornato."
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr ""
+#~ "Mentre si cercava di effettuare un'operazione di FTP PUT verso la URL <a "
+#~ "href=\"%U\">%U</a>"
diff --git a/errors/ja.po b/errors/ja.po
index ceb15decd9..44387e38b0 100644
--- a/errors/ja.po
+++ b/errors/ja.po
@@ -2,14 +2,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2009-01-30 20:02+1300\n"
 "Last-Translator: Takahiro Kambe <taca@back-street.net>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 1.2.0\n"
 
@@ -35,9 +35,10 @@ msgstr ""
 "生しました:"
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "ネットワークからデータを読もうと待っている間にタイムアウトが発生しました。"
 "ネットワークもしくはサーバが稼働していないか、あるいは混雑しています。再度リ"
@@ -52,9 +53,10 @@ msgid "Access Denied."
 msgstr "アクセスを拒否されました。"
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "設定されているアクセス制御の設定のため、今回はあなたからのリクエストは受けつ"
@@ -69,7 +71,7 @@ msgstr ""
 "FTP認証の失敗が、以下のURLから情報を得ようとしている間に発生しました: <a "
 "href=\"%U\">%U</a>"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -82,16 +84,18 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr "ICAPサーバから不正な応答がありました。"
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 "ネットワークからデータを受信している間にエラーが発生しました。再度、リクエス"
 "トしてください。"
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 "ネットワークにデータを送信している間にエラーが発生しました。再度リクエストし"
@@ -140,7 +144,8 @@ msgstr "ディレクトリ: %U"
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr "ディレクトリ: <a href=\"/\">%U</a>/"
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -189,24 +194,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "エラー: 要求されたURLからデータを取り出せませんでした。"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "エラー: 要求されたURNからデータを取り出せませんでした。"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "エラー: 要求されたURLからデータを取り出せませんでした。"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr "ESIの処理に失敗しました。"
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
-msgstr "FTPのPUTに成功: ファイルを作成しました。"
-
-#: templates/ERR_FTP_PUT_MODIFIED:1
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
 #, fuzzy
-msgid "FTP PUT Successful: File Updated"
-msgstr "FTPのPUTに成功: ファイルを更新しました。"
+msgid "FTP PUT Successful."
+msgstr "FTPのPUTに成功: ファイルを作成しました。"
 
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "ファイルのPUTやアップロードに失敗"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -225,11 +228,24 @@ msgstr "ファイルを作成しました。"
 msgid "File updated"
 msgstr "ファイルを更新しました。"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "転送は拒否されました。"
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -251,13 +267,18 @@ msgid "Generated %T by %h (%s)"
 msgstr "%Tに%h (%s)が生成しました。"
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "やあ、%Tの時点でURNには多くを期待しないでください。:)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr "ICAPのプロトコル・エラーです。"
@@ -284,6 +305,11 @@ msgstr "ホスト名に不正な文字が使われています: アンダース
 msgid "Illegal double-escape in the URL-Path"
 msgstr "不正な二重のエスケープがURLパスにあります。"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "不正なURL"
@@ -356,6 +382,14 @@ msgstr "読み込みタイムアウト"
 msgid "Request is too large."
 msgstr "リクエストが長すぎます。"
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "ソケット作成に失敗"
@@ -469,7 +503,8 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_CONNECT_FAIL:7
-msgid "The remote host or network may be down.  Please try the request again."
+#, fuzzy
+msgid "The remote host or network may be down. Please try the request again."
 msgstr ""
 "接続先のホストもしくはネットワークが稼働していません．しばらく待ってからもう"
 "一度試して下さい．"
@@ -508,8 +543,9 @@ msgid "The system returned: <i>%E</i>"
 msgstr "システムが以下のエラーを返しました: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
+#, fuzzy
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr "WAIS リレー用ホストが定義されていません! 管理者に連絡してください．"
 
@@ -517,7 +553,7 @@ msgstr "WAIS リレー用ホストが定義されていません! 管理者に
 #, fuzzy
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 "これらの制限は、このキャッシュの運用者によって課されています。これがエラーだ"
@@ -532,17 +568,19 @@ msgid "This cache does not support FTP."
 msgstr "キャッシュは FTP をサポートしていません．"
 
 #: templates/ERR_SHUTTING_DOWN:5
+#, fuzzy
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "このキャッシュは稼働停止の処理に入っていて、現在あなたのリクエストへのサービ"
 "スを提供できません。後で再度リクエストしてください．"
 
 #: templates/ERR_FORWARDING_DENIED:6
+#, fuzzy
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "キャッシュ間における関係を強制的に兄弟関係となるようにしているため，キャッ"
@@ -576,9 +614,10 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_FTP_NOT_FOUND:7
+#, fuzzy
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "これは(RFC 1738に従っていない)絶対パスを含んだFTPのURLによる可能性がありま"
@@ -597,15 +636,30 @@ msgstr ""
 #, fuzzy
 msgid ""
 "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."
+"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."
 msgstr ""
 "あなたのリクエストは，元のサーバもしくは他の親キャッシュサーバへ転送できませ"
 "ん．これは次の理由により発生したと考えられますキャッシュ管理者が元のサーバに"
 "直接接続しないように設定した． 設定されている全ての親キャッシュサーバへ現在到"
 "達できない．"
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr "以下のホスト名の IP address を調べられません．<q>%H</q>"
@@ -630,9 +684,10 @@ msgstr ""
 "<q>only-if-cached</q> の指定がありましたが，その文書がキャッシュに存在してい"
 "ません．"
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr "以下の URL を PUT しようとした際に: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -649,7 +704,13 @@ msgstr ""
 "(<q>only-if-cached</q> によって禁止されている)この文書が更新されているかどう"
 "かの再確認が必要です．"
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -679,3 +740,13 @@ msgstr ""
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "サイズがゼロの応答"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "エラー: 要求されたURNからデータを取り出せませんでした。"
+
+#, fuzzy
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTPのPUTに成功: ファイルを更新しました。"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr "以下の URL を PUT しようとした際に: <a href=\"%U\">%U</a>"
diff --git a/errors/ko.po b/errors/ko.po
index c4c007f077..efaff312e6 100644
--- a/errors/ko.po
+++ b/errors/ko.po
@@ -2,14 +2,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2009-06-05 17:23+1300\n"
 "Last-Translator: Jaeyeon Jung <jjung@cosmos.kaist.ac.kr>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 1.2.1\n"
 
@@ -30,9 +30,10 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "데이터를 네트웍을 통해 읽어오려고 기다리던 중 시간이 경과하였습니다. 네트웍"
 "이 혼잡상태에 있거나 서버가 서비스 불능 상태일 수 있습니다. 다시 요청하십시"
@@ -47,9 +48,10 @@ msgid "Access Denied."
 msgstr "서버 이용 요구가 거절되었습니다."
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "이 서버를 이용하기 위해서는 이용 허가가 필요합니다. 관리자에게 문의 하십시오."
@@ -61,7 +63,7 @@ msgid ""
 msgstr ""
 "다음 URL을 처리 하던 중 FTP 인증 문제가 발생했습니다: <a href=\"%U\">%U</a>"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -74,15 +76,17 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr ""
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 "데이터를 네트웍을 통해 읽어오는 동안 에러가 발생했습니다. 다시 요청하십시오."
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 "네트웍을 통해서 데이터를 쓰던 중 에러가 발생했습니다. 다시 시도해 주십시오."
@@ -128,7 +132,8 @@ msgstr ""
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -179,23 +184,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "에러: 요청된 URL을 가져올 수 없습니다"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr ""
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "에러: 요청된 URL을 가져올 수 없습니다"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "FTP PUT 수행 완료: 파일이 생성되었습니다"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "FTP PUT 수행 완료: 파일이 변경되었습니다"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "FTP PUT/upload 실패"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -214,11 +218,24 @@ msgstr "파일이 생성되었습니다"
 msgid "File updated"
 msgstr "파일이 변경되었습니다"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "포워딩 불가"
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -240,13 +257,18 @@ msgid "Generated %T by %h (%s)"
 msgstr ""
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "%T의 URN에 대해 너무 많은 것을 기대하지 마세요. :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr ""
@@ -271,6 +293,11 @@ msgstr "호스트네임에 잘못 된 문자가 있다; 밑줄은 허용되지 
 msgid "Illegal double-escape in the URL-Path"
 msgstr "URL-Path에 double-escape이 있다."
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "잘못된 URL"
@@ -345,6 +372,14 @@ msgstr "읽기 시간 초과"
 msgid "Request is too large."
 msgstr "Request가 너무 크다."
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "소켓 생성 실패"
@@ -460,7 +495,8 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_CONNECT_FAIL:7
-msgid "The remote host or network may be down.  Please try the request again."
+#, fuzzy
+msgid "The remote host or network may be down. Please try the request again."
 msgstr "상대 호스트나 네트웍이 동작하지 않습니다. 다시 시도하십시오."
 
 #: templates/ERR_TOO_BIG:5
@@ -497,8 +533,9 @@ msgid "The system returned: <i>%E</i>"
 msgstr "시스템은 아래와 같은 메시지를 보내왔습니다: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
+#, fuzzy
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 "이 캐쉬는 WAIS Relay 호스트가 지정되어 있지 않습니다. 관리자 에게 요청하십시"
@@ -507,7 +544,7 @@ msgstr ""
 #: templates/ERR_TOO_BIG:8
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 
@@ -520,21 +557,23 @@ msgid "This cache does not support FTP."
 msgstr "FTP 서비스가 불가능 합니다."
 
 #: templates/ERR_SHUTTING_DOWN:5
+#, fuzzy
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "이 캐쉬는 서비스를 마치려고 하기 때문에 현재는 요청된 서비스를 수행할 수 없습"
 "니다. 조금 후 다시 시도해 주십시오."
 
 #: templates/ERR_FORWARDING_DENIED:6
+#, fuzzy
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
-"이 캐쉬는 sibling 관계로 설정되어 있기 때문에 이 요청을 처리할 수 없습니다. %"
-"i 의 client가 잘못 설정된 캐쉬일 수 있습니다."
+"이 캐쉬는 sibling 관계로 설정되어 있기 때문에 이 요청을 처리할 수 없습니다. "
+"%i 의 client가 잘못 설정된 캐쉬일 수 있습니다."
 
 #: templates/ERR_ICAP_FAILURE:7
 msgid "This means that some aspect of the ICAP communication failed."
@@ -562,9 +601,10 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_FTP_NOT_FOUND:7
+#, fuzzy
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "FTP URL을 절대 경로로 지정하였을 때 (RFC 1738에 어긋납니다) 이러한 문제가 발"
@@ -583,14 +623,29 @@ msgstr ""
 #, fuzzy
 msgid ""
 "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."
+"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."
 msgstr ""
 "이 요청을 origin server나 다른 parent cache로 진행 시킬 수 없습니다. 다음과 "
 "같은 원인이 있을 수 있습니다. 이 캐쉬는 origin server로 직접 연결이 불가능 하"
 "도록 캐쉬 관리자에 의해 설정되었다. 모든 parent cache로의 접속이 불가능 하다."
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr "<q>%H</q> 에 대해서 IP 주소를 찾을 수 없습니다."
@@ -613,9 +668,10 @@ msgid ""
 "directive was specified."
 msgstr "캐쉬에 유효한 문서가 없고 <q>only-if-cached</q> 가 지정되었습니다."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr "다음 URL을 전송하던 중: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -631,7 +687,13 @@ msgstr ""
 "<q>only-if-cached</q>가 지정되어 문서가 요청되었습니다. 요청된 문서가 캐쉬에 "
 "없거나, <em>혹은</em> 재확인을 해야 합니다."
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -661,3 +723,9 @@ msgstr ""
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "크기가 0인 응답이 돌아왔습니다."
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTP PUT 수행 완료: 파일이 변경되었습니다"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr "다음 URL을 전송하던 중: <a href=\"%U\">%U</a>"
diff --git a/errors/lt.po b/errors/lt.po
index e74ad720af..52b1f1afb6 100644
--- a/errors/lt.po
+++ b/errors/lt.po
@@ -2,16 +2,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2009-06-07 19:27+1300\n"
 "Last-Translator: DVM <dvm382@takas.lt>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: lt\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
-"100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 1.2.1\n"
 
 #: templates/ERR_DIR_LISTING:6
@@ -31,9 +31,10 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "Klaida įvyko laukiant duomenų atsiuntimo iš tinklo. Tinklas arba serveris "
 "gali būti atjungtas arba perkrautas. Prašome pakartoti užklausą."
@@ -48,9 +49,10 @@ msgid "Access Denied."
 msgstr "Priėjimas draudžiamas."
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "Priėjimo kontrolės konfigūracija šiuo metu neleidžia atsiųsti jūsų nurodyto "
@@ -64,7 +66,7 @@ msgid ""
 msgstr ""
 "Nepavyko FTP prisistatymas bandant atsiųsti puslapį: <a href=\"%U\">%U</a>"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -76,15 +78,17 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr ""
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 "Įvyko klaida skaitant duomenis tinkle. Prašome pakartoti savo užklausą."
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr "Įvyko klaida bandant rašyti tinkle. Prašome pakartoti savo užklausą."
 
@@ -129,7 +133,8 @@ msgstr ""
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -178,23 +183,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "KLAIDA: Nurodytas URN negali būti atsiųstas"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "FTP PUT operacija buvo sėkminga: Failas sukurtas"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "FTP PUT operacija sėkminga: Failas atnaujintas"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "FTP PUT/uploadas nepavyko"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -213,11 +217,24 @@ msgstr "Failas sukurtas"
 msgid "File updated"
 msgstr "Failas atnaujintas"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Pervedimo komanda neleistina."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -239,13 +256,18 @@ msgid "Generated %T by %h (%s)"
 msgstr ""
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "Mielieji, siūlau daug nesitikėti iš URNų %T :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr ""
@@ -277,6 +299,11 @@ msgstr ""
 msgid "Illegal double-escape in the URL-Path"
 msgstr "Neleistinas double-escape kodas adrese"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "Klaidingas adresas"
@@ -350,6 +377,14 @@ msgstr "Leistino skaitymo laiko pabaiga"
 msgid "Request is too large."
 msgstr "Užklausa per didelė"
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Socket klaida"
@@ -472,7 +507,8 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_CONNECT_FAIL:7
-msgid "The remote host or network may be down.  Please try the request again."
+#, fuzzy
+msgid "The remote host or network may be down. Please try the request again."
 msgstr ""
 "Nurodytas serveris arba tinklas yra atjungtas. Pabandykite vykdyti užklausą "
 "vėliau."
@@ -511,17 +547,19 @@ msgid "The system returned: <i>%E</i>"
 msgstr "Sistema atsakė: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
+#, fuzzy
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 "WAIS Relay serveris yra nenurodytas Å¡iame proxy serveryje! Å auk ant (tik ne "
 "į) admino."
 
 #: templates/ERR_TOO_BIG:8
+#, fuzzy
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 "Šie apribojimai yra uždėti jūsų Interneto tiekėjo. Prašome kreiptis į savo "
@@ -536,17 +574,19 @@ msgid "This cache does not support FTP."
 msgstr "Å is proxy serveris nepalaiko FTP."
 
 #: templates/ERR_SHUTTING_DOWN:5
+#, fuzzy
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "Šiuo metu kešas yra išjungiamas ir negali jūsų aptarnauti. Prašome pakartoti "
 "užklausą vėliau."
 
 #: templates/ERR_FORWARDING_DENIED:6
+#, fuzzy
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "Šis kešas negali perkelti jūsų užklausos, kadangi ji bando sukurti sibling "
@@ -578,14 +618,15 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_FTP_NOT_FOUND:7
+#, fuzzy
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "Tai gali būti sąlygota FTP adreso su pilnu keliu (kuris neatitinka RFC 1738 "
-"standarto). Jei taip atsitiko, tada duomenys gali būti rasti <a href=\"%B\">%"
-"B</a> adresu."
+"standarto). Jei taip atsitiko, tada duomenys gali būti rasti <a href=\"%B\">"
+"%B</a> adresu."
 
 #: templates/ERR_SECURE_CONNECT_FAIL:7
 msgid ""
@@ -599,15 +640,30 @@ msgstr ""
 #, fuzzy
 msgid ""
 "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."
+"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."
 msgstr ""
 "Užklausa negali būti persiųsta į pagrindinį serverį arba kurį nors pagalbinį "
 "proxy serverį. Pagrindinės tokios klaidos priežastys yra šios Proxy "
 "administratorius neleidžia serveriui kurti tiesioginių susijungimų su "
 "serveriais, ir Visi pagalbiniai proxy serveriai Å¡iuo metu yra nepasiekiami."
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr "Neįmanoma nustatyti <q>%H</q> serverio IP adreso"
@@ -632,10 +688,10 @@ msgstr ""
 "Tinkamas dokumentas nerastas proxy serveryje ir <q>only-if-cached</q> "
 "komanda buvo nurodyta."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-#, fuzzy
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr "Bandydamas pakrauti dokumentą: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -651,7 +707,13 @@ msgstr ""
 "Dokumentas nerastas serveryje, <em>arba</em> jis pareikalavopatvirtinimo "
 "uždrausto <q>only-if-cached</q> komandos."
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -683,3 +745,13 @@ msgstr ""
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "Atsakymas nulinis"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "KLAIDA: Nurodytas URN negali būti atsiųstas"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTP PUT operacija sėkminga: Failas atnaujintas"
+
+#, fuzzy
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr "Bandydamas pakrauti dokumentą: <a href=\"%U\">%U</a>"
diff --git a/errors/lv.po b/errors/lv.po
index 19e597598d..c5e2d97fd1 100644
--- a/errors/lv.po
+++ b/errors/lv.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2009-10-28 12:47+0000\n"
 "Last-Translator: Mārtiņš Bruņenieks <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -37,9 +38,10 @@ msgstr ""
 "<b>Nekorekta atbilde</b> notikusi kļūda mēģinot apstrādāt pieprasījumu:"
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "Iestājusies noildze, gaidot datus no tīkla. Tīkls vai serveris nestrādā vai "
 "ir pārslogots."
@@ -53,9 +55,10 @@ msgid "Access Denied."
 msgstr "Pieeja liegta"
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "Šobrīd pēc pieejas kontroles uzstādījumiem jūsu pieprasījums nav atļauts. Ja "
@@ -69,7 +72,7 @@ msgstr ""
 "Mēģinot atvērt vietrādi URL: <a href=\"%U\">%U</a> notikusi FTP "
 "autentifikācijas kļūda"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -82,16 +85,18 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr "Saņemta nekorekta atbilde no ICAP servera"
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 "Iestājusies kļūdas situācija saņemot datus no tīkla. Lūdzu atkārtojiet savu "
 "pieprasījumu."
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 "Iestājusies kļūdas situācijanosūtot datus pa tīklu. Lūdzu atkārtojiet savu "
@@ -139,7 +144,8 @@ msgstr "Directorijs: %U"
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr "Direktorijs: <a href=\"/\">%U</a>/"
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -188,23 +194,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "KĻŪDA: Pieprasītā adrese nav atrodama"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
 msgstr "KĻŪDA: Pieprasītā adrese nav atrodama"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr "Neveiksmīga ESI apstrāde."
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "FTP PUT komanda izpildīta: Datne izveidota"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "FTP PUT komanda izpildīta: Datne atjaunināta"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "FTP PUT/augšupielāde neveiksmīga"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -223,11 +228,24 @@ msgstr "Datne izveidota"
 msgid "File updated"
 msgstr "Datne augšupielādēta"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Pārsūtīšana aizliegta."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -249,13 +267,18 @@ msgid "Generated %T by %h (%s)"
 msgstr "Ģenerēts %T by %h (%s)"
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "Hi, neiaizraujies par daudz ar %T :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr "ICAP protokola kļūda."
@@ -284,6 +307,11 @@ msgstr "Neatļauts simbols adresē. Pasvītrojuma rakstzīme nav atļauta."
 msgid "Illegal double-escape in the URL-Path"
 msgstr "Adresē ir divas atsoļa rakstzīmes, kas ir aizliegtas"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "Nepareizs URL"
@@ -357,6 +385,14 @@ msgstr "Lasīšanas noildze"
 msgid "Request is too large."
 msgstr "Pieprasījums ir par lielu."
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Savienojuma kļūda"
@@ -470,7 +506,8 @@ msgstr ""
 "Iestājusies sekojoša kļūda mēģinot atvērt adresi: <a href=\"%U\">%U</a>"
 
 #: templates/ERR_CONNECT_FAIL:7
-msgid "The remote host or network may be down.  Please try the request again."
+#, fuzzy
+msgid "The remote host or network may be down. Please try the request again."
 msgstr "Serveris vai tīkls nestrādā. Lūdzu atkārtojiet pieprasījumu."
 
 #: templates/ERR_TOO_BIG:5
@@ -507,17 +544,19 @@ msgid "The system returned: <i>%E</i>"
 msgstr "Sistēma atbildēja: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
+#, fuzzy
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 "Šai kešatmiņai nav definēta WAIS retranslācija. Griezieties pie "
 "administratora."
 
 #: templates/ERR_TOO_BIG:8
+#, fuzzy
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 "Šos limitus ir uzstādījis pakalpojuma sniedzējs, kurš uztur šo kešatmiņu. "
@@ -532,9 +571,10 @@ msgid "This cache does not support FTP."
 msgstr "Šī kešatmiņa neatbalsta FTP."
 
 #: templates/ERR_SHUTTING_DOWN:5
+#, fuzzy
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "Šī kešatmiņa ir izslēgšanās procesā un nevar šobrīd apkalpot Jūsu "
 "pieprasījumu. Lūdzu atkārtojiet Jūsu pieprasījumu nedaudz vēlāk."
@@ -542,7 +582,7 @@ msgstr ""
 #: templates/ERR_FORWARDING_DENIED:6
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 
@@ -573,9 +613,10 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_FTP_NOT_FOUND:7
+#, fuzzy
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "Šo var izsaukt FTP adrese ar absolūto ceļu (kas nav saderīgs RFC 1738).  Ja "
@@ -592,9 +633,24 @@ msgstr ""
 #: templates/ERR_CANNOT_FORWARD:6
 msgid ""
 "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."
+"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."
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
 msgstr ""
 
 #: templates/ERR_DNS_FAIL:5
@@ -621,9 +677,10 @@ msgstr ""
 "Kešatmiņā nav atrasts derīgs dokuments un tiek piemērota direktīva <q>only-"
 "if-cached</q> ."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr "Mēģinot izpildīt operāciju PUT sekojošā adresē: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -636,7 +693,13 @@ msgid ""
 "revalidation prohibited by the <q>only-if-cached</q> directive."
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -668,3 +731,13 @@ msgstr "Jūsu tīmekļa pārzinis ir <a href=\"mailto:%w\">%w</a>."
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "Nulles izmēra atbilde"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "KĻŪDA: Pieprasītā adrese nav atrodama"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTP PUT komanda izpildīta: Datne atjaunināta"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr ""
+#~ "Mēģinot izpildīt operāciju PUT sekojošā adresē: <a href=\"%U\">%U</a>"
diff --git a/errors/ms.po b/errors/ms.po
index 130329955d..fab21eeec8 100644
--- a/errors/ms.po
+++ b/errors/ms.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2009-06-05 23:33+0000\n"
 "Last-Translator: Mohamad Faizul bin Zulkifli <piju@mylinux.net.my>\n"
 "Language-Team: Malay <ms@li.org>\n"
+"Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,9 +39,10 @@ msgstr ""
 "request:"
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "Tiada maklum balas dari rangkaian. Pelayan mungkin tutup. Sila cuba lagi"
 
@@ -55,7 +57,7 @@ msgstr "Akses Disekat"
 #: templates/ERR_ACCESS_DENIED:6
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 
@@ -65,7 +67,7 @@ msgid ""
 "href=\"%U\">%U</a>"
 msgstr ""
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -76,15 +78,17 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr "Respon yang salah diterima dari pelayan ICAP"
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 "Keadaan yang salah dihadapi ketika membaca data dari rangkaian. Sila cuba lg"
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr "Keadaan yang salah dihadapi ketika menulis di rangkaian. Sila cuba lg"
 
@@ -130,7 +134,8 @@ msgstr "Direktori: %U"
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr "Direktori: <a href=\"/\">%U</a>/"
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -179,23 +184,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "RALAT: URL yang diminta tidak dapat diterima"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr ""
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "RALAT: URL yang diminta tidak dapat diterima"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "Penghantaran FTP berjaya: File Dihantar"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "Hantaran FTP berjaya: Fail Dikemaskini"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "Penghantaran FTP gagal"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -214,11 +218,24 @@ msgstr "Fail dicipta"
 msgid "File updated"
 msgstr "Fail dikemaskini"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -240,13 +257,18 @@ msgid "Generated %T by %h (%s)"
 msgstr "Dibuat pada %T by %h (%s)"
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr ""
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr ""
@@ -271,6 +293,11 @@ msgstr ""
 msgid "Illegal double-escape in the URL-Path"
 msgstr ""
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "URL Salah"
@@ -335,6 +362,14 @@ msgstr ""
 msgid "Request is too large."
 msgstr "Permintaan terlalu besar"
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Kegagalan Socket"
@@ -438,7 +473,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
@@ -476,14 +511,14 @@ msgstr ""
 
 #: templates/ERR_NO_RELAY:6
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 
 #: templates/ERR_TOO_BIG:8
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 
@@ -498,13 +533,13 @@ msgstr ""
 #: templates/ERR_SHUTTING_DOWN:5
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 
 #: templates/ERR_FORWARDING_DENIED:6
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 
@@ -533,7 +568,7 @@ msgstr ""
 #: templates/ERR_FTP_NOT_FOUND:7
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 
@@ -548,9 +583,24 @@ msgstr ""
 #: templates/ERR_CANNOT_FORWARD:6
 msgid ""
 "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."
+"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."
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
 msgstr ""
 
 #: templates/ERR_DNS_FAIL:5
@@ -575,8 +625,9 @@ msgid ""
 "directive was specified."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
 msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
@@ -590,7 +641,13 @@ msgid ""
 "revalidation prohibited by the <q>only-if-cached</q> directive."
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -620,3 +677,6 @@ msgstr "Webmaster anda ialah <a href=\"mailto:%w\">%w</a>."
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr ""
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "Hantaran FTP berjaya: Fail Dikemaskini"
diff --git a/errors/nl.po b/errors/nl.po
index 4691f4c75a..bb6ff7ca6a 100644
--- a/errors/nl.po
+++ b/errors/nl.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
-"PO-Revision-Date: 2009-10-16 07:15+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
+"PO-Revision-Date: 2010-03-18 23:24+0200\n"
 "Last-Translator: Rene Wijninga <r.wijninga@whine.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 1.2.1\n"
+"X-Generator: Pootle 2.0.1\n"
 "X-Launchpad-Export-Date: 2009-10-04 07:36+0000\n"
 
 #: templates/ERR_DIR_LISTING:6
@@ -41,8 +41,8 @@ msgstr ""
 
 #: templates/ERR_READ_TIMEOUT:7
 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."
+"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 ""
 "Er is een timeout opgetreden tijdens het lezen van data van het netwerk.  "
 "Het netwerk of de server zijn niet beschikbaar of overbelast.  Probeer het "
@@ -59,7 +59,7 @@ msgstr "Toegang niet toegestaan."
 #: templates/ERR_ACCESS_DENIED:6
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "U heeft geen toegang tot de URL die u probeerde op te vragen van deze "
@@ -71,10 +71,10 @@ msgid ""
 "An FTP authentication failure occurred while trying to retrieve the URL: <a "
 "href=\"%U\">%U</a>"
 msgstr ""
-"De FTP authenticatie is mislukt tijdens het openen van URL: <a href=\"%U\">%"
-"U</a>"
+"De FTP authenticatie is mislukt tijdens het openen van URL: <a href=\"%U\">"
+"%U</a>"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -88,7 +88,7 @@ msgstr "Er is een illegale reactie ontvangen van de ICAP server."
 
 #: templates/ERR_READ_ERROR:7
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 "Er is een fout opgetreden tijdens het lezen van data van het netwerk.  "
@@ -96,7 +96,7 @@ msgstr ""
 
 #: templates/ERR_WRITE_ERROR:7
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 "Er is een fout opgetreden tijdens het schrijven naar het netwerk.  Probeer "
@@ -143,7 +143,8 @@ msgstr "Map: %U"
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr "Map: <a href=\"%U\">%U</a>/"
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -192,23 +193,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "FOUT: De gevraagde URL kon niet worden opgehaald"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "FOUT: De gevraagde URN kon niet worden opgehaald"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "FOUT: De gevraagde URL kon niet worden opgehaald"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr "ESI processing mislukt."
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "FTP PUT Succesvol: Bestand aangemaakt"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "FTP PUT Succesvol: Bestand Vernieuwd"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "FTP PUT/upload mislukt"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -227,11 +227,24 @@ msgstr "Bestand aangemaakt"
 msgid "File updated"
 msgstr "Bestand vernieuwd"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr "Voor Firefox browsers ga naar: <ul>"
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr "Voor Internet Explorer browsers ga naar: <ul>"
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr "Voor Opera browsers ga naar: <ul>"
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Doorsturen niet toegestaan."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -253,13 +266,19 @@ msgid "Generated %T by %h (%s)"
 msgstr "Gegenereerd %T door %h (%s)"
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
+"HTTP/1.1 <q>Verwacht:</q> feature wordt gevraagd door HTTP/1.0 software."
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "Hmmm, verwacht niet teveel van URNs op %T :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr "Hoe kunt u deze instellingen in uw browser vinden:"
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr "ICAP protocol fout."
@@ -288,6 +307,12 @@ msgstr ""
 msgid "Illegal double-escape in the URL-Path"
 msgstr "Ongeldige <q>dubbele escape</q> in het URL pad"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+"Bij het HTTP Proxy keuzescherm vult u bij proxy naam %h en poort 3128 in."
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "Ongeldige URL"
@@ -361,6 +386,14 @@ msgstr "Lees Timeout"
 msgid "Request is too large."
 msgstr "Het verzoek is te lang."
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr "Selecteer: Instellingen automatisch detecteren"
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr "Selecteer: Gebruik automatisch proxy configuratie"
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Socket Fout"
@@ -470,22 +503,22 @@ msgid ""
 "The following error was encountered while trying to retrieve the URL: <a "
 "href=\"%U\">%U</a>"
 msgstr ""
-"De volgende fout is opgetreden tijdens het ophalen van URL: <a href=\"%U\">%"
-"U</a>"
+"De volgende fout is opgetreden tijdens het ophalen van 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 ""
-"De volgende fout is opgetreden tijdens het ophalen van URN: <a href=\"%U\">%"
-"U</a>"
+"De volgende fout is opgetreden tijdens het ophalen van 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."
+msgid "The remote host or network may be down. Please try the request again."
 msgstr ""
 "De server of het netwerk dat u probeert te benaderen is onbereikbaar. "
-"Probeer het opnieuw."
+"Probeer het later nog eens.."
 
 #: templates/ERR_TOO_BIG:5
 msgid "The request or reply is too large."
@@ -522,7 +555,7 @@ msgstr "Het systeem gaf als antwoord: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 "Er is geen WAIS Relay host gedefinieerd voor deze Cache!  Neem contact op "
@@ -531,7 +564,7 @@ msgstr ""
 #: templates/ERR_TOO_BIG:8
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 "Deze grootte-beperkingen zijn ingesteld door de beheerder van deze cache.  "
@@ -550,7 +583,7 @@ msgstr "Deze cache ondersteunt geen FTP."
 #: templates/ERR_SHUTTING_DOWN:5
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "Deze cache is bezig met herstarten en kan daarom momenteel niet aan uw "
 "verzoek voldoen.  Probeer het later opnieuw."
@@ -558,7 +591,7 @@ msgstr ""
 #: templates/ERR_FORWARDING_DENIED:6
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "Deze cache zal uw verzoek niet doorsturen, omdat het een sibling relatie "
@@ -597,7 +630,7 @@ msgstr ""
 #: templates/ERR_FTP_NOT_FOUND:7
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "Dit kan veroorzaakt worden door een FTP URL met een absoluut pad (hetgeen "
@@ -619,9 +652,9 @@ msgstr ""
 #: templates/ERR_CANNOT_FORWARD:6
 msgid ""
 "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."
+"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."
 msgstr ""
 "Dit verzoek kon niet worden doorgestuurd naar de oorspronkelijke server of "
 "een van de parent caches.  De meest waarschijnlijke reden voor deze fout is "
@@ -629,6 +662,27 @@ msgstr ""
 "server te praten, en alle ingestelde parent caches op dit moment "
 "onbereikbaar zijn."
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+"Configuratie -&gt; Internet Opties -&gt; Verbinding -&gt; LAN Instellingen -"
+"&gt;Proxy"
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+"Configuratie -&gt; Internet Opties -&gt; Geavanceerd -&gt; Netwerk -&gt;LAN "
+"Instellingen "
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+"Configuratie -&gt;Voorkeursinstellingen -&gt; Geavanceerd -&gt; Netwerk -&gt;"
+"Proxy Servers"
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr "Niet in staat om het IP adres te bepalen van server <q>%H</q>"
@@ -653,10 +707,10 @@ msgstr ""
 "Een geldig document werd niet gevonden in de cache, en de <q>only-if-cached</"
 "q> richtlijn was ingesteld."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr ""
-"Bij een poging om naar de volgende URL te schrijven: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr "Web Browser Configuratie"
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -673,7 +727,15 @@ msgstr ""
 "een herbevestiging nodig die niet werd toegestaan door de <q>only-if-cached</"
 "q> richtlijn."
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+"Uw Browser instellingen dienen te worden aangepast om dit netwerk te kunnen "
+"gebruiken."
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -705,3 +767,13 @@ msgstr "Uw cachebeheerder is <a href=\"mailto:%w\">%w</a>."
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "Antwoord is leeg"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "FOUT: De gevraagde URN kon niet worden opgehaald"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTP PUT Succesvol: Bestand Vernieuwd"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr ""
+#~ "Bij een poging om naar de volgende URL te schrijven: <a href=\"%U\">%U</a>"
diff --git a/errors/pl.po b/errors/pl.po
index adca65549a..d6f711b78f 100644
--- a/errors/pl.po
+++ b/errors/pl.po
@@ -2,16 +2,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2010-01-02 23:51+0000\n"
 "Last-Translator: Jarosław Ogrodnik <nobodythere@gmail.com>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2010-01-09 14:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-"Language: pl\n"
 
 #: templates/ERR_DIR_LISTING:6
 msgid "<a href=\"../\">Parent Directory</a> (<a href=\"/\">Root Directory</a>)"
@@ -34,9 +34,10 @@ msgstr ""
 "zapytania"
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "Przekroczony zostal dopuszczalny czas oczekiwania na dane z sieci. Sieć lub "
 "serwer źródłowy mogą być niedostępne lub przeciążone. Proszę ponowić żądanie."
@@ -50,9 +51,10 @@ msgid "Access Denied."
 msgstr "Dostęp zabroniony."
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "Konfiguracja serwera wyklucza Twój dostęp do niego w chwili obecnej. "
@@ -64,7 +66,7 @@ msgid ""
 "href=\"%U\">%U</a>"
 msgstr ""
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -76,15 +78,17 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr "Odebrano błędną odpowiedź z serwera ICAP"
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 "Podczas czytania dokumentu z sieci wystąpił błąd. Proszę ponowić żądanie."
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr "Wystąpił błąd podczas próby zapisu do sieci. Proszę ponowić żądanie."
 
@@ -129,7 +133,8 @@ msgstr "Katalog: %U"
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr "Katalog: <a href=\"%U\">%U</a>/"
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -178,23 +183,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "BŁĄD: Żądany URL nie może zostać pobrany"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "BŁĄD: Żądany URN nie może zostać sprowadzony"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "BŁĄD: Żądany URL nie może zostać pobrany"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "Operacja FTP PUT udała się: plik został utworzony"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "Operacja FTP PUT udana: plik uaktualniony"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "Nieudany FTP PUT/upload"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -213,11 +217,24 @@ msgstr "plik został utworzony"
 msgid "File updated"
 msgstr "plik uaktualniony"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Przekazanie żądania zabronione."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -239,13 +256,18 @@ msgid "Generated %T by %h (%s)"
 msgstr "Utworzono %T przez %h (%s)"
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "Proszę nie spodziewać się zbyt wiele od URNów z %T :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr ""
@@ -270,6 +292,11 @@ msgstr "Błędny znak w nazwie hosta; podkreślenia (underscores) są niedozwolo
 msgid "Illegal double-escape in the URL-Path"
 msgstr "podwójna sekwencja escape w ścieżce URL"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "błędny URL"
@@ -342,6 +369,14 @@ msgstr "przekroczony czas odczytu"
 msgid "Request is too large."
 msgstr "RZbyt duży rozmiar żądania"
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 #, fuzzy
 msgid "Socket Failure"
@@ -460,7 +495,8 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_CONNECT_FAIL:7
-msgid "The remote host or network may be down.  Please try the request again."
+#, fuzzy
+msgid "The remote host or network may be down. Please try the request again."
 msgstr ""
 "Serwer źródłowy lub sieć mogą być nieczynne. Spróbuj ponowić żądanie później."
 
@@ -498,8 +534,9 @@ msgid "The system returned: <i>%E</i>"
 msgstr "System zwrócił wartość: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
+#, fuzzy
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 "Dla tego serwera cache nie został zdefiniowany WAIS relay! Zawiadom "
@@ -508,7 +545,7 @@ msgstr ""
 #: templates/ERR_TOO_BIG:8
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 
@@ -523,13 +560,14 @@ msgstr "Ten serwer cache nie prowadzi połączeń FTP."
 #: templates/ERR_SHUTTING_DOWN:5
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 
 #: templates/ERR_FORWARDING_DENIED:6
+#, fuzzy
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "Ten serwer cache nie przekaże Twojego żądania ponieważ wymusza ono relację "
@@ -563,7 +601,7 @@ msgstr ""
 #: templates/ERR_FTP_NOT_FOUND:7
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 
@@ -579,15 +617,30 @@ msgstr ""
 #, fuzzy
 msgid ""
 "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."
+"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."
 msgstr ""
 "Żądanie nie może zostać przakazane serwerowi źródłowemu ani żadnemu z "
 "serwerów-rodziców.  Najbardziej prawdopodobne źródła błędu to Administrator "
 "serwera cache  nie pozwala temu cache na bezpośrednie połączenia do serwerów "
 "źródłowych Wszystkie kooperujące serwery-rodzice są w tej chwili niedostępne."
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr "Nie można ustalić adresu IP hosta o nazwie <q>%H</q>"
@@ -612,11 +665,10 @@ msgstr ""
 "żądanie z dyrektywą <q>only-if-cached</q> dotyczyło dokumentu aktualnie nie "
 "przechowywanego przez sewer cache."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-#, fuzzy
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
 msgstr ""
-"Podczas próby przesłania URL-a: <a href=\"%U\">%U</a> via FTP komendą PUT"
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -632,7 +684,13 @@ msgstr ""
 "znaleziony w zasobech serwera cache <em>lub</em> wymagał odświeżenia "
 "zabronionego dyrektywą <q>only-if-cached</q>."
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -662,3 +720,14 @@ msgstr ""
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "sprowadzony dokument ma zerowy rozmiar"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "BŁĄD: Żądany URN nie może zostać sprowadzony"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "Operacja FTP PUT udana: plik uaktualniony"
+
+#, fuzzy
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr ""
+#~ "Podczas próby przesłania URL-a: <a href=\"%U\">%U</a> via FTP komendą PUT"
diff --git a/errors/pt-br.po b/errors/pt-br.po
index 7d0a2cc3db..acc1075d8e 100644
--- a/errors/pt-br.po
+++ b/errors/pt-br.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2009-09-25 09:18+1300\n"
 "Last-Translator: Aecio F. Neto <aecioneto@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 1.2.1\n"
 "X-Launchpad-Export-Date: 2008-07-27 05:12+0000\n"
@@ -38,9 +38,10 @@ msgstr ""
 "<b>Resposta Inválida</b> erro encontrado ao tentar processar a requisição:"
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "Tempo esgotado esperando a leitura de dados pela rede. A rede ou o servidor "
 "pode estar desconectado ou congestionado. Por favor, tente novamente sua "
@@ -55,9 +56,10 @@ msgid "Access Denied."
 msgstr "Acesso Negado."
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "A configuração do controle de acesso impede que sua requisição seja "
@@ -72,29 +74,31 @@ msgstr ""
 "Ocorreu uma falha na autenticação do FTP ao tentar recuperar a URL: <a href="
 "\"%U\">%U</a>"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
 msgstr ""
-"Um erro no protocolo FTP ocorreu ao tentar recuperar a URL: <a href=\"%U\">%"
-"U</a>"
+"Um erro no protocolo FTP ocorreu ao tentar recuperar a URL: <a href=\"%U\">"
+"%U</a>"
 
 #: templates/ERR_ICAP_FAILURE:10
 msgid "An Illegal response was received from the ICAP server."
 msgstr "Uma resposta ilegal foi recebida do servidor ICAP."
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 "Uma condição de erro ocorreu ao ler dados da rede. Por favor, repita sua "
 "requisição."
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 "Ocorreu um erro ao tentar escrever na rede. Por favor, repita sua requisição."
@@ -140,7 +144,8 @@ msgstr "Diretório: %U"
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr "Directório: <a href=\"%U\">%U</a>/"
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -189,23 +194,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "ERRO: A URL requisitada não pode ser recuperada"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "ERRO: A URN requisitada não pode ser recuperada"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "ERRO: A URL requisitada não pode ser recuperada"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr "O processamento de ESI falhou."
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "FTP - PUT bem sucedido: Arquivo Criado"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "FTP - PUT bem sucedido: Arquivo Atualizado"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "FTP - PUT/envio falhou"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -224,11 +228,24 @@ msgstr "Arquivo criado"
 msgid "File updated"
 msgstr "Arquivo atualizado"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Encaminhamento Negado."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -250,13 +267,18 @@ msgid "Generated %T by %h (%s)"
 msgstr "Gerado %T por %h (%s)"
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "Olha, não espere muito por URNs em %T :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr "Erro de protocolo ICAP."
@@ -285,6 +307,11 @@ msgstr "Caracter ilegal no nome de host; underscores não são permitidos."
 msgid "Illegal double-escape in the URL-Path"
 msgstr "Escape duplo ilegal na URL-Path"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "URL inválida"
@@ -358,6 +385,14 @@ msgstr "Tempo de leitura esgotado"
 msgid "Request is too large."
 msgstr "Requisição é muito grande."
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Falha de socket"
@@ -480,7 +515,8 @@ msgstr ""
 "a>"
 
 #: templates/ERR_CONNECT_FAIL:7
-msgid "The remote host or network may be down.  Please try the request again."
+#, fuzzy
+msgid "The remote host or network may be down. Please try the request again."
 msgstr ""
 "O host remoto ou a rede pode estar fora do ar. Por favor, faça a requisição "
 "novamente."
@@ -519,17 +555,19 @@ msgid "The system returned: <i>%E</i>"
 msgstr "O sistema retornou: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
+#, fuzzy
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 "Não há nenhum host de WAIS Relay definido para esse Cache!  Contate o "
 "administrador."
 
 #: templates/ERR_TOO_BIG:8
+#, fuzzy
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 "Esses limites foram estabelecidos pelo Provedor de Serviço Internet em que "
@@ -545,17 +583,19 @@ msgid "This cache does not support FTP."
 msgstr "Esse cache não suporta FTP."
 
 #: templates/ERR_SHUTTING_DOWN:5
+#, fuzzy
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "Este cache está sendo desligado e não pode atender sua requisição neste "
 "momento.  Por favor, tente novamente em breve."
 
 #: templates/ERR_FORWARDING_DENIED:6
+#, fuzzy
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "Este cache não encaminhará sua requisição porque está tentando forçar um "
@@ -591,9 +631,10 @@ msgstr ""
 "favor, informe este erro ao webmaster."
 
 #: templates/ERR_FTP_NOT_FOUND:7
+#, fuzzy
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "Isto pode ter sido causado por uma URL de FTP com um caminho absoluto (que "
@@ -613,17 +654,33 @@ msgstr ""
 "com as credenciais de segurança do host."
 
 #: templates/ERR_CANNOT_FORWARD:6
+#, fuzzy
 msgid ""
 "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."
+"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."
 msgstr ""
 "Esta requisição não pode ser encaminhada ao servidor de origem ou para "
 "nenhum cache pai. A causa mais provável para este erro é que o administrador "
 "do cache não permite que este cache faça conexões diretas aos servidores de "
 "origem e que todos caches superiores estão inalcançáveis no momento."
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr "Impossível determinar o endereço IP do nome de host <q>%H</q>"
@@ -648,9 +705,10 @@ msgstr ""
 "Um documento válido não foi encontrado no cache e a diretiva <q>only-if-"
 "cached</q> foi especificada."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr "Ao tentar executar o PUT na seguinte URL: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -666,7 +724,13 @@ msgstr ""
 "cached</q>. O documento não foi encontrado no cache <em>ou</em> o cache "
 "requer uma revalidação, que é proibida por esta diretiva."
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -698,3 +762,12 @@ msgstr "Seu webmaster é <a href=\"mailto:%w\">%w</a>."
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "Resposta de tamanho zero"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "ERRO: A URN requisitada não pode ser recuperada"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTP - PUT bem sucedido: Arquivo Atualizado"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr "Ao tentar executar o PUT na seguinte URL: <a href=\"%U\">%U</a>"
diff --git a/errors/pt.po b/errors/pt.po
index f2c31f7cb4..ffd0f8db99 100644
--- a/errors/pt.po
+++ b/errors/pt.po
@@ -2,14 +2,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2009-06-14 14:41+1300\n"
 "Last-Translator: Pedro Lineu Orso <orso@pop.hsbcbamerindus.com.br>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 1.2.1\n"
 
@@ -30,9 +30,10 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "Excedeu o tempo limite enquanto esperava para ler dados na rede. A rede ou "
 "servidor pode estar indisponível ou congestionado. Por favor tente novamente."
@@ -46,9 +47,10 @@ msgid "Access Denied."
 msgstr "Proibido o Acesso."
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "O controle de acessos impediu sua requisição. Caso você não concorde com "
@@ -63,7 +65,7 @@ msgstr ""
 "Ocorreu uma falha na autenticação no FTP, na tentativa de recuperar a "
 "seguinte URL:<a href=\"%U\">%U</a>"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -76,16 +78,18 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr ""
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 "Ocorreu uma condição de erro enquanto lia o dado na rede. Por favor tente "
 "novamente."
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 "Uma condição de erro ocorreu enquanto escrevia na rede. Por favor tente "
@@ -132,7 +136,8 @@ msgstr ""
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -181,23 +186,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "ERRO: A URL solicitada não pode ser recuperada"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "ERRO: URN requisitada não pode ser recuperada"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "ERRO: A URL solicitada não pode ser recuperada"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "Sucesso no FTP PUT: Arquivo criado"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "Sucesso no FTP PUT: Arquivo atualizado"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "FTP PUT/erro na carga"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -218,11 +222,24 @@ msgstr "Arquivo atualizado"
 msgid "File updated"
 msgstr "Arquivo atualizado"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Expedição proibida."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -244,13 +261,18 @@ msgid "Generated %T by %h (%s)"
 msgstr ""
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "Não espere muita coisa de URNS em %T :-)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr ""
@@ -280,6 +302,11 @@ msgstr "Hostname com caracter inválido; não são permitidos underscores."
 msgid "Illegal double-escape in the URL-Path"
 msgstr ""
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "URL inválida"
@@ -354,6 +381,14 @@ msgstr "Excedeu o tempo limite para leitura (timeout)"
 msgid "Request is too large."
 msgstr "A requisição pode ser muito grande"
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Falha no Socket"
@@ -446,8 +481,8 @@ msgstr ""
 #: templates/ERR_FTP_NOT_FOUND:4
 msgid "The following URL could not be retrieved: <a href=\"%U\">%U</a>"
 msgstr ""
-"A seguite URL não pode ser recuperada (não foi encontrada): <a href=\"%U\">%"
-"U</a>"
+"A seguite URL não pode ser recuperada (não foi encontrada): <a href=\"%U\">"
+"%U</a>"
 
 #: templates/ERR_ACCESS_DENIED:4 templates/ERR_CACHE_ACCESS_DENIED:4
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:4 templates/ERR_CANNOT_FORWARD:4
@@ -473,7 +508,8 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_CONNECT_FAIL:7
-msgid "The remote host or network may be down.  Please try the request again."
+#, fuzzy
+msgid "The remote host or network may be down. Please try the request again."
 msgstr ""
 "O host remoto (servidor) ou a rede pode estar indisponível. Por favor tente "
 "novamente."
@@ -512,16 +548,18 @@ msgid "The system returned: <i>%E</i>"
 msgstr "O sistema retornou: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
+#, fuzzy
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 "Não há servidor WAIS definido para este cache! Fale com o administrador."
 
 #: templates/ERR_TOO_BIG:8
+#, fuzzy
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 "Os limites foram estabelecidos pelo administrador deste cache. Por favor, "
@@ -540,7 +578,7 @@ msgstr "Este cache não está habilitado para FTP."
 #, fuzzy
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "Este servidor de cache está em procedimento de shutting down e não pode "
 "servir sua requisição neste momento. Por favor, tente mais tarde."
@@ -549,7 +587,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "Este cache não expediu sua solicitação porque está tentando forçar "
@@ -582,9 +620,10 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_FTP_NOT_FOUND:7
+#, fuzzy
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "Isto pode ter como causa uma URL de FTP com caminho absoluto (que não está "
@@ -603,15 +642,30 @@ msgstr ""
 #, fuzzy
 msgid ""
 "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."
+"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."
 msgstr ""
 "Esta requisição não pode ser encaminhada para o servidor ou para qualquer "
 "outro cache. A causa mais provável para este erro é O administrador do cache "
 "não permite que este cache faça conexões diretas para servidores, e Todos os "
 "caches configurados não estão disponíveis."
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr "Incapaz de determinar o endereço IP através do nome do host <q>%H</q>"
@@ -636,9 +690,10 @@ msgstr ""
 "Não foi encontrado documento válido no cache e a opção <q>only-if-cached</q> "
 "foi especificada. "
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr "Na tentativa de salvar (PUT) a seguinte URL: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -654,7 +709,13 @@ msgstr ""
 "ativa. O documento não foi encontrado no cache, <em>ou</em> requer "
 "revalidação proibida pela opção <q>only-if-cached</q>"
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -684,3 +745,12 @@ msgstr ""
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "Resposta com tamanho zero"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "ERRO: URN requisitada não pode ser recuperada"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "Sucesso no FTP PUT: Arquivo atualizado"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr "Na tentativa de salvar (PUT) a seguinte URL: <a href=\"%U\">%U</a>"
diff --git a/errors/ro.po b/errors/ro.po
index 4597c7baea..8739e089a5 100644
--- a/errors/ro.po
+++ b/errors/ro.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
-"PO-Revision-Date: 2010-01-18 21:29+0200\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
+"PO-Revision-Date: 2010-03-20 16:29+0200\n"
 "Last-Translator: Arthur <arthur@psw.ro>\n"
 "Language-Team: Romanian <ro@li.org>\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2);;\n"
-"X-Generator: Pootle 2.0.0\n"
+"X-Generator: Pootle 2.0.1\n"
 "X-Launchpad-Export-Date: 2009-01-18 05:16+0000\n"
 
 #: templates/ERR_DIR_LISTING:6
@@ -43,11 +43,11 @@ msgstr ""
 
 #: templates/ERR_READ_TIMEOUT:7
 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."
+"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 ""
-"S-a depăşit timpul de aşteptare în tipul citirii datelor de la reţea.  "
-"Reţeaua sau serverul ar putea fi căzute sau congestionate.  Vă rugăm să "
+"S-a depăşit timpul de aşteptare în tipul citirii datelor de la reţea. "
+"Reţeaua sau serverul ar putea fi căzute sau congestionate. Vă rugăm să "
 "încercaţi din nou."
 
 #: templates/ERR_URN_RESOLVE:3
@@ -61,12 +61,12 @@ msgstr "Acces interzis."
 #: templates/ERR_ACCESS_DENIED:6
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "Configuraţia de control al accesului împiedică ca cererea dumneavoastră să "
-"fie permisă în acest moment.  Vă rugăm contactaţi furnizorul de servicii "
-"dacă credeţi că acest lucru nu este corect."
+"fie permisă în acest moment. Vă rugăm contactaţi furnizorul de servicii dacă "
+"credeţi că acest lucru nu este corect."
 
 #: templates/ERR_FTP_FORBIDDEN:4
 msgid ""
@@ -76,7 +76,7 @@ msgstr ""
 "Autentificarea FTP a eşuat în timp ce se încerca accesarea URL-ului: <a href="
 "\"%U\">%U</a>"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -90,18 +90,18 @@ msgstr "S-a recepţionat un răspuns ilegal de la serverul ICAP."
 
 #: templates/ERR_READ_ERROR:7
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
-"A survenit o eroare în timp ce se citeau date din reţea.  Vă rugăm să "
+"A survenit o eroare în timp ce se citeau date din reţea. Vă rugăm să "
 "încercaţi cererea din nou."
 
 #: templates/ERR_WRITE_ERROR:7
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
-"A survenit o eroare în timp ce se scriau date în reţea.  Vă rugăm să "
+"A survenit o eroare în timp ce se scriau date în reţea. Vă rugăm să "
 "încercaţi cererea din nou."
 
 #: templates/ERR_CACHE_ACCESS_DENIED:3 templates/ERR_CACHE_ACCESS_DENIED:5
@@ -145,7 +145,8 @@ msgstr "Directorul: %U"
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr "Directorul: <a href=\"%U\">%U</a>/"
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -194,23 +195,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "EROARE: URL-ul cerut nu a putut fi accesat"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "EROARE: URN-ul cerut nu a putut fi accesat"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "EROARE: URL-ul cerut nu a putut fi accesat"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr "Procesarea ESI a eşuat."
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "FTP PUT reuşit: fişierul a fost creat"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "FTP PUT reuşit: fişierul a fost actualizat"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "FTP PUT/încărcare eşuată"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -229,11 +229,24 @@ msgstr "Fişierul a fost creat"
 msgid "File updated"
 msgstr "Fişierul a fost actualizat"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr "Pentru navigatorul Firefox mergeţi la: <ul>"
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr "Pentru navigatorul Internet Explorer mergeţi la: <ul>"
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr "Pentru navigatorul Opera mergeţi la: <ul>"
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Înaintarea cererii este interzisă."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -255,13 +268,19 @@ msgid "Generated %T by %h (%s)"
 msgstr "Generat %T de către %h (%s)"
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
+"HTTP/1.1 Capabilitatea <q>Expect:</q> este cerută de software HTTP/1.0."
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "Hei, nu vă aşteptaţi la prea multe de la URN-uri pe %T :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr "Cum să găseşti aceste setări în navigatorul tău:"
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr "Eroare în protocolul ICAP."
@@ -291,6 +310,12 @@ msgstr ""
 msgid "Illegal double-escape in the URL-Path"
 msgstr "Secvenţa escape-dublu este ilegală în calea URL"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+"În căsuţa pentru proxy HTTP tastează numele proxy-ului %h şi portul 3128."
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "URL invalid"
@@ -365,6 +390,14 @@ msgstr "Cererea de citire a expirat"
 msgid "Request is too large."
 msgstr "Cererea este prea mare."
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr "Selectează Detectează automat setările"
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr "Selectează Configurare pentru proxy automată"
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Eroare de Socket"
@@ -485,9 +518,9 @@ msgstr ""
 "href=\"%U\">%U</a>"
 
 #: 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 ""
-"Calculatorul sau reţeaua destinaţie s-ar putea să fie inoperabile.  Vă rugăm "
+"Calculatorul sau reţeaua destinaţie s-ar putea să fie inoperabile. Vă rugăm "
 "să încercaţi cererea din nou."
 
 #: templates/ERR_TOO_BIG:5
@@ -525,20 +558,20 @@ msgstr "Sistemul de operare a returnat mesajul: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
-"Nu este definit niciun relay WAIS pentru acest cache!  Strigaţi la "
-"administrator!"
+"Nu este definit niciun relay WAIS pentru acest cache! Strigaţi la "
+"administrator."
 
 #: templates/ERR_TOO_BIG:8
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 "Aceste limite au fost impuse de către organizaţia care oferă serviciile de "
-"Internet şi care administreză acest cache.  Vă rugăm să îi contactaţi în mod "
+"Internet şi care administreză acest cache. Vă rugăm să îi contactaţi în mod "
 "direct dacă sunteţi de părere că este o greşeală."
 
 #: templates/ERR_UNSUP_HTTPVERSION:6
@@ -553,19 +586,19 @@ msgstr "Acest cache nu suportă protocolul FTP."
 #: templates/ERR_SHUTTING_DOWN:5
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "Acest cache este în curs de închidere şi nu poate procesa cererea în acest "
-"moment.  Vă rugăm să repetaţi cererea cât mai curând."
+"moment. Vă rugăm să repetaţi cererea cât mai curând."
 
 #: templates/ERR_FORWARDING_DENIED:6
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "Acest cache nu va înainta cererea dumneavoastră din cauză că încearcă să "
-"stabilească o relaţie de echivalenţă.  Poate că clientul %i este un cache "
+"stabilească o relaţie de echivalenţă. Poate că clientul %i este un cache "
 "care a fost configurat greşit."
 
 #: templates/ERR_ICAP_FAILURE:7
@@ -601,11 +634,11 @@ msgstr ""
 #: templates/ERR_FTP_NOT_FOUND:7
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "Acest lucru poate fi cauzat de un URL FTP cu o cale absolută (ceea ce nu "
-"este conform RFC-ului 1738).  Dacă aceasta este cauza, atunci fişierul poate "
+"este conform RFC-ului 1738). Dacă aceasta este cauza, atunci fişierul poate "
 "fi găsit la <a href=\"%B\">%B</a>."
 
 #: templates/ERR_SECURE_CONNECT_FAIL:7
@@ -623,16 +656,34 @@ msgstr ""
 #: templates/ERR_CANNOT_FORWARD:6
 msgid ""
 "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."
+"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."
 msgstr ""
 "Această cerere nu a putut fi înaintată către serverul de origine sau un "
-"cache părinte.  Cea mai probabilă cauză de eroare este că administratorul "
+"cache părinte. Cea mai probabilă cauză de eroare este că administratorul "
 "cache-ului nu permite acestui cache să facă conexiuni directe către "
 "serverele de origine şi toate cache-urile părinte nu pot fi contactate în "
 "acest moment."
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr "Nu pot determina adresa IP din numele host-ului pentru <q>%H</q>"
@@ -657,9 +708,10 @@ msgstr ""
 "Un document valid nu a fost găsit în cache şi directiva <q>only-if-cached</"
 "q> (numai dacă este deja în cache) a fost specificată."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr "În timp ce făceam PUT la următorul URL: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr "Configurarea navigatorului de internet"
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -676,7 +728,15 @@ msgstr ""
 "necesitat o revalidare, revalidare interzisă de directiva <q>only-if-cached</"
 "q>."
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+"Configurarea navigatorului de internet trebuie modificată pentru a putea "
+"utiliza această reţea."
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -708,3 +768,12 @@ msgstr "Webmaster-ul este <a href=\"mailto:%w\">%w</a>."
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "Răspuns de lungime zero"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "EROARE: URN-ul cerut nu a putut fi accesat"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTP PUT reuşit: fişierul a fost actualizat"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr "În timp ce făceam PUT la următorul URL: <a href=\"%U\">%U</a>"
diff --git a/errors/ru.po b/errors/ru.po
index 9b5337772e..0d1486db56 100644
--- a/errors/ru.po
+++ b/errors/ru.po
@@ -2,16 +2,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2009-06-14 11:47+0000\n"
 "Last-Translator: Amos Jeffries <Unknown>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2009-07-22 09:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-"Language: ru\n"
 
 #: templates/ERR_DIR_LISTING:6
 msgid "<a href=\"../\">Parent Directory</a> (<a href=\"/\">Root Directory</a>)"
@@ -32,9 +32,10 @@ msgid ""
 msgstr "Получен <b>недопустимый ответ</b> при попытке обработки запроса:"
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "Превышено время ожидания ответа во время чтения данных из сети. Сеть или "
 "сервер не работают либо перегружены. Пожалуйста, повторите запрос."
@@ -48,9 +49,10 @@ msgid "Access Denied."
 msgstr "Доступ запрещён."
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "Настройка контроля доступа не даёт возможности выполнить Ваш запрос в "
@@ -65,7 +67,7 @@ msgstr ""
 "Произошла ошибка аутентификации FTP при попытке получить URL: <a href=\"%U\">"
 "%U</a>"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -78,16 +80,18 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr "Получен недопустимый ответ от сервера ICAP."
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 "При попытке чтения данных из сети произошла ошибка. Пожалуйста, повторите "
 "запрос."
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 "При попытке отправки данных в сеть произошла ошибка. Пожалуйста, повторите "
@@ -131,11 +135,11 @@ msgid "Directory: %U"
 msgstr "Каталог: %U"
 
 #: templates/ERR_DIR_LISTING:2
-#, fuzzy
 msgid "Directory: <a href=\"%U\">%U</a>/"
-msgstr "Каталог: <a href=\"/\">%U</a>/"
+msgstr "Каталог: <a href=\"%U\">%U</a>/"
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -184,23 +188,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "ОШИБКА: Запрошенный URL не может быть получен"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "ОШИБКА: Запрошенный URN не может быть получен"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "ОШИБКА: Запрошенный URL не может быть получен"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr "Обработка ESI не удалась."
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "Команда FTP PUT завершилась успешно: файл создан"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "Команда FTP PUT завершилась успешно: файл обновлён"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "Команда FTP PUT (отправка) завершилась аварийно"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -219,11 +222,24 @@ msgstr "Файл создан"
 msgid "File updated"
 msgstr "Файл обновлён"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Пересылка запрещена."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -245,13 +261,18 @@ msgid "Generated %T by %h (%s)"
 msgstr "Создано %T на %h (%s)"
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "Не стоит ожидать чудес от URN-ов на %T :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr "Ошибка протокола ICAP."
@@ -277,6 +298,11 @@ msgstr "Недопустимый символ в имени узла (hostname),
 msgid "Illegal double-escape in the URL-Path"
 msgstr "Недопустимое двойное экранирование в пути URL (URL-Path)"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr "В поле ввода HTTP прокси введите имя прокси %h и порт 3128"
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "Недопустимый URL"
@@ -350,6 +376,14 @@ msgstr "Время ожидания при чтении истекло"
 msgid "Request is too large."
 msgstr "Запрос слишком велик."
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr "Выберите Автоматически определять настройки"
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr "Выберите Использовать Автоматическое определение прокси"
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Ошибка сокета"
@@ -464,10 +498,8 @@ msgid ""
 msgstr "При получении 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."
-msgstr ""
-"Возможно, удаленный узел или сеть недоступны. Пожалуйста, повторите запрос "
-"позже."
+msgid "The remote host or network may be down. Please try the request again."
+msgstr "Удаленный узел или сеть недоступен. Повторите запрос позднее"
 
 #: templates/ERR_TOO_BIG:5
 msgid "The request or reply is too large."
@@ -503,16 +535,18 @@ msgid "The system returned: <i>%E</i>"
 msgstr "Система вернула: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
+#, fuzzy
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 "Для этого кэша не определен узел Wais Relay. Обратитесь к администратору."
 
 #: templates/ERR_TOO_BIG:8
+#, fuzzy
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 "Эти ограничения установлены администратором, который управляет этим кэшем. "
@@ -528,17 +562,19 @@ msgid "This cache does not support FTP."
 msgstr "Этот кэш не поддерживает протокол FTP."
 
 #: templates/ERR_SHUTTING_DOWN:5
+#, fuzzy
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "Этот кэш находится в процессе завершения работы и не может выполнить Ваш "
 "запрос в настоящее время. Пожалуйста, повторите запрос через некторое время."
 
 #: templates/ERR_FORWARDING_DENIED:6
+#, fuzzy
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "Этот кэш не будет пересылать Ваш запрос потому, что он пытается "
@@ -574,9 +610,10 @@ msgstr ""
 "сообщите об этой ошибке веб-мастеру."
 
 #: templates/ERR_FTP_NOT_FOUND:7
+#, fuzzy
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "Это может быть вызвано FTP URL c абсолютным путём (который не соответствует "
@@ -596,17 +633,33 @@ msgstr ""
 "удостоверением безопасности узла."
 
 #: templates/ERR_CANNOT_FORWARD:6
+#, fuzzy
 msgid ""
 "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."
+"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."
 msgstr ""
 "Этот запрос не может быть перенаправлен ни к первичному серверу, ни к "
 "родительским кэшам. Наиболее вероятная причина этой ошибки в том, что "
 "администратор запретил прямые соединения к первичным серверам, а все "
 "указанные родительские кэши в данный момент недоступны."
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr "Невозможно определить IP-адрес по имени узла <q>%H</q>"
@@ -631,9 +684,10 @@ msgstr ""
 "Действительный документ не найден в кэше и указана деректива <q>only-if-"
 "cached</q>."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr "При попытке запроса PUT для следующего URL: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -649,7 +703,13 @@ msgstr ""
 "Документ не был найден в кэше <em>или</em> он требует проверки "
 "достоверности, запрещённой директивой <q>only-if-cached</q>."
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -681,3 +741,12 @@ msgstr "Ваш вебмастер: <a href=\"mailto:%w\">%w</a>."
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "Пустой ответ (нулевой длины)"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "ОШИБКА: Запрошенный URN не может быть получен"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "Команда FTP PUT завершилась успешно: файл обновлён"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr "При попытке запроса PUT для следующего URL: <a href=\"%U\">%U</a>"
diff --git a/errors/sk.po b/errors/sk.po
index 56b165e6a8..90274b8d34 100644
--- a/errors/sk.po
+++ b/errors/sk.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
-"PO-Revision-Date: 2010-03-07 14:00+0200\n"
-"Last-Translator:  <helix84@centrum.sk>\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
+"PO-Revision-Date: 2010-03-19 18:57+0100\n"
+"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
@@ -36,11 +36,12 @@ msgstr ""
 
 #: templates/ERR_READ_TIMEOUT:7
 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."
+"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 ""
-"Vyhradený čas vypršal počas čítania zo siete. Sieť alebo server môžu byť "
-"mimo prevádzky alebo preťažené. Opakujte prosím svoju požiadavku. "
+"Vyhradený čas vypršal počas čakania na načítanie dát zo siete. Sieť alebo "
+"server môžu byť mimo prevádzky alebo preťažené. Prosím, zopakujte svoju "
+"požiadavku."
 
 #: templates/ERR_URN_RESOLVE:3
 msgid "A URL for the requested URN could not be retrieved"
@@ -53,27 +54,28 @@ msgstr "Prístup zamietnutý."
 #: templates/ERR_ACCESS_DENIED:6
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
-"Prístup k dokumentu vám v tomto čase nebol umožnený v dôsledku "
-"nedostatočných prístupových práv. Ak si myslíte, že je to chyba, kontaktujte "
-"prosím správcu daného systému."
+"Vašu požiadavku v tomto čase nebolo možné splniť kvôli konfigurácii riadenia "
+"prístupu. Ak si myslíte, že je to chyba, prosím, kontaktujte správcu daného "
+"systému."
 
 #: templates/ERR_FTP_FORBIDDEN:4
 msgid ""
 "An FTP authentication failure occurred while trying to retrieve the URL: <a "
 "href=\"%U\">%U</a>"
 msgstr ""
-"Pri pokuse získať URL sa vyskytla chyba autentifikácie: <a href=\"%U\">%U</a>"
+"Pri pokuse získať URL sa vyskytla chyba autentifikácie FTP: <a href=\"%U\">"
+"%U</a>"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
 msgstr ""
-"Vyskytla sa chyba protokolu FTP pri pokuse o prístup k URL: <a href=\"%U\">%"
-"U</a>"
+"Vyskytla sa chyba protokolu FTP pri pokuse o prístup k URL: <a href=\"%U\">"
+"%U</a>"
 
 #: templates/ERR_ICAP_FAILURE:10
 msgid "An Illegal response was received from the ICAP server."
@@ -81,15 +83,15 @@ msgstr "Od ICAP servera bola prijatá neplatná odpoveď."
 
 #: templates/ERR_READ_ERROR:7
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
-"Vyskytla sa chyba pri prenose údajov cez sieť. Prosím, opakujte svoju "
+"Vyskytla sa chyba pri načítavaní údajov cez sieť. Prosím, opakujte svoju "
 "požiadavku."
 
 #: templates/ERR_WRITE_ERROR:7
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 "Vyskytla sa chyba pri zápise do siete. Prosím, opakujte svoju požiadavku."
@@ -135,7 +137,8 @@ msgstr "Adresár: %U"
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr "Adresár: <a href=\"%U\">%U</a>/"
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -184,23 +187,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "CHYBA: Požadovaný URL nebolo možné získať"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "CHYBA: Požadované URN nebolo možné získať"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "CHYBA: Požadovaný URL nebolo možné získať"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr "Spracovanie ESI zlyhalo."
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "operácia FTP PUT úspešná: Súbor vytvorený"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "operácia FTP PUT úspešná: Súbor aktualizovaný"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "FTP PUT/nahrávanie zlyhalo"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -219,11 +221,24 @@ msgstr "Súbor vytvorený"
 msgid "File updated"
 msgstr "Súbor aktualizovaný"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr "Prehliadače Firefox - choďte na: <ul>"
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr "Prehliadače Internet Explorer - choďte na: <ul>"
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr "Prehliadače Opera - choďte na: <ul>"
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Preposielanie zamietnuté."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -245,14 +260,20 @@ msgid "Generated %T by %h (%s)"
 msgstr "Vytvoril %T, %h (%s)"
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
-"Vlastnosť Expect: verzie HTTP/1.1 sa požaduje od softvéru verzie HTTP/1.0."
+"Vlastnosť <q>Expect:</q> verzie HTTP/1.1 sa požaduje od softvéru verzie "
+"HTTP/1.0."
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "Hej, neočakávaj priveľa od URN na %T :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr "Ako nájsť tieto nastavenia vo vašom prehliadači:"
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr "Chyba protokoly ICAP."
@@ -281,6 +302,11 @@ msgstr "Chybný znak v názve serveru; podčiarovník nie je povolený."
 msgid "Illegal double-escape in the URL-Path"
 msgstr "Chybná dvojitá úniková klauzula v URL-Path"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr "V poli HTTP proxy napíšte názov proxy %h a port 3128."
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "Neplatný URL"
@@ -354,6 +380,14 @@ msgstr "Čas vypršal pri čítaní"
 msgid "Request is too large."
 msgstr "Požiadavka je príliš dlhá."
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr "Vyberte Automaticky zistiť nastavenia"
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr "Vyberte Automatická konfigurácia proxy"
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Chyba socketu"
@@ -473,9 +507,10 @@ msgstr ""
 "Pri pokuse o získanie URN sa vyskytla nasledovná chyba: <a href=\"%U\">%U</a>"
 
 #: 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 ""
-"Vzdialený server alebo sieť sú nedostupné. Prosím, opakujte svoju požiadavku."
+"Vzdialený server alebo sieť môžu byť nedostupné. Prosím, opakujte svoju "
+"požiadavku."
 
 #: templates/ERR_TOO_BIG:5
 msgid "The request or reply is too large."
@@ -512,19 +547,19 @@ msgstr "Systém odpovedal: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
-"Tento cache server nemá nastavenú žiadnu WAIS Relay! Kričte na svojho "
+"Tento cache server nemá nastavený žiadny WAIS Relay server! Kričte na svojho "
 "správcu."
 
 #: templates/ERR_TOO_BIG:8
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
-"Tieto obmedzenia zaviedol poskytovateľ služby tohto cache servera. Prosím, "
+"Tieto obmedzenia zaviedol poskytovateľ tohto cache servera. Prosím, "
 "kontaktujte ho priamo ak máte pocit, že to je chyba."
 
 #: templates/ERR_UNSUP_HTTPVERSION:6
@@ -538,19 +573,20 @@ msgstr "Tento cache server nepodporuje protokol FTP."
 #: templates/ERR_SHUTTING_DOWN:5
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
-"Táto cache sa práve vypína a nemôže spracovať vašu požiadavku. Opakujte "
-"prosím svoju požiadavku o chvíľu."
+"Táto cache sa práve vypína a nemôže spracovať vašu požiadavku. Prosím, "
+"zopakujte svoju požiadavku o chvíľu."
 
 #: templates/ERR_FORWARDING_DENIED:6
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
-"Tento server nepresmeruje vašu požiadavku, pretože mu to nedovoľujú vzťahy v "
-"hierarchii cache serverov. Cache server %i je možno zle nakonfigurovaný."
+"Tento server nepresmeruje vašu požiadavku, pretože sa pokúša o vynútenie "
+"vzťahu súrodenec. Možno je klient na %i cache server, ktorý bol zle "
+"nakonfigurovaný."
 
 #: templates/ERR_ICAP_FAILURE:7
 msgid "This means that some aspect of the ICAP communication failed."
@@ -583,11 +619,11 @@ msgstr ""
 #: templates/ERR_FTP_NOT_FOUND:7
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "To môže byť spôsobené uvedením absolútnej cesty v FTP URL (čo odporuje RFC "
-"1738). V tomto prípade by ste súbor mohli nájsť na <a href=\"%B\">%B</a>."
+"1738). V tom prípade by ste súbor mohli nájsť na <a href=\"%B\">%B</a>."
 
 #: templates/ERR_SECURE_CONNECT_FAIL:7
 msgid ""
@@ -604,15 +640,35 @@ msgstr ""
 #: templates/ERR_CANNOT_FORWARD:6
 msgid ""
 "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."
+"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."
 msgstr ""
 "Požiadavku nemožno presmerovať k pôvodnému serveru alebo nadradeným cache "
 "serverom. Príčinou môže byť, že správca cache servera nedovolil tomuto cache "
 "serveru priamy prístup k pôvodným serverom a všetky nadradené cache servery "
 "sú práve nedostupné."
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+"Nástroje -&gt; Možnosti internetu -&gt; Pripojenie -&gt; Nastavenia LAN -"
+"&gt; Proxy"
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+"Nástroje -&gt; Možnosti -&gt; Rozšírené -&gt; Sieť -&gt; Nastavenie "
+"pripojenia"
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+"Nástroje -&gt; Nastavenia -&gt; Rozšírené -&gt; Sieť -&gt; Proxy servery"
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr "Nie je možné previesť názov počítača na IP adresu <q>%H</q>"
@@ -637,9 +693,10 @@ msgstr ""
 "Vami požadovaný dokument sa nenachádza v cache, a bola uvedená direktíva "
 "<q>only-if-cached</q>."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr "Pri pokuse o operáciu PUT na nasledovný URL: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr "Konfigurácia webového prehliadača"
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -656,7 +713,15 @@ msgstr ""
 "tento dokument vyžaduje aktualizáciu pričom toto je direktívou <q>only-if-"
 "cached</q> obmedzené."
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+"Aby ste mohli používať túto sieť, musíte upraviť konfiguráciu vášho webového "
+"prehliadača."
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -688,3 +753,12 @@ msgstr "Váš webmaster je <a href=\"mailto:%w\">%w</a>."
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "Odpoveď s nulovou veľkosťou"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "CHYBA: Požadované URN nebolo možné získať"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "operácia FTP PUT úspešná: Súbor aktualizovaný"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr "Pri pokuse o operáciu PUT na nasledovný URL: <a href=\"%U\">%U</a>"
diff --git a/errors/sr-cyrl.po b/errors/sr-cyrl.po
index 02f7f5a1a9..a57f96ba17 100644
--- a/errors/sr-cyrl.po
+++ b/errors/sr-cyrl.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:05+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,8 +30,8 @@ msgstr ""
 
 #: templates/ERR_READ_TIMEOUT:7
 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."
+"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 ""
 
 #: templates/ERR_URN_RESOLVE:3
@@ -44,7 +45,7 @@ msgstr ""
 #: templates/ERR_ACCESS_DENIED:6
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 
@@ -54,7 +55,7 @@ msgid ""
 "href=\"%U\">%U</a>"
 msgstr ""
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -66,13 +67,13 @@ msgstr ""
 
 #: templates/ERR_READ_ERROR:7
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 
 #: templates/ERR_WRITE_ERROR:7
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 
@@ -117,7 +118,8 @@ msgstr ""
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -166,23 +168,19 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
+msgid "ERROR: The requested URN could not be retrieved"
 msgstr ""
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
-msgstr ""
-
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+msgid "FTP PUT Successful."
 msgstr ""
 
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+msgid "FTP PUT upload failed"
 msgstr ""
 
 #: templates/ERR_FTP_DISABLED:5
@@ -201,11 +199,24 @@ msgstr ""
 msgid "File updated"
 msgstr ""
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -227,13 +238,18 @@ msgid "Generated %T by %h (%s)"
 msgstr ""
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr ""
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr ""
@@ -258,6 +274,11 @@ msgstr ""
 msgid "Illegal double-escape in the URL-Path"
 msgstr ""
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr ""
@@ -322,6 +343,14 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr ""
@@ -425,7 +454,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
@@ -463,14 +492,14 @@ msgstr ""
 
 #: templates/ERR_NO_RELAY:6
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 
 #: templates/ERR_TOO_BIG:8
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 
@@ -485,13 +514,13 @@ msgstr ""
 #: templates/ERR_SHUTTING_DOWN:5
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 
 #: templates/ERR_FORWARDING_DENIED:6
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 
@@ -520,7 +549,7 @@ msgstr ""
 #: templates/ERR_FTP_NOT_FOUND:7
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 
@@ -535,9 +564,24 @@ msgstr ""
 #: templates/ERR_CANNOT_FORWARD:6
 msgid ""
 "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."
+"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."
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
 msgstr ""
 
 #: templates/ERR_DNS_FAIL:5
@@ -562,8 +606,9 @@ msgid ""
 "directive was specified."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
 msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
@@ -577,7 +622,13 @@ msgid ""
 "revalidation prohibited by the <q>only-if-cached</q> directive."
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
diff --git a/errors/sr-latn.po b/errors/sr-latn.po
index 531c8a0342..b76b4f2021 100644
--- a/errors/sr-latn.po
+++ b/errors/sr-latn.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2010-03-08 23:50+0200\n"
 "Last-Translator: Bratislav <batailic@gmail.com>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
@@ -10,8 +10,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.0.1\n"
 
 #: templates/ERR_DIR_LISTING:6
@@ -33,9 +33,10 @@ msgid ""
 msgstr "<b>Neispravan odgovor</b> greška prilikom obrade vašeg zahteva:"
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "Zastoj prilikom čitanja podataka sa mreže.  Mreža ili server su možda "
 "preopterećeni ili nedostupni.  Molimo pokušajte ponovo."
@@ -49,9 +50,10 @@ msgid "Access Denied."
 msgstr "Pristup nije dozvoljen."
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "Sistem je konfigurisan tako da vam u ovom trenutku pristup nije dozvoljen.  "
@@ -63,29 +65,33 @@ msgid ""
 "An FTP authentication failure occurred while trying to retrieve the URL: <a "
 "href=\"%U\">%U</a>"
 msgstr ""
-"Nije uspela FTP autentifikacija prilikom učitavanja adrese (URL): <a href=\"%"
-"U\">%U</a>."
+"Nije uspela FTP autentifikacija prilikom učitavanja adrese (URL): <a href="
+"\"%U\">%U</a>."
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
 msgstr ""
-"Greška u FTP protokolu prilikom učitavanja adrese (URL): <a href=\"%U\">%U</a>"
+"Greška u FTP protokolu prilikom učitavanja adrese (URL): <a href=\"%U\">%U</"
+"a>"
 
 #: templates/ERR_ICAP_FAILURE:10
 msgid "An Illegal response was received from the ICAP server."
 msgstr "Neispravan odgovor ICAP servera."
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
-msgstr "Greška prilikom učitavanja podataka sa mreže.  Molimo pokušajte ponovo."
+msgstr ""
+"Greška prilikom učitavanja podataka sa mreže.  Molimo pokušajte ponovo."
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 "Desila se greška prilikom upisa podataka ka mreži. Molimo pokušajte ponovo."
@@ -131,7 +137,8 @@ msgstr "Direktorijum %U"
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr "Direktorijum: <a href=\"%U\">%U</a>/"
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -180,23 +187,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "GREŠKA: Tražena adresa (URL) ne može da se učita"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "GREŠKA: Tražena podatak (URN) ne može da se učita"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "GREŠKA: Tražena adresa (URL) ne može da se učita"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr "ESI obrada nije uspela."
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "FTP PUT uspešan: Fajl je kreiran"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "FTP PUT uspešan: Fajl je osvežen"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "FTP PUT/upis nije uspeo"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -215,11 +221,24 @@ msgstr "Fajl je kreiran"
 msgid "File updated"
 msgstr "Fajl je osvežen"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Prosleđivanje nije dozvoljeno."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -241,13 +260,19 @@ msgid "Generated %T by %h (%s)"
 msgstr "Generisano %T sa %h (%s)"
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+#, fuzzy
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr "HTTP/1.1 Zahtev: funkcija je tražena od HTTP/1.0 softvera."
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "Hej, ne očekuj previše od URN-a na %T :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr "Greška u ICAP protokolu."
@@ -275,6 +300,11 @@ msgstr ""
 msgid "Illegal double-escape in the URL-Path"
 msgstr "Nedozvoljene dvostruke \"escape\" sekvence u URL putanji"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "Neispravna adresa (URL)"
@@ -319,9 +349,9 @@ msgid ""
 "have difficulties authenticating yourself or <a href=\"http://%h/cgi-bin/"
 "chpasswd.cgi\">change</a> your default password."
 msgstr ""
-"Molimo kontaktirajte <a href=\"mailto:%w%W\">keš administratora</a> ako imate "
-"problema sa autentifikacijom ili <a href=\"http://%h/cgi-"
-"bin/chpasswd.cgi\">promenite</a> vašu šifru."
+"Molimo kontaktirajte <a href=\"mailto:%w%W\">keš administratora</a> ako "
+"imate problema sa autentifikacijom ili <a href=\"http://%h/cgi-bin/chpasswd."
+"cgi\">promenite</a> vašu šifru."
 
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:7
 msgid ""
@@ -347,6 +377,14 @@ msgstr "Zastoj čitanja"
 msgid "Request is too large."
 msgstr "Zahtev je prevelik."
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Greška prilikom uspostavljanja konekcije (Socket)"
@@ -421,8 +459,8 @@ msgstr "ESI procesor je vratio:"
 #: templates/ERR_FTP_UNAVAILABLE:4
 msgid "The FTP server was too busy to retrieve the URL: <a href=\"%U\">%U</a>"
 msgstr ""
-"FTP server je bio preopterećen prilikom učitavanja adrese (URL): <a href=\"%"
-"U\">%U</a>"
+"FTP server je bio preopterećen prilikom učitavanja adrese (URL): <a href=\"%U"
+"\">%U</a>"
 
 #: templates/ERR_INVALID_RESP:5
 msgid ""
@@ -464,7 +502,8 @@ msgid ""
 msgstr "Greška učitavanja podataka (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."
+#, fuzzy
+msgid "The remote host or network may be down. Please try the request again."
 msgstr "Udaljeni računar ili mreža nisu dostupni.  Molimo pokušajte ponovo."
 
 #: templates/ERR_TOO_BIG:5
@@ -501,17 +540,19 @@ msgid "The system returned: <i>%E</i>"
 msgstr "Odgovor sistema je: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
+#, fuzzy
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 "Za ovaj proksi server nije definisan WAIS server!  Kritikujte vašeg "
 "administratora."
 
 #: templates/ERR_TOO_BIG:8
+#, fuzzy
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 "Ove limite postavio je intenet servis provajder koji upravlja ovim proksi "
@@ -527,17 +568,19 @@ msgid "This cache does not support FTP."
 msgstr "Ovaj proksi server ne podržava FTP."
 
 #: templates/ERR_SHUTTING_DOWN:5
+#, fuzzy
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "Ovaj proksi server je u procesu isključivanja i ne može da izvrši vaš zahtev "
 "u ovom trenutku.  Molimo pokušajte ponovo uskoro."
 
 #: templates/ERR_FORWARDING_DENIED:6
+#, fuzzy
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "Ovaj proksi server neæe da prosledi vaš zahtev zato što pokušava da poštuje "
@@ -573,9 +616,10 @@ msgstr ""
 "webmastera o ovoj grešci."
 
 #: templates/ERR_FTP_NOT_FOUND:7
+#, fuzzy
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "To može da bude prouzrokovano time što je FTP adresa (URL) sa apsolutnom "
@@ -598,15 +642,30 @@ msgstr ""
 #, fuzzy
 msgid ""
 "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."
+"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."
 msgstr ""
 "Ovaj zahtev nije mogao da bude prosleðen izvonom serveru niti bilo kom "
 "nadreðenom proxy serveru. Najverovatniji uzrok ove greške je da keš "
 "administrator ne dozvoljava da ovaj proksi server direktno pristupi izvonom "
 "serveru,  svi konfigurisani nadreðeni proksi serveri su trenutno nedostupni."
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr "Nije moguæe odrediti IP adresu iz imena raèunara za <q>%H</q>"
@@ -631,11 +690,10 @@ msgstr ""
 "U kešu nije naðen validan dokument a specificirane je direktiva <q>only-if-"
 "cached</q>."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
 msgstr ""
-"Tokom pokušaja da se prenese (PUT) strana sa sledeæom adresom (URL): <a href="
-"\"%U\">%U</a>"
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -651,7 +709,13 @@ msgstr ""
 "nije naðen u proksi arhivi, <em>ili</em> se zahteva revalidacija kojaje "
 "zabranjena direktivom <q>only-if-cached</q>."
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -684,3 +748,14 @@ msgstr "Vaš webmaster je <a href=\"mailto:%w\">%w</a>."
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "Odgovor nulte dužine"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "GREŠKA: Tražena podatak (URN) ne može da se učita"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTP PUT uspešan: Fajl je osvežen"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr ""
+#~ "Tokom pokušaja da se prenese (PUT) strana sa sledeæom adresom (URL): <a "
+#~ "href=\"%U\">%U</a>"
diff --git a/errors/sv.po b/errors/sv.po
index 7daa7bcd66..8c0f0ca57b 100644
--- a/errors/sv.po
+++ b/errors/sv.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2010-02-10 23:51+0000\n"
 "Last-Translator: Henrik Nordström <henrik@henriknordstrom.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,9 +33,10 @@ msgstr ""
 "rfr&aring;gan skulle behandlas:"
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "En timeout intr&auml;ffade i v&auml;ntan p&aring; att f&aring; l&auml;sa "
 "data fr&aring;n n&auml;tverket.  Antingen &auml;r servern nere eller "
@@ -50,9 +52,10 @@ msgid "Access Denied."
 msgstr "Tilltr&auml;de Nekas."
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "Tilltr&auml;deskontrollen f&ouml;rhindrar Er beg&auml;ran fr&aring;n att "
@@ -67,7 +70,7 @@ msgstr ""
 "Ett misslyckande vid FTP autentifiering intr&auml;ffade vid f&ouml;rs&ouml;"
 "ket att h&auml;mta URL: <a href=\"%U\">%U</a>"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -80,16 +83,18 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr "Svaret fr&aring;n ICAP servern &auml;r ogiltigt och kan inte tolkas."
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 "Ett fel intr&auml;ffade vid f&ouml;rs&ouml;k att l&auml;sa data fr&aring;n "
 "n&auml;tverket.  V&auml;nligen f&ouml;rs&ouml;k igen."
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 "Ett fel intr&auml;ffade vid f&ouml;rs&ouml;k att skriva till n&auml;"
@@ -136,7 +141,8 @@ msgstr "Katalog: %U"
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr "Katalog: <a href=\"%U\">%U</a>/"
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -185,23 +191,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "FEL: Beg&auml;rd URL kunde inte h&auml;mtas"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "FEL: Beg&auml;rd URN kunde inte h&auml;mtas"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "FEL: Beg&auml;rd URL kunde inte h&auml;mtas"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr "ESI bearbetning misslyckades."
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "FTP PUT lyckades: Filen Skapades"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "FTP PUT Lyckades: Fil Uppdaterad"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "FTP PUT/uppladdning misslyckades"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -220,11 +225,24 @@ msgstr "Filein skapades"
 msgid "File updated"
 msgstr "Filen uppdaterades"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Vidarebefodran Nekad."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -246,7 +264,8 @@ msgid "Generated %T by %h (%s)"
 msgstr "Skapad %T av %h (%s)"
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
@@ -255,6 +274,10 @@ msgstr ""
 "Men hall&aring;, f&ouml;rv&auml;nta dig inte f&ouml;r mycket fr&aring;n en "
 "URNs p&aring; %T :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr "ICAP protokollfel."
@@ -285,6 +308,11 @@ msgstr ""
 msgid "Illegal double-escape in the URL-Path"
 msgstr "Ej till&aring;ten dubbel-escape i URL-S&ouml;kv&auml;gen"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "Felaktig URL"
@@ -359,6 +387,14 @@ msgstr "L&auml;sningen fick en timeout"
 msgid "Request is too large."
 msgstr "F&ouml;rfr&aring;gan &auml;r f&ouml;r stor."
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Socket Fel"
@@ -483,7 +519,8 @@ msgstr ""
 "\"%U\">%U</a>"
 
 #: templates/ERR_CONNECT_FAIL:7
-msgid "The remote host or network may be down.  Please try the request again."
+#, fuzzy
+msgid "The remote host or network may be down. Please try the request again."
 msgstr ""
 "Beg&auml;rd v&auml;rd eller n&auml;tverk kan vara nere.  V&auml;nligen "
 "f&ouml;rs&ouml;k igen."
@@ -522,17 +559,19 @@ msgid "The system returned: <i>%E</i>"
 msgstr "Systemet returnerade: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
+#, fuzzy
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 "Det finns ingen WAIS Relay v&auml;rd definerad f&ouml;r denna cache!  Skrik "
 "p&aring; din administrat&ouml;r."
 
 #: templates/ERR_TOO_BIG:8
+#, fuzzy
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 "Dessa gr&auml;nser &auml;r inst&auml;llda av den Internet Leverant&ouml;r "
@@ -548,18 +587,20 @@ msgid "This cache does not support FTP."
 msgstr "Denna cache st&ouml;djer inte FTP."
 
 #: templates/ERR_SHUTTING_DOWN:5
+#, fuzzy
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "Denna cache h&aring;ller p&aring; att st&auml;nga av sig och kan d&auml;"
 "rf&ouml;r inte behandla din f&ouml;rfr&aring;gan.  V&auml;nligen f&ouml;"
 "rs&ouml;k igen lite senare."
 
 #: templates/ERR_FORWARDING_DENIED:6
+#, fuzzy
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "Denna cache kommer inte vidarebefodra en beg&auml;ran eftersom den f&ouml;"
@@ -596,9 +637,10 @@ msgstr ""
 "nligen kontakta den ansvariga f&ouml;r webbservern ifr&aring;ga."
 
 #: templates/ERR_FTP_NOT_FOUND:7
+#, fuzzy
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "Detta kan orsakas av en FTP URL med en absolut s&ouml;kv&auml;g (vilket inte "
@@ -619,11 +661,12 @@ msgstr ""
 "de s&auml;kerhets alternativ eller certifikat som presenterades av servern."
 
 #: templates/ERR_CANNOT_FORWARD:6
+#, fuzzy
 msgid ""
 "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."
+"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."
 msgstr ""
 "Denna f&ouml;rfr&aring;gan kunde ej vidarebefodras till ursprunglig server "
 "eller till &ouml;verliggande cache-noder.  Den mest sannolika anledningen "
@@ -631,6 +674,21 @@ msgstr ""
 "att g&ouml;ra direkta anslutningar till ursprungliga servrar, och alla &ouml;"
 "verliggande cache-noder kan ej n&aring;s f&ouml;r tillf&auml;llet."
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr ""
@@ -656,11 +714,10 @@ msgstr ""
 "Senaste dokumentet &aring;terfanns inte i cachen och <q>only-if-cached</q> "
 "direktivet &auml;r satt."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
 msgstr ""
-"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"
@@ -677,7 +734,13 @@ msgstr ""
 "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_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -712,3 +775,14 @@ msgstr ""
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "Storleken p&aring; svaret var lika med noll"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "FEL: Beg&auml;rd URN kunde inte h&auml;mtas"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTP PUT Lyckades: Fil Uppdaterad"
+
+#~ 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>"
diff --git a/errors/templates/ERR_ACCESS_DENIED b/errors/templates/ERR_ACCESS_DENIED
index c694a9d8e6..0198ed8ddb 100644
--- a/errors/templates/ERR_ACCESS_DENIED
+++ b/errors/templates/ERR_ACCESS_DENIED
@@ -23,7 +23,7 @@ body
 <p><b>Access Denied.</b></p>
 </blockquote>
 
-<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>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>
diff --git a/errors/templates/ERR_CANNOT_FORWARD b/errors/templates/ERR_CANNOT_FORWARD
index 57e64c130f..74a8ecd9b7 100644
--- a/errors/templates/ERR_CANNOT_FORWARD
+++ b/errors/templates/ERR_CANNOT_FORWARD
@@ -24,7 +24,7 @@ body
 <p><b>Unable to forward this request at this time.</b></p>
 </blockquote>
 
-<p>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.</p>
+<p>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.</p>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
 
diff --git a/errors/templates/ERR_CONNECT_FAIL b/errors/templates/ERR_CONNECT_FAIL
index 87972329e4..076244deac 100644
--- a/errors/templates/ERR_CONNECT_FAIL
+++ b/errors/templates/ERR_CONNECT_FAIL
@@ -25,7 +25,7 @@ body
 
 <p id="sysmsg">The system returned: <i>%E</i></p>
 
-<p>The remote host or network may be down.  Please try the request again.</p>
+<p>The remote host or network may be down. Please try the request again.</p>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
 
diff --git a/errors/templates/ERR_DIR_LISTING b/errors/templates/ERR_DIR_LISTING
index f20313d52f..c1fa488f9d 100644
--- a/errors/templates/ERR_DIR_LISTING
+++ b/errors/templates/ERR_DIR_LISTING
@@ -2,7 +2,7 @@
 <html><head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>Directory: %U</title>
-<style type="text/css"><!-- 
+<style type="text/css"><!--
  %l
 
 body
@@ -16,10 +16,10 @@ body
 <hr>
 
 <div id="content">
-<p>Directory Content:</p>
+<h4>Directory Content:</h4>
 
 <blockquote id="data">
-<pre>%z</pre>
+<pre id="dirmsg">%z</pre>
 </blockquote>
 
 <table id="dirlisting" summary="Directory Listing">
diff --git a/errors/templates/ERR_FORWARDING_DENIED b/errors/templates/ERR_FORWARDING_DENIED
index 4e449c815b..1cdf3dd946 100644
--- a/errors/templates/ERR_FORWARDING_DENIED
+++ b/errors/templates/ERR_FORWARDING_DENIED
@@ -23,7 +23,7 @@ body
 <p><b>Forwarding Denied.</b></p>
 </blockquote>
 
-<p>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.</p>
+<p>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.</p>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
 
diff --git a/errors/templates/ERR_FTP_NOT_FOUND b/errors/templates/ERR_FTP_NOT_FOUND
index 7e44f5f37b..d847c5ff3a 100644
--- a/errors/templates/ERR_FTP_NOT_FOUND
+++ b/errors/templates/ERR_FTP_NOT_FOUND
@@ -30,7 +30,7 @@ body
 <pre>%g</pre>
 </blockquote>
 
-<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>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>
diff --git a/errors/templates/ERR_FTP_PUT_CREATED b/errors/templates/ERR_FTP_PUT_CREATED
index 13a01fccfb..6434247f72 100644
--- a/errors/templates/ERR_FTP_PUT_CREATED
+++ b/errors/templates/ERR_FTP_PUT_CREATED
@@ -1,7 +1,7 @@
 <!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=utf-8">
-<title>FTP PUT Successful: File Created</title>
+<title>FTP PUT Successful.</title>
 <style type="text/css"><!-- 
  %l
 
diff --git a/errors/templates/ERR_FTP_PUT_ERROR b/errors/templates/ERR_FTP_PUT_ERROR
index 01b838deac..f6a9da065d 100644
--- a/errors/templates/ERR_FTP_PUT_ERROR
+++ b/errors/templates/ERR_FTP_PUT_ERROR
@@ -12,12 +12,12 @@ body
 </head><body>
 <div id="titles">
 <h1>ERROR</h1>
-<h2>FTP PUT/upload failed</h2>
+<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>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>
 <blockquote id="data">
diff --git a/errors/templates/ERR_FTP_PUT_MODIFIED b/errors/templates/ERR_FTP_PUT_MODIFIED
index 605d67b388..589395e4db 100644
--- a/errors/templates/ERR_FTP_PUT_MODIFIED
+++ b/errors/templates/ERR_FTP_PUT_MODIFIED
@@ -1,7 +1,7 @@
 <!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=utf-8">
-<title>FTP PUT Successful: File Updated</title>
+<title>FTP PUT Successful.</title>
 <style type="text/css"><!-- 
  %l
 
diff --git a/errors/templates/ERR_INVALID_REQ b/errors/templates/ERR_INVALID_REQ
index 287876dd01..7ec7e9179b 100644
--- a/errors/templates/ERR_INVALID_REQ
+++ b/errors/templates/ERR_INVALID_REQ
@@ -31,7 +31,7 @@ body
 <li><p>Request is too large.</p></li>
 <li><p>Content-Length missing for POST or PUT requests.</p></li>
 <li><p>Illegal character in hostname; underscores are not allowed.</p></li>
-<li><p>HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.</p></li>
+<li><p>HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software.</p></li>
 </ul>
 
 <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p>
diff --git a/errors/templates/ERR_NO_RELAY b/errors/templates/ERR_NO_RELAY
index 0acae34b09..8a4f2dc642 100644
--- a/errors/templates/ERR_NO_RELAY
+++ b/errors/templates/ERR_NO_RELAY
@@ -23,7 +23,7 @@ body
 <p><b>No Wais Relay</b></p>
 </blockquote>
 
-<p>There is no WAIS Relay host defined for this Cache!  Yell at the administrator.</p>
+<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>
diff --git a/errors/templates/ERR_READ_ERROR b/errors/templates/ERR_READ_ERROR
index d16d476e3a..38f8f80617 100644
--- a/errors/templates/ERR_READ_ERROR
+++ b/errors/templates/ERR_READ_ERROR
@@ -25,7 +25,7 @@ body
 
 <p id="sysmsg">The system returned: <i>%E</i></p>
 
-<p>An error condition occurred while reading data from the network.  Please retry your request.</p>
+<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>
diff --git a/errors/templates/ERR_READ_TIMEOUT b/errors/templates/ERR_READ_TIMEOUT
index 1c8d29b4d2..f8654827fa 100644
--- a/errors/templates/ERR_READ_TIMEOUT
+++ b/errors/templates/ERR_READ_TIMEOUT
@@ -25,7 +25,7 @@ body
 
 <p id="sysmsg">The system returned: <i>%E</i></p>
 
-<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>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>
diff --git a/errors/templates/ERR_SHUTTING_DOWN b/errors/templates/ERR_SHUTTING_DOWN
index 2125f95165..cd3d435c2d 100644
--- a/errors/templates/ERR_SHUTTING_DOWN
+++ b/errors/templates/ERR_SHUTTING_DOWN
@@ -19,7 +19,7 @@ body
 <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>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>
diff --git a/errors/templates/ERR_TOO_BIG b/errors/templates/ERR_TOO_BIG
index 15ddfbce03..431cb05b66 100644
--- a/errors/templates/ERR_TOO_BIG
+++ b/errors/templates/ERR_TOO_BIG
@@ -25,7 +25,7 @@ body
 
 <p>If you are making a POST or PUT request, then the item you are trying to upload is too large.</p>
 <p>If you are making a GET request, then the item you are trying to download is too large.</p>
-<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>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>
diff --git a/errors/templates/ERR_URN_RESOLVE b/errors/templates/ERR_URN_RESOLVE
index 654c6a54bc..4b93dfb45d 100644
--- a/errors/templates/ERR_URN_RESOLVE
+++ b/errors/templates/ERR_URN_RESOLVE
@@ -1,7 +1,7 @@
 <!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=utf-8">
-<title>ERROR: The requested URN not be retrieved</title>
+<title>ERROR: The requested URN could not be retrieved</title>
 <style type="text/css"><!-- 
  %l
 
diff --git a/errors/templates/ERR_WRITE_ERROR b/errors/templates/ERR_WRITE_ERROR
index 71d1af6971..62f274671f 100644
--- a/errors/templates/ERR_WRITE_ERROR
+++ b/errors/templates/ERR_WRITE_ERROR
@@ -25,7 +25,7 @@ body
 
 <p id="sysmsg">The system returned: <i>%E</i></p>
 
-<p>An error condition occurred while writing to the network.  Please retry your request.</p>
+<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>
diff --git a/errors/th.po b/errors/th.po
index 2f35bed6a6..c9a40f0520 100644
--- a/errors/th.po
+++ b/errors/th.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2009-06-11 06:25+0000\n"
 "Last-Translator: Anon Sricharoenchai <Unknown>\n"
 "Language-Team: Thai <th@li.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,10 +35,11 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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 ""
+"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 "มีภาวะข้อผิดผลาดระหว่างที่กำลังรับข้อมูลจากระบบเครือข่าย.  กรุณาเรียกดูใหม่อีกครั้ง."
 
 #: templates/ERR_URN_RESOLVE:3
 msgid "A URL for the requested URN could not be retrieved"
@@ -50,7 +52,7 @@ msgstr ""
 #: templates/ERR_ACCESS_DENIED:6
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 
@@ -60,7 +62,7 @@ msgid ""
 "href=\"%U\">%U</a>"
 msgstr ""
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -71,14 +73,16 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr ""
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr "มีภาวะข้อผิดผลาดระหว่างที่กำลังรับข้อมูลจากระบบเครือข่าย.  กรุณาเรียกดูใหม่อีกครั้ง."
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr "มีภาวะข้อผิดผลาดระหว่างที่กำลังส่งข้อมูลไปยังระบบเครือข่าย.  กรุณาเรียกดูใหม่อีกครั้ง."
 
@@ -123,7 +127,8 @@ msgstr ""
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -172,23 +177,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "ERROR: ไม่สามารถเรียกดู URN ที่ได้รับการร้องขอ"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr "การประมวลผล ESI ไม่สำเร็จ"
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "FTP PUT เสร็จสมบูรณ์: มีไฟล์ใหม่ถูกสร้างขึ้น"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "FTP PUT เสร็จสมบูรณ์: ไฟล์ถูกแทนที่ด้วยไฟล์ใหม่"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "FTP PUT/upload (ส่งไฟล์ขึ้น) ไม่สำเร็จ"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -207,11 +211,24 @@ msgstr "ไฟล์ใหม่ถูกสร้างขึ้น"
 msgid "File updated"
 msgstr "ไฟล์ถูกแทนที่ด้วยไฟล์ใหม่"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "การส่งต่อ (forwarding) ไม่ได้รับอนุญาต"
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -233,13 +250,18 @@ msgid "Generated %T by %h (%s)"
 msgstr ""
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "เฮ้, อย่าคาดหวังจาก URN บน %T มากเกินไปนัก :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr "เกิดความผิดพลาดในโปรโตคอล ICAP"
@@ -264,6 +286,11 @@ msgstr ""
 msgid "Illegal double-escape in the URL-Path"
 msgstr ""
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "URL ผิดรูปแบบ (invalid)"
@@ -330,6 +357,14 @@ msgstr "การรอรับข้อมูลเกินเวลาที
 msgid "Request is too large."
 msgstr "คำสั่งหรือคำร้อง (request) ที่ส่ง มีขนาดใหญ่เกินไป"
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "เกิดการล้มเหลวใน socket"
@@ -433,7 +468,7 @@ msgid ""
 msgstr "พบความผิดพลาดดังต่อไปนี้ระหว่างที่พยายามเรียกดู 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."
+msgid "The remote host or network may be down. Please try the request again."
 msgstr ""
 
 #: templates/ERR_TOO_BIG:5
@@ -471,14 +506,14 @@ msgstr "ระบบส่งค่าคืนดังนี้: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 
 #: templates/ERR_TOO_BIG:8
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 
@@ -491,9 +526,10 @@ msgid "This cache does not support FTP."
 msgstr "ระบบแคชนี้ไม่รองรับ FTP"
 
 #: templates/ERR_SHUTTING_DOWN:5
+#, fuzzy
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "ระบบแคชนี้กำลังเข้าสู่กระบวนการปิดระบบ และไม่สามารถให้บริการตามคำขอที่คุณเรียกใช้มา "
 "ในขณะนี้.  กรุณาเรียกใช้มาใหม่อีกครั้งในภายหลัง"
@@ -501,7 +537,7 @@ msgstr ""
 #: templates/ERR_FORWARDING_DENIED:6
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 
@@ -530,7 +566,7 @@ msgstr ""
 #: templates/ERR_FTP_NOT_FOUND:7
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 
@@ -545,9 +581,24 @@ msgstr ""
 #: templates/ERR_CANNOT_FORWARD:6
 msgid ""
 "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."
+"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."
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
 msgstr ""
 
 #: templates/ERR_DNS_FAIL:5
@@ -572,9 +623,10 @@ msgid ""
 "directive was specified."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr "ระหว่างที่พยายาม PUT URL ต่อไปนี้: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -587,7 +639,13 @@ msgid ""
 "revalidation prohibited by the <q>only-if-cached</q> directive."
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -617,3 +675,12 @@ msgstr "ผู้ดูแลเว็บของคุณคือ <a href=\"m
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "สิ่งที่ตอบกลับมา ว่างเปล่า"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "ERROR: ไม่สามารถเรียกดู URN ที่ได้รับการร้องขอ"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTP PUT เสร็จสมบูรณ์: ไฟล์ถูกแทนที่ด้วยไฟล์ใหม่"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr "ระหว่างที่พยายาม PUT URL ต่อไปนี้: <a href=\"%U\">%U</a>"
diff --git a/errors/tr.po b/errors/tr.po
index bad641cf8c..8107101c67 100644
--- a/errors/tr.po
+++ b/errors/tr.po
@@ -2,16 +2,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2010-01-10 15:46+0000\n"
 "Last-Translator: Hüseyin Sevgi <hsevgi@msn.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2010-01-16 02:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-"Language: tr\n"
 
 #: templates/ERR_DIR_LISTING:6
 msgid "<a href=\"../\">Parent Directory</a> (<a href=\"/\">Root Directory</a>)"
@@ -30,9 +30,10 @@ msgid ""
 msgstr "<b>Geçersiz Yanıt</b> İşlem sırasında bir hata ile karşılaşıldı:"
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "İstemiş olduğunuz bilgileri ağdan okuma sırasında okuma zamanı doldu. Hedef "
 "sunucu kapalı veya çok meşgul olabilir. Lütfen isteğinizi tekrar giriniz."
@@ -46,9 +47,10 @@ msgid "Access Denied."
 msgstr "Erişim Yasak."
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "Erişim kontrol mekanizması istediğiniz bilgilere ulaşmanızı yasaklıyor. "
@@ -63,7 +65,7 @@ msgstr ""
 "URL: <a href=\"%U\">%U</a> adresine erişilirken bir FTP onay hatası meydana "
 "geldi."
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -76,16 +78,18 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr "ICAP sunucusundan yasadışı bir yanıt alınmıştır."
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 "Ağdan bilgileri okuma sırasında hata oluştu. Lütfen isteğinizi tekrar "
 "giriniz."
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 "Bilgiler ağ üzerine gönderilirken hata oluştu. Lütfen isteğinizi tekrar "
@@ -132,7 +136,8 @@ msgstr "Dizin: %U"
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr "Dizin: <a href=\"%U\">%U</a>/"
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -181,23 +186,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "HATA: İstenilen URL'e ulaşılamadı"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "HATA: İstenilen URN'e ulaşılamadı"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "HATA: İstenilen URL'e ulaşılamadı"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr "ESI İşleminde hata."
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "FTP PUT Başarılı: Dosya Yaratıldı"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "FTP PUT Başarılı: Dosya güncellendi"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "FTP PUT/Gönderme hatası"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -216,11 +220,24 @@ msgstr "Dosya güncellendi."
 msgid "File updated"
 msgstr "Dosya güncellendi."
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Yönlendirme yasak."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -242,13 +259,18 @@ msgid "Generated %T by %h (%s)"
 msgstr "%h (%s) tarafından %T oluşturuldu"
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "%T de URN den fazla birsey beklemeyin. :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr "ICAP iletişim hatası."
@@ -275,6 +297,11 @@ msgstr "Adreste yanlış karakterler (alt çizgi, vs. kullanılamaz)."
 msgid "Illegal double-escape in the URL-Path"
 msgstr ""
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "Yanlış URL."
@@ -346,6 +373,14 @@ msgstr "Okuma zamanı doldu (Read Timeout)"
 msgid "Request is too large."
 msgstr "İstenilen dosya çok büyük."
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Bağlantı hatası (Socket Failure)."
@@ -460,7 +495,8 @@ msgid ""
 msgstr "URN: <a href=\"%U\">%U</a> erişilirken bir hata ile karşılaşıldı."
 
 #: templates/ERR_CONNECT_FAIL:7
-msgid "The remote host or network may be down.  Please try the request again."
+#, fuzzy
+msgid "The remote host or network may be down. Please try the request again."
 msgstr "Uzak bağlantı veya ağ bozuk olabilir. Lütfen tekrar deneyin."
 
 #: templates/ERR_TOO_BIG:5
@@ -497,17 +533,19 @@ msgid "The system returned: <i>%E</i>"
 msgstr "Sistemden gelen mesaj: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
+#, fuzzy
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 "Bu Cache Sunucuda WAIS sunucu tanımlı değil. Lütfen Cache Yöneticisi ile "
 "bağlantıya geçiniz."
 
 #: templates/ERR_TOO_BIG:8
+#, fuzzy
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 "Bu sınırlar internet servis sağlayıcınız tarafından kurulmuştur. Eğer bunun "
@@ -523,17 +561,19 @@ msgid "This cache does not support FTP."
 msgstr "Bu cache sunucu FTP desteklemiyor."
 
 #: templates/ERR_SHUTTING_DOWN:5
+#, fuzzy
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "Bu önbellik şuan kapatılıyor ve isteğinize cevap veremez. Lütfen kısa bir "
 "süre sonra tekrar deneyin."
 
 #: templates/ERR_FORWARDING_DENIED:6
+#, fuzzy
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "Bu Cache Sunucu, yapılan ayarlardan ve tanımlanan kullanıcı hakklarından "
@@ -570,7 +610,7 @@ msgstr ""
 #: templates/ERR_FTP_NOT_FOUND:7
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 
@@ -583,17 +623,33 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_CANNOT_FORWARD:6
+#, fuzzy
 msgid ""
 "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."
+"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."
 msgstr ""
 "Bu istek şu anda başka bir Cache Sunucuya veya hedef WWW Sunucuya "
 "yönlendirilemez.Bunun sebebi aşağıdakilerden herhangi biri olabilir cache "
 "yöneticisi isteklerin hedef WWW sunucuya gitmesine izin vermiyor hiç bir ana "
 "Cache Sunucuya şu anda ulaşılamıyor."
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr "<q>%H</q> isimli sunucuya ait herhangi bir IP adresi bulunamadı."
@@ -618,8 +674,9 @@ msgstr ""
 "İstediğiniz doğru doküman cache sunucusunda bulunamadı ve <q>only-if-cached</"
 "q> (sadece Cache Sunucunda bulunuyor ise) tanımlı."
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
 msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
@@ -637,7 +694,13 @@ msgstr ""
 "cache sunucusunda bulunamadı veya bu mekanizmanın izin vermediği tazeleme "
 "yapılması gerekiyor."
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -667,3 +730,9 @@ msgstr "Senin webmaster'ın <a href=\"mailto:%w\">%w</a>."
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "Sıfır Uzunlukta cevap"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "HATA: İstenilen URN'e ulaşılamadı"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTP PUT Başarılı: Dosya güncellendi"
diff --git a/errors/uk.po b/errors/uk.po
index 691326c8c7..d9a2111f7a 100644
--- a/errors/uk.po
+++ b/errors/uk.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2009-12-03 12:10+1300\n"
 "Last-Translator: Feshchuk Yuriy <swopster@meta.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 1.2.1\n"
 "X-Launchpad-Export-Date: 2008-09-25 11:56+0000\n"
 
@@ -39,9 +39,10 @@ msgid ""
 msgstr "<b>Невірна відповідь</b> виникла при обробці запиту:"
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "Перевищено час очікування при отриманні даних з мережі. Мережа або сервер не "
 "працюють чи перенавантажені. Будь-ласка, повторіть запит."
@@ -55,9 +56,10 @@ msgid "Access Denied."
 msgstr "Доступ заборонено"
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "Налаштування контролю доступу забороняє обробку Вашого запиту в даний час. "
@@ -71,7 +73,7 @@ msgid ""
 msgstr ""
 "При отриманні URL: <a href=\"%U\">%U</a> відбулася невдала FTP авторизація."
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -83,15 +85,17 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr "Отримано некоректну відповідь від сервера ICAP."
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
 "Під час читання даних з мережі сталася помилка. Будь-ласка, повторіть запит."
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
 "Під час відправлення даних в мережу виникла помилка. Будь-ласка, повторіть "
@@ -138,7 +142,8 @@ msgstr "Директорія: %U"
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr "Директорія: <a href=\"%U\">%U</a>/"
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -187,23 +192,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "ПОМИЛКА: Запитаний URL не може бути отриманий"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "ПОМИЛКА: Запитаний URN не може бути отриманий"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "ПОМИЛКА: Запитаний URL не може бути отриманий"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr "Збій опрацювання ESI інструкції"
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "FTP успішно помістив: Файл cтворено"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "FTP успішно помістив: Файл оновлено"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "Операцію PUT/Upload не виконано"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -222,11 +226,24 @@ msgstr "Файл створено"
 msgid "File updated"
 msgstr "Файл поновлено"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Пересилку заборонено"
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -248,7 +265,8 @@ msgid "Generated %T by %h (%s)"
 msgstr "Згенеровано %T на %h (%s)"
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
@@ -256,6 +274,10 @@ msgstr ""
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "Не варто очікувати надто багато від URN'ів на %T."
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr "Помилка протоколу ICAP"
@@ -284,6 +306,11 @@ msgstr "Неприпустимий символ в імені сервера; с
 msgid "Illegal double-escape in the URL-Path"
 msgstr "В шляху URL присутній зайвий символ <q>/</q>;"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "Недійсний URL"
@@ -357,6 +384,14 @@ msgstr "Час очікування на відповідь вийшов"
 msgid "Request is too large."
 msgstr "Запит завеликий"
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Помилка TCP сокету"
@@ -471,7 +506,8 @@ msgid ""
 msgstr "При отриманні 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."
+#, fuzzy
+msgid "The remote host or network may be down. Please try the request again."
 msgstr ""
 "Віддалений вузел чи мережа не відповідають.  Будь-ласка, повторіть запит."
 
@@ -509,16 +545,18 @@ msgid "The system returned: <i>%E</i>"
 msgstr "Система повідомляє: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
+#, fuzzy
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 "Для даного кешу не визначено WAIS Relay вузол. Покричіть на Адміністратора."
 
 #: templates/ERR_TOO_BIG:8
+#, fuzzy
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 "Ці ліміти встановлено Інтернет постачальником, котрий керує даним кешом. "
@@ -533,17 +571,19 @@ msgid "This cache does not support FTP."
 msgstr "FTP відключено"
 
 #: templates/ERR_SHUTTING_DOWN:5
+#, fuzzy
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "Зараз кеш в процесі припинення роботи і не може виконати Ваш запит. Будь-"
 "ласка, повторіть запит через деякий час."
 
 #: templates/ERR_FORWARDING_DENIED:6
+#, fuzzy
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "Цей кеш не перешле Ваш запит, через намагання встановити родинні "
@@ -578,9 +618,10 @@ msgstr ""
 "про цю помилку Вебмайстра."
 
 #: templates/ERR_FTP_NOT_FOUND:7
+#, fuzzy
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "Це може бути викликано FTP адресою з абсолютним URL шляхом (який не "
@@ -599,17 +640,33 @@ msgstr ""
 "безпечні з'єднання, або кеш не задоволений сертифікатом безпечності вузла."
 
 #: templates/ERR_CANNOT_FORWARD:6
+#, fuzzy
 msgid ""
 "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."
+"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."
 msgstr ""
 "Даний запит не може бути пересланий ні до первинного сервера ні до будь-"
 "якого з батьківських кешів. Найбільш ймовірною причиною є те, що "
 "Адміністратор кешу заборонив здійснювати прямі з'єднання до первинних "
 "серверів, та всі визначені батьківські кеш-сервера зараз недосяжні."
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr "Неможливо визначити IP адресу вузла: <q>%H</q>"
@@ -635,9 +692,10 @@ msgstr ""
 "Необхідний документ не знайдений в кеші і визначена директива <q>only-if-"
 "cached</q> (<q>тільки в кеші</q>)"
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr "При спробі помістити файл за адресою: <a href=\"%U\">%U</a> ."
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -655,7 +713,13 @@ msgstr ""
 "потребує оновлення, що заборонено директивою <q>only-if-cached</q> "
 "(<q>тільки в кеші</q>)."
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -687,3 +751,12 @@ msgstr "Вебмайстер <a href=\"mailto:%w\">%w</a>."
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "Відповідь нульової довжини"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "ПОМИЛКА: Запитаний URN не може бути отриманий"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTP успішно помістив: Файл оновлено"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr "При спробі помістити файл за адресою: <a href=\"%U\">%U</a> ."
diff --git a/errors/update-pot.sh b/errors/update-pot.sh
deleted file mode 100755
index 14d2e4a383..0000000000
--- a/errors/update-pot.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-#
-# Update the core errpages.pot file from the basic templates
-# Useful if any template has altered.
-#
-# To be run during maintenance from the squid errors/ directory
-#
-
-# Make sure any existing temp stuff is gone from previous updates...
-rm -rf ./pot
-rm -f errpages.pot.new
-rm errpages.pot
-
-# make a temp directory for all our workings...
-mkdir pot
-
-# Generate per-page disctionaries ...
-for f in `ls -1 ./templates/`; do
-	if test "${f}" != "generic" ; then
-		html2po -i ./templates/${f} -P --duplicates=merge -o ./pot/${f}.pot
-	fi
-done
-
-# merge and sort the per-page .pot into a single master
-msgcat ./pot/*.pot -s -o errpages.pot.new &&
-	(
-	cat errpages.pot.new | 
-	sed s/PACKAGE\ VERSION/Squid-3/ |
-	sed s/LANGUAGE\ \<LL\@li\.org\>/Squid\ Developers\ \<squid-dev\@squid-cache\.org\>/
-	) >errpages.pot
-
-## Update all existing dictionaries with the new content ...
-for f in `ls -1 ./*.po` ; do
-	echo -n "Update: ${f} ... "
-	msgmerge --verbose -s -o ${f}.new ${f} errpages.pot
-	chown --reference=${f} ${f}.new
-	mv ${f}.new ${f}
-done
-
-# cleanup.
-rm -rf pot
-rm -f errpages.pot.new
diff --git a/errors/uz.po b/errors/uz.po
index 4b39d4d304..79812acc42 100644
--- a/errors/uz.po
+++ b/errors/uz.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squid\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2009-03-14 16:45+0000\n"
 "Last-Translator: Akmal Xushvaqov <akmalxster@gmail.com>\n"
 "Language-Team: Uzbek <uz@li.org>\n"
+"Language: uz\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,9 +36,10 @@ msgid ""
 msgstr "<b>Яроқсиз жавоб</b> хатолик сўров жараёнида яратилди :"
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "Тармоқдан маълумотлар ўқиш учун кутилаётганда узилиш рўй берди. Тармоқ ёки "
 "сервер ўчирилган ёки ўчириб-ёқилган бўлиши мумкин .  Илтимос, сўровингизни "
@@ -54,7 +56,7 @@ msgstr "Рухсат берилмаган."
 #: templates/ERR_ACCESS_DENIED:6
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 
@@ -64,7 +66,7 @@ msgid ""
 "href=\"%U\">%U</a>"
 msgstr ""
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -75,16 +77,24 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr ""
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr ""
+"Тармоқдан маълумотлар ўқиш учун кутилаётганда узилиш рўй берди. Тармоқ ёки "
+"сервер ўчирилган ёки ўчириб-ёқилган бўлиши мумкин .  Илтимос, сўровингизни "
+"қайта киритинг."
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr ""
+"Тармоқдан маълумотлар ўқиш учун кутилаётганда узилиш рўй берди. Тармоқ ёки "
+"сервер ўчирилган ёки ўчириб-ёқилган бўлиши мумкин .  Илтимос, сўровингизни "
+"қайта киритинг."
 
 #: templates/ERR_CACHE_ACCESS_DENIED:3 templates/ERR_CACHE_ACCESS_DENIED:5
 msgid "Cache Access Denied."
@@ -128,7 +138,8 @@ msgstr "Директория: %U"
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr "Директория: <a href=\"/\">%U</a>/"
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -177,23 +188,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "ХАТО: Сўралган URL топилмади."
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "Хато: Сўралган URN топилмади"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "ХАТО: Сўралган URL топилмади."
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr "ESI жараёни муваффақиятсиз якунланди."
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "FTP PUT Муваффақиятли: Файл яратилди"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "FTP PUT Муваффақиятли: Файл янгиланди"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "FTP PUT/юклаш муваффақиятсиз якунланди"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -212,11 +222,24 @@ msgstr "Файл яратилди"
 msgid "File updated"
 msgstr "Файл янгиланди"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "Узатиш рад қилинди."
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -238,13 +261,18 @@ msgid "Generated %T by %h (%s)"
 msgstr "%h (%s) томонидан  %T яратилган"
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "Эй, %T'даги URN'лардан кўп кутманг  :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr "ICAP протоколда хатолик."
@@ -269,6 +297,11 @@ msgstr ""
 msgid "Illegal double-escape in the URL-Path"
 msgstr ""
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "Яроқсиз URL"
@@ -342,6 +375,14 @@ msgstr "Узилишни ўқиш"
 msgid "Request is too large."
 msgstr "Сўров жуда катта."
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Сокет яроқсиз"
@@ -450,7 +491,8 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_CONNECT_FAIL:7
-msgid "The remote host or network may be down.  Please try the request again."
+#, fuzzy
+msgid "The remote host or network may be down. Please try the request again."
 msgstr ""
 "Масофадаги ҳост ёки тармоқ ўчирилган бўлиши мумкин. Илтимос, суровингизни "
 "қайтадан киритиб, уриниб кўринг."
@@ -490,14 +532,14 @@ msgstr "Тизим қайтарди: <i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 
 #: templates/ERR_TOO_BIG:8
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 
@@ -514,13 +556,13 @@ msgstr "Ушбу кеш FTP'ни қўллаб-қувватлай олмайди.
 #: templates/ERR_SHUTTING_DOWN:5
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 
 #: templates/ERR_FORWARDING_DENIED:6
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 
@@ -549,7 +591,7 @@ msgstr ""
 #: templates/ERR_FTP_NOT_FOUND:7
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 
@@ -564,9 +606,24 @@ msgstr ""
 #: templates/ERR_CANNOT_FORWARD:6
 msgid ""
 "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."
+"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."
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
 msgstr ""
 
 #: templates/ERR_DNS_FAIL:5
@@ -591,8 +648,9 @@ msgid ""
 "directive was specified."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
 msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
@@ -606,7 +664,13 @@ msgid ""
 "revalidation prohibited by the <q>only-if-cached</q> directive."
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -636,3 +700,9 @@ msgstr ""
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr ""
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "Хато: Сўралган URN топилмади"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTP PUT Муваффақиятли: Файл янгиланди"
diff --git a/errors/zh-cn.po b/errors/zh-cn.po
index cc5fc6f2e1..a519346749 100644
--- a/errors/zh-cn.po
+++ b/errors/zh-cn.po
@@ -2,16 +2,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2009-10-28 11:35+0000\n"
 "Last-Translator: 王英华 <wantinghard@gmail.com>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2009-11-07 07:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-"Language: zh_CN\n"
 
 #: templates/ERR_DIR_LISTING:6
 msgid "<a href=\"../\">Parent Directory</a> (<a href=\"/\">Root Directory</a>)"
@@ -30,9 +30,10 @@ msgid ""
 msgstr "<b>非法响应</b> 尝试处理请求时发生错误:"
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "等待从网络读取数据时发生超时。 网络或服务器下线或拥挤。  请重新发送你的请求。"
 
@@ -45,9 +46,10 @@ msgid "Access Denied."
 msgstr "访问被拒绝。"
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "当前的存取控制设定禁止您的请求被接受，如果您觉得这是错误的，请与您网路服务的"
@@ -59,7 +61,7 @@ msgid ""
 "href=\"%U\">%U</a>"
 msgstr "尝试获取 URL: <a href=\"%U\">%U</a> 时发生一个FTP认证错误"
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -70,14 +72,16 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr "收到来自 ICAP 服务器的一个非法响应。"
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr "正在通过网络读取数据时发生了错误，请重新尝试。"
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr "通过网络写入数据时发生了错误，请重新尝试。"
 
@@ -122,7 +126,8 @@ msgstr "文件夹： %U"
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr "文件夹： <a href=\"%U\">%U</a>/"
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -171,23 +176,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "错误: 不能获取请求的 URL"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "错误: 没有获取到请求的 URN"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "错误: 不能获取请求的 URL"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr "ESI 处理失败。"
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "FTP PUT 成功: 文件已创建"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "FTP PUT 成功: 文件已更新"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "FTP PUT/上传失败"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -206,11 +210,24 @@ msgstr "文件已创建"
 msgid "File updated"
 msgstr "文件已更新"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "拒绝转送"
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -232,13 +249,18 @@ msgid "Generated %T by %h (%s)"
 msgstr "已由 %h (%s) 生成 %T"
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "抱歉！您不能对 %T 上的 URNs 期待太多 :)"
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr "ICAP 协议错误。"
@@ -263,6 +285,11 @@ msgstr "主机名称中包含不合法的字符；下划线是不允许的。"
 msgid "Illegal double-escape in the URL-Path"
 msgstr "网址路径中有不合法双重转义符"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "无效的网址"
@@ -332,6 +359,14 @@ msgstr "读取超时"
 msgid "Request is too large."
 msgstr "请求命令过长"
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Socket 建立失败"
@@ -444,7 +479,8 @@ msgid ""
 msgstr "当尝试读取以下 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."
+#, fuzzy
+msgid "The remote host or network may be down. Please try the request again."
 msgstr "您要连结的网络服务器或网络可能发生故障。请稍后再试。"
 
 #: templates/ERR_TOO_BIG:5
@@ -481,15 +517,17 @@ msgid "The system returned: <i>%E</i>"
 msgstr "系统返回以下内容：<i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
+#, fuzzy
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr "本缓存服务器没有设定 WAIS 中继主机！如有疑问请与缓存服务器管理员联系。"
 
 #: templates/ERR_TOO_BIG:8
+#, fuzzy
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 "这些长度限制由操作本缓存服务器的服务提供者制定。如果您觉得这是错误的，请与他"
@@ -504,15 +542,17 @@ msgid "This cache does not support FTP."
 msgstr "本缓存服务器未开放文件传输服务。"
 
 #: templates/ERR_SHUTTING_DOWN:5
+#, fuzzy
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr "本缓存服务器正在关闭，暂时无法为您服务。请稍侯再试。"
 
 #: templates/ERR_FORWARDING_DENIED:6
+#, fuzzy
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "本缓存服务器无法转送您的请求，也许您是通过一个并未被本缓存服务器设定为允许存"
@@ -545,9 +585,10 @@ msgid ""
 msgstr "这意味着代理不能处理 ESI 模板。请向网站管理员报告这个错误。"
 
 #: templates/ERR_FTP_NOT_FOUND:7
+#, fuzzy
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 "这可能是由于 FTP 网址（URL）中包含了绝对路径所致（不符合 RFC1738）。如果真的"
@@ -564,16 +605,32 @@ msgstr ""
 "端计算机不支持安全连接，或者代理对主机的安全凭据不认可。"
 
 #: templates/ERR_CANNOT_FORWARD:6
+#, fuzzy
 msgid ""
 "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."
+"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."
 msgstr ""
 "您的请求无法被转送到原始网络服务器或其他的上层缓存服务器，发生这个问题最可能"
 "的原因是缓存服务器管理员不允许本服务器与原始网络服务器直接连结，而 所有本服务"
 "器指定的上层缓存服务器都暂时无法连结。"
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr "不能由主机名 <q>%H</q> 确定 IP 地址。"
@@ -598,9 +655,10 @@ msgstr ""
 "请求的文件在本缓存服务器上未找到，而您设定了<q>only-if-cached</q>（只读取缓"
 "存）指令。"
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr "当尝试上传（PUT）到以下位置时： <a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -616,7 +674,13 @@ msgstr ""
 "而所要的文件并未存在于本缓存服务器中，<em>或者</em>这个连结请求需要刷新文件"
 "而 <q>only-if-cached</q> 指令禁止这么做。"
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -646,3 +710,12 @@ msgstr "您的网站管理员是  <a href=\"mailto:%w\">%w</a>。"
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "响应内容长度为零"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "错误: 没有获取到请求的 URN"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "FTP PUT 成功: 文件已更新"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr "当尝试上传（PUT）到以下位置时： <a href=\"%U\">%U</a>"
diff --git a/errors/zh-tw.po b/errors/zh-tw.po
index 613412e5b8..37ac6d7780 100644
--- a/errors/zh-tw.po
+++ b/errors/zh-tw.po
@@ -2,14 +2,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 00:04+1300\n"
+"POT-Creation-Date: 2010-07-26 21:21+1300\n"
 "PO-Revision-Date: 2009-06-05 16:09+1300\n"
 "Last-Translator: Erick C. Chang <erick@mail.thu.edu.tw>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 1.2.1\n"
 
@@ -30,9 +30,10 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_READ_TIMEOUT:7
+#, fuzzy
 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."
+"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 ""
 "當透過網路讀取資料時，超過了等待時限。這可能是因為網路或是欲連結的網站伺服器"
 "發生壅塞或損壞。請重新嘗試一遍您的連結要求。"
@@ -46,9 +47,10 @@ msgid "Access Denied."
 msgstr "存取被拒絕"
 
 #: templates/ERR_ACCESS_DENIED:6
+#, fuzzy
 msgid ""
 "Access control configuration prevents your request from being allowed at "
-"this time.  Please contact your service provider if you feel this is "
+"this time. Please contact your service provider if you feel this is "
 "incorrect."
 msgstr ""
 "欲連結之網站的存取控制設定目前禁止了您的連線要求，如果您覺得得到這樣的訊息並"
@@ -60,7 +62,7 @@ msgid ""
 "href=\"%U\">%U</a>"
 msgstr ""
 
-#: templates/ERR_FTP_FAILURE:4
+#: templates/ERR_FTP_FAILURE:4 templates/ERR_FTP_PUT_ERROR:4
 msgid ""
 "An FTP protocol error occurred while trying to retrieve the URL: <a href=\"%U"
 "\">%U</a>"
@@ -72,14 +74,16 @@ msgid "An Illegal response was received from the ICAP server."
 msgstr ""
 
 #: templates/ERR_READ_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while reading data from the network.  Please "
+"An error condition occurred while reading data from the network. Please "
 "retry your request."
 msgstr "正在透過網路讀取資料時發生了錯誤的情況，請再嘗試一遍您的連結要求。"
 
 #: templates/ERR_WRITE_ERROR:7
+#, fuzzy
 msgid ""
-"An error condition occurred while writing to the network.  Please retry your "
+"An error condition occurred while writing to the network. Please retry your "
 "request."
 msgstr "正在透過網路寫入資料時發生了錯誤的情況，請重新嘗試一遍您的連結要求。"
 
@@ -125,7 +129,8 @@ msgstr ""
 msgid "Directory: <a href=\"%U\">%U</a>/"
 msgstr ""
 
-#: templates/ERR_ACCESS_DENIED:2 templates/ERR_CACHE_ACCESS_DENIED:2
+#: templates/ERR_ACCESS_DENIED:2 templates/ERR_AGENT_CONFIGURE:2
+#: templates/ERR_AGENT_WPAD:2 templates/ERR_CACHE_ACCESS_DENIED:2
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:2 templates/ERR_CANNOT_FORWARD:2
 #: templates/ERR_CONNECT_FAIL:2 templates/ERR_DNS_FAIL:2 templates/ERR_ESI:2
 #: templates/ERR_FORWARDING_DENIED:2 templates/ERR_FTP_DISABLED:2
@@ -174,23 +179,22 @@ msgid "ERROR: The requested URL could not be retrieved"
 msgstr "錯誤: 欲連結之網址（URL）無法正確的傳回"
 
 #: templates/ERR_URN_RESOLVE:1
-msgid "ERROR: The requested URN not be retrieved"
-msgstr "錯誤：欲連結之網址（URL）無法正確的傳回"
+#, fuzzy
+msgid "ERROR: The requested URN could not be retrieved"
+msgstr "錯誤: 欲連結之網址（URL）無法正確的傳回"
 
 #: templates/ERR_ESI:5
 msgid "ESI Processing failed."
 msgstr ""
 
-#: templates/ERR_FTP_PUT_CREATED:1
-msgid "FTP PUT Successful: File Created"
+#: templates/ERR_FTP_PUT_CREATED:1 templates/ERR_FTP_PUT_MODIFIED:1
+#, fuzzy
+msgid "FTP PUT Successful."
 msgstr "檔案傳輸 PUT 指令成功完成：檔案已被建立"
 
-#: templates/ERR_FTP_PUT_MODIFIED:1
-msgid "FTP PUT Successful: File Updated"
-msgstr "檔案傳輸 PUT 指令成功完成：檔案已被更新"
-
 #: templates/ERR_FTP_PUT_ERROR:3
-msgid "FTP PUT/upload failed"
+#, fuzzy
+msgid "FTP PUT upload failed"
 msgstr "檔案傳輸上傳（PUT）失敗"
 
 #: templates/ERR_FTP_DISABLED:5
@@ -209,11 +213,24 @@ msgstr "檔案已被成功地建立"
 msgid "File updated"
 msgstr "檔案已被更新了"
 
+#: templates/ERR_AGENT_CONFIGURE:6 templates/ERR_AGENT_WPAD:6
+msgid "For Firefox browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:9 templates/ERR_AGENT_WPAD:8
+msgid "For Internet Explorer browsers go to: <ul>"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:12 templates/ERR_AGENT_WPAD:11
+msgid "For Opera browsers go to: <ul>"
+msgstr ""
+
 #: templates/ERR_FORWARDING_DENIED:5
 msgid "Forwarding Denied."
 msgstr "轉送要求被拒"
 
-#: templates/ERR_ACCESS_DENIED:8 templates/ERR_CACHE_ACCESS_DENIED:8
+#: templates/ERR_ACCESS_DENIED:8 templates/ERR_AGENT_CONFIGURE:16
+#: templates/ERR_AGENT_WPAD:15 templates/ERR_CACHE_ACCESS_DENIED:8
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 templates/ERR_CANNOT_FORWARD:8
 #: templates/ERR_CONNECT_FAIL:9 templates/ERR_DIR_LISTING:7
 #: templates/ERR_DNS_FAIL:9 templates/ERR_ESI:9
@@ -235,13 +252,18 @@ msgid "Generated %T by %h (%s)"
 msgstr ""
 
 #: templates/ERR_INVALID_REQ:12
-msgid "HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software."
+msgid ""
+"HTTP/1.1 <q>Expect:</q> feature is being asked from an HTTP/1.0 software."
 msgstr ""
 
 #: templates/ERR_URN_RESOLVE:6
 msgid "Hey, don't expect too much from URNs on %T :)"
 msgstr "抱歉！您不能對 URNs 在 %T 上期待太多 :) "
 
+#: templates/ERR_AGENT_CONFIGURE:5 templates/ERR_AGENT_WPAD:5
+msgid "How to find these settings in your browser:"
+msgstr ""
+
 #: templates/ERR_ICAP_FAILURE:5
 msgid "ICAP protocol error."
 msgstr ""
@@ -266,6 +288,11 @@ msgstr "欲連結的主機名稱包含不合法的字元；底線這個字元是
 msgid "Illegal double-escape in the URL-Path"
 msgstr "不合法的網站連結路徑（缺少 <q>//</q>）"
 
+#: templates/ERR_AGENT_CONFIGURE:8 templates/ERR_AGENT_CONFIGURE:11
+#: templates/ERR_AGENT_CONFIGURE:14
+msgid "In the HTTP proxy box type the proxy name %h and port 3128."
+msgstr ""
+
 #: templates/ERR_INVALID_URL:5
 msgid "Invalid URL"
 msgstr "不正確的位置"
@@ -336,6 +363,14 @@ msgstr "超過讀取時限"
 msgid "Request is too large."
 msgstr "要求命令過長"
 
+#: templates/ERR_AGENT_WPAD:10
+msgid "Select Automatically detect settings"
+msgstr ""
+
+#: templates/ERR_AGENT_WPAD:13
+msgid "Select Use Automatic proxy configuration"
+msgstr ""
+
 #: templates/ERR_SOCKET_FAILURE:5
 msgid "Socket Failure"
 msgstr "Socket 建立失敗"
@@ -452,7 +487,8 @@ msgid ""
 msgstr ""
 
 #: templates/ERR_CONNECT_FAIL:7
-msgid "The remote host or network may be down.  Please try the request again."
+#, fuzzy
+msgid "The remote host or network may be down. Please try the request again."
 msgstr "您欲連結的網站伺服器或是網路可能發生故障。請稍後再試。"
 
 #: templates/ERR_TOO_BIG:5
@@ -489,8 +525,9 @@ msgid "The system returned: <i>%E</i>"
 msgstr "系統回應了下列錯誤訊息：<i>%E</i>"
 
 #: templates/ERR_NO_RELAY:6
+#, fuzzy
 msgid ""
-"There is no WAIS Relay host defined for this Cache!  Yell at the "
+"There is no WAIS Relay host defined for this Cache! Yell at the "
 "administrator."
 msgstr ""
 "本快取伺服器未提供 WAIS 廣域資訊伺服器服務！如有疑問請洽快取伺服器管理者。"
@@ -498,7 +535,7 @@ msgstr ""
 #: templates/ERR_TOO_BIG:8
 msgid ""
 "These limits have been established by the Internet Service Provider who "
-"operates this cache.  Please contact them directly if you feel this is an "
+"operates this cache. Please contact them directly if you feel this is an "
 "error."
 msgstr ""
 
@@ -511,17 +548,19 @@ msgid "This cache does not support FTP."
 msgstr "本快取伺服器並未開放支援檔案傳輸服務。"
 
 #: templates/ERR_SHUTTING_DOWN:5
+#, fuzzy
 msgid ""
 "This cache is in the process of shutting down and can not service your "
-"request at this time.  Please retry your request again soon."
+"request at this time. Please retry your request again soon."
 msgstr ""
 "本網路快取伺服器目前正在進行關閉程序，暫時無法對您的連線要求提供服務。請稍待"
 "片刻重新嘗試連線。"
 
 #: templates/ERR_FORWARDING_DENIED:6
+#, fuzzy
 msgid ""
 "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 "
+"sibling relationship. Perhaps the client at %i is a cache which has been "
 "misconfigured."
 msgstr ""
 "本快取伺服器將無法替您轉向您的連線要求，也許是因為您所使用的快取伺服器（%i）"
@@ -555,7 +594,7 @@ msgstr ""
 #: templates/ERR_FTP_NOT_FOUND:7
 msgid ""
 "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 "
+"comply with RFC 1738). If this is the cause, then the file can be found at "
 "<a href=\"%B\">%B</a>."
 msgstr ""
 
@@ -571,14 +610,29 @@ msgstr ""
 #, fuzzy
 msgid ""
 "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."
+"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."
 msgstr ""
 "您的連結要求無法被轉向原始網站伺服器或其他的上層快取伺服器，發生這個問題的最"
 "可能的原因可能是網路快取伺服器管理者不允許本伺服器逕行直接連結原始的網頁位"
 "置，或是 所有本伺服器設定的上層伺服器目前都暫時無法連結上。"
 
+#: templates/ERR_AGENT_CONFIGURE:10 templates/ERR_AGENT_WPAD:9
+msgid ""
+"Tools -&gt; Internet Options -&gt; Connection -&gt; LAN Settings -&gt;Proxy"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:7 templates/ERR_AGENT_WPAD:7
+msgid ""
+"Tools -&gt; Options -&gt; Advanced -&gt; Network -&gt; Connection Settings"
+msgstr ""
+
+#: templates/ERR_AGENT_CONFIGURE:13 templates/ERR_AGENT_WPAD:12
+msgid ""
+"Tools -&gt; Preferences -&gt; Advanced -&gt; Network -&gt; Proxy Servers"
+msgstr ""
+
 #: templates/ERR_DNS_FAIL:5
 msgid "Unable to determine IP address from host name <q>%H</q>"
 msgstr "無法將您輸入的網站主機位置轉譯成正確的 IP 位置 <q>%H</q>"
@@ -603,9 +657,10 @@ msgstr ""
 "您要求的文件並未存在於本快取伺服器上，而且您設定了 <q>only-if-cached</q> 指"
 "令。"
 
-#: templates/ERR_FTP_PUT_ERROR:4
-msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
-msgstr "當嘗試上傳（PUT）下列位置時：<a href=\"%U\">%U</a>"
+#: templates/ERR_AGENT_CONFIGURE:1 templates/ERR_AGENT_CONFIGURE:3
+#: templates/ERR_AGENT_WPAD:1 templates/ERR_AGENT_WPAD:3
+msgid "Web Browser Configuration"
+msgstr ""
 
 #: templates/ERR_WRITE_ERROR:5
 msgid "Write Error"
@@ -621,7 +676,13 @@ msgstr ""
 "快取伺服器中，<em>或者</em> 這個連線要求被 <q>only-if-cached</q> 指令認定是禁"
 "用的。"
 
-#: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7
+#: templates/ERR_AGENT_CONFIGURE:4 templates/ERR_AGENT_WPAD:4
+msgid ""
+"Your Web Browser configuration needs to be corrected to use this network."
+msgstr ""
+
+#: templates/ERR_ACCESS_DENIED:7 templates/ERR_AGENT_CONFIGURE:15
+#: templates/ERR_AGENT_WPAD:14 templates/ERR_CANNOT_FORWARD:7
 #: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8
 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7
 #: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7
@@ -651,3 +712,12 @@ msgstr ""
 #: templates/ERR_ZERO_SIZE_OBJECT:5
 msgid "Zero Sized Reply"
 msgstr "大小為零的資料回應"
+
+#~ msgid "ERROR: The requested URN not be retrieved"
+#~ msgstr "錯誤：欲連結之網址（URL）無法正確的傳回"
+
+#~ msgid "FTP PUT Successful: File Updated"
+#~ msgstr "檔案傳輸 PUT 指令成功完成：檔案已被更新"
+
+#~ msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"
+#~ msgstr "當嘗試上傳（PUT）下列位置時：<a href=\"%U\">%U</a>"