From: dan Date: Tue, 24 Oct 2000 06:19:17 +0000 (-0700) Subject: [svn] Manually applied Rob Mayoff 's patch (vs. 1.5.3, not 1.5.3... X-Git-Tag: v1.13~2432 X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=1396b300550d9b5ca3b4b3e4e3776a1456024f73 [svn] Manually applied Rob Mayoff 's patch (vs. 1.5.3, not 1.5.3+dev) to add --bind-address, making many necessary alphabetization, coding style, comment, documentation, and naming fixes and additions. --- diff --git a/doc/ChangeLog b/doc/ChangeLog index d5cc460c..e280d447 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,6 +1,7 @@ 2000-10-23 Dan Harkless * wget.texi (Recursive Retrieval Options): Improved --delete-after docs. + (Download Options): Documented Rob Mayoff's new --bind-address option. 2000-10-20 Dan Harkless diff --git a/doc/wget.info b/doc/wget.info index 29a6c2b6..27989582 100644 --- a/doc/wget.info +++ b/doc/wget.info @@ -26,8 +26,8 @@ notice identical to this one.  Indirect: wget.info-1: 961 -wget.info-2: 48494 -wget.info-3: 97018 +wget.info-2: 48745 +wget.info-3: 97411  Tag Table: (Indirect) @@ -39,50 +39,50 @@ Node: Option Syntax8163 Node: Basic Startup Options9587 Node: Logging and Input File Options10287 Node: Download Options12812 -Node: Directory Options20659 -Node: HTTP Options23137 -Node: FTP Options27853 -Node: Recursive Retrieval Options29835 -Node: Recursive Accept/Reject Options34856 -Node: Recursive Retrieval38082 -Node: Following Links40380 -Node: Relative Links41408 -Node: Host Checking41922 -Node: Domain Acceptance43947 -Node: All Hosts45617 -Node: Types of Files46044 -Node: Directory-Based Limits48494 -Node: FTP Links51134 -Node: Time-Stamping52004 -Node: Time-Stamping Usage53641 -Node: HTTP Time-Stamping Internals55210 -Node: FTP Time-Stamping Internals56680 -Node: Startup File57888 -Node: Wgetrc Location58761 -Node: Wgetrc Syntax59576 -Node: Wgetrc Commands60291 -Node: Sample Wgetrc68548 -Node: Examples73567 -Node: Simple Usage74174 -Node: Advanced Usage76568 -Node: Guru Usage79319 -Node: Various80981 -Node: Proxies81505 -Node: Distribution84270 -Node: Mailing List84621 -Node: Reporting Bugs85320 -Node: Portability87105 -Node: Signals88480 -Node: Appendices89134 -Node: Robots89549 -Node: Introduction to RES90696 -Node: RES Format92589 -Node: User-Agent Field93693 -Node: Disallow Field94457 -Node: Norobots Examples95068 -Node: Security Considerations96022 -Node: Contributors97018 -Node: Copying99661 -Node: Concept Index118824 +Node: Directory Options20910 +Node: HTTP Options23388 +Node: FTP Options28104 +Node: Recursive Retrieval Options30086 +Node: Recursive Accept/Reject Options35107 +Node: Recursive Retrieval38333 +Node: Following Links40631 +Node: Relative Links41659 +Node: Host Checking42173 +Node: Domain Acceptance44198 +Node: All Hosts45868 +Node: Types of Files46295 +Node: Directory-Based Limits48745 +Node: FTP Links51385 +Node: Time-Stamping52255 +Node: Time-Stamping Usage53892 +Node: HTTP Time-Stamping Internals55461 +Node: FTP Time-Stamping Internals56931 +Node: Startup File58139 +Node: Wgetrc Location59012 +Node: Wgetrc Syntax59827 +Node: Wgetrc Commands60542 +Node: Sample Wgetrc68941 +Node: Examples73960 +Node: Simple Usage74567 +Node: Advanced Usage76961 +Node: Guru Usage79712 +Node: Various81374 +Node: Proxies81898 +Node: Distribution84663 +Node: Mailing List85014 +Node: Reporting Bugs85713 +Node: Portability87498 +Node: Signals88873 +Node: Appendices89527 +Node: Robots89942 +Node: Introduction to RES91089 +Node: RES Format92982 +Node: User-Agent Field94086 +Node: Disallow Field94850 +Node: Norobots Examples95461 +Node: Security Considerations96415 +Node: Contributors97411 +Node: Copying100054 +Node: Concept Index119217  End Tag Table diff --git a/doc/wget.info-1 b/doc/wget.info-1 index 437f67fd..75f49368 100644 --- a/doc/wget.info-1 +++ b/doc/wget.info-1 @@ -347,6 +347,12 @@ File: wget.info, Node: Download Options, Next: Directory Options, Prev: Loggi Download Options ================ +`--bind-address=ADDRESS' + When making client TCP/IP connections, `bind()' to ADDRESS on the + local machine. ADDRESS may be specified as a hostname or IP + address. This option can be useful if your machine is bound to + multiple IPs. + `-t NUMBER' `--tries=NUMBER' Set number of retries to NUMBER. Specify 0 or `inf' for infinite diff --git a/doc/wget.info-2 b/doc/wget.info-2 index 474c32e7..90b3c863 100644 --- a/doc/wget.info-2 +++ b/doc/wget.info-2 @@ -341,9 +341,10 @@ some cases is the "lockable" Boolean, which may be set to `on', `off', value will be locked in for the duration of the wget invocation - commandline options will not override. - Some commands take pseudo-arbitrary values. STRING values can be -any non-empty string. N can be any positive integer, or `inf' for -infinity, where appropriate. + Some commands take pseudo-arbitrary values. ADDRESS values can be +hostnames or dotted-quad IP addresses. N can be any positive integer, +or `inf' for infinity, where appropriate. STRING values can be any +non-empty string. Most of these commands have commandline equivalents (*Note Invoking::), though some of the more obscure or rarely used ones do not. @@ -370,6 +371,9 @@ base = STRING Consider relative URLs in URL input files forced to be interpreted as HTML as being relative to STRING - the same as `-B'. +bind_address = ADDRESS + Bind to ADDRESS, like the `--bind-address' option. + cache = on/off When set to off, disallow server-caching. See the `-C' option. diff --git a/doc/wget.info-3 b/doc/wget.info-3 index ce0f54bf..b4c9e2ce 100644 --- a/doc/wget.info-3 +++ b/doc/wget.info-3 @@ -474,9 +474,11 @@ Concept Index * authentication: HTTP Options. * backing up converted files: Recursive Retrieval Options. * base for relative links in input file: Logging and Input File Options. +* bind() address: Download Options. * bug reports: Reporting Bugs. * bugs: Reporting Bugs. * cache: HTTP Options. +* client IP address: Download Options. * clobbering, file: Download Options. * command line: Invoking. * Content-Length, ignore: HTTP Options. @@ -520,6 +522,7 @@ Concept Index * incremental updating: Time-Stamping. * input-file: Logging and Input File Options. * invoking: Invoking. +* IP address, client: Download Options. * latest version: Distribution. * link conversion: Recursive Retrieval Options. * links: Following Links. @@ -547,8 +550,8 @@ Concept Index * pause: Download Options. * portability: Portability. * proxies: Proxies. -* proxy <1>: HTTP Options. -* proxy: Download Options. +* proxy <1>: Download Options. +* proxy: HTTP Options. * proxy authentication: HTTP Options. * proxy filling: Recursive Retrieval Options. * proxy password: HTTP Options. diff --git a/doc/wget.texi b/doc/wget.texi index a319b419..0310cf63 100644 --- a/doc/wget.texi +++ b/doc/wget.texi @@ -443,6 +443,15 @@ links in the file specified by @samp{-i}. @section Download Options @table @samp +@cindex bind() address +@cindex client IP address +@cindex IP address, client +@item --bind-address=@var{ADDRESS} +When making client TCP/IP connections, @code{bind()} to @var{ADDRESS} on +the local machine. @var{ADDRESS} may be specified as a hostname or IP +address. This option can be useful if your machine is bound to multiple +IPs. + @cindex retries @cindex tries @cindex number of retries @@ -1707,9 +1716,10 @@ option is set to @samp{always} or @samp{never}, that value will be locked in for the duration of the wget invocation -- commandline options will not override. -Some commands take pseudo-arbitrary values. @var{string} values can be -any non-empty string. @var{n} can be any positive integer, or -@samp{inf} for infinity, where appropriate. +Some commands take pseudo-arbitrary values. @var{address} values can be +hostnames or dotted-quad IP addresses. @var{n} can be any positive +integer, or @samp{inf} for infinity, where appropriate. @var{string} +values can be any non-empty string. Most of these commands have commandline equivalents (@xref{Invoking}), though some of the more obscure or rarely used ones do not. @@ -1741,6 +1751,9 @@ Consider relative @sc{url}s in @sc{url} input files forced to be interpreted as @sc{html} as being relative to @var{string} -- the same as @samp{-B}. +@item bind_address = @var{address} +Bind to @var{address}, like the @samp{--bind-address} option. + @item cache = on/off When set to off, disallow server-caching. See the @samp{-C} option. diff --git a/po/cs.gmo b/po/cs.gmo index 2fd21e5b..5511ce5c 100644 Binary files a/po/cs.gmo and b/po/cs.gmo differ diff --git a/po/cs.po b/po/cs.po index ae84bacd..e24a9540 100644 --- a/po/cs.po +++ b/po/cs.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU wget 1.5.2-b1\n" -"POT-Creation-Date: 2000-10-23 20:49-0700\n" +"POT-Creation-Date: 2000-10-23 23:14-0700\n" "PO-Revision-Date: 1998-06-05 08:47\n" "Last-Translator: Jan Prikryl \n" "Language-Team: Czech \n" @@ -212,7 +212,7 @@ msgstr "" "\n" # , c-format -#: src/ftp.c:1022 src/main.c:744 src/recur.c:468 src/retr.c:470 +#: src/ftp.c:1022 src/main.c:749 src/recur.c:468 src/retr.c:470 #, c-format msgid "Removing %s.\n" msgstr "Ma¾u %s.\n" @@ -629,50 +629,61 @@ msgid "%s (%s) - Read error at byte %ld/%ld (%s). " msgstr "%s (%s) - Chyba pøi ètení dat na bajtu %ld/%ld (%s). " # , c-format -#: src/init.c:320 src/netrc.c:260 +#: src/init.c:330 src/netrc.c:260 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Nemohu pøeèíst %s (%s).\n" # , c-format -#: src/init.c:341 src/init.c:347 +#: src/init.c:351 src/init.c:357 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Chyba v %s na øádku %d.\n" # , c-format -#: src/init.c:378 +#: src/init.c:388 #, c-format msgid "%s: Warning: Both system and user wgetrc point to `%s'.\n" msgstr "" "%s: Varování: Globální i u¾ivatelské wgetrc jsou shodnì ulo¾eny v `%s'.\n" # , c-format -#: src/init.c:466 +#: src/init.c:476 #, c-format msgid "%s: BUG: unknown command `%s', value `%s'.\n" msgstr "%s: Chyba: Neznámý pøíkaz `%s', hodnota `%s'.\n" # , c-format -#: src/init.c:493 +#: src/init.c:498 +#, fuzzy, c-format +msgid "%s: Out of memory.\n" +msgstr "%s: %s: Není dost pamìti.\n" + +#: src/init.c:504 +#, fuzzy, c-format +msgid "%s: %s: Cannot convert `%s' to an IP address.\n" +msgstr "%s: Varování: lokální IP adresa nemá reverzní DNS záznam.\n" + +# , c-format +#: src/init.c:532 #, c-format msgid "%s: %s: Please specify on or off.\n" msgstr "%s: %s: Zadejte prosím `on' nebo `off'.\n" # , c-format -#: src/init.c:537 +#: src/init.c:576 #, fuzzy, c-format msgid "%s: %s: Please specify always, on, off, or never.\n" msgstr "%s: %s: Zadejte prosím `on' nebo `off'.\n" # , c-format -#: src/init.c:556 src/init.c:813 src/init.c:835 src/init.c:908 +#: src/init.c:595 src/init.c:852 src/init.c:874 src/init.c:947 #, c-format msgid "%s: %s: Invalid specification `%s'.\n" msgstr "%s: %s: Neplatná specifikace `%s'\n" # , c-format -#: src/init.c:669 src/init.c:691 src/init.c:713 src/init.c:739 +#: src/init.c:708 src/init.c:730 src/init.c:752 src/init.c:778 #, c-format msgid "%s: Invalid specification `%s'\n" msgstr "%s: Neplatná specifikace `%s'\n" @@ -751,6 +762,8 @@ msgstr "" #, fuzzy msgid "" "Download:\n" +" --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " +"host.\n" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits).\n" " -O --output-document=FILE write documents to FILE.\n" @@ -786,7 +799,7 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:153 +#: src/main.c:154 msgid "" "Directories:\n" " -nd --no-directories don't create directories.\n" @@ -806,7 +819,7 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:160 +#: src/main.c:161 #, fuzzy msgid "" "HTTP options:\n" @@ -839,7 +852,7 @@ msgstr "" " v hlavièce identifikaèní øetìzec AGENT\n" # , fuzzy -#: src/main.c:173 +#: src/main.c:174 #, fuzzy msgid "" "FTP options:\n" @@ -856,7 +869,7 @@ msgstr "" " --passive-ftp pou¾ij pasivní mód pøenosu dat\n" "\n" -#: src/main.c:178 +#: src/main.c:179 #, fuzzy msgid "" "Recursive retrieval:\n" @@ -883,7 +896,7 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:188 +#: src/main.c:189 #, fuzzy msgid "" "Recursive accept/reject:\n" @@ -923,7 +936,7 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:203 +#: src/main.c:204 msgid "Mail bug reports and suggestions to .\n" msgstr "" "Zprávy o chybách a návrhy na vylep¹ení programu zasílejte na adresu\n" @@ -931,12 +944,12 @@ msgstr "" "Komentáøe k èeskému pøekladu zasílejte na adresu . \n" # , fuzzy -#: src/main.c:378 +#: src/main.c:383 #, c-format msgid "%s: debug support not compiled in.\n" msgstr "%s: program nebyl zkompilován s podporou pro ladìní.\n" -#: src/main.c:430 +#: src/main.c:435 msgid "" "Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.\n" "This program is distributed in the hope that it will be useful,\n" @@ -950,7 +963,7 @@ msgstr "" "anebo VHODNOSTI PRO URÈITÝ ÚÈEL. Dal¹í podrobnosti hledejte \n" "v Obecné veøejné licenci GNU.\n" -#: src/main.c:436 +#: src/main.c:441 #, fuzzy msgid "" "\n" @@ -960,13 +973,13 @@ msgstr "" "Autorem tohto programu je Hrvoje Nik¹iæ \n" # , c-format -#: src/main.c:510 +#: src/main.c:515 #, c-format msgid "%s: %s: invalid command\n" msgstr "%s: %s: neplatný pøíkaz\n" # , c-format -#: src/main.c:563 +#: src/main.c:568 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: nepøípustný pøepínaè -- `-n%c'\n" @@ -974,33 +987,33 @@ msgstr "%s: nep # , c-format #. #### Something nicer should be printed here -- similar to the #. pre-1.5 `--help' page. -#: src/main.c:566 src/main.c:608 src/main.c:666 +#: src/main.c:571 src/main.c:613 src/main.c:671 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Pøíkaz `%s --help' vypí¹e význam platných pøepínaèù.\n" -#: src/main.c:646 +#: src/main.c:651 msgid "Can't be verbose and quiet at the same time.\n" msgstr "Nedoká¾u být upovídaný a zitcha najednou.\n" -#: src/main.c:652 +#: src/main.c:657 msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "Nedoká¾u pou¾ívat èasová razítka a nemazat pøitom staré soubory.\n" #. No URL specified. -#: src/main.c:661 +#: src/main.c:666 #, c-format msgid "%s: missing URL\n" msgstr "%s: postrádám URL\n" # , c-format -#: src/main.c:759 +#: src/main.c:764 #, c-format msgid "No URLs found in %s.\n" msgstr "V souboru `%s' nebyla nalezena ¾ádná URL.\n" # , c-format -#: src/main.c:768 +#: src/main.c:773 #, c-format msgid "" "\n" @@ -1012,14 +1025,14 @@ msgstr "" "Celkem naèteno %s bajtù v %d souborech\n" # , c-format -#: src/main.c:773 +#: src/main.c:778 #, 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:800 +#: src/main.c:805 msgid "%s received, redirecting output to `%%s'.\n" msgstr "Zachycen signál %s , výstup pøesmìrován do `%%s'.\n" diff --git a/po/de.gmo b/po/de.gmo index b4b4af5c..6dc32778 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index df9e857c..bd51d26f 100644 --- a/po/de.po +++ b/po/de.po @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.5.2-b4\n" -"POT-Creation-Date: 2000-10-23 20:49-0700\n" +"POT-Creation-Date: 2000-10-23 23:14-0700\n" "PO-Revision-Date: 1998-06-15 19:25+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -216,7 +216,7 @@ msgstr "" "%s (%s) - »%s« gespeichert [%ld]\n" "\n" -#: src/ftp.c:1022 src/main.c:744 src/recur.c:468 src/retr.c:470 +#: src/ftp.c:1022 src/main.c:749 src/recur.c:468 src/retr.c:470 #, c-format msgid "Removing %s.\n" msgstr "Entferne »%s«.\n" @@ -584,42 +584,52 @@ msgstr "%s (%s) - Lesefehler bei Byte %ld (%s)." msgid "%s (%s) - Read error at byte %ld/%ld (%s). " msgstr "%s (%s) - Lesefehler bei Byte %ld/%ld (%s). " -#: src/init.c:320 src/netrc.c:260 +#: src/init.c:330 src/netrc.c:260 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Kann »%s« nicht lesen (%s).\n" -#: src/init.c:341 src/init.c:347 +#: src/init.c:351 src/init.c:357 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Fehler in »%s« bei Zeile %d.\n" -#: src/init.c:378 +#: src/init.c:388 #, c-format msgid "%s: Warning: Both system and user wgetrc point to `%s'.\n" msgstr "%s: Warnung: wgetrc des Systems und des Benutzers zeigen nach »%s«.\n" -#: src/init.c:466 +#: src/init.c:476 #, c-format msgid "%s: BUG: unknown command `%s', value `%s'.\n" msgstr "%s: Unbekannter Befehl »%s«, Wert »%s«.\n" -#: src/init.c:493 +#: src/init.c:498 +#, fuzzy, c-format +msgid "%s: Out of memory.\n" +msgstr "%s: %s: Nicht genügend Speicher.\n" + +#: src/init.c:504 +#, fuzzy, c-format +msgid "%s: %s: Cannot convert `%s' to an IP address.\n" +msgstr "%s: Warnung: kein \"reverse-lookup\" für lokale IP-Adresse möglich.\n" + +#: src/init.c:532 #, c-format msgid "%s: %s: Please specify on or off.\n" msgstr "%s: %s: Bitte »on« oder »off« angeben.\n" -#: src/init.c:537 +#: src/init.c:576 #, fuzzy, c-format msgid "%s: %s: Please specify always, on, off, or never.\n" msgstr "%s: %s: Bitte »on« oder »off« angeben.\n" -#: src/init.c:556 src/init.c:813 src/init.c:835 src/init.c:908 +#: src/init.c:595 src/init.c:852 src/init.c:874 src/init.c:947 #, c-format msgid "%s: %s: Invalid specification `%s'.\n" msgstr "%s: %s: Ungültige Angabe »%s«\n" -#: src/init.c:669 src/init.c:691 src/init.c:713 src/init.c:739 +#: src/init.c:708 src/init.c:730 src/init.c:752 src/init.c:778 #, c-format msgid "%s: Invalid specification `%s'\n" msgstr "%s: Ungültige Angabe »%s«\n" @@ -694,6 +704,8 @@ msgstr "" #, fuzzy msgid "" "Download:\n" +" --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " +"host.\n" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits).\n" " -O --output-document=FILE write documents to FILE.\n" @@ -731,7 +743,7 @@ msgstr "" " -Q, --quota=ZAHL setze die Hol-Vorgänge auf ZAHL\n" "\n" -#: src/main.c:153 +#: src/main.c:154 msgid "" "Directories:\n" " -nd --no-directories don't create directories.\n" @@ -751,7 +763,7 @@ msgstr "" " Verzeichnisbestandteile\n" "\n" -#: src/main.c:160 +#: src/main.c:161 #, fuzzy msgid "" "HTTP options:\n" @@ -785,7 +797,7 @@ msgstr "" "identifizieren\n" "\n" -#: src/main.c:173 +#: src/main.c:174 #, fuzzy msgid "" "FTP options:\n" @@ -802,7 +814,7 @@ msgstr "" " --passive-ftp den \"passiven\" Übertragungsmodus verwenden\n" "\n" -#: src/main.c:178 +#: src/main.c:179 #, fuzzy msgid "" "Recursive retrieval:\n" @@ -831,7 +843,7 @@ msgstr "" " -nr, --dont-remove-listing ».listing«-Dateien nicht entfernen\n" "\n" -#: src/main.c:188 +#: src/main.c:189 #, fuzzy msgid "" "Recursive accept/reject:\n" @@ -877,7 +889,7 @@ msgstr "" " hinaufsteigen\n" "\n" -#: src/main.c:203 +#: src/main.c:204 msgid "Mail bug reports and suggestions to .\n" msgstr "" "Fehlerberichte und Verbesserungsvorschläge bitte an \n" @@ -885,12 +897,12 @@ msgstr "" "\n" "Für die deutsche Übersetzung ist die Mailingliste zuständig.\n" -#: src/main.c:378 +#: src/main.c:383 #, c-format msgid "%s: debug support not compiled in.\n" msgstr "%s: Debug-Unterstützung nicht hineinkompiliert.\n" -#: src/main.c:430 +#: src/main.c:435 msgid "" "Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.\n" "This program is distributed in the hope that it will be useful,\n" @@ -905,7 +917,7 @@ msgstr "" "Lizenz- und Kopierbedingung; die Einzelheiten sind in der Datei COPYING\n" "(GNU General Public License) beschrieben.\n" -#: src/main.c:436 +#: src/main.c:441 #, fuzzy msgid "" "\n" @@ -914,45 +926,45 @@ msgstr "" "\n" "Geschrieben von Hrvoje Niksic .\n" -#: src/main.c:510 +#: src/main.c:515 #, c-format msgid "%s: %s: invalid command\n" msgstr "%s: %s: ungültiger Befehl\n" -#: src/main.c:563 +#: src/main.c:568 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: ungültige Option -- »-n%c«\n" #. #### Something nicer should be printed here -- similar to the #. pre-1.5 `--help' page. -#: src/main.c:566 src/main.c:608 src/main.c:666 +#: src/main.c:571 src/main.c:613 src/main.c:671 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "»%s --help« gibt weitere Informationen.\n" -#: src/main.c:646 +#: src/main.c:651 msgid "Can't be verbose and quiet at the same time.\n" msgstr "\"Mitteilsam\" und \"still\" ist gleichzeitig unmöglich.\n" -#: src/main.c:652 +#: src/main.c:657 msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Zeitstempeln und nicht Überschreiben alter Dateien ist gleichzeitig " "unmöglich.\n" #. No URL specified. -#: src/main.c:661 +#: src/main.c:666 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL fehlt\n" -#: src/main.c:759 +#: src/main.c:764 #, c-format msgid "No URLs found in %s.\n" msgstr "Keine URLs in %s gefunden.\n" -#: src/main.c:768 +#: src/main.c:773 #, c-format msgid "" "\n" @@ -963,14 +975,14 @@ msgstr "" "BEENDET --%s--\n" "Geholt: %s Bytes in %d Dateien\n" -#: src/main.c:773 +#: src/main.c:778 #, 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:800 +#: src/main.c:805 msgid "%s received, redirecting output to `%%s'.\n" msgstr "%s erhalten, weise Ausgabe nach »%%s« zurück.\n" diff --git a/po/hr.gmo b/po/hr.gmo index c9ad7320..039855ad 100644 Binary files a/po/hr.gmo and b/po/hr.gmo differ diff --git a/po/hr.po b/po/hr.po index fd8a4761..ecfe9cd9 100644 --- a/po/hr.po +++ b/po/hr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.5.2-b2\n" -"POT-Creation-Date: 2000-10-23 20:49-0700\n" +"POT-Creation-Date: 2000-10-23 23:14-0700\n" "PO-Revision-Date: 1998-02-29 21:05+01:00\n" "Last-Translator: Hrvoje Niksic \n" "Language-Team: Croatian \n" @@ -193,7 +193,7 @@ msgstr "" "%s (%s) - `%s' snimljen [%ld]\n" "\n" -#: src/ftp.c:1022 src/main.c:744 src/recur.c:468 src/retr.c:470 +#: src/ftp.c:1022 src/main.c:749 src/recur.c:468 src/retr.c:470 #, c-format msgid "Removing %s.\n" msgstr "Uklanjam %s.\n" @@ -558,42 +558,52 @@ msgstr "%s (%s) - Gre msgid "%s (%s) - Read error at byte %ld/%ld (%s). " msgstr "%s (%s) - Gre¹ka pri èitanju na bajtu %ld/%ld (%s). " -#: src/init.c:320 src/netrc.c:260 +#: src/init.c:330 src/netrc.c:260 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ne mogu proèitati %s (%s).\n" -#: src/init.c:341 src/init.c:347 +#: src/init.c:351 src/init.c:357 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Gre¹ka u %s na liniji %d.\n" -#: src/init.c:378 +#: src/init.c:388 #, c-format msgid "%s: Warning: Both system and user wgetrc point to `%s'.\n" msgstr "%s: Upozorenje: sistemski i korisnikov wgetrc su `%s'.\n" -#: src/init.c:466 +#: src/init.c:476 #, c-format msgid "%s: BUG: unknown command `%s', value `%s'.\n" msgstr "%s: BUG: Nepoznata naredba `%s', vrijednost `%s'.\n" -#: src/init.c:493 +#: src/init.c:498 +#, fuzzy, c-format +msgid "%s: Out of memory.\n" +msgstr "%s: %s: Nema dovoljno memorije.\n" + +#: src/init.c:504 +#, fuzzy, c-format +msgid "%s: %s: Cannot convert `%s' to an IP address.\n" +msgstr "%s: Upozorenje: ne mogu napraviti reverzni lookup lokalne IP adrese.\n" + +#: src/init.c:532 #, c-format msgid "%s: %s: Please specify on or off.\n" msgstr "%s: %s: Molim postavite na on ili off.\n" -#: src/init.c:537 +#: src/init.c:576 #, c-format msgid "%s: %s: Please specify always, on, off, or never.\n" msgstr "%s: %s: Molim postavite na on, off ili never.\n" -#: src/init.c:556 src/init.c:813 src/init.c:835 src/init.c:908 +#: src/init.c:595 src/init.c:852 src/init.c:874 src/init.c:947 #, c-format msgid "%s: %s: Invalid specification `%s'.\n" msgstr "%s: %s: Pogre¹na specifikacija `%s'\n" -#: src/init.c:669 src/init.c:691 src/init.c:713 src/init.c:739 +#: src/init.c:708 src/init.c:730 src/init.c:752 src/init.c:778 #, c-format msgid "%s: Invalid specification `%s'\n" msgstr "wget: %s: Pogre¹na specifikacija `%s'\n" @@ -664,8 +674,11 @@ msgstr "" "\n" #: src/main.c:138 +#, fuzzy msgid "" "Download:\n" +" --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " +"host.\n" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits).\n" " -O --output-document=FILE write documents to FILE.\n" @@ -701,7 +714,7 @@ msgstr "" " -Q, --quota=BROJ postavi ogranièenje skidanja na BROJ.\n" "\n" -#: src/main.c:153 +#: src/main.c:154 msgid "" "Directories:\n" " -nd --no-directories don't create directories.\n" @@ -720,7 +733,7 @@ msgstr "" " --cut-dirs=BROJ ignoriraj BROJ stranih direktorija.\n" "\n" -#: src/main.c:160 +#: src/main.c:161 msgid "" "HTTP options:\n" " --http-user=USER set http user to USER.\n" @@ -755,7 +768,7 @@ msgstr "" " Wget/VERZIJA.\n" "\n" -#: src/main.c:173 +#: src/main.c:174 msgid "" "FTP options:\n" " --retr-symlinks when recursing, retrieve linked-to files (not " @@ -771,7 +784,7 @@ msgstr "" " --passive-ftp koristi \"pasivni\" mod prijenosa.\n" "\n" -#: src/main.c:178 +#: src/main.c:179 #, fuzzy msgid "" "Recursive retrieval:\n" @@ -800,7 +813,7 @@ msgstr "" "HTML-a.\n" "\n" -#: src/main.c:188 +#: src/main.c:189 msgid "" "Recursive accept/reject:\n" " -A, --accept=LIST comma-separated list of accepted " @@ -844,16 +857,16 @@ msgstr "" " -np, --no-parent ne idi u direktorij iznad.\n" "\n" -#: src/main.c:203 +#: src/main.c:204 msgid "Mail bug reports and suggestions to .\n" msgstr "©aljite izvje¹taje o bugovima i prijedloge na .\n" -#: src/main.c:378 +#: src/main.c:383 #, c-format msgid "%s: debug support not compiled in.\n" msgstr "%s: podr¹ka za debugiranje nije ugraðena.\n" -#: src/main.c:430 +#: src/main.c:435 msgid "" "Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.\n" "This program is distributed in the hope that it will be useful,\n" @@ -867,7 +880,7 @@ msgstr "" "PROIZVODNOSTI ili UPOTREBLJIVOSTI ZA ODREÐENU SVRHU. Pogledajte GNU\n" "General Public License za vi¹e detalja.\n" -#: src/main.c:436 +#: src/main.c:441 #, fuzzy msgid "" "\n" @@ -876,43 +889,43 @@ msgstr "" "\n" "Izvorno napisao Hrvoje Nik¹iæ .\n" -#: src/main.c:510 +#: src/main.c:515 #, c-format msgid "%s: %s: invalid command\n" msgstr "%s: %s: nedozvoljena naredba\n" -#: src/main.c:563 +#: src/main.c:568 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: nedozvoljena opcija -- `-n%c'\n" #. #### Something nicer should be printed here -- similar to the #. pre-1.5 `--help' page. -#: src/main.c:566 src/main.c:608 src/main.c:666 +#: src/main.c:571 src/main.c:613 src/main.c:671 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Poku¹ajte `%s --help' za vi¹e opcija.\n" -#: src/main.c:646 +#: src/main.c:651 msgid "Can't be verbose and quiet at the same time.\n" msgstr "Ne mogu istovremeno biti verbozan i tih.\n" -#: src/main.c:652 +#: src/main.c:657 msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "Ne mogu istovremeno paziti na vrijeme i ne gaziti stare datoteke.\n" #. No URL specified. -#: src/main.c:661 +#: src/main.c:666 #, c-format msgid "%s: missing URL\n" msgstr "%s: nedostaje URL\n" -#: src/main.c:759 +#: src/main.c:764 #, c-format msgid "No URLs found in %s.\n" msgstr "Nijedan URL nije pronaðen u %s.\n" -#: src/main.c:768 +#: src/main.c:773 #, c-format msgid "" "\n" @@ -923,14 +936,14 @@ msgstr "" "ZAVR©IO --%s--\n" "Skinuo: %s bajta u %d datoteka\n" -#: src/main.c:773 +#: src/main.c:778 #, 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:800 +#: src/main.c:805 msgid "%s received, redirecting output to `%%s'.\n" msgstr "%s primljen, usmjeravam izlaz na `%%s'.\n" diff --git a/po/it.gmo b/po/it.gmo index 019a123c..6e9269b1 100644 Binary files a/po/it.gmo and b/po/it.gmo differ diff --git a/po/it.po b/po/it.po index 6a5c7e94..1c9b6a11 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.5.2-b1\n" -"POT-Creation-Date: 2000-10-23 20:49-0700\n" +"POT-Creation-Date: 2000-10-23 23:14-0700\n" "PO-Revision-Date: 1998-06-13 15:22+02:00\n" "Last-Translator: Giovanni Bortolozzo \n" "Language-Team: Italian \n" @@ -196,7 +196,7 @@ msgstr "" "%s (%s) - `%s' salvato [%ld]\n" "\n" -#: src/ftp.c:1022 src/main.c:744 src/recur.c:468 src/retr.c:470 +#: src/ftp.c:1022 src/main.c:749 src/recur.c:468 src/retr.c:470 #, c-format msgid "Removing %s.\n" msgstr "Rimuovo %s.\n" @@ -564,44 +564,56 @@ msgstr "%s (%s) - Errore di lettura al byte %ld (%s). " msgid "%s (%s) - Read error at byte %ld/%ld (%s). " msgstr "%s (%s) - Errore di lettura al %ld/%ld (%s). " -#: src/init.c:320 src/netrc.c:260 +#: src/init.c:330 src/netrc.c:260 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Impossibile leggere %s (%s).\n" -#: src/init.c:341 src/init.c:347 +#: src/init.c:351 src/init.c:357 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Errore in %s alla linea %d.\n" -#: src/init.c:378 +#: src/init.c:388 #, c-format msgid "%s: Warning: Both system and user wgetrc point to `%s'.\n" msgstr "" "%s: Attenzione: Sia il wgetrc di sistema che quello personale puntano\n" " a `%s'.\n" -#: src/init.c:466 +#: src/init.c:476 #, c-format msgid "%s: BUG: unknown command `%s', value `%s'.\n" msgstr "%s: BUG: comando `%s' sconosciuto, valore `%s'.\n" -#: src/init.c:493 +#: src/init.c:498 +#, fuzzy, c-format +msgid "%s: Out of memory.\n" +msgstr "%s: %s: Memoria insufficiente.\n" + +#: src/init.c:504 +#, fuzzy, c-format +msgid "%s: %s: Cannot convert `%s' to an IP address.\n" +msgstr "" +"%s: Attenzione: impossibile fare la risoluzione inversa dell'indirizzo\n" +" IP locale.\n" + +#: src/init.c:532 #, c-format msgid "%s: %s: Please specify on or off.\n" msgstr "%s: %s: Specificare on oppure off.\n" -#: src/init.c:537 +#: src/init.c:576 #, fuzzy, c-format msgid "%s: %s: Please specify always, on, off, or never.\n" msgstr "%s: %s: Specificare on oppure off.\n" -#: src/init.c:556 src/init.c:813 src/init.c:835 src/init.c:908 +#: src/init.c:595 src/init.c:852 src/init.c:874 src/init.c:947 #, c-format msgid "%s: %s: Invalid specification `%s'.\n" msgstr "%s: %s: Specificazione non valida `%s'\n" -#: src/init.c:669 src/init.c:691 src/init.c:713 src/init.c:739 +#: src/init.c:708 src/init.c:730 src/init.c:752 src/init.c:778 #, c-format msgid "%s: Invalid specification `%s'\n" msgstr "wget: %s: Specificazione non valida `%s'\n" @@ -677,6 +689,8 @@ msgstr "" #, fuzzy msgid "" "Download:\n" +" --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " +"host.\n" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits).\n" " -O --output-document=FILE write documents to FILE.\n" @@ -713,7 +727,7 @@ msgstr "" " -Q, --quota=NUMERO imposta la quota di scarico a NUMERO.\n" "\n" -#: src/main.c:153 +#: src/main.c:154 msgid "" "Directories:\n" " -nd --no-directories don't create directories.\n" @@ -733,7 +747,7 @@ msgstr "" " directory remote.\n" "\n" -#: src/main.c:160 +#: src/main.c:161 #, fuzzy msgid "" "HTTP options:\n" @@ -766,7 +780,7 @@ msgstr "" " Wget/VERSIONE.\n" "\n" -#: src/main.c:173 +#: src/main.c:174 #, fuzzy msgid "" "FTP options:\n" @@ -782,7 +796,7 @@ msgstr "" " --passive-ftp usa il modo di trasferimento \"passivo\".\n" "\n" -#: src/main.c:178 +#: src/main.c:179 #, fuzzy msgid "" "Recursive retrieval:\n" @@ -810,7 +824,7 @@ msgstr "" " -nr, --dont-remove-listing non rimuove i file `.listing'.\n" "\n" -#: src/main.c:188 +#: src/main.c:189 #, fuzzy msgid "" "Recursive accept/reject:\n" @@ -852,17 +866,17 @@ msgstr "" " -np, --no-parent non risale alla directory genitrice.\n" "\n" -#: src/main.c:203 +#: src/main.c:204 msgid "Mail bug reports and suggestions to .\n" msgstr "Inviare segnalazioni di bug e suggerimenti a .\n" -#: src/main.c:378 +#: src/main.c:383 #, c-format msgid "%s: debug support not compiled in.\n" msgstr "" "wget: %s: supporto per il debug non attivato in fase di compilazione.\n" -#: src/main.c:430 +#: src/main.c:435 msgid "" "Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.\n" "This program is distributed in the hope that it will be useful,\n" @@ -876,7 +890,7 @@ msgstr "" "COMMERCIABILITA` o di ADEGUATEZZA AD UN PARTICOLARE SCOPO. Si consulti\n" "la GNU General Public License per maggiori dettagli.\n" -#: src/main.c:436 +#: src/main.c:441 #, fuzzy msgid "" "\n" @@ -885,45 +899,45 @@ msgstr "" "\n" "Scritto da Hrvoje Niksic .\n" -#: src/main.c:510 +#: src/main.c:515 #, c-format msgid "%s: %s: invalid command\n" msgstr "%s: %s: comando non valido\n" -#: src/main.c:563 +#: src/main.c:568 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: opzione illegale -- `-n%c'\n" #. #### Something nicer should be printed here -- similar to the #. pre-1.5 `--help' page. -#: src/main.c:566 src/main.c:608 src/main.c:666 +#: src/main.c:571 src/main.c:613 src/main.c:671 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Usare `%s --help' per ulteriori opzioni.\n" -#: src/main.c:646 +#: src/main.c:651 msgid "Can't be verbose and quiet at the same time.\n" msgstr "Non posso essere prolisso e silenzioso allo stesso tempo.\n" -#: src/main.c:652 +#: src/main.c:657 msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Non posso impostare le date e contemporaneamente non modificare\n" "i vecchi file.\n" #. No URL specified. -#: src/main.c:661 +#: src/main.c:666 #, c-format msgid "%s: missing URL\n" msgstr "%s: manca l'URL\n" -#: src/main.c:759 +#: src/main.c:764 #, c-format msgid "No URLs found in %s.\n" msgstr "Non ci sono URL in %s.\n" -#: src/main.c:768 +#: src/main.c:773 #, c-format msgid "" "\n" @@ -934,14 +948,14 @@ msgstr "" "FINITO --%s--\n" "Scaricati: %s byte in %d file\n" -#: src/main.c:773 +#: src/main.c:778 #, 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:800 +#: src/main.c:805 msgid "%s received, redirecting output to `%%s'.\n" msgstr "%s ricevuti, redirigo l'output su `%%s'.\n" diff --git a/po/no.gmo b/po/no.gmo index 221b6188..a150d4e0 100644 Binary files a/po/no.gmo and b/po/no.gmo differ diff --git a/po/no.po b/po/no.po index 834205a3..bfffb1e4 100644 --- a/po/no.po +++ b/po/no.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.5.2-b1\n" -"POT-Creation-Date: 2000-10-23 20:49-0700\n" +"POT-Creation-Date: 2000-10-23 23:14-0700\n" "PO-Revision-Date: 1998-05-22 09:00+0100\n" "Last-Translator: Robert Schmidt \n" "Language-Team: Norwegian \n" @@ -195,7 +195,7 @@ msgstr "" "%s (%s) - «%s» lagret [%ld]\n" "\n" -#: src/ftp.c:1022 src/main.c:744 src/recur.c:468 src/retr.c:470 +#: src/ftp.c:1022 src/main.c:749 src/recur.c:468 src/retr.c:470 #, c-format msgid "Removing %s.\n" msgstr "Fjerner %s.\n" @@ -560,42 +560,52 @@ msgstr "%s (%s) - Lesefeil ved byte %ld (%s)." msgid "%s (%s) - Read error at byte %ld/%ld (%s). " msgstr "%s (%s) - Lesefeil ved byte %ld/%ld (%s)." -#: src/init.c:320 src/netrc.c:260 +#: src/init.c:330 src/netrc.c:260 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Kan ikke lese %s (%s).\n" -#: src/init.c:341 src/init.c:347 +#: src/init.c:351 src/init.c:357 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Feil i %s på linje %d.\n" -#: src/init.c:378 +#: src/init.c:388 #, c-format msgid "%s: Warning: Both system and user wgetrc point to `%s'.\n" msgstr "%s: Advarsel: Både systemets og brukerens wgetrc peker til «%s».\n" -#: src/init.c:466 +#: src/init.c:476 #, c-format msgid "%s: BUG: unknown command `%s', value `%s'.\n" msgstr "%s: Ukjent kommando «%s», verdi «%s».\n" -#: src/init.c:493 +#: src/init.c:498 +#, fuzzy, c-format +msgid "%s: Out of memory.\n" +msgstr "%s: %s: Ikke nok minne.\n" + +#: src/init.c:504 +#, fuzzy, c-format +msgid "%s: %s: Cannot convert `%s' to an IP address.\n" +msgstr "%s: Advarsel: feil fra tilbake-oppslag for lokal IP-adresse.\n" + +#: src/init.c:532 #, c-format msgid "%s: %s: Please specify on or off.\n" msgstr "%s: %s: Vennligst spesifiser «on» eller «off».\n" -#: src/init.c:537 +#: src/init.c:576 #, fuzzy, c-format msgid "%s: %s: Please specify always, on, off, or never.\n" msgstr "%s: %s: Vennligst spesifiser «on» eller «off».\n" -#: src/init.c:556 src/init.c:813 src/init.c:835 src/init.c:908 +#: src/init.c:595 src/init.c:852 src/init.c:874 src/init.c:947 #, c-format msgid "%s: %s: Invalid specification `%s'.\n" msgstr "%s: %s: Ugyldig spesifikasjon «%s»\n" -#: src/init.c:669 src/init.c:691 src/init.c:713 src/init.c:739 +#: src/init.c:708 src/init.c:730 src/init.c:752 src/init.c:778 #, c-format msgid "%s: Invalid specification `%s'\n" msgstr "%s: Ugyldig spesifikasjon «%s»\n" @@ -670,6 +680,8 @@ msgstr "" #, fuzzy msgid "" "Download:\n" +" --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " +"host.\n" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits).\n" " -O --output-document=FILE write documents to FILE.\n" @@ -704,7 +716,7 @@ msgstr "" " -Q, --quota=ANTALL sett nedlastingskvote til ANTALL.\n" "\n" -#: src/main.c:153 +#: src/main.c:154 msgid "" "Directories:\n" " -nd --no-directories don't create directories.\n" @@ -724,7 +736,7 @@ msgstr "" " katalognavn.\n" "\n" -#: src/main.c:160 +#: src/main.c:161 #, fuzzy msgid "" "HTTP options:\n" @@ -756,7 +768,7 @@ msgstr "" " «Wget/VERSJON».\n" "\n" -#: src/main.c:173 +#: src/main.c:174 #, fuzzy msgid "" "FTP options:\n" @@ -772,7 +784,7 @@ msgstr "" " --passive-ftp bruk passiv overføringsmodus.\n" "\n" -#: src/main.c:178 +#: src/main.c:179 #, fuzzy msgid "" "Recursive retrieval:\n" @@ -800,7 +812,7 @@ msgstr "" " -nr, --dont-remove-listing ikke slett «.listing»-filer.\n" "\n" -#: src/main.c:188 +#: src/main.c:189 #, fuzzy msgid "" "Recursive accept/reject:\n" @@ -840,16 +852,16 @@ msgstr "" "katalog.\n" "\n" -#: src/main.c:203 +#: src/main.c:204 msgid "Mail bug reports and suggestions to .\n" msgstr "Rapportér feil og send forslag til .\n" -#: src/main.c:378 +#: src/main.c:383 #, c-format msgid "%s: debug support not compiled in.\n" msgstr "%s: støtte for avlusing ikke inkludert ved kompilering.\n" -#: src/main.c:430 +#: src/main.c:435 msgid "" "Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.\n" "This program is distributed in the hope that it will be useful,\n" @@ -863,7 +875,7 @@ msgstr "" "EGNETHET TIL NOEN SPESIELL OPPGAVE.\n" "Se «GNU General Public License» for detaljer.\n" -#: src/main.c:436 +#: src/main.c:441 #, fuzzy msgid "" "\n" @@ -872,44 +884,44 @@ msgstr "" "\n" "Skrevet av Hrvoje Niksic .\n" -#: src/main.c:510 +#: src/main.c:515 #, c-format msgid "%s: %s: invalid command\n" msgstr "%s: %s: ugyldig kommando\n" -#: src/main.c:563 +#: src/main.c:568 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: ugyldig flagg -- «-n%c»\n" #. #### Something nicer should be printed here -- similar to the #. pre-1.5 `--help' page. -#: src/main.c:566 src/main.c:608 src/main.c:666 +#: src/main.c:571 src/main.c:613 src/main.c:671 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Prøv «%s --help» for flere flagg.\n" -#: src/main.c:646 +#: src/main.c:651 msgid "Can't be verbose and quiet at the same time.\n" msgstr "Kan ikke være utførlig og stille på samme tid.\n" -#: src/main.c:652 +#: src/main.c:657 msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Kan ikke tidsstemple og la være å berøre eksisterende filer på samme tid.\n" #. No URL specified. -#: src/main.c:661 +#: src/main.c:666 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL mangler.\n" -#: src/main.c:759 +#: src/main.c:764 #, c-format msgid "No URLs found in %s.\n" msgstr "Fant ingen URLer i %s.\n" -#: src/main.c:768 +#: src/main.c:773 #, c-format msgid "" "\n" @@ -920,14 +932,14 @@ msgstr "" "FERDIG --%s--\n" "Lastet ned %s bytes i %d filer\n" -#: src/main.c:773 +#: src/main.c:778 #, 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:800 +#: src/main.c:805 msgid "%s received, redirecting output to `%%s'.\n" msgstr "%s mottatt, omdirigerer utskrifter til «%%s».\n" diff --git a/po/pl.gmo b/po/pl.gmo index 6068ccac..6308a0e4 100644 Binary files a/po/pl.gmo and b/po/pl.gmo differ diff --git a/po/pl.po b/po/pl.po index d84bca80..dacc7878 100644 --- a/po/pl.po +++ b/po/pl.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.5.3\n" -"POT-Creation-Date: 2000-10-23 20:49-0700\n" +"POT-Creation-Date: 2000-10-23 23:14-0700\n" "PO-Revision-Date: 2000-09-15 23:44+0200\n" "Last-Translator: Grzegorz Kowal \n" "Language-Team: Polish \n" @@ -195,7 +195,7 @@ msgstr "" "%s (%s) - zapisano `%s' [%ld]\n" "\n" -#: src/ftp.c:1022 src/main.c:744 src/recur.c:468 src/retr.c:470 +#: src/ftp.c:1022 src/main.c:749 src/recur.c:468 src/retr.c:470 #, c-format msgid "Removing %s.\n" msgstr "Usuwanie %s.\n" @@ -562,44 +562,54 @@ msgstr "%s (%s) - B??d odczytu przy bajcie %ld (%s)." msgid "%s (%s) - Read error at byte %ld/%ld (%s). " msgstr "%s (%s) - B??d odczytu przy bajcie %ld/%ld (%s). " -#: src/init.c:320 src/netrc.c:260 +#: src/init.c:330 src/netrc.c:260 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Nie mog? odczyta? %s (%s).\n" -#: src/init.c:341 src/init.c:347 +#: src/init.c:351 src/init.c:357 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: B??d w %s w linii %d.\n" -#: src/init.c:378 +#: src/init.c:388 #, c-format msgid "%s: Warning: Both system and user wgetrc point to `%s'.\n" msgstr "" "%s: Ostrze?enie: Zarówno plik systemowy wgetrc jak i u?ytkownika odnosz? si? " "do `%s'.\n" -#: src/init.c:466 +#: src/init.c:476 #, c-format msgid "%s: BUG: unknown command `%s', value `%s'.\n" msgstr "%s: B??D W PROGRAMIE: nieznane polecenie `%s', warto?? `%s'.\n" -#: src/init.c:493 +#: src/init.c:498 +#, fuzzy, c-format +msgid "%s: Out of memory.\n" +msgstr "%s: %s: Brak pami?ci.\n" + +#: src/init.c:504 +#, fuzzy, c-format +msgid "%s: %s: Cannot convert `%s' to an IP address.\n" +msgstr "%s: Ostrze?enie: nie mog? odszuka? lokalnego adresu IP.\n" + +#: src/init.c:532 #, c-format msgid "%s: %s: Please specify on or off.\n" msgstr "%s: %s: Prosz? okre?li?: on lub off.\n" -#: src/init.c:537 +#: src/init.c:576 #, fuzzy, c-format msgid "%s: %s: Please specify always, on, off, or never.\n" msgstr "%s: %s: Prosz? okre?li?: on lub off.\n" -#: src/init.c:556 src/init.c:813 src/init.c:835 src/init.c:908 +#: src/init.c:595 src/init.c:852 src/init.c:874 src/init.c:947 #, c-format msgid "%s: %s: Invalid specification `%s'.\n" msgstr "%s: %s: Nieprawid?owa specyfikacja `%s'.\n" -#: src/init.c:669 src/init.c:691 src/init.c:713 src/init.c:739 +#: src/init.c:708 src/init.c:730 src/init.c:752 src/init.c:778 #, c-format msgid "%s: Invalid specification `%s'\n" msgstr "%s: Nieprawid?owa specyfikacja `%s'\n" @@ -674,6 +684,8 @@ msgstr "" #, fuzzy msgid "" "Download:\n" +" --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " +"host.\n" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits).\n" " -O --output-document=FILE write documents to FILE.\n" @@ -709,7 +721,7 @@ msgstr "" "NUMER.\n" "\n" -#: src/main.c:153 +#: src/main.c:154 msgid "" "Directories:\n" " -nd --no-directories don't create directories.\n" @@ -729,7 +741,7 @@ msgstr "" "NUMER.\n" "\n" -#: src/main.c:160 +#: src/main.c:161 #, fuzzy msgid "" "HTTP options:\n" @@ -762,7 +774,7 @@ msgstr "" "Wget/WERSJA.\n" "\n" -#: src/main.c:173 +#: src/main.c:174 #, fuzzy msgid "" "FTP options:\n" @@ -778,7 +790,7 @@ msgstr "" " --passive-ftp u?yj \"pasywnego\" trybu dla transferu.\n" "\n" -#: src/main.c:178 +#: src/main.c:179 #, fuzzy msgid "" "Recursive retrieval:\n" @@ -806,7 +818,7 @@ msgstr "" " -nr, --dont-remove-listing nie usuwaj plików `.listing'.\n" "\n" -#: src/main.c:188 +#: src/main.c:189 #, fuzzy msgid "" "Recursive accept/reject:\n" @@ -848,16 +860,16 @@ msgstr "" " -np, --no-parent nie przechod? do katalogu nadrz?dnego.\n" "\n" -#: src/main.c:203 +#: src/main.c:204 msgid "Mail bug reports and suggestions to .\n" msgstr "Raporty b??dów i sugestie prosz? wysy?a? do .\n" -#: src/main.c:378 +#: src/main.c:383 #, c-format msgid "%s: debug support not compiled in.\n" msgstr "%s: wsparcie dla debugowania nie zosta?o wkompilowane.\n" -#: src/main.c:430 +#: src/main.c:435 msgid "" "Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.\n" "This program is distributed in the hope that it will be useful,\n" @@ -871,7 +883,7 @@ msgstr "" "HANDLOWEJ lub ZASTOSOWANIA DO SZCZEGÓLNEGO CELU. Zobacz do\n" "GNU General Public License, aby uzyska? wi?cej informacji.\n" -#: src/main.c:436 +#: src/main.c:441 #, fuzzy msgid "" "\n" @@ -880,45 +892,45 @@ msgstr "" "\n" "Napisany przez Hrvoje Niksic .\n" -#: src/main.c:510 +#: src/main.c:515 #, c-format msgid "%s: %s: invalid command\n" msgstr "%s: %s: nieprawid?owa komenda\n" -#: src/main.c:563 +#: src/main.c:568 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: nielegalna opcja -- `-n%c'\n" #. #### Something nicer should be printed here -- similar to the #. pre-1.5 `--help' page. -#: src/main.c:566 src/main.c:608 src/main.c:666 +#: src/main.c:571 src/main.c:613 src/main.c:671 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Spróbuj `%s --help' w celu uzyskania opisu opcji.\n" -#: src/main.c:646 +#: src/main.c:651 msgid "Can't be verbose and quiet at the same time.\n" msgstr "Nie mog? wy?wietla? komunikatów i by? cicho w tym samym czasie.\n" -#: src/main.c:652 +#: src/main.c:657 msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Nie mog? jednocze?nie zwraca? uwagi na znaczniki czasowe i nie pobiera? " "starszych plików ni? lokalne.\n" #. No URL specified. -#: src/main.c:661 +#: src/main.c:666 #, c-format msgid "%s: missing URL\n" msgstr "%s: brak URL'a\n" -#: src/main.c:759 +#: src/main.c:764 #, c-format msgid "No URLs found in %s.\n" msgstr "Nie znaleziono ?adnych URL'i w %s.\n" -#: src/main.c:768 +#: src/main.c:773 #, c-format msgid "" "\n" @@ -929,14 +941,14 @@ msgstr "" "ZAKO?CZONO --%s--\n" "Pobrano: %s bajtów w %d plikach\n" -#: src/main.c:773 +#: src/main.c:778 #, 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:800 +#: src/main.c:805 msgid "%s received, redirecting output to `%%s'.\n" msgstr "pobrano %s, przekierowanie wyj?cia do `%%s'.\n" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo index 53eb1d8e..917f90f8 100644 Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ diff --git a/po/pt_BR.po b/po/pt_BR.po index ec70c806..1587afc8 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.5-b9\n" -"POT-Creation-Date: 2000-10-23 20:49-0700\n" +"POT-Creation-Date: 2000-10-23 23:14-0700\n" "PO-Revision-Date: 1998-04-06 22:09-0300\n" "Last-Translator: Wanderlei Antonio Cavasin \n" "Language-Team: Portuguese \n" @@ -212,7 +212,7 @@ msgstr "" "\n" # , c-format -#: src/ftp.c:1022 src/main.c:744 src/recur.c:468 src/retr.c:470 +#: src/ftp.c:1022 src/main.c:749 src/recur.c:468 src/retr.c:470 #, c-format msgid "Removing %s.\n" msgstr "Removendo %s.\n" @@ -619,50 +619,61 @@ msgid "%s (%s) - Read error at byte %ld/%ld (%s). " msgstr "%s (%s) - Erro de leitura no byte %ld/%ld (%s)." # , c-format -#: src/init.c:320 src/netrc.c:260 +#: src/init.c:330 src/netrc.c:260 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Não foi possível ler %s (%s).\n" # , c-format -#: src/init.c:341 src/init.c:347 +#: src/init.c:351 src/init.c:357 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Erro em %s na linha %d.\n" # , c-format -#: src/init.c:378 +#: src/init.c:388 #, c-format msgid "%s: Warning: Both system and user wgetrc point to `%s'.\n" msgstr "" "%s: Aviso: os arquivos wgetrc do sistema e do usuário apontam para `%s'.\n" # , c-format -#: src/init.c:466 +#: src/init.c:476 #, fuzzy, c-format msgid "%s: BUG: unknown command `%s', value `%s'.\n" msgstr "%s: Comando desconhecido `%s', valor `%s'.\n" # , c-format -#: src/init.c:493 +#: src/init.c:498 +#, fuzzy, c-format +msgid "%s: Out of memory.\n" +msgstr "%s: %s: Memória insuficiente.\n" + +#: src/init.c:504 +#, fuzzy, c-format +msgid "%s: %s: Cannot convert `%s' to an IP address.\n" +msgstr "%s: Aviso: não foi possível resolver endereço IP local.\n" + +# , c-format +#: src/init.c:532 #, c-format msgid "%s: %s: Please specify on or off.\n" msgstr "%s: %s: Por favor especifique on ou off.\n" # , c-format -#: src/init.c:537 +#: src/init.c:576 #, fuzzy, c-format msgid "%s: %s: Please specify always, on, off, or never.\n" msgstr "%s: %s: Por favor especifique on ou off.\n" # , c-format -#: src/init.c:556 src/init.c:813 src/init.c:835 src/init.c:908 +#: src/init.c:595 src/init.c:852 src/init.c:874 src/init.c:947 #, c-format msgid "%s: %s: Invalid specification `%s'.\n" msgstr "%s: %s: Especificação inválida `%s'\n" # , c-format -#: src/init.c:669 src/init.c:691 src/init.c:713 src/init.c:739 +#: src/init.c:708 src/init.c:730 src/init.c:752 src/init.c:778 #, c-format msgid "%s: Invalid specification `%s'\n" msgstr "%s: Especificação inválida `%s'\n" @@ -741,6 +752,8 @@ msgstr "" #, fuzzy msgid "" "Download:\n" +" --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " +"host.\n" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits).\n" " -O --output-document=FILE write documents to FILE.\n" @@ -776,7 +789,7 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:153 +#: src/main.c:154 msgid "" "Directories:\n" " -nd --no-directories don't create directories.\n" @@ -795,7 +808,7 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:160 +#: src/main.c:161 #, fuzzy msgid "" "HTTP options:\n" @@ -827,7 +840,7 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:173 +#: src/main.c:174 #, fuzzy msgid "" "FTP options:\n" @@ -845,7 +858,7 @@ msgstr "" " --passive-ftp usa modo de transferência \"passivo\".\n" "\n" -#: src/main.c:178 +#: src/main.c:179 #, fuzzy msgid "" "Recursive retrieval:\n" @@ -872,7 +885,7 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:188 +#: src/main.c:189 #, fuzzy msgid "" "Recursive accept/reject:\n" @@ -912,17 +925,17 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:203 +#: src/main.c:204 msgid "Mail bug reports and suggestions to .\n" msgstr "Relatos de bugs e sugestões para .\n" # , fuzzy -#: src/main.c:378 +#: src/main.c:383 #, c-format msgid "%s: debug support not compiled in.\n" msgstr "%s: compilado sem debug.\n" -#: src/main.c:430 +#: src/main.c:435 msgid "" "Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.\n" "This program is distributed in the hope that it will be useful,\n" @@ -936,7 +949,7 @@ msgstr "" "COMERCIABILIDADE ou de UTILIDADE PARA UM PROPÓSITO PARTICULAR.\n" "Veja a Licença Pública Geral GNU (GNU GPL) para mais detalhes.\n" -#: src/main.c:436 +#: src/main.c:441 #, fuzzy msgid "" "\n" @@ -946,13 +959,13 @@ msgstr "" "Escrito por Hrvoje Niksic .\n" # , c-format -#: src/main.c:510 +#: src/main.c:515 #, c-format msgid "%s: %s: invalid command\n" msgstr "%s: %s: comando inválido\n" # , c-format -#: src/main.c:563 +#: src/main.c:568 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: opção ilegal -- `-n%c'\n" @@ -960,35 +973,35 @@ msgstr "%s: op # , c-format #. #### Something nicer should be printed here -- similar to the #. pre-1.5 `--help' page. -#: src/main.c:566 src/main.c:608 src/main.c:666 +#: src/main.c:571 src/main.c:613 src/main.c:671 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Tente `%s --help' para mais opções.\n" -#: src/main.c:646 +#: src/main.c:651 msgid "Can't be verbose and quiet at the same time.\n" msgstr "Não pode ser verboso e quieto ao mesmo tempo.\n" -#: src/main.c:652 +#: src/main.c:657 msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Não é possível usar as opções \"timestamp\" e \"no clobber\" ao mesmo " "tempo.\n" #. No URL specified. -#: src/main.c:661 +#: src/main.c:666 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL faltando\n" # , c-format -#: src/main.c:759 +#: src/main.c:764 #, c-format msgid "No URLs found in %s.\n" msgstr "Nenhuma URL encontrada em %s.\n" # , c-format -#: src/main.c:768 +#: src/main.c:773 #, c-format msgid "" "\n" @@ -1000,14 +1013,14 @@ msgstr "" "Baixados: %s bytes em %d arquivos\n" # , c-format -#: src/main.c:773 +#: src/main.c:778 #, 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:800 +#: src/main.c:805 msgid "%s received, redirecting output to `%%s'.\n" msgstr "%s recebido, redirecionando saída para `%%s'.\n" diff --git a/po/ru.gmo b/po/ru.gmo index 9a19bf13..6019b4af 100644 Binary files a/po/ru.gmo and b/po/ru.gmo differ diff --git a/po/ru.po b/po/ru.po index b1d00454..60130001 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.5.4\n" -"POT-Creation-Date: 2000-10-23 20:49-0700\n" +"POT-Creation-Date: 2000-10-23 23:14-0700\n" "PO-Revision-Date: 2000-09-18 01:16+08:00\n" "Last-Translator: Const Kaplinsky \n" "Language-Team: Russian \n" @@ -195,7 +195,7 @@ msgstr "" "%s (%s) - `%s' ÓÏÈÒÁÎÅÎ [%ld]\n" "\n" -#: src/ftp.c:1022 src/main.c:744 src/recur.c:468 src/retr.c:470 +#: src/ftp.c:1022 src/main.c:749 src/recur.c:468 src/retr.c:470 #, c-format msgid "Removing %s.\n" msgstr "õÄÁÌÅÎÉÅ %s.\n" @@ -562,43 +562,54 @@ msgstr "%s (%s) - msgid "%s (%s) - Read error at byte %ld/%ld (%s). " msgstr "%s (%s) - ïÛÉÂËÁ ÞÔÅÎÉÑ, ÐÏÚÉÃÉÑ %ld/%ld (%s). " -#: src/init.c:320 src/netrc.c:260 +#: src/init.c:330 src/netrc.c:260 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: ïÛÉÂËÁ ÞÔÅÎÉÑ %s (%s).\n" -#: src/init.c:341 src/init.c:347 +#: src/init.c:351 src/init.c:357 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: ïÛÉÂËÁ × %s × ÓÔÒÏËÅ %d.\n" -#: src/init.c:378 +#: src/init.c:388 #, c-format msgid "%s: Warning: Both system and user wgetrc point to `%s'.\n" msgstr "" "%s: ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÓÉÓÔÅÍÎÙÊ É ÐÏÌØÚÏ×ÁÔÅÌØÓËÉÊ wgetrc ÕËÁÚÙ×ÁÀÔ ÎÁ `%s'.\n" -#: src/init.c:466 +#: src/init.c:476 #, c-format msgid "%s: BUG: unknown command `%s', value `%s'.\n" msgstr "%s: ïûéâëá ÷ ðòïçòáííå: ÎÅÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ `%s', ÚÎÁÞÅÎÉÅ `%s'.\n" -#: src/init.c:493 +#: src/init.c:498 +#, fuzzy, c-format +msgid "%s: Out of memory.\n" +msgstr "%s: %s: îÅÄÏÓÔÁÔÏÞÎÏ ÐÁÍÑÔÉ.\n" + +#: src/init.c:504 +#, fuzzy, c-format +msgid "%s: %s: Cannot convert `%s' to an IP address.\n" +msgstr "" +"%s: ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÏÛÉÂËÁ ÏÂÒÁÔÎÏÇÏ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ ÌÏËÁÌØÎÏÇÏ IP-ÁÄÒÅÓÁ.\n" + +#: src/init.c:532 #, c-format msgid "%s: %s: Please specify on or off.\n" msgstr "%s: %s: ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ on ÉÌÉ off.\n" -#: src/init.c:537 +#: src/init.c:576 #, fuzzy, c-format msgid "%s: %s: Please specify always, on, off, or never.\n" msgstr "%s: %s: ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ on ÉÌÉ off.\n" -#: src/init.c:556 src/init.c:813 src/init.c:835 src/init.c:908 +#: src/init.c:595 src/init.c:852 src/init.c:874 src/init.c:947 #, c-format msgid "%s: %s: Invalid specification `%s'.\n" msgstr "%s: %s: îÅÄÏÐÕÓÔÉÍÏÅ ÏÐÉÓÁÎÉÅ `%s'.\n" -#: src/init.c:669 src/init.c:691 src/init.c:713 src/init.c:739 +#: src/init.c:708 src/init.c:730 src/init.c:752 src/init.c:778 #, c-format msgid "%s: Invalid specification `%s'\n" msgstr "%s: îÅÄÏÐÕÓÔÉÍÏÅ ÏÐÉÓÁÎÉÅ `%s'\n" @@ -669,8 +680,11 @@ msgstr "" "\n" #: src/main.c:138 +#, fuzzy msgid "" "Download:\n" +" --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " +"host.\n" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits).\n" " -O --output-document=FILE write documents to FILE.\n" @@ -708,7 +722,7 @@ msgstr "" "ÆÁÊÌÏ×.\n" "\n" -#: src/main.c:153 +#: src/main.c:154 msgid "" "Directories:\n" " -nd --no-directories don't create directories.\n" @@ -727,7 +741,7 @@ msgstr "" " --cut-dirs=þéóìï ÕÓÅÞØ ÚÁÄÁÎÎÏÅ þéóìï ËÏÍÐÏÎÅÎÔ ËÁÔÁÌÏÇÁ.\n" "\n" -#: src/main.c:160 +#: src/main.c:161 #, fuzzy msgid "" "HTTP options:\n" @@ -762,7 +776,7 @@ msgstr "" " -U, --user-agent=óôòïëá ÚÁÄÁÔØ ÉÍÑ ÁÇÅÎÔÁ óôòïëá ×ÍÅÓÔÏ Wget/÷åòóéñ.\n" "\n" -#: src/main.c:173 +#: src/main.c:174 #, fuzzy msgid "" "FTP options:\n" @@ -779,7 +793,7 @@ msgstr "" " --passive-ftp ÉÓÐÏÌØÚÏ×ÁÔØ \"ÐÁÓÓÉ×ÎÙÊ\" ÒÅÖÉÍ ÐÅÒÅÄÁÞÉ.\n" "\n" -#: src/main.c:178 +#: src/main.c:179 #, fuzzy msgid "" "Recursive retrieval:\n" @@ -810,7 +824,7 @@ msgstr "" " ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÏÔÏÂÒÁÖÅÎÉÑ HTML-ÓÔÒÁÎÉÃÙ.\n" "\n" -#: src/main.c:188 +#: src/main.c:189 msgid "" "Recursive accept/reject:\n" " -A, --accept=LIST comma-separated list of accepted " @@ -852,17 +866,17 @@ msgstr "" " -np, --no-parent ÎÅ ÐÏÄÎÉÍÁÔØÓÑ × ÒÏÄÉÔÅÌØÓËÉÊ ËÁÔÁÌÏÇ.\n" "\n" -#: src/main.c:203 +#: src/main.c:204 msgid "Mail bug reports and suggestions to .\n" msgstr "" "óÏÏÂÝÅÎÉÑ Ï ÚÁÍÅÞÅÎÎÙÈ ÏÛÉÂËÁÈ ÏÔÐÒÁ×ÌÑÊÔÅ ÐÏ ÁÄÒÅÓÕ .\n" -#: src/main.c:378 +#: src/main.c:383 #, c-format msgid "%s: debug support not compiled in.\n" msgstr "%s: ÐÏÄÄÅÒÖËÁ ÏÔÌÁÄËÉ ÎÅ ÂÙÌÁ ×ËÌÀÞÅÎÁ ÐÒÉ ËÏÍÐÉÌÑÃÉÉ.\n" -#: src/main.c:430 +#: src/main.c:435 msgid "" "Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.\n" "This program is distributed in the hope that it will be useful,\n" @@ -876,7 +890,7 @@ msgstr "" "ðïìåúîïóôé ÉÌÉ ðòéçïäîïóôé äìñ ïðòåäåìåîîïê ãåìé. äÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ\n" "ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ ÓÍÏÔÒÉÔÅ GNU General Public License.\n" -#: src/main.c:436 +#: src/main.c:441 #, fuzzy msgid "" "\n" @@ -885,44 +899,44 @@ msgstr "" "\n" "ðÅÒ×ÏÎÁÞÁÌØÎÏ ÒÁÚÒÁÂÏÔÁÎÏ Á×ÔÏÒÏÍ: Hrvoje Niksic .\n" -#: src/main.c:510 +#: src/main.c:515 #, c-format msgid "%s: %s: invalid command\n" msgstr "%s: %s: ÎÅÄÏÐÕÓÔÉÍÁÑ ËÏÍÁÎÄÁ\n" -#: src/main.c:563 +#: src/main.c:568 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ËÌÀÞ -- `-n%c'\n" #. #### Something nicer should be printed here -- similar to the #. pre-1.5 `--help' page. -#: src/main.c:566 src/main.c:608 src/main.c:666 +#: src/main.c:571 src/main.c:613 src/main.c:671 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "úÁÐÕÓÔÉÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÊ ÓÐÒÁ×ËÉ.\n" -#: src/main.c:646 +#: src/main.c:651 msgid "Can't be verbose and quiet at the same time.\n" msgstr "òÅÖÉÍÙ verbose É quiet ÐÒÏÔÉ×ÏÒÅÞÁÔ ÄÒÕÇ ÄÒÕÇÕ.\n" -#: src/main.c:652 +#: src/main.c:657 msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "òÅÖÉÍÙ ÐÏÄÄÅÒÖËÉ ÏÔÍÅÔÏË ×ÒÅÍÅÎÉ É ÓÏÈÒÁÎÅÎÉÑ ÓÔÁÒÙÈ ÆÁÊÌÏ× ÎÅÓÏ×ÍÅÓÔÉÍÙ.\n" #. No URL specified. -#: src/main.c:661 +#: src/main.c:666 #, c-format msgid "%s: missing URL\n" msgstr "%s: ÎÅ ÕËÁÚÁÎ URL\n" -#: src/main.c:759 +#: src/main.c:764 #, c-format msgid "No URLs found in %s.\n" msgstr "÷ ÆÁÊÌÅ %s ÎÅ ÏÂÎÁÒÕÖÅÎÏ ÓÔÒÏË URL.\n" -#: src/main.c:768 +#: src/main.c:773 #, c-format msgid "" "\n" @@ -933,14 +947,14 @@ msgstr "" "úá÷åòûåîï --%s--\n" "ðÒÉÎÑÔÏ: %s ÂÁÊÔ × %d ÆÁÊÌax\n" -#: src/main.c:773 +#: src/main.c:778 #, 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:800 +#: src/main.c:805 msgid "%s received, redirecting output to `%%s'.\n" msgstr "ðÏÌÕÞÅÎ ÓÉÇÎÁÌ %s, ×Ù×ÏÄ ÐÅÒÅÎÁÐÒÁ×ÌÅÎ × `%%s'.\n" diff --git a/po/wget.pot b/po/wget.pot index 41d61406..0f8ae9fd 100644 --- a/po/wget.pot +++ b/po/wget.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-10-23 20:49-0700\n" +"POT-Creation-Date: 2000-10-23 23:14-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -186,7 +186,7 @@ msgid "" "\n" msgstr "" -#: src/ftp.c:1022 src/main.c:744 src/recur.c:468 src/retr.c:470 +#: src/ftp.c:1022 src/main.c:749 src/recur.c:468 src/retr.c:470 #, c-format msgid "Removing %s.\n" msgstr "" @@ -544,42 +544,52 @@ msgstr "" msgid "%s (%s) - Read error at byte %ld/%ld (%s). " msgstr "" -#: src/init.c:320 src/netrc.c:260 +#: src/init.c:330 src/netrc.c:260 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "" -#: src/init.c:341 src/init.c:347 +#: src/init.c:351 src/init.c:357 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "" -#: src/init.c:378 +#: src/init.c:388 #, c-format msgid "%s: Warning: Both system and user wgetrc point to `%s'.\n" msgstr "" -#: src/init.c:466 +#: src/init.c:476 #, c-format msgid "%s: BUG: unknown command `%s', value `%s'.\n" msgstr "" -#: src/init.c:493 +#: src/init.c:498 +#, c-format +msgid "%s: Out of memory.\n" +msgstr "" + +#: src/init.c:504 +#, c-format +msgid "%s: %s: Cannot convert `%s' to an IP address.\n" +msgstr "" + +#: src/init.c:532 #, c-format msgid "%s: %s: Please specify on or off.\n" msgstr "" -#: src/init.c:537 +#: src/init.c:576 #, c-format msgid "%s: %s: Please specify always, on, off, or never.\n" msgstr "" -#: src/init.c:556 src/init.c:813 src/init.c:835 src/init.c:908 +#: src/init.c:595 src/init.c:852 src/init.c:874 src/init.c:947 #, c-format msgid "%s: %s: Invalid specification `%s'.\n" msgstr "" -#: src/init.c:669 src/init.c:691 src/init.c:713 src/init.c:739 +#: src/init.c:708 src/init.c:730 src/init.c:752 src/init.c:778 #, c-format msgid "%s: Invalid specification `%s'\n" msgstr "" @@ -631,6 +641,8 @@ msgstr "" #: src/main.c:138 msgid "" "Download:\n" +" --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " +"host.\n" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits).\n" " -O --output-document=FILE write documents to FILE.\n" @@ -650,7 +662,7 @@ msgid "" "\n" msgstr "" -#: src/main.c:153 +#: src/main.c:154 msgid "" "Directories:\n" " -nd --no-directories don't create directories.\n" @@ -662,7 +674,7 @@ msgid "" "\n" msgstr "" -#: src/main.c:160 +#: src/main.c:161 msgid "" "HTTP options:\n" " --http-user=USER set http user to USER.\n" @@ -681,7 +693,7 @@ msgid "" "\n" msgstr "" -#: src/main.c:173 +#: src/main.c:174 msgid "" "FTP options:\n" " --retr-symlinks when recursing, retrieve linked-to files (not " @@ -691,7 +703,7 @@ msgid "" "\n" msgstr "" -#: src/main.c:178 +#: src/main.c:179 msgid "" "Recursive retrieval:\n" " -r, --recursive recursive web-suck -- use with care!.\n" @@ -708,7 +720,7 @@ msgid "" "\n" msgstr "" -#: src/main.c:188 +#: src/main.c:189 msgid "" "Recursive accept/reject:\n" " -A, --accept=LIST comma-separated list of accepted " @@ -733,16 +745,16 @@ msgid "" "\n" msgstr "" -#: src/main.c:203 +#: src/main.c:204 msgid "Mail bug reports and suggestions to .\n" msgstr "" -#: src/main.c:378 +#: src/main.c:383 #, c-format msgid "%s: debug support not compiled in.\n" msgstr "" -#: src/main.c:430 +#: src/main.c:435 msgid "" "Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.\n" "This program is distributed in the hope that it will be useful,\n" @@ -751,49 +763,49 @@ msgid "" "GNU General Public License for more details.\n" msgstr "" -#: src/main.c:436 +#: src/main.c:441 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" msgstr "" -#: src/main.c:510 +#: src/main.c:515 #, c-format msgid "%s: %s: invalid command\n" msgstr "" -#: src/main.c:563 +#: src/main.c:568 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "" #. #### Something nicer should be printed here -- similar to the #. pre-1.5 `--help' page. -#: src/main.c:566 src/main.c:608 src/main.c:666 +#: src/main.c:571 src/main.c:613 src/main.c:671 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "" -#: src/main.c:646 +#: src/main.c:651 msgid "Can't be verbose and quiet at the same time.\n" msgstr "" -#: src/main.c:652 +#: src/main.c:657 msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" #. No URL specified. -#: src/main.c:661 +#: src/main.c:666 #, c-format msgid "%s: missing URL\n" msgstr "" -#: src/main.c:759 +#: src/main.c:764 #, c-format msgid "No URLs found in %s.\n" msgstr "" -#: src/main.c:768 +#: src/main.c:773 #, c-format msgid "" "\n" @@ -801,14 +813,14 @@ msgid "" "Downloaded: %s bytes in %d files\n" msgstr "" -#: src/main.c:773 +#: src/main.c:778 #, 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:800 +#: src/main.c:805 msgid "%s received, redirecting output to `%%s'.\n" msgstr "" diff --git a/src/ChangeLog b/src/ChangeLog index 04f7c8bd..b2770ef7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,13 +1,28 @@ 2000-10-23 Dan Harkless + * connect.c (make_connection and bindport): Manually applied Rob + Mayoff 's 1.5.3 patch to add --bind-address, + changing coding style to GNU's. + * 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. + + * init.c: Manually applied Rob Mayoff's 1.5.3 patch to add + --bind-address, alphabetizing, changing coding style to GNU's, + commenting, and renaming cmd_ip_address() to cmd_address() to + imply hostnames also okay. - * main.c (main): --delete-after didn't delete the root of the tree. - Ignore --convert-links if --delete-after was specified. + * main.c (main): --delete-after didn't delete the root of the + tree. Ignore --convert-links if --delete-after was specified. + Manually applied Rob Mayoff's 1.5.3 patch to add --bind-address, + fixing duplicate use of added-since-1.5.3 case value. (print_help): Clarified that --delete-after deletes local files. + Rob forgot to add a line for his new --bind-address option. + + * options.h (struct options): Manually applied Rob Mayoff's patch + to add --bind-address (bind_address structure member). * recur.c (recursive_retrieve): Improved comment; added DEBUGP(). Ignore --convert-links if --delete-after was specified. diff --git a/src/connect.c b/src/connect.c index 175db605..28ce2043 100644 --- a/src/connect.c +++ b/src/connect.c @@ -87,6 +87,14 @@ make_connection (int *sock, char *hostname, unsigned short port) if ((*sock = socket (AF_INET, SOCK_STREAM, 0)) == -1) return CONSOCKERR; + if (opt.bind_address != NULL) + { + /* Bind the client side to the requested address. */ + if (bind (*sock, (struct sockaddr *) opt.bind_address, + sizeof (*opt.bind_address))) + return CONSOCKERR; + } + /* Connect the socket to the remote host. */ if (connect (*sock, (struct sockaddr *) &sock_name, sizeof (sock_name))) { @@ -118,8 +126,15 @@ bindport (unsigned short *port) if (setsockopt (msock, SOL_SOCKET, SO_REUSEADDR, (char *)&optval, sizeof (optval)) < 0) return CONSOCKERR; - srv.sin_family = AF_INET; - srv.sin_addr.s_addr = htonl (INADDR_ANY); + + if (opt.bind_address == NULL) + { + srv.sin_family = AF_INET; + srv.sin_addr.s_addr = htonl (INADDR_ANY); + } + else + srv = *opt.bind_address; + srv.sin_port = htons (*port); if (bind (msock, addr, sizeof (struct sockaddr_in)) < 0) { diff --git a/src/init.c b/src/init.c index b1169b23..9e119445 100644 --- a/src/init.c +++ b/src/init.c @@ -33,6 +33,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #endif #include +#ifdef WINDOWS +# include +#else +# include +# include +# include +#endif + #ifdef HAVE_PWD_H #include #endif @@ -52,6 +60,7 @@ extern int errno; #define CMD_DECLARE(func) static int func \ PARAMS ((const char *, const char *, void *)) +CMD_DECLARE (cmd_address); CMD_DECLARE (cmd_boolean); CMD_DECLARE (cmd_bytes); CMD_DECLARE (cmd_directory_vector); @@ -87,6 +96,7 @@ static struct { { "background", &opt.background, cmd_boolean }, { "backupconverted", &opt.backup_converted, cmd_boolean }, { "backups", &opt.backups, cmd_number }, + { "bindaddress", &opt.bind_address, cmd_address }, { "base", &opt.base_href, cmd_string }, { "cache", &opt.proxy_cache, cmd_boolean }, { "continue", &opt.always_rest, cmd_boolean }, @@ -475,6 +485,35 @@ setval (const char *com, const char *val) static int myatoi PARAMS ((const char *s)); +/* Store the address (specified as hostname or dotted-quad IP address) from VAL + to CLOSURE. COM is ignored, except for error messages. */ +static int +cmd_address (const char *com, const char *val, void *closure) +{ + struct sockaddr_in *sin; + + sin = (struct sockaddr_in *) malloc(sizeof *sin); + if (sin == NULL) + { + fprintf (stderr, _("%s: Out of memory.\n"), exec_name); + return 0; + } + + if (!store_hostaddress ((unsigned char *)&sin->sin_addr, val)) + { + fprintf (stderr, _("%s: %s: Cannot convert `%s' to an IP address.\n"), + exec_name, com, val); + return 0; + } + + sin->sin_family = AF_INET; + sin->sin_port = 0; + + * (struct sockaddr_in **) closure = sin; + + return 1; +} + /* Store the boolean value from VAL to CLOSURE. COM is ignored, except for error messages. */ static int diff --git a/src/main.c b/src/main.c index 4128bcb7..8bda521b 100644 --- a/src/main.c +++ b/src/main.c @@ -137,6 +137,7 @@ Logging and input file:\n\ -B, --base=URL prepends URL to relative links in -F -i file.\n\ \n"), _("\ Download:\n\ + --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local host.\n\ -t, --tries=NUMBER set number of retries to NUMBER (0 unlimits).\n\ -O --output-document=FILE write documents to FILE.\n\ -nc, --no-clobber don\'t clobber existing files or use .# suffixes.\n\ @@ -253,6 +254,7 @@ main (int argc, char *const *argv) { "append-output", required_argument, NULL, 'a' }, { "backups", required_argument, NULL, 23 }, /* undocumented */ { "base", required_argument, NULL, 'B' }, + { "bind-address", required_argument, NULL, 27 }, { "cache", required_argument, NULL, 'C' }, { "cut-dirs", required_argument, NULL, 17 }, { "delete-after", no_argument, NULL, 8 }, @@ -365,6 +367,9 @@ hpVqvdkKsxmNWrHSLcFbEY:G:g:T:U:O:l:n:i:o:a:t:D:A:R:P:B:e:Q:X:I:w:", printf ("%s\n", ftp_getaddress ()); exit (0); break; + case 27: + setval ("bindaddress", optarg); + break; case 'b': setval ("background", "on"); break; diff --git a/src/options.h b/src/options.h index fcd89376..8c2ab176 100644 --- a/src/options.h +++ b/src/options.h @@ -146,6 +146,8 @@ struct options int page_requisites; /* Whether we need to download all files necessary to display a page properly. */ + + struct sockaddr_in *bind_address; /* What local IP address to bind to. */ }; #ifndef OPTIONS_DEFINED_HERE