diff --git a/ChangeLog b/ChangeLog index 6edc5cbc..aefdee09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2000-03-10 Dan Harkless + + * TODO: Removed done item: we now have an option (-G) that makes + it easy to download a single HTML document and all its constituents. + + * po/*.{gmo,po,pot}: Regenerated after adding new options. + + * po/hr.po: Hrvoje forgot '\n's on his translations of my altered + messages, causing msgfmt to balk and `make install' to fail. + 2000-03-01 Dan Harkless * NEWS (-K): Now possible to use -N with -k thanks to this option. diff --git a/TODO b/TODO index 9f547699..30e9f9ca 100644 --- a/TODO +++ b/TODO @@ -22,9 +22,6 @@ particular order. Not all of them are user-visible changes. * Add case-insensitivity as an option. -* Add option to download all files needed to display a web page - (images, etc.) - * Handle MIME types correctly. There should be an option to (not) retrieve files based on MIME types, e.g. `--accept-types=image/*'. diff --git a/doc/ChangeLog b/doc/ChangeLog index beeb0093..db44aed2 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,13 @@ +2000-03-10 Dan Harkless + + * wget.texi (Recursive Retrieval Options): In -K description, + added a link to the discussion of interaction with -N. + (Recursive Accept/Reject Options): Did some alphabetizing and added + descriptions of new --follow-tags and -G / --ignore-tags options. + (Following Links): Changed "the loads of" to "loads of". + (Wgetrc Commands): Added descriptions of new follow_tags and + ignore_tags commands. + 2000-03-02 Daniel S. Lewart * wget.texi: Fix spelling and grammatical mistakes. diff --git a/doc/wget.info b/doc/wget.info index b39ac099..6dc5287d 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: 50388 -wget.info-3: 89138 +wget.info-2: 50366 +wget.info-3: 90237  Tag Table: (Indirect) @@ -43,46 +43,46 @@ Node: Directory Options18466 Node: HTTP Options20944 Node: FTP Options24540 Node: Recursive Retrieval Options25733 -Node: Recursive Accept/Reject Options27622 -Node: Recursive Retrieval29705 -Node: Following Links32003 -Node: Relative Links33035 -Node: Host Checking33549 -Node: Domain Acceptance35574 -Node: All Hosts37244 -Node: Types of Files37671 -Node: Directory-Based Limits40121 -Node: FTP Links42761 -Node: Time-Stamping43631 -Node: Time-Stamping Usage45268 -Node: HTTP Time-Stamping Internals46837 -Node: FTP Time-Stamping Internals48307 -Node: Startup File49515 -Node: Wgetrc Location50388 -Node: Wgetrc Syntax51203 -Node: Wgetrc Commands51918 -Node: Sample Wgetrc58756 -Node: Examples63048 -Node: Simple Usage63655 -Node: Advanced Usage66049 -Node: Guru Usage68800 -Node: Various70462 -Node: Proxies70986 -Node: Distribution73751 -Node: Mailing List74102 -Node: Reporting Bugs74801 -Node: Portability76586 -Node: Signals77961 -Node: Appendices78615 -Node: Robots79030 -Node: Introduction to RES80177 -Node: RES Format82070 -Node: User-Agent Field83174 -Node: Disallow Field83938 -Node: Norobots Examples84549 -Node: Security Considerations85503 -Node: Contributors86499 -Node: Copying89138 -Node: Concept Index108301 +Node: Recursive Accept/Reject Options27697 +Node: Recursive Retrieval30560 +Node: Following Links32858 +Node: Relative Links33886 +Node: Host Checking34400 +Node: Domain Acceptance36425 +Node: All Hosts38095 +Node: Types of Files38522 +Node: Directory-Based Limits40972 +Node: FTP Links43612 +Node: Time-Stamping44482 +Node: Time-Stamping Usage46119 +Node: HTTP Time-Stamping Internals47688 +Node: FTP Time-Stamping Internals49158 +Node: Startup File50366 +Node: Wgetrc Location51239 +Node: Wgetrc Syntax52054 +Node: Wgetrc Commands52769 +Node: Sample Wgetrc59855 +Node: Examples64147 +Node: Simple Usage64754 +Node: Advanced Usage67148 +Node: Guru Usage69899 +Node: Various71561 +Node: Proxies72085 +Node: Distribution74850 +Node: Mailing List75201 +Node: Reporting Bugs75900 +Node: Portability77685 +Node: Signals79060 +Node: Appendices79714 +Node: Robots80129 +Node: Introduction to RES81276 +Node: RES Format83169 +Node: User-Agent Field84273 +Node: Disallow Field85037 +Node: Norobots Examples85648 +Node: Security Considerations86602 +Node: Contributors87598 +Node: Copying90237 +Node: Concept Index109400  End Tag Table diff --git a/doc/wget.info-1 b/doc/wget.info-1 index 539161e3..2f6af01f 100644 --- a/doc/wget.info-1 +++ b/doc/wget.info-1 @@ -692,8 +692,9 @@ Recursive Retrieval Options `-K' `--backup-converted' - When converting a file, back up the original version with a - `.orig' suffix. + When converting a file, back up the original version with a `.orig' + suffix. Affects the behavior of `-N' (*Note HTTP Time-Stamping + Internals::). `-m' `--mirror' @@ -732,21 +733,39 @@ Recursive Accept/Reject Options Exclude the domains given in a comma-separated DOMAIN-LIST from DNS-lookup (*Note Domain Acceptance::). -`-L' -`--relative' - Follow relative links only. Useful for retrieving a specific home - page without any distractions, not even those from the same hosts - (*Note Relative Links::). - `--follow-ftp' Follow FTP links from HTML documents. Without this option, Wget will ignore all the FTP links. +`--follow-tags=LIST' + Wget has an internal table of HTML tag / attribute pairs that it + considers when looking for linked documents during a recursive + retrieval. If a user wants only a subset of those tags to be + considered, however, he or she should be specify such tags in a + comma-separated LIST with this option. + +`-G LIST' +`--ignore-tags=LIST' + This is the opposite of the `--follow-tags' option. To skip + certain HTML tags when recursively looking for documents to + download, specify them in a comma-separated LIST. The author of + this option likes to use the following command to download a + single HTML page and all documents necessary to display it + properly: + + wget -Ga,area -H -k -K -nh -r http://SITE/DOCUMENT + `-H' `--span-hosts' Enable spanning across hosts when doing recursive retrieving (*Note All Hosts::). +`-L' +`--relative' + Follow relative links only. Useful for retrieving a specific home + page without any distractions, not even those from the same hosts + (*Note Relative Links::). + `-I LIST' `--include-directories=LIST' Specify a comma-separated list of directories you wish to follow @@ -829,9 +848,9 @@ File: wget.info, Node: Following Links, Next: Time-Stamping, Prev: Recursive Following Links *************** - When retrieving recursively, one does not wish to retrieve the loads -of unnecessary data. Most of the time the users bear in mind exactly -what they want to download, and want Wget to follow only specific links. + When retrieving recursively, one does not wish to retrieve loads of +unnecessary data. Most of the time the users bear in mind exactly what +they want to download, and want Wget to follow only specific links. For example, if you wish to download the music archive from `fly.cc.fer.hr', you will not want to download all the home pages that @@ -1243,29 +1262,3 @@ that is supported by some FTP servers (including the popular `wu-ftpd'), which returns the exact time of the specified file. Wget may support this command in the future. - -File: wget.info, Node: Startup File, Next: Examples, Prev: Time-Stamping, Up: Top - -Startup File -************ - - Once you know how to change default settings of Wget through command -line arguments, you may wish to make some of those settings permanent. -You can do that in a convenient way by creating the Wget startup -file--`.wgetrc'. - - Besides `.wgetrc' is the "main" initialization file, it is -convenient to have a special facility for storing passwords. Thus Wget -reads and interprets the contents of `$HOME/.netrc', if it finds it. -You can find `.netrc' format in your system manuals. - - Wget reads `.wgetrc' upon startup, recognizing a limited set of -commands. - -* Menu: - -* Wgetrc Location:: Location of various wgetrc files. -* Wgetrc Syntax:: Syntax of wgetrc. -* Wgetrc Commands:: List of available commands. -* Sample Wgetrc:: A wgetrc example. - diff --git a/doc/wget.info-2 b/doc/wget.info-2 index e87cc1ec..52a2b228 100644 --- a/doc/wget.info-2 +++ b/doc/wget.info-2 @@ -23,6 +23,32 @@ are included exactly as in the original, and provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one. + +File: wget.info, Node: Startup File, Next: Examples, Prev: Time-Stamping, Up: Top + +Startup File +************ + + Once you know how to change default settings of Wget through command +line arguments, you may wish to make some of those settings permanent. +You can do that in a convenient way by creating the Wget startup +file--`.wgetrc'. + + Besides `.wgetrc' is the "main" initialization file, it is +convenient to have a special facility for storing passwords. Thus Wget +reads and interprets the contents of `$HOME/.netrc', if it finds it. +You can find `.netrc' format in your system manuals. + + Wget reads `.wgetrc' upon startup, recognizing a limited set of +commands. + +* Menu: + +* Wgetrc Location:: Location of various wgetrc files. +* Wgetrc Syntax:: Syntax of wgetrc. +* Wgetrc Commands:: List of available commands. +* Sample Wgetrc:: A wgetrc example. +  File: wget.info, Node: Wgetrc Location, Next: Wgetrc Syntax, Prev: Startup File, Up: Startup File @@ -158,6 +184,10 @@ exclude_domains = STRING follow_ftp = on/off Follow FTP links from HTML documents, the same as `-f'. +follow_tags = STRING + Only follow certain HTML tags when doing a recursive retrieval, + just like `--follow-tags'. + force_html = on/off If set to on, force the input filename to be regarded as an HTML document, the same as `-F'. @@ -186,6 +216,10 @@ ignore_length = on/off When set to on, ignore `Content-Length' header; the same as `--ignore-length'. +ignore_tags = STRING + Ignore certain HTML tags when doing a recursive retrieval, just + like `-G' / `--ignore-tags'. + include_directories = STRING Specify a comma-separated list of directories you wish to follow when downloading, the same as `-I'. diff --git a/doc/wget.info-3 b/doc/wget.info-3 index d028cc99..f68a7d91 100644 --- a/doc/wget.info-3 +++ b/doc/wget.info-3 @@ -449,8 +449,8 @@ Concept Index * input-file: Logging and Input File Options. * invoking: Invoking. * latest version: Distribution. +* link conversion: Recursive Retrieval Options. * links: Following Links. -* links conversion: Recursive Retrieval Options. * list: Mailing List. * location of wgetrc: Wgetrc Location. * log file: Logging and Input File Options. @@ -474,8 +474,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. @@ -510,6 +510,7 @@ Concept Index * suffixes, reject: Types of Files. * syntax of options: Option Syntax. * syntax of wgetrc: Wgetrc Syntax. +* tag-based recursive pruning: Recursive Accept/Reject Options. * time-stamping: Time-Stamping. * time-stamping usage: Time-Stamping Usage. * timeout: Download Options. diff --git a/doc/wget.texi b/doc/wget.texi index d647abbc..eccfabb9 100644 --- a/doc/wget.texi +++ b/doc/wget.texi @@ -822,7 +822,7 @@ The @samp{-r} option is to retrieve recursively, and @samp{-nd} not to create directories. @cindex conversion of links -@cindex links conversion +@cindex link conversion @item -k @itemx --convert-links Convert the non-relative links to relative ones locally. Only the @@ -836,7 +836,9 @@ will be performed at the end of the downloads. @cindex backing up converted files @item -K @itemx --backup-converted -When converting a file, back up the original version with a @samp{.orig} suffix. +When converting a file, back up the original version with a @samp{.orig} +suffix. Affects the behavior of @samp{-N} (@xref{HTTP Time-Stamping +Internals}). @item -m @itemx --mirror @@ -874,22 +876,42 @@ only one host is spanned (@xref{Domain Acceptance}). Exclude the domains given in a comma-separated @var{domain-list} from @sc{dns}-lookup (@xref{Domain Acceptance}). -@item -L -@itemx --relative -Follow relative links only. Useful for retrieving a specific home page -without any distractions, not even those from the same hosts -(@xref{Relative Links}). - @cindex follow FTP links @item --follow-ftp Follow @sc{ftp} links from @sc{html} documents. Without this option, Wget will ignore all the @sc{ftp} links. +@cindex tag-based recursive pruning +@item --follow-tags=@var{list} +Wget has an internal table of HTML tag / attribute pairs that it +considers when looking for linked documents during a recursive +retrieval. If a user wants only a subset of those tags to be +considered, however, he or she should be specify such tags in a +comma-separated @var{list} with this option. + +@item -G @var{list} +@itemx --ignore-tags=@var{list} +This is the opposite of the @samp{--follow-tags} option. To skip +certain HTML tags when recursively looking for documents to download, +specify them in a comma-separated @var{list}. The author of this option +likes to use the following command to download a single HTML page and +all documents necessary to display it properly: + +@example +wget -Ga,area -H -k -K -nh -r http://@var{site}/@var{document} +@end example + @item -H @itemx --span-hosts Enable spanning across hosts when doing recursive retrieving (@xref{All Hosts}). +@item -L +@itemx --relative +Follow relative links only. Useful for retrieving a specific home page +without any distractions, not even those from the same hosts +(@xref{Relative Links}). + @item -I @var{list} @itemx --include-directories=@var{list} Specify a comma-separated list of directories you wish to follow when @@ -973,7 +995,7 @@ precautions not to wreak havoc through carelessness. @cindex links @cindex following links -When retrieving recursively, one does not wish to retrieve the loads of +When retrieving recursively, one does not wish to retrieve loads of unnecessary data. Most of the time the users bear in mind exactly what they want to download, and want Wget to follow only specific links. @@ -1585,6 +1607,10 @@ Same as @samp{--exclude-domains} (@xref{Domain Acceptance}). @item follow_ftp = on/off Follow @sc{ftp} links from @sc{html} documents, the same as @samp{-f}. +@item follow_tags = @var{string} +Only follow certain HTML tags when doing a recursive retrieval, just like +@samp{--follow-tags}. + @item force_html = on/off If set to on, force the input filename to be regarded as an @sc{html} document, the same as @samp{-F}. @@ -1613,6 +1639,10 @@ Set @sc{http} user to @var{string}. When set to on, ignore @code{Content-Length} header; the same as @samp{--ignore-length}. +@item ignore_tags = @var{string} +Ignore certain HTML tags when doing a recursive retrieval, just like +@samp{-G} / @samp{--ignore-tags}. + @item include_directories = @var{string} Specify a comma-separated list of directories you wish to follow when downloading, the same as @samp{-I}. diff --git a/po/cs.gmo b/po/cs.gmo index de65e41f..57883d5d 100644 Binary files a/po/cs.gmo and b/po/cs.gmo differ diff --git a/po/cs.po b/po/cs.po index cdbdd70a..6442ffae 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-03-02 01:13-0800\n" +"POT-Creation-Date: 2000-03-10 19:51-0800\n" "PO-Revision-Date: 1998-06-05 08:47\n" "Last-Translator: Jan Prikryl \n" "Language-Team: Czech \n" @@ -16,19 +16,19 @@ msgstr "" # , c-format #. Login to the server: #. First: Establish the control connection. -#: src/ftp.c:147 src/http.c:346 +#: src/ftp.c:147 src/http.c:348 #, c-format msgid "Connecting to %s:%hu... " msgstr "Navazuji spojení s %s:%hu... " # , c-format -#: src/ftp.c:169 src/ftp.c:411 src/http.c:363 +#: src/ftp.c:169 src/ftp.c:411 src/http.c:365 #, c-format msgid "Connection to %s:%hu refused.\n" msgstr "Spojení s %s:%hu odmítnuto.\n" #. Second: Login with proper USER/PASS sequence. -#: src/ftp.c:190 src/http.c:374 +#: src/ftp.c:190 src/http.c:376 msgid "connected!\n" msgstr "spojeno!\n" @@ -196,13 +196,13 @@ msgid "File `%s' already there, not retrieving.\n" msgstr "Soubor `%s' je jiľ zde, nebudu jej přenáąet.\n" # , c-format -#: src/ftp.c:896 src/http.c:959 +#: src/ftp.c:907 src/http.c:983 #, c-format msgid "(try:%2d)" msgstr "(pokus:%2d)" # , c-format -#: src/ftp.c:960 src/http.c:1166 +#: src/ftp.c:971 src/http.c:1190 #, c-format msgid "" "%s (%s) - `%s' saved [%ld]\n" @@ -212,24 +212,24 @@ msgstr "" "\n" # , c-format -#: src/ftp.c:1006 +#: src/ftp.c:1017 #, 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:1018 +#: src/ftp.c:1029 #, c-format msgid "Removed `%s'.\n" msgstr "Vymazal jsem `%s'.\n" # , c-format -#: src/ftp.c:1054 +#: src/ftp.c:1065 #, 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:1106 src/http.c:1103 +#: src/ftp.c:1117 src/http.c:1127 #, c-format msgid "" "Server file no newer than local file `%s' -- not retrieving.\n" @@ -237,17 +237,17 @@ msgid "" msgstr "" # , c-format -#: src/ftp.c:1112 src/http.c:1109 +#: src/ftp.c:1123 src/http.c:1133 #, 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:1129 +#: src/ftp.c:1140 msgid "Invalid name of the symlink, skipping.\n" msgstr "Neplatný název symoblického odkazu, přeskakuji.\n" # , c-format -#: src/ftp.c:1146 +#: src/ftp.c:1157 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -257,13 +257,13 @@ msgstr "" "\n" # , c-format -#: src/ftp.c:1154 +#: src/ftp.c:1165 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Vytvářím symbolický odkaz %s -> %s\n" # , c-format -#: src/ftp.c:1165 +#: src/ftp.c:1176 #, c-format msgid "Symlinks not supported, skipping symlink `%s'.\n" msgstr "" @@ -271,32 +271,32 @@ msgstr "" "nepodporuje.\n" # , c-format -#: src/ftp.c:1177 +#: src/ftp.c:1188 #, c-format msgid "Skipping directory `%s'.\n" msgstr "Přeskakuji adresář `%s'.\n" # , c-format -#: src/ftp.c:1186 +#: src/ftp.c:1197 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: neznámý/nepodporovaný typ souboru.\n" # , c-format -#: src/ftp.c:1203 +#: src/ftp.c:1214 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: časové razítko souboru je poruąené.\n" # , c-format -#: src/ftp.c:1223 +#: src/ftp.c:1234 #, 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:1262 +#: src/ftp.c:1273 #, c-format msgid "Not descending to `%s' as it is excluded/not-included.\n" msgstr "" @@ -304,7 +304,7 @@ msgstr "" "nebyl zadán k procházení.\n" # , c-format -#: src/ftp.c:1307 +#: src/ftp.c:1318 #, c-format msgid "Rejecting `%s'.\n" msgstr "Odmítám `%s'.\n" @@ -313,19 +313,19 @@ msgstr "Odm #. No luck. #. #### This message SUCKS. We should see what was the #. reason that nothing was retrieved. -#: src/ftp.c:1354 +#: src/ftp.c:1365 #, c-format msgid "No matches on pattern `%s'.\n" msgstr "Vzorku `%s' nic neodpovídá.\n" # , c-format -#: src/ftp.c:1414 +#: src/ftp.c:1425 #, 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:1419 +#: src/ftp.c:1430 #, 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" @@ -428,147 +428,147 @@ msgid "Unknown error" msgstr "Neznámá chyba" # , c-format -#: src/html.c:439 src/html.c:441 +#: src/html.c:473 src/html.c:475 #, c-format msgid "Index of /%s on %s:%d" msgstr "Obsah /%s na %s:%d" -#: src/html.c:463 +#: src/html.c:497 msgid "time unknown " msgstr "čas neznámý " -#: src/html.c:467 +#: src/html.c:501 msgid "File " msgstr "Soubor " -#: src/html.c:470 +#: src/html.c:504 msgid "Directory " msgstr "Adresář " -#: src/html.c:473 +#: src/html.c:507 msgid "Link " msgstr "Sym. odkaz " -#: src/html.c:476 +#: src/html.c:510 msgid "Not sure " msgstr "Neznámý typ " # , c-format -#: src/html.c:494 +#: src/html.c:528 #, c-format msgid " (%s bytes)" msgstr " (%s bajtů)" -#: src/http.c:492 +#: src/http.c:505 msgid "Failed writing HTTP request.\n" msgstr "HTTP poľadavek nebylo moľné odeslat.\n" # , c-format -#: src/http.c:497 +#: src/http.c:510 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s poľadavek odeslán, čekám na odpověď ... " -#: src/http.c:536 +#: src/http.c:549 msgid "End of file while parsing headers.\n" msgstr "Hlavička není úplná.\n" # , c-format -#: src/http.c:547 +#: src/http.c:560 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Chyba (%s) při čtení hlaviček.\n" -#: src/http.c:587 +#: src/http.c:600 msgid "No data received" msgstr "Nepřiąla ľádná data" -#: src/http.c:589 +#: src/http.c:602 msgid "Malformed status line" msgstr "Odpověď serveru má zkomolený stavový řádek" -#: src/http.c:594 +#: src/http.c:607 msgid "(no description)" msgstr "(ľádný popis)" #. If we have tried it already, then there is not point #. retrying it. -#: src/http.c:678 +#: src/http.c:691 msgid "Authorization failed.\n" msgstr "Autorizace selhala.\n" -#: src/http.c:685 +#: src/http.c:698 msgid "Unknown authentication scheme.\n" msgstr "Server poľaduje neznámý způsob autentifikace.\n" # , c-format -#: src/http.c:748 +#: src/http.c:761 #, c-format msgid "Location: %s%s\n" msgstr "Přesměrováno na: %s%s\n" -#: src/http.c:749 src/http.c:774 +#: src/http.c:762 src/http.c:787 msgid "unspecified" msgstr "neudáno" -#: src/http.c:750 +#: src/http.c:763 msgid " [following]" msgstr " [následuji]" #. No need to print this output if the body won't be #. downloaded at all, or if the original server response is #. printed. -#: src/http.c:764 +#: src/http.c:777 msgid "Length: " msgstr "Délka: " # , c-format -#: src/http.c:769 +#: src/http.c:782 #, c-format msgid " (%s to go)" msgstr " (%s zbývá)" -#: src/http.c:774 +#: src/http.c:787 msgid "ignored" msgstr "je ignorována" -#: src/http.c:858 +#: src/http.c:871 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Varování: HTTP nepodporuje ľolíkové znaky.\n" # , c-format #. If opt.noclobber is turned on and file already exists, do not #. retrieve the file -#: src/http.c:873 +#: src/http.c:886 #, c-format msgid "File `%s' already there, will not retrieve.\n" msgstr "Soubor `%s' nebudu přenáąet, je jiľ zde.\n" # , c-format -#: src/http.c:1015 +#: src/http.c:1039 #, c-format msgid "Cannot write to `%s' (%s).\n" msgstr "Nemohu zapsat do `%s' (%s).\n" # , c-format -#: src/http.c:1025 +#: src/http.c:1049 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "CHYBA: Přesměrování (%d) bez udané nové adresy.\n" # , c-format -#: src/http.c:1048 +#: src/http.c:1072 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s CHYBA %d: %s.\n" -#: src/http.c:1060 +#: src/http.c:1084 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" "Nebudu pouľívat časová razítka (`time-stamps'), protoľe hlavička\n" "\"Last-modified\" v odpovědi serveru schází.\n" -#: src/http.c:1068 +#: src/http.c:1092 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "Ignoruji časové razítko souboru (`time-stamp'), protoľe hlavička \n" @@ -581,19 +581,19 @@ msgstr "" #. coding style no-no by many measures, for reasons such as #. this) we'd have to remember to free() the string at each #. one to avoid a memory leak. -#: src/http.c:1099 +#: src/http.c:1123 #, c-format msgid "" "Server file no newer than local file `%s.orig' -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:1113 +#: src/http.c:1137 msgid "Remote file is newer, retrieving.\n" msgstr "Vzdálený soubor je novějąího data, přenáąím.\n" # , c-format -#: src/http.c:1147 +#: src/http.c:1171 #, c-format msgid "" "%s (%s) - `%s' saved [%ld/%ld]\n" @@ -603,13 +603,13 @@ msgstr "" "\n" # , c-format -#: src/http.c:1181 +#: src/http.c:1205 #, c-format msgid "%s (%s) - Connection closed at byte %ld. " msgstr "%s (%s) - Spojení uzavřeno na bajtu %ld. " # , c-format -#: src/http.c:1189 +#: src/http.c:1213 #, c-format msgid "" "%s (%s) - `%s' saved [%ld/%ld])\n" @@ -619,62 +619,62 @@ msgstr "" "\n" # , c-format -#: src/http.c:1202 +#: src/http.c:1226 #, c-format msgid "%s (%s) - Connection closed at byte %ld/%ld. " msgstr "%s (%s) - Spojení uzavřeno na bajtu %ld/%ld. " # , c-format -#: src/http.c:1213 +#: src/http.c:1237 #, c-format msgid "%s (%s) - Read error at byte %ld (%s)." msgstr "%s (%s) - Chyba při čtení dat na bajtu %ld (%s)." # , c-format -#: src/http.c:1221 +#: src/http.c:1245 #, c-format 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:313 src/netrc.c:250 +#: src/init.c:317 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:334 src/init.c:340 +#: src/init.c:338 src/init.c:344 #, 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:371 +#: src/init.c:375 #, 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:459 +#: src/init.c:463 #, 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:486 +#: src/init.c:490 #, 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:504 src/init.c:761 src/init.c:783 src/init.c:856 +#: src/init.c:508 src/init.c:765 src/init.c:787 src/init.c:860 #, c-format msgid "%s: %s: Invalid specification `%s'.\n" msgstr "%s: %s: Neplatná specifikace `%s'\n" # , c-format -#: src/init.c:617 src/init.c:639 src/init.c:661 src/init.c:687 +#: src/init.c:621 src/init.c:643 src/init.c:665 src/init.c:691 #, c-format msgid "%s: Invalid specification `%s'\n" msgstr "%s: Neplatná specifikace `%s'\n" @@ -747,6 +747,7 @@ msgstr "" # , fuzzy #: src/main.c:133 +#, fuzzy msgid "" "Download:\n" " -t, --tries=NUMBER set number of retries to NUMBER (0 " @@ -760,6 +761,8 @@ msgid "" " --spider don't download anything.\n" " -T, --timeout=SECONDS set the read timeout to SECONDS.\n" " -w, --wait=SECONDS wait SECONDS between retrievals.\n" +" --waitretry=SECONDS\twait 0..max SECONDS between retries of a " +"retrieval.\n" " -Y, --proxy=on/off turn proxy on or off.\n" " -Q, --quota=NUMBER set retrieval quota to NUMBER.\n" "\n" @@ -781,7 +784,7 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:147 +#: src/main.c:148 msgid "" "Directories:\n" " -nd --no-directories don't create directories.\n" @@ -801,7 +804,7 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:154 +#: src/main.c:155 msgid "" "HTTP options:\n" " --http-user=USER set http user to USER.\n" @@ -830,7 +833,7 @@ msgstr "" " v hlavičce identifikační řetězec AGENT\n" # , fuzzy -#: src/main.c:165 +#: src/main.c:166 msgid "" "FTP options:\n" " --retr-symlinks retrieve FTP symbolic links.\n" @@ -845,7 +848,7 @@ msgstr "" " --passive-ftp pouľij pasivní mód přenosu dat\n" "\n" -#: src/main.c:170 +#: src/main.c:171 #, fuzzy msgid "" "Recursive retrieval:\n" @@ -868,17 +871,25 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:179 +#: src/main.c:180 +#, fuzzy msgid "" "Recursive accept/reject:\n" -" -A, --accept=LIST list of accepted extensions.\n" -" -R, --reject=LIST list of rejected extensions.\n" -" -D, --domains=LIST list of accepted domains.\n" +" -A, --accept=LIST comma-separated list of accepted " +"extensions.\n" +" -R, --reject=LIST comma-separated list of rejected " +"extensions.\n" +" -D, --domains=LIST comma-separated list of accepted " +"domains.\n" " --exclude-domains=LIST comma-separated list of rejected " "domains.\n" -" -L, --relative follow relative links only.\n" " --follow-ftp follow FTP links from HTML documents.\n" +" --follow-tags=LIST comma-separated list of followed HTML " +"tags.\n" +" -G, --ignore-tags=LIST comma-separated list of ignored HTML " +"tags.\n" " -H, --span-hosts go to foreign hosts when recursive.\n" +" -L, --relative follow relative links only.\n" " -I, --include-directories=LIST list of allowed directories.\n" " -X, --exclude-directories=LIST list of excluded directories.\n" " -nh, --no-host-lookup don't DNS-lookup hosts.\n" @@ -900,7 +911,7 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:192 +#: src/main.c:195 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" @@ -908,12 +919,12 @@ msgstr "" "Komentáře k českému překladu zasílejte na adresu . \n" # , fuzzy -#: src/main.c:349 +#: src/main.c:359 #, 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:400 +#: src/main.c:410 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" @@ -927,7 +938,7 @@ msgstr "" "anebo VHODNOSTI PRO URČITÝ ÚČEL. Daląí podrobnosti hledejte \n" "v Obecné veřejné licenci GNU.\n" -#: src/main.c:406 +#: src/main.c:416 msgid "" "\n" "Written by Hrvoje Niksic .\n" @@ -936,13 +947,13 @@ msgstr "" "Autorem tohto programu je Hrvoje Nikąić \n" # , c-format -#: src/main.c:470 +#: src/main.c:490 #, c-format msgid "%s: %s: invalid command\n" msgstr "%s: %s: neplatný příkaz\n" # , c-format -#: src/main.c:520 +#: src/main.c:543 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: nepřípustný přepínač -- `-n%c'\n" @@ -950,33 +961,33 @@ msgstr "%s: nep # , c-format #. #### Something nicer should be printed here -- similar to the #. pre-1.5 `--help' page. -#: src/main.c:523 src/main.c:565 src/main.c:596 +#: src/main.c:546 src/main.c:588 src/main.c:631 #, 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:576 +#: src/main.c:611 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:582 +#: src/main.c:617 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:591 +#: src/main.c:626 #, c-format msgid "%s: missing URL\n" msgstr "%s: postrádám URL\n" # , c-format -#: src/main.c:679 +#: src/main.c:714 #, c-format msgid "No URLs found in %s.\n" msgstr "V souboru `%s' nebyla nalezena ľádná URL.\n" # , c-format -#: src/main.c:688 +#: src/main.c:723 #, c-format msgid "" "\n" @@ -988,14 +999,14 @@ msgstr "" "Celkem načteno %s bajtů v %d souborech\n" # , c-format -#: src/main.c:693 +#: src/main.c:728 #, 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:720 +#: src/main.c:755 msgid "%s received, redirecting output to `%%s'.\n" msgstr "Zachycen signál %s , výstup přesměrován do `%%s'.\n" @@ -1036,7 +1047,7 @@ msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Nemohu najít pouľitelný ovladač socketů.\n" # , c-format -#: src/netrc.c:334 +#: src/netrc.c:359 #, c-format msgid "%s: %s:%d: warning: \"%s\" token appears before any machine name\n" msgstr "" @@ -1044,36 +1055,36 @@ msgstr "" " názvem počítače\n" # , c-format -#: src/netrc.c:365 +#: src/netrc.c:390 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: neznámý token \"%s\"\n" # , c-format -#: src/netrc.c:429 +#: src/netrc.c:454 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Pouľití: %s NETRC [NÁZEV POČÍTAČE]\n" # , c-format -#: src/netrc.c:439 +#: src/netrc.c:464 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: volání `stat %s' skončilo chybou: %s\n" # , c-format -#: src/recur.c:449 src/retr.c:463 +#: src/recur.c:451 src/retr.c:464 #, c-format msgid "Removing %s.\n" msgstr "Maľu %s.\n" # , c-format -#: src/recur.c:450 +#: src/recur.c:452 #, 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:609 +#: src/recur.c:611 msgid "Loading robots.txt; please ignore errors.\n" msgstr "Načítám `robots.txt'. Chybová hláąení ignorujte, prosím.\n" @@ -1087,23 +1098,23 @@ msgstr "" "\n" " [ přeskakuji %dK ]" -#: src/retr.c:344 +#: src/retr.c:345 msgid "Could not find proxy host.\n" msgstr "Nemohu najít proxy server.\n" # , c-format -#: src/retr.c:355 +#: src/retr.c:356 #, c-format msgid "Proxy %s: Must be HTTP.\n" msgstr "Proxy %s: Musí být HTTP.\n" # , c-format -#: src/retr.c:398 +#: src/retr.c:399 #, c-format msgid "%s: Redirection to itself.\n" msgstr "%s: Přesměrování na sebe sama.\n" -#: src/retr.c:484 +#: src/retr.c:485 msgid "" "Giving up.\n" "\n" @@ -1111,7 +1122,7 @@ msgstr "" "Vzdávám to.\n" "\n" -#: src/retr.c:484 +#: src/retr.c:485 msgid "" "Retrying.\n" "\n" diff --git a/po/de.gmo b/po/de.gmo index 3c1b0bbd..c0e6b308 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index 1caa1c95..21d0e55d 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-03-02 01:13-0800\n" +"POT-Creation-Date: 2000-03-10 19:51-0800\n" "PO-Revision-Date: 1998-06-15 19:25+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -33,18 +33,18 @@ msgstr "" #. Login to the server: #. First: Establish the control connection. -#: src/ftp.c:147 src/http.c:346 +#: src/ftp.c:147 src/http.c:348 #, c-format msgid "Connecting to %s:%hu... " msgstr "Verbindungsaufbau zu %s:%hu... " -#: src/ftp.c:169 src/ftp.c:411 src/http.c:363 +#: src/ftp.c:169 src/ftp.c:411 src/http.c:365 #, c-format msgid "Connection to %s:%hu refused.\n" msgstr "Verbindung nach %s:%hu zurückgewiesen.\n" #. Second: Login with proper USER/PASS sequence. -#: src/ftp.c:190 src/http.c:374 +#: src/ftp.c:190 src/http.c:376 msgid "connected!\n" msgstr "verbunden!\n" @@ -201,13 +201,13 @@ msgstr "Daten- msgid "File `%s' already there, not retrieving.\n" msgstr "Datei »%s« ist schon vorhanden, kein Hol-Versuch.\n" -#: src/ftp.c:896 src/http.c:959 +#: src/ftp.c:907 src/http.c:983 #, c-format msgid "(try:%2d)" msgstr "(versuche:%2d)" # oder "gesichert"? -#: src/ftp.c:960 src/http.c:1166 +#: src/ftp.c:971 src/http.c:1190 #, c-format msgid "" "%s (%s) - `%s' saved [%ld]\n" @@ -216,83 +216,83 @@ msgstr "" "%s (%s) - »%s« gespeichert [%ld]\n" "\n" -#: src/ftp.c:1006 +#: src/ftp.c:1017 #, c-format msgid "Using `%s' as listing tmp file.\n" msgstr "Benutze »%s« als temporäre Auflistungsdatei.\n" -#: src/ftp.c:1018 +#: src/ftp.c:1029 #, c-format msgid "Removed `%s'.\n" msgstr "Entfernt »%s«.\n" -#: src/ftp.c:1054 +#: src/ftp.c:1065 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Die Rekursionstiefe %d übersteigt die max. Tiefe %d.\n" -#: src/ftp.c:1106 src/http.c:1103 +#: src/ftp.c:1117 src/http.c:1127 #, c-format msgid "" "Server file no newer than local file `%s' -- not retrieving.\n" "\n" msgstr "" -#: src/ftp.c:1112 src/http.c:1109 +#: src/ftp.c:1123 src/http.c:1133 #, 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:1129 +#: src/ftp.c:1140 msgid "Invalid name of the symlink, skipping.\n" msgstr "Ungültiger Name für einen symbolischen Verweis, überspringe.\n" -#: src/ftp.c:1146 +#: src/ftp.c:1157 #, 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:1154 +#: src/ftp.c:1165 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Lege symbolischen Verweis %s -> %s an\n" -#: src/ftp.c:1165 +#: src/ftp.c:1176 #, c-format msgid "Symlinks not supported, skipping symlink `%s'.\n" msgstr "" "Symbolische Verweise nicht unterstützt, überspringe symbolischen Verweis " "»%s«.\n" -#: src/ftp.c:1177 +#: src/ftp.c:1188 #, c-format msgid "Skipping directory `%s'.\n" msgstr "Überspringe Verzeichnis »%s«.\n" -#: src/ftp.c:1186 +#: src/ftp.c:1197 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: unbekannter/nicht unterstüzter Dateityp.\n" -#: src/ftp.c:1203 +#: src/ftp.c:1214 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: beschädigter Zeitstempel.\n" -#: src/ftp.c:1223 +#: src/ftp.c:1234 #, 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:1262 +#: src/ftp.c:1273 #, 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:1307 +#: src/ftp.c:1318 #, c-format msgid "Rejecting `%s'.\n" msgstr "Weise zurück »%s«.\n" @@ -300,17 +300,17 @@ msgstr "Weise zur #. No luck. #. #### This message SUCKS. We should see what was the #. reason that nothing was retrieved. -#: src/ftp.c:1354 +#: src/ftp.c:1365 #, c-format msgid "No matches on pattern `%s'.\n" msgstr "Keine Übereinstimmungen bei dem Muster »%s«.\n" -#: src/ftp.c:1414 +#: src/ftp.c:1425 #, c-format msgid "Wrote HTML-ized index to `%s' [%ld].\n" msgstr "Schreibe HTML-artigen Index nach »%s« [%ld].\n" -#: src/ftp.c:1419 +#: src/ftp.c:1430 #, c-format msgid "Wrote HTML-ized index to `%s'.\n" msgstr "HTML-artiger Index nach »%s« geschrieben.\n" @@ -402,86 +402,86 @@ msgstr "Host nicht gefunden" msgid "Unknown error" msgstr "Unbekannter Fehler" -#: src/html.c:439 src/html.c:441 +#: src/html.c:473 src/html.c:475 #, c-format msgid "Index of /%s on %s:%d" msgstr "Index von /%s auf %s:%d" -#: src/html.c:463 +#: src/html.c:497 msgid "time unknown " msgstr "Zeit unbekannt " -#: src/html.c:467 +#: src/html.c:501 msgid "File " msgstr "Datei " -#: src/html.c:470 +#: src/html.c:504 msgid "Directory " msgstr "Verzeichnis " -#: src/html.c:473 +#: src/html.c:507 msgid "Link " msgstr "Verweis " -#: src/html.c:476 +#: src/html.c:510 msgid "Not sure " msgstr "Nicht sicher" -#: src/html.c:494 +#: src/html.c:528 #, c-format msgid " (%s bytes)" msgstr " (%s Bytes)" -#: src/http.c:492 +#: src/http.c:505 msgid "Failed writing HTTP request.\n" msgstr "HTTP-Anforderung zu schreiben schlug fehl.\n" -#: src/http.c:497 +#: src/http.c:510 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s Anforderung gesendet, warte auf Antwort... " -#: src/http.c:536 +#: src/http.c:549 msgid "End of file while parsing headers.\n" msgstr "Dateiende beim auswerten der Kopfzeilen.\n" -#: src/http.c:547 +#: src/http.c:560 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Lesefehler (%s) bei den Kopfzeilen.\n" -#: src/http.c:587 +#: src/http.c:600 msgid "No data received" msgstr "Keine Daten empfangen" -#: src/http.c:589 +#: src/http.c:602 msgid "Malformed status line" msgstr "Nicht korrekte Statuszeile" -#: src/http.c:594 +#: src/http.c:607 msgid "(no description)" msgstr "(keine Beschreibung)" #. If we have tried it already, then there is not point #. retrying it. -#: src/http.c:678 +#: src/http.c:691 msgid "Authorization failed.\n" msgstr "Authorisierung fehlgeschlagen.\n" -#: src/http.c:685 +#: src/http.c:698 msgid "Unknown authentication scheme.\n" msgstr "Unbekannten Authentifizierungsablauf.\n" -#: src/http.c:748 +#: src/http.c:761 #, c-format msgid "Location: %s%s\n" msgstr "Platz: %s%s\n" -#: src/http.c:749 src/http.c:774 +#: src/http.c:762 src/http.c:787 msgid "unspecified" msgstr "nicht spezifiziert" -#: src/http.c:750 +#: src/http.c:763 msgid " [following]" msgstr "[folge]" @@ -489,51 +489,51 @@ msgstr "[folge]" #. No need to print this output if the body won't be #. downloaded at all, or if the original server response is #. printed. -#: src/http.c:764 +#: src/http.c:777 msgid "Length: " msgstr "Länge: " -#: src/http.c:769 +#: src/http.c:782 #, c-format msgid " (%s to go)" msgstr " (noch %s)" -#: src/http.c:774 +#: src/http.c:787 msgid "ignored" msgstr "übergangen" -#: src/http.c:858 +#: src/http.c:871 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Warnung: Joker-Zeichen werden bei HTTP nicht unterstützt.\n" #. If opt.noclobber is turned on and file already exists, do not #. retrieve the file -#: src/http.c:873 +#: src/http.c:886 #, c-format msgid "File `%s' already there, will not retrieve.\n" msgstr "Datei »%s« schon vorhanden, kein Hol-Versuch.\n" -#: src/http.c:1015 +#: src/http.c:1039 #, c-format msgid "Cannot write to `%s' (%s).\n" msgstr "Kann nicht nach »%s« schreiben (%s).\n" # Was meint hier location? -#: src/http.c:1025 +#: src/http.c:1049 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "FEHLER: Redirektion (%d) ohne Ziel(?).\n" -#: src/http.c:1048 +#: src/http.c:1072 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s FEHLER %d: %s.\n" -#: src/http.c:1060 +#: src/http.c:1084 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "»Last-modified«-Kopfzeile fehlt -- Zeitstempel abgeschaltet.\n" -#: src/http.c:1068 +#: src/http.c:1092 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "»Last-modified«-Kopfzeile ungültig -- Zeitstempeln übergangen.\n" @@ -544,18 +544,18 @@ msgstr " #. coding style no-no by many measures, for reasons such as #. this) we'd have to remember to free() the string at each #. one to avoid a memory leak. -#: src/http.c:1099 +#: src/http.c:1123 #, c-format msgid "" "Server file no newer than local file `%s.orig' -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:1113 +#: src/http.c:1137 msgid "Remote file is newer, retrieving.\n" msgstr "Entfernte Datei ist neuer, Hol-Versuch.\n" -#: src/http.c:1147 +#: src/http.c:1171 #, c-format msgid "" "%s (%s) - `%s' saved [%ld/%ld]\n" @@ -564,12 +564,12 @@ msgstr "" "%s (%s) - »%s« gesichert [%ld/%ld]\n" "\n" -#: src/http.c:1181 +#: src/http.c:1205 #, c-format msgid "%s (%s) - Connection closed at byte %ld. " msgstr "%s (%s) - Verbindung bei Byte %ld geschlossen. " -#: src/http.c:1189 +#: src/http.c:1213 #, c-format msgid "" "%s (%s) - `%s' saved [%ld/%ld])\n" @@ -578,52 +578,52 @@ msgstr "" "%s (%s) - »%s« gesichert [%ld/%ld])\n" "\n" -#: src/http.c:1202 +#: src/http.c:1226 #, c-format msgid "%s (%s) - Connection closed at byte %ld/%ld. " msgstr "%s (%s) - Verbindung bei Byte %ld/%ld geschlossen. " -#: src/http.c:1213 +#: src/http.c:1237 #, c-format msgid "%s (%s) - Read error at byte %ld (%s)." msgstr "%s (%s) - Lesefehler bei Byte %ld (%s)." -#: src/http.c:1221 +#: src/http.c:1245 #, c-format msgid "%s (%s) - Read error at byte %ld/%ld (%s). " msgstr "%s (%s) - Lesefehler bei Byte %ld/%ld (%s). " -#: src/init.c:313 src/netrc.c:250 +#: src/init.c:317 src/netrc.c:260 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Kann »%s« nicht lesen (%s).\n" -#: src/init.c:334 src/init.c:340 +#: src/init.c:338 src/init.c:344 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Fehler in »%s« bei Zeile %d.\n" -#: src/init.c:371 +#: src/init.c:375 #, 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:459 +#: src/init.c:463 #, c-format msgid "%s: BUG: unknown command `%s', value `%s'.\n" msgstr "%s: Unbekannter Befehl »%s«, Wert »%s«.\n" -#: src/init.c:486 +#: src/init.c:490 #, c-format msgid "%s: %s: Please specify on or off.\n" msgstr "%s: %s: Bitte »on« oder »off« angeben.\n" -#: src/init.c:504 src/init.c:761 src/init.c:783 src/init.c:856 +#: src/init.c:508 src/init.c:765 src/init.c:787 src/init.c:860 #, c-format msgid "%s: %s: Invalid specification `%s'.\n" msgstr "%s: %s: Ungültige Angabe »%s«\n" -#: src/init.c:617 src/init.c:639 src/init.c:661 src/init.c:687 +#: src/init.c:621 src/init.c:643 src/init.c:665 src/init.c:691 #, c-format msgid "%s: Invalid specification `%s'\n" msgstr "%s: Ungültige Angabe »%s«\n" @@ -692,6 +692,7 @@ msgstr "" "\n" #: src/main.c:133 +#, fuzzy msgid "" "Download:\n" " -t, --tries=NUMBER set number of retries to NUMBER (0 " @@ -705,6 +706,8 @@ msgid "" " --spider don't download anything.\n" " -T, --timeout=SECONDS set the read timeout to SECONDS.\n" " -w, --wait=SECONDS wait SECONDS between retrievals.\n" +" --waitretry=SECONDS\twait 0..max SECONDS between retries of a " +"retrieval.\n" " -Y, --proxy=on/off turn proxy on or off.\n" " -Q, --quota=NUMBER set retrieval quota to NUMBER.\n" "\n" @@ -728,7 +731,7 @@ msgstr "" " -Q, --quota=ZAHL setze die Hol-Vorgänge auf ZAHL\n" "\n" -#: src/main.c:147 +#: src/main.c:148 msgid "" "Directories:\n" " -nd --no-directories don't create directories.\n" @@ -748,7 +751,7 @@ msgstr "" " Verzeichnisbestandteile\n" "\n" -#: src/main.c:154 +#: src/main.c:155 msgid "" "HTTP options:\n" " --http-user=USER set http user to USER.\n" @@ -778,7 +781,7 @@ msgstr "" "identifizieren\n" "\n" -#: src/main.c:165 +#: src/main.c:166 msgid "" "FTP options:\n" " --retr-symlinks retrieve FTP symbolic links.\n" @@ -793,7 +796,7 @@ msgstr "" " --passive-ftp den \"passiven\" Übertragungsmodus verwenden\n" "\n" -#: src/main.c:170 +#: src/main.c:171 #, fuzzy msgid "" "Recursive retrieval:\n" @@ -818,17 +821,25 @@ msgstr "" " -nr, --dont-remove-listing ».listing«-Dateien nicht entfernen\n" "\n" -#: src/main.c:179 +#: src/main.c:180 +#, fuzzy msgid "" "Recursive accept/reject:\n" -" -A, --accept=LIST list of accepted extensions.\n" -" -R, --reject=LIST list of rejected extensions.\n" -" -D, --domains=LIST list of accepted domains.\n" +" -A, --accept=LIST comma-separated list of accepted " +"extensions.\n" +" -R, --reject=LIST comma-separated list of rejected " +"extensions.\n" +" -D, --domains=LIST comma-separated list of accepted " +"domains.\n" " --exclude-domains=LIST comma-separated list of rejected " "domains.\n" -" -L, --relative follow relative links only.\n" " --follow-ftp follow FTP links from HTML documents.\n" +" --follow-tags=LIST comma-separated list of followed HTML " +"tags.\n" +" -G, --ignore-tags=LIST comma-separated list of ignored HTML " +"tags.\n" " -H, --span-hosts go to foreign hosts when recursive.\n" +" -L, --relative follow relative links only.\n" " -I, --include-directories=LIST list of allowed directories.\n" " -X, --exclude-directories=LIST list of excluded directories.\n" " -nh, --no-host-lookup don't DNS-lookup hosts.\n" @@ -856,7 +867,7 @@ msgstr "" " hinaufsteigen\n" "\n" -#: src/main.c:192 +#: src/main.c:195 msgid "Mail bug reports and suggestions to .\n" msgstr "" "Fehlerberichte und Verbesserungsvorschläge bitte an \n" @@ -864,12 +875,12 @@ msgstr "" "\n" "Für die deutsche Übersetzung ist die Mailingliste zuständig.\n" -#: src/main.c:349 +#: src/main.c:359 #, c-format msgid "%s: debug support not compiled in.\n" msgstr "%s: Debug-Unterstützung nicht hineinkompiliert.\n" -#: src/main.c:400 +#: src/main.c:410 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" @@ -884,7 +895,7 @@ msgstr "" "Lizenz- und Kopierbedingung; die Einzelheiten sind in der Datei COPYING\n" "(GNU General Public License) beschrieben.\n" -#: src/main.c:406 +#: src/main.c:416 msgid "" "\n" "Written by Hrvoje Niksic .\n" @@ -892,45 +903,45 @@ msgstr "" "\n" "Geschrieben von Hrvoje Niksic .\n" -#: src/main.c:470 +#: src/main.c:490 #, c-format msgid "%s: %s: invalid command\n" msgstr "%s: %s: ungültiger Befehl\n" -#: src/main.c:520 +#: src/main.c:543 #, 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:523 src/main.c:565 src/main.c:596 +#: src/main.c:546 src/main.c:588 src/main.c:631 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "»%s --help« gibt weitere Informationen.\n" -#: src/main.c:576 +#: src/main.c:611 msgid "Can't be verbose and quiet at the same time.\n" msgstr "\"Mitteilsam\" und \"still\" ist gleichzeitig unmöglich.\n" -#: src/main.c:582 +#: src/main.c:617 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:591 +#: src/main.c:626 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL fehlt\n" -#: src/main.c:679 +#: src/main.c:714 #, c-format msgid "No URLs found in %s.\n" msgstr "Keine URLs in %s gefunden.\n" -#: src/main.c:688 +#: src/main.c:723 #, c-format msgid "" "\n" @@ -941,14 +952,14 @@ msgstr "" "BEENDET --%s--\n" "Geholt: %s Bytes in %d Dateien\n" -#: src/main.c:693 +#: src/main.c:728 #, 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:720 +#: src/main.c:755 msgid "%s received, redirecting output to `%%s'.\n" msgstr "%s erhalten, weise Ausgabe nach »%%s« zurück.\n" @@ -986,38 +997,38 @@ msgstr "WinHelp %s wird gestartet\n" msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Kann keinen benutzbaren \"socket driver\" finden.\n" -#: src/netrc.c:334 +#: src/netrc.c:359 #, c-format msgid "%s: %s:%d: warning: \"%s\" token appears before any machine name\n" msgstr "%s: %s:%d: Warnung: »%s«-Wortteil erscheint vor einem Maschinennamen\n" -#: src/netrc.c:365 +#: src/netrc.c:390 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: unbekannter Wortteil »%s«\n" -#: src/netrc.c:429 +#: src/netrc.c:454 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Syntax: %s NETRC [HOSTNAME]\n" # stat -#: src/netrc.c:439 +#: src/netrc.c:464 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: kann nicht finden %s: %s\n" -#: src/recur.c:449 src/retr.c:463 +#: src/recur.c:451 src/retr.c:464 #, c-format msgid "Removing %s.\n" msgstr "Entferne »%s«.\n" -#: src/recur.c:450 +#: src/recur.c:452 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Entferne »%s«, da dies zurückgewiesen werden soll.\n" -#: src/recur.c:609 +#: src/recur.c:611 msgid "Loading robots.txt; please ignore errors.\n" msgstr "Lade »robots.txt«; bitte Fehler ignorieren.\n" @@ -1030,21 +1041,21 @@ msgstr "" "\n" " [ überspringe %dK ]" -#: src/retr.c:344 +#: src/retr.c:345 msgid "Could not find proxy host.\n" msgstr "Kann Proxy-Host nicht finden.\n" -#: src/retr.c:355 +#: src/retr.c:356 #, c-format msgid "Proxy %s: Must be HTTP.\n" msgstr "Proxy %s: Muss HTTP sein.\n" -#: src/retr.c:398 +#: src/retr.c:399 #, c-format msgid "%s: Redirection to itself.\n" msgstr "%s: Redirektion auf sich selber.\n" -#: src/retr.c:484 +#: src/retr.c:485 msgid "" "Giving up.\n" "\n" @@ -1052,7 +1063,7 @@ msgstr "" "Gebe auf.\n" "\n" -#: src/retr.c:484 +#: src/retr.c:485 msgid "" "Retrying.\n" "\n" diff --git a/po/hr.gmo b/po/hr.gmo index 3ab2e124..adc85d97 100644 Binary files a/po/hr.gmo and b/po/hr.gmo differ diff --git a/po/hr.po b/po/hr.po index ed249449..b1e6dfbc 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-03-02 01:13-0800\n" +"POT-Creation-Date: 2000-03-10 19:51-0800\n" "PO-Revision-Date: 1998-02-29 21:05+01:00\n" "Last-Translator: Hrvoje Niksic \n" "Language-Team: Croatian \n" @@ -15,18 +15,18 @@ msgstr "" #. Login to the server: #. First: Establish the control connection. -#: src/ftp.c:147 src/http.c:346 +#: src/ftp.c:147 src/http.c:348 #, c-format msgid "Connecting to %s:%hu... " msgstr "Spajam se na %s:%hu... " -#: src/ftp.c:169 src/ftp.c:411 src/http.c:363 +#: src/ftp.c:169 src/ftp.c:411 src/http.c:365 #, c-format msgid "Connection to %s:%hu refused.\n" msgstr "%s:%hu odbija vezu.\n" #. Second: Login with proper USER/PASS sequence. -#: src/ftp.c:190 src/http.c:374 +#: src/ftp.c:190 src/http.c:376 msgid "connected!\n" msgstr "spojen!\n" @@ -179,12 +179,12 @@ msgstr "Prijenos podataka prekinut.\n" msgid "File `%s' already there, not retrieving.\n" msgstr "Datoteka `%s' već postoji, ne skidam.\n" -#: src/ftp.c:896 src/http.c:959 +#: src/ftp.c:907 src/http.c:983 #, c-format msgid "(try:%2d)" msgstr "(pok:%2d)" -#: src/ftp.c:960 src/http.c:1166 +#: src/ftp.c:971 src/http.c:1190 #, c-format msgid "" "%s (%s) - `%s' saved [%ld]\n" @@ -193,38 +193,39 @@ msgstr "" "%s (%s) - `%s' snimljen [%ld]\n" "\n" -#: src/ftp.c:1006 +#: src/ftp.c:1017 #, c-format msgid "Using `%s' as listing tmp file.\n" msgstr "Koristim `%s' kao privremenu datoteku za listing.\n" -#: src/ftp.c:1018 +#: src/ftp.c:1029 #, c-format msgid "Removed `%s'.\n" msgstr "Izbrisao `%s'.\n" -#: src/ftp.c:1054 +#: src/ftp.c:1065 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Dubina rekurzije %d prelazi najveću dozvoljenu %d.\n" -#: src/ftp.c:1106 src/http.c:1103 +#: src/ftp.c:1117 src/http.c:1127 #, c-format msgid "" "Server file no newer than local file `%s' -- not retrieving.\n" "\n" -msgstr "Datoteka na posluľitelju nije novija od lokalne datoteke `%s' -- ne skidam." +msgstr "" +"Datoteka na posluľitelju nije novija od lokalne datoteke `%s' -- ne skidam.\n" -#: src/ftp.c:1112 src/http.c:1109 +#: src/ftp.c:1123 src/http.c:1133 #, fuzzy, 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:1129 +#: src/ftp.c:1140 msgid "Invalid name of the symlink, skipping.\n" msgstr "Pogreąno ime simboličkog linka, preskačem.\n" -#: src/ftp.c:1146 +#: src/ftp.c:1157 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -233,42 +234,42 @@ msgstr "" "Već postoji ispravan link %s -> %s\n" "\n" -#: src/ftp.c:1154 +#: src/ftp.c:1165 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Stvaram simbolički link %s -> %s\n" -#: src/ftp.c:1165 +#: src/ftp.c:1176 #, c-format msgid "Symlinks not supported, skipping symlink `%s'.\n" msgstr "Linkovi nisu podrľani, preskačem link `%s'.\n" -#: src/ftp.c:1177 +#: src/ftp.c:1188 #, c-format msgid "Skipping directory `%s'.\n" msgstr "Preskačem direktorij `%s'.\n" -#: src/ftp.c:1186 +#: src/ftp.c:1197 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: nepoznata/nepodrľana vrsta datoteke.\n" -#: src/ftp.c:1203 +#: src/ftp.c:1214 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: pogreąno vrijeme.\n" -#: src/ftp.c:1223 +#: src/ftp.c:1234 #, 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:1262 +#: src/ftp.c:1273 #, 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:1307 +#: src/ftp.c:1318 #, c-format msgid "Rejecting `%s'.\n" msgstr "Odbijam `%s'.\n" @@ -276,17 +277,17 @@ msgstr "Odbijam `%s'.\n" #. No luck. #. #### This message SUCKS. We should see what was the #. reason that nothing was retrieved. -#: src/ftp.c:1354 +#: src/ftp.c:1365 #, c-format msgid "No matches on pattern `%s'.\n" msgstr "Niąta ne ide uz `%s'.\n" -#: src/ftp.c:1414 +#: src/ftp.c:1425 #, c-format msgid "Wrote HTML-ized index to `%s' [%ld].\n" msgstr "Snimio HTML-iziran indeks u `%s' [%ld].\n" -#: src/ftp.c:1419 +#: src/ftp.c:1430 #, c-format msgid "Wrote HTML-ized index to `%s'.\n" msgstr "Snimio HTML-iziran indeks u `%s'.\n" @@ -377,136 +378,136 @@ msgstr "Ra msgid "Unknown error" msgstr "Nepoznata greąka" -#: src/html.c:439 src/html.c:441 +#: src/html.c:473 src/html.c:475 #, c-format msgid "Index of /%s on %s:%d" msgstr "Indeks direktorija /%s na %s:%d" -#: src/html.c:463 +#: src/html.c:497 msgid "time unknown " msgstr "nepoznato vrijeme " -#: src/html.c:467 +#: src/html.c:501 msgid "File " msgstr "Datoteka " -#: src/html.c:470 +#: src/html.c:504 msgid "Directory " msgstr "Direktorij " -#: src/html.c:473 +#: src/html.c:507 msgid "Link " msgstr "Link " -#: src/html.c:476 +#: src/html.c:510 msgid "Not sure " msgstr "Ne znam " -#: src/html.c:494 +#: src/html.c:528 #, c-format msgid " (%s bytes)" msgstr " (%s bajtova)" -#: src/http.c:492 +#: src/http.c:505 msgid "Failed writing HTTP request.\n" msgstr "Nisam uspio poslati HTTP zahtjev.\n" -#: src/http.c:497 +#: src/http.c:510 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s zahtjev poslan, čekam odgovor... " -#: src/http.c:536 +#: src/http.c:549 msgid "End of file while parsing headers.\n" msgstr "Kraj datoteke za vrijeme obrade zaglavlja.\n" -#: src/http.c:547 +#: src/http.c:560 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Greąka pri čitanju zaglavlja (%s).\n" -#: src/http.c:587 +#: src/http.c:600 msgid "No data received" msgstr "Podaci nisu primljeni" -#: src/http.c:589 +#: src/http.c:602 msgid "Malformed status line" msgstr "Deformirana statusna linija" -#: src/http.c:594 +#: src/http.c:607 msgid "(no description)" msgstr "(bez opisa)" #. If we have tried it already, then there is not point #. retrying it. -#: src/http.c:678 +#: src/http.c:691 msgid "Authorization failed.\n" msgstr "Ovjera nije uspjela.\n" -#: src/http.c:685 +#: src/http.c:698 msgid "Unknown authentication scheme.\n" msgstr "Nepoznata metoda ovjere.\n" -#: src/http.c:748 +#: src/http.c:761 #, c-format msgid "Location: %s%s\n" msgstr "Poloľaj: %s%s\n" -#: src/http.c:749 src/http.c:774 +#: src/http.c:762 src/http.c:787 msgid "unspecified" msgstr "neodređen" -#: src/http.c:750 +#: src/http.c:763 msgid " [following]" msgstr " [pratim]" #. No need to print this output if the body won't be #. downloaded at all, or if the original server response is #. printed. -#: src/http.c:764 +#: src/http.c:777 msgid "Length: " msgstr "Duljina: " -#: src/http.c:769 +#: src/http.c:782 #, c-format msgid " (%s to go)" msgstr " (joą %s)" -#: src/http.c:774 +#: src/http.c:787 msgid "ignored" msgstr "zanemarena" -#: src/http.c:858 +#: src/http.c:871 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Upozorenje: wildcardi nisu podrľani za HTTP.\n" #. If opt.noclobber is turned on and file already exists, do not #. retrieve the file -#: src/http.c:873 +#: src/http.c:886 #, c-format msgid "File `%s' already there, will not retrieve.\n" msgstr "Datoteka `%s' već postoji, ne skidam.\n" -#: src/http.c:1015 +#: src/http.c:1039 #, c-format msgid "Cannot write to `%s' (%s).\n" msgstr "Ne mogu pisati u `%s' (%s).\n" -#: src/http.c:1025 +#: src/http.c:1049 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "GRE©KA: Redirekcija (%d) bez novog poloľaja (location).\n" -#: src/http.c:1048 +#: src/http.c:1072 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s GRE©KA %d: %s.\n" -#: src/http.c:1060 +#: src/http.c:1084 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Nedostaje Last-Modified zaglavlje -- ignoriram vremensku oznaku.\n" -#: src/http.c:1068 +#: src/http.c:1092 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Nevaljan Last-Modified header -- ignoriram vremensku oznaku.\n" @@ -517,18 +518,20 @@ msgstr "Nevaljan Last-Modified header -- ignoriram vremensku oznaku.\n" #. coding style no-no by many measures, for reasons such as #. this) we'd have to remember to free() the string at each #. one to avoid a memory leak. -#: src/http.c:1099 +#: src/http.c:1123 #, c-format msgid "" "Server file no newer than local file `%s.orig' -- not retrieving.\n" "\n" -msgstr "Datoteka na posluľitelju nije novija od lokalne datoteke `%s.orig' -- ne skidam." +msgstr "" +"Datoteka na posluľitelju nije novija od lokalne datoteke `%s.orig' -- ne " +"skidam.\n" -#: src/http.c:1113 +#: src/http.c:1137 msgid "Remote file is newer, retrieving.\n" msgstr "Datoteka na posluľitelju je novija, skidam.\n" -#: src/http.c:1147 +#: src/http.c:1171 #, c-format msgid "" "%s (%s) - `%s' saved [%ld/%ld]\n" @@ -537,12 +540,12 @@ msgstr "" "%s (%s) - `%s' snimljen [%ld/%ld]\n" "\n" -#: src/http.c:1181 +#: src/http.c:1205 #, c-format msgid "%s (%s) - Connection closed at byte %ld. " msgstr "%s (%s) - Veza zatvorena na bajtu %ld. " -#: src/http.c:1189 +#: src/http.c:1213 #, c-format msgid "" "%s (%s) - `%s' saved [%ld/%ld])\n" @@ -551,52 +554,52 @@ msgstr "" "%s (%s) - `%s' snimljen [%ld/%ld])\n" "\n" -#: src/http.c:1202 +#: src/http.c:1226 #, c-format msgid "%s (%s) - Connection closed at byte %ld/%ld. " msgstr "%s (%s) - Veza zatvorena na bajtu %ld/%ld. " -#: src/http.c:1213 +#: src/http.c:1237 #, c-format msgid "%s (%s) - Read error at byte %ld (%s)." msgstr "%s (%s) - Greąka pri čitanju na bajtu %ld (%s)." -#: src/http.c:1221 +#: src/http.c:1245 #, c-format 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:313 src/netrc.c:250 +#: src/init.c:317 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:334 src/init.c:340 +#: src/init.c:338 src/init.c:344 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Greąka u %s na liniji %d.\n" -#: src/init.c:371 +#: src/init.c:375 #, 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:459 +#: src/init.c:463 #, c-format msgid "%s: BUG: unknown command `%s', value `%s'.\n" msgstr "%s: BUG: Nepoznata naredba `%s', vrijednost `%s'.\n" -#: src/init.c:486 +#: src/init.c:490 #, c-format msgid "%s: %s: Please specify on or off.\n" msgstr "%s: %s: Molim postavite na on ili off.\n" -#: src/init.c:504 src/init.c:761 src/init.c:783 src/init.c:856 +#: src/init.c:508 src/init.c:765 src/init.c:787 src/init.c:860 #, c-format msgid "%s: %s: Invalid specification `%s'.\n" msgstr "%s: %s: Pogreąna specifikacija `%s'\n" -#: src/init.c:617 src/init.c:639 src/init.c:661 src/init.c:687 +#: src/init.c:621 src/init.c:643 src/init.c:665 src/init.c:691 #, c-format msgid "%s: Invalid specification `%s'\n" msgstr "wget: %s: Pogreąna specifikacija `%s'\n" @@ -664,6 +667,7 @@ msgstr "" "\n" #: src/main.c:133 +#, fuzzy msgid "" "Download:\n" " -t, --tries=NUMBER set number of retries to NUMBER (0 " @@ -677,6 +681,8 @@ msgid "" " --spider don't download anything.\n" " -T, --timeout=SECONDS set the read timeout to SECONDS.\n" " -w, --wait=SECONDS wait SECONDS between retrievals.\n" +" --waitretry=SECONDS\twait 0..max SECONDS between retries of a " +"retrieval.\n" " -Y, --proxy=on/off turn proxy on or off.\n" " -Q, --quota=NUMBER set retrieval quota to NUMBER.\n" "\n" @@ -696,7 +702,7 @@ msgstr "" " -Q, --quota=BROJ postavi ograničenje skidanja na BROJ.\n" "\n" -#: src/main.c:147 +#: src/main.c:148 msgid "" "Directories:\n" " -nd --no-directories don't create directories.\n" @@ -715,7 +721,7 @@ msgstr "" " --cut-dirs=BROJ ignoriraj BROJ stranih direktorija.\n" "\n" -#: src/main.c:154 +#: src/main.c:155 msgid "" "HTTP options:\n" " --http-user=USER set http user to USER.\n" @@ -745,7 +751,7 @@ msgstr "" " Wget/VERZIJA.\n" "\n" -#: src/main.c:165 +#: src/main.c:166 msgid "" "FTP options:\n" " --retr-symlinks retrieve FTP symbolic links.\n" @@ -759,7 +765,7 @@ msgstr "" " --passive-ftp koristi \"pasivni\" mod prijenosa.\n" "\n" -#: src/main.c:170 +#: src/main.c:171 #, fuzzy msgid "" "Recursive retrieval:\n" @@ -782,17 +788,25 @@ msgstr "" " -nr, --dont-remove-listing ne uklanjaj `.listing' datoteke.\n" "\n" -#: src/main.c:179 +#: src/main.c:180 +#, fuzzy msgid "" "Recursive accept/reject:\n" -" -A, --accept=LIST list of accepted extensions.\n" -" -R, --reject=LIST list of rejected extensions.\n" -" -D, --domains=LIST list of accepted domains.\n" +" -A, --accept=LIST comma-separated list of accepted " +"extensions.\n" +" -R, --reject=LIST comma-separated list of rejected " +"extensions.\n" +" -D, --domains=LIST comma-separated list of accepted " +"domains.\n" " --exclude-domains=LIST comma-separated list of rejected " "domains.\n" -" -L, --relative follow relative links only.\n" " --follow-ftp follow FTP links from HTML documents.\n" +" --follow-tags=LIST comma-separated list of followed HTML " +"tags.\n" +" -G, --ignore-tags=LIST comma-separated list of ignored HTML " +"tags.\n" " -H, --span-hosts go to foreign hosts when recursive.\n" +" -L, --relative follow relative links only.\n" " -I, --include-directories=LIST list of allowed directories.\n" " -X, --exclude-directories=LIST list of excluded directories.\n" " -nh, --no-host-lookup don't DNS-lookup hosts.\n" @@ -815,16 +829,16 @@ msgstr "" " -np, --no-parent ne idi u direktorij viąe.\n" "\n" -#: src/main.c:192 +#: src/main.c:195 msgid "Mail bug reports and suggestions to .\n" msgstr "©aljite izvjeątaje o bugovima i prijedloge na .\n" -#: src/main.c:349 +#: src/main.c:359 #, c-format msgid "%s: debug support not compiled in.\n" msgstr "%s: podrąka za debugiranje nije ugrađena.\n" -#: src/main.c:400 +#: src/main.c:410 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" @@ -838,7 +852,7 @@ msgstr "" "PROIZVODNOSTI ili UPOTREBLJIVOSTI ZA ODREĐENU SVRHU. Pogledajte GNU\n" "General Public License za viąe detalja.\n" -#: src/main.c:406 +#: src/main.c:416 msgid "" "\n" "Written by Hrvoje Niksic .\n" @@ -846,43 +860,43 @@ msgstr "" "\n" "Napisao Hrvoje Nikąić .\n" -#: src/main.c:470 +#: src/main.c:490 #, c-format msgid "%s: %s: invalid command\n" msgstr "%s: %s: nedozvoljena naredba\n" -#: src/main.c:520 +#: src/main.c:543 #, 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:523 src/main.c:565 src/main.c:596 +#: src/main.c:546 src/main.c:588 src/main.c:631 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Pokuąajte `%s --help' za viąe opcija.\n" -#: src/main.c:576 +#: src/main.c:611 msgid "Can't be verbose and quiet at the same time.\n" msgstr "Ne mogu istovremeno biti verbozan i tih.\n" -#: src/main.c:582 +#: src/main.c:617 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:591 +#: src/main.c:626 #, c-format msgid "%s: missing URL\n" msgstr "%s: nedostaje URL\n" -#: src/main.c:679 +#: src/main.c:714 #, c-format msgid "No URLs found in %s.\n" msgstr "Nijedan URL nije pronađen u %s.\n" -#: src/main.c:688 +#: src/main.c:723 #, c-format msgid "" "\n" @@ -893,14 +907,14 @@ msgstr "" "ZAVR©IO --%s--\n" "Skinuo: %s bajta u %d datoteka\n" -#: src/main.c:693 +#: src/main.c:728 #, 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:720 +#: src/main.c:755 msgid "%s received, redirecting output to `%%s'.\n" msgstr "%s primljen, usmjeravam izlaz na `%%s'.\n" @@ -937,38 +951,38 @@ msgstr "Pokre msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Ne mogu naći upotrebljiv driver za sockete.\n" -#: src/netrc.c:334 +#: src/netrc.c:359 #, c-format msgid "%s: %s:%d: warning: \"%s\" token appears before any machine name\n" msgstr "" "%s: %s:%d: upozorenje: \"%s\" token se pojavljuje prije naziva stroja\n" -#: src/netrc.c:365 +#: src/netrc.c:390 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: nepoznat token \"%s\"\n" -#: src/netrc.c:429 +#: src/netrc.c:454 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Uporaba: %s NETRC [RAČUNALO]\n" -#: src/netrc.c:439 +#: src/netrc.c:464 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: ne mogu stat-irati %s: %s\n" -#: src/recur.c:449 src/retr.c:463 +#: src/recur.c:451 src/retr.c:464 #, c-format msgid "Removing %s.\n" msgstr "Uklanjam %s.\n" -#: src/recur.c:450 +#: src/recur.c:452 #, 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:609 +#: src/recur.c:611 msgid "Loading robots.txt; please ignore errors.\n" msgstr "Učitavam robots.txt; molim ne obazirati se na greąke.\n" @@ -981,21 +995,21 @@ msgstr "" "\n" " [ preskačem %dK ]" -#: src/retr.c:344 +#: src/retr.c:345 msgid "Could not find proxy host.\n" msgstr "Ne mogu naći proxy računalo.\n" -#: src/retr.c:355 +#: src/retr.c:356 #, c-format msgid "Proxy %s: Must be HTTP.\n" msgstr "Proxy %s: Mora biti HTTP.\n" -#: src/retr.c:398 +#: src/retr.c:399 #, c-format msgid "%s: Redirection to itself.\n" msgstr "%s: Redirekcija na samog sebe.\n" -#: src/retr.c:484 +#: src/retr.c:485 msgid "" "Giving up.\n" "\n" @@ -1003,7 +1017,7 @@ msgstr "" "Odustajem.\n" "\n" -#: src/retr.c:484 +#: src/retr.c:485 msgid "" "Retrying.\n" "\n" diff --git a/po/it.gmo b/po/it.gmo index 6497e68e..ba2c0853 100644 Binary files a/po/it.gmo and b/po/it.gmo differ diff --git a/po/it.po b/po/it.po index c6d46835..9d4f5248 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-03-02 01:13-0800\n" +"POT-Creation-Date: 2000-03-10 19:51-0800\n" "PO-Revision-Date: 1998-06-13 15:22+02:00\n" "Last-Translator: Giovanni Bortolozzo \n" "Language-Team: Italian \n" @@ -15,18 +15,18 @@ msgstr "" #. Login to the server: #. First: Establish the control connection. -#: src/ftp.c:147 src/http.c:346 +#: src/ftp.c:147 src/http.c:348 #, c-format msgid "Connecting to %s:%hu... " msgstr "Mi sto connettendo a %s:%hu..." -#: src/ftp.c:169 src/ftp.c:411 src/http.c:363 +#: src/ftp.c:169 src/ftp.c:411 src/http.c:365 #, c-format msgid "Connection to %s:%hu refused.\n" msgstr "Connessione a %s:%hu rifiutata.\n" #. Second: Login with proper USER/PASS sequence. -#: src/ftp.c:190 src/http.c:374 +#: src/ftp.c:190 src/http.c:376 msgid "connected!\n" msgstr "connesso!\n" @@ -182,12 +182,12 @@ msgstr "Trasferimento dati abortito.\n" msgid "File `%s' already there, not retrieving.\n" msgstr "Il file `%s' č giŕ presente, non lo scarico.\n" -#: src/ftp.c:896 src/http.c:959 +#: src/ftp.c:907 src/http.c:983 #, c-format msgid "(try:%2d)" msgstr "(provo:%2d)" -#: src/ftp.c:960 src/http.c:1166 +#: src/ftp.c:971 src/http.c:1190 #, c-format msgid "" "%s (%s) - `%s' saved [%ld]\n" @@ -196,38 +196,38 @@ msgstr "" "%s (%s) - `%s' salvato [%ld]\n" "\n" -#: src/ftp.c:1006 +#: src/ftp.c:1017 #, c-format msgid "Using `%s' as listing tmp file.\n" msgstr "Utilizzo `%s' come file temporaneo per il listing.\n" -#: src/ftp.c:1018 +#: src/ftp.c:1029 #, c-format msgid "Removed `%s'.\n" msgstr "`%s' rimosso.\n" -#: src/ftp.c:1054 +#: src/ftp.c:1065 #, 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:1106 src/http.c:1103 +#: src/ftp.c:1117 src/http.c:1127 #, c-format msgid "" "Server file no newer than local file `%s' -- not retrieving.\n" "\n" msgstr "" -#: src/ftp.c:1112 src/http.c:1109 +#: src/ftp.c:1123 src/http.c:1133 #, 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:1129 +#: src/ftp.c:1140 msgid "Invalid name of the symlink, skipping.\n" msgstr "Il nome del link simbolico non č valido, passo oltre.\n" -#: src/ftp.c:1146 +#: src/ftp.c:1157 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -236,42 +236,42 @@ msgstr "" "Ho giŕ il link simbolico %s -> %s\n" "\n" -#: src/ftp.c:1154 +#: src/ftp.c:1165 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Creo il link simbolico %s -> %s\n" -#: src/ftp.c:1165 +#: src/ftp.c:1176 #, c-format msgid "Symlinks not supported, skipping symlink `%s'.\n" msgstr "Link simbolici non supportati, ignoro il link `%s'.\n" -#: src/ftp.c:1177 +#: src/ftp.c:1188 #, c-format msgid "Skipping directory `%s'.\n" msgstr "Ignoro la directory `%s'.\n" -#: src/ftp.c:1186 +#: src/ftp.c:1197 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: tipo di file sconosciuto/non supportato.\n" -#: src/ftp.c:1203 +#: src/ftp.c:1214 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: time-stamp corrotto.\n" -#: src/ftp.c:1223 +#: src/ftp.c:1234 #, 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:1262 +#: src/ftp.c:1273 #, 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:1307 +#: src/ftp.c:1318 #, c-format msgid "Rejecting `%s'.\n" msgstr "Rifiuto `%s'.\n" @@ -279,17 +279,17 @@ msgstr "Rifiuto `%s'.\n" #. No luck. #. #### This message SUCKS. We should see what was the #. reason that nothing was retrieved. -#: src/ftp.c:1354 +#: src/ftp.c:1365 #, c-format msgid "No matches on pattern `%s'.\n" msgstr "Nessun corrispondenza con il modello `%s'.\n" -#: src/ftp.c:1414 +#: src/ftp.c:1425 #, 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:1419 +#: src/ftp.c:1430 #, c-format msgid "Wrote HTML-ized index to `%s'.\n" msgstr "Scrivo l'indice in formato HTML in `%s'.\n" @@ -384,136 +384,136 @@ msgstr "Host non trovato" msgid "Unknown error" msgstr "Errore sconosciuto" -#: src/html.c:439 src/html.c:441 +#: src/html.c:473 src/html.c:475 #, c-format msgid "Index of /%s on %s:%d" msgstr "Indice della directory /%s su %s:%d" -#: src/html.c:463 +#: src/html.c:497 msgid "time unknown " msgstr "data sconosciuta " -#: src/html.c:467 +#: src/html.c:501 msgid "File " msgstr "File " -#: src/html.c:470 +#: src/html.c:504 msgid "Directory " msgstr "Directory " -#: src/html.c:473 +#: src/html.c:507 msgid "Link " msgstr "Link " -#: src/html.c:476 +#: src/html.c:510 msgid "Not sure " msgstr "Incerto " -#: src/html.c:494 +#: src/html.c:528 #, c-format msgid " (%s bytes)" msgstr " (%s byte)" -#: src/http.c:492 +#: src/http.c:505 msgid "Failed writing HTTP request.\n" msgstr "Non riesco a scrivere la richiesta HTTP.\n" -#: src/http.c:497 +#: src/http.c:510 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s richiesta inviata, aspetto la risposta... " -#: src/http.c:536 +#: src/http.c:549 msgid "End of file while parsing headers.\n" msgstr "Raggiunta la fine del file durante l'analisi degli header.\n" -#: src/http.c:547 +#: src/http.c:560 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Errore di lettura degli header (%s).\n" -#: src/http.c:587 +#: src/http.c:600 msgid "No data received" msgstr "Nessun dato ricevuto" -#: src/http.c:589 +#: src/http.c:602 msgid "Malformed status line" msgstr "Riga di stato malformata" -#: src/http.c:594 +#: src/http.c:607 msgid "(no description)" msgstr "(nessuna descrizione)" #. If we have tried it already, then there is not point #. retrying it. -#: src/http.c:678 +#: src/http.c:691 msgid "Authorization failed.\n" msgstr "Autorizzazione fallita.\n" -#: src/http.c:685 +#: src/http.c:698 msgid "Unknown authentication scheme.\n" msgstr "Schema di autotentificazione sconosciuto.\n" -#: src/http.c:748 +#: src/http.c:761 #, c-format msgid "Location: %s%s\n" msgstr "Location: %s%s\n" -#: src/http.c:749 src/http.c:774 +#: src/http.c:762 src/http.c:787 msgid "unspecified" msgstr "non specificato" -#: src/http.c:750 +#: src/http.c:763 msgid " [following]" msgstr " [segue]" #. No need to print this output if the body won't be #. downloaded at all, or if the original server response is #. printed. -#: src/http.c:764 +#: src/http.c:777 msgid "Length: " msgstr "Lunghezza: " -#: src/http.c:769 +#: src/http.c:782 #, c-format msgid " (%s to go)" msgstr " (%s per finire)" -#: src/http.c:774 +#: src/http.c:787 msgid "ignored" msgstr "ignorato" -#: src/http.c:858 +#: src/http.c:871 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Attenzione: le wildcard non sono supportate in HTTP.\n" #. If opt.noclobber is turned on and file already exists, do not #. retrieve the file -#: src/http.c:873 +#: src/http.c:886 #, c-format msgid "File `%s' already there, will not retrieve.\n" msgstr "Il file `%s' č giŕ presente, non lo scarico.\n" -#: src/http.c:1015 +#: src/http.c:1039 #, c-format msgid "Cannot write to `%s' (%s).\n" msgstr "Non riesco a scrivere in `%s' (%s).\n" -#: src/http.c:1025 +#: src/http.c:1049 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERRORE: Redirezione (%d) senza posizione.\n" -#: src/http.c:1048 +#: src/http.c:1072 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERRORE %d: %s.\n" -#: src/http.c:1060 +#: src/http.c:1084 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Manca l'header last-modified -- date disattivate.\n" -#: src/http.c:1068 +#: src/http.c:1092 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Header last-modified non valido -- data ignorata.\n" @@ -524,18 +524,18 @@ msgstr "Header last-modified non valido -- data ignorata.\n" #. coding style no-no by many measures, for reasons such as #. this) we'd have to remember to free() the string at each #. one to avoid a memory leak. -#: src/http.c:1099 +#: src/http.c:1123 #, c-format msgid "" "Server file no newer than local file `%s.orig' -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:1113 +#: src/http.c:1137 msgid "Remote file is newer, retrieving.\n" msgstr "Il file remoto č piů recente, lo scarico.\n" -#: src/http.c:1147 +#: src/http.c:1171 #, c-format msgid "" "%s (%s) - `%s' saved [%ld/%ld]\n" @@ -544,12 +544,12 @@ msgstr "" "%s (%s) - `%s' salvato [%ld/%ld]\n" "\n" -#: src/http.c:1181 +#: src/http.c:1205 #, c-format msgid "%s (%s) - Connection closed at byte %ld. " msgstr "%s (%s) - Connessione chiusa al byte %ld. " -#: src/http.c:1189 +#: src/http.c:1213 #, c-format msgid "" "%s (%s) - `%s' saved [%ld/%ld])\n" @@ -558,54 +558,54 @@ msgstr "" "%s (%s) - `%s' salvati [%ld/%ld])\n" "\n" -#: src/http.c:1202 +#: src/http.c:1226 #, c-format msgid "%s (%s) - Connection closed at byte %ld/%ld. " msgstr "%s (%s) - Connessione chiusa al byte %ld/%ld. " -#: src/http.c:1213 +#: src/http.c:1237 #, c-format msgid "%s (%s) - Read error at byte %ld (%s)." msgstr "%s (%s) - Errore di lettura al byte %ld (%s). " -#: src/http.c:1221 +#: src/http.c:1245 #, c-format msgid "%s (%s) - Read error at byte %ld/%ld (%s). " msgstr "%s (%s) - Errore di lettura al %ld/%ld (%s). " -#: src/init.c:313 src/netrc.c:250 +#: src/init.c:317 src/netrc.c:260 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Impossibile leggere %s (%s).\n" -#: src/init.c:334 src/init.c:340 +#: src/init.c:338 src/init.c:344 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Errore in %s alla linea %d.\n" -#: src/init.c:371 +#: src/init.c:375 #, 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:459 +#: src/init.c:463 #, c-format msgid "%s: BUG: unknown command `%s', value `%s'.\n" msgstr "%s: BUG: comando `%s' sconosciuto, valore `%s'.\n" -#: src/init.c:486 +#: src/init.c:490 #, c-format msgid "%s: %s: Please specify on or off.\n" msgstr "%s: %s: Specificare on oppure off.\n" -#: src/init.c:504 src/init.c:761 src/init.c:783 src/init.c:856 +#: src/init.c:508 src/init.c:765 src/init.c:787 src/init.c:860 #, c-format msgid "%s: %s: Invalid specification `%s'.\n" msgstr "%s: %s: Specificazione non valida `%s'\n" -#: src/init.c:617 src/init.c:639 src/init.c:661 src/init.c:687 +#: src/init.c:621 src/init.c:643 src/init.c:665 src/init.c:691 #, c-format msgid "%s: Invalid specification `%s'\n" msgstr "wget: %s: Specificazione non valida `%s'\n" @@ -675,6 +675,7 @@ msgstr "" "\n" #: src/main.c:133 +#, fuzzy msgid "" "Download:\n" " -t, --tries=NUMBER set number of retries to NUMBER (0 " @@ -688,6 +689,8 @@ msgid "" " --spider don't download anything.\n" " -T, --timeout=SECONDS set the read timeout to SECONDS.\n" " -w, --wait=SECONDS wait SECONDS between retrievals.\n" +" --waitretry=SECONDS\twait 0..max SECONDS between retries of a " +"retrieval.\n" " -Y, --proxy=on/off turn proxy on or off.\n" " -Q, --quota=NUMBER set retrieval quota to NUMBER.\n" "\n" @@ -710,7 +713,7 @@ msgstr "" " -Q, --quota=NUMERO imposta la quota di scarico a NUMERO.\n" "\n" -#: src/main.c:147 +#: src/main.c:148 msgid "" "Directories:\n" " -nd --no-directories don't create directories.\n" @@ -730,7 +733,7 @@ msgstr "" " directory remote.\n" "\n" -#: src/main.c:154 +#: src/main.c:155 msgid "" "HTTP options:\n" " --http-user=USER set http user to USER.\n" @@ -759,7 +762,7 @@ msgstr "" " Wget/VERSIONE.\n" "\n" -#: src/main.c:165 +#: src/main.c:166 msgid "" "FTP options:\n" " --retr-symlinks retrieve FTP symbolic links.\n" @@ -773,7 +776,7 @@ msgstr "" " --passive-ftp usa il modo di trasferimento \"passivo\".\n" "\n" -#: src/main.c:170 +#: src/main.c:171 #, fuzzy msgid "" "Recursive retrieval:\n" @@ -797,17 +800,25 @@ msgstr "" " -nr, --dont-remove-listing non rimuove i file `.listing'.\n" "\n" -#: src/main.c:179 +#: src/main.c:180 +#, fuzzy msgid "" "Recursive accept/reject:\n" -" -A, --accept=LIST list of accepted extensions.\n" -" -R, --reject=LIST list of rejected extensions.\n" -" -D, --domains=LIST list of accepted domains.\n" +" -A, --accept=LIST comma-separated list of accepted " +"extensions.\n" +" -R, --reject=LIST comma-separated list of rejected " +"extensions.\n" +" -D, --domains=LIST comma-separated list of accepted " +"domains.\n" " --exclude-domains=LIST comma-separated list of rejected " "domains.\n" -" -L, --relative follow relative links only.\n" " --follow-ftp follow FTP links from HTML documents.\n" +" --follow-tags=LIST comma-separated list of followed HTML " +"tags.\n" +" -G, --ignore-tags=LIST comma-separated list of ignored HTML " +"tags.\n" " -H, --span-hosts go to foreign hosts when recursive.\n" +" -L, --relative follow relative links only.\n" " -I, --include-directories=LIST list of allowed directories.\n" " -X, --exclude-directories=LIST list of excluded directories.\n" " -nh, --no-host-lookup don't DNS-lookup hosts.\n" @@ -831,17 +842,17 @@ msgstr "" " -np, --no-parent non risale alla directory genitrice.\n" "\n" -#: src/main.c:192 +#: src/main.c:195 msgid "Mail bug reports and suggestions to .\n" msgstr "Inviare segnalazioni di bug e suggerimenti a .\n" -#: src/main.c:349 +#: src/main.c:359 #, 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:400 +#: src/main.c:410 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" @@ -855,7 +866,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:406 +#: src/main.c:416 msgid "" "\n" "Written by Hrvoje Niksic .\n" @@ -863,45 +874,45 @@ msgstr "" "\n" "Scritto da Hrvoje Niksic .\n" -#: src/main.c:470 +#: src/main.c:490 #, c-format msgid "%s: %s: invalid command\n" msgstr "%s: %s: comando non valido\n" -#: src/main.c:520 +#: src/main.c:543 #, 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:523 src/main.c:565 src/main.c:596 +#: src/main.c:546 src/main.c:588 src/main.c:631 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Usare `%s --help' per ulteriori opzioni.\n" -#: src/main.c:576 +#: src/main.c:611 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:582 +#: src/main.c:617 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:591 +#: src/main.c:626 #, c-format msgid "%s: missing URL\n" msgstr "%s: manca l'URL\n" -#: src/main.c:679 +#: src/main.c:714 #, c-format msgid "No URLs found in %s.\n" msgstr "Non ci sono URL in %s.\n" -#: src/main.c:688 +#: src/main.c:723 #, c-format msgid "" "\n" @@ -912,14 +923,14 @@ msgstr "" "FINITO --%s--\n" "Scaricati: %s byte in %d file\n" -#: src/main.c:693 +#: src/main.c:728 #, 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:720 +#: src/main.c:755 msgid "%s received, redirecting output to `%%s'.\n" msgstr "%s ricevuti, redirigo l'output su `%%s'.\n" @@ -956,38 +967,38 @@ msgstr "Avvio WinHelp %s\n" msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Non riesco a trovare un driver utilizzabile per i socket.\n" -#: src/netrc.c:334 +#: src/netrc.c:359 #, c-format msgid "%s: %s:%d: warning: \"%s\" token appears before any machine name\n" msgstr "" "%s: %s:%d: attenzione: il token \"%s\" appare prima di un nome di macchina\n" -#: src/netrc.c:365 +#: src/netrc.c:390 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: token \"%s\" sconosciuto\n" -#: src/netrc.c:429 +#: src/netrc.c:454 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Uso: %s NETRC [HOSTNAME]\n" -#: src/netrc.c:439 +#: src/netrc.c:464 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: stat su %s fallita: %s\n" -#: src/recur.c:449 src/retr.c:463 +#: src/recur.c:451 src/retr.c:464 #, c-format msgid "Removing %s.\n" msgstr "Rimuovo %s.\n" -#: src/recur.c:450 +#: src/recur.c:452 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Rimuovo %s poiché deve essere rifiutato.\n" -#: src/recur.c:609 +#: src/recur.c:611 msgid "Loading robots.txt; please ignore errors.\n" msgstr "Carico robots.txt; si ignorino eventuali errori.\n" @@ -1000,21 +1011,21 @@ msgstr "" "\n" " [ salto %dK ]" -#: src/retr.c:344 +#: src/retr.c:345 msgid "Could not find proxy host.\n" msgstr "Non riesco a trovare il proxy host.\n" -#: src/retr.c:355 +#: src/retr.c:356 #, c-format msgid "Proxy %s: Must be HTTP.\n" msgstr "Proxy %s: Deve essere HTTP.\n" -#: src/retr.c:398 +#: src/retr.c:399 #, c-format msgid "%s: Redirection to itself.\n" msgstr "%s: Redirezione su se stesso.\n" -#: src/retr.c:484 +#: src/retr.c:485 msgid "" "Giving up.\n" "\n" @@ -1022,7 +1033,7 @@ msgstr "" "Rinuncio.\n" "\n" -#: src/retr.c:484 +#: src/retr.c:485 msgid "" "Retrying.\n" "\n" diff --git a/po/no.gmo b/po/no.gmo index ba046918..f17220b6 100644 Binary files a/po/no.gmo and b/po/no.gmo differ diff --git a/po/no.po b/po/no.po index 1b90dc9a..deec58d8 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-03-02 01:13-0800\n" +"POT-Creation-Date: 2000-03-10 19:51-0800\n" "PO-Revision-Date: 1998-05-22 09:00+0100\n" "Last-Translator: Robert Schmidt \n" "Language-Team: Norwegian \n" @@ -15,18 +15,18 @@ msgstr "" #. Login to the server: #. First: Establish the control connection. -#: src/ftp.c:147 src/http.c:346 +#: src/ftp.c:147 src/http.c:348 #, c-format msgid "Connecting to %s:%hu... " msgstr "Kontakter %s:%hu... " -#: src/ftp.c:169 src/ftp.c:411 src/http.c:363 +#: src/ftp.c:169 src/ftp.c:411 src/http.c:365 #, c-format msgid "Connection to %s:%hu refused.\n" msgstr "Kontakt med %s:%hu nektet.\n" #. Second: Login with proper USER/PASS sequence. -#: src/ftp.c:190 src/http.c:374 +#: src/ftp.c:190 src/http.c:376 msgid "connected!\n" msgstr "kontakt!\n" @@ -181,12 +181,12 @@ msgstr "Dataoverf msgid "File `%s' already there, not retrieving.\n" msgstr "File «%s» eksisterer allerede, ignoreres.\n" -#: src/ftp.c:896 src/http.c:959 +#: src/ftp.c:907 src/http.c:983 #, c-format msgid "(try:%2d)" msgstr "(forsřk:%2d)" -#: src/ftp.c:960 src/http.c:1166 +#: src/ftp.c:971 src/http.c:1190 #, c-format msgid "" "%s (%s) - `%s' saved [%ld]\n" @@ -195,38 +195,38 @@ msgstr "" "%s (%s) - «%s» lagret [%ld]\n" "\n" -#: src/ftp.c:1006 +#: src/ftp.c:1017 #, c-format msgid "Using `%s' as listing tmp file.\n" msgstr "Bruker «%s» som temporćr katalogliste.\n" -#: src/ftp.c:1018 +#: src/ftp.c:1029 #, c-format msgid "Removed `%s'.\n" msgstr "Slettet «%s».\n" -#: src/ftp.c:1054 +#: src/ftp.c:1065 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Rekursjonsdybde %d overskred maksimal dybde %d.\n" -#: src/ftp.c:1106 src/http.c:1103 +#: src/ftp.c:1117 src/http.c:1127 #, c-format msgid "" "Server file no newer than local file `%s' -- not retrieving.\n" "\n" msgstr "" -#: src/ftp.c:1112 src/http.c:1109 +#: src/ftp.c:1123 src/http.c:1133 #, 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:1129 +#: src/ftp.c:1140 msgid "Invalid name of the symlink, skipping.\n" msgstr "Ugyldig navn for symbolsk link, ignoreres.\n" -#: src/ftp.c:1146 +#: src/ftp.c:1157 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -235,42 +235,42 @@ msgstr "" "Har allerede gyldig symbolsk link %s -> %s\n" "\n" -#: src/ftp.c:1154 +#: src/ftp.c:1165 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Lager symbolsk link %s -> %s\n" -#: src/ftp.c:1165 +#: src/ftp.c:1176 #, c-format msgid "Symlinks not supported, skipping symlink `%s'.\n" msgstr "Symbolske linker ikke střttet, ignorerer «%s».\n" -#: src/ftp.c:1177 +#: src/ftp.c:1188 #, c-format msgid "Skipping directory `%s'.\n" msgstr "Ignorerer katalog «%s».\n" -#: src/ftp.c:1186 +#: src/ftp.c:1197 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: filtypen er ukjent/ikke střttet.\n" -#: src/ftp.c:1203 +#: src/ftp.c:1214 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: ugyldig tidsstempel.\n" -#: src/ftp.c:1223 +#: src/ftp.c:1234 #, 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:1262 +#: src/ftp.c:1273 #, 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:1307 +#: src/ftp.c:1318 #, c-format msgid "Rejecting `%s'.\n" msgstr "Ignorerer «%s».\n" @@ -278,17 +278,17 @@ msgstr "Ignorerer #. No luck. #. #### This message SUCKS. We should see what was the #. reason that nothing was retrieved. -#: src/ftp.c:1354 +#: src/ftp.c:1365 #, c-format msgid "No matches on pattern `%s'.\n" msgstr "Ingenting passer med mřnsteret «%s».\n" -#: src/ftp.c:1414 +#: src/ftp.c:1425 #, c-format msgid "Wrote HTML-ized index to `%s' [%ld].\n" msgstr "Skrev HTML-formattert indeks til «%s» [%ld].\n" -#: src/ftp.c:1419 +#: src/ftp.c:1430 #, c-format msgid "Wrote HTML-ized index to `%s'.\n" msgstr "Skrev HTML-formattert indeks til «%s».\n" @@ -380,136 +380,136 @@ msgstr "Tjener ikke funnet" msgid "Unknown error" msgstr "Ukjent feil" -#: src/html.c:439 src/html.c:441 +#: src/html.c:473 src/html.c:475 #, c-format msgid "Index of /%s on %s:%d" msgstr "Indeks for /%s pĺ %s:%d" -#: src/html.c:463 +#: src/html.c:497 msgid "time unknown " msgstr "ukjent tid " -#: src/html.c:467 +#: src/html.c:501 msgid "File " msgstr "Fil " -#: src/html.c:470 +#: src/html.c:504 msgid "Directory " msgstr "Katalog " -#: src/html.c:473 +#: src/html.c:507 msgid "Link " msgstr "Link " -#: src/html.c:476 +#: src/html.c:510 msgid "Not sure " msgstr "Usikker " -#: src/html.c:494 +#: src/html.c:528 #, c-format msgid " (%s bytes)" msgstr " (%s bytes)" -#: src/http.c:492 +#: src/http.c:505 msgid "Failed writing HTTP request.\n" msgstr "Feil ved sending av HTTP-forespřrsel.\n" -#: src/http.c:497 +#: src/http.c:510 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s forespřrsel sendt, mottar topptekster... " -#: src/http.c:536 +#: src/http.c:549 msgid "End of file while parsing headers.\n" msgstr "Filslutt funnet ved lesing av topptekster.\n" -#: src/http.c:547 +#: src/http.c:560 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Lesefeil (%s) i topptekster.\n" -#: src/http.c:587 +#: src/http.c:600 msgid "No data received" msgstr "Ingen data mottatt" -#: src/http.c:589 +#: src/http.c:602 msgid "Malformed status line" msgstr "Feil i statuslinje" -#: src/http.c:594 +#: src/http.c:607 msgid "(no description)" msgstr "(ingen beskrivelse)" #. If we have tried it already, then there is not point #. retrying it. -#: src/http.c:678 +#: src/http.c:691 msgid "Authorization failed.\n" msgstr "Autorisasjon mislyktes\n" -#: src/http.c:685 +#: src/http.c:698 msgid "Unknown authentication scheme.\n" msgstr "Ukjent autorisasjons-protokoll.\n" -#: src/http.c:748 +#: src/http.c:761 #, c-format msgid "Location: %s%s\n" msgstr "Sted: %s%s\n" -#: src/http.c:749 src/http.c:774 +#: src/http.c:762 src/http.c:787 msgid "unspecified" msgstr "uspesifisert" -#: src/http.c:750 +#: src/http.c:763 msgid " [following]" msgstr " [omdirigert]" #. No need to print this output if the body won't be #. downloaded at all, or if the original server response is #. printed. -#: src/http.c:764 +#: src/http.c:777 msgid "Length: " msgstr "Lengde: " -#: src/http.c:769 +#: src/http.c:782 #, c-format msgid " (%s to go)" msgstr " (%s igjen)" -#: src/http.c:774 +#: src/http.c:787 msgid "ignored" msgstr "ignoreres" -#: src/http.c:858 +#: src/http.c:871 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Advarsel: jokertegn ikke střttet i HTTP.\n" #. If opt.noclobber is turned on and file already exists, do not #. retrieve the file -#: src/http.c:873 +#: src/http.c:886 #, c-format msgid "File `%s' already there, will not retrieve.\n" msgstr "Filen «%s» hentes ikke, fordi den allerede eksisterer.\n" -#: src/http.c:1015 +#: src/http.c:1039 #, c-format msgid "Cannot write to `%s' (%s).\n" msgstr "Kan ikke skrive til «%s» (%s).\n" -#: src/http.c:1025 +#: src/http.c:1049 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "FEIL: Omdirigering (%d) uten nytt sted.\n" -#: src/http.c:1048 +#: src/http.c:1072 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s FEIL %d: %s.\n" -#: src/http.c:1060 +#: src/http.c:1084 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Last-modified topptekst mangler -- tidsstempling slĺs av.\n" -#: src/http.c:1068 +#: src/http.c:1092 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Last-modified topptekst ugyldig -- tidsstempel ignoreres.\n" @@ -520,18 +520,18 @@ msgstr "Last-modified topptekst ugyldig -- tidsstempel ignoreres.\n" #. coding style no-no by many measures, for reasons such as #. this) we'd have to remember to free() the string at each #. one to avoid a memory leak. -#: src/http.c:1099 +#: src/http.c:1123 #, c-format msgid "" "Server file no newer than local file `%s.orig' -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:1113 +#: src/http.c:1137 msgid "Remote file is newer, retrieving.\n" msgstr "Fil pĺ tjener er nyere - hentes.\n" -#: src/http.c:1147 +#: src/http.c:1171 #, c-format msgid "" "%s (%s) - `%s' saved [%ld/%ld]\n" @@ -540,12 +540,12 @@ msgstr "" "%s (%s) - «%s» lagret [%ld/%ld]\n" "\n" -#: src/http.c:1181 +#: src/http.c:1205 #, c-format msgid "%s (%s) - Connection closed at byte %ld. " msgstr "%s (%s) - Forbindelse brutt ved byte %ld. " -#: src/http.c:1189 +#: src/http.c:1213 #, c-format msgid "" "%s (%s) - `%s' saved [%ld/%ld])\n" @@ -554,52 +554,52 @@ msgstr "" "%s (%s) - «%s» lagret [%ld/%ld]\n" "\n" -#: src/http.c:1202 +#: src/http.c:1226 #, c-format msgid "%s (%s) - Connection closed at byte %ld/%ld. " msgstr "%s (%s) - Forbindelse brutt ved byte %ld/%ld. " -#: src/http.c:1213 +#: src/http.c:1237 #, c-format msgid "%s (%s) - Read error at byte %ld (%s)." msgstr "%s (%s) - Lesefeil ved byte %ld (%s)." -#: src/http.c:1221 +#: src/http.c:1245 #, c-format msgid "%s (%s) - Read error at byte %ld/%ld (%s). " msgstr "%s (%s) - Lesefeil ved byte %ld/%ld (%s)." -#: src/init.c:313 src/netrc.c:250 +#: src/init.c:317 src/netrc.c:260 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Kan ikke lese %s (%s).\n" -#: src/init.c:334 src/init.c:340 +#: src/init.c:338 src/init.c:344 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Feil i %s pĺ linje %d.\n" -#: src/init.c:371 +#: src/init.c:375 #, 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:459 +#: src/init.c:463 #, c-format msgid "%s: BUG: unknown command `%s', value `%s'.\n" msgstr "%s: Ukjent kommando «%s», verdi «%s».\n" -#: src/init.c:486 +#: src/init.c:490 #, c-format msgid "%s: %s: Please specify on or off.\n" msgstr "%s: %s: Vennligst spesifiser «on» eller «off».\n" -#: src/init.c:504 src/init.c:761 src/init.c:783 src/init.c:856 +#: src/init.c:508 src/init.c:765 src/init.c:787 src/init.c:860 #, c-format msgid "%s: %s: Invalid specification `%s'.\n" msgstr "%s: %s: Ugyldig spesifikasjon «%s»\n" -#: src/init.c:617 src/init.c:639 src/init.c:661 src/init.c:687 +#: src/init.c:621 src/init.c:643 src/init.c:665 src/init.c:691 #, c-format msgid "%s: Invalid specification `%s'\n" msgstr "%s: Ugyldig spesifikasjon «%s»\n" @@ -668,6 +668,7 @@ msgstr "" "\n" #: src/main.c:133 +#, fuzzy msgid "" "Download:\n" " -t, --tries=NUMBER set number of retries to NUMBER (0 " @@ -681,6 +682,8 @@ msgid "" " --spider don't download anything.\n" " -T, --timeout=SECONDS set the read timeout to SECONDS.\n" " -w, --wait=SECONDS wait SECONDS between retrievals.\n" +" --waitretry=SECONDS\twait 0..max SECONDS between retries of a " +"retrieval.\n" " -Y, --proxy=on/off turn proxy on or off.\n" " -Q, --quota=NUMBER set retrieval quota to NUMBER.\n" "\n" @@ -701,7 +704,7 @@ msgstr "" " -Q, --quota=ANTALL sett nedlastingskvote til ANTALL.\n" "\n" -#: src/main.c:147 +#: src/main.c:148 msgid "" "Directories:\n" " -nd --no-directories don't create directories.\n" @@ -721,7 +724,7 @@ msgstr "" " katalognavn.\n" "\n" -#: src/main.c:154 +#: src/main.c:155 msgid "" "HTTP options:\n" " --http-user=USER set http user to USER.\n" @@ -749,7 +752,7 @@ msgstr "" " «Wget/VERSJON».\n" "\n" -#: src/main.c:165 +#: src/main.c:166 msgid "" "FTP options:\n" " --retr-symlinks retrieve FTP symbolic links.\n" @@ -763,7 +766,7 @@ msgstr "" " --passive-ftp bruk passiv overfřringsmodus.\n" "\n" -#: src/main.c:170 +#: src/main.c:171 #, fuzzy msgid "" "Recursive retrieval:\n" @@ -787,17 +790,25 @@ msgstr "" " -nr, --dont-remove-listing ikke slett «.listing»-filer.\n" "\n" -#: src/main.c:179 +#: src/main.c:180 +#, fuzzy msgid "" "Recursive accept/reject:\n" -" -A, --accept=LIST list of accepted extensions.\n" -" -R, --reject=LIST list of rejected extensions.\n" -" -D, --domains=LIST list of accepted domains.\n" +" -A, --accept=LIST comma-separated list of accepted " +"extensions.\n" +" -R, --reject=LIST comma-separated list of rejected " +"extensions.\n" +" -D, --domains=LIST comma-separated list of accepted " +"domains.\n" " --exclude-domains=LIST comma-separated list of rejected " "domains.\n" -" -L, --relative follow relative links only.\n" " --follow-ftp follow FTP links from HTML documents.\n" +" --follow-tags=LIST comma-separated list of followed HTML " +"tags.\n" +" -G, --ignore-tags=LIST comma-separated list of ignored HTML " +"tags.\n" " -H, --span-hosts go to foreign hosts when recursive.\n" +" -L, --relative follow relative links only.\n" " -I, --include-directories=LIST list of allowed directories.\n" " -X, --exclude-directories=LIST list of excluded directories.\n" " -nh, --no-host-lookup don't DNS-lookup hosts.\n" @@ -819,16 +830,16 @@ msgstr "" "katalog.\n" "\n" -#: src/main.c:192 +#: src/main.c:195 msgid "Mail bug reports and suggestions to .\n" msgstr "Rapportér feil og send forslag til .\n" -#: src/main.c:349 +#: src/main.c:359 #, c-format msgid "%s: debug support not compiled in.\n" msgstr "%s: střtte for avlusing ikke inkludert ved kompilering.\n" -#: src/main.c:400 +#: src/main.c:410 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" @@ -842,7 +853,7 @@ msgstr "" "EGNETHET TIL NOEN SPESIELL OPPGAVE.\n" "Se «GNU General Public License» for detaljer.\n" -#: src/main.c:406 +#: src/main.c:416 msgid "" "\n" "Written by Hrvoje Niksic .\n" @@ -850,44 +861,44 @@ msgstr "" "\n" "Skrevet av Hrvoje Niksic .\n" -#: src/main.c:470 +#: src/main.c:490 #, c-format msgid "%s: %s: invalid command\n" msgstr "%s: %s: ugyldig kommando\n" -#: src/main.c:520 +#: src/main.c:543 #, 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:523 src/main.c:565 src/main.c:596 +#: src/main.c:546 src/main.c:588 src/main.c:631 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Prřv «%s --help» for flere flagg.\n" -#: src/main.c:576 +#: src/main.c:611 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:582 +#: src/main.c:617 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:591 +#: src/main.c:626 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL mangler.\n" -#: src/main.c:679 +#: src/main.c:714 #, c-format msgid "No URLs found in %s.\n" msgstr "Fant ingen URLer i %s.\n" -#: src/main.c:688 +#: src/main.c:723 #, c-format msgid "" "\n" @@ -898,14 +909,14 @@ msgstr "" "FERDIG --%s--\n" "Lastet ned %s bytes i %d filer\n" -#: src/main.c:693 +#: src/main.c:728 #, 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:720 +#: src/main.c:755 msgid "%s received, redirecting output to `%%s'.\n" msgstr "%s mottatt, omdirigerer utskrifter til «%%s».\n" @@ -943,37 +954,37 @@ msgstr "Starter WinHelp %s\n" msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Fant ingen brukbar socket-driver.\n" -#: src/netrc.c:334 +#: src/netrc.c:359 #, c-format msgid "%s: %s:%d: warning: \"%s\" token appears before any machine name\n" msgstr "%s: %s:%d: Advarsel: symbolet «%s» funnet fřr tjener-navn\n" -#: src/netrc.c:365 +#: src/netrc.c:390 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: ukjent symbol «%s»\n" -#: src/netrc.c:429 +#: src/netrc.c:454 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Bruk: %s NETRC [TJENERNAVN]\n" -#: src/netrc.c:439 +#: src/netrc.c:464 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: «stat» feilet for %s: %s\n" -#: src/recur.c:449 src/retr.c:463 +#: src/recur.c:451 src/retr.c:464 #, c-format msgid "Removing %s.\n" msgstr "Fjerner %s.\n" -#: src/recur.c:450 +#: src/recur.c:452 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Fjerner %s fordi den skal forkastes.\n" -#: src/recur.c:609 +#: src/recur.c:611 msgid "Loading robots.txt; please ignore errors.\n" msgstr "Henter robots.txt; ignorer eventuelle feilmeldinger.\n" @@ -986,21 +997,21 @@ msgstr "" "\n" " [ hopper over %dK ]" -#: src/retr.c:344 +#: src/retr.c:345 msgid "Could not find proxy host.\n" msgstr "Fant ikke proxy-tjener.\n" -#: src/retr.c:355 +#: src/retr.c:356 #, c-format msgid "Proxy %s: Must be HTTP.\n" msgstr "Proxy %s: Mĺ střtte HTTP.\n" -#: src/retr.c:398 +#: src/retr.c:399 #, c-format msgid "%s: Redirection to itself.\n" msgstr "%s: Omdirigerer til seg selv.\n" -#: src/retr.c:484 +#: src/retr.c:485 msgid "" "Giving up.\n" "\n" @@ -1008,7 +1019,7 @@ msgstr "" "Gir opp.\n" "\n" -#: src/retr.c:484 +#: src/retr.c:485 msgid "" "Retrying.\n" "\n" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo index b6bfe117..82f130e0 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 e4cd5a06..1a398154 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-03-02 01:13-0800\n" +"POT-Creation-Date: 2000-03-10 19:51-0800\n" "PO-Revision-Date: 1998-04-06 22:09-0300\n" "Last-Translator: Wanderlei Antonio Cavasin \n" "Language-Team: Portuguese \n" @@ -16,19 +16,19 @@ msgstr "" # , c-format #. Login to the server: #. First: Establish the control connection. -#: src/ftp.c:147 src/http.c:346 +#: src/ftp.c:147 src/http.c:348 #, c-format msgid "Connecting to %s:%hu... " msgstr "Conectando-se a %s:%hu... " # , c-format -#: src/ftp.c:169 src/ftp.c:411 src/http.c:363 +#: src/ftp.c:169 src/ftp.c:411 src/http.c:365 #, c-format msgid "Connection to %s:%hu refused.\n" msgstr "Conexăo para %s:%hu recusada.\n" #. Second: Login with proper USER/PASS sequence. -#: src/ftp.c:190 src/http.c:374 +#: src/ftp.c:190 src/http.c:376 msgid "connected!\n" msgstr "conectado!\n" @@ -196,13 +196,13 @@ msgid "File `%s' already there, not retrieving.\n" msgstr "Arquivo `%s' já existente, năo será baixado.\n" # , c-format -#: src/ftp.c:896 src/http.c:959 +#: src/ftp.c:907 src/http.c:983 #, c-format msgid "(try:%2d)" msgstr "(tentativa:%2d)" # , c-format -#: src/ftp.c:960 src/http.c:1166 +#: src/ftp.c:971 src/http.c:1190 #, c-format msgid "" "%s (%s) - `%s' saved [%ld]\n" @@ -212,24 +212,24 @@ msgstr "" "\n" # , c-format -#: src/ftp.c:1006 +#: src/ftp.c:1017 #, 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:1018 +#: src/ftp.c:1029 #, c-format msgid "Removed `%s'.\n" msgstr "Removido `%s'.\n" # , c-format -#: src/ftp.c:1054 +#: src/ftp.c:1065 #, 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:1106 src/http.c:1103 +#: src/ftp.c:1117 src/http.c:1127 #, c-format msgid "" "Server file no newer than local file `%s' -- not retrieving.\n" @@ -237,17 +237,17 @@ msgid "" msgstr "" # , c-format -#: src/ftp.c:1112 src/http.c:1109 +#: src/ftp.c:1123 src/http.c:1133 #, 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:1129 +#: src/ftp.c:1140 msgid "Invalid name of the symlink, skipping.\n" msgstr "Nome inválido do link simbólico, ignorando.\n" # , c-format -#: src/ftp.c:1146 +#: src/ftp.c:1157 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -257,50 +257,50 @@ msgstr "" "\n" # , c-format -#: src/ftp.c:1154 +#: src/ftp.c:1165 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Criando link simbólico %s -> %s\n" # , c-format -#: src/ftp.c:1165 +#: src/ftp.c:1176 #, 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:1177 +#: src/ftp.c:1188 #, c-format msgid "Skipping directory `%s'.\n" msgstr "Ignorando diretório `%s'.\n" # , c-format -#: src/ftp.c:1186 +#: src/ftp.c:1197 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: tipo de arquivo desconhecido/năo suportado.\n" # , c-format -#: src/ftp.c:1203 +#: src/ftp.c:1214 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: horário (timestamp) inválido.\n" # , c-format -#: src/ftp.c:1223 +#: src/ftp.c:1234 #, 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:1262 +#: src/ftp.c:1273 #, 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:1307 +#: src/ftp.c:1318 #, c-format msgid "Rejecting `%s'.\n" msgstr "Rejeitando `%s'.\n" @@ -309,19 +309,19 @@ msgstr "Rejeitando `%s'.\n" #. No luck. #. #### This message SUCKS. We should see what was the #. reason that nothing was retrieved. -#: src/ftp.c:1354 +#: src/ftp.c:1365 #, c-format msgid "No matches on pattern `%s'.\n" msgstr "Nada encontrado com o padrăo `%s'.\n" # , c-format -#: src/ftp.c:1414 +#: src/ftp.c:1425 #, 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:1419 +#: src/ftp.c:1430 #, c-format msgid "Wrote HTML-ized index to `%s'.\n" msgstr "Escrito índice em formato HTML para `%s'.\n" @@ -422,145 +422,145 @@ msgid "Unknown error" msgstr "Erro desconhecido" # , c-format -#: src/html.c:439 src/html.c:441 +#: src/html.c:473 src/html.c:475 #, c-format msgid "Index of /%s on %s:%d" msgstr "Índice de /%s em %s:%d" -#: src/html.c:463 +#: src/html.c:497 msgid "time unknown " msgstr "horário desconhecido " -#: src/html.c:467 +#: src/html.c:501 msgid "File " msgstr "Arquivo " -#: src/html.c:470 +#: src/html.c:504 msgid "Directory " msgstr "Diretório " -#: src/html.c:473 +#: src/html.c:507 msgid "Link " msgstr "Link " -#: src/html.c:476 +#: src/html.c:510 msgid "Not sure " msgstr "Sem certeza " # , c-format -#: src/html.c:494 +#: src/html.c:528 #, c-format msgid " (%s bytes)" msgstr " (%s bytes)" -#: src/http.c:492 +#: src/http.c:505 msgid "Failed writing HTTP request.\n" msgstr "Falha na requisiçăo HTTP.\n" # , c-format -#: src/http.c:497 +#: src/http.c:510 #, fuzzy, c-format msgid "%s request sent, awaiting response... " msgstr "%s requisiçăo enviada, buscando headers... " -#: src/http.c:536 +#: src/http.c:549 msgid "End of file while parsing headers.\n" msgstr "Fim de arquivo durante a leitura dos headers.\n" # , c-format -#: src/http.c:547 +#: src/http.c:560 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Erro de leitura (%s) nos headers.\n" -#: src/http.c:587 +#: src/http.c:600 msgid "No data received" msgstr "" -#: src/http.c:589 +#: src/http.c:602 msgid "Malformed status line" msgstr "" -#: src/http.c:594 +#: src/http.c:607 msgid "(no description)" msgstr "(sem descriçăo)" #. If we have tried it already, then there is not point #. retrying it. -#: src/http.c:678 +#: src/http.c:691 msgid "Authorization failed.\n" msgstr "" -#: src/http.c:685 +#: src/http.c:698 msgid "Unknown authentication scheme.\n" msgstr "" # , c-format -#: src/http.c:748 +#: src/http.c:761 #, c-format msgid "Location: %s%s\n" msgstr "Localizaçăo: %s%s\n" -#: src/http.c:749 src/http.c:774 +#: src/http.c:762 src/http.c:787 msgid "unspecified" msgstr "nao especificado" -#: src/http.c:750 +#: src/http.c:763 msgid " [following]" msgstr " [seguinte]" #. No need to print this output if the body won't be #. downloaded at all, or if the original server response is #. printed. -#: src/http.c:764 +#: src/http.c:777 msgid "Length: " msgstr "Tamanho: " # , c-format -#: src/http.c:769 +#: src/http.c:782 #, c-format msgid " (%s to go)" msgstr " (%s para o fim)" -#: src/http.c:774 +#: src/http.c:787 msgid "ignored" msgstr "ignorado" -#: src/http.c:858 +#: src/http.c:871 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Aviso: wildcards năo suportados para HTTP.\n" # , c-format #. If opt.noclobber is turned on and file already exists, do not #. retrieve the file -#: src/http.c:873 +#: src/http.c:886 #, c-format msgid "File `%s' already there, will not retrieve.\n" msgstr "Arquivo `%s' já presente, năo será baixado.\n" # , c-format -#: src/http.c:1015 +#: src/http.c:1039 #, c-format msgid "Cannot write to `%s' (%s).\n" msgstr "Năo foi possível escrever em `%s' (%s).\n" # , c-format -#: src/http.c:1025 +#: src/http.c:1049 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERRO: Redireçăo (%d) sem Location.\n" # , c-format -#: src/http.c:1048 +#: src/http.c:1072 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERRO %d: %s.\n" -#: src/http.c:1060 +#: src/http.c:1084 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Header Last-modified năo recebido -- time-stamps desligados.\n" -#: src/http.c:1068 +#: src/http.c:1092 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Header Last-modified inválido -- time-stamp ignorado.\n" @@ -571,19 +571,19 @@ msgstr "Header Last-modified inv #. coding style no-no by many measures, for reasons such as #. this) we'd have to remember to free() the string at each #. one to avoid a memory leak. -#: src/http.c:1099 +#: src/http.c:1123 #, c-format msgid "" "Server file no newer than local file `%s.orig' -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:1113 +#: src/http.c:1137 msgid "Remote file is newer, retrieving.\n" msgstr "Arquivo remoto é mais novo, buscando.\n" # , c-format -#: src/http.c:1147 +#: src/http.c:1171 #, c-format msgid "" "%s (%s) - `%s' saved [%ld/%ld]\n" @@ -593,13 +593,13 @@ msgstr "" "\n" # , c-format -#: src/http.c:1181 +#: src/http.c:1205 #, c-format msgid "%s (%s) - Connection closed at byte %ld. " msgstr "%s (%s) - Conexăo fechada no byte %ld. " # , c-format -#: src/http.c:1189 +#: src/http.c:1213 #, c-format msgid "" "%s (%s) - `%s' saved [%ld/%ld])\n" @@ -609,62 +609,62 @@ msgstr "" "\n" # , c-format -#: src/http.c:1202 +#: src/http.c:1226 #, c-format msgid "%s (%s) - Connection closed at byte %ld/%ld. " msgstr "%s (%s) - Conexăo fechada no byte %ld/%ld. " # , c-format -#: src/http.c:1213 +#: src/http.c:1237 #, c-format msgid "%s (%s) - Read error at byte %ld (%s)." msgstr "%s (%s) - Erro de leitura no byte %ld (%s)." # , c-format -#: src/http.c:1221 +#: src/http.c:1245 #, c-format 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:313 src/netrc.c:250 +#: src/init.c:317 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:334 src/init.c:340 +#: src/init.c:338 src/init.c:344 #, 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:371 +#: src/init.c:375 #, 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:459 +#: src/init.c:463 #, 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:486 +#: src/init.c:490 #, 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:504 src/init.c:761 src/init.c:783 src/init.c:856 +#: src/init.c:508 src/init.c:765 src/init.c:787 src/init.c:860 #, c-format msgid "%s: %s: Invalid specification `%s'.\n" msgstr "%s: %s: Especificaçăo inválida `%s'\n" # , c-format -#: src/init.c:617 src/init.c:639 src/init.c:661 src/init.c:687 +#: src/init.c:621 src/init.c:643 src/init.c:665 src/init.c:691 #, c-format msgid "%s: Invalid specification `%s'\n" msgstr "%s: Especificaçăo inválida `%s'\n" @@ -737,6 +737,7 @@ msgstr "" # , fuzzy #: src/main.c:133 +#, fuzzy msgid "" "Download:\n" " -t, --tries=NUMBER set number of retries to NUMBER (0 " @@ -750,6 +751,8 @@ msgid "" " --spider don't download anything.\n" " -T, --timeout=SECONDS set the read timeout to SECONDS.\n" " -w, --wait=SECONDS wait SECONDS between retrievals.\n" +" --waitretry=SECONDS\twait 0..max SECONDS between retries of a " +"retrieval.\n" " -Y, --proxy=on/off turn proxy on or off.\n" " -Q, --quota=NUMBER set retrieval quota to NUMBER.\n" "\n" @@ -771,7 +774,7 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:147 +#: src/main.c:148 msgid "" "Directories:\n" " -nd --no-directories don't create directories.\n" @@ -790,7 +793,7 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:154 +#: src/main.c:155 msgid "" "HTTP options:\n" " --http-user=USER set http user to USER.\n" @@ -818,7 +821,7 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:165 +#: src/main.c:166 msgid "" "FTP options:\n" " --retr-symlinks retrieve FTP symbolic links.\n" @@ -834,7 +837,7 @@ msgstr "" " --passive-ftp usa modo de transferęncia \"passivo\".\n" "\n" -#: src/main.c:170 +#: src/main.c:171 #, fuzzy msgid "" "Recursive retrieval:\n" @@ -857,17 +860,25 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:179 +#: src/main.c:180 +#, fuzzy msgid "" "Recursive accept/reject:\n" -" -A, --accept=LIST list of accepted extensions.\n" -" -R, --reject=LIST list of rejected extensions.\n" -" -D, --domains=LIST list of accepted domains.\n" +" -A, --accept=LIST comma-separated list of accepted " +"extensions.\n" +" -R, --reject=LIST comma-separated list of rejected " +"extensions.\n" +" -D, --domains=LIST comma-separated list of accepted " +"domains.\n" " --exclude-domains=LIST comma-separated list of rejected " "domains.\n" -" -L, --relative follow relative links only.\n" " --follow-ftp follow FTP links from HTML documents.\n" +" --follow-tags=LIST comma-separated list of followed HTML " +"tags.\n" +" -G, --ignore-tags=LIST comma-separated list of ignored HTML " +"tags.\n" " -H, --span-hosts go to foreign hosts when recursive.\n" +" -L, --relative follow relative links only.\n" " -I, --include-directories=LIST list of allowed directories.\n" " -X, --exclude-directories=LIST list of excluded directories.\n" " -nh, --no-host-lookup don't DNS-lookup hosts.\n" @@ -889,17 +900,17 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:192 +#: src/main.c:195 msgid "Mail bug reports and suggestions to .\n" msgstr "Relatos de bugs e sugestőes para .\n" # , fuzzy -#: src/main.c:349 +#: src/main.c:359 #, c-format msgid "%s: debug support not compiled in.\n" msgstr "%s: compilado sem debug.\n" -#: src/main.c:400 +#: src/main.c:410 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" @@ -913,7 +924,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:406 +#: src/main.c:416 msgid "" "\n" "Written by Hrvoje Niksic .\n" @@ -922,13 +933,13 @@ msgstr "" "Escrito por Hrvoje Niksic .\n" # , c-format -#: src/main.c:470 +#: src/main.c:490 #, c-format msgid "%s: %s: invalid command\n" msgstr "%s: %s: comando inválido\n" # , c-format -#: src/main.c:520 +#: src/main.c:543 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: opçăo ilegal -- `-n%c'\n" @@ -936,35 +947,35 @@ msgstr "%s: op # , c-format #. #### Something nicer should be printed here -- similar to the #. pre-1.5 `--help' page. -#: src/main.c:523 src/main.c:565 src/main.c:596 +#: src/main.c:546 src/main.c:588 src/main.c:631 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Tente `%s --help' para mais opçőes.\n" -#: src/main.c:576 +#: src/main.c:611 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:582 +#: src/main.c:617 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:591 +#: src/main.c:626 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL faltando\n" # , c-format -#: src/main.c:679 +#: src/main.c:714 #, c-format msgid "No URLs found in %s.\n" msgstr "Nenhuma URL encontrada em %s.\n" # , c-format -#: src/main.c:688 +#: src/main.c:723 #, c-format msgid "" "\n" @@ -976,14 +987,14 @@ msgstr "" "Baixados: %s bytes em %d arquivos\n" # , c-format -#: src/main.c:693 +#: src/main.c:728 #, 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:720 +#: src/main.c:755 msgid "%s received, redirecting output to `%%s'.\n" msgstr "%s recebido, redirecionando saída para `%%s'.\n" @@ -1024,43 +1035,43 @@ msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Năo foi possivel encontrar um driver de sockets usável.\n" # , c-format -#: src/netrc.c:334 +#: src/netrc.c:359 #, c-format msgid "%s: %s:%d: warning: \"%s\" token appears before any machine name\n" msgstr "" "%s: %s:%d: aviso: token \"%s\" aparece antes de qualquer nome de máquina\n" # , c-format -#: src/netrc.c:365 +#: src/netrc.c:390 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: token desconhecido \"%s\"\n" # , c-format -#: src/netrc.c:429 +#: src/netrc.c:454 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Uso: %s NETRC [NOME DO HOST]\n" # , c-format -#: src/netrc.c:439 +#: src/netrc.c:464 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: năo foi possível acessar %s: %s\n" # , c-format -#: src/recur.c:449 src/retr.c:463 +#: src/recur.c:451 src/retr.c:464 #, c-format msgid "Removing %s.\n" msgstr "Removendo %s.\n" # , c-format -#: src/recur.c:450 +#: src/recur.c:452 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Removendo %s pois ele deve ser rejeitado.\n" -#: src/recur.c:609 +#: src/recur.c:611 msgid "Loading robots.txt; please ignore errors.\n" msgstr "Buscando robots.txt; por favor ignore qualquer erro.\n" @@ -1074,23 +1085,23 @@ msgstr "" "\n" " [ ignorando %dK ]" -#: src/retr.c:344 +#: src/retr.c:345 msgid "Could not find proxy host.\n" msgstr "Năo foi possível encontrar o proxy.\n" # , c-format -#: src/retr.c:355 +#: src/retr.c:356 #, c-format msgid "Proxy %s: Must be HTTP.\n" msgstr "Proxy %s: Deve ser HTTP.\n" # , c-format -#: src/retr.c:398 +#: src/retr.c:399 #, c-format msgid "%s: Redirection to itself.\n" msgstr "%s: Redireçăo para si mesmo.\n" -#: src/retr.c:484 +#: src/retr.c:485 msgid "" "Giving up.\n" "\n" @@ -1098,7 +1109,7 @@ msgstr "" "Desistindo.\n" "\n" -#: src/retr.c:484 +#: src/retr.c:485 msgid "" "Retrying.\n" "\n" diff --git a/po/wget.pot b/po/wget.pot index 5b430689..bf00ca6b 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-03-02 01:13-0800\n" +"POT-Creation-Date: 2000-03-10 19:51-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,18 +16,18 @@ msgstr "" #. Login to the server: #. First: Establish the control connection. -#: src/ftp.c:147 src/http.c:346 +#: src/ftp.c:147 src/http.c:348 #, c-format msgid "Connecting to %s:%hu... " msgstr "" -#: src/ftp.c:169 src/ftp.c:411 src/http.c:363 +#: src/ftp.c:169 src/ftp.c:411 src/http.c:365 #, c-format msgid "Connection to %s:%hu refused.\n" msgstr "" #. Second: Login with proper USER/PASS sequence. -#: src/ftp.c:190 src/http.c:374 +#: src/ftp.c:190 src/http.c:376 msgid "connected!\n" msgstr "" @@ -174,92 +174,92 @@ msgstr "" msgid "File `%s' already there, not retrieving.\n" msgstr "" -#: src/ftp.c:896 src/http.c:959 +#: src/ftp.c:907 src/http.c:983 #, c-format msgid "(try:%2d)" msgstr "" -#: src/ftp.c:960 src/http.c:1166 +#: src/ftp.c:971 src/http.c:1190 #, c-format msgid "" "%s (%s) - `%s' saved [%ld]\n" "\n" msgstr "" -#: src/ftp.c:1006 +#: src/ftp.c:1017 #, c-format msgid "Using `%s' as listing tmp file.\n" msgstr "" -#: src/ftp.c:1018 +#: src/ftp.c:1029 #, c-format msgid "Removed `%s'.\n" msgstr "" -#: src/ftp.c:1054 +#: src/ftp.c:1065 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "" -#: src/ftp.c:1106 src/http.c:1103 +#: src/ftp.c:1117 src/http.c:1127 #, c-format msgid "" "Server file no newer than local file `%s' -- not retrieving.\n" "\n" msgstr "" -#: src/ftp.c:1112 src/http.c:1109 +#: src/ftp.c:1123 src/http.c:1133 #, c-format msgid "The sizes do not match (local %ld) -- retrieving.\n" msgstr "" -#: src/ftp.c:1129 +#: src/ftp.c:1140 msgid "Invalid name of the symlink, skipping.\n" msgstr "" -#: src/ftp.c:1146 +#: src/ftp.c:1157 #, c-format msgid "" "Already have correct symlink %s -> %s\n" "\n" msgstr "" -#: src/ftp.c:1154 +#: src/ftp.c:1165 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "" -#: src/ftp.c:1165 +#: src/ftp.c:1176 #, c-format msgid "Symlinks not supported, skipping symlink `%s'.\n" msgstr "" -#: src/ftp.c:1177 +#: src/ftp.c:1188 #, c-format msgid "Skipping directory `%s'.\n" msgstr "" -#: src/ftp.c:1186 +#: src/ftp.c:1197 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "" -#: src/ftp.c:1203 +#: src/ftp.c:1214 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "" -#: src/ftp.c:1223 +#: src/ftp.c:1234 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "" -#: src/ftp.c:1262 +#: src/ftp.c:1273 #, c-format msgid "Not descending to `%s' as it is excluded/not-included.\n" msgstr "" -#: src/ftp.c:1307 +#: src/ftp.c:1318 #, c-format msgid "Rejecting `%s'.\n" msgstr "" @@ -267,17 +267,17 @@ msgstr "" #. No luck. #. #### This message SUCKS. We should see what was the #. reason that nothing was retrieved. -#: src/ftp.c:1354 +#: src/ftp.c:1365 #, c-format msgid "No matches on pattern `%s'.\n" msgstr "" -#: src/ftp.c:1414 +#: src/ftp.c:1425 #, c-format msgid "Wrote HTML-ized index to `%s' [%ld].\n" msgstr "" -#: src/ftp.c:1419 +#: src/ftp.c:1430 #, c-format msgid "Wrote HTML-ized index to `%s'.\n" msgstr "" @@ -368,136 +368,136 @@ msgstr "" msgid "Unknown error" msgstr "" -#: src/html.c:439 src/html.c:441 +#: src/html.c:473 src/html.c:475 #, c-format msgid "Index of /%s on %s:%d" msgstr "" -#: src/html.c:463 +#: src/html.c:497 msgid "time unknown " msgstr "" -#: src/html.c:467 +#: src/html.c:501 msgid "File " msgstr "" -#: src/html.c:470 +#: src/html.c:504 msgid "Directory " msgstr "" -#: src/html.c:473 +#: src/html.c:507 msgid "Link " msgstr "" -#: src/html.c:476 +#: src/html.c:510 msgid "Not sure " msgstr "" -#: src/html.c:494 +#: src/html.c:528 #, c-format msgid " (%s bytes)" msgstr "" -#: src/http.c:492 +#: src/http.c:505 msgid "Failed writing HTTP request.\n" msgstr "" -#: src/http.c:497 +#: src/http.c:510 #, c-format msgid "%s request sent, awaiting response... " msgstr "" -#: src/http.c:536 +#: src/http.c:549 msgid "End of file while parsing headers.\n" msgstr "" -#: src/http.c:547 +#: src/http.c:560 #, c-format msgid "Read error (%s) in headers.\n" msgstr "" -#: src/http.c:587 +#: src/http.c:600 msgid "No data received" msgstr "" -#: src/http.c:589 +#: src/http.c:602 msgid "Malformed status line" msgstr "" -#: src/http.c:594 +#: src/http.c:607 msgid "(no description)" msgstr "" #. If we have tried it already, then there is not point #. retrying it. -#: src/http.c:678 +#: src/http.c:691 msgid "Authorization failed.\n" msgstr "" -#: src/http.c:685 +#: src/http.c:698 msgid "Unknown authentication scheme.\n" msgstr "" -#: src/http.c:748 +#: src/http.c:761 #, c-format msgid "Location: %s%s\n" msgstr "" -#: src/http.c:749 src/http.c:774 +#: src/http.c:762 src/http.c:787 msgid "unspecified" msgstr "" -#: src/http.c:750 +#: src/http.c:763 msgid " [following]" msgstr "" #. No need to print this output if the body won't be #. downloaded at all, or if the original server response is #. printed. -#: src/http.c:764 +#: src/http.c:777 msgid "Length: " msgstr "" -#: src/http.c:769 +#: src/http.c:782 #, c-format msgid " (%s to go)" msgstr "" -#: src/http.c:774 +#: src/http.c:787 msgid "ignored" msgstr "" -#: src/http.c:858 +#: src/http.c:871 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "" #. If opt.noclobber is turned on and file already exists, do not #. retrieve the file -#: src/http.c:873 +#: src/http.c:886 #, c-format msgid "File `%s' already there, will not retrieve.\n" msgstr "" -#: src/http.c:1015 +#: src/http.c:1039 #, c-format msgid "Cannot write to `%s' (%s).\n" msgstr "" -#: src/http.c:1025 +#: src/http.c:1049 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "" -#: src/http.c:1048 +#: src/http.c:1072 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "" -#: src/http.c:1060 +#: src/http.c:1084 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" -#: src/http.c:1068 +#: src/http.c:1092 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" @@ -508,82 +508,82 @@ msgstr "" #. coding style no-no by many measures, for reasons such as #. this) we'd have to remember to free() the string at each #. one to avoid a memory leak. -#: src/http.c:1099 +#: src/http.c:1123 #, c-format msgid "" "Server file no newer than local file `%s.orig' -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:1113 +#: src/http.c:1137 msgid "Remote file is newer, retrieving.\n" msgstr "" -#: src/http.c:1147 +#: src/http.c:1171 #, c-format msgid "" "%s (%s) - `%s' saved [%ld/%ld]\n" "\n" msgstr "" -#: src/http.c:1181 +#: src/http.c:1205 #, c-format msgid "%s (%s) - Connection closed at byte %ld. " msgstr "" -#: src/http.c:1189 +#: src/http.c:1213 #, c-format msgid "" "%s (%s) - `%s' saved [%ld/%ld])\n" "\n" msgstr "" -#: src/http.c:1202 +#: src/http.c:1226 #, c-format msgid "%s (%s) - Connection closed at byte %ld/%ld. " msgstr "" -#: src/http.c:1213 +#: src/http.c:1237 #, c-format msgid "%s (%s) - Read error at byte %ld (%s)." msgstr "" -#: src/http.c:1221 +#: src/http.c:1245 #, c-format msgid "%s (%s) - Read error at byte %ld/%ld (%s). " msgstr "" -#: src/init.c:313 src/netrc.c:250 +#: src/init.c:317 src/netrc.c:260 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "" -#: src/init.c:334 src/init.c:340 +#: src/init.c:338 src/init.c:344 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "" -#: src/init.c:371 +#: src/init.c:375 #, c-format msgid "%s: Warning: Both system and user wgetrc point to `%s'.\n" msgstr "" -#: src/init.c:459 +#: src/init.c:463 #, c-format msgid "%s: BUG: unknown command `%s', value `%s'.\n" msgstr "" -#: src/init.c:486 +#: src/init.c:490 #, c-format msgid "%s: %s: Please specify on or off.\n" msgstr "" -#: src/init.c:504 src/init.c:761 src/init.c:783 src/init.c:856 +#: src/init.c:508 src/init.c:765 src/init.c:787 src/init.c:860 #, c-format msgid "%s: %s: Invalid specification `%s'.\n" msgstr "" -#: src/init.c:617 src/init.c:639 src/init.c:661 src/init.c:687 +#: src/init.c:621 src/init.c:643 src/init.c:665 src/init.c:691 #, c-format msgid "%s: Invalid specification `%s'\n" msgstr "" @@ -645,12 +645,14 @@ msgid "" " --spider don't download anything.\n" " -T, --timeout=SECONDS set the read timeout to SECONDS.\n" " -w, --wait=SECONDS wait SECONDS between retrievals.\n" +" --waitretry=SECONDS\twait 0..max SECONDS between retries of a " +"retrieval.\n" " -Y, --proxy=on/off turn proxy on or off.\n" " -Q, --quota=NUMBER set retrieval quota to NUMBER.\n" "\n" msgstr "" -#: src/main.c:147 +#: src/main.c:148 msgid "" "Directories:\n" " -nd --no-directories don't create directories.\n" @@ -662,7 +664,7 @@ msgid "" "\n" msgstr "" -#: src/main.c:154 +#: src/main.c:155 msgid "" "HTTP options:\n" " --http-user=USER set http user to USER.\n" @@ -678,7 +680,7 @@ msgid "" "\n" msgstr "" -#: src/main.c:165 +#: src/main.c:166 msgid "" "FTP options:\n" " --retr-symlinks retrieve FTP symbolic links.\n" @@ -687,7 +689,7 @@ msgid "" "\n" msgstr "" -#: src/main.c:170 +#: src/main.c:171 msgid "" "Recursive retrieval:\n" " -r, --recursive recursive web-suck -- use with care!.\n" @@ -700,17 +702,24 @@ msgid "" "\n" msgstr "" -#: src/main.c:179 +#: src/main.c:180 msgid "" "Recursive accept/reject:\n" -" -A, --accept=LIST list of accepted extensions.\n" -" -R, --reject=LIST list of rejected extensions.\n" -" -D, --domains=LIST list of accepted domains.\n" +" -A, --accept=LIST comma-separated list of accepted " +"extensions.\n" +" -R, --reject=LIST comma-separated list of rejected " +"extensions.\n" +" -D, --domains=LIST comma-separated list of accepted " +"domains.\n" " --exclude-domains=LIST comma-separated list of rejected " "domains.\n" -" -L, --relative follow relative links only.\n" " --follow-ftp follow FTP links from HTML documents.\n" +" --follow-tags=LIST comma-separated list of followed HTML " +"tags.\n" +" -G, --ignore-tags=LIST comma-separated list of ignored HTML " +"tags.\n" " -H, --span-hosts go to foreign hosts when recursive.\n" +" -L, --relative follow relative links only.\n" " -I, --include-directories=LIST list of allowed directories.\n" " -X, --exclude-directories=LIST list of excluded directories.\n" " -nh, --no-host-lookup don't DNS-lookup hosts.\n" @@ -718,16 +727,16 @@ msgid "" "\n" msgstr "" -#: src/main.c:192 +#: src/main.c:195 msgid "Mail bug reports and suggestions to .\n" msgstr "" -#: src/main.c:349 +#: src/main.c:359 #, c-format msgid "%s: debug support not compiled in.\n" msgstr "" -#: src/main.c:400 +#: src/main.c:410 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" @@ -736,49 +745,49 @@ msgid "" "GNU General Public License for more details.\n" msgstr "" -#: src/main.c:406 +#: src/main.c:416 msgid "" "\n" "Written by Hrvoje Niksic .\n" msgstr "" -#: src/main.c:470 +#: src/main.c:490 #, c-format msgid "%s: %s: invalid command\n" msgstr "" -#: src/main.c:520 +#: src/main.c:543 #, 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:523 src/main.c:565 src/main.c:596 +#: src/main.c:546 src/main.c:588 src/main.c:631 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "" -#: src/main.c:576 +#: src/main.c:611 msgid "Can't be verbose and quiet at the same time.\n" msgstr "" -#: src/main.c:582 +#: src/main.c:617 msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" #. No URL specified. -#: src/main.c:591 +#: src/main.c:626 #, c-format msgid "%s: missing URL\n" msgstr "" -#: src/main.c:679 +#: src/main.c:714 #, c-format msgid "No URLs found in %s.\n" msgstr "" -#: src/main.c:688 +#: src/main.c:723 #, c-format msgid "" "\n" @@ -786,14 +795,14 @@ msgid "" "Downloaded: %s bytes in %d files\n" msgstr "" -#: src/main.c:693 +#: src/main.c:728 #, 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:720 +#: src/main.c:755 msgid "%s received, redirecting output to `%%s'.\n" msgstr "" @@ -826,37 +835,37 @@ msgstr "" msgid "%s: Couldn't find usable socket driver.\n" msgstr "" -#: src/netrc.c:334 +#: src/netrc.c:359 #, c-format msgid "%s: %s:%d: warning: \"%s\" token appears before any machine name\n" msgstr "" -#: src/netrc.c:365 +#: src/netrc.c:390 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "" -#: src/netrc.c:429 +#: src/netrc.c:454 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "" -#: src/netrc.c:439 +#: src/netrc.c:464 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "" -#: src/recur.c:449 src/retr.c:463 +#: src/recur.c:451 src/retr.c:464 #, c-format msgid "Removing %s.\n" msgstr "" -#: src/recur.c:450 +#: src/recur.c:452 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "" -#: src/recur.c:609 +#: src/recur.c:611 msgid "Loading robots.txt; please ignore errors.\n" msgstr "" @@ -867,27 +876,27 @@ msgid "" " [ skipping %dK ]" msgstr "" -#: src/retr.c:344 +#: src/retr.c:345 msgid "Could not find proxy host.\n" msgstr "" -#: src/retr.c:355 +#: src/retr.c:356 #, c-format msgid "Proxy %s: Must be HTTP.\n" msgstr "" -#: src/retr.c:398 +#: src/retr.c:399 #, c-format msgid "%s: Redirection to itself.\n" msgstr "" -#: src/retr.c:484 +#: src/retr.c:485 msgid "" "Giving up.\n" "\n" msgstr "" -#: src/retr.c:484 +#: src/retr.c:485 msgid "" "Retrying.\n" "\n" diff --git a/src/ChangeLog b/src/ChangeLog index deda3ca3..25b06058 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,27 @@ +2000-03-10 Dan Harkless + + * html.c (idmatch): Implemented checking of my new --follow-tags + and --ignore-tags options. + + * init.c (commands): Added comment reminding people adding new + entries doing allocation to add corresponding freeing in cleanup(). + (commands): Added new followtags and ignoretags commands. + (cleanup): Free storage for new followtags and ignoretags. + + * main.c: Use of "comma-separated list" was random -- normalized + it. Did some alphabetization. Added comments pointing out + "Options without arguments" and "Options accepting an argument" + sections of long_options[]. Added new options --follow-tags and + -G / --ignore-tags. Added comment that Damir's --referer is + currently undocumented. Added comment that Heiko's --waitretry is + partially undocumented (mentioned in --help but not in + wget.texi). Moved improperly sorted 24, 129, and 'G' cases. + + * options.h (struct options): Added new fields follow_tags and + ignore_tags. + + * wget.h: Added "#define EQ 0" so we can say "strcmp(a, b) == EQ". + 2000-03-02 Dan Harkless * ftp.c (ftp_loop_internal): Heiko introduced "suggest explicit diff --git a/src/html.c b/src/html.c index a27edac1..51a8233e 100644 --- a/src/html.c +++ b/src/html.c @@ -52,17 +52,46 @@ struct tag_attr { static int idmatch (struct tag_attr *tags, const char *tag, const char *attr) { - int i; - - if (!tag || !attr) - return 0; - + int i, j; + + if (tag == NULL || attr == NULL) + return FALSE; + for (i = 0; tags[i].tag; i++) + /* Loop through all the tags wget ever cares about. */ if (!strcasecmp (tags[i].tag, tag) && !strcasecmp (tags[i].attr, attr)) - return 1; - return 0; + /* The tag and attribute matched one of the ones wget cares about. */ + { + if (opt.ignore_tags) + /* --ignore-tags was specified. Do not match these specific tags. + --ignore-tags takes precedence over --follow-tags, so we process + --ignore first and fall through if there's no match. */ + for (j = 0; opt.ignore_tags[j] != NULL; j++) + /* Loop through all the tags this user doesn't care about. */ + if (strcasecmp(opt.ignore_tags[j], tag) == EQ) + return FALSE; + + if (opt.follow_tags) + /* --follow-tags was specified. Only match these specific tags, so + return FALSE if we don't match one of them. */ + { + for (j = 0; opt.follow_tags[j] != NULL; j++) + /* Loop through all the tags this user cares about. */ + if (strcasecmp(opt.follow_tags[j], tag) == EQ) + return TRUE; + + return FALSE; /* wasn't one of the explicitly desired tags */ + } + + /* If we get to here, --follow-tags isn't being used, and --ignore-tags, + if specified, didn't include this tag, so it's okay to follow. */ + return TRUE; + } + + return FALSE; /* not one of the tag/attribute pairs wget ever cares about */ } + /* Parse BUF (a buffer of BUFSIZE characters) searching for HTML tags describing URLs to follow. When a tag is encountered, extract its components (as described by html_allow[] array), and return the diff --git a/src/init.c b/src/init.c index 45ae3545..f97628a2 100644 --- a/src/init.c +++ b/src/init.c @@ -71,10 +71,11 @@ CMD_DECLARE (cmd_spec_outputdocument); CMD_DECLARE (cmd_spec_recursive); CMD_DECLARE (cmd_spec_useragent); -/* List of recognized commands, each consisting of name, closure and - function. When adding a new command, simply add it to the list, - but be sure to keep the list sorted alphabetically, as comind() - depends on it. */ +/* List of recognized commands, each consisting of name, closure and function. + When adding a new command, simply add it to the list, but be sure to keep the + list sorted alphabetically, as comind() depends on it. Also, be sure to add + any entries that allocate memory (e.g. cmd_string and cmd_vector guys) to the + cleanup() function below. */ static struct { char *name; void *closure; @@ -105,6 +106,7 @@ static struct { { "excludedirectories", &opt.excludes, cmd_directory_vector }, { "excludedomains", &opt.exclude_domains, cmd_vector }, { "followftp", &opt.follow_ftp, cmd_boolean }, + { "followtags", &opt.follow_tags, cmd_vector }, { "forcehtml", &opt.force_html, cmd_boolean }, { "ftpproxy", &opt.ftp_proxy, cmd_string }, { "glob", &opt.ftp_glob, cmd_boolean }, @@ -114,6 +116,7 @@ static struct { { "httpproxy", &opt.http_proxy, cmd_string }, { "httpuser", &opt.http_user, cmd_string }, { "ignorelength", &opt.ignore_length, cmd_boolean }, + { "ignoretags", &opt.ignore_tags, cmd_vector }, { "includedirectories", &opt.includes, cmd_directory_vector }, { "input", &opt.input_filename, cmd_string }, { "killlonger", &opt.kill_longer, cmd_boolean }, @@ -124,7 +127,7 @@ static struct { { "noclobber", &opt.noclobber, cmd_boolean }, { "noparent", &opt.no_parent, cmd_boolean }, { "noproxy", &opt.no_proxy, cmd_vector }, - { "numtries", &opt.ntry, cmd_number_inf }, /* deprecated */ + { "numtries", &opt.ntry, cmd_number_inf },/* deprecated*/ { "outputdocument", NULL, cmd_spec_outputdocument }, { "passiveftp", &opt.ftp_pasv, cmd_boolean }, { "passwd", &opt.ftp_pass, cmd_string }, @@ -919,6 +922,8 @@ cleanup (void) free_vec (opt.excludes); free_vec (opt.includes); free_vec (opt.domains); + free_vec (opt.follow_tags); + free_vec (opt.ignore_tags); free (opt.ftp_acc); free (opt.ftp_pass); FREE_MAYBE (opt.ftp_proxy); diff --git a/src/main.c b/src/main.c index c9e76846..cb724787 100644 --- a/src/main.c +++ b/src/main.c @@ -179,13 +179,15 @@ Recursive retrieval:\n\ -nr, --dont-remove-listing don\'t remove `.listing\' files.\n\ \n"), _("\ Recursive accept/reject:\n\ - -A, --accept=LIST list of accepted extensions.\n\ - -R, --reject=LIST list of rejected extensions.\n\ - -D, --domains=LIST list of accepted domains.\n\ + -A, --accept=LIST comma-separated list of accepted extensions.\n\ + -R, --reject=LIST comma-separated list of rejected extensions.\n\ + -D, --domains=LIST comma-separated list of accepted domains.\n\ --exclude-domains=LIST comma-separated list of rejected domains.\n\ - -L, --relative follow relative links only.\n\ --follow-ftp follow FTP links from HTML documents.\n\ + --follow-tags=LIST comma-separated list of followed HTML tags.\n\ + -G, --ignore-tags=LIST comma-separated list of ignored HTML tags.\n\ -H, --span-hosts go to foreign hosts when recursive.\n\ + -L, --relative follow relative links only.\n\ -I, --include-directories=LIST list of allowed directories.\n\ -X, --exclude-directories=LIST list of excluded directories.\n\ -nh, --no-host-lookup don\'t DNS-lookup hosts.\n\ @@ -202,6 +204,7 @@ main (int argc, char *const *argv) static struct option long_options[] = { + /* Options without arguments: */ { "background", no_argument, NULL, 'b' }, { "continue", no_argument, NULL, 'c' }, { "convert-links", no_argument, NULL, 'k' }, @@ -235,6 +238,7 @@ main (int argc, char *const *argv) { "verbose", no_argument, NULL, 'v' }, { "version", no_argument, NULL, 'V' }, + /* Options accepting an argument: */ { "accept", required_argument, NULL, 'A' }, { "append-output", required_argument, NULL, 'a' }, { "backups", required_argument, NULL, 23 }, /* undocumented */ @@ -248,11 +252,13 @@ main (int argc, char *const *argv) { "execute", required_argument, NULL, 'e' }, { "exclude-directories", required_argument, NULL, 'X' }, { "exclude-domains", required_argument, NULL, 12 }, + { "follow-tags", required_argument, NULL, 25 }, { "glob", required_argument, NULL, 'g' }, { "header", required_argument, NULL, 3 }, { "htmlify", required_argument, NULL, 7 }, { "http-passwd", required_argument, NULL, 2 }, { "http-user", required_argument, NULL, 1 }, + { "ignore-tags", required_argument, NULL, 'G' }, { "include-directories", required_argument, NULL, 'I' }, { "input-file", required_argument, NULL, 'i' }, { "level", required_argument, NULL, 'l' }, @@ -267,10 +273,10 @@ main (int argc, char *const *argv) { "timeout", required_argument, NULL, 'T' }, { "tries", required_argument, NULL, 't' }, { "user-agent", required_argument, NULL, 'U' }, - { "referer", required_argument, NULL, 129 }, + { "referer", required_argument, NULL, 129 }, /* undocumented */ { "use-proxy", required_argument, NULL, 'Y' }, { "wait", required_argument, NULL, 'w' }, - { "waitretry", required_argument, NULL, 24 }, + { "waitretry", required_argument, NULL, 24 }, /* partially undocumented */ { 0, 0, 0, 0 } }; @@ -292,7 +298,7 @@ main (int argc, char *const *argv) initialize (); while ((c = getopt_long (argc, argv, "\ -hVqvdkKsxmNWrHSLcFbEY:g:T:U:O:l:n:i:o:a:t:D:A:R:P:B:e:Q:X:I:w:", +hVqvdkKsxmNWrHSLcFbEY:G:g:T:U:O:l:n:i:o:a:t:D:A:R:P:B:e:Q:X:I:w:", long_options, (int *)0)) != EOF) { switch (c) @@ -372,12 +378,12 @@ hVqvdkKsxmNWrHSLcFbEY:g:T:U:O:l:n:i:o:a:t:D:A:R:P:B:e:Q:X:I:w:", #endif exit (0); break; - case 'k': - setval ("convertlinks", "on"); - break; case 'K': setval ("backupconverted", "on"); break; + case 'k': + setval ("convertlinks", "on"); + break; case 'L': setval ("relativeonly", "on"); break; @@ -445,6 +451,16 @@ GNU General Public License for more details.\n")); case 23: setval ("backups", optarg); break; + case 24: + setval ("waitretry", optarg); + wr = 1; + break; + case 25: + setval ("followtags", optarg); + break; + case 129: + setval ("referer", optarg); + break; case 'A': setval ("accept", optarg); break; @@ -479,6 +495,9 @@ GNU General Public License for more details.\n")); free (val); } break; + case 'G': + setval ("ignoretags", optarg); + break; case 'g': setval ("glob", optarg); break; @@ -553,16 +572,9 @@ GNU General Public License for more details.\n")); case 'U': setval ("useragent", optarg); break; - case 129: - setval ("referer", optarg); - break; case 'w': setval ("wait", optarg); break; - case 24: - setval ("waitretry", optarg); - wr = 1; - break; case 'X': setval ("excludedirectories", optarg); break; diff --git a/src/options.h b/src/options.h index 1036c6f2..2f773afa 100644 --- a/src/options.h +++ b/src/options.h @@ -64,6 +64,9 @@ struct options char **domains; /* See host.c */ char **exclude_domains; + char **follow_tags; /* List of HTML tags to recursively follow. */ + char **ignore_tags; /* List of HTML tags to ignore if recursing. */ + int follow_ftp; /* Are FTP URL-s followed in recursive retrieving? */ int retr_symlinks; /* Whether we retrieve symlinks in diff --git a/src/wget.h b/src/wget.h index 4467f5fb..ab37507e 100644 --- a/src/wget.h +++ b/src/wget.h @@ -206,4 +206,8 @@ typedef unsigned char boolean; #define TRUE 1 #endif +/* So we can say strcmp(a, b) == EQ rather than strcmp(a, b) == 0 or + the really awful !strcmp(a, b). */ +#define EQ 0 + #endif /* WGET_H */