From 7931200609abea24cedfc96bb890aef9c1c7f0b2 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 30 Aug 2000 04:26:21 -0700 Subject: [PATCH] [svn] * *.{gmo,po,pot}: Regenerated after modifying wget --help output. * ftp.c (ftp_retrieve_list): Use new INFINITE_RECURSION #define. * html.c: htmlfindurl() now takes final `dash_p_leaf_HTML' parameter. Wrapped some > 80-column lines. When -p is specified and we're at a leaf node, do not traverse , , or tags other than . * html.h (htmlfindurl): Now takes final `dash_p_leaf_HTML' parameter. * init.c: Added new -p / --page-requisites / page_requisites option. * main.c (print_help): Clarified that -l inf and -l 0 both allow infinite recursion. Changed the unhelpful --mirrior description to simply give the options it's equivalent to. Added new -p option. (main): Added some comments; handle new -p / --page-requisites. * options.h (struct options): Added new page_requisites field. * recur.c: Changed "URL-s" to "URLs" and "HTML-s" to "HTMLs". Calculate and pass down new `dash_p_leaf_HTML' parameter to get_urls_html(). Use new INFINITE_RECURSION #define. * retr.c: Changed "URL-s" to "URLs". get_urls_html() now takes final `dash_p_leaf_HTML' parameter. * url.c: get_urls_html() and htmlfindurl() now take final `dash_p_leaf_HTML' parameter. * url.h (get_urls_html): Now takes final `dash_p_leaf_HTML' parameter. * wget.h: Added some comments and new INFINITE_RECURSION #define. * wget.texi (Recursive Retrieval Options): Documented new -p option. --- AUTHORS | 3 +- ChangeLog | 4 ++ doc/ChangeLog | 4 ++ doc/wget.info | 86 ++++++++++++------------- doc/wget.info-1 | 166 ++++++++++++++++++++++-------------------------- doc/wget.info-2 | 91 ++++++++++++++++++++++++++ doc/wget.info-3 | 2 + doc/wget.texi | 95 +++++++++++++++++++++++++-- po/cs.gmo | Bin 16937 -> 15901 bytes po/cs.po | 127 +++++++++++++++++++----------------- po/de.gmo | Bin 17102 -> 16078 bytes po/de.po | 127 +++++++++++++++++++----------------- po/hr.gmo | Bin 16632 -> 15574 bytes po/hr.po | 127 +++++++++++++++++++----------------- po/it.gmo | Bin 16941 -> 15890 bytes po/it.po | 127 +++++++++++++++++++----------------- po/no.gmo | Bin 16182 -> 15202 bytes po/no.po | 127 +++++++++++++++++++----------------- po/pt_BR.gmo | Bin 16092 -> 15143 bytes po/pt_BR.po | 127 +++++++++++++++++++----------------- po/wget.pot | 126 +++++++++++++++++++----------------- src/ChangeLog | 34 ++++++++++ src/ftp.c | 5 +- src/html.c | 93 +++++++++++++++++++++++---- src/html.h | 2 +- src/init.c | 3 +- src/main.c | 32 ++++++++-- src/options.h | 3 + src/recur.c | 39 ++++++++---- src/retr.c | 6 +- src/url.c | 6 +- src/url.h | 2 +- src/wget.h | 11 ++++ 33 files changed, 977 insertions(+), 598 deletions(-) diff --git a/AUTHORS b/AUTHORS index b8faa159..8895a3c9 100644 --- a/AUTHORS +++ b/AUTHORS @@ -15,4 +15,5 @@ and windecl.h. Junio Hamano. Added support for FTP Opie and HTTP digest authentication. -Dan Harkless. Added --backup-converted, --follow-tags, and --ignore-tags, etc. +Dan Harkless. Added --backup-converted, --follow-tags, --ignore-tags, and +--page-requisites; improved documentation, etc. diff --git a/ChangeLog b/ChangeLog index 62bcc242..17ced044 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2000-08-30 Dan Harkless + + * po/*.{gmo,po,pot}: Regenerated after modifying wget --help output. + 2000-08-25 Dan Harkless * MACHINES: Alphabetized, changed "architectures" to "OSes and diff --git a/doc/ChangeLog b/doc/ChangeLog index 6cc16aff..cfca5a71 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2000-08-30 Dan Harkless + + * wget.texi (Recursive Retrieval Options): Documented new -p option. + 2000-08-23 Dan Harkless * wget.texi (Download Options): Using -c on a file that's already fully diff --git a/doc/wget.info b/doc/wget.info index 2bcd830a..dddc5b9c 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: 50225 -wget.info-3: 93801 +wget.info-2: 50095 +wget.info-3: 97019  Tag Table: (Indirect) @@ -43,46 +43,46 @@ Node: Directory Options20659 Node: HTTP Options23137 Node: FTP Options27042 Node: Recursive Retrieval Options28235 -Node: Recursive Accept/Reject Options30199 -Node: Recursive Retrieval33097 -Node: Following Links35395 -Node: Relative Links36423 -Node: Host Checking36937 -Node: Domain Acceptance38962 -Node: All Hosts40632 -Node: Types of Files41059 -Node: Directory-Based Limits43509 -Node: FTP Links46149 -Node: Time-Stamping47019 -Node: Time-Stamping Usage48656 -Node: HTTP Time-Stamping Internals50225 -Node: FTP Time-Stamping Internals51695 -Node: Startup File52903 -Node: Wgetrc Location53776 -Node: Wgetrc Syntax54591 -Node: Wgetrc Commands55306 -Node: Sample Wgetrc62692 -Node: Examples67711 -Node: Simple Usage68318 -Node: Advanced Usage70712 -Node: Guru Usage73463 -Node: Various75125 -Node: Proxies75649 -Node: Distribution78414 -Node: Mailing List78765 -Node: Reporting Bugs79464 -Node: Portability81249 -Node: Signals82624 -Node: Appendices83278 -Node: Robots83693 -Node: Introduction to RES84840 -Node: RES Format86733 -Node: User-Agent Field87837 -Node: Disallow Field88601 -Node: Norobots Examples89212 -Node: Security Considerations90166 -Node: Contributors91162 -Node: Copying93801 -Node: Concept Index112964 +Node: Recursive Accept/Reject Options32947 +Node: Recursive Retrieval36173 +Node: Following Links38471 +Node: Relative Links39499 +Node: Host Checking40013 +Node: Domain Acceptance42038 +Node: All Hosts43708 +Node: Types of Files44135 +Node: Directory-Based Limits46585 +Node: FTP Links49225 +Node: Time-Stamping50095 +Node: Time-Stamping Usage51732 +Node: HTTP Time-Stamping Internals53301 +Node: FTP Time-Stamping Internals54771 +Node: Startup File55979 +Node: Wgetrc Location56852 +Node: Wgetrc Syntax57667 +Node: Wgetrc Commands58382 +Node: Sample Wgetrc65910 +Node: Examples70929 +Node: Simple Usage71536 +Node: Advanced Usage73930 +Node: Guru Usage76681 +Node: Various78343 +Node: Proxies78867 +Node: Distribution81632 +Node: Mailing List81983 +Node: Reporting Bugs82682 +Node: Portability84467 +Node: Signals85842 +Node: Appendices86496 +Node: Robots86911 +Node: Introduction to RES88058 +Node: RES Format89951 +Node: User-Agent Field91055 +Node: Disallow Field91819 +Node: Norobots Examples92430 +Node: Security Considerations93384 +Node: Contributors94380 +Node: Copying97019 +Node: Concept Index116182  End Tag Table diff --git a/doc/wget.info-1 b/doc/wget.info-1 index 1a759f52..884f2add 100644 --- a/doc/wget.info-1 +++ b/doc/wget.info-1 @@ -764,6 +764,70 @@ Recursive Retrieval Options useful to access the full remote file list when running a mirror, or for debugging purposes. +`-p' +`--page-requisites' + This option causes wget to download all the files that are + necessary to properly display a given HTML page. This includes + such things as inlined images, sounds, and referenced stylesheets. + + Ordinarily, when downloading a single HTML page, any requisite + documents that may be needed to display it properly are not + downloaded. Using `-r' together with `-l' can help, but since + wget does not ordinarily distinguish between external and inlined + documents, one is generally left with "leaf documents" that are + missing their requisites. + + For instance, say document `1.html' contains an `' tag + referencing `1.gif' and an `' tag pointing to external document + `2.html'. Say that `2.html' is the same but that its image is + `2.gif' and it links to `3.html'. Say this continues up to some + arbitrarily high number. + + If one executes the command: + + wget -r -l 2 http://SITE/1.html + + then `1.html', `1.gif', `2.html', `2.gif', and `3.html' will be + downloaded. As you can see, `3.html' is without its requisite + `3.gif' because wget is simply counting the number of hops (up to + 2) away from `1.html' in order to determine where to stop the + recursion. However, with this command: + + wget -r -l 2 -p http://SITE/1.html + + all the above files *and* `3.html''s requisite `3.gif' will be + downloaded. Similarly, + + wget -r -l 1 -p http://SITE/1.html + + will cause `1.html', `1.gif', `2.html', and `2.gif' to be + downloaded. One might think that: + + wget -r -l 0 -p http://SITE/1.html + + would download just `1.html' and `1.gif', but unfortunately this + is not the case, because `-l 0' is equivalent to `-l inf' - that + is, infinite recursion. To download a single HTML page (or a + handful of them, all specified on the commandline or in a `-i' URL + input file) and its requisites, simply leave off `-p' and `-l': + + wget -p http://SITE/1.html + + Note that wget will behave as if `-r' had been specified, but only + that single page and its requisites will be downloaded. Links + from that page to external documents will not be followed. + Actually, to download a single page and all its requisites (even + if they exist on separate websites), and make sure the lot + displays properly locally, this author likes to use a few options + in addition to `-p': + + wget -H -k -K -nh -p http://SITE/DOCUMENT + + To finish off this topic, it's worth knowing that wget's idea of an + external document link is any URL specified in an `' tag, an + `' tag, or a `' tag other than `'. +  File: wget.info, Node: Recursive Accept/Reject Options, Prev: Recursive Retrieval Options, Up: Invoking @@ -801,13 +865,20 @@ Recursive Accept/Reject Options `--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 files (e.g. images, sounds, and - stylesheets) necessary to display it properly: + download, specify them in a comma-separated LIST. + + In the past, the `-G' option was the best bet for downloading a + single page and its requisites, using a commandline like: wget -Ga,area -H -k -K -nh -r http://SITE/DOCUMENT + However, the author of this option came across a page with tags + like `' and came to the realization that + `-G' was not enough. One can't just tell wget to ignore `', + because then stylesheets will not be downloaded. Now the best bet + for downloading a single page and its requisites is the dedicated + `--page-requisites' option. + `-H' `--span-hosts' Enable spanning across hosts when doing recursive retrieving @@ -1167,90 +1238,3 @@ normally. Also note that followed links to FTP directories will not be retrieved recursively further. - -File: wget.info, Node: Time-Stamping, Next: Startup File, Prev: Following Links, Up: Top - -Time-Stamping -************* - - One of the most important aspects of mirroring information from the -Internet is updating your archives. - - Downloading the whole archive again and again, just to replace a few -changed files is expensive, both in terms of wasted bandwidth and money, -and the time to do the update. This is why all the mirroring tools -offer the option of incremental updating. - - Such an updating mechanism means that the remote server is scanned in -search of "new" files. Only those new files will be downloaded in the -place of the old ones. - - A file is considered new if one of these two conditions are met: - - 1. A file of that name does not already exist locally. - - 2. A file of that name does exist, but the remote file was modified - more recently than the local file. - - To implement this, the program needs to be aware of the time of last -modification of both remote and local files. Such information are -called the "time-stamps". - - The time-stamping in GNU Wget is turned on using `--timestamping' -(`-N') option, or through `timestamping = on' directive in `.wgetrc'. -With this option, for each file it intends to download, Wget will check -whether a local file of the same name exists. If it does, and the -remote file is older, Wget will not download it. - - If the local file does not exist, or the sizes of the files do not -match, Wget will download the remote file no matter what the time-stamps -say. - -* Menu: - -* Time-Stamping Usage:: -* HTTP Time-Stamping Internals:: -* FTP Time-Stamping Internals:: - - -File: wget.info, Node: Time-Stamping Usage, Next: HTTP Time-Stamping Internals, Prev: Time-Stamping, Up: Time-Stamping - -Time-Stamping Usage -=================== - - The usage of time-stamping is simple. Say you would like to -download a file so that it keeps its date of modification. - - wget -S http://www.gnu.ai.mit.edu/ - - A simple `ls -l' shows that the time stamp on the local file equals -the state of the `Last-Modified' header, as returned by the server. As -you can see, the time-stamping info is preserved locally, even without -`-N'. - - Several days later, you would like Wget to check if the remote file -has changed, and download it if it has. - - wget -N http://www.gnu.ai.mit.edu/ - - Wget will ask the server for the last-modified date. If the local -file is newer, the remote file will not be re-fetched. However, if the -remote file is more recent, Wget will proceed fetching it normally. - - The same goes for FTP. For example: - - wget ftp://ftp.ifi.uio.no/pub/emacs/gnus/* - - `ls' will show that the timestamps are set according to the state on -the remote server. Reissuing the command with `-N' will make Wget -re-fetch *only* the files that have been modified. - - In both HTTP and FTP retrieval Wget will time-stamp the local file -correctly (with or without `-N') if it gets the stamps, i.e. gets the -directory listing for FTP or the `Last-Modified' header for HTTP. - - If you wished to mirror the GNU archive every week, you would use the -following command every week: - - wget --timestamping -r ftp://prep.ai.mit.edu/pub/gnu/ - diff --git a/doc/wget.info-2 b/doc/wget.info-2 index d98a3b4f..804867f8 100644 --- a/doc/wget.info-2 +++ b/doc/wget.info-2 @@ -23,6 +23,93 @@ 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: Time-Stamping, Next: Startup File, Prev: Following Links, Up: Top + +Time-Stamping +************* + + One of the most important aspects of mirroring information from the +Internet is updating your archives. + + Downloading the whole archive again and again, just to replace a few +changed files is expensive, both in terms of wasted bandwidth and money, +and the time to do the update. This is why all the mirroring tools +offer the option of incremental updating. + + Such an updating mechanism means that the remote server is scanned in +search of "new" files. Only those new files will be downloaded in the +place of the old ones. + + A file is considered new if one of these two conditions are met: + + 1. A file of that name does not already exist locally. + + 2. A file of that name does exist, but the remote file was modified + more recently than the local file. + + To implement this, the program needs to be aware of the time of last +modification of both remote and local files. Such information are +called the "time-stamps". + + The time-stamping in GNU Wget is turned on using `--timestamping' +(`-N') option, or through `timestamping = on' directive in `.wgetrc'. +With this option, for each file it intends to download, Wget will check +whether a local file of the same name exists. If it does, and the +remote file is older, Wget will not download it. + + If the local file does not exist, or the sizes of the files do not +match, Wget will download the remote file no matter what the time-stamps +say. + +* Menu: + +* Time-Stamping Usage:: +* HTTP Time-Stamping Internals:: +* FTP Time-Stamping Internals:: + + +File: wget.info, Node: Time-Stamping Usage, Next: HTTP Time-Stamping Internals, Prev: Time-Stamping, Up: Time-Stamping + +Time-Stamping Usage +=================== + + The usage of time-stamping is simple. Say you would like to +download a file so that it keeps its date of modification. + + wget -S http://www.gnu.ai.mit.edu/ + + A simple `ls -l' shows that the time stamp on the local file equals +the state of the `Last-Modified' header, as returned by the server. As +you can see, the time-stamping info is preserved locally, even without +`-N'. + + Several days later, you would like Wget to check if the remote file +has changed, and download it if it has. + + wget -N http://www.gnu.ai.mit.edu/ + + Wget will ask the server for the last-modified date. If the local +file is newer, the remote file will not be re-fetched. However, if the +remote file is more recent, Wget will proceed fetching it normally. + + The same goes for FTP. For example: + + wget ftp://ftp.ifi.uio.no/pub/emacs/gnus/* + + `ls' will show that the timestamps are set according to the state on +the remote server. Reissuing the command with `-N' will make Wget +re-fetch *only* the files that have been modified. + + In both HTTP and FTP retrieval Wget will time-stamp the local file +correctly (with or without `-N') if it gets the stamps, i.e. gets the +directory listing for FTP or the `Last-Modified' header for HTTP. + + If you wished to mirror the GNU archive every week, you would use the +following command every week: + + wget --timestamping -r ftp://prep.ai.mit.edu/pub/gnu/ +  File: wget.info, Node: HTTP Time-Stamping Internals, Next: FTP Time-Stamping Internals, Prev: Time-Stamping Usage, Up: Time-Stamping @@ -322,6 +409,10 @@ no_proxy = STRING output_document = STRING Set the output filename - the same as `-O'. +page_requisites = on/off + Download all ancillary documents necessary for a single HTML page + to display properly - the same as `-p'. + passive_ftp = on/off Set passive FTP - the same as `--passive-ftp'. diff --git a/doc/wget.info-3 b/doc/wget.info-3 index a5cfd472..cad3e7b6 100644 --- a/doc/wget.info-3 +++ b/doc/wget.info-3 @@ -474,6 +474,7 @@ Concept Index * option syntax: Option Syntax. * output file: Logging and Input File Options. * overview: Overview. +* page requisites: Recursive Retrieval Options. * passive ftp: FTP Options. * pause: Download Options. * portability: Portability. @@ -495,6 +496,7 @@ Concept Index * reject wildcards: Types of Files. * relative links: Relative Links. * reporting bugs: Reporting Bugs. +* required images, downloading: Recursive Retrieval Options. * retries: Download Options. * retries, waiting between: Download Options. * retrieval tracing style: Download Options. diff --git a/doc/wget.texi b/doc/wget.texi index 86e23cf8..b23b13e2 100644 --- a/doc/wget.texi +++ b/doc/wget.texi @@ -913,6 +913,82 @@ retrievals. Normally, these files contain the raw directory listings received from @sc{ftp} servers. Not removing them can be useful to access the full remote file list when running a mirror, or for debugging purposes. + +@cindex page requisites +@cindex required images, downloading +@item -p +@itemx --page-requisites +This option causes wget to download all the files that are necessary to +properly display a given HTML page. This includes such things as +inlined images, sounds, and referenced stylesheets. + +Ordinarily, when downloading a single HTML page, any requisite documents +that may be needed to display it properly are not downloaded. Using +@samp{-r} together with @samp{-l} can help, but since wget does not +ordinarily distinguish between external and inlined documents, one is +generally left with "leaf documents" that are missing their requisites. + +For instance, say document @file{1.html} contains an @code{} tag +referencing @file{1.gif} and an @code{} tag pointing to external +document @file{2.html}. Say that @file{2.html} is the same but that its +image is @file{2.gif} and it links to @file{3.html}. Say this +continues up to some arbitrarily high number. + +If one executes the command: + +@example +wget -r -l 2 http://@var{site}/1.html +@end example + +then @file{1.html}, @file{1.gif}, @file{2.html}, @file{2.gif}, and +@file{3.html} will be downloaded. As you can see, @file{3.html} is +without its requisite @file{3.gif} because wget is simply counting the +number of hops (up to 2) away from @file{1.html} in order to determine +where to stop the recursion. However, with this command: + +@example +wget -r -l 2 -p http://@var{site}/1.html +@end example + +all the above files @emph{and} @file{3.html}'s requisite @file{3.gif} +will be downloaded. Similarly, + +@example +wget -r -l 1 -p http://@var{site}/1.html +@end example + +will cause @file{1.html}, @file{1.gif}, @file{2.html}, and @file{2.gif} +to be downloaded. One might think that: + +@example +wget -r -l 0 -p http://@var{site}/1.html +@end example + +would download just @file{1.html} and @file{1.gif}, but unfortunately +this is not the case, because @samp{-l 0} is equivalent to @samp{-l inf} +-- that is, infinite recursion. To download a single HTML page (or a +handful of them, all specified on the commandline or in a @samp{-i} @sc{url} +input file) and its requisites, simply leave off @samp{-p} and @samp{-l}: + +@example +wget -p http://@var{site}/1.html +@end example + +Note that wget will behave as if @samp{-r} had been specified, but only +that single page and its requisites will be downloaded. Links from that +page to external documents will not be followed. Actually, to download +a single page and all its requisites (even if they exist on separate +websites), and make sure the lot displays properly locally, this author +likes to use a few options in addition to @samp{-p}: + +@example +wget -H -k -K -nh -p http://@var{site}/@var{document} +@end example + +To finish off this topic, it's worth knowing that wget's idea of an +external document link is any URL specified in an @code{} tag, an +@code{} tag, or a @code{} tag other than @code{}. @end table @node Recursive Accept/Reject Options, , Recursive Retrieval Options, Invoking @@ -952,15 +1028,22 @@ comma-separated @var{list} with this option. @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 files (e.g. images, sounds, and stylesheets) necessary to display it -properly: +specify them in a comma-separated @var{list}. + +In the past, the @samp{-G} option was the best bet for downloading a +single page and its requisites, using a commandline like: @example wget -Ga,area -H -k -K -nh -r http://@var{site}/@var{document} @end example +However, the author of this option came across a page with tags like +@code{} and came to the realization that +@samp{-G} was not enough. One can't just tell wget to ignore +@code{}, because then stylesheets will not be downloaded. Now the +best bet for downloading a single page and its requisites is the +dedicated @samp{--page-requisites} option. + @item -H @itemx --span-hosts Enable spanning across hosts when doing recursive retrieving (@xref{All @@ -1746,6 +1829,10 @@ proxy loading, instead of the one specified in environment. @item output_document = @var{string} Set the output filename -- the same as @samp{-O}. +@item page_requisites = on/off +Download all ancillary documents necessary for a single HTML page to +display properly -- the same as @samp{-p}. + @item passive_ftp = on/off Set passive @sc{ftp} -- the same as @samp{--passive-ftp}. diff --git a/po/cs.gmo b/po/cs.gmo index 71c272ae35d7c03230d462376a23988c3d68e9d5..65d031bd08ddd86606f9d33cf1738dbe60d39dec 100644 GIT binary patch delta 3171 zcmYk-3yj=V702=aVkzC-((QI1ZMVC#v%B5r?CdW4eipDTg%&gwfshKe22hFuTA)BH zqfmvS$YZEr!AeM!Vj!YLQ2|X%j7lp$qxgVEO=Aj*R*cW0e$LEa<4w+d@4f&3J@=g7 zIse^9cU63HXJOC0B`+oA@gOuO$-LwEqa>;PWqG@*2UjFXRWI(swK$B=;RbviJCkJ5 zSy+u%rQCsa*0-kX2XLYFBgogHC$W$>i2z!Yq{hRf3;QvL=VBHM*oF_G0BgR1wRjl& z@EAI`*t29Mu1@(b6!_vhupJ-8Wq1fPc*On5seH||;lkQAmJ4ydGR(pzm5M+k_sv; zHIH-43a6QPaam--`LgX^xDZ47g+w`uYP$R{sMbvmMW#(>;0SI-fi~?!ewq#;b((&Q zUv-CIqV_9(hLl}#9QkebZZu(`S@t1u^G4Lw%~6VY;q$l%zlII?-E^I1()=fDXIr9o zIBVe}8O3#|Ct7ym0{kLYVff*<mmY-ma`e!Oks;L%|xF{pakSZg)aFkh_?nhwp z{9aVk%x6&vGEbx4$-IDSn~A`DEv+Y^GPTMwE^gg|S-cXJsx=gDR{z%hCOWwFo5*qN zF(g^`1f)PVnue3C>>`uw#VFwHyV1qj>(Ry8dr)I#A3=&_e~RHJ0@6Eef{*iUW9YrM z)mV^0+cpz*ZHwlK7azkc9zs&J{T`{&F6wyRes+1kJpvG1`+e#Dvna6k7jZrwMJlxa z5i9X;<#k6SR;P^wQ-}i{8BHhB4wprftUL#A#w$>?D__O)-K7zeQ*Z}5*ZFwLuONq= zpv0G#kMG|FU3+b)S=aYbcX!1Bfpj;bUg!?#hcUW7 zhc}@2yFZNr@BS8&y!&PJ2dn2qq*l)Wy0B**o`;vAy`E=KGCi-jKboj_F^aI4mDZck z!QQAX$$LZMGw~_pAcRV$Q5~Z+eOr<9zI`aOTm&HVoKGil<<|BbBIYa_Vke@-m@{xJ)Vx(aH zTGXuh{V0$^{#g_0U*r7gb4yWxbE7zk??5%5djJJE z_dG7Z7f=c2ewFSYMFGsch7wy*+*HVA5Brq{yQElK2)`|@L@}-Cby>B{iwxC;{z$9 z4JX*9biEVhnB32%)4fyhLiVwA{r^yi(gW+#J7WY@@3VW<~FdD|6ujCds&aP$jPVQl6u}fIA`Fs{5K7|-+6&+a`pYR*H zf1Hgm-)6F&#n@g(vJOvRBjxpF$!#WYE-#X3??$FkN@KO(YuH-$c6KF;j*W3ATUnZw ze`eD8&A5eK%A(t2+*kba!jZY_&HC7lYy-QUy@hGN=+)A=!S8PNR#q(Slz-lPpy%Y1 iYY!~Rt~s%4GCwku9U7S)89uPN^PhDGZk+kt{Qm&U3_pkf delta 4187 zcmaKt3vg7`8Gug^XxX57Kgf%-d63;C8)I?|bzJ{&u>osM+iMPr}8_zYG2FIhYDC_!EPrO66c&ErY$V5e`EQAA(-^ZOERS z7hxWJ3pOZ~n*}+S+XQRjR+o1{9M6@&s^KYE3eUhQcnSNeA6OQlDtITeUWhZ2>cX{|^};A5^1>q!J%!IgoGLt@VbOeuo+7fM7D1d- z1Y6V(i{Uoxt9k|#?m`-p+M*MX(iHs=_Cj$4#l`G(coQTe#iNi+6z_*bRQwf4q{Wi4 zGWZIV?|*~nEy+@MCxb z{3R@cueozKlFE6^$wsC04u&hql4^%LAU#p}0Q@lgDfB?mgWk&DK#W(u0duH-6={)c zQ$^J_eUSF^E(8b%;*=cSw+4>Mag< zH$e?=ho#ityO#k9yoVs^^-2?>*n1X|I5QH?=Rp4?!s*x1jd-?wr6<@(We_HVYi6L$dIyu7o+w zvTPN+7k&(Oz*ixSS1%=Ng=3I2^^d#!21H-IWKh&?p`4mPiM z*DXk`nfoFD4-7-b zox_k!bxMHf?fe0xw4FbPl%(??u!s70X$BtnafqR=aY!k;_Q4#OcGtfOaj5GQB)wg4 z!U=wx7QiUn4Y_73&%#CU4T#~DQqpcHrJ)4flF@9qNvU}$($sw$3n=W_liAR75R#Ri zCt(Bsf3~^AS-D=lCm<>BeFk!_SFR-~@0EziT3;^Q1v?-P^gRmM-zNdEukTq%$@@;r z{SPwu7Yn2@h?kP0;5vw*U=q^h!TTW*1y8x_KY=I;z6@!i;9uZ&rTP~_9O}OVV!Zz@ z$oc-Kpa;GN8{r=zfv+x+`(MMLlLg^znGLHyK?o3F5%Odyv4^FqZFYyy-KG%8SI>mk@adkweIX>BXMLC3iC7 z5;)I3-kecekuRoi^_15=!bl@)kS`!Kf&AJ?+s{2m(+_(}Qui?zUq9!rH$hs(Ry&c0-1(It@y_#Q-Zrut`7AQ3RC-xXsZkOkzbcK~jL2QP4w1skBR>xEP#d*N20V`= zMaW^K1L01p^@u#uAoARV%tKblM1Da(&wH~oR%$*hM(7;p`3Ua>awGBy#6svJ=XscS ztveRL)xNbiZ@f{<6SYS5q!EvYMvb_(EiE6K zrQObn-HC`{U$NO4 zW)^*>r8E2e&Vi(JAZbhuS#jfkj|>?pJ^R6Dk455|KYPr;>PRRNwKED#Gz0>sWd>&V z&S|j|Q>L~?MrO5`Me=5@Q9SUqKg!g_Ga#z0(; zOj(moHJn3hokJtm)UXj4vnQi-wzal7WM5G|9g6F9+iuy|>^WIpwP}H;Bhc2STf0}a zbe@dYyi<^xvTSR@idxBY=8O*MWZX`~7{#r`kTvxIrQf=FaLwi|7!6w#d<+fl{)A3U zM9+ndaUFB@eo!B{Dq^$tb?l#!m^H4=ke;wiWB7e~MNQZV`l@Y_+!Kq$6XQA>3P*-# zh@R9;hK3C}c8%UJjbzF_nY=uNQ8O|uN3PW!iMMnjW+i9BA@g1Bi%iC%k>QAKUewc} zn3=FGzbLpycg(sPvl7#WHdDrU_;S>ECSqS4KlMJ(|F1RX@~&gng&EtpK%r<4ZG|U7 p(|gF>1v{druadfJ^ov_L9d|U18#?K\n" "Language-Team: Czech \n" @@ -88,7 +88,7 @@ msgstr "" "Adresáø `%s' neexistuje.\n" "\n" -#: src/ftp.c:331 src/ftp.c:599 src/ftp.c:647 src/url.c:1494 +#: src/ftp.c:331 src/ftp.c:599 src/ftp.c:647 src/url.c:1501 msgid "done.\n" msgstr "hotovo.\n" @@ -289,14 +289,14 @@ msgid "%s: corrupt time-stamp.\n" msgstr "%s: èasové razítko souboru je poru¹ené.\n" # , c-format -#: src/ftp.c:1242 +#: src/ftp.c:1243 #, 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:1281 +#: src/ftp.c:1282 #, 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:1326 +#: src/ftp.c:1327 #, 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:1373 +#: src/ftp.c:1374 #, c-format msgid "No matches on pattern `%s'.\n" msgstr "Vzorku `%s' nic neodpovídá.\n" # , c-format -#: src/ftp.c:1433 +#: src/ftp.c:1434 #, 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:1438 +#: src/ftp.c:1439 #, 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,33 +428,33 @@ msgid "Unknown error" msgstr "Neznámá chyba" # , c-format -#: src/html.c:470 src/html.c:472 +#: src/html.c:539 src/html.c:541 #, c-format msgid "Index of /%s on %s:%d" msgstr "Obsah /%s na %s:%d" -#: src/html.c:494 +#: src/html.c:563 msgid "time unknown " msgstr "èas neznámý " -#: src/html.c:498 +#: src/html.c:567 msgid "File " msgstr "Soubor " -#: src/html.c:501 +#: src/html.c:570 msgid "Directory " msgstr "Adresáø " -#: src/html.c:504 +#: src/html.c:573 msgid "Link " msgstr "Sym. odkaz " -#: src/html.c:507 +#: src/html.c:576 msgid "Not sure " msgstr "Neznámý typ " # , c-format -#: src/html.c:525 +#: src/html.c:594 #, c-format msgid " (%s bytes)" msgstr " (%s bajtù)" @@ -637,44 +637,44 @@ 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:318 src/netrc.c:260 +#: src/init.c:319 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:339 src/init.c:345 +#: src/init.c:340 src/init.c:346 #, 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:376 +#: src/init.c:377 #, 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:464 +#: src/init.c:465 #, 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:491 +#: src/init.c:492 #, 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:509 src/init.c:766 src/init.c:788 src/init.c:861 +#: src/init.c:510 src/init.c:767 src/init.c:789 src/init.c:862 #, c-format msgid "%s: %s: Invalid specification `%s'.\n" msgstr "%s: %s: Neplatná specifikace `%s'\n" # , c-format -#: src/init.c:622 src/init.c:644 src/init.c:666 src/init.c:692 +#: src/init.c:623 src/init.c:645 src/init.c:667 src/init.c:693 #, c-format msgid "%s: Invalid specification `%s'\n" msgstr "%s: Neplatná specifikace `%s'\n" @@ -723,6 +723,7 @@ msgstr "" # , fuzzy #: src/main.c:127 +#, fuzzy msgid "" "Logging and input file:\n" " -o, --output-file=FILE log messages to FILE.\n" @@ -731,8 +732,9 @@ msgid "" " -q, --quiet quiet (no output).\n" " -v, --verbose be verbose (this is the default).\n" " -nv, --non-verbose turn off verboseness, without being quiet.\n" -" -i, --input-file=FILE read URL-s from file.\n" +" -i, --input-file=FILE download URLs found in FILE.\n" " -F, --force-html treat input file as HTML.\n" +" -B, --base=URL prepends URL to relative links in -F -i file.\n" "\n" msgstr "" "Protokolování a vstupní soubor:\n" @@ -747,14 +749,15 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:137 +#: src/main.c:138 #, fuzzy msgid "" "Download:\n" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits).\n" " -O --output-document=FILE write documents to FILE.\n" -" -nc, --no-clobber don't clobber existing files.\n" +" -nc, --no-clobber don't clobber existing files or use .# " +"suffixes.\n" " -c, --continue restart getting an existing file.\n" " --dot-style=STYLE set retrieval display style.\n" " -N, --timestamping don't retrieve files if older than local.\n" @@ -762,7 +765,7 @@ 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 " +" --waitretry=SECONDS\twait 1...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" @@ -785,7 +788,7 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:152 +#: src/main.c:153 msgid "" "Directories:\n" " -nd --no-directories don't create directories.\n" @@ -805,7 +808,7 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:159 +#: src/main.c:160 #, fuzzy msgid "" "HTTP options:\n" @@ -836,7 +839,7 @@ msgstr "" " v hlavièce identifikaèní øetìzec AGENT\n" # , fuzzy -#: src/main.c:171 +#: src/main.c:172 msgid "" "FTP options:\n" " --retr-symlinks retrieve FTP symbolic links.\n" @@ -851,17 +854,21 @@ msgstr "" " --passive-ftp pou¾ij pasivní mód pøenosu dat\n" "\n" -#: src/main.c:176 +#: src/main.c:177 #, fuzzy msgid "" "Recursive retrieval:\n" " -r, --recursive recursive web-suck -- use with care!.\n" -" -l, --level=NUMBER maximum recursion depth (0 to unlimit).\n" +" -l, --level=NUMBER maximum recursion depth (inf or 0 for " +"infinite).\n" " --delete-after delete downloaded files.\n" " -k, --convert-links convert non-relative links to relative.\n" " -K, --backup-converted before converting file X, back up as X.orig.\n" -" -m, --mirror turn on options suitable for mirroring.\n" +" -m, --mirror shortcut option equivalent to -r -N -l inf " +"-nr.\n" " -nr, --dont-remove-listing don't remove `.listing' files.\n" +" -p, --page-requisites get all images, etc. needed to display HTML " +"page.\n" "\n" msgstr "" "Rekurzivní stahování:\n" @@ -874,7 +881,7 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:185 +#: src/main.c:187 #, fuzzy msgid "" "Recursive accept/reject:\n" @@ -914,7 +921,7 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:200 +#: src/main.c:202 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" @@ -922,12 +929,12 @@ msgstr "" "Komentáøe k èeskému pøekladu zasílejte na adresu . \n" # , fuzzy -#: src/main.c:364 +#: src/main.c:371 #, 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:415 +#: src/main.c:425 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" @@ -941,7 +948,7 @@ msgstr "" "anebo VHODNOSTI PRO URÈITÝ ÚÈEL. Dal¹í podrobnosti hledejte \n" "v Obecné veøejné licenci GNU.\n" -#: src/main.c:421 +#: src/main.c:431 #, fuzzy msgid "" "\n" @@ -951,13 +958,13 @@ msgstr "" "Autorem tohto programu je Hrvoje Nik¹iæ \n" # , c-format -#: src/main.c:495 +#: src/main.c:505 #, c-format msgid "%s: %s: invalid command\n" msgstr "%s: %s: neplatný pøíkaz\n" # , c-format -#: src/main.c:548 +#: src/main.c:558 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: nepøípustný pøepínaè -- `-n%c'\n" @@ -965,33 +972,33 @@ msgstr "%s: nep # , c-format #. #### Something nicer should be printed here -- similar to the #. pre-1.5 `--help' page. -#: src/main.c:551 src/main.c:593 src/main.c:636 +#: src/main.c:561 src/main.c:603 src/main.c:661 #, 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:616 +#: src/main.c:641 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:622 +#: src/main.c:647 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:631 +#: src/main.c:656 #, c-format msgid "%s: missing URL\n" msgstr "%s: postrádám URL\n" # , c-format -#: src/main.c:719 +#: src/main.c:744 #, c-format msgid "No URLs found in %s.\n" msgstr "V souboru `%s' nebyla nalezena ¾ádná URL.\n" # , c-format -#: src/main.c:728 +#: src/main.c:753 #, c-format msgid "" "\n" @@ -1003,14 +1010,14 @@ msgstr "" "Celkem naèteno %s bajtù v %d souborech\n" # , c-format -#: src/main.c:733 +#: src/main.c:758 #, 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:760 +#: src/main.c:785 msgid "%s received, redirecting output to `%%s'.\n" msgstr "Zachycen signál %s , výstup pøesmìrován do `%%s'.\n" @@ -1077,18 +1084,18 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: volání `stat %s' skonèilo chybou: %s\n" # , c-format -#: src/recur.c:451 src/retr.c:464 +#: src/recur.c:463 src/retr.c:468 #, c-format msgid "Removing %s.\n" msgstr "Ma¾u %s.\n" # , c-format -#: src/recur.c:452 +#: src/recur.c:464 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Ma¾u %s, proto¾e tento soubor není po¾adován.\n" -#: src/recur.c:611 +#: src/recur.c:624 msgid "Loading robots.txt; please ignore errors.\n" msgstr "Naèítám `robots.txt'. Chybová hlá¹ení ignorujte, prosím.\n" @@ -1102,23 +1109,23 @@ msgstr "" "\n" " [ pøeskakuji %dK ]" -#: src/retr.c:345 +#: src/retr.c:349 msgid "Could not find proxy host.\n" msgstr "Nemohu najít proxy server.\n" # , c-format -#: src/retr.c:356 +#: src/retr.c:360 #, c-format msgid "Proxy %s: Must be HTTP.\n" msgstr "Proxy %s: Musí být HTTP.\n" # , c-format -#: src/retr.c:399 +#: src/retr.c:403 #, c-format msgid "%s: Redirection to itself.\n" msgstr "%s: Pøesmìrování na sebe sama.\n" -#: src/retr.c:485 +#: src/retr.c:489 msgid "" "Giving up.\n" "\n" @@ -1126,7 +1133,7 @@ msgstr "" "Vzdávám to.\n" "\n" -#: src/retr.c:485 +#: src/retr.c:489 msgid "" "Retrying.\n" "\n" @@ -1135,31 +1142,31 @@ msgstr "" "\n" # , c-format -#: src/url.c:944 +#: src/url.c:951 #, c-format msgid "Error (%s): Link %s without a base provided.\n" msgstr "Chyba (%s): K relativnímu odkazu %s nelze najít bázový odkaz.\n" # , c-format -#: src/url.c:959 +#: src/url.c:966 #, c-format msgid "Error (%s): Base %s relative, without referer URL.\n" msgstr "Chyba (%s): Bázový odkaz %s nesmí být relativní.\n" # , c-format -#: src/url.c:1377 +#: src/url.c:1384 #, c-format msgid "Converting %s... " msgstr "Konvertuji %s... " # , c-format -#: src/url.c:1382 src/url.c:1450 +#: src/url.c:1389 src/url.c:1457 #, c-format msgid "Cannot convert links in %s: %s\n" msgstr "Nedoká¾u pøevést odkazy v %s: %s\n" # , c-format -#: src/url.c:1426 +#: src/url.c:1433 #, fuzzy, c-format msgid "Cannot back up %s as %s: %s\n" msgstr "Nedoká¾u pøevést odkazy v %s: %s\n" diff --git a/po/de.gmo b/po/de.gmo index ee1cf5dfd8e536fceeeebdc5e1d395d35cff5377..d7a899a159419070889179ab93376c2ae5a111e3 100644 GIT binary patch delta 3171 zcmY+_du-ix8OQN&acpZl*7drsYfn$x^|to3>&|*vFJrh3G8o`Qg9IX=fP@e(!eorg zQ5iQ8nUsRU;-;7kb$@6Ek;o*GLyC6-M9tU;*an&{1xXbTo{j>kzu5h$%j9MoF0B6ww&7u1 zhA$#D>R&7GH#ihhH;k3{8_q+SH{6N*G<*{U*zog=Zy`U84OofJCiBK&Y{Jd%PrWAR zW*fI4X&WCzrD;5f(-?tp+$8#Wjw3~y&PGZ!U5kQi+JiD}3dLIR>FoLMkl&_vQ>viC za`QOXT-s>j#pcL_^XBWka1Ms_ONjC+s_BZqqguB(6q&Z1j77W*1={i@YuAHsis;;;-Z`=L#mwY!clHZwjY7T z^ZQUub6-a#$UT92C-(xXZ7u@ywX`onWonmYT-<&k=J5(ts`gO0RsGu^G10;8-$#zy z-$0V(k3$ONqiHzF%Pum>e;5UvzZ_kh--#~H--{Y6e*h_x|0RZ>2uSaA2tLktjH35C zHepEy9oLwsYezIsym%1vcmzq+@fV~Nt3=eF{GX9OU)&Ihvn@1npue~ksX0zm)Bj9SiLq9Oeqd@vCCi@2WHL84RgJ+C72W@ly0&x5kQd-LD`g-LE0# zx}!<0dqR5FQ-{v?M6*et=TyvNl(HB1#rHpG@HN>LqJP*Lxyz()$q{!W|jE zioW~a=TN}C?_h_&RdJ5vzA1ER-$#+ZzPNA;#<@QK{)EcVU+?~isDCS}Z~tY;QU5;V zp#OW>`X$_K{cjvmm8ji&F#_Un_2cM*)xSZ34G1DWw}CTIfCEvgHFy^)^}u0l$I=TX znrt9y!_nZP@`FJyM<#>s%l3C>>o244eNcHK(7}I{S%}OvVIeZ-uMp?#70yRJR=6HF z;Qi?0!t>ay{)NApkYdQ8r0zqqj6jC&LzxUkQ+46*k(9%Wk%QqO6yWd~D8u1Tpn!(w za2bAEPf>OF>GJcD=mq{ps2A^ze8}^t|Hv*IOY{f1iu;f%#h)Ta z>!OR5V4Zi;I~Wqne)MBFfDa?Tqd&p57$p?+SPjk~HBxoSd+T@M1kT}Ucobbc=~;YDlcA*fDsgW5 zBIIxSI#j0VZ=hzJejfAqW_D4-2bU z<`iP=nZ2NDW%uXJ@+|5WnqJN#Le2BPv3GWV)$&rrCDn9$wlB93cz%2`aL1U%|22+P@1#8fzdDun{HuaYzL!vx|eNbQQ-Hmg)GMIGNOj*f^7apY-IPdQRW*@ zr?ME)7%@&^$FX88Qo1DF;a7*vj|G04ShRnPP3&5>g`Lmh`@5ONxQDHppOt^6viYa+ zLUu8m&h{RdeSArAW~Y^wO1qekD1C;#pS7|s7UOz$C;I@KW&a&lAL={dgxW)O`Hja{ aO%#f2@@tBd#kGgd>wdW5P~G(5h5rG}U_K%M delta 4176 zcmaKu3v69w9l*cNZLr%y+qJjr`r^BNtj}}Xu9mi2-?YQAP6q2(7GmVK_w@E;x94{E zo;zk`9>zmN=6GD@m`a9G0!vfadh0X94=o(D^!Q>jH3OQVDg8i@+PD2eJgc0~n z$UB8UgT?R-*rHTX9z?IG4c5cm0S`eOFOtA&;q$N@o`E&+EzVa%*eYd%1B)m92gP^7 zjjT_>CMb#=Tzn4VXz@je;q}ZF*;&68c0dPq!zZDJzl9_4J;;G2gKz`<1jLb&Ea$5_ zCdb&|z>;slYWNx~f`5fXRr0RCUy3u5>e6lgerXaCdFe@rozj;ePL-bb8D0&s6DBKa z9mF|Bu;C$C1}8aRH8R;BY~&!R4L<`ZP51@a55*A-m+`L0>meB_OF%MFb`KMagLJ`Od!6_!)~$Q?{D5IGJ>Z$z39!;!O))J5c)k%`*%kd)P8R3fU~0dc&Ra>>E9 zCgk8+Y^rwnC?qqruR!e7ibK~>J;@yUb?hmZ7wbBh;6UANkfx|R4CTd>P{ZdTDXV)O zQuF#XkmvP%{(k*F*uYwvQ1+jJI9C4?NZ-`|5?%qNgxrGq3&EPeT=_!Pzs&{;4M-l% z*06y!UA(Cu{uoNCaI}#_)J<>?O@DwK)+}95nwoj0NPqKqENyq_hOAyD5QpmM4wn7{lI-_M<3E zB+&tXKWYZ+W00E?{SL&@=y{**5;=#qOXS#V7rl*e0@7pcGjI^z4YBXGzs#hZjdPGp zw7&~Ua|h9hBOON|k#tB?@!{$CDQtjmK@4;fg*ez5MA$ja8izXXg7iY?*XgP4@Hy6G zVDm+Yy)Ndw=c=x8UO2@@f{g-vxB_xOx1cIK=1vq7=AU_UxcKy z_eU_SRNopn1SJFP_uUF{zV9Sl2StyA`%c3)_`P6#A>f-zt#aw=K1m4%`Gp+wAk0}HSh9)~;N62yT)p2@8mB%AWy;6$)a$o=nT z<0uso#(^69$Lwg*U<{AU!hlPl%miDIp~q zmL^1RI1aHld^>E0r{(_BmBYVaL&G;Ak&WPt+5$%)5slmdN#V$I5Qj(3LEamsaplW6 zx(!mo(F5>Gco;M!y2FJ^B>Hq0t}Y&aA5pe})zL_QoE5k0Zx&1)=TP5)Eh?v z&chx=+DJwagOYY47v7-%l~nsdfBC*&3gHcj(Lsh0iJvOxHsu?U4D-E+j0qp!ujK3| z;xugkkD_gH?b`$g80b8;qylz)5WzY28_A-^hzY)7P^A3@e4GNch?P&0L#Oc-B6 z!pI4P+R5EkHy|<&`B2xxRY;e=o>BKRp`*O9n%^=++FgcpVHO!jK8d6d`p6qn==xwT z*c#05hB3rM`h&g4a!(g@4Sb3fEu=n;aB0*7$jwLCvOBPC`^31GkxV7@oSDhQ5@tp_DJ>78q7(CU zV)OH+9S>BOwfxNwR*SoyUfi6@CcFbK`I%2!wxj(=zBArQ2Rw}fS<7@TdD)x#n@x5~ z`|me<3I{!fgJyavl`-G1GG)4Y`9YI2Yh^Tl&aBC)GqG&a@eSBmFbq3o8_VymSaGsx zTc>7bmaW+2rcK{&IkR}6r%cOEXwNIp6U+0&%l2|!ZwV5s(`GEL_uM>TWb{lrHRn~s zQ`+V!&7{)PrZMZxC0EYY+Cj;=qr{rmeHoe;hYsQ>OpyLt0>LWO97FoGnInn#p+9PM~ht+JCZQ z@x!`dY{c~}{7*M-rUT`eJ$qiviEiAB_X9g(Oxna4$!5e`9kUlqD^R*jQ)C<~nbb}D zP0O`Sy{vpNW$P7Bn&sTfw8@<1khEkbHm9577M*Wp9KGA&>crA\n" "Language-Team: German \n" @@ -102,7 +102,7 @@ msgstr "" "Kein solches Verzeichnis »%s«.\n" "\n" -#: src/ftp.c:331 src/ftp.c:599 src/ftp.c:647 src/url.c:1494 +#: src/ftp.c:331 src/ftp.c:599 src/ftp.c:647 src/url.c:1501 msgid "done.\n" msgstr "fertig.\n" @@ -281,18 +281,18 @@ msgstr "%s: unbekannter/nicht unterst msgid "%s: corrupt time-stamp.\n" msgstr "%s: beschädigter Zeitstempel.\n" -#: src/ftp.c:1242 +#: src/ftp.c:1243 #, 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:1281 +#: src/ftp.c:1282 #, 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:1326 +#: src/ftp.c:1327 #, 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:1373 +#: src/ftp.c:1374 #, c-format msgid "No matches on pattern `%s'.\n" msgstr "Keine Übereinstimmungen bei dem Muster »%s«.\n" -#: src/ftp.c:1433 +#: src/ftp.c:1434 #, c-format msgid "Wrote HTML-ized index to `%s' [%ld].\n" msgstr "Schreibe HTML-artigen Index nach »%s« [%ld].\n" -#: src/ftp.c:1438 +#: src/ftp.c:1439 #, c-format msgid "Wrote HTML-ized index to `%s'.\n" msgstr "HTML-artiger Index nach »%s« geschrieben.\n" @@ -402,32 +402,32 @@ msgstr "Host nicht gefunden" msgid "Unknown error" msgstr "Unbekannter Fehler" -#: src/html.c:470 src/html.c:472 +#: src/html.c:539 src/html.c:541 #, c-format msgid "Index of /%s on %s:%d" msgstr "Index von /%s auf %s:%d" -#: src/html.c:494 +#: src/html.c:563 msgid "time unknown " msgstr "Zeit unbekannt " -#: src/html.c:498 +#: src/html.c:567 msgid "File " msgstr "Datei " -#: src/html.c:501 +#: src/html.c:570 msgid "Directory " msgstr "Verzeichnis " -#: src/html.c:504 +#: src/html.c:573 msgid "Link " msgstr "Verweis " -#: src/html.c:507 +#: src/html.c:576 msgid "Not sure " msgstr "Nicht sicher" -#: src/html.c:525 +#: src/html.c:594 #, c-format msgid " (%s bytes)" msgstr " (%s Bytes)" @@ -593,37 +593,37 @@ msgstr "%s (%s) - Lesefehler bei Byte %ld (%s)." msgid "%s (%s) - Read error at byte %ld/%ld (%s). " msgstr "%s (%s) - Lesefehler bei Byte %ld/%ld (%s). " -#: src/init.c:318 src/netrc.c:260 +#: src/init.c:319 src/netrc.c:260 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Kann »%s« nicht lesen (%s).\n" -#: src/init.c:339 src/init.c:345 +#: src/init.c:340 src/init.c:346 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Fehler in »%s« bei Zeile %d.\n" -#: src/init.c:376 +#: src/init.c:377 #, 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:464 +#: src/init.c:465 #, c-format msgid "%s: BUG: unknown command `%s', value `%s'.\n" msgstr "%s: Unbekannter Befehl »%s«, Wert »%s«.\n" -#: src/init.c:491 +#: src/init.c:492 #, c-format msgid "%s: %s: Please specify on or off.\n" msgstr "%s: %s: Bitte »on« oder »off« angeben.\n" -#: src/init.c:509 src/init.c:766 src/init.c:788 src/init.c:861 +#: src/init.c:510 src/init.c:767 src/init.c:789 src/init.c:862 #, c-format msgid "%s: %s: Invalid specification `%s'.\n" msgstr "%s: %s: Ungültige Angabe »%s«\n" -#: src/init.c:622 src/init.c:644 src/init.c:666 src/init.c:692 +#: src/init.c:623 src/init.c:645 src/init.c:667 src/init.c:693 #, c-format msgid "%s: Invalid specification `%s'\n" msgstr "%s: Ungültige Angabe »%s«\n" @@ -669,6 +669,7 @@ msgstr "" "\n" #: src/main.c:127 +#, fuzzy msgid "" "Logging and input file:\n" " -o, --output-file=FILE log messages to FILE.\n" @@ -677,8 +678,9 @@ msgid "" " -q, --quiet quiet (no output).\n" " -v, --verbose be verbose (this is the default).\n" " -nv, --non-verbose turn off verboseness, without being quiet.\n" -" -i, --input-file=FILE read URL-s from file.\n" +" -i, --input-file=FILE download URLs found in FILE.\n" " -F, --force-html treat input file as HTML.\n" +" -B, --base=URL prepends URL to relative links in -F -i file.\n" "\n" msgstr "" "Log-Datei schreiben und Eingabe-Datei:\n" @@ -692,14 +694,15 @@ msgstr "" " -F, --force-html Eingabe-Datei als HTML behandeln\n" "\n" -#: src/main.c:137 +#: src/main.c:138 #, fuzzy msgid "" "Download:\n" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits).\n" " -O --output-document=FILE write documents to FILE.\n" -" -nc, --no-clobber don't clobber existing files.\n" +" -nc, --no-clobber don't clobber existing files or use .# " +"suffixes.\n" " -c, --continue restart getting an existing file.\n" " --dot-style=STYLE set retrieval display style.\n" " -N, --timestamping don't retrieve files if older than local.\n" @@ -707,7 +710,7 @@ 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 " +" --waitretry=SECONDS\twait 1...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" @@ -732,7 +735,7 @@ msgstr "" " -Q, --quota=ZAHL setze die Hol-Vorgänge auf ZAHL\n" "\n" -#: src/main.c:152 +#: src/main.c:153 msgid "" "Directories:\n" " -nd --no-directories don't create directories.\n" @@ -752,7 +755,7 @@ msgstr "" " Verzeichnisbestandteile\n" "\n" -#: src/main.c:159 +#: src/main.c:160 #, fuzzy msgid "" "HTTP options:\n" @@ -784,7 +787,7 @@ msgstr "" "identifizieren\n" "\n" -#: src/main.c:171 +#: src/main.c:172 msgid "" "FTP options:\n" " --retr-symlinks retrieve FTP symbolic links.\n" @@ -799,17 +802,21 @@ msgstr "" " --passive-ftp den \"passiven\" Übertragungsmodus verwenden\n" "\n" -#: src/main.c:176 +#: src/main.c:177 #, fuzzy msgid "" "Recursive retrieval:\n" " -r, --recursive recursive web-suck -- use with care!.\n" -" -l, --level=NUMBER maximum recursion depth (0 to unlimit).\n" +" -l, --level=NUMBER maximum recursion depth (inf or 0 for " +"infinite).\n" " --delete-after delete downloaded files.\n" " -k, --convert-links convert non-relative links to relative.\n" " -K, --backup-converted before converting file X, back up as X.orig.\n" -" -m, --mirror turn on options suitable for mirroring.\n" +" -m, --mirror shortcut option equivalent to -r -N -l inf " +"-nr.\n" " -nr, --dont-remove-listing don't remove `.listing' files.\n" +" -p, --page-requisites get all images, etc. needed to display HTML " +"page.\n" "\n" msgstr "" "Rekursives Holen:\n" @@ -824,7 +831,7 @@ msgstr "" " -nr, --dont-remove-listing ».listing«-Dateien nicht entfernen\n" "\n" -#: src/main.c:185 +#: src/main.c:187 #, fuzzy msgid "" "Recursive accept/reject:\n" @@ -870,7 +877,7 @@ msgstr "" " hinaufsteigen\n" "\n" -#: src/main.c:200 +#: src/main.c:202 msgid "Mail bug reports and suggestions to .\n" msgstr "" "Fehlerberichte und Verbesserungsvorschläge bitte an \n" @@ -878,12 +885,12 @@ msgstr "" "\n" "Für die deutsche Übersetzung ist die Mailingliste zuständig.\n" -#: src/main.c:364 +#: src/main.c:371 #, c-format msgid "%s: debug support not compiled in.\n" msgstr "%s: Debug-Unterstützung nicht hineinkompiliert.\n" -#: src/main.c:415 +#: src/main.c:425 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" @@ -898,7 +905,7 @@ msgstr "" "Lizenz- und Kopierbedingung; die Einzelheiten sind in der Datei COPYING\n" "(GNU General Public License) beschrieben.\n" -#: src/main.c:421 +#: src/main.c:431 #, fuzzy msgid "" "\n" @@ -907,45 +914,45 @@ msgstr "" "\n" "Geschrieben von Hrvoje Niksic .\n" -#: src/main.c:495 +#: src/main.c:505 #, c-format msgid "%s: %s: invalid command\n" msgstr "%s: %s: ungültiger Befehl\n" -#: src/main.c:548 +#: src/main.c:558 #, 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:551 src/main.c:593 src/main.c:636 +#: src/main.c:561 src/main.c:603 src/main.c:661 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "»%s --help« gibt weitere Informationen.\n" -#: src/main.c:616 +#: src/main.c:641 msgid "Can't be verbose and quiet at the same time.\n" msgstr "\"Mitteilsam\" und \"still\" ist gleichzeitig unmöglich.\n" -#: src/main.c:622 +#: src/main.c:647 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:631 +#: src/main.c:656 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL fehlt\n" -#: src/main.c:719 +#: src/main.c:744 #, c-format msgid "No URLs found in %s.\n" msgstr "Keine URLs in %s gefunden.\n" -#: src/main.c:728 +#: src/main.c:753 #, c-format msgid "" "\n" @@ -956,14 +963,14 @@ msgstr "" "BEENDET --%s--\n" "Geholt: %s Bytes in %d Dateien\n" -#: src/main.c:733 +#: src/main.c:758 #, 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:760 +#: src/main.c:785 msgid "%s received, redirecting output to `%%s'.\n" msgstr "%s erhalten, weise Ausgabe nach »%%s« zurück.\n" @@ -1022,17 +1029,17 @@ msgstr "Syntax: %s NETRC [HOSTNAME]\n" msgid "%s: cannot stat %s: %s\n" msgstr "%s: kann nicht finden %s: %s\n" -#: src/recur.c:451 src/retr.c:464 +#: src/recur.c:463 src/retr.c:468 #, c-format msgid "Removing %s.\n" msgstr "Entferne »%s«.\n" -#: src/recur.c:452 +#: src/recur.c:464 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Entferne »%s«, da dies zurückgewiesen werden soll.\n" -#: src/recur.c:611 +#: src/recur.c:624 msgid "Loading robots.txt; please ignore errors.\n" msgstr "Lade »robots.txt«; bitte Fehler ignorieren.\n" @@ -1045,21 +1052,21 @@ msgstr "" "\n" " [ überspringe %dK ]" -#: src/retr.c:345 +#: src/retr.c:349 msgid "Could not find proxy host.\n" msgstr "Kann Proxy-Host nicht finden.\n" -#: src/retr.c:356 +#: src/retr.c:360 #, c-format msgid "Proxy %s: Must be HTTP.\n" msgstr "Proxy %s: Muss HTTP sein.\n" -#: src/retr.c:399 +#: src/retr.c:403 #, c-format msgid "%s: Redirection to itself.\n" msgstr "%s: Redirektion auf sich selber.\n" -#: src/retr.c:485 +#: src/retr.c:489 msgid "" "Giving up.\n" "\n" @@ -1067,7 +1074,7 @@ msgstr "" "Gebe auf.\n" "\n" -#: src/retr.c:485 +#: src/retr.c:489 msgid "" "Retrying.\n" "\n" @@ -1076,27 +1083,27 @@ msgstr "" "\n" # ??? -#: src/url.c:944 +#: src/url.c:951 #, c-format msgid "Error (%s): Link %s without a base provided.\n" msgstr "Fehler (%s): Verweis »%s« ohne »base« versucht.\n" -#: src/url.c:959 +#: src/url.c:966 #, c-format msgid "Error (%s): Base %s relative, without referer URL.\n" msgstr "Fehler (%s): »Base« %s relativ, ohne Bezugs-URL.\n" -#: src/url.c:1377 +#: src/url.c:1384 #, c-format msgid "Converting %s... " msgstr "Wandle um %s... " -#: src/url.c:1382 src/url.c:1450 +#: src/url.c:1389 src/url.c:1457 #, c-format msgid "Cannot convert links in %s: %s\n" msgstr "Kann Verweise nicht umwandeln zu %s: %s\n" -#: src/url.c:1426 +#: src/url.c:1433 #, fuzzy, c-format msgid "Cannot back up %s as %s: %s\n" msgstr "Kann Verweise nicht umwandeln zu %s: %s\n" diff --git a/po/hr.gmo b/po/hr.gmo index 92da17ac1dd5dc16cd8217097ed42f65832c644c..672b81ee19cf96885b78f63557c08ce88464e925 100644 GIT binary patch delta 3463 zcmZA2d2pRo8OQOr(mgdvv$cfe<|ZNgN|u|Oo6u6BlrB(&Ld69Ov>;#wM4&C$P&P}! zQlW)P5e6N{sSIwdjub|!{GlQ$E{KlGU}s=dU|dEK9SeS*+?NdFnfc{=-t(UOoM$_4 z-q<$nSDPpHOs{w$DUJuBE=gw0!(SxHoc|V==bnbgCCS|7cnfa80sJ$rOp?-iY{5&h z1n)|@4=X)?DSdt%*)IJ)cHl2@qQ~S-lZGTI>&8}GgsM(Dos`(mUvLbvyMT>p zy?8=#ec{A96B`#sBvP~RJ{!)%NWHYx@;Yi-%iE}R?HG!*_F^2w9mvtz?;tz1uVRi* zv+xiuLbX5c-zc+noDREn1?*7&x@9Ka7Op~FT^FT@4L`$Dd;zQRwc>Mq8cBVHXPK*y z-f?jKDwO8>OHi5WAHdo89L~kC!*2bbP$2cMW10GAbaq^uOr*p?nGYdCRsJ0E^7@G~8OGa=xI=EpQW^pGfRYPRBPW>BxVA6#zA;VdR zN6NAk8OTP{NL6+XiX^)gIh?%{7vWw!8J|avH0pV&?8IH@UDM+j@BdO+U)=v#_@aeMd=%pc-_?X;_+!r;X|Xx+;}*ul(UxzZh+B@J>(@$=nbyVt;ZgH;He!GKdohdGBBSkYRdj#*lgLi{@9`8oI$<)PyzjvbUQ^uAu^Tzj zaWGwf2}RjCz4*S9_t9LPD{%;K#-$iFbztY4sFAxOGcC9t+3(tc%Gz8MqR=a6gXYbJ*!3Fdq8`r8_=k zgAu7R4DQ6N>MTQ<9r_5eJ9GyMXlQRx{fC}3ab<>HE^ZhWT|_Y4i&8&)D$2s}#p!x9 z6-S2S0FDnILWd7Ok4t=gWiwKqTZ<(a4mmit5oI8^1xxYk823MS*hEw0euSdQ9YLwj z{S(!5Bx;$(HOTnLHE91xM8eUL&!_9*h~5~9p74Dbc^w^`m!rZ~)InH)8BIl#Q{2>HF8POFM*v zz6axDsMh0g-DcybQtrZ8o)O2dxW0ocTknE(7l3K=p z$f@z5S#)<~?d@@^$##kWZ%-FxI?6gZZY*LVxxyqGBWe`m29l!WekxFmD8qRaY5f18 zp(e-Y{Jok^qDcEC^vSo3 z!UsqrChI81KGH|YUK%FXFj+w{t}7y0hVP=m^mzwPtWF=MV-4x%$#Js3pP;4mVfq+t zr5K-~<0oguKhgCuZlVil1C3LR==jrVF`Y{DsFY%~Me_Sh&Zi-IAC=H1>ZC2SlJ2Cl zsE(Q`#%8*M*3ce$dt7C53c0rNF-uN6u>IXf%MVguCTCo*U>xx?-kybnm zKLnqHI9l-@#Lm@ZOLf9);kV#zklI(Sgk-jIJH&3~Ec8?V%0nm|s(c($-%2S38>;YD zT?L6ol|U|W=O&V>&CJPMmGll5R~>=v@DWH)RJ{ThlMK$PJScXsTg{~sNHtEXWz@eq zg0h4KQZk1_)%%!pNZ$l;LMI^x^#QXkrIP2rfYesM4lCh1kRGa$3#oBU2=dm{tbtu{ z4B|k|gHXdqVLA1$`6&tpYF>kMY^^jQhHI&lq^`Cfl8M?;i1)QPDiPJ5fH+=z8iwJM zknGgH1#zSfr^S&v$rR4ijYBe3cN}83?g^Nssp@`(g2B4CAsg%GK^&^5zS2DP*F*Nz z$DoEsAStYu*N8p!FF~F+5S^?y1R!ro!;NNLGK!-O55R>`99{&!Chz|hDBmy(--SiY zpM!GXRZ7wW|HK?e8hOl#IA2IEQANl{HWnc*vR^6 zdH+edPijd7zVi^n{whc_`8UEkCFW^NP4t=AX?mCY6%De2x=8o0*a@rQz21fukHZ$`;vnmRxsXT$Tp|Vn>mkh* zn1DDOI0e^2DJd5Q$(rhek{L=8+z+u6d<60V3TA(R(uDFG??E%Kj5J5HL_&nk*Fitr z0lBdGkf9jBVDk^5hHpalg=kdioscx2a0{fAp%kPfq1zyKLx*7r^$(puA+;fil!ee) z!#5xXTO{JuP@0O!TM|&iV~{MgJO#O^<=3zb{sYqWt>OstR>~(`-%20J#jRWEsZMA! zucH2Kr%*7|_HBrvw%@Vg_L4#{8#eIxriUI*zRchvAZ;HlEM@|vjy$WbJY+=R#|@*weh;|qXS#~t#a$c>0m z8sRlYm##i&bh=n=MOu*E$Ogng9z@2GBM1#Gf0R@P`LA)|el^RJ>&(+`SYY&hhI`={ z(t#X8+7THcT2mGaej0A(?<9Jvq4ja?`~=aEq>t8)*0&V-%T{BtHOZXJtcVvc7Zj)h<_o`?r? zdoNgVGO4&ujE&{2#K}!S@3EZ;JkX<-9Us@OSFR_v>xrA~Twb@D#Ojn4iRvwzhl6Q7 zmP$;!)o>53a}SLrQoF3+gfktxaJSYDhn$P5rz2^-eq`ftbKaSr>gN~abp+embnD7h zEuCiy>z^sij*C10SHaf|j%*rPJ2dECmQJRu>Byu`CQ_LxOJ}rsy2bVHQkB2xcr+2s z9nHS)Y}AeIlGT@+?R3&kXC_S#*t4<7tb65UT0o9D_BZW#MEgdqSL6`9RU+mqHzM5nF)*%4yMP8&-z)*tM6#yHWOl^5lGJ#bO3 zIC{=@NSE|MV#d<;Y%bT{TXvaVkbCI|$4+rRL#DVl8gUYiHI>m*kpzt~-|dVacV4;h E-<^nR<^TWy diff --git a/po/hr.po b/po/hr.po index ba68eb95..e3a28b3b 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-05-22 19:06-0700\n" +"POT-Creation-Date: 2000-08-30 03:32-0700\n" "PO-Revision-Date: 1998-02-29 21:05+01:00\n" "Last-Translator: Hrvoje Niksic \n" "Language-Team: Croatian \n" @@ -81,7 +81,7 @@ msgid "" "\n" msgstr "Nema direktorija `%s'.\n" -#: src/ftp.c:331 src/ftp.c:599 src/ftp.c:647 src/url.c:1494 +#: src/ftp.c:331 src/ftp.c:599 src/ftp.c:647 src/url.c:1501 msgid "done.\n" msgstr "gotovo.\n" @@ -259,17 +259,17 @@ msgstr "%s: nepoznata/nepodr msgid "%s: corrupt time-stamp.\n" msgstr "%s: pogre¹no vrijeme.\n" -#: src/ftp.c:1242 +#: src/ftp.c:1243 #, 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:1281 +#: src/ftp.c:1282 #, 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:1326 +#: src/ftp.c:1327 #, c-format msgid "Rejecting `%s'.\n" msgstr "Odbijam `%s'.\n" @@ -277,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:1373 +#: src/ftp.c:1374 #, c-format msgid "No matches on pattern `%s'.\n" msgstr "Ni¹ta ne ide uz `%s'.\n" -#: src/ftp.c:1433 +#: src/ftp.c:1434 #, c-format msgid "Wrote HTML-ized index to `%s' [%ld].\n" msgstr "Snimio HTML-iziran indeks u `%s' [%ld].\n" -#: src/ftp.c:1438 +#: src/ftp.c:1439 #, c-format msgid "Wrote HTML-ized index to `%s'.\n" msgstr "Snimio HTML-iziran indeks u `%s'.\n" @@ -378,32 +378,32 @@ msgstr "Ra msgid "Unknown error" msgstr "Nepoznata gre¹ka" -#: src/html.c:470 src/html.c:472 +#: src/html.c:539 src/html.c:541 #, c-format msgid "Index of /%s on %s:%d" msgstr "Indeks direktorija /%s na %s:%d" -#: src/html.c:494 +#: src/html.c:563 msgid "time unknown " msgstr "nepoznato vrijeme " -#: src/html.c:498 +#: src/html.c:567 msgid "File " msgstr "Datoteka " -#: src/html.c:501 +#: src/html.c:570 msgid "Directory " msgstr "Direktorij " -#: src/html.c:504 +#: src/html.c:573 msgid "Link " msgstr "Link " -#: src/html.c:507 +#: src/html.c:576 msgid "Not sure " msgstr "Ne znam " -#: src/html.c:525 +#: src/html.c:594 #, c-format msgid " (%s bytes)" msgstr " (%s bajtova)" @@ -569,37 +569,37 @@ msgstr "%s (%s) - Gre msgid "%s (%s) - Read error at byte %ld/%ld (%s). " msgstr "%s (%s) - Gre¹ka pri èitanju na bajtu %ld/%ld (%s). " -#: src/init.c:318 src/netrc.c:260 +#: src/init.c:319 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:339 src/init.c:345 +#: src/init.c:340 src/init.c:346 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Gre¹ka u %s na liniji %d.\n" -#: src/init.c:376 +#: src/init.c:377 #, 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:464 +#: src/init.c:465 #, c-format msgid "%s: BUG: unknown command `%s', value `%s'.\n" msgstr "%s: BUG: Nepoznata naredba `%s', vrijednost `%s'.\n" -#: src/init.c:491 +#: src/init.c:492 #, c-format msgid "%s: %s: Please specify on or off.\n" msgstr "%s: %s: Molim postavite na on ili off.\n" -#: src/init.c:509 src/init.c:766 src/init.c:788 src/init.c:861 +#: src/init.c:510 src/init.c:767 src/init.c:789 src/init.c:862 #, c-format msgid "%s: %s: Invalid specification `%s'.\n" msgstr "%s: %s: Pogre¹na specifikacija `%s'\n" -#: src/init.c:622 src/init.c:644 src/init.c:666 src/init.c:692 +#: src/init.c:623 src/init.c:645 src/init.c:667 src/init.c:693 #, c-format msgid "%s: Invalid specification `%s'\n" msgstr "wget: %s: Pogre¹na specifikacija `%s'\n" @@ -644,6 +644,7 @@ msgstr "" "\n" #: src/main.c:127 +#, fuzzy msgid "" "Logging and input file:\n" " -o, --output-file=FILE log messages to FILE.\n" @@ -652,8 +653,9 @@ msgid "" " -q, --quiet quiet (no output).\n" " -v, --verbose be verbose (this is the default).\n" " -nv, --non-verbose turn off verboseness, without being quiet.\n" -" -i, --input-file=FILE read URL-s from file.\n" +" -i, --input-file=FILE download URLs found in FILE.\n" " -F, --force-html treat input file as HTML.\n" +" -B, --base=URL prepends URL to relative links in -F -i file.\n" "\n" msgstr "" "Logging and input file:\n" @@ -667,14 +669,15 @@ msgstr "" " -F, --force-html tretiraj ulaznu datoteku kao HTML.\n" "\n" -#: src/main.c:137 +#: src/main.c:138 #, fuzzy msgid "" "Download:\n" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits).\n" " -O --output-document=FILE write documents to FILE.\n" -" -nc, --no-clobber don't clobber existing files.\n" +" -nc, --no-clobber don't clobber existing files or use .# " +"suffixes.\n" " -c, --continue restart getting an existing file.\n" " --dot-style=STYLE set retrieval display style.\n" " -N, --timestamping don't retrieve files if older than local.\n" @@ -682,7 +685,7 @@ 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 " +" --waitretry=SECONDS\twait 1...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" @@ -703,7 +706,7 @@ msgstr "" " -Q, --quota=BROJ postavi ogranièenje skidanja na BROJ.\n" "\n" -#: src/main.c:152 +#: src/main.c:153 msgid "" "Directories:\n" " -nd --no-directories don't create directories.\n" @@ -722,7 +725,7 @@ msgstr "" " --cut-dirs=BROJ ignoriraj BROJ stranih direktorija.\n" "\n" -#: src/main.c:159 +#: src/main.c:160 #, fuzzy msgid "" "HTTP options:\n" @@ -754,7 +757,7 @@ msgstr "" " Wget/VERZIJA.\n" "\n" -#: src/main.c:171 +#: src/main.c:172 msgid "" "FTP options:\n" " --retr-symlinks retrieve FTP symbolic links.\n" @@ -768,17 +771,21 @@ msgstr "" " --passive-ftp koristi \"pasivni\" mod prijenosa.\n" "\n" -#: src/main.c:176 +#: src/main.c:177 #, fuzzy msgid "" "Recursive retrieval:\n" " -r, --recursive recursive web-suck -- use with care!.\n" -" -l, --level=NUMBER maximum recursion depth (0 to unlimit).\n" +" -l, --level=NUMBER maximum recursion depth (inf or 0 for " +"infinite).\n" " --delete-after delete downloaded files.\n" " -k, --convert-links convert non-relative links to relative.\n" " -K, --backup-converted before converting file X, back up as X.orig.\n" -" -m, --mirror turn on options suitable for mirroring.\n" +" -m, --mirror shortcut option equivalent to -r -N -l inf " +"-nr.\n" " -nr, --dont-remove-listing don't remove `.listing' files.\n" +" -p, --page-requisites get all images, etc. needed to display HTML " +"page.\n" "\n" msgstr "" "Rekurzivno skidanje:\n" @@ -791,7 +798,7 @@ msgstr "" " -nr, --dont-remove-listing ne uklanjaj `.listing' datoteke.\n" "\n" -#: src/main.c:185 +#: src/main.c:187 #, fuzzy msgid "" "Recursive accept/reject:\n" @@ -832,16 +839,16 @@ msgstr "" " -np, --no-parent ne idi u direktorij vi¹e.\n" "\n" -#: src/main.c:200 +#: src/main.c:202 msgid "Mail bug reports and suggestions to .\n" msgstr "©aljite izvje¹taje o bugovima i prijedloge na .\n" -#: src/main.c:364 +#: src/main.c:371 #, c-format msgid "%s: debug support not compiled in.\n" msgstr "%s: podr¹ka za debugiranje nije ugraðena.\n" -#: src/main.c:415 +#: src/main.c:425 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 +862,7 @@ msgstr "" "PROIZVODNOSTI ili UPOTREBLJIVOSTI ZA ODREÐENU SVRHU. Pogledajte GNU\n" "General Public License za vi¹e detalja.\n" -#: src/main.c:421 +#: src/main.c:431 #, fuzzy msgid "" "\n" @@ -864,43 +871,43 @@ msgstr "" "\n" "Napisao Hrvoje Nik¹iæ .\n" -#: src/main.c:495 +#: src/main.c:505 #, c-format msgid "%s: %s: invalid command\n" msgstr "%s: %s: nedozvoljena naredba\n" -#: src/main.c:548 +#: src/main.c:558 #, 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:551 src/main.c:593 src/main.c:636 +#: src/main.c:561 src/main.c:603 src/main.c:661 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Poku¹ajte `%s --help' za vi¹e opcija.\n" -#: src/main.c:616 +#: src/main.c:641 msgid "Can't be verbose and quiet at the same time.\n" msgstr "Ne mogu istovremeno biti verbozan i tih.\n" -#: src/main.c:622 +#: src/main.c:647 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:631 +#: src/main.c:656 #, c-format msgid "%s: missing URL\n" msgstr "%s: nedostaje URL\n" -#: src/main.c:719 +#: src/main.c:744 #, c-format msgid "No URLs found in %s.\n" msgstr "Nijedan URL nije pronaðen u %s.\n" -#: src/main.c:728 +#: src/main.c:753 #, c-format msgid "" "\n" @@ -911,14 +918,14 @@ msgstr "" "ZAVR©IO --%s--\n" "Skinuo: %s bajta u %d datoteka\n" -#: src/main.c:733 +#: src/main.c:758 #, 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:760 +#: src/main.c:785 msgid "%s received, redirecting output to `%%s'.\n" msgstr "%s primljen, usmjeravam izlaz na `%%s'.\n" @@ -976,17 +983,17 @@ msgstr "Uporaba: %s NETRC [RA msgid "%s: cannot stat %s: %s\n" msgstr "%s: ne mogu stat-irati %s: %s\n" -#: src/recur.c:451 src/retr.c:464 +#: src/recur.c:463 src/retr.c:468 #, c-format msgid "Removing %s.\n" msgstr "Uklanjam %s.\n" -#: src/recur.c:452 +#: src/recur.c:464 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Uklanjam %s buduæi da bi ga trebalo odbiti.\n" -#: src/recur.c:611 +#: src/recur.c:624 msgid "Loading robots.txt; please ignore errors.\n" msgstr "Uèitavam robots.txt; molim ne obazirati se na gre¹ke.\n" @@ -999,21 +1006,21 @@ msgstr "" "\n" " [ preskaèem %dK ]" -#: src/retr.c:345 +#: src/retr.c:349 msgid "Could not find proxy host.\n" msgstr "Ne mogu naæi proxy raèunalo.\n" -#: src/retr.c:356 +#: src/retr.c:360 #, c-format msgid "Proxy %s: Must be HTTP.\n" msgstr "Proxy %s: Mora biti HTTP.\n" -#: src/retr.c:399 +#: src/retr.c:403 #, c-format msgid "%s: Redirection to itself.\n" msgstr "%s: Redirekcija na samog sebe.\n" -#: src/retr.c:485 +#: src/retr.c:489 msgid "" "Giving up.\n" "\n" @@ -1021,7 +1028,7 @@ msgstr "" "Odustajem.\n" "\n" -#: src/retr.c:485 +#: src/retr.c:489 msgid "" "Retrying.\n" "\n" @@ -1029,27 +1036,27 @@ msgstr "" "Poku¹avam ponovo.\n" "\n" -#: src/url.c:944 +#: src/url.c:951 #, c-format msgid "Error (%s): Link %s without a base provided.\n" msgstr "Gre¹ka (%s): Zadan je link %s bez osnove.\n" -#: src/url.c:959 +#: src/url.c:966 #, c-format msgid "Error (%s): Base %s relative, without referer URL.\n" msgstr "Gre¹ka (%s): Baza %s je relativna, bez referirajuæeg URL-a.\n" -#: src/url.c:1377 +#: src/url.c:1384 #, c-format msgid "Converting %s... " msgstr "Konvertiram %s... " -#: src/url.c:1382 src/url.c:1450 +#: src/url.c:1389 src/url.c:1457 #, c-format msgid "Cannot convert links in %s: %s\n" msgstr "Ne mogu konvertirati linkove u %s: %s\n" -#: src/url.c:1426 +#: src/url.c:1433 #, fuzzy, c-format msgid "Cannot back up %s as %s: %s\n" msgstr "Ne mogu konvertirati linkove u %s: %s\n" diff --git a/po/it.gmo b/po/it.gmo index 5106661166690c9ffde75bbece8f120c427d52dd..6d6c0d4b6eb291ea554c0337470a7b0a4ee104e0 100644 GIT binary patch delta 3171 zcmZA3du*On9l-HZ7?-wVU9a1^_U+SdZ`-Z6ZN08*x8j&&z=9JEl1(j!p&`JgOu0>7 zaD#z51}hU~QweGq26Q@1yi77pP#7Z`@iK|d#7hK$AjS|cGy3_x@2h|KB){i-&Uw!H z-Ot-Tv8!U=j>7&~b*ED4IS4H&%{q-Qq*VE<(sETdE=;Lv3GTvmxB`#k#rQAGr!;3h zR^!$(Z^e4^-R1cKoNfLn(lzHvEc6+K18phQ_?SAe7kltB%&>s%_%L#?=KENSzrm&W z20Ay_x3n17miYnX_}o3%fsf&QJb^j<1N&(WU9&7OSbIU~L+v(PV7?bcUmFK0ul)&f zwDxtRxUL4r(Al&Mufk#6j~PCP=i{r$V0}N%!wtxh`Yr6IMFzK7V6grXY{jEE7hgo# zsDGuj-r!KAx?!ZW-mn=(-f$1n({LC$*znUb|BCc9Hee+>n~WO=un8|Ss&J%c!Oc-bA%-b|@lkek%^*HOSHC&mld{Cs1~p|A^ma zgELY4g}+3ZU3ePlZLv3+u+SpY!} zP)&1RMkUC72lYEKnU9D{pt44*@LhGvz%53N8c z9eOwVHWYfS4VMEL{(?EZ!_T90!!MRNaxSj-Bk5N%RjdEV?FLFP@=27UkZe^)zx|A{<|Uu59$s#QAam2MwkzXuydFa1xJWW*D`Sok_~$2V^oFHJ;pu9Gg6f z=im>~-pL0e1;<-BA?R{x+>>qMe#JB>*XRY^kvW~o$Tu*Kz@$4mwi=)y@ z_Z6Ryd0$Dkkcr|-N)OI_bN1lmO=e5UE#zYIaq@PeujALC_}uJ$4|xZfDXx@WA3V~1 j-g&i0>awY`s>b>Tmu1Ta#|Kv&*_?l(;mGL3n`iw8u>U`3 delta 4181 zcma);dvIJ;8Ng3!TFADL_oI1n_K{@s*iE);9-C(KC^pasuhLR0Fm{{VY zQi@Bp%9|FJQYv%+XLM?rqGLxZjDOS-#u@Q3>L3CYl@UeMih~R=iu(KRy(!f}>Y0A` zch0%zeDAyIeY=nCEh!u*t$JBG<1lDeYH=z2nNnqca<)A~ut_OT4DN-S;0pL6T&L89 z9@qxAz@@O@@=jRI`k=dh94=#h0(QcuVIjoiG?R;zD#y5Lha<2XPC*U#K`;Co{6VMddAUIqOGY z5XwaiSH1#qwDMmN#Z}A|*{NCy`=AB;;g_I>FTn};4~W6)QCJVJhd5H5$G-A2xrYr5 zR(~C~z#qU0_&Ox2>c2btH8>-wu9m*~1 z@E1_tzX{P>U#?V17*bBzZzx>p9BhzCNKM179M}RMVZDr`ybJNZaS5c>jg(0uZM+6X z;Vy`yjZZ)fHlBh5@NM`MHZUf&Z~6lyv(4xfz0K&7CM+}$GU;I>0qN>yDTN&P4!jWl z2-d=1x@$L*mPM?|MvL?ghFi#z`Y7BC>4}!R;Q8aRv z9BOziY@q($-Aqv6Jpf6sSDFyT-j^Y%^U7yNCVW+pl=)C95&70Z9QRQ!G3+xShJEN% zz3_fWW_(XW^!UV~i>RJtj{AQ0RDpy3J|;Ne-wJ68|IJVi9)cP^2}zm%MM%v9iy`j= zF=s!p1-7x4CY1f75XS=FhxAS0=kPozCFCmzyy~tAtRTNofw$S=bV|lJ-zoQc;B63xI==zQK&M2?{m%Cw z8SU~q>#jIl!#V-c(e*g?MPb(|$f0ie%tm1lYM6w)?-m0%(k+o~g+GB~*j@oY4zrNY zwC7oP9ee{4Na!+%1EG1i9LiTQ3BT;_7yirykHclK0%A;>Fgy&2Har7yCM>m;{bP_+ zhF^eWptlraxK|t@;@-`WucP-SNI84&g$?kq%WpzC_hV;W=#}r83w?YV3Zs3}l~=&) zAOVv}BvnImkP-~t2-zFD16IN(Am8=SNjLzXgUw3CBx4wg zNy&tg3G~GFK@WTgawhf_7=e;{G7@_YVkh>FQj6s8|8N-_P5hmalwxS)YB&LBAt@a> z3hUu_-S;oSZq{!=qL1T@{LsWlAkM@$Lz+0g2jWQlB$RVxM;wp;5w>yUeE0AFD4(GG z!i{EN7rfbBAAu+wJpqYi^fwTNqo*MTN8g2HXbh+2w|}f1VqolA$i1 z555A4ZsK)V2H$ko@4-5yRxN>)VpU7=R9RE)r&&FO$k>D&K<+6n^K>u2fteSPaSMWO zCDpmNc%`SQ?LKB25%2Ft(g^jEl$;rdi~BwGgcLz0&$>2SQ#|5m|#wBOgH|pE5q@Kx(A6y7Moh1`K`MD9lxM)r8a1s7Bn5}9e8%FO32 zJ(Efs!yc_eW)F{$nYY*t$!>gd&HB|^M%qm3IU|=#B#oT5Of4_MawlQmNzBh1nQ8ax z!Yya>gRe~&?0eJ3wtUhyaMoi!o61<)dF41`TiR~l*q%=r)>((`sk0f(nA$ntXv3VPv1(3(x5Sv=6&j8rD6ZLe%kQnn{{wiohxjhk4VH4@W$(}wk-oSw;=b9OcCOOy7c z88bU&gl4U|^cmY)TU@fvs-8~d^ragwTOaluZ)#n;*wY_cu|h{;!+itCP5-f)!X&lS z(4q|6lQ^rp#&gVu7~dX5#&e({^khSp7NE zwwUg4N-1vJ=g!pwIbzK0N|`xR2c;T$>SK3uXZT`i)DP)~`K*~vkq#Z)o;PxI_iH+p z)>G!(yqUEUb4JE8J;jn}L$M;dq%fZ~Xp&SWWtr#f60VwhL3@wR;b4M*cAznlHT3%~ y|F14tXp*#%Od2|wPU*{O6-{E#e1IR?CJD=;25GygB$LhuPh`eIzcdcLv-sayFmD0? diff --git a/po/it.po b/po/it.po index 3e8e8277..6beef911 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-05-22 19:06-0700\n" +"POT-Creation-Date: 2000-08-30 03:32-0700\n" "PO-Revision-Date: 1998-06-13 15:22+02:00\n" "Last-Translator: Giovanni Bortolozzo \n" "Language-Team: Italian \n" @@ -84,7 +84,7 @@ msgstr "" "La directory `%s' non esiste.\n" "\n" -#: src/ftp.c:331 src/ftp.c:599 src/ftp.c:647 src/url.c:1494 +#: src/ftp.c:331 src/ftp.c:599 src/ftp.c:647 src/url.c:1501 msgid "done.\n" msgstr "fatto.\n" @@ -261,17 +261,17 @@ msgstr "%s: tipo di file sconosciuto/non supportato.\n" msgid "%s: corrupt time-stamp.\n" msgstr "%s: time-stamp corrotto.\n" -#: src/ftp.c:1242 +#: src/ftp.c:1243 #, 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:1281 +#: src/ftp.c:1282 #, 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:1326 +#: src/ftp.c:1327 #, 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:1373 +#: src/ftp.c:1374 #, c-format msgid "No matches on pattern `%s'.\n" msgstr "Nessun corrispondenza con il modello `%s'.\n" -#: src/ftp.c:1433 +#: src/ftp.c:1434 #, 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:1438 +#: src/ftp.c:1439 #, c-format msgid "Wrote HTML-ized index to `%s'.\n" msgstr "Scrivo l'indice in formato HTML in `%s'.\n" @@ -384,32 +384,32 @@ msgstr "Host non trovato" msgid "Unknown error" msgstr "Errore sconosciuto" -#: src/html.c:470 src/html.c:472 +#: src/html.c:539 src/html.c:541 #, c-format msgid "Index of /%s on %s:%d" msgstr "Indice della directory /%s su %s:%d" -#: src/html.c:494 +#: src/html.c:563 msgid "time unknown " msgstr "data sconosciuta " -#: src/html.c:498 +#: src/html.c:567 msgid "File " msgstr "File " -#: src/html.c:501 +#: src/html.c:570 msgid "Directory " msgstr "Directory " -#: src/html.c:504 +#: src/html.c:573 msgid "Link " msgstr "Link " -#: src/html.c:507 +#: src/html.c:576 msgid "Not sure " msgstr "Incerto " -#: src/html.c:525 +#: src/html.c:594 #, c-format msgid " (%s bytes)" msgstr " (%s byte)" @@ -573,39 +573,39 @@ msgstr "%s (%s) - Errore di lettura al byte %ld (%s). " msgid "%s (%s) - Read error at byte %ld/%ld (%s). " msgstr "%s (%s) - Errore di lettura al %ld/%ld (%s). " -#: src/init.c:318 src/netrc.c:260 +#: src/init.c:319 src/netrc.c:260 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Impossibile leggere %s (%s).\n" -#: src/init.c:339 src/init.c:345 +#: src/init.c:340 src/init.c:346 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Errore in %s alla linea %d.\n" -#: src/init.c:376 +#: src/init.c:377 #, 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:464 +#: src/init.c:465 #, c-format msgid "%s: BUG: unknown command `%s', value `%s'.\n" msgstr "%s: BUG: comando `%s' sconosciuto, valore `%s'.\n" -#: src/init.c:491 +#: src/init.c:492 #, c-format msgid "%s: %s: Please specify on or off.\n" msgstr "%s: %s: Specificare on oppure off.\n" -#: src/init.c:509 src/init.c:766 src/init.c:788 src/init.c:861 +#: src/init.c:510 src/init.c:767 src/init.c:789 src/init.c:862 #, c-format msgid "%s: %s: Invalid specification `%s'.\n" msgstr "%s: %s: Specificazione non valida `%s'\n" -#: src/init.c:622 src/init.c:644 src/init.c:666 src/init.c:692 +#: src/init.c:623 src/init.c:645 src/init.c:667 src/init.c:693 #, c-format msgid "%s: Invalid specification `%s'\n" msgstr "wget: %s: Specificazione non valida `%s'\n" @@ -651,6 +651,7 @@ msgstr "" "\n" #: src/main.c:127 +#, fuzzy msgid "" "Logging and input file:\n" " -o, --output-file=FILE log messages to FILE.\n" @@ -659,8 +660,9 @@ msgid "" " -q, --quiet quiet (no output).\n" " -v, --verbose be verbose (this is the default).\n" " -nv, --non-verbose turn off verboseness, without being quiet.\n" -" -i, --input-file=FILE read URL-s from file.\n" +" -i, --input-file=FILE download URLs found in FILE.\n" " -F, --force-html treat input file as HTML.\n" +" -B, --base=URL prepends URL to relative links in -F -i file.\n" "\n" msgstr "" "File di log e d'ingresso:\n" @@ -675,14 +677,15 @@ msgstr "" " -F, --force-html tratta il file di input come HTML.\n" "\n" -#: src/main.c:137 +#: src/main.c:138 #, fuzzy msgid "" "Download:\n" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits).\n" " -O --output-document=FILE write documents to FILE.\n" -" -nc, --no-clobber don't clobber existing files.\n" +" -nc, --no-clobber don't clobber existing files or use .# " +"suffixes.\n" " -c, --continue restart getting an existing file.\n" " --dot-style=STYLE set retrieval display style.\n" " -N, --timestamping don't retrieve files if older than local.\n" @@ -690,7 +693,7 @@ 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 " +" --waitretry=SECONDS\twait 1...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" @@ -714,7 +717,7 @@ msgstr "" " -Q, --quota=NUMERO imposta la quota di scarico a NUMERO.\n" "\n" -#: src/main.c:152 +#: src/main.c:153 msgid "" "Directories:\n" " -nd --no-directories don't create directories.\n" @@ -734,7 +737,7 @@ msgstr "" " directory remote.\n" "\n" -#: src/main.c:159 +#: src/main.c:160 #, fuzzy msgid "" "HTTP options:\n" @@ -765,7 +768,7 @@ msgstr "" " Wget/VERSIONE.\n" "\n" -#: src/main.c:171 +#: src/main.c:172 msgid "" "FTP options:\n" " --retr-symlinks retrieve FTP symbolic links.\n" @@ -779,17 +782,21 @@ msgstr "" " --passive-ftp usa il modo di trasferimento \"passivo\".\n" "\n" -#: src/main.c:176 +#: src/main.c:177 #, fuzzy msgid "" "Recursive retrieval:\n" " -r, --recursive recursive web-suck -- use with care!.\n" -" -l, --level=NUMBER maximum recursion depth (0 to unlimit).\n" +" -l, --level=NUMBER maximum recursion depth (inf or 0 for " +"infinite).\n" " --delete-after delete downloaded files.\n" " -k, --convert-links convert non-relative links to relative.\n" " -K, --backup-converted before converting file X, back up as X.orig.\n" -" -m, --mirror turn on options suitable for mirroring.\n" +" -m, --mirror shortcut option equivalent to -r -N -l inf " +"-nr.\n" " -nr, --dont-remove-listing don't remove `.listing' files.\n" +" -p, --page-requisites get all images, etc. needed to display HTML " +"page.\n" "\n" msgstr "" "Scarico ricorsivo:\n" @@ -803,7 +810,7 @@ msgstr "" " -nr, --dont-remove-listing non rimuove i file `.listing'.\n" "\n" -#: src/main.c:185 +#: src/main.c:187 #, fuzzy msgid "" "Recursive accept/reject:\n" @@ -845,17 +852,17 @@ msgstr "" " -np, --no-parent non risale alla directory genitrice.\n" "\n" -#: src/main.c:200 +#: src/main.c:202 msgid "Mail bug reports and suggestions to .\n" msgstr "Inviare segnalazioni di bug e suggerimenti a .\n" -#: src/main.c:364 +#: src/main.c:371 #, 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:415 +#: src/main.c:425 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" @@ -869,7 +876,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:421 +#: src/main.c:431 #, fuzzy msgid "" "\n" @@ -878,45 +885,45 @@ msgstr "" "\n" "Scritto da Hrvoje Niksic .\n" -#: src/main.c:495 +#: src/main.c:505 #, c-format msgid "%s: %s: invalid command\n" msgstr "%s: %s: comando non valido\n" -#: src/main.c:548 +#: src/main.c:558 #, 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:551 src/main.c:593 src/main.c:636 +#: src/main.c:561 src/main.c:603 src/main.c:661 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Usare `%s --help' per ulteriori opzioni.\n" -#: src/main.c:616 +#: src/main.c:641 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:622 +#: src/main.c:647 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:631 +#: src/main.c:656 #, c-format msgid "%s: missing URL\n" msgstr "%s: manca l'URL\n" -#: src/main.c:719 +#: src/main.c:744 #, c-format msgid "No URLs found in %s.\n" msgstr "Non ci sono URL in %s.\n" -#: src/main.c:728 +#: src/main.c:753 #, c-format msgid "" "\n" @@ -927,14 +934,14 @@ msgstr "" "FINITO --%s--\n" "Scaricati: %s byte in %d file\n" -#: src/main.c:733 +#: src/main.c:758 #, 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:760 +#: src/main.c:785 msgid "%s received, redirecting output to `%%s'.\n" msgstr "%s ricevuti, redirigo l'output su `%%s'.\n" @@ -992,17 +999,17 @@ msgstr "Uso: %s NETRC [HOSTNAME]\n" msgid "%s: cannot stat %s: %s\n" msgstr "%s: stat su %s fallita: %s\n" -#: src/recur.c:451 src/retr.c:464 +#: src/recur.c:463 src/retr.c:468 #, c-format msgid "Removing %s.\n" msgstr "Rimuovo %s.\n" -#: src/recur.c:452 +#: src/recur.c:464 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Rimuovo %s poiché deve essere rifiutato.\n" -#: src/recur.c:611 +#: src/recur.c:624 msgid "Loading robots.txt; please ignore errors.\n" msgstr "Carico robots.txt; si ignorino eventuali errori.\n" @@ -1015,21 +1022,21 @@ msgstr "" "\n" " [ salto %dK ]" -#: src/retr.c:345 +#: src/retr.c:349 msgid "Could not find proxy host.\n" msgstr "Non riesco a trovare il proxy host.\n" -#: src/retr.c:356 +#: src/retr.c:360 #, c-format msgid "Proxy %s: Must be HTTP.\n" msgstr "Proxy %s: Deve essere HTTP.\n" -#: src/retr.c:399 +#: src/retr.c:403 #, c-format msgid "%s: Redirection to itself.\n" msgstr "%s: Redirezione su se stesso.\n" -#: src/retr.c:485 +#: src/retr.c:489 msgid "" "Giving up.\n" "\n" @@ -1037,7 +1044,7 @@ msgstr "" "Rinuncio.\n" "\n" -#: src/retr.c:485 +#: src/retr.c:489 msgid "" "Retrying.\n" "\n" @@ -1045,27 +1052,27 @@ msgstr "" "Ritento.\n" "\n" -#: src/url.c:944 +#: src/url.c:951 #, c-format msgid "Error (%s): Link %s without a base provided.\n" msgstr "Errore (%s): Link %s fornito senza una base.\n" -#: src/url.c:959 +#: src/url.c:966 #, c-format msgid "Error (%s): Base %s relative, without referer URL.\n" msgstr "Errore (%s): Base %s relativa, senza URL di riferimento\n" -#: src/url.c:1377 +#: src/url.c:1384 #, c-format msgid "Converting %s... " msgstr "Converto %s... " -#: src/url.c:1382 src/url.c:1450 +#: src/url.c:1389 src/url.c:1457 #, c-format msgid "Cannot convert links in %s: %s\n" msgstr "Non riesco a convertire i link in %s: %s\n" -#: src/url.c:1426 +#: src/url.c:1433 #, fuzzy, c-format msgid "Cannot back up %s as %s: %s\n" msgstr "Non riesco a convertire i link in %s: %s\n" diff --git a/po/no.gmo b/po/no.gmo index 2a6317c90be1129182f12efa24818e5d8c4d1a46..e5ed1450eab7e92dd74933bc3154625c83125a82 100644 GIT binary patch delta 3170 zcmYk+dyJfA702+>#Yuj)U7kM_10}D^VWUHPwSUZfUUWQxR;mP<_tjF-fZ`Th{B3(blM)l7vFleA!NaCWLC_}28?7~rQW40cF#rr!^ zO>>_^CCGgX^-k_7RNGtx=4yuEKM|1L=@ERK@0mvXde&oE z20c3s)U_v?CpI3!JRU_-_52B`(JShB-+NYVy*C07T<_i4`XeZ?-e>Scd;zJ@`y$ri zziRWoNUTL038owe`f{4ici!i+=-&PVv_MPDzGXI2f`gnsw+L zJ>_v_WaZ#)vK^GPNS>q~u!qKYr8MmRDuDS{rqw-bX-<2^+#LucHa2fs` zsZ$=SHz3)VEYs`p4d~*rdon(n@j0Z(cqpUW$A^(}<5Y+Y$Ir{wccSdZZ`M-+8o$?E zpsOPQL9dPg+VOYZ?^6HOuUHWA#MP)5CT>K|C%%BxnTRHm~)2B3f zD?WnXLp@Tw0oAzp5b|4m3YDz*JkI)$ik>Lq8Cb9WQ&B4sPle>9nL2>#IrZgi{vCAj zRMd_F(~D3uO)E#0+wo-c$dsDXpGFr?N5%r2ei$3@q@Rr@T!YUb6-v&P zkfi@jd_VIas-`ep&g0=2A_2vvoO!u+``N885?#_xx-gZ7G-Z zF*cvAO<;Uzw`TMIM`#yMbjwb*j@`uGl~QG7vuddR?(lmq`*3AXL*IfA zR32z3l=quo$KuaHhoxwM8Fm%Z>gf))nMGk=#ZF}L?5QFC>eBXXd=Iv30uJATAznuNr0!eg{+8%75$s6tcg)Yp!wbDh}N zrZC`^$0!@D6inBa$I3rQ1tzqu+Yr-`_9&Y)ZD<2&+E_=W3aZgfOd2p?fY|T5_aeKIHi@og7BJYb+4<10 z8?I!27zUvn#Bjq&h@%akLKHVL*2qp{0>+^Uhu~9C!N0-F;l~hzO%reh{5r&urZV<5 zKZCt2V6f>&uoM0sE{CTfQ8j(!tT*F~q`G;nv)-JCMBaP|qNn*65T}~oaOhnE(c>j6 z+A@f98o_!eVGG=heXWMag*e-$ctBW$Jq-M2A7LHB-0db_0wQQZAHBz4_#&B%nW5t1?=N+lxSMu_7+$|Z(< zI>fLKomxM91dD}k@aY&|mr4+LMJS5WIUqb@u{S!n_@5c~F zgJHSmkIG${(g1MqUV2@+BGVTcpq z7a@*>KZ5J_)xk>5ZZjaZ*Dp!QKF((Tb9NMuoz$ib)yQ4|$J zvMwpbQ1lIlG14oFVsV%2AtjAX!#Y@T*Y9>IB|=Z^Cy;Ddv6Bo)ZR~%Ll=V|LZ39d| z4ENvb@>!REgk+>&GDEk=y^zes$%aH2U+b=KhuoNWnV!O-_!8jDwHDFq9^`64JFYUo!|Xyk;95g5Q9YVa*RAJu*~)lyc~M z5WPb$L7W_V1&+W^;Go5?C5NR;hox3{JS-_EHN$%#jW&GPoj(ULJS?>%1H=D;G}8!Y zY;rT?7jHx&Mc>Fn5W^!9F*Zh?hPCj7yZ%oCw@$I}0So*(jmifv{4d1AF%FAEV_$|i zGYo z+RT0icyC1>bf#y$sjU4-yGaXQhTMx}HLbd;HriccEQOP2%7Oi!=lwP0fvQ>Sueqyw zur_Rcm-%f7Z7dxn|Lv9kRcICDLZphUN7Bfbkn<6FzUe@I;)?6Fpfk_NUmfilXCeia>mhf~ey-$QMx+_GAq9j!vY&mt1MXOmaL0GU6rv;J z?%KiXk-EX;EzJ55`T5w0NGr-kp)IAC?dMkB-$phg(sBz=@o4Ks7d2QZBdv1AT-j8a zTwWjZC>1S4cts0klhvrKCfBZ?x=P8DFJ#rMUMi)sdP$iDB_CpPCS{*V&CTgX+C92( z%2_=3v9x8MOY76+tZm?o*IY4Yn9BL&IAdFyw@=KMbGmuPW_#!?291Jp_J`~P75hL% zFHRRq`q@XObxSRL2%0mwlH#8^qhmFbD(6i{fq{l-)F>Fyg}sYf%yQ9Cg-m8ai$QK8 z>gJp|g9mC_&ly=|du4l)vpuo1y^z=I-NdS*o=U4N*G@%CDpM@X+SRZRt+fwj3dJ3I zbjF;`FWOeh zFDmMoGmN}m!o$xlx?@WYRj6M+&1TM;xx6xNk=ol1en#o#?Aa%+qMCbCmGWiN)D4xY zENV#GA)d1d91W>TzAT<1Bw{vIx~X8;wm+vCO1PQVRZx63RGH8%C-yJwipr@X`!gRD z^SP`FmQ1cls+j)5UYN}p>7u@PGD5}-mD{;fSB@(&OD@VedSJ>eDb\n" "Language-Team: Norwegian \n" @@ -83,7 +83,7 @@ msgstr "" "Ingen katalog ved navn «%s».\n" "\n" -#: src/ftp.c:331 src/ftp.c:599 src/ftp.c:647 src/url.c:1494 +#: src/ftp.c:331 src/ftp.c:599 src/ftp.c:647 src/url.c:1501 msgid "done.\n" msgstr "OK.\n" @@ -260,17 +260,17 @@ msgstr "%s: filtypen er ukjent/ikke st msgid "%s: corrupt time-stamp.\n" msgstr "%s: ugyldig tidsstempel.\n" -#: src/ftp.c:1242 +#: src/ftp.c:1243 #, 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:1281 +#: src/ftp.c:1282 #, 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:1326 +#: src/ftp.c:1327 #, 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:1373 +#: src/ftp.c:1374 #, c-format msgid "No matches on pattern `%s'.\n" msgstr "Ingenting passer med mønsteret «%s».\n" -#: src/ftp.c:1433 +#: src/ftp.c:1434 #, c-format msgid "Wrote HTML-ized index to `%s' [%ld].\n" msgstr "Skrev HTML-formattert indeks til «%s» [%ld].\n" -#: src/ftp.c:1438 +#: src/ftp.c:1439 #, c-format msgid "Wrote HTML-ized index to `%s'.\n" msgstr "Skrev HTML-formattert indeks til «%s».\n" @@ -380,32 +380,32 @@ msgstr "Tjener ikke funnet" msgid "Unknown error" msgstr "Ukjent feil" -#: src/html.c:470 src/html.c:472 +#: src/html.c:539 src/html.c:541 #, c-format msgid "Index of /%s on %s:%d" msgstr "Indeks for /%s på %s:%d" -#: src/html.c:494 +#: src/html.c:563 msgid "time unknown " msgstr "ukjent tid " -#: src/html.c:498 +#: src/html.c:567 msgid "File " msgstr "Fil " -#: src/html.c:501 +#: src/html.c:570 msgid "Directory " msgstr "Katalog " -#: src/html.c:504 +#: src/html.c:573 msgid "Link " msgstr "Link " -#: src/html.c:507 +#: src/html.c:576 msgid "Not sure " msgstr "Usikker " -#: src/html.c:525 +#: src/html.c:594 #, c-format msgid " (%s bytes)" msgstr " (%s bytes)" @@ -569,37 +569,37 @@ msgstr "%s (%s) - Lesefeil ved byte %ld (%s)." msgid "%s (%s) - Read error at byte %ld/%ld (%s). " msgstr "%s (%s) - Lesefeil ved byte %ld/%ld (%s)." -#: src/init.c:318 src/netrc.c:260 +#: src/init.c:319 src/netrc.c:260 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Kan ikke lese %s (%s).\n" -#: src/init.c:339 src/init.c:345 +#: src/init.c:340 src/init.c:346 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Feil i %s på linje %d.\n" -#: src/init.c:376 +#: src/init.c:377 #, 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:464 +#: src/init.c:465 #, c-format msgid "%s: BUG: unknown command `%s', value `%s'.\n" msgstr "%s: Ukjent kommando «%s», verdi «%s».\n" -#: src/init.c:491 +#: src/init.c:492 #, c-format msgid "%s: %s: Please specify on or off.\n" msgstr "%s: %s: Vennligst spesifiser «on» eller «off».\n" -#: src/init.c:509 src/init.c:766 src/init.c:788 src/init.c:861 +#: src/init.c:510 src/init.c:767 src/init.c:789 src/init.c:862 #, c-format msgid "%s: %s: Invalid specification `%s'.\n" msgstr "%s: %s: Ugyldig spesifikasjon «%s»\n" -#: src/init.c:622 src/init.c:644 src/init.c:666 src/init.c:692 +#: src/init.c:623 src/init.c:645 src/init.c:667 src/init.c:693 #, c-format msgid "%s: Invalid specification `%s'\n" msgstr "%s: Ugyldig spesifikasjon «%s»\n" @@ -645,6 +645,7 @@ msgstr "" "\n" #: src/main.c:127 +#, fuzzy msgid "" "Logging and input file:\n" " -o, --output-file=FILE log messages to FILE.\n" @@ -653,8 +654,9 @@ msgid "" " -q, --quiet quiet (no output).\n" " -v, --verbose be verbose (this is the default).\n" " -nv, --non-verbose turn off verboseness, without being quiet.\n" -" -i, --input-file=FILE read URL-s from file.\n" +" -i, --input-file=FILE download URLs found in FILE.\n" " -F, --force-html treat input file as HTML.\n" +" -B, --base=URL prepends URL to relative links in -F -i file.\n" "\n" msgstr "" "Utskrifter og innlesing:\n" @@ -668,14 +670,15 @@ msgstr "" " -F, --force-html les inn filer som HTML.\n" "\n" -#: src/main.c:137 +#: src/main.c:138 #, fuzzy msgid "" "Download:\n" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits).\n" " -O --output-document=FILE write documents to FILE.\n" -" -nc, --no-clobber don't clobber existing files.\n" +" -nc, --no-clobber don't clobber existing files or use .# " +"suffixes.\n" " -c, --continue restart getting an existing file.\n" " --dot-style=STYLE set retrieval display style.\n" " -N, --timestamping don't retrieve files if older than local.\n" @@ -683,7 +686,7 @@ 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 " +" --waitretry=SECONDS\twait 1...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" @@ -705,7 +708,7 @@ msgstr "" " -Q, --quota=ANTALL sett nedlastingskvote til ANTALL.\n" "\n" -#: src/main.c:152 +#: src/main.c:153 msgid "" "Directories:\n" " -nd --no-directories don't create directories.\n" @@ -725,7 +728,7 @@ msgstr "" " katalognavn.\n" "\n" -#: src/main.c:159 +#: src/main.c:160 #, fuzzy msgid "" "HTTP options:\n" @@ -755,7 +758,7 @@ msgstr "" " «Wget/VERSJON».\n" "\n" -#: src/main.c:171 +#: src/main.c:172 msgid "" "FTP options:\n" " --retr-symlinks retrieve FTP symbolic links.\n" @@ -769,17 +772,21 @@ msgstr "" " --passive-ftp bruk passiv overføringsmodus.\n" "\n" -#: src/main.c:176 +#: src/main.c:177 #, fuzzy msgid "" "Recursive retrieval:\n" " -r, --recursive recursive web-suck -- use with care!.\n" -" -l, --level=NUMBER maximum recursion depth (0 to unlimit).\n" +" -l, --level=NUMBER maximum recursion depth (inf or 0 for " +"infinite).\n" " --delete-after delete downloaded files.\n" " -k, --convert-links convert non-relative links to relative.\n" " -K, --backup-converted before converting file X, back up as X.orig.\n" -" -m, --mirror turn on options suitable for mirroring.\n" +" -m, --mirror shortcut option equivalent to -r -N -l inf " +"-nr.\n" " -nr, --dont-remove-listing don't remove `.listing' files.\n" +" -p, --page-requisites get all images, etc. needed to display HTML " +"page.\n" "\n" msgstr "" "Rekursiv nedlasting:\n" @@ -793,7 +800,7 @@ msgstr "" " -nr, --dont-remove-listing ikke slett «.listing»-filer.\n" "\n" -#: src/main.c:185 +#: src/main.c:187 #, fuzzy msgid "" "Recursive accept/reject:\n" @@ -833,16 +840,16 @@ msgstr "" "katalog.\n" "\n" -#: src/main.c:200 +#: src/main.c:202 msgid "Mail bug reports and suggestions to .\n" msgstr "Rapportér feil og send forslag til .\n" -#: src/main.c:364 +#: src/main.c:371 #, c-format msgid "%s: debug support not compiled in.\n" msgstr "%s: støtte for avlusing ikke inkludert ved kompilering.\n" -#: src/main.c:415 +#: src/main.c:425 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" @@ -856,7 +863,7 @@ msgstr "" "EGNETHET TIL NOEN SPESIELL OPPGAVE.\n" "Se «GNU General Public License» for detaljer.\n" -#: src/main.c:421 +#: src/main.c:431 #, fuzzy msgid "" "\n" @@ -865,44 +872,44 @@ msgstr "" "\n" "Skrevet av Hrvoje Niksic .\n" -#: src/main.c:495 +#: src/main.c:505 #, c-format msgid "%s: %s: invalid command\n" msgstr "%s: %s: ugyldig kommando\n" -#: src/main.c:548 +#: src/main.c:558 #, 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:551 src/main.c:593 src/main.c:636 +#: src/main.c:561 src/main.c:603 src/main.c:661 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Prøv «%s --help» for flere flagg.\n" -#: src/main.c:616 +#: src/main.c:641 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:622 +#: src/main.c:647 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:631 +#: src/main.c:656 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL mangler.\n" -#: src/main.c:719 +#: src/main.c:744 #, c-format msgid "No URLs found in %s.\n" msgstr "Fant ingen URLer i %s.\n" -#: src/main.c:728 +#: src/main.c:753 #, c-format msgid "" "\n" @@ -913,14 +920,14 @@ msgstr "" "FERDIG --%s--\n" "Lastet ned %s bytes i %d filer\n" -#: src/main.c:733 +#: src/main.c:758 #, 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:760 +#: src/main.c:785 msgid "%s received, redirecting output to `%%s'.\n" msgstr "%s mottatt, omdirigerer utskrifter til «%%s».\n" @@ -978,17 +985,17 @@ msgstr "Bruk: %s NETRC [TJENERNAVN]\n" msgid "%s: cannot stat %s: %s\n" msgstr "%s: «stat» feilet for %s: %s\n" -#: src/recur.c:451 src/retr.c:464 +#: src/recur.c:463 src/retr.c:468 #, c-format msgid "Removing %s.\n" msgstr "Fjerner %s.\n" -#: src/recur.c:452 +#: src/recur.c:464 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Fjerner %s fordi den skal forkastes.\n" -#: src/recur.c:611 +#: src/recur.c:624 msgid "Loading robots.txt; please ignore errors.\n" msgstr "Henter robots.txt; ignorer eventuelle feilmeldinger.\n" @@ -1001,21 +1008,21 @@ msgstr "" "\n" " [ hopper over %dK ]" -#: src/retr.c:345 +#: src/retr.c:349 msgid "Could not find proxy host.\n" msgstr "Fant ikke proxy-tjener.\n" -#: src/retr.c:356 +#: src/retr.c:360 #, c-format msgid "Proxy %s: Must be HTTP.\n" msgstr "Proxy %s: Må støtte HTTP.\n" -#: src/retr.c:399 +#: src/retr.c:403 #, c-format msgid "%s: Redirection to itself.\n" msgstr "%s: Omdirigerer til seg selv.\n" -#: src/retr.c:485 +#: src/retr.c:489 msgid "" "Giving up.\n" "\n" @@ -1023,7 +1030,7 @@ msgstr "" "Gir opp.\n" "\n" -#: src/retr.c:485 +#: src/retr.c:489 msgid "" "Retrying.\n" "\n" @@ -1031,27 +1038,27 @@ msgstr "" "Prøver igjen.\n" "\n" -#: src/url.c:944 +#: src/url.c:951 #, c-format msgid "Error (%s): Link %s without a base provided.\n" msgstr "Feil (%s): Link %s gitt uten utgangspunkt.\n" -#: src/url.c:959 +#: src/url.c:966 #, c-format msgid "Error (%s): Base %s relative, without referer URL.\n" msgstr "Feil (%s): Utgangspunktet %s er relativt, ukjent URL som referent.\n" -#: src/url.c:1377 +#: src/url.c:1384 #, c-format msgid "Converting %s... " msgstr "Konverterer %s... " -#: src/url.c:1382 src/url.c:1450 +#: src/url.c:1389 src/url.c:1457 #, c-format msgid "Cannot convert links in %s: %s\n" msgstr "Kan ikke konvertere linker i %s: %s\n" -#: src/url.c:1426 +#: src/url.c:1433 #, fuzzy, c-format msgid "Cannot back up %s as %s: %s\n" msgstr "Kan ikke konvertere linker i %s: %s\n" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo index 52c557ff4f696f4ba1edb313f4e7b69f9c8ec310..eb3c54c1eded658f715604b0956eafc349351c80 100644 GIT binary patch delta 2975 zcmXxm3yj=V702=aLMiTc``Bk)W@cxm-RJC%yW82>ot;vw6lfa}0UJ^jh_n$!1QDfz zbUSJbRi3s}8iPn6C@KLT)Tr^17)4UBQBZtgm0(1JM2(L?jG}(d%y6@3zW0Cc{O>vE zch2423_-P!* z7jRjUtXSEicak2@qpj!l*y(vQj^j406;1Y-Wbq*!!3bai|ADzAS!plH<3<$V${pB+ zH7wu(9Kvt6_#AS+YALQkmb@0v#6i3SUyqCYHx|BQVZg$19K)B8qponwx=uw0c3p%O zybh=FD_F+gVJ=C!IZ57t3&>IT4Y(TbLVMkh;9C44^4I-W{*w%q+AXZYkZKY+X{^5k zN!zoxwf+U9P|wfNK|Qaa0DGy^Am?#T@1^L>-fOVe&u;9;P>PS<&m#qUpX5JLg5JnL zmVI81gZkdo;+2^8d>c}r??IGF-(x7lzGv|i{BLu=UsiE&KULaZhf!aCJq~n9&z~K)tJKwNNEP|LGKTK9o?eAr%_o$;7};5JdtpA7RPHQn@mKWjarK^ z8-Z|~-H#k+@53ql8d4zp2Xs&_0`gu?*%Ea^Eum}HzzQ0CLZKq+BP(W+9 z{xDRDL_9Lut(awK-ar|`LfICqDJ{McpND*@f<46q;iFXlVpv|CeJ}7nEWLAJu&$x>hQ_GBQ=VGh~_Px zixMnefr6+NZ#E%O@d4~cFSe1g_zTY>o^k_1p{WIw_0(JK%Xn(hv+Fl~2MTQZZj|x# zV<@ocKcQxup+*EY^Je6D<_0_s?{dy&^`H5bg-JJp91&qDGI4O}a+FDFS8M+>c$Vj< zutRdu6O@=8!G5eFu{^iJwoaIf(aXBItdHEuw zNckYDd-=0Sjq(?f0_E?cgUWGBWHu+5P+)Ey=J0~ndIUg$xx>iU-1m^5x&L4-?Uz}* z37O_26B5sFM48X;M2_YUpuPF~QHJwRU;&@O6&m>@lyN0WMZt=_P^1#wU&2U)pGx$W zl2#r@=T?3a_unpjOWhV}jRTia8^*LgY=OUC)^cDA2Ip6_Hr zNe>O$Ab~oivk_2AL^J|ey7>T*ar6D`jZ`{{8eV#Sd6VrG(NBNc@Dd=KD2CY+wS_7 zWfQeKJcmXdEQ-B{&9bW*J(645Su9%jM7EU0(4~zr=kwy$ypE(xqNs`-ofoxfjB8pv z15aRT7~`^Jug|j^bN}bIINst$d@qaQN5@>ju4gem&ek+$&5yV;F`_XpVLMor#W+yk z-dXB;zu6eOmTh7C>UVc$m)~ag>iEEsqn-D!I%nGj%*z|zvsx# Ih3ilHKU9b+Jpcdz delta 3921 zcmai$dvIJ;8Ng3$3uKd~O`0@KH*wEyNV-XOvw4tBvztVUwoM>PTWA%bj5pnzWMOx2 zvbzZgtt$v^p$~)wI_U6+prhl!j82DlafCsU5&1(<>$C&Rz=(sQ;#fhPQGegLH&|w( z+{t%;=W);XK0EpD!s&gbdzRO|s@&%oXjW?ZEAVBdDi6EM)hD4}sp{XtTi_YkrfqYOAya{{)*(~!ffmO%|;FbKCn z99)%$weSwu3BLu;hc9}37vk{hwJ-#6R;`0O;U{4ZehMDJzFGJM3r#Hi5r)xy4#ZHc z7{;;M35del4BQA0!XEex9Dsj?TB$nDs!eblVyNyAY=qy3I8gU2Y=x&F_UitPebqvi zn5flIQWb$?P}b)msa;d{)}Mf6XwB~+it2q32kU!1ZincppM#a~W?0YPVMsRWB~u&V zLr3%h9@DBH2fM8VZ)!{dUV&g`)jGIC|OpCdAWq`{w1a0n)K%?nTnP zkvS=Az8GS-IS(&@M<9F6&%*QIKOyC45j`kwSp^BCh3qNDEn8s~BqJ54;U4A<)IV?` z15y^)1yLB7F&io%wc>E#F-U&|3_i*>K{azq$t<}i6Hnzh^Iku1jE51#BlH^q)fpFA(;ri3{eymhd37^ z2-y!w2{0VG6jJ+82C^192sQj3Br~BGV2Rp>{>Fe0TEp%}>lh@e)`GWwAH<>7Cm>g| z^(XLL_#&)?uXyuUA?0h8+ace7K&nS+E6#{RZ8W7Kh_*?{wQYM>?*A3sDC#TC)_xP@ zVEcC3F#notMFJI0qB(DeOzrbxI_fVDMUvz-u56NIRH$WomPC`o3eJhMYDd7e1HAsKOXk=;L7(q&arPvo35JBuZ z*aFM24sx)9RK}iTj>o+fP(#Wjndl|`6-3;74Reh5?S(kjcN-+)zT*(b`hEik_zjaL z#Ib&KisAklI7f=t8_ z`Hhd0X31Q96jJ~A=OB9HDM;VM<$Rn!0#qZ^KmL0LmHd`SWL1#5h~Yu;6we1qt7K$Q zdWCWg-i5=@!*4PtokQXnnHahrlGdTyArTJ!43deVx1grq&@Jl;oRLf3(272H{=wlAANuYQakz(#K`C)a5emSd2gk^?aR#WLFCzi zNSp@|sr)n|W{#ClRQj9pj8JKw8+l_)Z9@)~|5E8+d6*FekpF$uf$}??1q>MBX%r20NY+OLFgTh$ywKGYFJs%;_5kaG}uzG~j4kJWB(d^aR_>Q00z zOY2E-%v13A8Tbi=BFZx*|IexkGv*&(j~yN_gtN#+$W=%NxdD;qb|hp*?u#}y&sTU~ zjZ7j5v!c{p<+1Ai+9Isx0VlA2UZ?swD`;)f4us^)g>#J(&^mnd{IxOGj_tK zb<~OQiaPT}R->{yvSoZ?vz900OzW&&C|J{WK^Gk@8{KloGH0yWSv!~VjxL^Z7neSk zDw%UBdvbo-7&z-Sn@{J8+TC)UF_z}ciMjc-T|Db!GjtcjIY+zScbEeU=D>oTpL7cL zM~_U}CB3*2F3zM2n!nf4 zVrM^cIAx+;vLAHTDd3|nSns3=lpxG!#^(QN3OE0b4i`$;au0uOT~S@gq^EJzNjY9| xxfTV{VCOxROV{+jsnVIZy^7*1%j1&5kE\n" "Language-Team: Portuguese \n" @@ -88,7 +88,7 @@ msgstr "" "Diretório `%s' não encontrado.\n" "\n" -#: src/ftp.c:331 src/ftp.c:599 src/ftp.c:647 src/url.c:1494 +#: src/ftp.c:331 src/ftp.c:599 src/ftp.c:647 src/url.c:1501 msgid "done.\n" msgstr "feito.\n" @@ -287,20 +287,20 @@ msgid "%s: corrupt time-stamp.\n" msgstr "%s: horário (timestamp) inválido.\n" # , c-format -#: src/ftp.c:1242 +#: src/ftp.c:1243 #, 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:1281 +#: src/ftp.c:1282 #, 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:1326 +#: src/ftp.c:1327 #, 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:1373 +#: src/ftp.c:1374 #, c-format msgid "No matches on pattern `%s'.\n" msgstr "Nada encontrado com o padrão `%s'.\n" # , c-format -#: src/ftp.c:1433 +#: src/ftp.c:1434 #, 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:1438 +#: src/ftp.c:1439 #, c-format msgid "Wrote HTML-ized index to `%s'.\n" msgstr "Escrito índice em formato HTML para `%s'.\n" @@ -422,33 +422,33 @@ msgid "Unknown error" msgstr "Erro desconhecido" # , c-format -#: src/html.c:470 src/html.c:472 +#: src/html.c:539 src/html.c:541 #, c-format msgid "Index of /%s on %s:%d" msgstr "Índice de /%s em %s:%d" -#: src/html.c:494 +#: src/html.c:563 msgid "time unknown " msgstr "horário desconhecido " -#: src/html.c:498 +#: src/html.c:567 msgid "File " msgstr "Arquivo " -#: src/html.c:501 +#: src/html.c:570 msgid "Directory " msgstr "Diretório " -#: src/html.c:504 +#: src/html.c:573 msgid "Link " msgstr "Link " -#: src/html.c:507 +#: src/html.c:576 msgid "Not sure " msgstr "Sem certeza " # , c-format -#: src/html.c:525 +#: src/html.c:594 #, c-format msgid " (%s bytes)" msgstr " (%s bytes)" @@ -627,44 +627,44 @@ 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:318 src/netrc.c:260 +#: src/init.c:319 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:339 src/init.c:345 +#: src/init.c:340 src/init.c:346 #, 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:376 +#: src/init.c:377 #, 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:464 +#: src/init.c:465 #, 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:491 +#: src/init.c:492 #, 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:509 src/init.c:766 src/init.c:788 src/init.c:861 +#: src/init.c:510 src/init.c:767 src/init.c:789 src/init.c:862 #, c-format msgid "%s: %s: Invalid specification `%s'.\n" msgstr "%s: %s: Especificação inválida `%s'\n" # , c-format -#: src/init.c:622 src/init.c:644 src/init.c:666 src/init.c:692 +#: src/init.c:623 src/init.c:645 src/init.c:667 src/init.c:693 #, c-format msgid "%s: Invalid specification `%s'\n" msgstr "%s: Especificação inválida `%s'\n" @@ -714,6 +714,7 @@ msgstr "" # , fuzzy #: src/main.c:127 +#, fuzzy msgid "" "Logging and input file:\n" " -o, --output-file=FILE log messages to FILE.\n" @@ -722,8 +723,9 @@ msgid "" " -q, --quiet quiet (no output).\n" " -v, --verbose be verbose (this is the default).\n" " -nv, --non-verbose turn off verboseness, without being quiet.\n" -" -i, --input-file=FILE read URL-s from file.\n" +" -i, --input-file=FILE download URLs found in FILE.\n" " -F, --force-html treat input file as HTML.\n" +" -B, --base=URL prepends URL to relative links in -F -i file.\n" "\n" msgstr "" "Geração de log e arquivo de entrada:\n" @@ -737,14 +739,15 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:137 +#: src/main.c:138 #, fuzzy msgid "" "Download:\n" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits).\n" " -O --output-document=FILE write documents to FILE.\n" -" -nc, --no-clobber don't clobber existing files.\n" +" -nc, --no-clobber don't clobber existing files or use .# " +"suffixes.\n" " -c, --continue restart getting an existing file.\n" " --dot-style=STYLE set retrieval display style.\n" " -N, --timestamping don't retrieve files if older than local.\n" @@ -752,7 +755,7 @@ 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 " +" --waitretry=SECONDS\twait 1...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" @@ -775,7 +778,7 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:152 +#: src/main.c:153 msgid "" "Directories:\n" " -nd --no-directories don't create directories.\n" @@ -794,7 +797,7 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:159 +#: src/main.c:160 #, fuzzy msgid "" "HTTP options:\n" @@ -824,7 +827,7 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:171 +#: src/main.c:172 msgid "" "FTP options:\n" " --retr-symlinks retrieve FTP symbolic links.\n" @@ -840,17 +843,21 @@ msgstr "" " --passive-ftp usa modo de transferência \"passivo\".\n" "\n" -#: src/main.c:176 +#: src/main.c:177 #, fuzzy msgid "" "Recursive retrieval:\n" " -r, --recursive recursive web-suck -- use with care!.\n" -" -l, --level=NUMBER maximum recursion depth (0 to unlimit).\n" +" -l, --level=NUMBER maximum recursion depth (inf or 0 for " +"infinite).\n" " --delete-after delete downloaded files.\n" " -k, --convert-links convert non-relative links to relative.\n" " -K, --backup-converted before converting file X, back up as X.orig.\n" -" -m, --mirror turn on options suitable for mirroring.\n" +" -m, --mirror shortcut option equivalent to -r -N -l inf " +"-nr.\n" " -nr, --dont-remove-listing don't remove `.listing' files.\n" +" -p, --page-requisites get all images, etc. needed to display HTML " +"page.\n" "\n" msgstr "" "Busca recursiva:\n" @@ -863,7 +870,7 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:185 +#: src/main.c:187 #, fuzzy msgid "" "Recursive accept/reject:\n" @@ -903,17 +910,17 @@ msgstr "" "\n" # , fuzzy -#: src/main.c:200 +#: src/main.c:202 msgid "Mail bug reports and suggestions to .\n" msgstr "Relatos de bugs e sugestões para .\n" # , fuzzy -#: src/main.c:364 +#: src/main.c:371 #, c-format msgid "%s: debug support not compiled in.\n" msgstr "%s: compilado sem debug.\n" -#: src/main.c:415 +#: src/main.c:425 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 +934,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:421 +#: src/main.c:431 #, fuzzy msgid "" "\n" @@ -937,13 +944,13 @@ msgstr "" "Escrito por Hrvoje Niksic .\n" # , c-format -#: src/main.c:495 +#: src/main.c:505 #, c-format msgid "%s: %s: invalid command\n" msgstr "%s: %s: comando inválido\n" # , c-format -#: src/main.c:548 +#: src/main.c:558 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: opção ilegal -- `-n%c'\n" @@ -951,35 +958,35 @@ msgstr "%s: op # , c-format #. #### Something nicer should be printed here -- similar to the #. pre-1.5 `--help' page. -#: src/main.c:551 src/main.c:593 src/main.c:636 +#: src/main.c:561 src/main.c:603 src/main.c:661 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Tente `%s --help' para mais opções.\n" -#: src/main.c:616 +#: src/main.c:641 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:622 +#: src/main.c:647 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:631 +#: src/main.c:656 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL faltando\n" # , c-format -#: src/main.c:719 +#: src/main.c:744 #, c-format msgid "No URLs found in %s.\n" msgstr "Nenhuma URL encontrada em %s.\n" # , c-format -#: src/main.c:728 +#: src/main.c:753 #, c-format msgid "" "\n" @@ -991,14 +998,14 @@ msgstr "" "Baixados: %s bytes em %d arquivos\n" # , c-format -#: src/main.c:733 +#: src/main.c:758 #, 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:760 +#: src/main.c:785 msgid "%s received, redirecting output to `%%s'.\n" msgstr "%s recebido, redirecionando saída para `%%s'.\n" @@ -1064,18 +1071,18 @@ msgid "%s: cannot stat %s: %s\n" msgstr "%s: não foi possível acessar %s: %s\n" # , c-format -#: src/recur.c:451 src/retr.c:464 +#: src/recur.c:463 src/retr.c:468 #, c-format msgid "Removing %s.\n" msgstr "Removendo %s.\n" # , c-format -#: src/recur.c:452 +#: src/recur.c:464 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Removendo %s pois ele deve ser rejeitado.\n" -#: src/recur.c:611 +#: src/recur.c:624 msgid "Loading robots.txt; please ignore errors.\n" msgstr "Buscando robots.txt; por favor ignore qualquer erro.\n" @@ -1089,23 +1096,23 @@ msgstr "" "\n" " [ ignorando %dK ]" -#: src/retr.c:345 +#: src/retr.c:349 msgid "Could not find proxy host.\n" msgstr "Não foi possível encontrar o proxy.\n" # , c-format -#: src/retr.c:356 +#: src/retr.c:360 #, c-format msgid "Proxy %s: Must be HTTP.\n" msgstr "Proxy %s: Deve ser HTTP.\n" # , c-format -#: src/retr.c:399 +#: src/retr.c:403 #, c-format msgid "%s: Redirection to itself.\n" msgstr "%s: Redireção para si mesmo.\n" -#: src/retr.c:485 +#: src/retr.c:489 msgid "" "Giving up.\n" "\n" @@ -1113,7 +1120,7 @@ msgstr "" "Desistindo.\n" "\n" -#: src/retr.c:485 +#: src/retr.c:489 msgid "" "Retrying.\n" "\n" @@ -1122,31 +1129,31 @@ msgstr "" "\n" # , c-format -#: src/url.c:944 +#: src/url.c:951 #, c-format msgid "Error (%s): Link %s without a base provided.\n" msgstr "Erro (%s): Link %s sem uma base fornecida.\n" # , c-format -#: src/url.c:959 +#: src/url.c:966 #, c-format msgid "Error (%s): Base %s relative, without referer URL.\n" msgstr "Erro (%s): Base %s relativa, sem URL referenciadora.\n" # , c-format -#: src/url.c:1377 +#: src/url.c:1384 #, c-format msgid "Converting %s... " msgstr "Convertendo %s... " # , c-format -#: src/url.c:1382 src/url.c:1450 +#: src/url.c:1389 src/url.c:1457 #, c-format msgid "Cannot convert links in %s: %s\n" msgstr "Não foi possível converter links em %s: %s\n" # , c-format -#: src/url.c:1426 +#: src/url.c:1433 #, fuzzy, c-format msgid "Cannot back up %s as %s: %s\n" msgstr "Não foi possível converter links em %s: %s\n" diff --git a/po/wget.pot b/po/wget.pot index 4c34cfbc..c3590d1b 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-05-22 19:06-0700\n" +"POT-Creation-Date: 2000-08-30 03:32-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -82,7 +82,7 @@ msgid "" "\n" msgstr "" -#: src/ftp.c:331 src/ftp.c:599 src/ftp.c:647 src/url.c:1494 +#: src/ftp.c:331 src/ftp.c:599 src/ftp.c:647 src/url.c:1501 msgid "done.\n" msgstr "" @@ -249,17 +249,17 @@ msgstr "" msgid "%s: corrupt time-stamp.\n" msgstr "" -#: src/ftp.c:1242 +#: src/ftp.c:1243 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "" -#: src/ftp.c:1281 +#: src/ftp.c:1282 #, c-format msgid "Not descending to `%s' as it is excluded/not-included.\n" msgstr "" -#: src/ftp.c:1326 +#: src/ftp.c:1327 #, 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:1373 +#: src/ftp.c:1374 #, c-format msgid "No matches on pattern `%s'.\n" msgstr "" -#: src/ftp.c:1433 +#: src/ftp.c:1434 #, c-format msgid "Wrote HTML-ized index to `%s' [%ld].\n" msgstr "" -#: src/ftp.c:1438 +#: src/ftp.c:1439 #, c-format msgid "Wrote HTML-ized index to `%s'.\n" msgstr "" @@ -368,32 +368,32 @@ msgstr "" msgid "Unknown error" msgstr "" -#: src/html.c:470 src/html.c:472 +#: src/html.c:539 src/html.c:541 #, c-format msgid "Index of /%s on %s:%d" msgstr "" -#: src/html.c:494 +#: src/html.c:563 msgid "time unknown " msgstr "" -#: src/html.c:498 +#: src/html.c:567 msgid "File " msgstr "" -#: src/html.c:501 +#: src/html.c:570 msgid "Directory " msgstr "" -#: src/html.c:504 +#: src/html.c:573 msgid "Link " msgstr "" -#: src/html.c:507 +#: src/html.c:576 msgid "Not sure " msgstr "" -#: src/html.c:525 +#: src/html.c:594 #, c-format msgid " (%s bytes)" msgstr "" @@ -553,37 +553,37 @@ msgstr "" msgid "%s (%s) - Read error at byte %ld/%ld (%s). " msgstr "" -#: src/init.c:318 src/netrc.c:260 +#: src/init.c:319 src/netrc.c:260 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "" -#: src/init.c:339 src/init.c:345 +#: src/init.c:340 src/init.c:346 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "" -#: src/init.c:376 +#: src/init.c:377 #, c-format msgid "%s: Warning: Both system and user wgetrc point to `%s'.\n" msgstr "" -#: src/init.c:464 +#: src/init.c:465 #, c-format msgid "%s: BUG: unknown command `%s', value `%s'.\n" msgstr "" -#: src/init.c:491 +#: src/init.c:492 #, c-format msgid "%s: %s: Please specify on or off.\n" msgstr "" -#: src/init.c:509 src/init.c:766 src/init.c:788 src/init.c:861 +#: src/init.c:510 src/init.c:767 src/init.c:789 src/init.c:862 #, c-format msgid "%s: %s: Invalid specification `%s'.\n" msgstr "" -#: src/init.c:622 src/init.c:644 src/init.c:666 src/init.c:692 +#: src/init.c:623 src/init.c:645 src/init.c:667 src/init.c:693 #, c-format msgid "%s: Invalid specification `%s'\n" msgstr "" @@ -626,18 +626,20 @@ msgid "" " -q, --quiet quiet (no output).\n" " -v, --verbose be verbose (this is the default).\n" " -nv, --non-verbose turn off verboseness, without being quiet.\n" -" -i, --input-file=FILE read URL-s from file.\n" +" -i, --input-file=FILE download URLs found in FILE.\n" " -F, --force-html treat input file as HTML.\n" +" -B, --base=URL prepends URL to relative links in -F -i file.\n" "\n" msgstr "" -#: src/main.c:137 +#: src/main.c:138 msgid "" "Download:\n" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits).\n" " -O --output-document=FILE write documents to FILE.\n" -" -nc, --no-clobber don't clobber existing files.\n" +" -nc, --no-clobber don't clobber existing files or use .# " +"suffixes.\n" " -c, --continue restart getting an existing file.\n" " --dot-style=STYLE set retrieval display style.\n" " -N, --timestamping don't retrieve files if older than local.\n" @@ -645,14 +647,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 " +" --waitretry=SECONDS\twait 1...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:152 +#: src/main.c:153 msgid "" "Directories:\n" " -nd --no-directories don't create directories.\n" @@ -664,7 +666,7 @@ msgid "" "\n" msgstr "" -#: src/main.c:159 +#: src/main.c:160 msgid "" "HTTP options:\n" " --http-user=USER set http user to USER.\n" @@ -681,7 +683,7 @@ msgid "" "\n" msgstr "" -#: src/main.c:171 +#: src/main.c:172 msgid "" "FTP options:\n" " --retr-symlinks retrieve FTP symbolic links.\n" @@ -690,20 +692,24 @@ msgid "" "\n" msgstr "" -#: src/main.c:176 +#: src/main.c:177 msgid "" "Recursive retrieval:\n" " -r, --recursive recursive web-suck -- use with care!.\n" -" -l, --level=NUMBER maximum recursion depth (0 to unlimit).\n" +" -l, --level=NUMBER maximum recursion depth (inf or 0 for " +"infinite).\n" " --delete-after delete downloaded files.\n" " -k, --convert-links convert non-relative links to relative.\n" " -K, --backup-converted before converting file X, back up as X.orig.\n" -" -m, --mirror turn on options suitable for mirroring.\n" +" -m, --mirror shortcut option equivalent to -r -N -l inf " +"-nr.\n" " -nr, --dont-remove-listing don't remove `.listing' files.\n" +" -p, --page-requisites get all images, etc. needed to display HTML " +"page.\n" "\n" msgstr "" -#: src/main.c:185 +#: src/main.c:187 msgid "" "Recursive accept/reject:\n" " -A, --accept=LIST comma-separated list of accepted " @@ -728,16 +734,16 @@ msgid "" "\n" msgstr "" -#: src/main.c:200 +#: src/main.c:202 msgid "Mail bug reports and suggestions to .\n" msgstr "" -#: src/main.c:364 +#: src/main.c:371 #, c-format msgid "%s: debug support not compiled in.\n" msgstr "" -#: src/main.c:415 +#: src/main.c:425 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" @@ -746,49 +752,49 @@ msgid "" "GNU General Public License for more details.\n" msgstr "" -#: src/main.c:421 +#: src/main.c:431 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" msgstr "" -#: src/main.c:495 +#: src/main.c:505 #, c-format msgid "%s: %s: invalid command\n" msgstr "" -#: src/main.c:548 +#: src/main.c:558 #, 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:551 src/main.c:593 src/main.c:636 +#: src/main.c:561 src/main.c:603 src/main.c:661 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "" -#: src/main.c:616 +#: src/main.c:641 msgid "Can't be verbose and quiet at the same time.\n" msgstr "" -#: src/main.c:622 +#: src/main.c:647 msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" #. No URL specified. -#: src/main.c:631 +#: src/main.c:656 #, c-format msgid "%s: missing URL\n" msgstr "" -#: src/main.c:719 +#: src/main.c:744 #, c-format msgid "No URLs found in %s.\n" msgstr "" -#: src/main.c:728 +#: src/main.c:753 #, c-format msgid "" "\n" @@ -796,14 +802,14 @@ msgid "" "Downloaded: %s bytes in %d files\n" msgstr "" -#: src/main.c:733 +#: src/main.c:758 #, 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:760 +#: src/main.c:785 msgid "%s received, redirecting output to `%%s'.\n" msgstr "" @@ -856,17 +862,17 @@ msgstr "" msgid "%s: cannot stat %s: %s\n" msgstr "" -#: src/recur.c:451 src/retr.c:464 +#: src/recur.c:463 src/retr.c:468 #, c-format msgid "Removing %s.\n" msgstr "" -#: src/recur.c:452 +#: src/recur.c:464 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "" -#: src/recur.c:611 +#: src/recur.c:624 msgid "Loading robots.txt; please ignore errors.\n" msgstr "" @@ -877,53 +883,53 @@ msgid "" " [ skipping %dK ]" msgstr "" -#: src/retr.c:345 +#: src/retr.c:349 msgid "Could not find proxy host.\n" msgstr "" -#: src/retr.c:356 +#: src/retr.c:360 #, c-format msgid "Proxy %s: Must be HTTP.\n" msgstr "" -#: src/retr.c:399 +#: src/retr.c:403 #, c-format msgid "%s: Redirection to itself.\n" msgstr "" -#: src/retr.c:485 +#: src/retr.c:489 msgid "" "Giving up.\n" "\n" msgstr "" -#: src/retr.c:485 +#: src/retr.c:489 msgid "" "Retrying.\n" "\n" msgstr "" -#: src/url.c:944 +#: src/url.c:951 #, c-format msgid "Error (%s): Link %s without a base provided.\n" msgstr "" -#: src/url.c:959 +#: src/url.c:966 #, c-format msgid "Error (%s): Base %s relative, without referer URL.\n" msgstr "" -#: src/url.c:1377 +#: src/url.c:1384 #, c-format msgid "Converting %s... " msgstr "" -#: src/url.c:1382 src/url.c:1450 +#: src/url.c:1389 src/url.c:1457 #, c-format msgid "Cannot convert links in %s: %s\n" msgstr "" -#: src/url.c:1426 +#: src/url.c:1433 #, c-format msgid "Cannot back up %s as %s: %s\n" msgstr "" diff --git a/src/ChangeLog b/src/ChangeLog index 93d28789..709174ef 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,37 @@ +2000-08-30 Dan Harkless + + * ftp.c (ftp_retrieve_list): Use new INFINITE_RECURSION #define. + + * html.c: htmlfindurl() now takes final `dash_p_leaf_HTML' parameter. + Wrapped some > 80-column lines. When -p is specified and we're at a + leaf node, do not traverse , , or tags other than + . + + * html.h (htmlfindurl): Now takes final `dash_p_leaf_HTML' parameter. + + * init.c: Added new -p / --page-requisites / page_requisites option. + + * main.c (print_help): Clarified that -l inf and -l 0 both allow + infinite recursion. Changed the unhelpful --mirrior description + to simply give the options it's equivalent to. Added new -p option. + (main): Added some comments; handle new -p / --page-requisites. + + * options.h (struct options): Added new page_requisites field. + + * recur.c: Changed "URL-s" to "URLs" and "HTML-s" to "HTMLs". + Calculate and pass down new `dash_p_leaf_HTML' parameter to + get_urls_html(). Use new INFINITE_RECURSION #define. + + * retr.c: Changed "URL-s" to "URLs". get_urls_html() now takes + final `dash_p_leaf_HTML' parameter. + + * url.c: get_urls_html() and htmlfindurl() now take final + `dash_p_leaf_HTML' parameter. + + * url.h (get_urls_html): Now takes final `dash_p_leaf_HTML' parameter. + + * wget.h: Added some comments and new INFINITE_RECURSION #define. + 2000-08-23 Dan Harkless * main.c (print_help): -B / --base was not mentioned. diff --git a/src/ftp.c b/src/ftp.c index cc2cff9b..da37ee77 100644 --- a/src/ftp.c +++ b/src/ftp.c @@ -1068,7 +1068,7 @@ ftp_retrieve_list (struct urlinfo *u, struct fileinfo *f, ccon *con) /* Increase the depth. */ ++depth; - if (opt.reclevel && depth > opt.reclevel) + if (opt.reclevel != INFINITE_RECURSION && depth > opt.reclevel) { DEBUGP ((_("Recursion depth %d exceeded max. depth %d.\n"), depth, opt.reclevel)); @@ -1236,7 +1236,8 @@ Already have correct symlink %s -> %s\n\n"), f = f->next; } /* while */ /* We do not want to call ftp_retrieve_dirs here */ - if (opt.recursive && !(opt.reclevel && depth >= opt.reclevel)) + if (opt.recursive && + !(opt.reclevel != INFINITE_RECURSION && depth >= opt.reclevel)) err = ftp_retrieve_dirs (u, orig, con); else if (opt.recursive) DEBUGP ((_("Will not retrieve dirs since depth is %d (max %d).\n"), diff --git a/src/html.c b/src/html.c index c8767d6e..426e7330 100644 --- a/src/html.c +++ b/src/html.c @@ -98,15 +98,15 @@ idmatch (struct tag_attr *tags, const char *tag, const char *attr) address and the length of the string. Return NULL if no URL is found. */ const char * -htmlfindurl (const char *buf, int bufsize, int *size, int init) +htmlfindurl (const char *buf, int bufsize, int *size, int init, + int dash_p_leaf_HTML) { const char *p, *ph; - state_t *s; + state_t *s = &global_state; + /* NULL-terminated list of tags and modifiers someone would want to follow -- feel free to edit to suit your needs: */ static struct tag_attr html_allow[] = { - { "a", "href" }, - { "link", "href" }, { "script", "src" }, { "img", "src" }, { "img", "href" }, @@ -119,7 +119,6 @@ htmlfindurl (const char *buf, int bufsize, int *size, int init) { "script", "src" }, { "embed", "src" }, { "bgsound", "src" }, - { "area", "href" }, { "img", "lowsrc" }, { "input", "src" }, { "layer", "src" }, @@ -127,13 +126,15 @@ htmlfindurl (const char *buf, int bufsize, int *size, int init) { "th", "background"}, { "td", "background"}, /* Tags below this line are treated specially. */ + { "a", "href" }, + { "area", "href" }, { "base", "href" }, + { "link", "href" }, + { "link", "rel" }, { "meta", "content" }, { NULL, NULL } }; - s = &global_state; - if (init) { DEBUGP (("Resetting a parser state.\n")); @@ -142,6 +143,10 @@ htmlfindurl (const char *buf, int bufsize, int *size, int init) while (1) { + const char* link_href = NULL; + const char* link_rel = NULL; + int link_href_saved_size; + if (!bufsize) break; /* Let's look for a tag, if we are not already in one. */ @@ -240,7 +245,8 @@ htmlfindurl (const char *buf, int bufsize, int *size, int init) /* Now we must skip the spaces to find '='. */ if (*buf != '=') { - for (; bufsize && ISSPACE (*buf) && *buf != '>'; ++buf, --bufsize); + for (; bufsize && ISSPACE (*buf) && *buf != '>'; + ++buf, --bufsize); if (!bufsize || *buf == '>') break; } @@ -286,7 +292,8 @@ htmlfindurl (const char *buf, int bufsize, int *size, int init) else { p = buf; - for (; bufsize && !ISSPACE (*buf) && *buf != '>'; ++buf, --bufsize) + for (; bufsize && !ISSPACE (*buf) && *buf != '>'; + ++buf, --bufsize) if (ph && *buf == '#') ph = buf; if (!bufsize) @@ -300,12 +307,72 @@ htmlfindurl (const char *buf, int bufsize, int *size, int init) 2) its tag and attribute are found in html_allow. */ if (*size && idmatch (html_allow, s->tag, s->attr)) { - if (!strcasecmp (s->tag, "base") && !strcasecmp (s->attr, "href")) + if (strcasecmp(s->tag, "a") == EQ || + strcasecmp(s->tag, "area") == EQ) + { + /* Only follow these if we're not at a -p leaf node, as they + always link to external documents. */ + if (!dash_p_leaf_HTML) + { + s->at_value = 1; + return p; + } + } + else if (!strcasecmp (s->tag, "base") && + !strcasecmp (s->attr, "href")) { FREE_MAYBE (s->base); s->base = strdupdelim (p, buf); } - else if (!strcasecmp (s->tag, "meta") && !strcasecmp (s->attr, "content")) + else if (strcasecmp(s->tag, "link") == EQ) + { + if (strcasecmp(s->attr, "href") == EQ) + { + link_href = p; + link_href_saved_size = *size; /* for restoration below */ + } + else if (strcasecmp(s->attr, "rel") == EQ) + link_rel = p; + + if (link_href != NULL && link_rel != NULL) + /* Okay, we've now seen this tag's HREF and REL + attributes (they may be in either order), so it's now + possible to decide if we want to traverse it. */ + if (!dash_p_leaf_HTML || + strncasecmp(link_rel, "stylesheet", + sizeof("stylesheet") - 1) == EQ) + /* In the normal case, all tags are fair game. + + In the special case of when -p is active, however, and + we're at a leaf node (relative to the -l max. depth) in + the HTML document tree, the only tag we'll + follow is a , as it's necessary + for displaying this document properly. We won't follow + other tags, like , for + instance, as they refer to external documents. + + Note that the above strncasecmp() will incorrectly + consider something like ' tag, size is currently set to the size for + REL's value -- set it to what it was when we were + looking at HREF's value. */ + *size = link_href_saved_size; + + s->at_value = 1; + return link_href; + } + } + else if (!strcasecmp (s->tag, "meta") && + !strcasecmp (s->attr, "content")) { /* Some pages use a META tag to specify that the page be refreshed by a new page after a given number of @@ -323,7 +390,9 @@ htmlfindurl (const char *buf, int bufsize, int *size, int init) for (; *size && ISDIGIT (*p); p++, *size -= 1); if (*p == ';') { - for (p++, *size -= 1; *size && ISSPACE (*p); p++, *size -= 1) ; + for (p++, *size -= 1; + *size && ISSPACE (*p); + p++, *size -= 1) ; if (!strncasecmp (p, "URL=", 4)) { p += 4, *size -= 4; diff --git a/src/html.h b/src/html.h index 56cb627a..7fa0132e 100644 --- a/src/html.h +++ b/src/html.h @@ -32,7 +32,7 @@ typedef struct struct fileinfo; /* Function declarations */ -const char *htmlfindurl PARAMS ((const char *, int, int *, int)); +const char *htmlfindurl PARAMS ((const char *, int, int *, int, int)); const char *html_base PARAMS ((void)); uerr_t ftp_index PARAMS ((const char *, struct urlinfo *, struct fileinfo *)); diff --git a/src/init.c b/src/init.c index 86ee4648..97bbeb5c 100644 --- a/src/init.c +++ b/src/init.c @@ -129,6 +129,7 @@ static struct { { "noproxy", &opt.no_proxy, cmd_vector }, { "numtries", &opt.ntry, cmd_number_inf },/* deprecated*/ { "outputdocument", NULL, cmd_spec_outputdocument }, + { "pagerequisites", &opt.page_requisites, cmd_boolean }, { "passiveftp", &opt.ftp_pasv, cmd_boolean }, { "passwd", &opt.ftp_pass, cmd_string }, { "proxypasswd", &opt.proxy_passwd, cmd_string }, @@ -823,7 +824,7 @@ cmd_spec_mirror (const char *com, const char *val, void *closure) if (!opt.no_dirstruct) opt.dirstruct = 1; opt.timestamping = 1; - opt.reclevel = 0; + opt.reclevel = INFINITE_RECURSION; opt.remove_listing = 0; } return 1; diff --git a/src/main.c b/src/main.c index 89c6c347..fb72913e 100644 --- a/src/main.c +++ b/src/main.c @@ -177,12 +177,13 @@ FTP options:\n\ \n"), _("\ Recursive retrieval:\n\ -r, --recursive recursive web-suck -- use with care!.\n\ - -l, --level=NUMBER maximum recursion depth (0 to unlimit).\n\ + -l, --level=NUMBER maximum recursion depth (inf or 0 for infinite).\n\ --delete-after delete downloaded files.\n\ -k, --convert-links convert non-relative links to relative.\n\ -K, --backup-converted before converting file X, back up as X.orig.\n\ - -m, --mirror turn on options suitable for mirroring.\n\ + -m, --mirror shortcut option equivalent to -r -N -l inf -nr.\n\ -nr, --dont-remove-listing don\'t remove `.listing\' files.\n\ + -p, --page-requisites get all images, etc. needed to display HTML page.\n\ \n"), _("\ Recursive accept/reject:\n\ -A, --accept=LIST comma-separated list of accepted extensions.\n\ @@ -232,6 +233,7 @@ main (int argc, char *const *argv) { "no-parent", no_argument, NULL, 5 }, { "non-verbose", no_argument, NULL, 18 }, { "passive-ftp", no_argument, NULL, 11 }, + { "page-requisites", no_argument, NULL, 'p' }, { "quiet", no_argument, NULL, 'q' }, { "recursive", no_argument, NULL, 'r' }, { "relative", no_argument, NULL, 'L' }, @@ -301,10 +303,14 @@ main (int argc, char *const *argv) windows_main_junk (&argc, (char **) argv, (char **) &exec_name); #endif - initialize (); + initialize (); /* sets option defaults; reads the system.wgetrc and .wgetrc */ + /* [Is the order of the option letters significant? If not, they should be + alphabetized, like the long_options. The only thing I know for sure is + that the options with required arguments must be followed by a ':'. + -- Dan Harkless ] */ while ((c = getopt_long (argc, argv, "\ -hVqvdkKsxmNWrHSLcFbEY:G:g:T:U:O:l:n:i:o:a:t:D:A:R:P:B:e:Q:X:I:w:", +hpVqvdkKsxmNWrHSLcFbEY: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) @@ -399,6 +405,9 @@ hVqvdkKsxmNWrHSLcFbEY:G:g:T:U:O:l:n:i:o:a:t:D:A:R:P:B:e:Q:X:I:w:", case 'N': setval ("timestamping", "on"); break; + case 'p': + setval ("pagerequisites", "on"); + break; case 'S': setval ("serverresponse", "on"); break; @@ -596,6 +605,21 @@ GNU General Public License for more details.\n")); break; } } + + /* All user options have now been processed, so it's now safe to do + interoption dependency checks. */ + + if (opt.reclevel == 0) + opt.reclevel = INFINITE_RECURSION; /* see wget.h for commentary on this */ + + if (opt.page_requisites && !opt.recursive) + { + opt.recursive = TRUE; + opt.reclevel = 0; + if (!opt.no_dirstruct) + opt.dirstruct = TRUE; /* usually handled by cmd_spec_recursive() */ + } + if (opt.verbose == -1) opt.verbose = !opt.quiet; diff --git a/src/options.h b/src/options.h index 2f773afa..83b15360 100644 --- a/src/options.h +++ b/src/options.h @@ -141,6 +141,9 @@ struct options int delete_after; /* Whether the files will be deleted after download. */ + + int page_requisites; /* Whether we need to download all files + necessary to display a page properly. */ }; #ifndef OPTIONS_DEFINED_HERE diff --git a/src/recur.c b/src/recur.c index 397db8c6..dc58c645 100644 --- a/src/recur.c +++ b/src/recur.c @@ -106,7 +106,7 @@ recursive_reset (void) } /* The core of recursive retrieving. Endless recursion is avoided by - having all URL-s stored to a linked list of URL-s, which is checked + having all URLs stored to a linked list of URLs, which is checked before loading any URL. That way no URL can get loaded twice. The function also supports specification of maximum recursion depth @@ -116,7 +116,7 @@ recursive_retrieve (const char *file, const char *this_url) { char *constr, *filename, *newloc; char *canon_this_url = NULL; - int dt, inl; + int dt, inl, dash_p_leaf_HTML = FALSE; int this_url_ftp; /* See below the explanation */ uerr_t err; struct urlinfo *rurl; @@ -163,13 +163,24 @@ recursive_retrieve (const char *file, const char *this_url) else ++depth; - /* Bail out if opt.reclevel is exceeded. */ - if ((opt.reclevel != 0) && (depth > opt.reclevel)) + if (opt.reclevel != INFINITE_RECURSION && depth > opt.reclevel) + /* We've exceeded the maximum recursion depth specified by the user. */ { - DEBUGP (("Recursion depth %d exceeded max. depth %d.\n", - depth, opt.reclevel)); - --depth; - return RECLEVELEXC; + if (opt.page_requisites && depth <= opt.reclevel + 1) + /* When -p is specified, we can do one more partial recursion from the + "leaf nodes" on the HTML document tree. The recursion is partial in + that we won't traverse any or tags, nor any tags + except for . */ + dash_p_leaf_HTML = TRUE; + else + /* Either -p wasn't specified or it was and we've already gone the one + extra (pseudo-)level that it affords us, so we need to bail out. */ + { + DEBUGP (("Recursion depth %d exceeded max. depth %d.\n", + depth, opt.reclevel)); + --depth; + return RECLEVELEXC; + } } /* Determine whether this_url is an FTP URL. If it is, it means @@ -179,8 +190,8 @@ recursive_retrieve (const char *file, const char *this_url) this_url_ftp = (urlproto (this_url) == URLFTP); /* Get the URL-s from an HTML file: */ - url_list = get_urls_html (file, - canon_this_url ? canon_this_url : this_url, 0); + url_list = get_urls_html (file, canon_this_url ? canon_this_url : this_url, + 0, dash_p_leaf_HTML); /* Decide what to do with each of the URLs. A URL will be loaded if it meets several requirements, discussed later. */ @@ -312,7 +323,8 @@ recursive_retrieve (const char *file, const char *this_url) (!*u->file || (((suf = suffix (constr)) != NULL) && ((!strcmp (suf, "html") || !strcmp (suf, "htm")) - && ((opt.reclevel != 0) && (depth != opt.reclevel)))))) + && ((opt.reclevel != INFINITE_RECURSION) && + (depth != opt.reclevel)))))) { if (!acceptable (u->file)) { @@ -504,7 +516,7 @@ recursive_retrieve (const char *file, const char *this_url) This is why Wget must, after the whole retrieval, call convert_all_links to go once more through the entire list of - retrieved HTML-s, and re-convert them. + retrieved HTMLs, and re-convert them. All the downloaded HTMLs are kept in urls_html, and downloaded URLs in urls_downloaded. From these two lists information is @@ -531,7 +543,8 @@ convert_all_links (void) else DEBUGP (("I cannot find the corresponding URL.\n")); /* Parse the HTML file... */ - urls = get_urls_html (html->string, urlhtml ? urlhtml->url : NULL, 1); + urls = get_urls_html (html->string, urlhtml ? urlhtml->url : NULL, 1, + FALSE); if (!urls) continue; for (l1 = urls; l1; l1 = l1->next) diff --git a/src/retr.c b/src/retr.c index dd19b1fe..62b98a34 100644 --- a/src/retr.c +++ b/src/retr.c @@ -430,9 +430,9 @@ retrieve_url (const char *origurl, char **file, char **newloc, return result; } -/* Find the URL-s in the file and call retrieve_url() for each of +/* Find the URLs in the file and call retrieve_url() for each of them. If HTML is non-zero, treat the file as HTML, and construct - the URL-s accordingly. + the URLs accordingly. If opt.recursive is set, call recursive_retrieve() for each file. */ uerr_t @@ -443,7 +443,7 @@ retrieve_from_file (const char *file, int html, int *count) /* If spider-mode is on, we do not want get_urls_html barfing errors on baseless links. */ - url_list = (html ? get_urls_html (file, NULL, opt.spider) + url_list = (html ? get_urls_html (file, NULL, opt.spider, FALSE) : get_urls_file (file)); status = RETROK; /* Suppose everything is OK. */ *count = 0; /* Reset the URL count. */ diff --git a/src/url.c b/src/url.c index 01b492ee..e2368065 100644 --- a/src/url.c +++ b/src/url.c @@ -830,7 +830,8 @@ get_urls_file (const char *file) If SILENT is non-zero, do not barf on baseless relative links. */ urlpos * -get_urls_html (const char *file, const char *this_url, int silent) +get_urls_html (const char *file, const char *this_url, int silent, + int dash_p_leaf_HTML) { long nread; FILE *fp; @@ -859,7 +860,8 @@ get_urls_html (const char *file, const char *this_url, int silent) first_time = 1; /* Iterate over the URLs in BUF, picked by htmlfindurl(). */ for (buf = orig_buf; - (buf = htmlfindurl (buf, nread - (buf - orig_buf), &step, first_time)); + (buf = htmlfindurl (buf, nread - (buf - orig_buf), &step, first_time, + dash_p_leaf_HTML)); buf += step) { int i, no_proto; diff --git a/src/url.h b/src/url.h index 45e8b76e..b8b52e82 100644 --- a/src/url.h +++ b/src/url.h @@ -88,7 +88,7 @@ char *str_url PARAMS ((const struct urlinfo *, int)); int url_equal PARAMS ((const char *, const char *)); urlpos *get_urls_file PARAMS ((const char *)); -urlpos *get_urls_html PARAMS ((const char *, const char *, int)); +urlpos *get_urls_html PARAMS ((const char *, const char *, int, int)); void free_urlpos PARAMS ((urlpos *)); void rotate_backups PARAMS ((const char *)); diff --git a/src/wget.h b/src/wget.h index d42cb5ae..ffcee1ca 100644 --- a/src/wget.h +++ b/src/wget.h @@ -193,6 +193,10 @@ char *xstrdup PARAMS ((const char *)); #define FREE_MAYBE(foo) do { if (foo) free (foo); } while (0) /* #### Hack: OPTIONS_DEFINED_HERE is defined in main.c. */ +/* [Is this weird hack really necessary on any compilers? No ANSI C compiler + should complain about "extern const char *exec_name;" followed by + "const char *exec_name;". Are we doing this for K&R compilers, or...?? + -- Dan Harkless ] */ #ifndef OPTIONS_DEFINED_HERE extern const char *exec_name; #endif @@ -239,4 +243,11 @@ typedef unsigned char boolean; the really awful !strcmp(a, b). */ #define EQ 0 +/* For most options, 0 means no limits, but with -p in the picture, that causes + a problem on the maximum recursion depth variable. To retain backwards + compatibility we allow users to consider "0" to be synonymous with "inf" for + -l, but internally infinite recursion is specified by -1 and 0 means to only + retrieve the requisites of a single document. */ +#define INFINITE_RECURSION -1 + #endif /* WGET_H */ -- 2.39.2