[svn] Commit administrative changes in preparation for the 1.7

prerelease.
Published in <sxsd78wwiwj.fsf@florida.arsdigita.de>.

diff --git a/ChangeLog b/ChangeLog
index 7fa80d1f210ccc228d3a6129fb25ec501356ec7b..a7727b4473d735475a8a81efa1d4a74c7763827a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-05-26  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+       * po/hr.po: Updated.
+
+       * po/wget.pot: Regenerated from sources.
+
+       * README: Updated copyright statement.
+
+       * INSTALL: Document the new OpenSSL autodetector.
+

 2001-05-26  Hrvoje Niksic  <hniksic@arsdigita.com>
 
        * configure.in: Provide a default for AC_TRY_RUN when
 2001-05-26  Hrvoje Niksic  <hniksic@arsdigita.com>
 
        * configure.in: Provide a default for AC_TRY_RUN when

diff --git a/INSTALL b/INSTALL
index bfb38fbcf9aed1fa04eefd138fc499382b5c294f..331139e3da7b152e2646e8c9ca0c182bbacdc87e 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -46,12 +46,12 @@ files, but it is useful to have a look at things you can change there.
 If you use socks, it is useful to add -L/usr/local/lib (or wherever
 the socks library is installed) to LDFLAGS in Makefile.
 
 If you use socks, it is useful to add -L/usr/local/lib (or wherever
 the socks library is installed) to LDFLAGS in Makefile.
 

-If you have OpenSSL installed in its default /usr/local/ssl directory
-(i.e. libraries are in /usr/local/ssl/lib), you can simply 
-`configure --with-ssl'.  If you have it installed elsewhere, you need
-to specify your alternate OpenSSL root directory.  For instance, if
-libcrypto.* and libssl.* are in /usr/local/lib, you need to 
-`configure --with-ssl=/usr/local'.
+If you have OpenSSL libraries installed in one of the default
+directories, such as /usr/local/lib or /usr/local/ssl/lib, you can
+simply `configure --with-ssl'.  If you have it installed elsewhere,
+you need to specify your alternate OpenSSL root directory.  For
+instance, if libcrypto.* and libssl.* are in /opt/openssl/lib, you
+need to `configure --with-ssl=/opt/openssl'.

 
 To configure Wget on Windows, run configure.bat and follow the
 instructions in the windows/ directory.  If this doesn't work for any
 
 To configure Wget on Windows, run configure.bat and follow the
 instructions in the windows/ directory.  If this doesn't work for any

diff --git a/README b/README
index f9215a449fda0750a6470967265e45fa5ee1e30d..bf88d6dbeae6445f3180cee1f64170a11072e396 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
                                                           -*- text -*-
 GNU Wget
                                                           -*- text -*-
 GNU Wget

-========                          Home: http://sunsite.dk/wget/
+========              (Temporary) home: http://sunsite.dk/wget/

 
 GNU Wget is a free network utility to retrieve files from the World
 Wide Web using HTTP and FTP, the two most widely used Internet
 
 GNU Wget is a free network utility to retrieve files from the World
 Wide Web using HTTP and FTP, the two most widely used Internet


@@ -45,9 +45,9 @@ Wget 1.6 is at:
 
 Please report bugs in Wget to <bug-wget@gnu.org>.
 
 
 Please report bugs in Wget to <bug-wget@gnu.org>.
 

-Wget has a mailing list at <wget@sunsite.dk>.  To subscribe, mail
-to <wget-subscribe@sunsite.dk>.  Wget's home page is at
-<URL:http://sunsite.dk/wget/>.
+Wget has a mailing list at <wget@sunsite.dk>.  To subscribe, mail to
+<wget-subscribe@sunsite.dk>.  Wget's home page is temporarily at
+<URL:http://sunsite.dk/wget/>.  It will soon be moved to www.gnu.org.

 
 Wget is free in all senses -- it is freely redistributable, and no
 payment is required.  If you still wish to donate money to the
 
 Wget is free in all senses -- it is freely redistributable, and no
 payment is required.  If you still wish to donate money to the


@@ -61,7 +61,8 @@ MAINTAINERS: Dan Harkless <wget@harkless.org>
 Wget was originally written by Hrvoje Niksic.
 
 
 Wget was originally written by Hrvoje Niksic.
 
 

-Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001 Free Software
+Foundation, Inc.

 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 5423e74c9f0d9457e6552e371b90b1450c20f395..152e466a38413e08d76cce44fd8767497d233046 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-26  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+       * wget.texi: Updated version to 1.7-pre1.
+

 2001-04-28  Hrvoje Niksic  <hniksic@arsdigita.com>
 
        * wget.texi (Wgetrc Commands): Update docs for `continue'.
 2001-04-28  Hrvoje Niksic  <hniksic@arsdigita.com>
 
        * wget.texi (Wgetrc Commands): Update docs for `continue'.

diff --git a/doc/wget.texi b/doc/wget.texi
index e3df048ce936931a217269e7d7545a5615d78683..4fe437dcab1b064596f80983f2181f68e4228c11 100644 (file)
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -15,8 +15,8 @@
 @end iftex
 
 @c This should really be auto-generated!
 @end iftex
 
 @c This should really be auto-generated!

-@set VERSION 1.7-dev
-@set UPDATED Jan 2001
+@set VERSION 1.7-pre1
+@set UPDATED May 2001

 
 @dircategory Net Utilities
 @dircategory World Wide Web
 
 @dircategory Net Utilities
 @dircategory World Wide Web


@@ -88,7 +88,8 @@ entitled ``GNU Free Documentation License''.
 This manual documents version @value{VERSION} of GNU Wget, the freely
 available utility for network download.
 
 This manual documents version @value{VERSION} of GNU Wget, the freely
 available utility for network download.
 

-Copyright @copyright{} 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+Copyright @copyright{} 1996, 1997, 1998, 2000, 2001 Free Software
+Foundation, Inc.

 
 @menu
 * Overview::            Features of Wget.
 
 @menu
 * Overview::            Features of Wget.

diff --git a/po/hr.po b/po/hr.po
index 3060e042eb6f707f829fcc95294a9208db27da43..703b7a2150152fc908056fb7bf22ae794841179d 100644 (file)
--- a/po/hr.po
+++ b/po/hr.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: GNU Wget 1.7-dev\n"
-"POT-Creation-Date: 2001-04-27 09:41+0200\n"
+"Project-Id-Version: GNU Wget 1.7-pre1\n"
+"POT-Creation-Date: 2001-05-26 11:07+0200\n"

 "PO-Revision-Date: 1998-02-29 21:05+01:00\n"
 "Last-Translator: Hrvoje Niksic <hniksic@arsdigita.com>\n"
 "Language-Team: Croatian <hr-translation@bagan.srce.hr>\n"
 "PO-Revision-Date: 1998-02-29 21:05+01:00\n"
 "Last-Translator: Hrvoje Niksic <hniksic@arsdigita.com>\n"
 "Language-Team: Croatian <hr-translation@bagan.srce.hr>\n"


@@ -13,143 +13,143 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: src/cookies.c:623
+#: src/cookies.c:588

 #, c-format
 msgid "Error in Set-Cookie, field `%s'"
 msgstr "Gre¹ka u zaglavlju Set-Cookie, polje `%s'"
 
 #, c-format
 msgid "Error in Set-Cookie, field `%s'"
 msgstr "Gre¹ka u zaglavlju Set-Cookie, polje `%s'"
 

-#: src/cookies.c:647
+#: src/cookies.c:612

 #, c-format
 msgid "Syntax error in Set-Cookie at character `%c'.\n"
 msgstr "Gre¹ka u Set-Cookie na znaku `%c'.\n"
 
 #, c-format
 msgid "Syntax error in Set-Cookie at character `%c'.\n"
 msgstr "Gre¹ka u Set-Cookie na znaku `%c'.\n"
 

-#: src/cookies.c:655
+#: src/cookies.c:620

 msgid "Syntax error in Set-Cookie: premature end of string.\n"
 msgstr "Gre¹ka u Set-Cookie: prerani kraj stringa.\n"
 
 msgid "Syntax error in Set-Cookie: premature end of string.\n"
 msgstr "Gre¹ka u Set-Cookie: prerani kraj stringa.\n"
 

-#: src/cookies.c:1350
+#: src/cookies.c:1352

 #, c-format
 msgid "Cannot open cookies file `%s': %s\n"
 msgstr "Ne mogu otvoriti datoteku s cookiejima `%s': %s\n"
 
 #, c-format
 msgid "Cannot open cookies file `%s': %s\n"
 msgstr "Ne mogu otvoriti datoteku s cookiejima `%s': %s\n"
 

-#: src/cookies.c:1362
+#: src/cookies.c:1364

 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Gre¹ka pri pisanju u `%s': %s\n"
 
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Gre¹ka pri pisanju u `%s': %s\n"
 

-#: src/cookies.c:1366
+#: src/cookies.c:1368

 #, c-format
 msgid "Error closing `%s': %s\n"
 msgstr "Gre¹ka pri zatvaranju `%s': %s\n"
 
 #, c-format
 msgid "Error closing `%s': %s\n"
 msgstr "Gre¹ka pri zatvaranju `%s': %s\n"
 

-#: src/ftp-ls.c:785
+#: src/ftp-ls.c:787

 msgid "Usupported listing type, trying Unix listing parser.\n"
 msgstr "Nepodr¾an tip ispisa, poku¹avam s Unixovim parserom ispisa.\n"
 
 msgid "Usupported listing type, trying Unix listing parser.\n"
 msgstr "Nepodr¾an tip ispisa, poku¹avam s Unixovim parserom ispisa.\n"
 

-#: src/ftp-ls.c:830 src/ftp-ls.c:832
+#: src/ftp-ls.c:832 src/ftp-ls.c:834

 #, c-format
 msgid "Index of /%s on %s:%d"
 msgstr "Indeks direktorija /%s na %s:%d"
 
 #, c-format
 msgid "Index of /%s on %s:%d"
 msgstr "Indeks direktorija /%s na %s:%d"
 

-#: src/ftp-ls.c:854
+#: src/ftp-ls.c:856

 msgid "time unknown       "
 msgstr "nepoznato vrijeme    "
 
 msgid "time unknown       "
 msgstr "nepoznato vrijeme    "
 

-#: src/ftp-ls.c:858
+#: src/ftp-ls.c:860

 msgid "File        "
 msgstr "Datoteka    "
 
 msgid "File        "
 msgstr "Datoteka    "
 

-#: src/ftp-ls.c:861
+#: src/ftp-ls.c:863

 msgid "Directory   "
 msgstr "Direktorij  "
 
 msgid "Directory   "
 msgstr "Direktorij  "
 

-#: src/ftp-ls.c:864
+#: src/ftp-ls.c:866

 msgid "Link        "
 msgstr "Link        "
 
 msgid "Link        "
 msgstr "Link        "
 

-#: src/ftp-ls.c:867
+#: src/ftp-ls.c:869

 msgid "Not sure    "
 msgstr "Ne znam     "
 
 msgid "Not sure    "
 msgstr "Ne znam     "
 

-#: src/ftp-ls.c:885
+#: src/ftp-ls.c:887

 #, c-format
 msgid " (%s bytes)"
 msgstr " (%s bajtova)"
 
 #. Login to the server:
 #. First: Establish the control connection.
 #, c-format
 msgid " (%s bytes)"
 msgstr " (%s bajtova)"
 
 #. Login to the server:
 #. First: Establish the control connection.

-#: src/ftp.c:151 src/http.c:627
+#: src/ftp.c:149 src/http.c:623

 #, c-format
 msgid "Connecting to %s:%hu... "
 msgstr "Spajam se na %s:%hu... "
 
 #, c-format
 msgid "Connecting to %s:%hu... "
 msgstr "Spajam se na %s:%hu... "
 

-#: src/ftp.c:173 src/ftp.c:540 src/http.c:644
+#: src/ftp.c:171 src/ftp.c:538 src/http.c:640

 #, c-format
 msgid "Connection to %s:%hu refused.\n"
 msgstr "%s:%hu odbija vezu.\n"
 
 #. Second: Login with proper USER/PASS sequence.
 #, c-format
 msgid "Connection to %s:%hu refused.\n"
 msgstr "%s:%hu odbija vezu.\n"
 
 #. Second: Login with proper USER/PASS sequence.

-#: src/ftp.c:194 src/http.c:655
+#: src/ftp.c:192 src/http.c:651

 msgid "connected!\n"
 msgstr "spojen!\n"
 
 msgid "connected!\n"
 msgstr "spojen!\n"
 

-#: src/ftp.c:195
+#: src/ftp.c:193

 #, c-format
 msgid "Logging in as %s ... "
 msgstr "Logiram se kao %s ... "
 
 #, c-format
 msgid "Logging in as %s ... "
 msgstr "Logiram se kao %s ... "
 

-#: src/ftp.c:204 src/ftp.c:257 src/ftp.c:289 src/ftp.c:337 src/ftp.c:430
-#: src/ftp.c:482 src/ftp.c:576 src/ftp.c:649 src/ftp.c:710 src/ftp.c:758
+#: src/ftp.c:202 src/ftp.c:255 src/ftp.c:287 src/ftp.c:335 src/ftp.c:428
+#: src/ftp.c:480 src/ftp.c:574 src/ftp.c:647 src/ftp.c:708 src/ftp.c:756

 msgid "Error in server response, closing control connection.\n"
 msgstr "Gre¹ka u odgovoru, zatvaram kontrolnu vezu.\n"
 
 msgid "Error in server response, closing control connection.\n"
 msgstr "Gre¹ka u odgovoru, zatvaram kontrolnu vezu.\n"
 

-#: src/ftp.c:212
+#: src/ftp.c:210

 msgid "Error in server greeting.\n"
 msgstr "Gre¹ka u poslu¾iteljevom pozdravu.\n"
 
 msgid "Error in server greeting.\n"
 msgstr "Gre¹ka u poslu¾iteljevom pozdravu.\n"
 

-#: src/ftp.c:220 src/ftp.c:346 src/ftp.c:439 src/ftp.c:491 src/ftp.c:586
-#: src/ftp.c:659 src/ftp.c:720 src/ftp.c:768
+#: src/ftp.c:218 src/ftp.c:344 src/ftp.c:437 src/ftp.c:489 src/ftp.c:584
+#: src/ftp.c:657 src/ftp.c:718 src/ftp.c:766

 msgid "Write failed, closing control connection.\n"
 msgstr "Write nije uspio, zatvaram kontrolnu vezu.\n"
 
 msgid "Write failed, closing control connection.\n"
 msgstr "Write nije uspio, zatvaram kontrolnu vezu.\n"
 

-#: src/ftp.c:227
+#: src/ftp.c:225

 msgid "The server refuses login.\n"
 msgstr "Poslu¾itelj odbija prijavu.\n"
 
 msgid "The server refuses login.\n"
 msgstr "Poslu¾itelj odbija prijavu.\n"
 

-#: src/ftp.c:234
+#: src/ftp.c:232

 msgid "Login incorrect.\n"
 msgstr "Pogre¹na prijava.\n"
 
 msgid "Login incorrect.\n"
 msgstr "Pogre¹na prijava.\n"
 

-#: src/ftp.c:241
+#: src/ftp.c:239

 msgid "Logged in!\n"
 msgstr "Ulogiran!\n"
 
 msgid "Logged in!\n"
 msgstr "Ulogiran!\n"
 

-#: src/ftp.c:266
+#: src/ftp.c:264

 msgid "Server error, can't determine system type.\n"
 msgstr "Gre¹ka na serveru, ne mogu utvrditi vrstu sustava.\n"
 
 msgid "Server error, can't determine system type.\n"
 msgstr "Gre¹ka na serveru, ne mogu utvrditi vrstu sustava.\n"
 

-#: src/ftp.c:276 src/ftp.c:561 src/ftp.c:633 src/ftp.c:690
+#: src/ftp.c:274 src/ftp.c:559 src/ftp.c:631 src/ftp.c:688

 msgid "done.    "
 msgstr "gotovo.  "
 
 msgid "done.    "
 msgstr "gotovo.  "
 

-#: src/ftp.c:326 src/ftp.c:460 src/ftp.c:741 src/ftp.c:789 src/url.c:1429
+#: src/ftp.c:324 src/ftp.c:458 src/ftp.c:739 src/ftp.c:787 src/url.c:1429

 msgid "done.\n"
 msgstr "gotovo.\n"
 
 msgid "done.\n"
 msgstr "gotovo.\n"
 

-#: src/ftp.c:354
+#: src/ftp.c:352

 #, c-format
 msgid "Unknown type `%c', closing control connection.\n"
 msgstr "Nepoznat tip `%c', zatvaram kontrolnu vezu.\n"
 
 #, c-format
 msgid "Unknown type `%c', closing control connection.\n"
 msgstr "Nepoznat tip `%c', zatvaram kontrolnu vezu.\n"
 

-#: src/ftp.c:367
+#: src/ftp.c:365

 msgid "done.  "
 msgstr "gotovo."
 
 msgid "done.  "
 msgstr "gotovo."
 

-#: src/ftp.c:373
+#: src/ftp.c:371

 msgid "==> CWD not needed.\n"
 msgstr "==> CWD ne treba.\n"
 
 msgid "==> CWD not needed.\n"
 msgstr "==> CWD ne treba.\n"
 

-#: src/ftp.c:446
+#: src/ftp.c:444

 #, c-format
 msgid ""
 "No such directory `%s'.\n"
 #, c-format
 msgid ""
 "No such directory `%s'.\n"


@@ -157,40 +157,42 @@ msgid ""
 msgstr "Nema direktorija `%s'.\n"
 
 #. do not CWD
 msgstr "Nema direktorija `%s'.\n"
 
 #. do not CWD

-#: src/ftp.c:464
+#: src/ftp.c:462

 msgid "==> CWD not required.\n"
 msgstr "==> CWD se ne tra¾i.\n"
 
 msgid "==> CWD not required.\n"
 msgstr "==> CWD se ne tra¾i.\n"
 

-#: src/ftp.c:498
+#: src/ftp.c:496

 msgid "Cannot initiate PASV transfer.\n"
 msgstr "Ne mogu otpoèeti PASV prijenos.\n"
 
 msgid "Cannot initiate PASV transfer.\n"
 msgstr "Ne mogu otpoèeti PASV prijenos.\n"
 

-#: src/ftp.c:502
+#: src/ftp.c:500

 msgid "Cannot parse PASV response.\n"
 msgstr "Ne mogu raspoznati PASV odgovor.\n"
 
 msgid "Cannot parse PASV response.\n"
 msgstr "Ne mogu raspoznati PASV odgovor.\n"
 

-#: src/ftp.c:516
+#: src/ftp.c:514

 #, c-format
 msgid "Will try connecting to %s:%hu.\n"
 msgstr "Poku¹at æu se spojiti na %s:%hu.\n"
 
 #, c-format
 msgid "Will try connecting to %s:%hu.\n"
 msgstr "Poku¹at æu se spojiti na %s:%hu.\n"
 

-#: src/ftp.c:603
+#: src/ftp.c:601

 #, c-format
 msgid "Bind error (%s).\n"
 msgstr "Gre¹ka u bindu (%s).\n"
 
 #, c-format
 msgid "Bind error (%s).\n"
 msgstr "Gre¹ka u bindu (%s).\n"
 

-#: src/ftp.c:619
+#: src/ftp.c:617

 msgid "Invalid PORT.\n"
 msgstr "Pogre¹an PORT.\n"
 
 msgid "Invalid PORT.\n"
 msgstr "Pogre¹an PORT.\n"
 

-#: src/ftp.c:672
+#: src/ftp.c:670

 #, c-format
 msgid ""
 "\n"
 "REST failed; will not truncate `%s'.\n"
 #, c-format
 msgid ""
 "\n"
 "REST failed; will not truncate `%s'.\n"

-msgstr "\nREST nije uspio; neæu skratiti `%s'.\n"
+msgstr ""
+"\n"
+"REST nije uspio; neæu skratiti `%s'.\n"

 
 

-#: src/ftp.c:679
+#: src/ftp.c:677

 msgid ""
 "\n"
 "REST failed, starting from scratch.\n"
 msgid ""
 "\n"
 "REST failed, starting from scratch.\n"


@@ -198,7 +200,7 @@ msgstr ""
 "\n"
 "REST nije uspio, poèinjem ispoèetka.\n"
 
 "\n"
 "REST nije uspio, poèinjem ispoèetka.\n"
 

-#: src/ftp.c:728
+#: src/ftp.c:726

 #, c-format
 msgid ""
 "No such file `%s'.\n"
 #, c-format
 msgid ""
 "No such file `%s'.\n"


@@ -207,7 +209,7 @@ msgstr ""
 "Nema datoteke `%s'.\n"
 "\n"
 
 "Nema datoteke `%s'.\n"
 "\n"
 

-#: src/ftp.c:776
+#: src/ftp.c:774

 #, c-format
 msgid ""
 "No such file or directory `%s'.\n"
 #, c-format
 msgid ""
 "No such file or directory `%s'.\n"


@@ -216,49 +218,49 @@ msgstr ""
 "Nema datoteke ili direktorija `%s'.\n"
 "\n"
 
 "Nema datoteke ili direktorija `%s'.\n"
 "\n"
 

-#: src/ftp.c:860 src/ftp.c:868
+#: src/ftp.c:858 src/ftp.c:866

 #, c-format
 msgid "Length: %s"
 msgstr "Duljina: %s"
 
 #, c-format
 msgid "Length: %s"
 msgstr "Duljina: %s"
 

-#: src/ftp.c:862 src/ftp.c:870
+#: src/ftp.c:860 src/ftp.c:868

 #, c-format
 msgid " [%s to go]"
 msgstr " [jo¹ %s]"
 
 #, c-format
 msgid " [%s to go]"
 msgstr " [jo¹ %s]"
 

-#: src/ftp.c:872
+#: src/ftp.c:870

 msgid " (unauthoritative)\n"
 msgstr " (neautorizirana)\n"
 
 msgid " (unauthoritative)\n"
 msgstr " (neautorizirana)\n"
 

-#: src/ftp.c:899
+#: src/ftp.c:897

 #, c-format
 msgid "%s: %s, closing control connection.\n"
 msgstr "%s: %s, zatvaram kontrolnu vezu.\n"
 
 #, c-format
 msgid "%s: %s, closing control connection.\n"
 msgstr "%s: %s, zatvaram kontrolnu vezu.\n"
 

-#: src/ftp.c:907
+#: src/ftp.c:905

 #, c-format
 msgid "%s (%s) - Data connection: %s; "
 msgstr "%s (%s) - Podatkovna veza: %s; "
 
 #, c-format
 msgid "%s (%s) - Data connection: %s; "
 msgstr "%s (%s) - Podatkovna veza: %s; "
 

-#: src/ftp.c:924
+#: src/ftp.c:922

 msgid "Control connection closed.\n"
 msgstr "Kontrolna veza prekinuta.\n"
 
 msgid "Control connection closed.\n"
 msgstr "Kontrolna veza prekinuta.\n"
 

-#: src/ftp.c:942
+#: src/ftp.c:940

 msgid "Data transfer aborted.\n"
 msgstr "Prijenos podataka prekinut.\n"
 
 msgid "Data transfer aborted.\n"
 msgstr "Prijenos podataka prekinut.\n"
 

-#: src/ftp.c:1006
+#: src/ftp.c:1004

 #, c-format
 msgid "File `%s' already there, not retrieving.\n"
 msgstr "Datoteka `%s' veæ postoji, ne skidam.\n"
 
 #, c-format
 msgid "File `%s' already there, not retrieving.\n"
 msgstr "Datoteka `%s' veæ postoji, ne skidam.\n"
 

-#: src/ftp.c:1076 src/http.c:1501
+#: src/ftp.c:1074 src/http.c:1501

 #, c-format
 msgid "(try:%2d)"
 msgstr "(pok:%2d)"
 
 #, c-format
 msgid "(try:%2d)"
 msgstr "(pok:%2d)"
 

-#: src/ftp.c:1140 src/http.c:1754
+#: src/ftp.c:1138 src/http.c:1752

 #, c-format
 msgid ""
 "%s (%s) - `%s' saved [%ld]\n"
 #, c-format
 msgid ""
 "%s (%s) - `%s' saved [%ld]\n"


@@ -267,36 +269,36 @@ msgstr ""
 "%s (%s) - `%s' snimljen [%ld]\n"
 "\n"
 
 "%s (%s) - `%s' snimljen [%ld]\n"
 "\n"
 

-#: src/ftp.c:1182 src/main.c:814 src/recur.c:483 src/retr.c:566
+#: src/ftp.c:1180 src/main.c:809 src/recur.c:483 src/retr.c:566

 #, c-format
 msgid "Removing %s.\n"
 msgstr "Uklanjam %s.\n"
 
 #, c-format
 msgid "Removing %s.\n"
 msgstr "Uklanjam %s.\n"
 

-#: src/ftp.c:1222
+#: src/ftp.c:1220

 #, c-format
 msgid "Using `%s' as listing tmp file.\n"
 msgstr "Koristim `%s' kao privremenu datoteku za listing.\n"
 
 #, c-format
 msgid "Using `%s' as listing tmp file.\n"
 msgstr "Koristim `%s' kao privremenu datoteku za listing.\n"
 

-#: src/ftp.c:1234
+#: src/ftp.c:1232

 #, c-format
 msgid "Removed `%s'.\n"
 msgstr "Izbrisao `%s'.\n"
 
 #, c-format
 msgid "Removed `%s'.\n"
 msgstr "Izbrisao `%s'.\n"
 

-#: src/ftp.c:1270
+#: src/ftp.c:1268

 #, c-format
 msgid "Recursion depth %d exceeded max. depth %d.\n"
 msgstr "Dubina rekurzije %d prelazi najveæu dozvoljenu %d.\n"
 
 #. Remote file is older, file sizes can be compared and
 #. are both equal.
 #, c-format
 msgid "Recursion depth %d exceeded max. depth %d.\n"
 msgstr "Dubina rekurzije %d prelazi najveæu dozvoljenu %d.\n"
 
 #. Remote file is older, file sizes can be compared and
 #. are both equal.

-#: src/ftp.c:1331
+#: src/ftp.c:1329

 #, c-format
 msgid "Remote file no newer than local file `%s' -- not retrieving.\n"
 msgstr ""
 "Datoteka na poslu¾itelju nije novija od lokalne datoteke `%s' -- ne skidam.\n"
 
 #. Remote file is newer or sizes cannot be matched
 #, c-format
 msgid "Remote file no newer than local file `%s' -- not retrieving.\n"
 msgstr ""
 "Datoteka na poslu¾itelju nije novija od lokalne datoteke `%s' -- ne skidam.\n"
 
 #. Remote file is newer or sizes cannot be matched

-#: src/ftp.c:1338
+#: src/ftp.c:1336

 #, c-format
 msgid ""
 "Remote file is newer than local file `%s' -- retrieving.\n"
 #, c-format
 msgid ""
 "Remote file is newer than local file `%s' -- retrieving.\n"


@@ -304,18 +306,18 @@ msgid ""
 msgstr "Datoteka na poslu¾itelju novija od lokalne datoteke `%s' -- skidam.\n"
 
 #. Sizes do not match
 msgstr "Datoteka na poslu¾itelju novija od lokalne datoteke `%s' -- skidam.\n"
 
 #. Sizes do not match

-#: src/ftp.c:1345
+#: src/ftp.c:1343

 #, c-format
 msgid ""
 "The sizes do not match (local %ld) -- retrieving.\n"
 "\n"
 msgstr "Velièine se ne sla¾u (lokalno %ld) -- skidam.\n"
 
 #, c-format
 msgid ""
 "The sizes do not match (local %ld) -- retrieving.\n"
 "\n"
 msgstr "Velièine se ne sla¾u (lokalno %ld) -- skidam.\n"
 

-#: src/ftp.c:1362
+#: src/ftp.c:1360

 msgid "Invalid name of the symlink, skipping.\n"
 msgstr "Pogre¹no ime simbolièkog linka, preskaèem.\n"
 
 msgid "Invalid name of the symlink, skipping.\n"
 msgstr "Pogre¹no ime simbolièkog linka, preskaèem.\n"
 

-#: src/ftp.c:1379
+#: src/ftp.c:1377

 #, c-format
 msgid ""
 "Already have correct symlink %s -> %s\n"
 #, c-format
 msgid ""
 "Already have correct symlink %s -> %s\n"


@@ -324,42 +326,42 @@ msgstr ""
 "Veæ postoji ispravan link %s -> %s\n"
 "\n"
 
 "Veæ postoji ispravan link %s -> %s\n"
 "\n"
 

-#: src/ftp.c:1387
+#: src/ftp.c:1385

 #, c-format
 msgid "Creating symlink %s -> %s\n"
 msgstr "Stvaram simbolièki link %s -> %s\n"
 
 #, c-format
 msgid "Creating symlink %s -> %s\n"
 msgstr "Stvaram simbolièki link %s -> %s\n"
 

-#: src/ftp.c:1398
+#: src/ftp.c:1396

 #, c-format
 msgid "Symlinks not supported, skipping symlink `%s'.\n"
 msgstr "Linkovi nisu podr¾ani, preskaèem link `%s'.\n"
 
 #, c-format
 msgid "Symlinks not supported, skipping symlink `%s'.\n"
 msgstr "Linkovi nisu podr¾ani, preskaèem link `%s'.\n"
 

-#: src/ftp.c:1410
+#: src/ftp.c:1408

 #, c-format
 msgid "Skipping directory `%s'.\n"
 msgstr "Preskaèem direktorij `%s'.\n"
 
 #, c-format
 msgid "Skipping directory `%s'.\n"
 msgstr "Preskaèem direktorij `%s'.\n"
 

-#: src/ftp.c:1419
+#: src/ftp.c:1417

 #, c-format
 msgid "%s: unknown/unsupported file type.\n"
 msgstr "%s: nepoznata/nepodr¾ana vrsta datoteke.\n"
 
 #, c-format
 msgid "%s: unknown/unsupported file type.\n"
 msgstr "%s: nepoznata/nepodr¾ana vrsta datoteke.\n"
 

-#: src/ftp.c:1446
+#: src/ftp.c:1444

 #, c-format
 msgid "%s: corrupt time-stamp.\n"
 msgstr "%s: pogre¹no vrijeme.\n"
 
 #, c-format
 msgid "%s: corrupt time-stamp.\n"
 msgstr "%s: pogre¹no vrijeme.\n"
 

-#: src/ftp.c:1467
+#: src/ftp.c:1465

 #, 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"
 
 #, 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:1513
+#: src/ftp.c:1511

 #, 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"
 
 #, 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:1560
+#: src/ftp.c:1558

 #, c-format
 msgid "Rejecting `%s'.\n"
 msgstr "Odbijam `%s'.\n"
 #, c-format
 msgid "Rejecting `%s'.\n"
 msgstr "Odbijam `%s'.\n"


@@ -367,17 +369,17 @@ msgstr "Odbijam `%s'.\n"
 #. No luck.
 #. #### This message SUCKS.  We should see what was the
 #. reason that nothing was retrieved.
 #. No luck.
 #. #### This message SUCKS.  We should see what was the
 #. reason that nothing was retrieved.

-#: src/ftp.c:1607
+#: src/ftp.c:1605

 #, c-format
 msgid "No matches on pattern `%s'.\n"
 msgstr "Ni¹ta ne ide uz `%s'.\n"
 
 #, c-format
 msgid "No matches on pattern `%s'.\n"
 msgstr "Ni¹ta ne ide uz `%s'.\n"
 

-#: src/ftp.c:1672
+#: src/ftp.c:1670

 #, c-format
 msgid "Wrote HTML-ized index to `%s' [%ld].\n"
 msgstr "Snimio HTML-iziran indeks u `%s' [%ld].\n"
 
 #, c-format
 msgid "Wrote HTML-ized index to `%s' [%ld].\n"
 msgstr "Snimio HTML-iziran indeks u `%s' [%ld].\n"
 

-#: src/ftp.c:1677
+#: src/ftp.c:1675

 #, c-format
 msgid "Wrote HTML-ized index to `%s'.\n"
 msgstr "Snimio HTML-iziran indeks u `%s'.\n"
 #, c-format
 msgid "Wrote HTML-ized index to `%s'.\n"
 msgstr "Snimio HTML-iziran indeks u `%s'.\n"


@@ -426,45 +428,11 @@ msgstr "%s: nedozvoljena opcija -- %c\n"
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: opcija tra¾i argument -- %c\n"
 
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: opcija tra¾i argument -- %c\n"
 

-#: src/host.c:391
-#, c-format
-msgid "%s: Cannot determine user-id.\n"
-msgstr "%s: Ne mogu utvrditi user-id.\n"
-
-#: src/host.c:403
-#, c-format
-msgid "%s: Warning: uname failed: %s\n"
-msgstr "%s: Upozorenje: uname nije uspio: %s\n"
-
-#: src/host.c:415
-#, c-format
-msgid "%s: Warning: gethostname failed\n"
-msgstr "%s: Upozorenje: gethostname nije uspio\n"
-
-#: src/host.c:443
-#, c-format
-msgid "%s: Warning: cannot determine local IP address.\n"
-msgstr "%s: Upozorenje: ne mogu utvrditi lokalnu IP adresu.\n"
-
-#: src/host.c:457
-#, c-format
-msgid "%s: Warning: cannot reverse-lookup local IP address.\n"
-msgstr "%s: Upozorenje: ne mogu napraviti reverzni lookup lokalne IP adrese.\n"
-
-#. This gets ticked pretty often.  Karl Berry reports
-#. that there can be valid reasons for the local host
-#. name not to be an FQDN, so I've decided to remove the
-#. annoying warning.
-#: src/host.c:470
-#, c-format
-msgid "%s: Warning: reverse-lookup of local address did not yield FQDN!\n"
-msgstr "%s: Upozorenje: reverzni lookup lokalne adrese ne daje FQDN!\n"
-
-#: src/host.c:498
+#: src/host.c:374

 msgid "Host not found"
 msgstr "Raèunalo nije pronaðeno"
 
 msgid "Host not found"
 msgstr "Raèunalo nije pronaðeno"
 

-#: src/host.c:500
+#: src/host.c:376

 msgid "Unknown error"
 msgstr "Nepoznata gre¹ka"
 
 msgid "Unknown error"
 msgstr "Nepoznata gre¹ka"
 


@@ -487,11 +455,11 @@ msgstr "Poku
 msgid "Failed to get certificate key from %s\n"
 msgstr "Nisam uspio dobiti certifikat kljuèa iz %s\n"
 
 msgid "Failed to get certificate key from %s\n"
 msgstr "Nisam uspio dobiti certifikat kljuèa iz %s\n"
 

-#: src/http.c:666 src/http.c:1592
+#: src/http.c:662 src/http.c:1592

 msgid "Unable to establish SSL connection.\n"
 msgstr "Ne mogu uspostaviti SSL vezu.\n"
 
 msgid "Unable to establish SSL connection.\n"
 msgstr "Ne mogu uspostaviti SSL vezu.\n"
 

-#: src/http.c:674
+#: src/http.c:670

 #, c-format
 msgid "Reusing connection to %s:%hu.\n"
 msgstr "Koristim postojeæu vezu prema %s:%hu.\n"
 #, c-format
 msgid "Reusing connection to %s:%hu.\n"
 msgstr "Koristim postojeæu vezu prema %s:%hu.\n"


@@ -510,32 +478,45 @@ msgstr "%s zahtjev poslan, 
 msgid "End of file while parsing headers.\n"
 msgstr "Kraj datoteke za vrijeme obrade zaglavlja.\n"
 
 msgid "End of file while parsing headers.\n"
 msgstr "Kraj datoteke za vrijeme obrade zaglavlja.\n"
 

-#: src/http.c:920
+#: src/http.c:919

 #, c-format
 msgid "Read error (%s) in headers.\n"
 msgstr "Gre¹ka pri èitanju zaglavlja (%s).\n"
 
 #, c-format
 msgid "Read error (%s) in headers.\n"
 msgstr "Gre¹ka pri èitanju zaglavlja (%s).\n"
 

-#: src/http.c:960
+#: src/http.c:958

 msgid "No data received"
 msgstr "Podaci nisu primljeni"
 
 msgid "No data received"
 msgstr "Podaci nisu primljeni"
 

-#: src/http.c:962
+#: src/http.c:960

 msgid "Malformed status line"
 msgstr "Deformirana statusna linija"
 
 msgid "Malformed status line"
 msgstr "Deformirana statusna linija"
 

-#: src/http.c:967
+#: src/http.c:965

 msgid "(no description)"
 msgstr "(bez opisa)"
 
 msgid "(no description)"
 msgstr "(bez opisa)"
 

-#: src/http.c:1090
+#: src/http.c:1088

 msgid "Authorization failed.\n"
 msgstr "Ovjera nije uspjela.\n"
 
 msgid "Authorization failed.\n"
 msgstr "Ovjera nije uspjela.\n"
 

-#: src/http.c:1097
+#: src/http.c:1095

 msgid "Unknown authentication scheme.\n"
 msgstr "Nepoznata metoda ovjere.\n"
 
 msgid "Unknown authentication scheme.\n"
 msgstr "Nepoznata metoda ovjere.\n"
 

-#: src/http.c:1173
+#: src/http.c:1135
+#, c-format
+msgid "Location: %s%s\n"
+msgstr "Polo¾aj: %s%s\n"
+
+#: src/http.c:1136 src/http.c:1268
+msgid "unspecified"
+msgstr "neodreðen"
+
+#: src/http.c:1137
+msgid " [following]"
+msgstr " [pratim]"
+
+#: src/http.c:1199

 msgid ""
 "\n"
 "    The file is already fully retrieved; nothing to do.\n"
 msgid ""
 "\n"
 "    The file is already fully retrieved; nothing to do.\n"


@@ -545,49 +526,36 @@ msgstr ""
 "    Datoteka je veæ u potpunosti skinuta; nema se ¹to napraviti.\n"
 "\n"
 
 "    Datoteka je veæ u potpunosti skinuta; nema se ¹to napraviti.\n"
 "\n"
 

-#: src/http.c:1190
+#: src/http.c:1215

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"

-"    The server does not support continued download;\n"
-"    refusing to truncate `%s'.\n"
+"The server does not support continued downloads, which conflicts with `-c'.\n"
+"Refusing to truncate existing file `%s'.\n"

 "\n"
 msgstr ""
 "\n"
 "\n"
 msgstr ""
 "\n"

-"    Server ne podr¾ava nastavljanje downloada;\n"
-"    odbijam skratiti `%s'.\n"
+"Server ne podr¾ava nastavljanje downloada, ¹to se kosi s `-c'.\n"
+"Odbijam skratiti postojeæu datoteku `%s'.\n"

 "\n"
 
 "\n"
 

-#: src/http.c:1238
-#, c-format
-msgid "Location: %s%s\n"
-msgstr "Polo¾aj: %s%s\n"
-
-#: src/http.c:1239 src/http.c:1265
-msgid "unspecified"
-msgstr "neodreðen"
-
-#: src/http.c:1240
-msgid " [following]"
-msgstr " [pratim]"
-

 #. No need to print this output if the body won't be
 #. downloaded at all, or if the original server response is
 #. printed.
 #. No need to print this output if the body won't be
 #. downloaded at all, or if the original server response is
 #. printed.

-#: src/http.c:1255
+#: src/http.c:1258

 msgid "Length: "
 msgstr "Duljina: "
 
 msgid "Length: "
 msgstr "Duljina: "
 

-#: src/http.c:1260
+#: src/http.c:1263

 #, c-format
 msgid " (%s to go)"
 msgstr " (jo¹ %s)"
 
 #, c-format
 msgid " (%s to go)"
 msgstr " (jo¹ %s)"
 

-#: src/http.c:1265
+#: src/http.c:1268

 msgid "ignored"
 msgstr "zanemarena"
 
 msgid "ignored"
 msgstr "zanemarena"
 

-#: src/http.c:1395
+#: src/http.c:1398

 msgid "Warning: wildcards not supported in HTTP.\n"
 msgstr "Upozorenje: wildcardi nisu podr¾ani za HTTP.\n"
 
 msgid "Warning: wildcards not supported in HTTP.\n"
 msgstr "Upozorenje: wildcardi nisu podr¾ani za HTTP.\n"
 


@@ -603,25 +571,25 @@ msgstr "Datoteka `%s' ve
 msgid "Cannot write to `%s' (%s).\n"
 msgstr "Ne mogu pisati u `%s' (%s).\n"
 
 msgid "Cannot write to `%s' (%s).\n"
 msgstr "Ne mogu pisati u `%s' (%s).\n"
 

-#: src/http.c:1602
+#: src/http.c:1601

 #, c-format
 msgid "ERROR: Redirection (%d) without location.\n"
 msgstr "GRE©KA: Redirekcija (%d) bez novog polo¾aja (location).\n"
 
 #, c-format
 msgid "ERROR: Redirection (%d) without location.\n"
 msgstr "GRE©KA: Redirekcija (%d) bez novog polo¾aja (location).\n"
 

-#: src/http.c:1627
+#: src/http.c:1629

 #, c-format
 msgid "%s ERROR %d: %s.\n"
 msgstr "%s GRE©KA %d: %s.\n"
 
 #, c-format
 msgid "%s ERROR %d: %s.\n"
 msgstr "%s GRE©KA %d: %s.\n"
 

-#: src/http.c:1640
+#: src/http.c:1641

 msgid "Last-modified header missing -- time-stamps turned off.\n"
 msgstr "Nedostaje Last-Modified zaglavlje -- ignoriram vremensku oznaku.\n"
 
 msgid "Last-modified header missing -- time-stamps turned off.\n"
 msgstr "Nedostaje Last-Modified zaglavlje -- ignoriram vremensku oznaku.\n"
 

-#: src/http.c:1648
+#: src/http.c:1649

 msgid "Last-modified header invalid -- time-stamp ignored.\n"
 msgstr "Nevaljan Last-Modified header -- ignoriram vremensku oznaku.\n"
 
 msgid "Last-modified header invalid -- time-stamp ignored.\n"
 msgstr "Nevaljan Last-Modified header -- ignoriram vremensku oznaku.\n"
 

-#: src/http.c:1671
+#: src/http.c:1672

 #, c-format
 msgid ""
 "Server file no newer than local file `%s' -- not retrieving.\n"
 #, c-format
 msgid ""
 "Server file no newer than local file `%s' -- not retrieving.\n"


@@ -638,7 +606,7 @@ msgstr "Veli
 msgid "Remote file is newer, retrieving.\n"
 msgstr "Datoteka na poslu¾itelju je novija, skidam.\n"
 
 msgid "Remote file is newer, retrieving.\n"
 msgstr "Datoteka na poslu¾itelju je novija, skidam.\n"
 

-#: src/http.c:1728
+#: src/http.c:1727

 #, c-format
 msgid ""
 "%s (%s) - `%s' saved [%ld/%ld]\n"
 #, c-format
 msgid ""
 "%s (%s) - `%s' saved [%ld/%ld]\n"


@@ -647,12 +615,12 @@ msgstr ""
 "%s (%s) - `%s' snimljen [%ld/%ld]\n"
 "\n"
 
 "%s (%s) - `%s' snimljen [%ld/%ld]\n"
 "\n"
 

-#: src/http.c:1776
+#: src/http.c:1773

 #, c-format
 msgid "%s (%s) - Connection closed at byte %ld. "
 msgstr "%s (%s) - Veza zatvorena na bajtu %ld. "
 
 #, c-format
 msgid "%s (%s) - Connection closed at byte %ld. "
 msgstr "%s (%s) - Veza zatvorena na bajtu %ld. "
 

-#: src/http.c:1784
+#: src/http.c:1781

 #, c-format
 msgid ""
 "%s (%s) - `%s' saved [%ld/%ld])\n"
 #, c-format
 msgid ""
 "%s (%s) - `%s' saved [%ld/%ld])\n"


@@ -661,22 +629,22 @@ msgstr ""
 "%s (%s) - `%s' snimljen [%ld/%ld])\n"
 "\n"
 
 "%s (%s) - `%s' snimljen [%ld/%ld])\n"
 "\n"
 

-#: src/http.c:1804
+#: src/http.c:1800

 #, c-format
 msgid "%s (%s) - Connection closed at byte %ld/%ld. "
 msgstr "%s (%s) - Veza zatvorena na bajtu %ld/%ld. "
 
 #, c-format
 msgid "%s (%s) - Connection closed at byte %ld/%ld. "
 msgstr "%s (%s) - Veza zatvorena na bajtu %ld/%ld. "
 

-#: src/http.c:1815
+#: src/http.c:1811

 #, c-format
 msgid "%s (%s) - Read error at byte %ld (%s)."
 msgstr "%s (%s) - Gre¹ka pri èitanju na bajtu %ld (%s)."
 
 #, c-format
 msgid "%s (%s) - Read error at byte %ld (%s)."
 msgstr "%s (%s) - Gre¹ka pri èitanju na bajtu %ld (%s)."
 

-#: src/http.c:1823
+#: src/http.c:1819

 #, c-format
 msgid "%s (%s) - Read error at byte %ld/%ld (%s). "
 msgstr "%s (%s) - Gre¹ka pri èitanju na bajtu %ld/%ld (%s). "
 
 #, c-format
 msgid "%s (%s) - Read error at byte %ld/%ld (%s). "
 msgstr "%s (%s) - Gre¹ka pri èitanju na bajtu %ld/%ld (%s). "
 

-#: src/init.c:348 src/netrc.c:260
+#: src/init.c:348 src/netrc.c:267

 #, c-format
 msgid "%s: Cannot read %s (%s).\n"
 msgstr "%s: Ne mogu proèitati %s (%s).\n"
 #, c-format
 msgid "%s: Cannot read %s (%s).\n"
 msgstr "%s: Ne mogu proèitati %s (%s).\n"


@@ -696,27 +664,27 @@ msgstr "%s: Upozorenje: sistemski i korisnikov wgetrc su `%s'.\n"
 msgid "%s: BUG: unknown command `%s', value `%s'.\n"
 msgstr "%s: BUG: Nepoznata naredba `%s', vrijednost `%s'.\n"
 
 msgid "%s: BUG: unknown command `%s', value `%s'.\n"
 msgstr "%s: BUG: Nepoznata naredba `%s', vrijednost `%s'.\n"
 

-#: src/init.c:526
+#: src/init.c:528

 #, c-format
 msgid "%s: %s: Cannot convert `%s' to an IP address.\n"
 msgstr "%s: %s: Upozorenje: ne mogu pretvoriti `%s' u IP adresu.\n"
 
 #, c-format
 msgid "%s: %s: Cannot convert `%s' to an IP address.\n"
 msgstr "%s: %s: Upozorenje: ne mogu pretvoriti `%s' u IP adresu.\n"
 

-#: src/init.c:557
+#: src/init.c:558

 #, c-format
 msgid "%s: %s: Please specify on or off.\n"
 msgstr "%s: %s: Molim postavite na on ili off.\n"
 
 #, c-format
 msgid "%s: %s: Please specify on or off.\n"
 msgstr "%s: %s: Molim postavite na on ili off.\n"
 

-#: src/init.c:601
+#: src/init.c:602

 #, c-format
 msgid "%s: %s: Please specify always, on, off, or never.\n"
 msgstr "%s: %s: Molim postavite na on, off ili never.\n"
 
 #, c-format
 msgid "%s: %s: Please specify always, on, off, or never.\n"
 msgstr "%s: %s: Molim postavite na on, off ili never.\n"
 

-#: src/init.c:620 src/init.c:917 src/init.c:939 src/init.c:1003
+#: src/init.c:621 src/init.c:918 src/init.c:940 src/init.c:1004

 #, c-format
 msgid "%s: %s: Invalid specification `%s'.\n"
 msgstr "%s: %s: Pogre¹na specifikacija `%s'\n"
 
 #, c-format
 msgid "%s: %s: Invalid specification `%s'.\n"
 msgstr "%s: %s: Pogre¹na specifikacija `%s'\n"
 

-#: src/init.c:773 src/init.c:795 src/init.c:817 src/init.c:843
+#: src/init.c:774 src/init.c:796 src/init.c:818 src/init.c:844

 #, c-format
 msgid "%s: Invalid specification `%s'\n"
 msgstr "wget: %s: Pogre¹na specifikacija `%s'\n"
 #, c-format
 msgid "%s: Invalid specification `%s'\n"
 msgstr "wget: %s: Pogre¹na specifikacija `%s'\n"


@@ -874,6 +842,8 @@ msgid ""
 "       --referer=URL         include `Referer: URL' header in HTTP request.\n"
 "  -s,  --save-headers        save the HTTP headers to file.\n"
 "  -U,  --user-agent=AGENT    identify as AGENT instead of Wget/VERSION.\n"
 "       --referer=URL         include `Referer: URL' header in HTTP request.\n"
 "  -s,  --save-headers        save the HTTP headers to file.\n"
 "  -U,  --user-agent=AGENT    identify as AGENT instead of Wget/VERSION.\n"

+"       --no-http-keep-alive  disable HTTP keep-alive (persistent "
+"connections).\n"

 "       --cookies=off         don't use cookies.\n"
 "       --load-cookies=FILE   load cookies from FILE before session.\n"
 "       --save-cookies=FILE   save cookies to FILE after session.\n"
 "       --cookies=off         don't use cookies.\n"
 "       --load-cookies=FILE   load cookies from FILE before session.\n"
 "       --save-cookies=FILE   save cookies to FILE after session.\n"


@@ -894,12 +864,13 @@ msgstr ""
 "  -s,  --save-headers           snimaj HTTP zaglavlja na disk.\n"
 "  -U,  --user-agent=KLIJENT     identificiraj se kao KLIJENT umjesto\n"
 "                                  Wget/VERZIJA.\n"
 "  -s,  --save-headers           snimaj HTTP zaglavlja na disk.\n"
 "  -U,  --user-agent=KLIJENT     identificiraj se kao KLIJENT umjesto\n"
 "                                  Wget/VERZIJA.\n"

+"       --no-http-keep-alive     ne koristi HTTP neprekinutu vezu (keep-alive).\n"

 "       --cookies=off            ne koristi cookieje.\n"
 "       --load-cookies=DATOTEKA  uèitaj cookieje iz DATOTEKE na poèetku rada.\n"
 "       --save-cookies=DATOTKEA  snimi cookieje u DATOTEKU na kraju rada.\n"
 "\n"
 
 "       --cookies=off            ne koristi cookieje.\n"
 "       --load-cookies=DATOTEKA  uèitaj cookieje iz DATOTEKE na poèetku rada.\n"
 "       --save-cookies=DATOTKEA  snimi cookieje u DATOTEKU na kraju rada.\n"
 "\n"
 

-#: src/main.c:199
+#: src/main.c:200

 msgid ""
 "FTP options:\n"
 "  -nr, --dont-remove-listing   don't remove `.listing' files.\n"
 msgid ""
 "FTP options:\n"
 "  -nr, --dont-remove-listing   don't remove `.listing' files.\n"


@@ -918,7 +889,7 @@ msgstr ""
 "                                idi u direktorije).\n"
 "\n"
 
 "                                idi u direktorije).\n"
 "\n"
 

-#: src/main.c:206
+#: src/main.c:207

 msgid ""
 "Recursive retrieval:\n"
 "  -r,  --recursive          recursive web-suck -- use with care!\n"
 msgid ""
 "Recursive retrieval:\n"
 "  -r,  --recursive          recursive web-suck -- use with care!\n"


@@ -943,7 +914,7 @@ msgstr ""
 "a.\n"
 "\n"
 
 "a.\n"
 "\n"
 

-#: src/main.c:216
+#: src/main.c:217

 msgid ""
 "Recursive accept/reject:\n"
 "  -A,  --accept=LIST                comma-separated list of accepted "
 msgid ""
 "Recursive accept/reject:\n"
 "  -A,  --accept=LIST                comma-separated list of accepted "


@@ -987,16 +958,16 @@ msgstr ""
 "  -np, --no-parent                   ne idi u direktorij iznad.\n"
 "\n"
 
 "  -np, --no-parent                   ne idi u direktorij iznad.\n"
 "\n"
 

-#: src/main.c:232
+#: src/main.c:233

 msgid "Mail bug reports and suggestions to <bug-wget@gnu.org>.\n"
 msgstr "©aljite izvje¹taje o bugovima i prijedloge na <bug-wget@gnu.org>.\n"
 
 msgid "Mail bug reports and suggestions to <bug-wget@gnu.org>.\n"
 msgstr "©aljite izvje¹taje o bugovima i prijedloge na <bug-wget@gnu.org>.\n"
 

-#: src/main.c:424
+#: src/main.c:419

 #, c-format
 msgid "%s: debug support not compiled in.\n"
 msgstr "%s: podr¹ka za debugiranje nije ugraðena.\n"
 
 #, c-format
 msgid "%s: debug support not compiled in.\n"
 msgstr "%s: podr¹ka za debugiranje nije ugraðena.\n"
 

-#: src/main.c:476
+#: src/main.c:471

 msgid ""
 "Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.\n"
 "This program is distributed in the hope that it will be useful,\n"
 msgid ""
 "Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.\n"
 "This program is distributed in the hope that it will be useful,\n"


@@ -1010,7 +981,7 @@ msgstr ""
 "PROIZVODNOSTI ili UPOTREBLJIVOSTI ZA ODREÐENU SVRHU.  Pogledajte GNU\n"
 "General Public License za vi¹e detalja.\n"
 
 "PROIZVODNOSTI ili UPOTREBLJIVOSTI ZA ODREÐENU SVRHU.  Pogledajte GNU\n"
 "General Public License za vi¹e detalja.\n"
 

-#: src/main.c:482
+#: src/main.c:477

 msgid ""
 "\n"
 "Originally written by Hrvoje Niksic <hniksic@arsdigita.com>.\n"
 msgid ""
 "\n"
 "Originally written by Hrvoje Niksic <hniksic@arsdigita.com>.\n"


@@ -1018,43 +989,43 @@ msgstr ""
 "\n"
 "Izvorno napisao Hrvoje Nik¹iæ <hniksic@arsdigita.com>.\n"
 
 "\n"
 "Izvorno napisao Hrvoje Nik¹iæ <hniksic@arsdigita.com>.\n"
 

-#: src/main.c:573
+#: src/main.c:568

 #, c-format
 msgid "%s: %s: invalid command\n"
 msgstr "%s: %s: nedozvoljena naredba\n"
 
 #, c-format
 msgid "%s: %s: invalid command\n"
 msgstr "%s: %s: nedozvoljena naredba\n"
 

-#: src/main.c:629
+#: src/main.c:624

 #, 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.
 #, 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:632 src/main.c:674 src/main.c:732
+#: src/main.c:627 src/main.c:669 src/main.c:727

 #, c-format
 msgid "Try `%s --help' for more options.\n"
 msgstr "Poku¹ajte `%s --help' za vi¹e opcija.\n"
 
 #, c-format
 msgid "Try `%s --help' for more options.\n"
 msgstr "Poku¹ajte `%s --help' za vi¹e opcija.\n"
 

-#: src/main.c:712
+#: src/main.c:707

 msgid "Can't be verbose and quiet at the same time.\n"
 msgstr "Ne mogu istovremeno biti verbozan i tih.\n"
 
 msgid "Can't be verbose and quiet at the same time.\n"
 msgstr "Ne mogu istovremeno biti verbozan i tih.\n"
 

-#: src/main.c:718
+#: src/main.c:713

 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.
 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:727
+#: src/main.c:722

 #, c-format
 msgid "%s: missing URL\n"
 msgstr "%s: nedostaje URL\n"
 
 #, c-format
 msgid "%s: missing URL\n"
 msgstr "%s: nedostaje URL\n"
 

-#: src/main.c:829
+#: src/main.c:824

 #, c-format
 msgid "No URLs found in %s.\n"
 msgstr "Nijedan URL nije pronaðen u %s.\n"
 
 #, c-format
 msgid "No URLs found in %s.\n"
 msgstr "Nijedan URL nije pronaðen u %s.\n"
 

-#: src/main.c:838
+#: src/main.c:833

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -1065,19 +1036,19 @@ msgstr ""
 "ZAVR©IO --%s--\n"
 "Skinuo: %s bajta u %d datoteka\n"
 
 "ZAVR©IO --%s--\n"
 "Skinuo: %s bajta u %d datoteka\n"
 

-#: src/main.c:846
+#: src/main.c:841

 #, 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.
 #, 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:880
+#: src/main.c:875

 #, c-format
 msgid "%s received, redirecting output to `%%s'.\n"
 msgstr "%s primljen, usmjeravam izlaz na `%%s'.\n"
 
 #, c-format
 msgid "%s received, redirecting output to `%%s'.\n"
 msgstr "%s primljen, usmjeravam izlaz na `%%s'.\n"
 

-#: src/mswindows.c:115
+#: src/mswindows.c:89

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -1091,42 +1062,42 @@ msgstr ""
 "Mo¾ete prekinuti Wget pritiskom na CTRL+ALT+DELETE.\n"
 
 #. parent, no error
 "Mo¾ete prekinuti Wget pritiskom na CTRL+ALT+DELETE.\n"
 
 #. parent, no error

-#: src/mswindows.c:132 src/utils.c:481
+#: src/mswindows.c:106 src/utils.c:457

 msgid "Continuing in background.\n"
 msgstr "Nastavljam u pozadini.\n"
 
 msgid "Continuing in background.\n"
 msgstr "Nastavljam u pozadini.\n"
 

-#: src/mswindows.c:134 src/utils.c:483
+#: src/mswindows.c:108 src/utils.c:459

 #, c-format
 msgid "Output will be written to `%s'.\n"
 msgstr "Izlaz se sprema u `%s'.\n"
 
 #, c-format
 msgid "Output will be written to `%s'.\n"
 msgstr "Izlaz se sprema u `%s'.\n"
 

-#: src/mswindows.c:214
+#: src/mswindows.c:188

 #, c-format
 msgid "Starting WinHelp %s\n"
 msgstr "Pokreæem WinHelp %s\n"
 
 #, c-format
 msgid "Starting WinHelp %s\n"
 msgstr "Pokreæem WinHelp %s\n"
 

-#: src/mswindows.c:241 src/mswindows.c:248
+#: src/mswindows.c:215 src/mswindows.c:222

 #, c-format
 msgid "%s: Couldn't find usable socket driver.\n"
 msgstr "%s: Ne mogu naæi upotrebljiv driver za sockete.\n"
 
 #, c-format
 msgid "%s: Couldn't find usable socket driver.\n"
 msgstr "%s: Ne mogu naæi upotrebljiv driver za sockete.\n"
 

-#: src/netrc.c:360
+#: src/netrc.c:367

 #, c-format
 msgid "%s: %s:%d: warning: \"%s\" token appears before any machine name\n"
 msgstr ""
 "%s: %s:%d: upozorenje: \"%s\" token se pojavljuje prije naziva stroja\n"
 
 #, c-format
 msgid "%s: %s:%d: warning: \"%s\" token appears before any machine name\n"
 msgstr ""
 "%s: %s:%d: upozorenje: \"%s\" token se pojavljuje prije naziva stroja\n"
 

-#: src/netrc.c:391
+#: src/netrc.c:398

 #, c-format
 msgid "%s: %s:%d: unknown token \"%s\"\n"
 msgstr "%s: %s:%d: nepoznat token \"%s\"\n"
 
 #, c-format
 msgid "%s: %s:%d: unknown token \"%s\"\n"
 msgstr "%s: %s:%d: nepoznat token \"%s\"\n"
 

-#: src/netrc.c:455
+#: src/netrc.c:462

 #, c-format
 msgid "Usage: %s NETRC [HOSTNAME]\n"
 msgstr "Uporaba: %s NETRC [RAÈUNALO]\n"
 
 #, c-format
 msgid "Usage: %s NETRC [HOSTNAME]\n"
 msgstr "Uporaba: %s NETRC [RAÈUNALO]\n"
 

-#: src/netrc.c:465
+#: src/netrc.c:472

 #, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr "%s: ne mogu stat-irati %s: %s\n"
 #, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr "%s: ne mogu stat-irati %s: %s\n"


@@ -1220,22 +1191,7 @@ msgstr "Pogre
 msgid "Invalid host name"
 msgstr "Pogre¹an naziv raèunala"
 
 msgid "Invalid host name"
 msgstr "Pogre¹an naziv raèunala"
 

-#: src/utils.c:643
+#: src/utils.c:619

 #, c-format
 msgid "Failed to unlink symlink `%s': %s\n"
 msgstr "Ne mogu izbrisati link `%s': %s\n"
 #, c-format
 msgid "Failed to unlink symlink `%s': %s\n"
 msgstr "Ne mogu izbrisati link `%s': %s\n"

-
-#~ msgid "Cannot compare sizes, remote system is VMS.\n"
-#~ msgstr "Ne mogu usporediti velièine, udaljeni sustav je VMS.\n"
-
-#~ msgid "%s: Out of memory.\n"
-#~ msgstr "%s: Nema dovoljno memorije.\n"
-
-#~ msgid "%s: Redirection to itself.\n"
-#~ msgstr "%s: Redirekcija na samog sebe.\n"
-
-#~ msgid "Error (%s): Link %s without a base provided.\n"
-#~ msgstr "Gre¹ka (%s): Zadan je link %s bez osnove.\n"
-
-#~ msgid "Error (%s): Base %s relative, without referer URL.\n"
-#~ msgstr "Gre¹ka (%s): Baza %s je relativna, bez referirajuæeg URL-a.\n"

diff --git a/po/wget.pot b/po/wget.pot
index 89bcd47f27428658c9b563e692142ea16e3f92af..748520165e14711bc7141bc76c91d6878698194c 100644 (file)
--- a/po/wget.pot
+++ b/po/wget.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"

-"POT-Creation-Date: 2001-04-27 09:41+0200\n"
+"POT-Creation-Date: 2001-05-26 11:07+0200\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -14,143 +14,143 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8-bit\n"
 

-#: src/cookies.c:623
+#: src/cookies.c:588

 #, c-format
 msgid "Error in Set-Cookie, field `%s'"
 msgstr ""
 
 #, c-format
 msgid "Error in Set-Cookie, field `%s'"
 msgstr ""
 

-#: src/cookies.c:647
+#: src/cookies.c:612

 #, c-format
 msgid "Syntax error in Set-Cookie at character `%c'.\n"
 msgstr ""
 
 #, c-format
 msgid "Syntax error in Set-Cookie at character `%c'.\n"
 msgstr ""
 

-#: src/cookies.c:655
+#: src/cookies.c:620

 msgid "Syntax error in Set-Cookie: premature end of string.\n"
 msgstr ""
 
 msgid "Syntax error in Set-Cookie: premature end of string.\n"
 msgstr ""
 

-#: src/cookies.c:1350
+#: src/cookies.c:1352

 #, c-format
 msgid "Cannot open cookies file `%s': %s\n"
 msgstr ""
 
 #, c-format
 msgid "Cannot open cookies file `%s': %s\n"
 msgstr ""
 

-#: src/cookies.c:1362
+#: src/cookies.c:1364

 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr ""
 
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr ""
 

-#: src/cookies.c:1366
+#: src/cookies.c:1368

 #, c-format
 msgid "Error closing `%s': %s\n"
 msgstr ""
 
 #, c-format
 msgid "Error closing `%s': %s\n"
 msgstr ""
 

-#: src/ftp-ls.c:785
+#: src/ftp-ls.c:787

 msgid "Usupported listing type, trying Unix listing parser.\n"
 msgstr ""
 
 msgid "Usupported listing type, trying Unix listing parser.\n"
 msgstr ""
 

-#: src/ftp-ls.c:830 src/ftp-ls.c:832
+#: src/ftp-ls.c:832 src/ftp-ls.c:834

 #, c-format
 msgid "Index of /%s on %s:%d"
 msgstr ""
 
 #, c-format
 msgid "Index of /%s on %s:%d"
 msgstr ""
 

-#: src/ftp-ls.c:854
+#: src/ftp-ls.c:856

 msgid "time unknown       "
 msgstr ""
 
 msgid "time unknown       "
 msgstr ""
 

-#: src/ftp-ls.c:858
+#: src/ftp-ls.c:860

 msgid "File        "
 msgstr ""
 
 msgid "File        "
 msgstr ""
 

-#: src/ftp-ls.c:861
+#: src/ftp-ls.c:863

 msgid "Directory   "
 msgstr ""
 
 msgid "Directory   "
 msgstr ""
 

-#: src/ftp-ls.c:864
+#: src/ftp-ls.c:866

 msgid "Link        "
 msgstr ""
 
 msgid "Link        "
 msgstr ""
 

-#: src/ftp-ls.c:867
+#: src/ftp-ls.c:869

 msgid "Not sure    "
 msgstr ""
 
 msgid "Not sure    "
 msgstr ""
 

-#: src/ftp-ls.c:885
+#: src/ftp-ls.c:887

 #, c-format
 msgid " (%s bytes)"
 msgstr ""
 
 #. Login to the server:
 #. First: Establish the control connection.
 #, c-format
 msgid " (%s bytes)"
 msgstr ""
 
 #. Login to the server:
 #. First: Establish the control connection.

-#: src/ftp.c:151 src/http.c:627
+#: src/ftp.c:149 src/http.c:623

 #, c-format
 msgid "Connecting to %s:%hu... "
 msgstr ""
 
 #, c-format
 msgid "Connecting to %s:%hu... "
 msgstr ""
 

-#: src/ftp.c:173 src/ftp.c:540 src/http.c:644
+#: src/ftp.c:171 src/ftp.c:538 src/http.c:640

 #, c-format
 msgid "Connection to %s:%hu refused.\n"
 msgstr ""
 
 #. Second: Login with proper USER/PASS sequence.
 #, c-format
 msgid "Connection to %s:%hu refused.\n"
 msgstr ""
 
 #. Second: Login with proper USER/PASS sequence.

-#: src/ftp.c:194 src/http.c:655
+#: src/ftp.c:192 src/http.c:651

 msgid "connected!\n"
 msgstr ""
 
 msgid "connected!\n"
 msgstr ""
 

-#: src/ftp.c:195
+#: src/ftp.c:193

 #, c-format
 msgid "Logging in as %s ... "
 msgstr ""
 
 #, c-format
 msgid "Logging in as %s ... "
 msgstr ""
 

-#: src/ftp.c:204 src/ftp.c:257 src/ftp.c:289 src/ftp.c:337 src/ftp.c:430
-#: src/ftp.c:482 src/ftp.c:576 src/ftp.c:649 src/ftp.c:710 src/ftp.c:758
+#: src/ftp.c:202 src/ftp.c:255 src/ftp.c:287 src/ftp.c:335 src/ftp.c:428
+#: src/ftp.c:480 src/ftp.c:574 src/ftp.c:647 src/ftp.c:708 src/ftp.c:756

 msgid "Error in server response, closing control connection.\n"
 msgstr ""
 
 msgid "Error in server response, closing control connection.\n"
 msgstr ""
 

-#: src/ftp.c:212
+#: src/ftp.c:210

 msgid "Error in server greeting.\n"
 msgstr ""
 
 msgid "Error in server greeting.\n"
 msgstr ""
 

-#: src/ftp.c:220 src/ftp.c:346 src/ftp.c:439 src/ftp.c:491 src/ftp.c:586
-#: src/ftp.c:659 src/ftp.c:720 src/ftp.c:768
+#: src/ftp.c:218 src/ftp.c:344 src/ftp.c:437 src/ftp.c:489 src/ftp.c:584
+#: src/ftp.c:657 src/ftp.c:718 src/ftp.c:766

 msgid "Write failed, closing control connection.\n"
 msgstr ""
 
 msgid "Write failed, closing control connection.\n"
 msgstr ""
 

-#: src/ftp.c:227
+#: src/ftp.c:225

 msgid "The server refuses login.\n"
 msgstr ""
 
 msgid "The server refuses login.\n"
 msgstr ""
 

-#: src/ftp.c:234
+#: src/ftp.c:232

 msgid "Login incorrect.\n"
 msgstr ""
 
 msgid "Login incorrect.\n"
 msgstr ""
 

-#: src/ftp.c:241
+#: src/ftp.c:239

 msgid "Logged in!\n"
 msgstr ""
 
 msgid "Logged in!\n"
 msgstr ""
 

-#: src/ftp.c:266
+#: src/ftp.c:264

 msgid "Server error, can't determine system type.\n"
 msgstr ""
 
 msgid "Server error, can't determine system type.\n"
 msgstr ""
 

-#: src/ftp.c:276 src/ftp.c:561 src/ftp.c:633 src/ftp.c:690
+#: src/ftp.c:274 src/ftp.c:559 src/ftp.c:631 src/ftp.c:688

 msgid "done.    "
 msgstr ""
 
 msgid "done.    "
 msgstr ""
 

-#: src/ftp.c:326 src/ftp.c:460 src/ftp.c:741 src/ftp.c:789 src/url.c:1429
+#: src/ftp.c:324 src/ftp.c:458 src/ftp.c:739 src/ftp.c:787 src/url.c:1429

 msgid "done.\n"
 msgstr ""
 
 msgid "done.\n"
 msgstr ""
 

-#: src/ftp.c:354
+#: src/ftp.c:352

 #, c-format
 msgid "Unknown type `%c', closing control connection.\n"
 msgstr ""
 
 #, c-format
 msgid "Unknown type `%c', closing control connection.\n"
 msgstr ""
 

-#: src/ftp.c:367
+#: src/ftp.c:365

 msgid "done.  "
 msgstr ""
 
 msgid "done.  "
 msgstr ""
 

-#: src/ftp.c:373
+#: src/ftp.c:371

 msgid "==> CWD not needed.\n"
 msgstr ""
 
 msgid "==> CWD not needed.\n"
 msgstr ""
 

-#: src/ftp.c:446
+#: src/ftp.c:444

 #, c-format
 msgid ""
 "No such directory `%s'.\n"
 #, c-format
 msgid ""
 "No such directory `%s'.\n"


@@ -158,137 +158,137 @@ msgid ""
 msgstr ""
 
 #. do not CWD
 msgstr ""
 
 #. do not CWD

-#: src/ftp.c:464
+#: src/ftp.c:462

 msgid "==> CWD not required.\n"
 msgstr ""
 
 msgid "==> CWD not required.\n"
 msgstr ""
 

-#: src/ftp.c:498
+#: src/ftp.c:496

 msgid "Cannot initiate PASV transfer.\n"
 msgstr ""
 
 msgid "Cannot initiate PASV transfer.\n"
 msgstr ""
 

-#: src/ftp.c:502
+#: src/ftp.c:500

 msgid "Cannot parse PASV response.\n"
 msgstr ""
 
 msgid "Cannot parse PASV response.\n"
 msgstr ""
 

-#: src/ftp.c:516
+#: src/ftp.c:514

 #, c-format
 msgid "Will try connecting to %s:%hu.\n"
 msgstr ""
 
 #, c-format
 msgid "Will try connecting to %s:%hu.\n"
 msgstr ""
 

-#: src/ftp.c:603
+#: src/ftp.c:601

 #, c-format
 msgid "Bind error (%s).\n"
 msgstr ""
 
 #, c-format
 msgid "Bind error (%s).\n"
 msgstr ""
 

-#: src/ftp.c:619
+#: src/ftp.c:617

 msgid "Invalid PORT.\n"
 msgstr ""
 
 msgid "Invalid PORT.\n"
 msgstr ""
 

-#: src/ftp.c:672
+#: src/ftp.c:670

 #, c-format
 msgid ""
 "\n"
 "REST failed; will not truncate `%s'.\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "\n"
 "REST failed; will not truncate `%s'.\n"
 msgstr ""
 

-#: src/ftp.c:679
+#: src/ftp.c:677

 msgid ""
 "\n"
 "REST failed, starting from scratch.\n"
 msgstr ""
 
 msgid ""
 "\n"
 "REST failed, starting from scratch.\n"
 msgstr ""
 

-#: src/ftp.c:728
+#: src/ftp.c:726

 #, c-format
 msgid ""
 "No such file `%s'.\n"
 "\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "No such file `%s'.\n"
 "\n"
 msgstr ""
 

-#: src/ftp.c:776
+#: src/ftp.c:774

 #, c-format
 msgid ""
 "No such file or directory `%s'.\n"
 "\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "No such file or directory `%s'.\n"
 "\n"
 msgstr ""
 

-#: src/ftp.c:860 src/ftp.c:868
+#: src/ftp.c:858 src/ftp.c:866

 #, c-format
 msgid "Length: %s"
 msgstr ""
 
 #, c-format
 msgid "Length: %s"
 msgstr ""
 

-#: src/ftp.c:862 src/ftp.c:870
+#: src/ftp.c:860 src/ftp.c:868

 #, c-format
 msgid " [%s to go]"
 msgstr ""
 
 #, c-format
 msgid " [%s to go]"
 msgstr ""
 

-#: src/ftp.c:872
+#: src/ftp.c:870

 msgid " (unauthoritative)\n"
 msgstr ""
 
 msgid " (unauthoritative)\n"
 msgstr ""
 

-#: src/ftp.c:899
+#: src/ftp.c:897

 #, c-format
 msgid "%s: %s, closing control connection.\n"
 msgstr ""
 
 #, c-format
 msgid "%s: %s, closing control connection.\n"
 msgstr ""
 

-#: src/ftp.c:907
+#: src/ftp.c:905

 #, c-format
 msgid "%s (%s) - Data connection: %s; "
 msgstr ""
 
 #, c-format
 msgid "%s (%s) - Data connection: %s; "
 msgstr ""
 

-#: src/ftp.c:924
+#: src/ftp.c:922

 msgid "Control connection closed.\n"
 msgstr ""
 
 msgid "Control connection closed.\n"
 msgstr ""
 

-#: src/ftp.c:942
+#: src/ftp.c:940

 msgid "Data transfer aborted.\n"
 msgstr ""
 
 msgid "Data transfer aborted.\n"
 msgstr ""
 

-#: src/ftp.c:1006
+#: src/ftp.c:1004

 #, c-format
 msgid "File `%s' already there, not retrieving.\n"
 msgstr ""
 
 #, c-format
 msgid "File `%s' already there, not retrieving.\n"
 msgstr ""
 

-#: src/ftp.c:1076 src/http.c:1501
+#: src/ftp.c:1074 src/http.c:1501

 #, c-format
 msgid "(try:%2d)"
 msgstr ""
 
 #, c-format
 msgid "(try:%2d)"
 msgstr ""
 

-#: src/ftp.c:1140 src/http.c:1754
+#: src/ftp.c:1138 src/http.c:1752

 #, c-format
 msgid ""
 "%s (%s) - `%s' saved [%ld]\n"
 "\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "%s (%s) - `%s' saved [%ld]\n"
 "\n"
 msgstr ""
 

-#: src/ftp.c:1182 src/main.c:814 src/recur.c:483 src/retr.c:566
+#: src/ftp.c:1180 src/main.c:809 src/recur.c:483 src/retr.c:566

 #, c-format
 msgid "Removing %s.\n"
 msgstr ""
 
 #, c-format
 msgid "Removing %s.\n"
 msgstr ""
 

-#: src/ftp.c:1222
+#: src/ftp.c:1220

 #, c-format
 msgid "Using `%s' as listing tmp file.\n"
 msgstr ""
 
 #, c-format
 msgid "Using `%s' as listing tmp file.\n"
 msgstr ""
 

-#: src/ftp.c:1234
+#: src/ftp.c:1232

 #, c-format
 msgid "Removed `%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "Removed `%s'.\n"
 msgstr ""
 

-#: src/ftp.c:1270
+#: src/ftp.c:1268

 #, c-format
 msgid "Recursion depth %d exceeded max. depth %d.\n"
 msgstr ""
 
 #. Remote file is older, file sizes can be compared and
 #. are both equal.
 #, c-format
 msgid "Recursion depth %d exceeded max. depth %d.\n"
 msgstr ""
 
 #. Remote file is older, file sizes can be compared and
 #. are both equal.

-#: src/ftp.c:1331
+#: src/ftp.c:1329

 #, c-format
 msgid "Remote file no newer than local file `%s' -- not retrieving.\n"
 msgstr ""
 
 #. Remote file is newer or sizes cannot be matched
 #, c-format
 msgid "Remote file no newer than local file `%s' -- not retrieving.\n"
 msgstr ""
 
 #. Remote file is newer or sizes cannot be matched

-#: src/ftp.c:1338
+#: src/ftp.c:1336

 #, c-format
 msgid ""
 "Remote file is newer than local file `%s' -- retrieving.\n"
 #, c-format
 msgid ""
 "Remote file is newer than local file `%s' -- retrieving.\n"


@@ -296,60 +296,60 @@ msgid ""
 msgstr ""
 
 #. Sizes do not match
 msgstr ""
 
 #. Sizes do not match

-#: src/ftp.c:1345
+#: src/ftp.c:1343

 #, c-format
 msgid ""
 "The sizes do not match (local %ld) -- retrieving.\n"
 "\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "The sizes do not match (local %ld) -- retrieving.\n"
 "\n"
 msgstr ""
 

-#: src/ftp.c:1362
+#: src/ftp.c:1360

 msgid "Invalid name of the symlink, skipping.\n"
 msgstr ""
 
 msgid "Invalid name of the symlink, skipping.\n"
 msgstr ""
 

-#: src/ftp.c:1379
+#: src/ftp.c:1377

 #, c-format
 msgid ""
 "Already have correct symlink %s -> %s\n"
 "\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Already have correct symlink %s -> %s\n"
 "\n"
 msgstr ""
 

-#: src/ftp.c:1387
+#: src/ftp.c:1385

 #, c-format
 msgid "Creating symlink %s -> %s\n"
 msgstr ""
 
 #, c-format
 msgid "Creating symlink %s -> %s\n"
 msgstr ""
 

-#: src/ftp.c:1398
+#: src/ftp.c:1396

 #, c-format
 msgid "Symlinks not supported, skipping symlink `%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "Symlinks not supported, skipping symlink `%s'.\n"
 msgstr ""
 

-#: src/ftp.c:1410
+#: src/ftp.c:1408

 #, c-format
 msgid "Skipping directory `%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "Skipping directory `%s'.\n"
 msgstr ""
 

-#: src/ftp.c:1419
+#: src/ftp.c:1417

 #, c-format
 msgid "%s: unknown/unsupported file type.\n"
 msgstr ""
 
 #, c-format
 msgid "%s: unknown/unsupported file type.\n"
 msgstr ""
 

-#: src/ftp.c:1446
+#: src/ftp.c:1444

 #, c-format
 msgid "%s: corrupt time-stamp.\n"
 msgstr ""
 
 #, c-format
 msgid "%s: corrupt time-stamp.\n"
 msgstr ""
 

-#: src/ftp.c:1467
+#: src/ftp.c:1465

 #, c-format
 msgid "Will not retrieve dirs since depth is %d (max %d).\n"
 msgstr ""
 
 #, c-format
 msgid "Will not retrieve dirs since depth is %d (max %d).\n"
 msgstr ""
 

-#: src/ftp.c:1513
+#: src/ftp.c:1511

 #, c-format
 msgid "Not descending to `%s' as it is excluded/not-included.\n"
 msgstr ""
 
 #, c-format
 msgid "Not descending to `%s' as it is excluded/not-included.\n"
 msgstr ""
 

-#: src/ftp.c:1560
+#: src/ftp.c:1558

 #, c-format
 msgid "Rejecting `%s'.\n"
 msgstr ""
 #, c-format
 msgid "Rejecting `%s'.\n"
 msgstr ""


@@ -357,17 +357,17 @@ msgstr ""
 #. No luck.
 #. #### This message SUCKS.  We should see what was the
 #. reason that nothing was retrieved.
 #. No luck.
 #. #### This message SUCKS.  We should see what was the
 #. reason that nothing was retrieved.

-#: src/ftp.c:1607
+#: src/ftp.c:1605

 #, c-format
 msgid "No matches on pattern `%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "No matches on pattern `%s'.\n"
 msgstr ""
 

-#: src/ftp.c:1672
+#: src/ftp.c:1670

 #, c-format
 msgid "Wrote HTML-ized index to `%s' [%ld].\n"
 msgstr ""
 
 #, c-format
 msgid "Wrote HTML-ized index to `%s' [%ld].\n"
 msgstr ""
 

-#: src/ftp.c:1677
+#: src/ftp.c:1675

 #, c-format
 msgid "Wrote HTML-ized index to `%s'.\n"
 msgstr ""
 #, c-format
 msgid "Wrote HTML-ized index to `%s'.\n"
 msgstr ""


@@ -416,45 +416,11 @@ msgstr ""
 msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
 msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 

-#: src/host.c:391
-#, c-format
-msgid "%s: Cannot determine user-id.\n"
-msgstr ""
-
-#: src/host.c:403
-#, c-format
-msgid "%s: Warning: uname failed: %s\n"
-msgstr ""
-
-#: src/host.c:415
-#, c-format
-msgid "%s: Warning: gethostname failed\n"
-msgstr ""
-
-#: src/host.c:443
-#, c-format
-msgid "%s: Warning: cannot determine local IP address.\n"
-msgstr ""
-
-#: src/host.c:457
-#, c-format
-msgid "%s: Warning: cannot reverse-lookup local IP address.\n"
-msgstr ""
-
-#. This gets ticked pretty often.  Karl Berry reports
-#. that there can be valid reasons for the local host
-#. name not to be an FQDN, so I've decided to remove the
-#. annoying warning.
-#: src/host.c:470
-#, c-format
-msgid "%s: Warning: reverse-lookup of local address did not yield FQDN!\n"
-msgstr ""
-
-#: src/host.c:498
+#: src/host.c:374

 msgid "Host not found"
 msgstr ""
 
 msgid "Host not found"
 msgstr ""
 

-#: src/host.c:500
+#: src/host.c:376

 msgid "Unknown error"
 msgstr ""
 
 msgid "Unknown error"
 msgstr ""
 


@@ -477,11 +443,11 @@ msgstr ""
 msgid "Failed to get certificate key from %s\n"
 msgstr ""
 
 msgid "Failed to get certificate key from %s\n"
 msgstr ""
 

-#: src/http.c:666 src/http.c:1592
+#: src/http.c:662 src/http.c:1592

 msgid "Unable to establish SSL connection.\n"
 msgstr ""
 
 msgid "Unable to establish SSL connection.\n"
 msgstr ""
 

-#: src/http.c:674
+#: src/http.c:670

 #, c-format
 msgid "Reusing connection to %s:%hu.\n"
 msgstr ""
 #, c-format
 msgid "Reusing connection to %s:%hu.\n"
 msgstr ""


@@ -500,77 +466,77 @@ msgstr ""
 msgid "End of file while parsing headers.\n"
 msgstr ""
 
 msgid "End of file while parsing headers.\n"
 msgstr ""
 

-#: src/http.c:920
+#: src/http.c:919

 #, c-format
 msgid "Read error (%s) in headers.\n"
 msgstr ""
 
 #, c-format
 msgid "Read error (%s) in headers.\n"
 msgstr ""
 

-#: src/http.c:960
+#: src/http.c:958

 msgid "No data received"
 msgstr ""
 
 msgid "No data received"
 msgstr ""
 

-#: src/http.c:962
+#: src/http.c:960

 msgid "Malformed status line"
 msgstr ""
 
 msgid "Malformed status line"
 msgstr ""
 

-#: src/http.c:967
+#: src/http.c:965

 msgid "(no description)"
 msgstr ""
 
 msgid "(no description)"
 msgstr ""
 

-#: src/http.c:1090
+#: src/http.c:1088

 msgid "Authorization failed.\n"
 msgstr ""
 
 msgid "Authorization failed.\n"
 msgstr ""
 

-#: src/http.c:1097
+#: src/http.c:1095

 msgid "Unknown authentication scheme.\n"
 msgstr ""
 
 msgid "Unknown authentication scheme.\n"
 msgstr ""
 

-#: src/http.c:1173
+#: src/http.c:1135
+#, c-format
+msgid "Location: %s%s\n"
+msgstr ""
+
+#: src/http.c:1136 src/http.c:1268
+msgid "unspecified"
+msgstr ""
+
+#: src/http.c:1137
+msgid " [following]"
+msgstr ""
+
+#: src/http.c:1199

 msgid ""
 "\n"
 "    The file is already fully retrieved; nothing to do.\n"
 "\n"
 msgstr ""
 
 msgid ""
 "\n"
 "    The file is already fully retrieved; nothing to do.\n"
 "\n"
 msgstr ""
 

-#: src/http.c:1190
+#: src/http.c:1215

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"

-"    The server does not support continued download;\n"
-"    refusing to truncate `%s'.\n"
+"The server does not support continued downloads, which conflicts with `-c'.\n"
+"Refusing to truncate existing file `%s'.\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: src/http.c:1238
-#, c-format
-msgid "Location: %s%s\n"
-msgstr ""
-
-#: src/http.c:1239 src/http.c:1265
-msgid "unspecified"
-msgstr ""
-
-#: src/http.c:1240
-msgid " [following]"
-msgstr ""
-

 #. No need to print this output if the body won't be
 #. downloaded at all, or if the original server response is
 #. printed.
 #. No need to print this output if the body won't be
 #. downloaded at all, or if the original server response is
 #. printed.

-#: src/http.c:1255
+#: src/http.c:1258

 msgid "Length: "
 msgstr ""
 
 msgid "Length: "
 msgstr ""
 

-#: src/http.c:1260
+#: src/http.c:1263

 #, c-format
 msgid " (%s to go)"
 msgstr ""
 
 #, c-format
 msgid " (%s to go)"
 msgstr ""
 

-#: src/http.c:1265
+#: src/http.c:1268

 msgid "ignored"
 msgstr ""
 
 msgid "ignored"
 msgstr ""
 

-#: src/http.c:1395
+#: src/http.c:1398

 msgid "Warning: wildcards not supported in HTTP.\n"
 msgstr ""
 
 msgid "Warning: wildcards not supported in HTTP.\n"
 msgstr ""
 


@@ -586,25 +552,25 @@ msgstr ""
 msgid "Cannot write to `%s' (%s).\n"
 msgstr ""
 
 msgid "Cannot write to `%s' (%s).\n"
 msgstr ""
 

-#: src/http.c:1602
+#: src/http.c:1601

 #, c-format
 msgid "ERROR: Redirection (%d) without location.\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: Redirection (%d) without location.\n"
 msgstr ""
 

-#: src/http.c:1627
+#: src/http.c:1629

 #, c-format
 msgid "%s ERROR %d: %s.\n"
 msgstr ""
 
 #, c-format
 msgid "%s ERROR %d: %s.\n"
 msgstr ""
 

-#: src/http.c:1640
+#: src/http.c:1641

 msgid "Last-modified header missing -- time-stamps turned off.\n"
 msgstr ""
 
 msgid "Last-modified header missing -- time-stamps turned off.\n"
 msgstr ""
 

-#: src/http.c:1648
+#: src/http.c:1649

 msgid "Last-modified header invalid -- time-stamp ignored.\n"
 msgstr ""
 
 msgid "Last-modified header invalid -- time-stamp ignored.\n"
 msgstr ""
 

-#: src/http.c:1671
+#: src/http.c:1672

 #, c-format
 msgid ""
 "Server file no newer than local file `%s' -- not retrieving.\n"
 #, c-format
 msgid ""
 "Server file no newer than local file `%s' -- not retrieving.\n"


@@ -620,41 +586,41 @@ msgstr ""
 msgid "Remote file is newer, retrieving.\n"
 msgstr ""
 
 msgid "Remote file is newer, retrieving.\n"
 msgstr ""
 

-#: src/http.c:1728
+#: src/http.c:1727

 #, c-format
 msgid ""
 "%s (%s) - `%s' saved [%ld/%ld]\n"
 "\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "%s (%s) - `%s' saved [%ld/%ld]\n"
 "\n"
 msgstr ""
 

-#: src/http.c:1776
+#: src/http.c:1773

 #, c-format
 msgid "%s (%s) - Connection closed at byte %ld. "
 msgstr ""
 
 #, c-format
 msgid "%s (%s) - Connection closed at byte %ld. "
 msgstr ""
 

-#: src/http.c:1784
+#: src/http.c:1781

 #, c-format
 msgid ""
 "%s (%s) - `%s' saved [%ld/%ld])\n"
 "\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "%s (%s) - `%s' saved [%ld/%ld])\n"
 "\n"
 msgstr ""
 

-#: src/http.c:1804
+#: src/http.c:1800

 #, c-format
 msgid "%s (%s) - Connection closed at byte %ld/%ld. "
 msgstr ""
 
 #, c-format
 msgid "%s (%s) - Connection closed at byte %ld/%ld. "
 msgstr ""
 

-#: src/http.c:1815
+#: src/http.c:1811

 #, c-format
 msgid "%s (%s) - Read error at byte %ld (%s)."
 msgstr ""
 
 #, c-format
 msgid "%s (%s) - Read error at byte %ld (%s)."
 msgstr ""
 

-#: src/http.c:1823
+#: src/http.c:1819

 #, c-format
 msgid "%s (%s) - Read error at byte %ld/%ld (%s). "
 msgstr ""
 
 #, c-format
 msgid "%s (%s) - Read error at byte %ld/%ld (%s). "
 msgstr ""
 

-#: src/init.c:348 src/netrc.c:260
+#: src/init.c:348 src/netrc.c:267

 #, c-format
 msgid "%s: Cannot read %s (%s).\n"
 msgstr ""
 #, c-format
 msgid "%s: Cannot read %s (%s).\n"
 msgstr ""


@@ -674,27 +640,27 @@ msgstr ""
 msgid "%s: BUG: unknown command `%s', value `%s'.\n"
 msgstr ""
 
 msgid "%s: BUG: unknown command `%s', value `%s'.\n"
 msgstr ""
 

-#: src/init.c:526
+#: src/init.c:528

 #, c-format
 msgid "%s: %s: Cannot convert `%s' to an IP address.\n"
 msgstr ""
 
 #, c-format
 msgid "%s: %s: Cannot convert `%s' to an IP address.\n"
 msgstr ""
 

-#: src/init.c:557
+#: src/init.c:558

 #, c-format
 msgid "%s: %s: Please specify on or off.\n"
 msgstr ""
 
 #, c-format
 msgid "%s: %s: Please specify on or off.\n"
 msgstr ""
 

-#: src/init.c:601
+#: src/init.c:602

 #, c-format
 msgid "%s: %s: Please specify always, on, off, or never.\n"
 msgstr ""
 
 #, c-format
 msgid "%s: %s: Please specify always, on, off, or never.\n"
 msgstr ""
 

-#: src/init.c:620 src/init.c:917 src/init.c:939 src/init.c:1003
+#: src/init.c:621 src/init.c:918 src/init.c:940 src/init.c:1004

 #, c-format
 msgid "%s: %s: Invalid specification `%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "%s: %s: Invalid specification `%s'.\n"
 msgstr ""
 

-#: src/init.c:773 src/init.c:795 src/init.c:817 src/init.c:843
+#: src/init.c:774 src/init.c:796 src/init.c:818 src/init.c:844

 #, c-format
 msgid "%s: Invalid specification `%s'\n"
 msgstr ""
 #, c-format
 msgid "%s: Invalid specification `%s'\n"
 msgstr ""


@@ -798,13 +764,15 @@ msgid ""
 "       --referer=URL         include `Referer: URL' header in HTTP request.\n"
 "  -s,  --save-headers        save the HTTP headers to file.\n"
 "  -U,  --user-agent=AGENT    identify as AGENT instead of Wget/VERSION.\n"
 "       --referer=URL         include `Referer: URL' header in HTTP request.\n"
 "  -s,  --save-headers        save the HTTP headers to file.\n"
 "  -U,  --user-agent=AGENT    identify as AGENT instead of Wget/VERSION.\n"

+"       --no-http-keep-alive  disable HTTP keep-alive (persistent "
+"connections).\n"

 "       --cookies=off         don't use cookies.\n"
 "       --load-cookies=FILE   load cookies from FILE before session.\n"
 "       --save-cookies=FILE   save cookies to FILE after session.\n"
 "\n"
 msgstr ""
 
 "       --cookies=off         don't use cookies.\n"
 "       --load-cookies=FILE   load cookies from FILE before session.\n"
 "       --save-cookies=FILE   save cookies to FILE after session.\n"
 "\n"
 msgstr ""
 

-#: src/main.c:199
+#: src/main.c:200

 msgid ""
 "FTP options:\n"
 "  -nr, --dont-remove-listing   don't remove `.listing' files.\n"
 msgid ""
 "FTP options:\n"
 "  -nr, --dont-remove-listing   don't remove `.listing' files.\n"


@@ -815,7 +783,7 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: src/main.c:206
+#: src/main.c:207

 msgid ""
 "Recursive retrieval:\n"
 "  -r,  --recursive          recursive web-suck -- use with care!\n"
 msgid ""
 "Recursive retrieval:\n"
 "  -r,  --recursive          recursive web-suck -- use with care!\n"


@@ -830,7 +798,7 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: src/main.c:216
+#: src/main.c:217

 msgid ""
 "Recursive accept/reject:\n"
 "  -A,  --accept=LIST                comma-separated list of accepted "
 msgid ""
 "Recursive accept/reject:\n"
 "  -A,  --accept=LIST                comma-separated list of accepted "


@@ -855,16 +823,16 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: src/main.c:232
+#: src/main.c:233

 msgid "Mail bug reports and suggestions to <bug-wget@gnu.org>.\n"
 msgstr ""
 
 msgid "Mail bug reports and suggestions to <bug-wget@gnu.org>.\n"
 msgstr ""
 

-#: src/main.c:424
+#: src/main.c:419

 #, c-format
 msgid "%s: debug support not compiled in.\n"
 msgstr ""
 
 #, c-format
 msgid "%s: debug support not compiled in.\n"
 msgstr ""
 

-#: src/main.c:476
+#: src/main.c:471

 msgid ""
 "Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.\n"
 "This program is distributed in the hope that it will be useful,\n"
 msgid ""
 "Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.\n"
 "This program is distributed in the hope that it will be useful,\n"


@@ -873,49 +841,49 @@ msgid ""
 "GNU General Public License for more details.\n"
 msgstr ""
 
 "GNU General Public License for more details.\n"
 msgstr ""
 

-#: src/main.c:482
+#: src/main.c:477

 msgid ""
 "\n"
 "Originally written by Hrvoje Niksic <hniksic@arsdigita.com>.\n"
 msgstr ""
 
 msgid ""
 "\n"
 "Originally written by Hrvoje Niksic <hniksic@arsdigita.com>.\n"
 msgstr ""
 

-#: src/main.c:573
+#: src/main.c:568

 #, c-format
 msgid "%s: %s: invalid command\n"
 msgstr ""
 
 #, c-format
 msgid "%s: %s: invalid command\n"
 msgstr ""
 

-#: src/main.c:629
+#: src/main.c:624

 #, c-format
 msgid "%s: illegal option -- `-n%c'\n"
 msgstr ""
 
 #. #### Something nicer should be printed here -- similar to the
 #. pre-1.5 `--help' page.
 #, 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:632 src/main.c:674 src/main.c:732
+#: src/main.c:627 src/main.c:669 src/main.c:727

 #, c-format
 msgid "Try `%s --help' for more options.\n"
 msgstr ""
 
 #, c-format
 msgid "Try `%s --help' for more options.\n"
 msgstr ""
 

-#: src/main.c:712
+#: src/main.c:707

 msgid "Can't be verbose and quiet at the same time.\n"
 msgstr ""
 
 msgid "Can't be verbose and quiet at the same time.\n"
 msgstr ""
 

-#: src/main.c:718
+#: src/main.c:713

 msgid "Can't timestamp and not clobber old files at the same time.\n"
 msgstr ""
 
 #. No URL specified.
 msgid "Can't timestamp and not clobber old files at the same time.\n"
 msgstr ""
 
 #. No URL specified.

-#: src/main.c:727
+#: src/main.c:722

 #, c-format
 msgid "%s: missing URL\n"
 msgstr ""
 
 #, c-format
 msgid "%s: missing URL\n"
 msgstr ""
 

-#: src/main.c:829
+#: src/main.c:824

 #, c-format
 msgid "No URLs found in %s.\n"
 msgstr ""
 
 #, c-format
 msgid "No URLs found in %s.\n"
 msgstr ""
 

-#: src/main.c:838
+#: src/main.c:833

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -923,19 +891,19 @@ msgid ""
 "Downloaded: %s bytes in %d files\n"
 msgstr ""
 
 "Downloaded: %s bytes in %d files\n"
 msgstr ""
 

-#: src/main.c:846
+#: src/main.c:841

 #, 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.
 #, 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:880
+#: src/main.c:875

 #, c-format
 msgid "%s received, redirecting output to `%%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "%s received, redirecting output to `%%s'.\n"
 msgstr ""
 

-#: src/mswindows.c:115
+#: src/mswindows.c:89

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -945,41 +913,41 @@ msgid ""
 msgstr ""
 
 #. parent, no error
 msgstr ""
 
 #. parent, no error

-#: src/mswindows.c:132 src/utils.c:481
+#: src/mswindows.c:106 src/utils.c:457

 msgid "Continuing in background.\n"
 msgstr ""
 
 msgid "Continuing in background.\n"
 msgstr ""
 

-#: src/mswindows.c:134 src/utils.c:483
+#: src/mswindows.c:108 src/utils.c:459

 #, c-format
 msgid "Output will be written to `%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "Output will be written to `%s'.\n"
 msgstr ""
 

-#: src/mswindows.c:214
+#: src/mswindows.c:188

 #, c-format
 msgid "Starting WinHelp %s\n"
 msgstr ""
 
 #, c-format
 msgid "Starting WinHelp %s\n"
 msgstr ""
 

-#: src/mswindows.c:241 src/mswindows.c:248
+#: src/mswindows.c:215 src/mswindows.c:222

 #, c-format
 msgid "%s: Couldn't find usable socket driver.\n"
 msgstr ""
 
 #, c-format
 msgid "%s: Couldn't find usable socket driver.\n"
 msgstr ""
 

-#: src/netrc.c:360
+#: src/netrc.c:367

 #, c-format
 msgid "%s: %s:%d: warning: \"%s\" token appears before any machine name\n"
 msgstr ""
 
 #, c-format
 msgid "%s: %s:%d: warning: \"%s\" token appears before any machine name\n"
 msgstr ""
 

-#: src/netrc.c:391
+#: src/netrc.c:398

 #, c-format
 msgid "%s: %s:%d: unknown token \"%s\"\n"
 msgstr ""
 
 #, c-format
 msgid "%s: %s:%d: unknown token \"%s\"\n"
 msgstr ""
 

-#: src/netrc.c:455
+#: src/netrc.c:462

 #, c-format
 msgid "Usage: %s NETRC [HOSTNAME]\n"
 msgstr ""
 
 #, c-format
 msgid "Usage: %s NETRC [HOSTNAME]\n"
 msgstr ""
 

-#: src/netrc.c:465
+#: src/netrc.c:472

 #, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr ""
 #, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr ""


@@ -1067,7 +1035,7 @@ msgstr ""
 msgid "Invalid host name"
 msgstr ""
 
 msgid "Invalid host name"
 msgstr ""
 

-#: src/utils.c:643
+#: src/utils.c:619

 #, c-format
 msgid "Failed to unlink symlink `%s': %s\n"
 msgstr ""
 #, c-format
 msgid "Failed to unlink symlink `%s': %s\n"
 msgstr ""

diff --git a/src/ChangeLog b/src/ChangeLog
index 22e3504e8dd656d6d244b6e279560f4088297eba..e9148a8e8b908e97addec390769ec30d8b68318f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-26  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+       * version.c: Updated version to 1.7-pre1.
+

 2001-05-14  Hrvoje Niksic  <hniksic@arsdigita.com>
 
        * gen_sslfunc.c: Don't include <sys/time.h> directly.
 2001-05-14  Hrvoje Niksic  <hniksic@arsdigita.com>
 
        * gen_sslfunc.c: Don't include <sys/time.h> directly.

diff --git a/src/version.c b/src/version.c
index 21bd61e63df292906ca85ecfa2894f7b30c5eefd..e347ac05ea9d1f870271ea8e136a9ee38636b685 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -1 +1 @@
-char *version_string = "1.7-dev";
+char *version_string = "1.7-pre1";