[svn] --delete-after wasn't implemented for files retrieved by FTP or corresponding to

files specified on the commandline.  Made --convert-links be ignored when
--delete-after is specified.  Added note about this fact to --delete-after docs
and made general improvements to them, including the clarification that
--delete-after only deletes local files.

doc/ChangeLog

@@ -1,3 +1,7 @@
+2000-10-23  Dan Harkless  <dan-wget@dilvish.speed.net>
+
+	* wget.texi (Recursive Retrieval Options): Improved --delete-after docs.
+	
 2000-10-20  Dan Harkless  <dan-wget@dilvish.speed.net>
 
 	* wget.texi (Recursive Retrieval Options): Sugg. -E on 1-page download.

doc/wget.info

@@ -26,8 +26,8 @@ notice identical to this one.
 
 Indirect:
 wget.info-1: 961
-wget.info-2: 48417
+wget.info-2: 48494
-wget.info-3: 96941
+wget.info-3: 97018
 
 Tag Table:
 (Indirect)
@@ -41,48 +41,48 @@ Node: Logging and Input File Options10287
 Node: Download Options12812
 Node: Directory Options20659
 Node: HTTP Options23137
-Node: FTP Options28082
+Node: FTP Options27853
-Node: Recursive Retrieval Options30064
+Node: Recursive Retrieval Options29835
-Node: Recursive Accept/Reject Options34779
+Node: Recursive Accept/Reject Options34856
-Node: Recursive Retrieval38005
+Node: Recursive Retrieval38082
-Node: Following Links40303
+Node: Following Links40380
-Node: Relative Links41331
+Node: Relative Links41408
-Node: Host Checking41845
+Node: Host Checking41922
-Node: Domain Acceptance43870
+Node: Domain Acceptance43947
-Node: All Hosts45540
+Node: All Hosts45617
-Node: Types of Files45967
+Node: Types of Files46044
-Node: Directory-Based Limits48417
+Node: Directory-Based Limits48494
-Node: FTP Links51057
+Node: FTP Links51134
-Node: Time-Stamping51927
+Node: Time-Stamping52004
-Node: Time-Stamping Usage53564
+Node: Time-Stamping Usage53641
-Node: HTTP Time-Stamping Internals55133
+Node: HTTP Time-Stamping Internals55210
-Node: FTP Time-Stamping Internals56603
+Node: FTP Time-Stamping Internals56680
-Node: Startup File57811
+Node: Startup File57888
-Node: Wgetrc Location58684
+Node: Wgetrc Location58761
-Node: Wgetrc Syntax59499
+Node: Wgetrc Syntax59576
-Node: Wgetrc Commands60214
+Node: Wgetrc Commands60291
-Node: Sample Wgetrc68471
+Node: Sample Wgetrc68548
-Node: Examples73490
+Node: Examples73567
-Node: Simple Usage74097
+Node: Simple Usage74174
-Node: Advanced Usage76491
+Node: Advanced Usage76568
-Node: Guru Usage79242
+Node: Guru Usage79319
-Node: Various80904
+Node: Various80981
-Node: Proxies81428
+Node: Proxies81505
-Node: Distribution84193
+Node: Distribution84270
-Node: Mailing List84544
+Node: Mailing List84621
-Node: Reporting Bugs85243
+Node: Reporting Bugs85320
-Node: Portability87028
+Node: Portability87105
-Node: Signals88403
+Node: Signals88480
-Node: Appendices89057
+Node: Appendices89134
-Node: Robots89472
+Node: Robots89549
-Node: Introduction to RES90619
+Node: Introduction to RES90696
-Node: RES Format92512
+Node: RES Format92589
-Node: User-Agent Field93616
+Node: User-Agent Field93693
-Node: Disallow Field94380
+Node: Disallow Field94457
-Node: Norobots Examples94991
+Node: Norobots Examples95068
-Node: Security Considerations95945
+Node: Security Considerations96022
-Node: Contributors96941
+Node: Contributors97018
-Node: Copying99580
+Node: Copying99661
-Node: Concept Index118743
+Node: Concept Index118824
 
 End Tag Table

doc/wget.info-1

@@ -689,11 +689,6 @@ HTTP Options
      this option is discouraged, unless you really know what you are
      doing.
 
-     *NOTE* that Netscape Communications Corp. has claimed that false
-     transmissions of `Mozilla' as the `User-Agent' are a copyright
-     infringement, which will be prosecuted.  *DO NOT* misrepresent
-     Wget as Mozilla.
-
 
 File: wget.info,  Node: FTP Options,  Next: Recursive Retrieval Options,  Prev: HTTP Options,  Up: Invoking
 
@@ -761,13 +756,19 @@ Recursive Retrieval Options
 `--delete-after'
      This option tells Wget to delete every single file it downloads,
      *after* having done so.  It is useful for pre-fetching popular
-     pages through proxy, e.g.:
+     pages through a proxy, e.g.:
 
           wget -r -nd --delete-after http://whatever.com/~popular/page/
 
-     The `-r' option is to retrieve recursively, and `-nd' not to
+     The `-r' option is to retrieve recursively, and `-nd' to not
      create directories.
 
+     Note that `--delete-after' deletes files on the local machine.  It
+     does not issue the `DELE' command to remote FTP sites, for
+     instance.  Also note that when `--delete-after' is specified,
+     `--convert-links' is ignored, so `.orig' files are simply not
+     created in the first place.
+
 `-k'
 `--convert-links'
      Convert the non-relative links to relative ones locally.  Only the

doc/wget.info-3

@@ -29,10 +29,10 @@ File: wget.info,  Node: Contributors,  Prev: Security Considerations,  Up: Appen
 Contributors
 ============
 
-   GNU Wget was written by Hrvoje Niksic <hniksic@iskon.hr>.  However,
+   GNU Wget was written by Hrvoje Niksic <hniksic@arsdigita.com>.
-its development could never have gone as far as it has, were it not for
+However, its development could never have gone as far as it has, were it
-the help of many people, either with bug reports, feature proposals,
+not for the help of many people, either with bug reports, feature
-patches, or letters saying "Thanks!".
+proposals, patches, or letters saying "Thanks!".
 
    Special thanks goes to the following people (no particular order):
 

doc/wget.texi

@@ -901,15 +901,21 @@ Retrieval}).  The default maximum depth is 5.
 @item --delete-after
 This option tells Wget to delete every single file it downloads,
 @emph{after} having done so.  It is useful for pre-fetching popular
-pages through proxy, e.g.:
+pages through a proxy, e.g.:
 
 @example
 wget -r -nd --delete-after http://whatever.com/~popular/page/
 @end example
 
-The @samp{-r} option is to retrieve recursively, and @samp{-nd} not to
+The @samp{-r} option is to retrieve recursively, and @samp{-nd} to not
 create directories.  
 
+Note that @samp{--delete-after} deletes files on the local machine.  It
+does not issue the @samp{DELE} command to remote FTP sites, for
+instance.  Also note that when @samp{--delete-after} is specified,
+@samp{--convert-links} is ignored, so @samp{.orig} files are simply not
+created in the first place.
+
 @cindex conversion of links
 @cindex link conversion
 @item -k

po/cs.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU wget 1.5.2-b1\n"
-"POT-Creation-Date: 2000-10-20 00:29-0700\n"
+"POT-Creation-Date: 2000-10-23 20:39-0700\n"
 "PO-Revision-Date: 1998-06-05 08:47\n"
 "Last-Translator: Jan Prikryl <prikryl@acm.org>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -212,24 +212,30 @@ msgstr ""
 "\n"
 
 # , c-format
-#: src/ftp.c:1034
+#: src/ftp.c:1022 src/main.c:744 src/recur.c:468 src/retr.c:470
+#, c-format
+msgid "Removing %s.\n"
+msgstr "Ma¾u %s.\n"
+
+# , c-format
+#: src/ftp.c:1063
 #, c-format
 msgid "Using `%s' as listing tmp file.\n"
 msgstr "Seznam souborù bude doèasnì ulo¾en v `%s'.\n"
 
 # , c-format
-#: src/ftp.c:1046
+#: src/ftp.c:1075
 #, c-format
 msgid "Removed `%s'.\n"
 msgstr "Vymazal jsem `%s'.\n"
 
 # , c-format
-#: src/ftp.c:1082
+#: src/ftp.c:1111
 #, c-format
 msgid "Recursion depth %d exceeded max. depth %d.\n"
 msgstr "Hloubka rekurze %d pøekroèila maximální povolenou hloubku %d.\n"
 
-#: src/ftp.c:1134 src/http.c:1163
+#: src/ftp.c:1163 src/http.c:1163
 #, c-format
 msgid ""
 "Server file no newer than local file `%s' -- not retrieving.\n"
@@ -237,17 +243,17 @@ msgid ""
 msgstr ""
 
 # , c-format
-#: src/ftp.c:1140 src/http.c:1171
+#: src/ftp.c:1169 src/http.c:1171
 #, fuzzy, c-format
 msgid "The sizes do not match (local %ld) -- retrieving.\n"
 msgstr "Velikosti se neshodují (lokálnì %ld), pøená¹ím.\n"
 
-#: src/ftp.c:1157
+#: src/ftp.c:1186
 msgid "Invalid name of the symlink, skipping.\n"
 msgstr "Neplatný název symoblického odkazu, pøeskakuji.\n"
 
 # , c-format
-#: src/ftp.c:1174
+#: src/ftp.c:1203
 #, c-format
 msgid ""
 "Already have correct symlink %s -> %s\n"
@@ -257,13 +263,13 @@ msgstr ""
 "\n"
 
 # , c-format
-#: src/ftp.c:1182
+#: src/ftp.c:1211
 #, c-format
 msgid "Creating symlink %s -> %s\n"
 msgstr "Vytváøím symbolický odkaz %s -> %s\n"
 
 # , c-format
-#: src/ftp.c:1193
+#: src/ftp.c:1222
 #, c-format
 msgid "Symlinks not supported, skipping symlink `%s'.\n"
 msgstr ""
@@ -271,32 +277,32 @@ msgstr ""
 "nepodporuje.\n"
 
 # , c-format
-#: src/ftp.c:1205
+#: src/ftp.c:1234
 #, c-format
 msgid "Skipping directory `%s'.\n"
 msgstr "Pøeskakuji adresáø `%s'.\n"
 
 # , c-format
-#: src/ftp.c:1214
+#: src/ftp.c:1243
 #, c-format
 msgid "%s: unknown/unsupported file type.\n"
 msgstr "%s: neznámý/nepodporovaný typ souboru.\n"
 
 # , c-format
-#: src/ftp.c:1231
+#: src/ftp.c:1260
 #, c-format
 msgid "%s: corrupt time-stamp.\n"
 msgstr "%s: èasové razítko souboru je poru¹ené.\n"
 
 # , c-format
-#: src/ftp.c:1252
+#: src/ftp.c:1281
 #, c-format
 msgid "Will not retrieve dirs since depth is %d (max %d).\n"
 msgstr ""
 "Podadresáøe nebudu pøená¹et, proto¾e jsme ji¾ v hloubce %d (maximum je %d).\n"
 
 # , c-format
-#: src/ftp.c:1291
+#: src/ftp.c:1320
 #, c-format
 msgid "Not descending to `%s' as it is excluded/not-included.\n"
 msgstr ""
@@ -304,7 +310,7 @@ msgstr ""
 "nebyl zadán k procházení.\n"
 
 # , c-format
-#: src/ftp.c:1336
+#: src/ftp.c:1365
 #, c-format
 msgid "Rejecting `%s'.\n"
 msgstr "Odmítám `%s'.\n"
@@ -313,19 +319,19 @@ msgstr "Odm
 #. No luck.
 #. #### This message SUCKS.  We should see what was the
 #. reason that nothing was retrieved.
-#: src/ftp.c:1383
+#: src/ftp.c:1412
 #, c-format
 msgid "No matches on pattern `%s'.\n"
 msgstr "Vzorku `%s' nic neodpovídá.\n"
 
 # , c-format
-#: src/ftp.c:1443
+#: src/ftp.c:1472
 #, c-format
 msgid "Wrote HTML-ized index to `%s' [%ld].\n"
 msgstr "Výpis adresáøe v HTML formátu byl zapsán do `%s' [%ld].\n"
 
 # , c-format
-#: src/ftp.c:1448
+#: src/ftp.c:1477
 #, c-format
 msgid "Wrote HTML-ized index to `%s'.\n"
 msgstr "Výpis adresáøe v HTML formátu byl zapsán do `%s'.\n"
@@ -948,7 +954,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "\n"
-"Originally written by Hrvoje Niksic <hniksic@iskon.hr>.\n"
+"Originally written by Hrvoje Niksic <hniksic@arsdigita.com>.\n"
 msgstr ""
 "\n"
 "Autorem tohto programu je Hrvoje Nik¹iæ <hniksic@srce.hr>\n"
@@ -988,13 +994,13 @@ msgid "%s: missing URL\n"
 msgstr "%s: postrádám URL\n"
 
 # , c-format
-#: src/main.c:749
+#: src/main.c:759
 #, c-format
 msgid "No URLs found in %s.\n"
 msgstr "V souboru `%s' nebyla nalezena ¾ádná URL.\n"
 
 # , c-format
-#: src/main.c:758
+#: src/main.c:768
 #, c-format
 msgid ""
 "\n"
@@ -1006,14 +1012,14 @@ msgstr ""
 "Celkem naèteno %s bajtù v %d souborech\n"
 
 # , c-format
-#: src/main.c:763
+#: src/main.c:773
 #, c-format
 msgid "Download quota (%s bytes) EXCEEDED!\n"
 msgstr "Pøekroèen limit objemu ulo¾ených dat (%s bajtù)!\n"
 
 #. Please note that the double `%' in `%%s' is intentional, because
 #. redirect_output passes tmp through printf.
-#: src/main.c:790
+#: src/main.c:800
 msgid "%s received, redirecting output to `%%s'.\n"
 msgstr "Zachycen signál %s , výstup pøesmìrován do `%%s'.\n"
 
@@ -1080,18 +1086,12 @@ msgid "%s: cannot stat %s: %s\n"
 msgstr "%s: volání `stat %s' skonèilo chybou: %s\n"
 
 # , c-format
-#: src/recur.c:463 src/retr.c:468
+#: src/recur.c:469
-#, c-format
-msgid "Removing %s.\n"
-msgstr "Ma¾u %s.\n"
-
-# , c-format
-#: src/recur.c:464
 #, c-format
 msgid "Removing %s since it should be rejected.\n"
 msgstr "Ma¾u %s, proto¾e tento soubor není po¾adován.\n"
 
-#: src/recur.c:624
+#: src/recur.c:630
 msgid "Loading robots.txt; please ignore errors.\n"
 msgstr "Naèítám `robots.txt'. Chybová hlá¹ení ignorujte, prosím.\n"
 
@@ -1121,7 +1121,7 @@ msgstr "Proxy %s: Mus
 msgid "%s: Redirection to itself.\n"
 msgstr "%s: Pøesmìrování na sebe sama.\n"
 
-#: src/retr.c:489
+#: src/retr.c:491
 msgid ""
 "Giving up.\n"
 "\n"
@@ -1129,7 +1129,7 @@ msgstr ""
 "Vzdávám to.\n"
 "\n"
 
-#: src/retr.c:489
+#: src/retr.c:491
 msgid ""
 "Retrying.\n"
 "\n"

po/de.po

@@ -23,7 +23,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wget 1.5.2-b4\n"
-"POT-Creation-Date: 2000-10-20 00:29-0700\n"
+"POT-Creation-Date: 2000-10-23 20:39-0700\n"
 "PO-Revision-Date: 1998-06-15 19:25+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@suse.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -216,83 +216,88 @@ msgstr ""
 "%s (%s) - »%s« gespeichert [%ld]\n"
 "\n"
 
-#: src/ftp.c:1034
+#: src/ftp.c:1022 src/main.c:744 src/recur.c:468 src/retr.c:470
+#, c-format
+msgid "Removing %s.\n"
+msgstr "Entferne »%s«.\n"
+
+#: src/ftp.c:1063
 #, c-format
 msgid "Using `%s' as listing tmp file.\n"
 msgstr "Benutze »%s« als temporäre Auflistungsdatei.\n"
 
-#: src/ftp.c:1046
+#: src/ftp.c:1075
 #, c-format
 msgid "Removed `%s'.\n"
 msgstr "Entfernt »%s«.\n"
 
-#: src/ftp.c:1082
+#: src/ftp.c:1111
 #, c-format
 msgid "Recursion depth %d exceeded max. depth %d.\n"
 msgstr "Die Rekursionstiefe %d übersteigt die max. Tiefe %d.\n"
 
-#: src/ftp.c:1134 src/http.c:1163
+#: src/ftp.c:1163 src/http.c:1163
 #, c-format
 msgid ""
 "Server file no newer than local file `%s' -- not retrieving.\n"
 "\n"
 msgstr ""
 
-#: src/ftp.c:1140 src/http.c:1171
+#: src/ftp.c:1169 src/http.c:1171
 #, fuzzy, c-format
 msgid "The sizes do not match (local %ld) -- retrieving.\n"
 msgstr "Größen stimmen nicht überein (lokal %ld), Hol-Versuch.\n"
 
-#: src/ftp.c:1157
+#: src/ftp.c:1186
 msgid "Invalid name of the symlink, skipping.\n"
 msgstr "Ungültiger Name für einen symbolischen Verweis, überspringe.\n"
 
-#: src/ftp.c:1174
+#: src/ftp.c:1203
 #, c-format
 msgid ""
 "Already have correct symlink %s -> %s\n"
 "\n"
 msgstr "Der richtige symbolische Verweis %s -> %s ist schon vorhanden\n"
 
-#: src/ftp.c:1182
+#: src/ftp.c:1211
 #, c-format
 msgid "Creating symlink %s -> %s\n"
 msgstr "Lege symbolischen Verweis %s -> %s an\n"
 
-#: src/ftp.c:1193
+#: src/ftp.c:1222
 #, c-format
 msgid "Symlinks not supported, skipping symlink `%s'.\n"
 msgstr ""
 "Symbolische Verweise nicht unterstützt, überspringe symbolischen Verweis "
 "»%s«.\n"
 
-#: src/ftp.c:1205
+#: src/ftp.c:1234
 #, c-format
 msgid "Skipping directory `%s'.\n"
 msgstr "Überspringe Verzeichnis »%s«.\n"
 
-#: src/ftp.c:1214
+#: src/ftp.c:1243
 #, c-format
 msgid "%s: unknown/unsupported file type.\n"
 msgstr "%s: unbekannter/nicht unterstüzter Dateityp.\n"
 
-#: src/ftp.c:1231
+#: src/ftp.c:1260
 #, c-format
 msgid "%s: corrupt time-stamp.\n"
 msgstr "%s: beschädigter Zeitstempel.\n"
 
-#: src/ftp.c:1252
+#: src/ftp.c:1281
 #, c-format
 msgid "Will not retrieve dirs since depth is %d (max %d).\n"
 msgstr "Hole Verzeichnisse nicht, da die Tiefe %d ist (max %d).\n"
 
-#: src/ftp.c:1291
+#: src/ftp.c:1320
 #, c-format
 msgid "Not descending to `%s' as it is excluded/not-included.\n"
 msgstr ""
 "Steige nicht zu »%s« hinab, da es ausgeschlossen/nicht eingeschlossen ist.\n"
 
-#: src/ftp.c:1336
+#: src/ftp.c:1365
 #, c-format
 msgid "Rejecting `%s'.\n"
 msgstr "Weise zurück »%s«.\n"
@@ -300,17 +305,17 @@ msgstr "Weise zur
 #. No luck.
 #. #### This message SUCKS.  We should see what was the
 #. reason that nothing was retrieved.
-#: src/ftp.c:1383
+#: src/ftp.c:1412
 #, c-format
 msgid "No matches on pattern `%s'.\n"
 msgstr "Keine Übereinstimmungen bei dem Muster »%s«.\n"
 
-#: src/ftp.c:1443
+#: src/ftp.c:1472
 #, c-format
 msgid "Wrote HTML-ized index to `%s' [%ld].\n"
 msgstr "Schreibe HTML-artigen Index nach »%s« [%ld].\n"
 
-#: src/ftp.c:1448
+#: src/ftp.c:1477
 #, c-format
 msgid "Wrote HTML-ized index to `%s'.\n"
 msgstr "HTML-artiger Index nach »%s« geschrieben.\n"
@@ -904,7 +909,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "\n"
-"Originally written by Hrvoje Niksic <hniksic@iskon.hr>.\n"
+"Originally written by Hrvoje Niksic <hniksic@arsdigita.com>.\n"
 msgstr ""
 "\n"
 "Geschrieben von Hrvoje Niksic <hniksic@srce.hr>.\n"
@@ -942,12 +947,12 @@ msgstr ""
 msgid "%s: missing URL\n"
 msgstr "%s: URL fehlt\n"
 
-#: src/main.c:749
+#: src/main.c:759
 #, c-format
 msgid "No URLs found in %s.\n"
 msgstr "Keine URLs in %s gefunden.\n"
 
-#: src/main.c:758
+#: src/main.c:768
 #, c-format
 msgid ""
 "\n"
@@ -958,14 +963,14 @@ msgstr ""
 "BEENDET --%s--\n"
 "Geholt: %s Bytes in %d Dateien\n"
 
-#: src/main.c:763
+#: src/main.c:773
 #, c-format
 msgid "Download quota (%s bytes) EXCEEDED!\n"
 msgstr "Hol-Kontingent (%s Bytes) ERSCHÖPFT!\n"
 
 #. Please note that the double `%' in `%%s' is intentional, because
 #. redirect_output passes tmp through printf.
-#: src/main.c:790
+#: src/main.c:800
 msgid "%s received, redirecting output to `%%s'.\n"
 msgstr "%s erhalten, weise Ausgabe nach »%%s« zurück.\n"
 
@@ -1024,17 +1029,12 @@ msgstr "Syntax: %s NETRC [HOSTNAME]\n"
 msgid "%s: cannot stat %s: %s\n"
 msgstr "%s: kann nicht finden %s: %s\n"
 
-#: src/recur.c:463 src/retr.c:468
+#: src/recur.c:469
-#, c-format
-msgid "Removing %s.\n"
-msgstr "Entferne »%s«.\n"
-
-#: src/recur.c:464
 #, c-format
 msgid "Removing %s since it should be rejected.\n"
 msgstr "Entferne »%s«, da dies zurückgewiesen werden soll.\n"
 
-#: src/recur.c:624
+#: src/recur.c:630
 msgid "Loading robots.txt; please ignore errors.\n"
 msgstr "Lade »robots.txt«; bitte Fehler ignorieren.\n"
 
@@ -1061,7 +1061,7 @@ msgstr "Proxy %s: Muss HTTP sein.\n"
 msgid "%s: Redirection to itself.\n"
 msgstr "%s: Redirektion auf sich selber.\n"
 
-#: src/retr.c:489
+#: src/retr.c:491
 msgid ""
 "Giving up.\n"
 "\n"
@@ -1069,7 +1069,7 @@ msgstr ""
 "Gebe auf.\n"
 "\n"
 
-#: src/retr.c:489
+#: src/retr.c:491
 msgid ""
 "Retrying.\n"
 "\n"

po/hr.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wget 1.5.2-b2\n"
-"POT-Creation-Date: 2000-10-20 00:29-0700\n"
+"POT-Creation-Date: 2000-10-23 20:39-0700\n"
 "PO-Revision-Date: 1998-02-29 21:05+01:00\n"
 "Last-Translator: Hrvoje Niksic <hniksic@srce.hr>\n"
 "Language-Team: Croatian <hr-translation@bagan.srce.hr>\n"
@@ -193,22 +193,27 @@ msgstr ""
 "%s (%s) - `%s' snimljen [%ld]\n"
 "\n"
 
-#: src/ftp.c:1034
+#: src/ftp.c:1022 src/main.c:744 src/recur.c:468 src/retr.c:470
+#, c-format
+msgid "Removing %s.\n"
+msgstr "Uklanjam %s.\n"
+
+#: src/ftp.c:1063
 #, c-format
 msgid "Using `%s' as listing tmp file.\n"
 msgstr "Koristim `%s' kao privremenu datoteku za listing.\n"
 
-#: src/ftp.c:1046
+#: src/ftp.c:1075
 #, c-format
 msgid "Removed `%s'.\n"
 msgstr "Izbrisao `%s'.\n"
 
-#: src/ftp.c:1082
+#: src/ftp.c:1111
 #, c-format
 msgid "Recursion depth %d exceeded max. depth %d.\n"
 msgstr "Dubina rekurzije %d prelazi najveæu dozvoljenu %d.\n"
 
-#: src/ftp.c:1134 src/http.c:1163
+#: src/ftp.c:1163 src/http.c:1163
 #, c-format
 msgid ""
 "Server file no newer than local file `%s' -- not retrieving.\n"
@@ -216,16 +221,16 @@ msgid ""
 msgstr ""
 "Datoteka na poslu¾itelju nije novija od lokalne datoteke `%s' -- ne skidam.\n"
 
-#: src/ftp.c:1140 src/http.c:1171
+#: src/ftp.c:1169 src/http.c:1171
 #, c-format
 msgid "The sizes do not match (local %ld) -- retrieving.\n"
 msgstr "Velièine se ne sla¾u (lokalno %ld) -- skidam.\n"
 
-#: src/ftp.c:1157
+#: src/ftp.c:1186
 msgid "Invalid name of the symlink, skipping.\n"
 msgstr "Pogre¹no ime simbolièkog linka, preskaèem.\n"
 
-#: src/ftp.c:1174
+#: src/ftp.c:1203
 #, c-format
 msgid ""
 "Already have correct symlink %s -> %s\n"
@@ -234,42 +239,42 @@ msgstr ""
 "Veæ postoji ispravan link %s -> %s\n"
 "\n"
 
-#: src/ftp.c:1182
+#: src/ftp.c:1211
 #, c-format
 msgid "Creating symlink %s -> %s\n"
 msgstr "Stvaram simbolièki link %s -> %s\n"
 
-#: src/ftp.c:1193
+#: src/ftp.c:1222
 #, c-format
 msgid "Symlinks not supported, skipping symlink `%s'.\n"
 msgstr "Linkovi nisu podr¾ani, preskaèem link `%s'.\n"
 
-#: src/ftp.c:1205
+#: src/ftp.c:1234
 #, c-format
 msgid "Skipping directory `%s'.\n"
 msgstr "Preskaèem direktorij `%s'.\n"
 
-#: src/ftp.c:1214
+#: src/ftp.c:1243
 #, c-format
 msgid "%s: unknown/unsupported file type.\n"
 msgstr "%s: nepoznata/nepodr¾ana vrsta datoteke.\n"
 
-#: src/ftp.c:1231
+#: src/ftp.c:1260
 #, c-format
 msgid "%s: corrupt time-stamp.\n"
 msgstr "%s: pogre¹no vrijeme.\n"
 
-#: src/ftp.c:1252
+#: src/ftp.c:1281
 #, c-format
 msgid "Will not retrieve dirs since depth is %d (max %d).\n"
 msgstr "Ne skidam direktorije jer je dubina %d (maksimalno %d).\n"
 
-#: src/ftp.c:1291
+#: src/ftp.c:1320
 #, c-format
 msgid "Not descending to `%s' as it is excluded/not-included.\n"
 msgstr "Ne idem u `%s' jer je iskljuèen ili nije ukljuèen.\n"
 
-#: src/ftp.c:1336
+#: src/ftp.c:1365
 #, c-format
 msgid "Rejecting `%s'.\n"
 msgstr "Odbijam `%s'.\n"
@@ -277,17 +282,17 @@ msgstr "Odbijam `%s'.\n"
 #. No luck.
 #. #### This message SUCKS.  We should see what was the
 #. reason that nothing was retrieved.
-#: src/ftp.c:1383
+#: src/ftp.c:1412
 #, c-format
 msgid "No matches on pattern `%s'.\n"
 msgstr "Ni¹ta ne ide uz `%s'.\n"
 
-#: src/ftp.c:1443
+#: src/ftp.c:1472
 #, c-format
 msgid "Wrote HTML-ized index to `%s' [%ld].\n"
 msgstr "Snimio HTML-iziran indeks u `%s' [%ld].\n"
 
-#: src/ftp.c:1448
+#: src/ftp.c:1477
 #, c-format
 msgid "Wrote HTML-ized index to `%s'.\n"
 msgstr "Snimio HTML-iziran indeks u `%s'.\n"
@@ -654,7 +659,8 @@ msgstr ""
 "  -nv, --non-verbose              iskljuèi veæinu ispisa.\n"
 "  -i,  --input-file=DATOTEKA      èitaj URL-ove iz DATOTEKE.\n"
 "  -F,  --force-html               tretiraj ulaznu datoteku kao HTML.\n"
-"  -B,  --base=URL                 osnovni URL za relativne linkove kod -F -i.\n"
+"  -B,  --base=URL                 osnovni URL za relativne linkove kod -F "
+"-i.\n"
 "\n"
 
 #: src/main.c:138
@@ -689,7 +695,8 @@ msgstr ""
 "       --spider                     ni¹ta ne skidaj.\n"
 "  -T,  --timeout=SEKUNDE            postavi timeout èitanja na SEKUNDE.\n"
 "  -w,  --wait=SEKUNDE               èekaj SEKUNDE izmeðu skidanja.\n"
-"       --wait-retry=SEKUNDE         èekaj 1...SEKUNDI izmeðu ponovnih poku¹aja.\n"
+"       --wait-retry=SEKUNDE         èekaj 1...SEKUNDI izmeðu ponovnih "
+"poku¹aja.\n"
 "  -Y,  --proxy=on/off               ukljuèi ili iskljuèi proxy.\n"
 "  -Q,  --quota=BROJ                 postavi ogranièenje skidanja na BROJ.\n"
 "\n"
@@ -734,13 +741,15 @@ msgstr ""
 "HTTP options:\n"
 "       --http-user=KORISNIK     postavi HTTP korisnika na KORISNIK.\n"
 "       --http-passwd=ZAPORKA    postavi HTTP zaporku na ZAPORKA.\n"
-"  -C,  --cache=on/off           dozvoli ili zabrani ke¹iranje na poslu¾itelju\n"
+"  -C,  --cache=on/off           dozvoli ili zabrani ke¹iranje na "
+"poslu¾itelju\n"
 "                                  (obièno dozvoljeno).\n"
 "       --ignore-length          ignoriraj `Content-Length' zaglavlje.\n"
 "       --header=STRING          umetni STRING meðu zaglavlja.\n"
 "       --proxy-user=KORISNIK    postavi KORISNIKA kao proxy korisnika\n"
 "       --proxy-passwd=ZAPORKA   postavi proxy zaporku na ZAPORKU.\n"
-"       --referer=URL            dodaj `Referer: URL' zaglavlje u HTTP zahtjev.\n"
+"       --referer=URL            dodaj `Referer: URL' zaglavlje u HTTP "
+"zahtjev.\n"
 "  -s,  --save-headers           snimaj HTTP zaglavlja na disk.\n"
 "  -U,  --user-agent=KLIJENT     identificiraj se kao KLIJENT umjesto\n"
 "                                  Wget/VERZIJA.\n"
@@ -780,12 +789,14 @@ msgid ""
 msgstr ""
 "Rekurzivno skidanje:\n"
 "  -r,  --recursive             rekurzivno skidanje -- koristi pa¾ljivo!\n"
-"  -l,  --level=NUMBER          maksimalna dubina rekurzije (0 za beskonaènu).\n"
+"  -l,  --level=NUMBER          maksimalna dubina rekurzije (0 za "
+"beskonaènu).\n"
 "       --delete-after          bri¹i skinute datoteke.\n"
 "  -k,  --convert-links         konvertiraj apsolutne linkove u relativne.\n"
 "  -m,  --mirror                ukljuèi opcije pogodne za \"mirror\".\n"
 "  -nr, --dont-remove-listing   ne uklanjaj `.listing' datoteke.\n"
-"  -p,  --page-requisites       skupi slike i drugo potrebno za prikaz HTML-a.\n"
+"  -p,  --page-requisites       skupi slike i drugo potrebno za prikaz "
+"HTML-a.\n"
 "\n"
 
 #: src/main.c:188
@@ -816,7 +827,8 @@ msgstr ""
 "  -A,  --accept=POPIS                popis prihvaæenih nastavaka.\n"
 "  -R,  --reject=POPIS                popis odbijenih nastavaka.\n"
 "  -D,  --domains=POPIS               popis prihvaæenih domena.\n"
-"       --exclude-domains=POPIS       zarezom odvojen popis odbijenih domena.\n"
+"       --exclude-domains=POPIS       zarezom odvojen popis odbijenih "
+"domena.\n"
 "  -L,  --relative                    prati samo relativne linkove.\n"
 "       --follow-ftp                  prati FTP linkove iz HTML dokumenata.\n"
 "       --follow-tags=LIST            zarezom odvojen popis HTML tagova koje\n"
@@ -855,10 +867,13 @@ msgstr ""
 "General Public License za vi¹e detalja.\n"
 
 #: src/main.c:436
+#, fuzzy
 msgid ""
 "\n"
-"Originally written by Hrvoje Niksic <hniksic@iskon.hr>.\n"
+"Originally written by Hrvoje Niksic <hniksic@arsdigita.com>.\n"
-msgstr "\nIzvorno napisao Hrvoje Nik¹iæ <hniksic@iskon.hr>.\n"
+msgstr ""
+"\n"
+"Izvorno napisao Hrvoje Nik¹iæ <hniksic@iskon.hr>.\n"
 
 #: src/main.c:510
 #, c-format
@@ -891,12 +906,12 @@ msgstr "Ne mogu istovremeno paziti na vrijeme i ne gaziti stare datoteke.\n"
 msgid "%s: missing URL\n"
 msgstr "%s: nedostaje URL\n"
 
-#: src/main.c:749
+#: src/main.c:759
 #, c-format
 msgid "No URLs found in %s.\n"
 msgstr "Nijedan URL nije pronaðen u %s.\n"
 
-#: src/main.c:758
+#: src/main.c:768
 #, c-format
 msgid ""
 "\n"
@@ -907,14 +922,14 @@ msgstr ""
 "ZAVR©IO --%s--\n"
 "Skinuo: %s bajta u %d datoteka\n"
 
-#: src/main.c:763
+#: src/main.c:773
 #, c-format
 msgid "Download quota (%s bytes) EXCEEDED!\n"
 msgstr "Kvota (%s bajtova) je PREKORAÈENA!\n"
 
 #. Please note that the double `%' in `%%s' is intentional, because
 #. redirect_output passes tmp through printf.
-#: src/main.c:790
+#: src/main.c:800
 msgid "%s received, redirecting output to `%%s'.\n"
 msgstr "%s primljen, usmjeravam izlaz na `%%s'.\n"
 
@@ -972,17 +987,12 @@ msgstr "Uporaba: %s NETRC [RA
 msgid "%s: cannot stat %s: %s\n"
 msgstr "%s: ne mogu stat-irati %s: %s\n"
 
-#: src/recur.c:463 src/retr.c:468
+#: src/recur.c:469
-#, c-format
-msgid "Removing %s.\n"
-msgstr "Uklanjam %s.\n"
-
-#: src/recur.c:464
 #, c-format
 msgid "Removing %s since it should be rejected.\n"
 msgstr "Uklanjam %s buduæi da bi ga trebalo odbiti.\n"
 
-#: src/recur.c:624
+#: src/recur.c:630
 msgid "Loading robots.txt; please ignore errors.\n"
 msgstr "Uèitavam robots.txt; molim ne obazirati se na gre¹ke.\n"
 
@@ -1009,7 +1019,7 @@ msgstr "Proxy %s: Mora biti HTTP.\n"
 msgid "%s: Redirection to itself.\n"
 msgstr "%s: Redirekcija na samog sebe.\n"
 
-#: src/retr.c:489
+#: src/retr.c:491
 msgid ""
 "Giving up.\n"
 "\n"
@@ -1017,7 +1027,7 @@ msgstr ""
 "Odustajem.\n"
 "\n"
 
-#: src/retr.c:489
+#: src/retr.c:491
 msgid ""
 "Retrying.\n"
 "\n"

po/it.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wget 1.5.2-b1\n"
-"POT-Creation-Date: 2000-10-20 00:29-0700\n"
+"POT-Creation-Date: 2000-10-23 20:39-0700\n"
 "PO-Revision-Date: 1998-06-13 15:22+02:00\n"
 "Last-Translator: Giovanni Bortolozzo <borto@dei.unipd.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -196,38 +196,43 @@ msgstr ""
 "%s (%s) - `%s' salvato [%ld]\n"
 "\n"
 
-#: src/ftp.c:1034
+#: src/ftp.c:1022 src/main.c:744 src/recur.c:468 src/retr.c:470
+#, c-format
+msgid "Removing %s.\n"
+msgstr "Rimuovo %s.\n"
+
+#: src/ftp.c:1063
 #, c-format
 msgid "Using `%s' as listing tmp file.\n"
 msgstr "Utilizzo `%s' come file temporaneo per il listing.\n"
 
-#: src/ftp.c:1046
+#: src/ftp.c:1075
 #, c-format
 msgid "Removed `%s'.\n"
 msgstr "`%s' rimosso.\n"
 
-#: src/ftp.c:1082
+#: src/ftp.c:1111
 #, c-format
 msgid "Recursion depth %d exceeded max. depth %d.\n"
 msgstr "La profondità di %d nella ricorsione eccede il massimo ( %d ).\n"
 
-#: src/ftp.c:1134 src/http.c:1163
+#: src/ftp.c:1163 src/http.c:1163
 #, c-format
 msgid ""
 "Server file no newer than local file `%s' -- not retrieving.\n"
 "\n"
 msgstr ""
 
-#: src/ftp.c:1140 src/http.c:1171
+#: src/ftp.c:1169 src/http.c:1171
 #, fuzzy, c-format
 msgid "The sizes do not match (local %ld) -- retrieving.\n"
 msgstr "Le dimensioni non coincidono (locale %ld), lo scarico.\n"
 
-#: src/ftp.c:1157
+#: src/ftp.c:1186
 msgid "Invalid name of the symlink, skipping.\n"
 msgstr "Il nome del link simbolico non è valido, passo oltre.\n"
 
-#: src/ftp.c:1174
+#: src/ftp.c:1203
 #, c-format
 msgid ""
 "Already have correct symlink %s -> %s\n"
@@ -236,42 +241,42 @@ msgstr ""
 "Ho già il link simbolico %s -> %s\n"
 "\n"
 
-#: src/ftp.c:1182
+#: src/ftp.c:1211
 #, c-format
 msgid "Creating symlink %s -> %s\n"
 msgstr "Creo il link simbolico %s -> %s\n"
 
-#: src/ftp.c:1193
+#: src/ftp.c:1222
 #, c-format
 msgid "Symlinks not supported, skipping symlink `%s'.\n"
 msgstr "Link simbolici non supportati, ignoro il link `%s'.\n"
 
-#: src/ftp.c:1205
+#: src/ftp.c:1234
 #, c-format
 msgid "Skipping directory `%s'.\n"
 msgstr "Ignoro la directory `%s'.\n"
 
-#: src/ftp.c:1214
+#: src/ftp.c:1243
 #, c-format
 msgid "%s: unknown/unsupported file type.\n"
 msgstr "%s: tipo di file sconosciuto/non supportato.\n"
 
-#: src/ftp.c:1231
+#: src/ftp.c:1260
 #, c-format
 msgid "%s: corrupt time-stamp.\n"
 msgstr "%s: time-stamp corrotto.\n"
 
-#: src/ftp.c:1252
+#: src/ftp.c:1281
 #, c-format
 msgid "Will not retrieve dirs since depth is %d (max %d).\n"
 msgstr "Non scarico le directory perché la profondità é %d (max %d).\n"
 
-#: src/ftp.c:1291
+#: src/ftp.c:1320
 #, c-format
 msgid "Not descending to `%s' as it is excluded/not-included.\n"
 msgstr "Non scendo nella directory `%s' perché è esclusa/non inclusa.\n"
 
-#: src/ftp.c:1336
+#: src/ftp.c:1365
 #, c-format
 msgid "Rejecting `%s'.\n"
 msgstr "Rifiuto `%s'.\n"
@@ -279,17 +284,17 @@ msgstr "Rifiuto `%s'.\n"
 #. No luck.
 #. #### This message SUCKS.  We should see what was the
 #. reason that nothing was retrieved.
-#: src/ftp.c:1383
+#: src/ftp.c:1412
 #, c-format
 msgid "No matches on pattern `%s'.\n"
 msgstr "Nessun corrispondenza con il modello `%s'.\n"
 
-#: src/ftp.c:1443
+#: src/ftp.c:1472
 #, c-format
 msgid "Wrote HTML-ized index to `%s' [%ld].\n"
 msgstr "Scrivo l'indice in formato HTML in `%s' [%ld].\n"
 
-#: src/ftp.c:1448
+#: src/ftp.c:1477
 #, c-format
 msgid "Wrote HTML-ized index to `%s'.\n"
 msgstr "Scrivo l'indice in formato HTML in `%s'.\n"
@@ -875,7 +880,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "\n"
-"Originally written by Hrvoje Niksic <hniksic@iskon.hr>.\n"
+"Originally written by Hrvoje Niksic <hniksic@arsdigita.com>.\n"
 msgstr ""
 "\n"
 "Scritto da Hrvoje Niksic <hniksic@srce.hr>.\n"
@@ -913,12 +918,12 @@ msgstr ""
 msgid "%s: missing URL\n"
 msgstr "%s: manca l'URL\n"
 
-#: src/main.c:749
+#: src/main.c:759
 #, c-format
 msgid "No URLs found in %s.\n"
 msgstr "Non ci sono URL in %s.\n"
 
-#: src/main.c:758
+#: src/main.c:768
 #, c-format
 msgid ""
 "\n"
@@ -929,14 +934,14 @@ msgstr ""
 "FINITO --%s--\n"
 "Scaricati: %s byte in %d file\n"
 
-#: src/main.c:763
+#: src/main.c:773
 #, c-format
 msgid "Download quota (%s bytes) EXCEEDED!\n"
 msgstr "Quota per lo scarico (%s byte) SUPERATA!\n"
 
 #. Please note that the double `%' in `%%s' is intentional, because
 #. redirect_output passes tmp through printf.
-#: src/main.c:790
+#: src/main.c:800
 msgid "%s received, redirecting output to `%%s'.\n"
 msgstr "%s ricevuti, redirigo l'output su `%%s'.\n"
 
@@ -994,17 +999,12 @@ msgstr "Uso: %s NETRC [HOSTNAME]\n"
 msgid "%s: cannot stat %s: %s\n"
 msgstr "%s: stat su %s fallita: %s\n"
 
-#: src/recur.c:463 src/retr.c:468
+#: src/recur.c:469
-#, c-format
-msgid "Removing %s.\n"
-msgstr "Rimuovo %s.\n"
-
-#: src/recur.c:464
 #, c-format
 msgid "Removing %s since it should be rejected.\n"
 msgstr "Rimuovo %s poiché deve essere rifiutato.\n"
 
-#: src/recur.c:624
+#: src/recur.c:630
 msgid "Loading robots.txt; please ignore errors.\n"
 msgstr "Carico robots.txt; si ignorino eventuali errori.\n"
 
@@ -1031,7 +1031,7 @@ msgstr "Proxy %s: Deve essere HTTP.\n"
 msgid "%s: Redirection to itself.\n"
 msgstr "%s: Redirezione su se stesso.\n"
 
-#: src/retr.c:489
+#: src/retr.c:491
 msgid ""
 "Giving up.\n"
 "\n"
@@ -1039,7 +1039,7 @@ msgstr ""
 "Rinuncio.\n"
 "\n"
 
-#: src/retr.c:489
+#: src/retr.c:491
 msgid ""
 "Retrying.\n"
 "\n"

po/no.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wget 1.5.2-b1\n"
-"POT-Creation-Date: 2000-10-20 00:29-0700\n"
+"POT-Creation-Date: 2000-10-23 20:39-0700\n"
 "PO-Revision-Date: 1998-05-22 09:00+0100\n"
 "Last-Translator: Robert Schmidt <rsc@vingmed.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -195,38 +195,43 @@ msgstr ""
 "%s (%s) - «%s» lagret [%ld]\n"
 "\n"
 
-#: src/ftp.c:1034
+#: src/ftp.c:1022 src/main.c:744 src/recur.c:468 src/retr.c:470
+#, c-format
+msgid "Removing %s.\n"
+msgstr "Fjerner %s.\n"
+
+#: src/ftp.c:1063
 #, c-format
 msgid "Using `%s' as listing tmp file.\n"
 msgstr "Bruker «%s» som temporær katalogliste.\n"
 
-#: src/ftp.c:1046
+#: src/ftp.c:1075
 #, c-format
 msgid "Removed `%s'.\n"
 msgstr "Slettet «%s».\n"
 
-#: src/ftp.c:1082
+#: src/ftp.c:1111
 #, c-format
 msgid "Recursion depth %d exceeded max. depth %d.\n"
 msgstr "Rekursjonsdybde %d overskred maksimal dybde %d.\n"
 
-#: src/ftp.c:1134 src/http.c:1163
+#: src/ftp.c:1163 src/http.c:1163
 #, c-format
 msgid ""
 "Server file no newer than local file `%s' -- not retrieving.\n"
 "\n"
 msgstr ""
 
-#: src/ftp.c:1140 src/http.c:1171
+#: src/ftp.c:1169 src/http.c:1171
 #, fuzzy, c-format
 msgid "The sizes do not match (local %ld) -- retrieving.\n"
 msgstr "Filstørrelsene er forskjellige (local %ld), hentes.\n"
 
-#: src/ftp.c:1157
+#: src/ftp.c:1186
 msgid "Invalid name of the symlink, skipping.\n"
 msgstr "Ugyldig navn for symbolsk link, ignoreres.\n"
 
-#: src/ftp.c:1174
+#: src/ftp.c:1203
 #, c-format
 msgid ""
 "Already have correct symlink %s -> %s\n"
@@ -235,42 +240,42 @@ msgstr ""
 "Har allerede gyldig symbolsk link %s -> %s\n"
 "\n"
 
-#: src/ftp.c:1182
+#: src/ftp.c:1211
 #, c-format
 msgid "Creating symlink %s -> %s\n"
 msgstr "Lager symbolsk link %s -> %s\n"
 
-#: src/ftp.c:1193
+#: src/ftp.c:1222
 #, c-format
 msgid "Symlinks not supported, skipping symlink `%s'.\n"
 msgstr "Symbolske linker ikke støttet, ignorerer «%s».\n"
 
-#: src/ftp.c:1205
+#: src/ftp.c:1234
 #, c-format
 msgid "Skipping directory `%s'.\n"
 msgstr "Ignorerer katalog «%s».\n"
 
-#: src/ftp.c:1214
+#: src/ftp.c:1243
 #, c-format
 msgid "%s: unknown/unsupported file type.\n"
 msgstr "%s: filtypen er ukjent/ikke støttet.\n"
 
-#: src/ftp.c:1231
+#: src/ftp.c:1260
 #, c-format
 msgid "%s: corrupt time-stamp.\n"
 msgstr "%s: ugyldig tidsstempel.\n"
 
-#: src/ftp.c:1252
+#: src/ftp.c:1281
 #, c-format
 msgid "Will not retrieve dirs since depth is %d (max %d).\n"
 msgstr "Henter ikke kataloger på dybde %d (max %d).\n"
 
-#: src/ftp.c:1291
+#: src/ftp.c:1320
 #, c-format
 msgid "Not descending to `%s' as it is excluded/not-included.\n"
 msgstr "Behandler ikke «%s» da det er ekskludert/ikke inkludert.\n"
 
-#: src/ftp.c:1336
+#: src/ftp.c:1365
 #, c-format
 msgid "Rejecting `%s'.\n"
 msgstr "Ignorerer «%s».\n"
@@ -278,17 +283,17 @@ msgstr "Ignorerer
 #. No luck.
 #. #### This message SUCKS.  We should see what was the
 #. reason that nothing was retrieved.
-#: src/ftp.c:1383
+#: src/ftp.c:1412
 #, c-format
 msgid "No matches on pattern `%s'.\n"
 msgstr "Ingenting passer med mønsteret «%s».\n"
 
-#: src/ftp.c:1443
+#: src/ftp.c:1472
 #, c-format
 msgid "Wrote HTML-ized index to `%s' [%ld].\n"
 msgstr "Skrev HTML-formattert indeks til «%s» [%ld].\n"
 
-#: src/ftp.c:1448
+#: src/ftp.c:1477
 #, c-format
 msgid "Wrote HTML-ized index to `%s'.\n"
 msgstr "Skrev HTML-formattert indeks til «%s».\n"
@@ -862,7 +867,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "\n"
-"Originally written by Hrvoje Niksic <hniksic@iskon.hr>.\n"
+"Originally written by Hrvoje Niksic <hniksic@arsdigita.com>.\n"
 msgstr ""
 "\n"
 "Skrevet av Hrvoje Niksic <hniksic@srce.hr>.\n"
@@ -899,12 +904,12 @@ msgstr ""
 msgid "%s: missing URL\n"
 msgstr "%s: URL mangler.\n"
 
-#: src/main.c:749
+#: src/main.c:759
 #, c-format
 msgid "No URLs found in %s.\n"
 msgstr "Fant ingen URLer i %s.\n"
 
-#: src/main.c:758
+#: src/main.c:768
 #, c-format
 msgid ""
 "\n"
@@ -915,14 +920,14 @@ msgstr ""
 "FERDIG --%s--\n"
 "Lastet ned %s bytes i %d filer\n"
 
-#: src/main.c:763
+#: src/main.c:773
 #, c-format
 msgid "Download quota (%s bytes) EXCEEDED!\n"
 msgstr "Nedlastingskvote (%s bytes) overskredet!\n"
 
 #. Please note that the double `%' in `%%s' is intentional, because
 #. redirect_output passes tmp through printf.
-#: src/main.c:790
+#: src/main.c:800
 msgid "%s received, redirecting output to `%%s'.\n"
 msgstr "%s mottatt, omdirigerer utskrifter til «%%s».\n"
 
@@ -980,17 +985,12 @@ msgstr "Bruk: %s NETRC [TJENERNAVN]\n"
 msgid "%s: cannot stat %s: %s\n"
 msgstr "%s: «stat» feilet for %s: %s\n"
 
-#: src/recur.c:463 src/retr.c:468
+#: src/recur.c:469
-#, c-format
-msgid "Removing %s.\n"
-msgstr "Fjerner %s.\n"
-
-#: src/recur.c:464
 #, c-format
 msgid "Removing %s since it should be rejected.\n"
 msgstr "Fjerner %s fordi den skal forkastes.\n"
 
-#: src/recur.c:624
+#: src/recur.c:630
 msgid "Loading robots.txt; please ignore errors.\n"
 msgstr "Henter robots.txt; ignorer eventuelle feilmeldinger.\n"
 
@@ -1017,7 +1017,7 @@ msgstr "Proxy %s: M
 msgid "%s: Redirection to itself.\n"
 msgstr "%s: Omdirigerer til seg selv.\n"
 
-#: src/retr.c:489
+#: src/retr.c:491
 msgid ""
 "Giving up.\n"
 "\n"
@@ -1025,7 +1025,7 @@ msgstr ""
 "Gir opp.\n"
 "\n"
 
-#: src/retr.c:489
+#: src/retr.c:491
 msgid ""
 "Retrying.\n"
 "\n"

po/pl.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wget 1.5.3\n"
-"POT-Creation-Date: 2000-10-20 00:29-0700\n"
+"POT-Creation-Date: 2000-10-23 20:39-0700\n"
 "PO-Revision-Date: 2000-09-15 23:44+0200\n"
 "Last-Translator: Grzegorz Kowal <g_kowal@poczta.onet.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -195,38 +195,43 @@ msgstr ""
 "%s (%s) - zapisano `%s' [%ld]\n"
 "\n"
 
-#: src/ftp.c:1034
+#: src/ftp.c:1022 src/main.c:744 src/recur.c:468 src/retr.c:470
+#, c-format
+msgid "Removing %s.\n"
+msgstr "Usuwanie %s.\n"
+
+#: src/ftp.c:1063
 #, c-format
 msgid "Using `%s' as listing tmp file.\n"
 msgstr "U?ycie `%s' jako tymczasowego pliku wylistowania.\n"
 
-#: src/ftp.c:1046
+#: src/ftp.c:1075
 #, c-format
 msgid "Removed `%s'.\n"
 msgstr "Usuni?to `%s'.\n"
 
-#: src/ftp.c:1082
+#: src/ftp.c:1111
 #, c-format
 msgid "Recursion depth %d exceeded max. depth %d.\n"
 msgstr "G??boko?? rekursji %d przekroczy?a g??boko?? maksymaln? %d.\n"
 
-#: src/ftp.c:1134 src/http.c:1163
+#: src/ftp.c:1163 src/http.c:1163
 #, c-format
 msgid ""
 "Server file no newer than local file `%s' -- not retrieving.\n"
 "\n"
 msgstr ""
 
-#: src/ftp.c:1140 src/http.c:1171
+#: src/ftp.c:1169 src/http.c:1171
 #, fuzzy, c-format
 msgid "The sizes do not match (local %ld) -- retrieving.\n"
 msgstr "Rozmiary nie s? zgodne (lokalny %ld), wi?c pobieram.\n"
 
-#: src/ftp.c:1157
+#: src/ftp.c:1186
 msgid "Invalid name of the symlink, skipping.\n"
 msgstr "Nieprawid?owa nazwa ??cza symbolicznego, wi?c pomijam go.\n"
 
-#: src/ftp.c:1174
+#: src/ftp.c:1203
 #, c-format
 msgid ""
 "Already have correct symlink %s -> %s\n"
@@ -235,42 +240,42 @@ msgstr ""
 "Istnieje ju? prawid?owe ??cze symboliczne %s -> %s\n"
 "\n"
 
-#: src/ftp.c:1182
+#: src/ftp.c:1211
 #, c-format
 msgid "Creating symlink %s -> %s\n"
 msgstr "Tworz? ??cze symboliczne %s -> %s\n"
 
-#: src/ftp.c:1193
+#: src/ftp.c:1222
 #, c-format
 msgid "Symlinks not supported, skipping symlink `%s'.\n"
 msgstr "??cza symboliczne nie s? obs?ugiwane, wi?c pomijam ??cze `%s'.\n"
 
-#: src/ftp.c:1205
+#: src/ftp.c:1234
 #, c-format
 msgid "Skipping directory `%s'.\n"
 msgstr "Pomijam katalog `%s'.\n"
 
-#: src/ftp.c:1214
+#: src/ftp.c:1243
 #, c-format
 msgid "%s: unknown/unsupported file type.\n"
 msgstr "%s: nieznany/nieobs?ugiwany typ pliku.\n"
 
-#: src/ftp.c:1231
+#: src/ftp.c:1260
 #, c-format
 msgid "%s: corrupt time-stamp.\n"
 msgstr "%s: zniszczony znacznik czasu.\n"
 
-#: src/ftp.c:1252
+#: src/ftp.c:1281
 #, c-format
 msgid "Will not retrieve dirs since depth is %d (max %d).\n"
 msgstr "Nie b?d? pobiera? katalogów dopóki g??boko?? wynosi %d (maks. %d).\n"
 
-#: src/ftp.c:1291
+#: src/ftp.c:1320
 #, c-format
 msgid "Not descending to `%s' as it is excluded/not-included.\n"
 msgstr "Brak zej?cia do `%s', tak jak to jest wykluczone/nie w??czone.\n"
 
-#: src/ftp.c:1336
+#: src/ftp.c:1365
 #, c-format
 msgid "Rejecting `%s'.\n"
 msgstr "Odrzucam `%s'.\n"
@@ -278,17 +283,17 @@ msgstr "Odrzucam `%s'.\n"
 #. No luck.
 #. #### This message SUCKS.  We should see what was the
 #. reason that nothing was retrieved.
-#: src/ftp.c:1383
+#: src/ftp.c:1412
 #, c-format
 msgid "No matches on pattern `%s'.\n"
 msgstr "Brak dopasowa? do wzorca `%s'.\n"
 
-#: src/ftp.c:1443
+#: src/ftp.c:1472
 #, c-format
 msgid "Wrote HTML-ized index to `%s' [%ld].\n"
 msgstr "Indeks w formacie HTML zosta? zapisany w `%s' [%ld].\n"
 
-#: src/ftp.c:1448
+#: src/ftp.c:1477
 #, c-format
 msgid "Wrote HTML-ized index to `%s'.\n"
 msgstr "Indeks w formacie HTML zosta? zapisany w `%s'.\n"
@@ -870,7 +875,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "\n"
-"Originally written by Hrvoje Niksic <hniksic@iskon.hr>.\n"
+"Originally written by Hrvoje Niksic <hniksic@arsdigita.com>.\n"
 msgstr ""
 "\n"
 "Napisany przez Hrvoje Niksic <hniksic@srce.hr>.\n"
@@ -908,12 +913,12 @@ msgstr ""
 msgid "%s: missing URL\n"
 msgstr "%s: brak URL'a\n"
 
-#: src/main.c:749
+#: src/main.c:759
 #, c-format
 msgid "No URLs found in %s.\n"
 msgstr "Nie znaleziono ?adnych URL'i w %s.\n"
 
-#: src/main.c:758
+#: src/main.c:768
 #, c-format
 msgid ""
 "\n"
@@ -924,14 +929,14 @@ msgstr ""
 "ZAKO?CZONO --%s--\n"
 "Pobrano: %s bajtów w %d plikach\n"
 
-#: src/main.c:763
+#: src/main.c:773
 #, c-format
 msgid "Download quota (%s bytes) EXCEEDED!\n"
 msgstr "Ograniczenie rozmiaru pobierania (%s bajtów) zosta?o PRZEKROCZONE!\n"
 
 #. Please note that the double `%' in `%%s' is intentional, because
 #. redirect_output passes tmp through printf.
-#: src/main.c:790
+#: src/main.c:800
 msgid "%s received, redirecting output to `%%s'.\n"
 msgstr "pobrano %s, przekierowanie wyj?cia do `%%s'.\n"
 
@@ -990,17 +995,12 @@ msgstr "U?ycie: %s NETRC [NAZWA_SERWERA]\n"
 msgid "%s: cannot stat %s: %s\n"
 msgstr "%s: nie mog? przeprowadzi? statystyki %s: %s\n"
 
-#: src/recur.c:463 src/retr.c:468
+#: src/recur.c:469
-#, c-format
-msgid "Removing %s.\n"
-msgstr "Usuwanie %s.\n"
-
-#: src/recur.c:464
 #, c-format
 msgid "Removing %s since it should be rejected.\n"
 msgstr "Usuni?cie %s poniewa? powinien by? odrzucony.\n"
 
-#: src/recur.c:624
+#: src/recur.c:630
 msgid "Loading robots.txt; please ignore errors.\n"
 msgstr "?adowanie robots.txt; prosz? zignorowa? b??dy.\n"
 
@@ -1027,7 +1027,7 @@ msgstr "Proxy %s: Musi by? HTTP.\n"
 msgid "%s: Redirection to itself.\n"
 msgstr "%s: Przekierowanie na samego siebie.\n"
 
-#: src/retr.c:489
+#: src/retr.c:491
 msgid ""
 "Giving up.\n"
 "\n"
@@ -1035,7 +1035,7 @@ msgstr ""
 "Poddaj? si?.\n"
 "\n"
 
-#: src/retr.c:489
+#: src/retr.c:491
 msgid ""
 "Retrying.\n"
 "\n"

po/pt_BR.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wget 1.5-b9\n"
-"POT-Creation-Date: 2000-10-20 00:29-0700\n"
+"POT-Creation-Date: 2000-10-23 20:39-0700\n"
 "PO-Revision-Date: 1998-04-06 22:09-0300\n"
 "Last-Translator: Wanderlei Antonio Cavasin <cavassin@conectiva.com.br>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -212,24 +212,30 @@ msgstr ""
 "\n"
 
 # , c-format
-#: src/ftp.c:1034
+#: src/ftp.c:1022 src/main.c:744 src/recur.c:468 src/retr.c:470
+#, c-format
+msgid "Removing %s.\n"
+msgstr "Removendo %s.\n"
+
+# , c-format
+#: src/ftp.c:1063
 #, c-format
 msgid "Using `%s' as listing tmp file.\n"
 msgstr "Usando `%s' como arquivo temporário de listagem.\n"
 
 # , c-format
-#: src/ftp.c:1046
+#: src/ftp.c:1075
 #, c-format
 msgid "Removed `%s'.\n"
 msgstr "Removido `%s'.\n"
 
 # , c-format
-#: src/ftp.c:1082
+#: src/ftp.c:1111
 #, c-format
 msgid "Recursion depth %d exceeded max. depth %d.\n"
 msgstr "Nível de recursão %d excede nível máximo %d.\n"
 
-#: src/ftp.c:1134 src/http.c:1163
+#: src/ftp.c:1163 src/http.c:1163
 #, c-format
 msgid ""
 "Server file no newer than local file `%s' -- not retrieving.\n"
@@ -237,17 +243,17 @@ msgid ""
 msgstr ""
 
 # , c-format
-#: src/ftp.c:1140 src/http.c:1171
+#: src/ftp.c:1169 src/http.c:1171
 #, fuzzy, c-format
 msgid "The sizes do not match (local %ld) -- retrieving.\n"
 msgstr "Os tamanhos não são iguais (local %ld), baixando.\n"
 
-#: src/ftp.c:1157
+#: src/ftp.c:1186
 msgid "Invalid name of the symlink, skipping.\n"
 msgstr "Nome inválido do link simbólico, ignorando.\n"
 
 # , c-format
-#: src/ftp.c:1174
+#: src/ftp.c:1203
 #, c-format
 msgid ""
 "Already have correct symlink %s -> %s\n"
@@ -257,50 +263,50 @@ msgstr ""
 "\n"
 
 # , c-format
-#: src/ftp.c:1182
+#: src/ftp.c:1211
 #, c-format
 msgid "Creating symlink %s -> %s\n"
 msgstr "Criando link simbólico %s -> %s\n"
 
 # , c-format
-#: src/ftp.c:1193
+#: src/ftp.c:1222
 #, c-format
 msgid "Symlinks not supported, skipping symlink `%s'.\n"
 msgstr "Links simbólicos não suportados, %s será ignorado.\n"
 
 # , c-format
-#: src/ftp.c:1205
+#: src/ftp.c:1234
 #, c-format
 msgid "Skipping directory `%s'.\n"
 msgstr "Ignorando diretório `%s'.\n"
 
 # , c-format
-#: src/ftp.c:1214
+#: src/ftp.c:1243
 #, c-format
 msgid "%s: unknown/unsupported file type.\n"
 msgstr "%s: tipo de arquivo desconhecido/não suportado.\n"
 
 # , c-format
-#: src/ftp.c:1231
+#: src/ftp.c:1260
 #, c-format
 msgid "%s: corrupt time-stamp.\n"
 msgstr "%s: horário (timestamp) inválido.\n"
 
 # , c-format
-#: src/ftp.c:1252
+#: src/ftp.c:1281
 #, c-format
 msgid "Will not retrieve dirs since depth is %d (max %d).\n"
 msgstr ""
 "Não serão buscados diretórios, pois o nível de recursão é %d (max %d).\n"
 
 # , c-format
-#: src/ftp.c:1291
+#: src/ftp.c:1320
 #, c-format
 msgid "Not descending to `%s' as it is excluded/not-included.\n"
 msgstr "Não descendo para `%s', pois está excluído/não incluído.\n"
 
 # , c-format
-#: src/ftp.c:1336
+#: src/ftp.c:1365
 #, c-format
 msgid "Rejecting `%s'.\n"
 msgstr "Rejeitando `%s'.\n"
@@ -309,19 +315,19 @@ msgstr "Rejeitando `%s'.\n"
 #. No luck.
 #. #### This message SUCKS.  We should see what was the
 #. reason that nothing was retrieved.
-#: src/ftp.c:1383
+#: src/ftp.c:1412
 #, c-format
 msgid "No matches on pattern `%s'.\n"
 msgstr "Nada encontrado com o padrão `%s'.\n"
 
 # , c-format
-#: src/ftp.c:1443
+#: src/ftp.c:1472
 #, c-format
 msgid "Wrote HTML-ized index to `%s' [%ld].\n"
 msgstr "Escrito index em formato HTML para `%s' [%ld].\n"
 
 # , c-format
-#: src/ftp.c:1448
+#: src/ftp.c:1477
 #, c-format
 msgid "Wrote HTML-ized index to `%s'.\n"
 msgstr "Escrito índice em formato HTML para `%s'.\n"
@@ -934,7 +940,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "\n"
-"Originally written by Hrvoje Niksic <hniksic@iskon.hr>.\n"
+"Originally written by Hrvoje Niksic <hniksic@arsdigita.com>.\n"
 msgstr ""
 "\n"
 "Escrito por Hrvoje Niksic <hniksic@srce.hr>.\n"
@@ -976,13 +982,13 @@ msgid "%s: missing URL\n"
 msgstr "%s: URL faltando\n"
 
 # , c-format
-#: src/main.c:749
+#: src/main.c:759
 #, c-format
 msgid "No URLs found in %s.\n"
 msgstr "Nenhuma URL encontrada em %s.\n"
 
 # , c-format
-#: src/main.c:758
+#: src/main.c:768
 #, c-format
 msgid ""
 "\n"
@@ -994,14 +1000,14 @@ msgstr ""
 "Baixados: %s bytes em %d arquivos\n"
 
 # , c-format
-#: src/main.c:763
+#: src/main.c:773
 #, c-format
 msgid "Download quota (%s bytes) EXCEEDED!\n"
 msgstr "EXCEDIDA a quota (%s bytes) de recepção!\n"
 
 #. Please note that the double `%' in `%%s' is intentional, because
 #. redirect_output passes tmp through printf.
-#: src/main.c:790
+#: src/main.c:800
 msgid "%s received, redirecting output to `%%s'.\n"
 msgstr "%s recebido, redirecionando saída para `%%s'.\n"
 
@@ -1067,18 +1073,12 @@ msgid "%s: cannot stat %s: %s\n"
 msgstr "%s: não foi possível acessar %s: %s\n"
 
 # , c-format
-#: src/recur.c:463 src/retr.c:468
+#: src/recur.c:469
-#, c-format
-msgid "Removing %s.\n"
-msgstr "Removendo %s.\n"
-
-# , c-format
-#: src/recur.c:464
 #, c-format
 msgid "Removing %s since it should be rejected.\n"
 msgstr "Removendo %s pois ele deve ser rejeitado.\n"
 
-#: src/recur.c:624
+#: src/recur.c:630
 msgid "Loading robots.txt; please ignore errors.\n"
 msgstr "Buscando robots.txt; por favor ignore qualquer erro.\n"
 
@@ -1108,7 +1108,7 @@ msgstr "Proxy %s: Deve ser HTTP.\n"
 msgid "%s: Redirection to itself.\n"
 msgstr "%s: Redireção para si mesmo.\n"
 
-#: src/retr.c:489
+#: src/retr.c:491
 msgid ""
 "Giving up.\n"
 "\n"
@@ -1116,7 +1116,7 @@ msgstr ""
 "Desistindo.\n"
 "\n"
 
-#: src/retr.c:489
+#: src/retr.c:491
 msgid ""
 "Retrying.\n"
 "\n"

po/ru.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wget 1.5.4\n"
-"POT-Creation-Date: 2000-10-20 00:29-0700\n"
+"POT-Creation-Date: 2000-10-23 20:39-0700\n"
 "PO-Revision-Date: 2000-09-18 01:16+08:00\n"
 "Last-Translator: Const Kaplinsky <const@ce.cctpu.edu.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -195,38 +195,43 @@ msgstr ""
 "%s (%s) - `%s' ÓÏÈÒÁÎÅÎ [%ld]\n"
 "\n"
 
-#: src/ftp.c:1034
+#: src/ftp.c:1022 src/main.c:744 src/recur.c:468 src/retr.c:470
+#, c-format
+msgid "Removing %s.\n"
+msgstr "õÄÁÌÅÎÉÅ %s.\n"
+
+#: src/ftp.c:1063
 #, c-format
 msgid "Using `%s' as listing tmp file.\n"
 msgstr "ìÉÓÔÉÎÇ ÂÕÄÅÔ ÓÏÈÒÁÎÅÎ ×Ï ×ÒÅÍÅÎÎÏÍ ÆÁÊÌÅ `%s'.\n"
 
-#: src/ftp.c:1046
+#: src/ftp.c:1075
 #, c-format
 msgid "Removed `%s'.\n"
 msgstr "õÄÁÌÅÎ `%s'.\n"
 
-#: src/ftp.c:1082
+#: src/ftp.c:1111
 #, c-format
 msgid "Recursion depth %d exceeded max. depth %d.\n"
 msgstr "çÌÕÂÉÎÁ ÒÅËÕÒÓÉÉ %d ÐÒÅ×ÙÓÉÌÁ ÍÁËÓÉÍÁÌØÎÕÀ ÇÌÕÂÉÎÕ %d.\n"
 
-#: src/ftp.c:1134 src/http.c:1163
+#: src/ftp.c:1163 src/http.c:1163
 #, c-format
 msgid ""
 "Server file no newer than local file `%s' -- not retrieving.\n"
 "\n"
 msgstr "æÁÊÌ ÎÁ ÓÅÒ×ÅÒÅ ÎÅ ÎÏ×ÅÅ ÌÏËÁÌØÎÏÇÏ ÆÁÊÌÁ `%s' -- ÐÒÏÐÕÓË.\n"
 
-#: src/ftp.c:1140 src/http.c:1171
+#: src/ftp.c:1169 src/http.c:1171
 #, c-format
 msgid "The sizes do not match (local %ld) -- retrieving.\n"
 msgstr "òÁÚÍÅÒÙ ÆÁÊÌÏ× ÎÅ ÓÏ×ÐÁÄÁÀÔ (ÌÏËÁÌØÎÙÊ ÒÁÚÍÅÒ %ld) -- ÐÏÌÕÞÅÎÉÅ.\n"
 
-#: src/ftp.c:1157
+#: src/ftp.c:1186
 msgid "Invalid name of the symlink, skipping.\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÏÅ ÉÍÑ ÓÉÍ×ÏÌØÎÏÊ ÓÓÙÌËÉ, ÐÒÏÐÕÝÅÎÏ.\n"
 
-#: src/ftp.c:1174
+#: src/ftp.c:1203
 #, c-format
 msgid ""
 "Already have correct symlink %s -> %s\n"
@@ -235,42 +240,42 @@ msgstr ""
 "ëÏÒÒÅËÔÎÁÑ ÓÓÙÌËÁ %s -> %s ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ.\n"
 "\n"
 
-#: src/ftp.c:1182
+#: src/ftp.c:1211
 #, c-format
 msgid "Creating symlink %s -> %s\n"
 msgstr "óÏÚÄÁÎÉÅ ÓÉÍ×ÏÌØÎÏÊ ÓÓÙÌËÉ %s -> %s\n"
 
-#: src/ftp.c:1193
+#: src/ftp.c:1222
 #, c-format
 msgid "Symlinks not supported, skipping symlink `%s'.\n"
 msgstr "óÉÍ×ÏÌØÎÙÅ ÓÓÙÌËÉ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ, ÐÒÏÐÕÓË `%s'.\n"
 
-#: src/ftp.c:1205
+#: src/ftp.c:1234
 #, c-format
 msgid "Skipping directory `%s'.\n"
 msgstr "ðÒÏÐÕÓË ËÁÔÁÌÏÇÁ `%s'.\n"
 
-#: src/ftp.c:1214
+#: src/ftp.c:1243
 #, c-format
 msgid "%s: unknown/unsupported file type.\n"
 msgstr "%s: ÔÉÐ ÆÁÊÌÁ ÎÅÉÚ×ÅÓÔÅÎ ÉÌÉ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ.\n"
 
-#: src/ftp.c:1231
+#: src/ftp.c:1260
 #, c-format
 msgid "%s: corrupt time-stamp.\n"
 msgstr "%s: ÎÅ×ÅÒÎÏÅ ×ÒÅÍÑ ÉÚÍÅÎÅÎÉÑ ÆÁÊÌÁ.\n"
 
-#: src/ftp.c:1252
+#: src/ftp.c:1281
 #, c-format
 msgid "Will not retrieve dirs since depth is %d (max %d).\n"
 msgstr "ëÁÔÁÌÏÇÉ ÎÅ ÂÕÄÕÔ ÐÏÌÕÞÅÎÙ, ÇÌÕÂÉÎÁ ÓÏÓÔÁ×ÌÑÅÔ %d (ÍÁËÓÉÍÕÍ %d).\n"
 
-#: src/ftp.c:1291
+#: src/ftp.c:1320
 #, c-format
 msgid "Not descending to `%s' as it is excluded/not-included.\n"
 msgstr "ëÁÔÁÌÏÇ `%s' ÐÒÏÐÕÝÅÎ, ÔÁË ËÁË ÎÁÈÏÄÉÔÓÑ × ÓÐÉÓËÅ ÉÓËÌÀÞÅÎÎÙÈ.\n"
 
-#: src/ftp.c:1336
+#: src/ftp.c:1365
 #, c-format
 msgid "Rejecting `%s'.\n"
 msgstr "ðÒÏÐÕÓË `%s'.\n"
@@ -278,17 +283,17 @@ msgstr "
 #. No luck.
 #. #### This message SUCKS.  We should see what was the
 #. reason that nothing was retrieved.
-#: src/ftp.c:1383
+#: src/ftp.c:1412
 #, c-format
 msgid "No matches on pattern `%s'.\n"
 msgstr "îÅÔ ÓÏ×ÐÁÄÅÎÉÊ Ó ÛÁÂÌÏÎÏÍ `%s'.\n"
 
-#: src/ftp.c:1443
+#: src/ftp.c:1472
 #, c-format
 msgid "Wrote HTML-ized index to `%s' [%ld].\n"
 msgstr "ìÉÓÔÉÎÇ × ÆÏÒÍÁÔÅ HTML ÚÁÐÉÓÁÎ × ÆÁÊÌ `%s' [%ld].\n"
 
-#: src/ftp.c:1448
+#: src/ftp.c:1477
 #, c-format
 msgid "Wrote HTML-ized index to `%s'.\n"
 msgstr "ìÉÓÔÉÎÇ × ÆÏÒÍÁÔÅ HTML ÚÁÐÉÓÁÎ × ÆÁÊÌ `%s'.\n"
@@ -871,9 +876,10 @@ msgstr ""
 "ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ ÓÍÏÔÒÉÔÅ GNU General Public License.\n"
 
 #: src/main.c:436
+#, fuzzy
 msgid ""
 "\n"
-"Originally written by Hrvoje Niksic <hniksic@iskon.hr>.\n"
+"Originally written by Hrvoje Niksic <hniksic@arsdigita.com>.\n"
 msgstr ""
 "\n"
 "ðÅÒ×ÏÎÁÞÁÌØÎÏ ÒÁÚÒÁÂÏÔÁÎÏ Á×ÔÏÒÏÍ: Hrvoje Niksic <hniksic@srce.hr>.\n"
@@ -910,12 +916,12 @@ msgstr ""
 msgid "%s: missing URL\n"
 msgstr "%s: ÎÅ ÕËÁÚÁÎ URL\n"
 
-#: src/main.c:749
+#: src/main.c:759
 #, c-format
 msgid "No URLs found in %s.\n"
 msgstr "÷ ÆÁÊÌÅ %s ÎÅ ÏÂÎÁÒÕÖÅÎÏ ÓÔÒÏË URL.\n"
 
-#: src/main.c:758
+#: src/main.c:768
 #, c-format
 msgid ""
 "\n"
@@ -926,14 +932,14 @@ msgstr ""
 "úá÷åòûåîï --%s--\n"
 "ðÒÉÎÑÔÏ: %s ÂÁÊÔ × %d ÆÁÊÌax\n"
 
-#: src/main.c:763
+#: src/main.c:773
 #, c-format
 msgid "Download quota (%s bytes) EXCEEDED!\n"
 msgstr "ðòå÷ùûåîï ÏÇÒÁÎÉÞÅÎÉÅ ÏÂßÅÍÁ (%s ÂÁÊÔ)!\n"
 
 #. Please note that the double `%' in `%%s' is intentional, because
 #. redirect_output passes tmp through printf.
-#: src/main.c:790
+#: src/main.c:800
 msgid "%s received, redirecting output to `%%s'.\n"
 msgstr "ðÏÌÕÞÅÎ ÓÉÇÎÁÌ %s, ×Ù×ÏÄ ÐÅÒÅÎÁÐÒÁ×ÌÅÎ × `%%s'.\n"
 
@@ -991,17 +997,12 @@ msgstr "
 msgid "%s: cannot stat %s: %s\n"
 msgstr "%s: ÎÅ ÕÄÁÅÔÓÑ ×ÙÐÏÌÎÉÔØ stat ÄÌÑ %s: %s\n"
 
-#: src/recur.c:463 src/retr.c:468
+#: src/recur.c:469
-#, c-format
-msgid "Removing %s.\n"
-msgstr "õÄÁÌÅÎÉÅ %s.\n"
-
-#: src/recur.c:464
 #, c-format
 msgid "Removing %s since it should be rejected.\n"
 msgstr "õÄÁÌÅÎÉÅ %s, ÔÁË ËÁË ÜÔÏÔ ÆÁÊÌ ÄÏÌÖÅÎ ÂÙÔØ ÉÓËÌÀÞÅÎ.\n"
 
-#: src/recur.c:624
+#: src/recur.c:630
 msgid "Loading robots.txt; please ignore errors.\n"
 msgstr "úÁÇÒÕÚËÁ robots.txt; ÎÅ ÏÂÒÁÝÁÊÔÅ ×ÎÉÍÁÎÉÑ ÎÁ ÏÛÉÂËÉ.\n"
 
@@ -1028,7 +1029,7 @@ msgstr "
 msgid "%s: Redirection to itself.\n"
 msgstr "%s: ðÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ ÎÁ ÓÁÍÏÇÏ ÓÅÂÑ.\n"
 
-#: src/retr.c:489
+#: src/retr.c:491
 msgid ""
 "Giving up.\n"
 "\n"
@@ -1036,7 +1037,7 @@ msgstr ""
 "úÁ×ÅÒÛÅÎÉÅ.\n"
 "\n"
 
-#: src/retr.c:489
+#: src/retr.c:491
 msgid ""
 "Retrying.\n"
 "\n"

po/wget.pot

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-10-20 00:29-0700\n"
+"POT-Creation-Date: 2000-10-23 20:39-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -186,80 +186,85 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/ftp.c:1034
+#: src/ftp.c:1022 src/main.c:744 src/recur.c:468 src/retr.c:470
+#, c-format
+msgid "Removing %s.\n"
+msgstr ""
+
+#: src/ftp.c:1063
 #, c-format
 msgid "Using `%s' as listing tmp file.\n"
 msgstr ""
 
-#: src/ftp.c:1046
+#: src/ftp.c:1075
 #, c-format
 msgid "Removed `%s'.\n"
 msgstr ""
 
-#: src/ftp.c:1082
+#: src/ftp.c:1111
 #, c-format
 msgid "Recursion depth %d exceeded max. depth %d.\n"
 msgstr ""
 
-#: src/ftp.c:1134 src/http.c:1163
+#: src/ftp.c:1163 src/http.c:1163
 #, c-format
 msgid ""
 "Server file no newer than local file `%s' -- not retrieving.\n"
 "\n"
 msgstr ""
 
-#: src/ftp.c:1140 src/http.c:1171
+#: src/ftp.c:1169 src/http.c:1171
 #, c-format
 msgid "The sizes do not match (local %ld) -- retrieving.\n"
 msgstr ""
 
-#: src/ftp.c:1157
+#: src/ftp.c:1186
 msgid "Invalid name of the symlink, skipping.\n"
 msgstr ""
 
-#: src/ftp.c:1174
+#: src/ftp.c:1203
 #, c-format
 msgid ""
 "Already have correct symlink %s -> %s\n"
 "\n"
 msgstr ""
 
-#: src/ftp.c:1182
+#: src/ftp.c:1211
 #, c-format
 msgid "Creating symlink %s -> %s\n"
 msgstr ""
 
-#: src/ftp.c:1193
+#: src/ftp.c:1222
 #, c-format
 msgid "Symlinks not supported, skipping symlink `%s'.\n"
 msgstr ""
 
-#: src/ftp.c:1205
+#: src/ftp.c:1234
 #, c-format
 msgid "Skipping directory `%s'.\n"
 msgstr ""
 
-#: src/ftp.c:1214
+#: src/ftp.c:1243
 #, c-format
 msgid "%s: unknown/unsupported file type.\n"
 msgstr ""
 
-#: src/ftp.c:1231
+#: src/ftp.c:1260
 #, c-format
 msgid "%s: corrupt time-stamp.\n"
 msgstr ""
 
-#: src/ftp.c:1252
+#: src/ftp.c:1281
 #, c-format
 msgid "Will not retrieve dirs since depth is %d (max %d).\n"
 msgstr ""
 
-#: src/ftp.c:1291
+#: src/ftp.c:1320
 #, c-format
 msgid "Not descending to `%s' as it is excluded/not-included.\n"
 msgstr ""
 
-#: src/ftp.c:1336
+#: src/ftp.c:1365
 #, c-format
 msgid "Rejecting `%s'.\n"
 msgstr ""
@@ -267,17 +272,17 @@ msgstr ""
 #. No luck.
 #. #### This message SUCKS.  We should see what was the
 #. reason that nothing was retrieved.
-#: src/ftp.c:1383
+#: src/ftp.c:1412
 #, c-format
 msgid "No matches on pattern `%s'.\n"
 msgstr ""
 
-#: src/ftp.c:1443
+#: src/ftp.c:1472
 #, c-format
 msgid "Wrote HTML-ized index to `%s' [%ld].\n"
 msgstr ""
 
-#: src/ftp.c:1448
+#: src/ftp.c:1477
 #, c-format
 msgid "Wrote HTML-ized index to `%s'.\n"
 msgstr ""
@@ -749,7 +754,7 @@ msgstr ""
 #: src/main.c:436
 msgid ""
 "\n"
-"Originally written by Hrvoje Niksic <hniksic@iskon.hr>.\n"
+"Originally written by Hrvoje Niksic <hniksic@arsdigita.com>.\n"
 msgstr ""
 
 #: src/main.c:510
@@ -783,12 +788,12 @@ msgstr ""
 msgid "%s: missing URL\n"
 msgstr ""
 
-#: src/main.c:749
+#: src/main.c:759
 #, c-format
 msgid "No URLs found in %s.\n"
 msgstr ""
 
-#: src/main.c:758
+#: src/main.c:768
 #, c-format
 msgid ""
 "\n"
@@ -796,14 +801,14 @@ msgid ""
 "Downloaded: %s bytes in %d files\n"
 msgstr ""
 
-#: src/main.c:763
+#: src/main.c:773
 #, c-format
 msgid "Download quota (%s bytes) EXCEEDED!\n"
 msgstr ""
 
 #. Please note that the double `%' in `%%s' is intentional, because
 #. redirect_output passes tmp through printf.
-#: src/main.c:790
+#: src/main.c:800
 msgid "%s received, redirecting output to `%%s'.\n"
 msgstr ""
 
@@ -856,17 +861,12 @@ msgstr ""
 msgid "%s: cannot stat %s: %s\n"
 msgstr ""
 
-#: src/recur.c:463 src/retr.c:468
+#: src/recur.c:469
-#, c-format
-msgid "Removing %s.\n"
-msgstr ""
-
-#: src/recur.c:464
 #, c-format
 msgid "Removing %s since it should be rejected.\n"
 msgstr ""
 
-#: src/recur.c:624
+#: src/recur.c:630
 msgid "Loading robots.txt; please ignore errors.\n"
 msgstr ""
 
@@ -891,13 +891,13 @@ msgstr ""
 msgid "%s: Redirection to itself.\n"
 msgstr ""
 
-#: src/retr.c:489
+#: src/retr.c:491
 msgid ""
 "Giving up.\n"
 "\n"
 msgstr ""
 
-#: src/retr.c:489
+#: src/retr.c:491
 msgid ""
 "Retrying.\n"
 "\n"

src/ChangeLog

@@ -1,3 +1,18 @@
+2000-10-23  Dan Harkless  <dan-wget@dilvish.speed.net>
+
+	* ftp.c (ftp_loop_internal): --delete-after wasn't implemented for
+ 	files downloaded via FTP.  Per a comment, .listing files were not
+	counted towards number of bytes and files downloaded because they're 
+	deleted anyway.  Well, they aren't under -nr, so count them then.
+		
+	* main.c (main): --delete-after didn't delete the root of the tree.
+	Ignore --convert-links if --delete-after was specified.
+		
+	* recur.c (recursive_retrieve): Improved comment; added DEBUGP().
+	Ignore --convert-links if --delete-after was specified.
+		
+	* retr.c (retrieve_from_file): Just added a DEBUGP().
+		
 2000-10-19  Dan Harkless  <dan-wget@dilvish.speed.net>
 
 	* ftp.c (ftp_loop_internal): downloaded_file() enumerators changed.

src/ftp.c

@@ -989,13 +989,42 @@ ftp_loop_internal (struct urlinfo *u, struct fileinfo *f, ccon *con)
 		 tms, tmrate, locf, len);
       logprintf (LOG_NONVERBOSE, "%s URL: %s [%ld] -> \"%s\" [%d]\n",
 		 tms, u->url, len, locf, count);
-      /* Do not count listings among the downloaded stuff, since they
+
-	 will get deleted anyway.  */
+      if ((con->cmd & DO_LIST))
-      if (!(con->cmd & DO_LIST))
+	/* This is a directory listing file. */
+	{
+	  if (!opt.remove_listing)
+	    /* --dont-remove-listing was specified, so do count this towards the
+	       number of bytes and files downloaded. */
 	    {
-	  ++opt.numurls;
 	      opt.downloaded += len;
+	      opt.numurls++;
 	    }
+
+	  /* Deletion of listing files is not controlled by --delete-after, but
+	     by the more specific option --dont-remove-listing, and the code
+	     to do this deletion is in another function. */
+	}
+      else
+	/* This is not a directory listing file. */
+	{
+	  /* Unlike directory listing files, don't pretend normal files weren't
+	     downloaded if they're going to be deleted.  People seeding proxies,
+	     for instance, may want to know how many bytes and files they've
+	     downloaded through it. */
+	  opt.downloaded += len;
+	  opt.numurls++;
+
+	  if (opt.delete_after)
+	    {
+	      DEBUGP (("Removing file due to --delete-after in"
+		       " ftp_loop_internal():\n"));
+	      logprintf (LOG_VERBOSE, _("Removing %s.\n"), locf);
+	      if (unlink (locf))
+		logprintf (LOG_NOTQUIET, "unlink: %s\n", strerror (errno));
+	    }
+	}
+      
       /* Restore the original leave-pendingness.  */
       if (orig_lp)
 	con->cmd |= LEAVE_PENDING;

src/main.c

@@ -730,13 +730,23 @@ Can't timestamp and not clobber old files at the same time.\n"));
   /* Retrieve the URLs from argument list.  */
   for (t = url; *t; t++)
     {
-      char *filename, *new_file;
+      char *filename, *redirected_URL;
       int dt;
 
-      status = retrieve_url (*t, &filename, &new_file, NULL, &dt);
+      status = retrieve_url (*t, &filename, &redirected_URL, NULL, &dt);
       if (opt.recursive && status == RETROK && (dt & TEXTHTML))
-	status = recursive_retrieve (filename, new_file ? new_file : *t);
+	status = recursive_retrieve (filename,
-      FREE_MAYBE (new_file);
+				     redirected_URL ? redirected_URL : *t);
+
+      if (opt.delete_after && file_exists_p(filename))
+	{
+	  DEBUGP (("Removing file due to --delete-after in main():\n"));
+	  logprintf (LOG_VERBOSE, _("Removing %s.\n"), filename);
+	  if (unlink (filename))
+	    logprintf (LOG_NOTQUIET, "unlink: %s\n", strerror (errno));
+	}
+
+      FREE_MAYBE (redirected_URL);
       FREE_MAYBE (filename);
     }
 
@@ -763,7 +773,7 @@ Can't timestamp and not clobber old files at the same time.\n"));
 		   _("Download quota (%s bytes) EXCEEDED!\n"),
 		   legible (opt.quota));
     }
-  if (opt.convert_links)
+  if (opt.convert_links & !opt.delete_after)
     {
       convert_all_links ();
     }

src/recur.c

@@ -455,10 +455,15 @@ recursive_retrieve (const char *file, const char *this_url)
 	  else
 	    DEBUGP (("%s is not text/html so we don't chase.\n",
 		     filename ? filename: "(null)"));
-	  /* If an suffix-rejected file was loaded only because it was HTML,
+
-	     undo the error now */
 	  if (opt.delete_after || (filename && !acceptable (filename)))
+	    /* Either --delete-after was specified, or we loaded this otherwise
+	       rejected (e.g. by -R) HTML file just so we could harvest its
+	       hyperlinks -- in either case, delete the local file. */
 	    {
+	      DEBUGP (("Removing file due to %s in recursive_retrieve():\n",
+		       opt.delete_after ? "--delete-after" :
+		       "recursive rejection criteria"));
 	      logprintf (LOG_VERBOSE,
 			 (opt.delete_after ? _("Removing %s.\n")
 			  : _("Removing %s since it should be rejected.\n")),
@@ -467,6 +472,7 @@ recursive_retrieve (const char *file, const char *this_url)
 		logprintf (LOG_NOTQUIET, "unlink: %s\n", strerror (errno));
 	      dt &= ~RETROKF;
 	    }
+
 	  /* If everything was OK, and links are to be converted, let's
 	     store the local filename.  */
 	  if (opt.convert_links && (dt & RETROKF) && (filename != NULL))
@@ -482,7 +488,7 @@ recursive_retrieve (const char *file, const char *this_url)
       freeurl (u, 1);
       /* Increment the pbuf for the appropriate size.  */
     }
-  if (opt.convert_links)
+  if (opt.convert_links && !opt.delete_after)
     convert_links (file, url_list);
   /* Free the linked list of URL-s.  */
   free_urlpos (url_list);

src/retr.c

@@ -465,6 +465,8 @@ retrieve_from_file (const char *file, int html, int *count)
 
       if (filename && opt.delete_after && file_exists_p (filename))
 	{
+	  DEBUGP (("Removing file due to --delete-after in"
+		   " retrieve_from_file():\n"));
 	  logprintf (LOG_VERBOSE, _("Removing %s.\n"), filename);
 	  if (unlink (filename))
 	    logprintf (LOG_NOTQUIET, "unlink: %s\n", strerror (errno));