diff --git a/Makefile b/Makefile index efc02131..9ff3de8d 100644 --- a/Makefile +++ b/Makefile @@ -74,6 +74,7 @@ upload: distclean dist files VERSION scp README $(HTMLDIR)/readme.txt scp linkchecker-out.*.gz $(HTMLDIR) scp VERSION $(HTMLDIR)/raw/ + scp $(MD5SUMS) $(HTMLDIR)/ #scp dist/* $(HTMLDIR)/ ncftpput upload.sourceforge.net /incoming dist/* && read -p "Make new SF file releases and then press Enter:" ssh -C -t shell1.sourceforge.net "cd $(PACKAGEDIR) && make" diff --git a/linkcheck/HttpUrlData.py b/linkcheck/HttpUrlData.py index b21808e1..b09ad1ac 100644 --- a/linkcheck/HttpUrlData.py +++ b/linkcheck/HttpUrlData.py @@ -83,6 +83,8 @@ class HttpUrlData (UrlData): """ # set the proxy, so a 407 status after this is an error self._setProxy(self.config["proxy"].get(self.scheme)) + if self.proxy: + self.setInfo(linkcheck._("Using HTTP Proxy %s")%`self.proxy`) self.headers = None self.auth = None self.cookies = [] @@ -100,6 +102,7 @@ class HttpUrlData (UrlData): if status == 305 and self.headers: oldproxy = (self.proxy, self.proxyauth) self._setProxy(self.headers.getheader("Location")) + self.setInfo(linkcheck._("Enforced HTTP Proxy %s")%`self.proxy`) status, statusText, self.headers = self._getHttpRequest() self.proxy, self.proxyauth = oldproxy # follow redirections @@ -212,7 +215,6 @@ class HttpUrlData (UrlData): """ if self.proxy: host = self.proxy - self.setInfo(linkcheck._("Using HTTP Proxy %s")%`self.proxy`) else: host = self.urlTuple[1] Config.debug(HURT_ME_PLENTY, "host", host) diff --git a/po/de.po b/po/de.po index 248b86ea..fed00d39 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: Thu Sep 26 18:43:36 2002\n" +"POT-Creation-Date: Thu Sep 26 22:05:37 2002\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Bastian Kleineidam \n" "Language-Team: LANGUAGE \n" @@ -39,9 +39,15 @@ msgstr "gefunden" msgid "Path is empty" msgstr "Pfad ist leer" +msgid "Using HTTP Proxy %s" +msgstr "Verwende HTTP Proxy %s" + msgid "Access denied by robots.txt, checked only syntax" msgstr "Zugriff verweigert durch robots.txt; prüfe lediglich Syntax" +msgid "Enforced HTTP Proxy %s" +msgstr "Erzwungener HTTP Proxy %s" + msgid "too much redirections (>= 5)" msgstr "zu viele Weiterleitungen (>= 5)" @@ -71,9 +77,6 @@ msgstr "" "URLs, die auf (Home-) Verzeichnisse verweisen, sollten mit einem / enden, um " "Weiterleitungen zu verhindern" -msgid "Using HTTP Proxy %s" -msgstr "Verwende HTTP Proxy %s" - msgid "Unsupported content encoding %s." msgstr "Content-Encoding %s wird nicht unterstützt." diff --git a/po/fr.po b/po/fr.po index 35a22d34..bfe7fe06 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: Thu Sep 26 18:43:36 2002\n" +"POT-Creation-Date: Thu Sep 26 22:05:37 2002\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -39,9 +39,15 @@ msgstr "trouv msgid "Path is empty" msgstr "" +msgid "Using HTTP Proxy %s" +msgstr "" + msgid "Access denied by robots.txt, checked only syntax" msgstr "Accès refusé par robots.txt, analyse de la syntaxe seulement" +msgid "Enforced HTTP Proxy %s" +msgstr "" + msgid "too much redirections (>= 5)" msgstr "" @@ -67,9 +73,6 @@ msgid "" "redirection" msgstr "" -msgid "Using HTTP Proxy %s" -msgstr "" - msgid "Unsupported content encoding %s." msgstr "" diff --git a/po/nl.po b/po/nl.po index cd8ad4d4..053dfc44 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: Thu Sep 26 18:43:36 2002\n" +"POT-Creation-Date: Thu Sep 26 22:05:37 2002\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Hans Bausewein \n" "Language-Team: LANGUAGE \n" @@ -39,9 +39,15 @@ msgstr "gevonden" msgid "Path is empty" msgstr "" +msgid "Using HTTP Proxy %s" +msgstr "" + msgid "Access denied by robots.txt, checked only syntax" msgstr "Toegang geweigerd door robots.txt; alleen syntax gecontroleerd" +msgid "Enforced HTTP Proxy %s" +msgstr "" + msgid "too much redirections (>= 5)" msgstr "te veel verwijzingen (>= 5)" @@ -70,9 +76,6 @@ msgstr "" "URLs, die auf (Home-) Verzeichnisse verweisen, sollten mit einem / enden, um " "Weiterleitungen zu verhindern" -msgid "Using HTTP Proxy %s" -msgstr "" - msgid "Unsupported content encoding %s." msgstr ""