X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=po%2Fen_GB.po;h=2cbbec0ad5601e16e77e1890639d59bf2e1e3214;hp=e662e03e58642a6caf9e48b16f5f74768b66a811;hb=0d92a065943f24c4907cc37b5f31db129efc7eae;hpb=e7d78dd2a75d0ea21a63ac4968df6079b8018cd5

diff --git a/po/en_GB.po b/po/en_GB.po
index e662e03e..2cbbec0a 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wget 1.9.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-26 16:14-0700\n"
+"Report-Msgid-Bugs-To: bug-wget@gnu.org\n"
+"POT-Creation-Date: 2009-09-08 01:04-0700\n"
 "PO-Revision-Date: 2004-05-27 21:46-0400\n"
 "Last-Translator: Gareth Owen <gowen72@yahoo.com>\n"
 "Language-Team: English (British) <en_gb@li.org>\n"
@@ -14,55 +14,151 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/connect.c:195
+#: lib/error.c:127
+#, fuzzy
+msgid "Unknown system error"
+msgstr "Unknown error"
+
+#: lib/getopt.c:526 lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: option `%s' is ambiguous\n"
+
+#: lib/getopt.c:575 lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: option `--%s' doesn't allow an argument\n"
+
+#: lib/getopt.c:588 lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: option `%c%s' doesn't allow an argument\n"
+
+#: lib/getopt.c:636 lib/getopt.c:655 lib/getopt.c:971 lib/getopt.c:990
 #, c-format
-msgid "%s: unable to resolve bind address `%s'; disabling bind.\n"
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: option `%s' requires an argument\n"
+
+#: lib/getopt.c:693 lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: unrecognised option `--%s'\n"
+
+#: lib/getopt.c:704 lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: unrecognised option `%c%s'\n"
+
+#: lib/getopt.c:759 lib/getopt.c:762
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: illegal option -- %c\n"
+
+#: lib/getopt.c:768 lib/getopt.c:771
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: invalid option -- %c\n"
+
+#: lib/getopt.c:823 lib/getopt.c:839 lib/getopt.c:1043 lib/getopt.c:1061
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: option requires an argument -- %c\n"
+
+#: lib/getopt.c:892 lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: option `-W %s' is ambiguous\n"
+
+#: lib/getopt.c:932 lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: option `-W %s' doesn't allow an argument\n"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:272
+msgid "`"
+msgstr ""
+
+#: lib/quotearg.c:273
+msgid "'"
+msgstr ""
+
+#: lib/xalloc-die.c:34
+msgid "memory exhausted"
 msgstr ""
 
-#: src/connect.c:267
+#: src/connect.c:207
+#, c-format
+msgid "%s: unable to resolve bind address %s; disabling bind.\n"
+msgstr ""
+
+#: src/connect.c:291
 #, fuzzy, c-format
 msgid "Connecting to %s|%s|:%d... "
 msgstr "Connecting to %s[%s]:%hu... "
 
-#: src/connect.c:270
+#: src/connect.c:298
 #, fuzzy, c-format
 msgid "Connecting to %s:%d... "
 msgstr "Connecting to %s:%hu... "
 
-#: src/connect.c:330
+#: src/connect.c:358
 msgid "connected.\n"
 msgstr "connected.\n"
 
-#: src/connect.c:342 src/host.c:752 src/host.c:781
+#: src/connect.c:370 src/host.c:780 src/host.c:809
 #, c-format
 msgid "failed: %s.\n"
 msgstr "failed: %s.\n"
 
-#: src/convert.c:171
+#: src/connect.c:394 src/http.c:1674
+#, c-format
+msgid "%s: unable to resolve host address %s\n"
+msgstr ""
+
+#: src/convert.c:185
 #, fuzzy, c-format
 msgid "Converted %d files in %s seconds.\n"
 msgstr "Converted %d files in %.2f seconds.\n"
 
-#: src/convert.c:196
+#: src/convert.c:213
 #, c-format
 msgid "Converting %s... "
 msgstr "Converting %s... "
 
-#: src/convert.c:209
+#: src/convert.c:226
 msgid "nothing to do.\n"
 msgstr "nothing to do.\n"
 
-#: src/convert.c:217 src/convert.c:241
+#: src/convert.c:234 src/convert.c:258
 #, c-format
 msgid "Cannot convert links in %s: %s\n"
 msgstr "Cannot convert links in %s: %s\n"
 
-#: src/convert.c:232
-#, c-format
-msgid "Unable to delete `%s': %s\n"
+#: src/convert.c:249
+#, fuzzy, c-format
+msgid "Unable to delete %s: %s\n"
 msgstr "Unable to delete `%s': %s\n"
 
-#: src/convert.c:441
+#: src/convert.c:464
 #, c-format
 msgid "Cannot back up %s as %s: %s\n"
 msgstr "Cannot back up %s as %s: %s\n"
@@ -72,179 +168,177 @@ msgstr "Cannot back up %s as %s: %s\n"
 msgid "Syntax error in Set-Cookie: %s at position %d.\n"
 msgstr "Syntax error in Set-Cookie: %s at position %d.\n"
 
-#: src/cookies.c:685
+#: src/cookies.c:686
 #, c-format
 msgid "Cookie coming from %s attempted to set domain to %s\n"
 msgstr ""
 
-#: src/cookies.c:1132 src/cookies.c:1250
-#, c-format
-msgid "Cannot open cookies file `%s': %s\n"
+#: src/cookies.c:1134 src/cookies.c:1252
+#, fuzzy, c-format
+msgid "Cannot open cookies file %s: %s\n"
 msgstr "Cannot open cookies file `%s': %s\n"
 
-#: src/cookies.c:1287
-#, c-format
-msgid "Error writing to `%s': %s\n"
+#: src/cookies.c:1289
+#, fuzzy, c-format
+msgid "Error writing to %s: %s\n"
 msgstr "Error writing to `%s': %s\n"
 
-#: src/cookies.c:1290
-#, c-format
-msgid "Error closing `%s': %s\n"
+#: src/cookies.c:1292
+#, fuzzy, c-format
+msgid "Error closing %s: %s\n"
 msgstr "Error closing `%s': %s\n"
 
-#: src/ftp-ls.c:836
+#: src/ftp-ls.c:1065
 msgid "Unsupported listing type, trying Unix listing parser.\n"
 msgstr "Unsupported listing type, trying Unix listing parser.\n"
 
-#: src/ftp-ls.c:882 src/ftp-ls.c:884
+#: src/ftp-ls.c:1116 src/ftp-ls.c:1118
 #, c-format
 msgid "Index of /%s on %s:%d"
 msgstr "Index of /%s on %s:%d"
 
-#: src/ftp-ls.c:907
+#: src/ftp-ls.c:1143
 #, c-format
 msgid "time unknown       "
 msgstr "time unknown       "
 
-#: src/ftp-ls.c:911
+#: src/ftp-ls.c:1147
 #, c-format
 msgid "File        "
 msgstr "File        "
 
-#: src/ftp-ls.c:914
+#: src/ftp-ls.c:1150
 #, c-format
 msgid "Directory   "
 msgstr "Directory   "
 
-#: src/ftp-ls.c:917
+#: src/ftp-ls.c:1153
 #, c-format
 msgid "Link        "
 msgstr "Link        "
 
-#: src/ftp-ls.c:920
+#: src/ftp-ls.c:1156
 #, c-format
 msgid "Not sure    "
 msgstr "Not sure    "
 
-#: src/ftp-ls.c:938
+#: src/ftp-ls.c:1179
 #, c-format
 msgid " (%s bytes)"
 msgstr " (%s bytes)"
 
-#: src/ftp.c:209
+#: src/ftp.c:221
 #, c-format
 msgid "Length: %s"
 msgstr "Length: %s"
 
-#: src/ftp.c:215 src/http.c:2174
+#: src/ftp.c:227 src/http.c:2253
 #, c-format
 msgid ", %s (%s) remaining"
 msgstr ""
 
-#: src/ftp.c:219 src/http.c:2178
+#: src/ftp.c:231 src/http.c:2257
 #, c-format
 msgid ", %s remaining"
 msgstr ""
 
-#: src/ftp.c:222
+#: src/ftp.c:234
 msgid " (unauthoritative)\n"
 msgstr " (unauthoritative)\n"
 
-#. Second: Login with proper USER/PASS sequence.
-#: src/ftp.c:298
+#: src/ftp.c:315
 #, c-format
 msgid "Logging in as %s ... "
 msgstr "Logging in as %s ... "
 
-#: src/ftp.c:311 src/ftp.c:357 src/ftp.c:386 src/ftp.c:438 src/ftp.c:550
-#: src/ftp.c:596 src/ftp.c:625 src/ftp.c:682 src/ftp.c:743 src/ftp.c:803
-#: src/ftp.c:850
+#: src/ftp.c:329 src/ftp.c:375 src/ftp.c:404 src/ftp.c:469 src/ftp.c:699
+#: src/ftp.c:752 src/ftp.c:781 src/ftp.c:838 src/ftp.c:899 src/ftp.c:991
+#: src/ftp.c:1038
 msgid "Error in server response, closing control connection.\n"
 msgstr "Error in server response, closing control connection.\n"
 
-#: src/ftp.c:318
+#: src/ftp.c:336
 msgid "Error in server greeting.\n"
 msgstr "Error in server greeting.\n"
 
-#: src/ftp.c:325 src/ftp.c:446 src/ftp.c:558 src/ftp.c:633 src/ftp.c:692
-#: src/ftp.c:753 src/ftp.c:813 src/ftp.c:860
+#: src/ftp.c:343 src/ftp.c:477 src/ftp.c:707 src/ftp.c:789 src/ftp.c:848
+#: src/ftp.c:909 src/ftp.c:1001 src/ftp.c:1048
 msgid "Write failed, closing control connection.\n"
 msgstr "Write failed, closing control connection.\n"
 
-#: src/ftp.c:331
+#: src/ftp.c:349
 msgid "The server refuses login.\n"
 msgstr "The server refuses login.\n"
 
-#: src/ftp.c:337
+#: src/ftp.c:355
 msgid "Login incorrect.\n"
 msgstr "Login incorrect.\n"
 
-#: src/ftp.c:343
+#: src/ftp.c:361
 msgid "Logged in!\n"
 msgstr "Logged in!\n"
 
-#: src/ftp.c:365
+#: src/ftp.c:383
 msgid "Server error, can't determine system type.\n"
 msgstr "Server error, can't determine system type.\n"
 
-#: src/ftp.c:374 src/ftp.c:669 src/ftp.c:726 src/ftp.c:769
+#: src/ftp.c:392 src/ftp.c:825 src/ftp.c:882 src/ftp.c:925
 msgid "done.    "
 msgstr "done.    "
 
-#: src/ftp.c:426 src/ftp.c:575 src/ftp.c:608 src/ftp.c:833 src/ftp.c:879
+#: src/ftp.c:457 src/ftp.c:724 src/ftp.c:764 src/ftp.c:1021 src/ftp.c:1067
 msgid "done.\n"
 msgstr "done.\n"
 
-#: src/ftp.c:453
+#: src/ftp.c:484
 #, c-format
 msgid "Unknown type `%c', closing control connection.\n"
 msgstr "Unknown type `%c', closing control connection.\n"
 
-#: src/ftp.c:465
+#: src/ftp.c:496
 msgid "done.  "
 msgstr "done.  "
 
-#: src/ftp.c:471
+#: src/ftp.c:502
 msgid "==> CWD not needed.\n"
 msgstr "==> CWD not needed.\n"
 
-#: src/ftp.c:564
-#, c-format
+#: src/ftp.c:713
+#, fuzzy, c-format
 msgid ""
-"No such directory `%s'.\n"
+"No such directory %s.\n"
 "\n"
 msgstr ""
 "No such directory `%s'.\n"
 "\n"
 
-#. do not CWD
-#: src/ftp.c:579
+#: src/ftp.c:734
 msgid "==> CWD not required.\n"
 msgstr "==> CWD not required.\n"
 
-#: src/ftp.c:639
+#: src/ftp.c:795
 msgid "Cannot initiate PASV transfer.\n"
 msgstr "Cannot initiate PASV transfer.\n"
 
-#: src/ftp.c:643
+#: src/ftp.c:799
 msgid "Cannot parse PASV response.\n"
 msgstr "Cannot parse PASV response.\n"
 
-#: src/ftp.c:660
+#: src/ftp.c:816
 #, fuzzy, c-format
 msgid "couldn't connect to %s port %d: %s\n"
 msgstr "couldn't connect to %s:%hu: %s\n"
 
-#: src/ftp.c:708
+#: src/ftp.c:864
 #, c-format
 msgid "Bind error (%s).\n"
 msgstr "Bind error (%s).\n"
 
-#: src/ftp.c:714
+#: src/ftp.c:870
 msgid "Invalid PORT.\n"
 msgstr "Invalid PORT.\n"
 
-#: src/ftp.c:760
+#: src/ftp.c:916
 msgid ""
 "\n"
 "REST failed, starting from scratch.\n"
@@ -252,109 +346,120 @@ msgstr ""
 "\n"
 "REST failed, starting from scratch.\n"
 
-#: src/ftp.c:821
+#: src/ftp.c:957
 #, c-format
-msgid ""
+msgid "File %s exists.\n"
+msgstr ""
+
+#: src/ftp.c:963
+#, fuzzy, c-format
+msgid "No such file %s.\n"
+msgstr ""
 "No such file `%s'.\n"
 "\n"
+
+#: src/ftp.c:1009
+#, fuzzy, c-format
+msgid ""
+"No such file %s.\n"
+"\n"
 msgstr ""
 "No such file `%s'.\n"
 "\n"
 
-#: src/ftp.c:868
-#, c-format
+#: src/ftp.c:1056
+#, fuzzy, c-format
 msgid ""
-"No such file or directory `%s'.\n"
+"No such file or directory %s.\n"
 "\n"
 msgstr ""
 "No such file or directory `%s'.\n"
 "\n"
 
-#. We cannot just invent a new name and use it (which is
-#. what functions like unique_create typically do)
-#. because we told the user we'd use this name.
-#. Instead, return and retry the download.
-#: src/ftp.c:930 src/http.c:2236
+#: src/ftp.c:1187 src/http.c:2344
 #, c-format
 msgid "%s has sprung into existence.\n"
 msgstr ""
 
-#: src/ftp.c:982
+#: src/ftp.c:1239
 #, c-format
 msgid "%s: %s, closing control connection.\n"
 msgstr "%s: %s, closing control connection.\n"
 
-#: src/ftp.c:991
+#: src/ftp.c:1248
 #, c-format
 msgid "%s (%s) - Data connection: %s; "
 msgstr "%s (%s) - Data connection: %s; "
 
-#: src/ftp.c:1006
+#: src/ftp.c:1263
 msgid "Control connection closed.\n"
 msgstr "Control connection closed.\n"
 
-#: src/ftp.c:1024
+#: src/ftp.c:1281
 msgid "Data transfer aborted.\n"
 msgstr "Data transfer aborted.\n"
 
-#: src/ftp.c:1092
+#: src/ftp.c:1381
 #, fuzzy, c-format
-msgid "File `%s' already there; not retrieving.\n"
+msgid "File %s already there; not retrieving.\n"
 msgstr "File `%s' already there, not retrieving.\n"
 
-#: src/ftp.c:1160 src/http.c:2375
+#: src/ftp.c:1447 src/http.c:2529
 #, c-format
 msgid "(try:%2d)"
 msgstr "(try:%2d)"
 
-#: src/ftp.c:1230 src/http.c:2683
+#: src/ftp.c:1522 src/http.c:2873
+#, c-format
+msgid ""
+"%s (%s) - written to stdout %s[%s]\n"
+"\n"
+msgstr ""
+
+#: src/ftp.c:1523 src/http.c:2874
 #, fuzzy, c-format
 msgid ""
-"%s (%s) - `%s' saved [%s]\n"
+"%s (%s) - %s saved [%s]\n"
 "\n"
 msgstr ""
 "%s (%s) - `%s' saved [%ld]\n"
 "\n"
 
-#: src/ftp.c:1272 src/main.c:990 src/recur.c:376 src/retr.c:859
+#: src/ftp.c:1568 src/main.c:1299 src/recur.c:438 src/retr.c:990
 #, c-format
 msgid "Removing %s.\n"
 msgstr "Removing %s.\n"
 
-#: src/ftp.c:1314
-#, c-format
-msgid "Using `%s' as listing tmp file.\n"
+#: src/ftp.c:1610
+#, fuzzy, c-format
+msgid "Using %s as listing tmp file.\n"
 msgstr "Using `%s' as listing tmp file.\n"
 
-#: src/ftp.c:1329
-#, c-format
-msgid "Removed `%s'.\n"
+#: src/ftp.c:1627
+#, fuzzy, c-format
+msgid "Removed %s.\n"
 msgstr "Removed `%s'.\n"
 
-#: src/ftp.c:1362
+#: src/ftp.c:1664
 #, c-format
 msgid "Recursion depth %d exceeded max. depth %d.\n"
 msgstr "Recursion depth %d exceeded max. depth %d.\n"
 
-#. Remote file is older, file sizes can be compared and
-#. are both equal.
-#: src/ftp.c:1432
-#, c-format
-msgid "Remote file no newer than local file `%s' -- not retrieving.\n"
+#: src/ftp.c:1734
+#, fuzzy, c-format
+msgid "Remote file no newer than local file %s -- not retrieving.\n"
 msgstr "Remote file no newer than local file `%s' -- not retrieving.\n"
 
-#. Remote file is newer or sizes cannot be matched
-#: src/ftp.c:1439
-#, c-format
+#: src/ftp.c:1741
+#, fuzzy, c-format
 msgid ""
-"Remote file is newer than local file `%s' -- retrieving.\n"
+"Remote file is newer than local file %s -- retrieving.\n"
 "\n"
 msgstr ""
 "Remote file is newer than local file `%s' -- retrieving.\n"
 "\n"
 
-#. Sizes do not match
-#: src/ftp.c:1446
+#: src/ftp.c:1748
 #, fuzzy, c-format
 msgid ""
 "The sizes do not match (local %s) -- retrieving.\n"
@@ -363,11 +468,11 @@ msgstr ""
 "The sizes do not match (local %ld) -- retrieving.\n"
 "\n"
 
-#: src/ftp.c:1464
+#: src/ftp.c:1766
 msgid "Invalid name of the symlink, skipping.\n"
 msgstr "Invalid name of the symlink, skipping.\n"
 
-#: src/ftp.c:1481
+#: src/ftp.c:1783
 #, c-format
 msgid ""
 "Already have correct symlink %s -> %s\n"
@@ -376,253 +481,242 @@ msgstr ""
 "Already have correct symlink %s -> %s\n"
 "\n"
 
-#: src/ftp.c:1489
+#: src/ftp.c:1792
 #, c-format
 msgid "Creating symlink %s -> %s\n"
 msgstr "Creating symlink %s -> %s\n"
 
-#: src/ftp.c:1499
-#, c-format
-msgid "Symlinks not supported, skipping symlink `%s'.\n"
+#: src/ftp.c:1802
+#, fuzzy, c-format
+msgid "Symlinks not supported, skipping symlink %s.\n"
 msgstr "Symlinks not supported, skipping symlink `%s'.\n"
 
-#: src/ftp.c:1511
-#, c-format
-msgid "Skipping directory `%s'.\n"
+#: src/ftp.c:1814
+#, fuzzy, c-format
+msgid "Skipping directory %s.\n"
 msgstr "Skipping directory `%s'.\n"
 
-#: src/ftp.c:1520
+#: src/ftp.c:1823
 #, c-format
 msgid "%s: unknown/unsupported file type.\n"
 msgstr "%s: unknown/unsupported file type.\n"
 
-#: src/ftp.c:1547
+#: src/ftp.c:1860
 #, c-format
 msgid "%s: corrupt time-stamp.\n"
 msgstr "%s: corrupt time-stamp.\n"
 
-#: src/ftp.c:1575
+#: src/ftp.c:1882
 #, c-format
 msgid "Will not retrieve dirs since depth is %d (max %d).\n"
 msgstr "Will not retrieve dirs since depth is %d (max %d).\n"
 
-#: src/ftp.c:1625
-#, c-format
-msgid "Not descending to `%s' as it is excluded/not-included.\n"
+#: src/ftp.c:1932
+#, fuzzy, c-format
+msgid "Not descending to %s as it is excluded/not-included.\n"
 msgstr "Not descending to `%s' as it is excluded/not-included.\n"
 
-#: src/ftp.c:1691 src/ftp.c:1705
-#, c-format
-msgid "Rejecting `%s'.\n"
+#: src/ftp.c:1998 src/ftp.c:2012
+#, fuzzy, c-format
+msgid "Rejecting %s.\n"
 msgstr "Rejecting `%s'.\n"
 
-#. No luck.
-#. #### This message SUCKS.  We should see what was the
-#. reason that nothing was retrieved.
-#: src/ftp.c:1753
-#, c-format
-msgid "No matches on pattern `%s'.\n"
+#: src/ftp.c:2035
+#, fuzzy, c-format
+msgid "Error matching %s against %s: %s\n"
+msgstr "Error writing to `%s': %s\n"
+
+#: src/ftp.c:2077
+#, fuzzy, c-format
+msgid "No matches on pattern %s.\n"
 msgstr "No matches on pattern `%s'.\n"
 
-#: src/ftp.c:1819
+#: src/ftp.c:2148
 #, fuzzy, c-format
-msgid "Wrote HTML-ized index to `%s' [%s].\n"
+msgid "Wrote HTML-ized index to %s [%s].\n"
 msgstr "Wrote HTML-ised index to `%s' [%ld].\n"
 
-#: src/ftp.c:1824
-#, c-format
-msgid "Wrote HTML-ized index to `%s'.\n"
+#: src/ftp.c:2153
+#, fuzzy, c-format
+msgid "Wrote HTML-ized index to %s.\n"
 msgstr "Wrote HTML-ised index to `%s'.\n"
 
-#: src/getopt.c:670
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: option `%s' is ambiguous\n"
+#: src/gnutls.c:220 src/openssl.c:495
+msgid "ERROR"
+msgstr ""
 
-#: src/getopt.c:695
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: option `--%s' doesn't allow an argument\n"
+#: src/gnutls.c:220 src/openssl.c:495
+msgid "WARNING"
+msgstr ""
 
-#: src/getopt.c:700
+#: src/gnutls.c:226 src/openssl.c:504
 #, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: No certificate presented by %s.\n"
+msgstr ""
 
-#: src/getopt.c:718 src/getopt.c:891
+#: src/gnutls.c:234
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: option `%s' requires an argument\n"
+msgid "%s: The certificate of %s is not trusted.\n"
+msgstr ""
 
-#. --option
-#: src/getopt.c:747
+#: src/gnutls.c:240
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: unrecognised option `--%s'\n"
+msgid "%s: The certificate of %s hasn't got a known issuer.\n"
+msgstr ""
 
-#. +option or -option
-#: src/getopt.c:751
+#: src/gnutls.c:246
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: unrecognised option `%c%s'\n"
+msgid "%s: The certificate of %s has been revoked.\n"
+msgstr ""
 
-#. 1003.2 specifies the format of this message.
-#: src/getopt.c:777
+#: src/gnutls.c:260
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: illegal option -- %c\n"
+msgid "Error initializing X509 certificate: %s\n"
+msgstr ""
 
-#: src/getopt.c:780
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: invalid option -- %c\n"
+#: src/gnutls.c:269
+msgid "No certificate found\n"
+msgstr ""
 
-#. 1003.2 specifies the format of this message.
-#: src/getopt.c:810 src/getopt.c:940
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: option requires an argument -- %c\n"
+#: src/gnutls.c:276
+#, fuzzy, c-format
+msgid "Error parsing certificate: %s\n"
+msgstr "Error parsing proxy URL %s: %s.\n"
 
-#: src/getopt.c:857
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: option `-W %s' is ambiguous\n"
+#: src/gnutls.c:283
+msgid "The certificate has not yet been activated\n"
+msgstr ""
+
+#: src/gnutls.c:288
+msgid "The certificate has expired\n"
+msgstr ""
 
-#: src/getopt.c:875
+#: src/gnutls.c:294
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: option `-W %s' doesn't allow an argument\n"
+msgid "The certificate's owner does not match hostname %s\n"
+msgstr ""
 
-#: src/host.c:347
+#: src/host.c:358
 #, fuzzy
 msgid "Unknown host"
 msgstr "Unknown error"
 
-#. Message modeled after what gai_strerror returns in similar
-#. circumstances.
-#: src/host.c:351
+#: src/host.c:362
 msgid "Temporary failure in name resolution"
 msgstr ""
 
-#: src/host.c:353
+#: src/host.c:364
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: src/host.c:714
+#: src/host.c:737
 #, c-format
 msgid "Resolving %s... "
 msgstr "Resolving %s... "
 
-#: src/host.c:761
+#: src/host.c:789
 msgid "failed: No IPv4/IPv6 addresses for host.\n"
 msgstr ""
 
-#: src/host.c:784
+#: src/host.c:812
 msgid "failed: timed out.\n"
 msgstr "failed: timed out.\n"
 
-#: src/html-url.c:288
+#: src/html-url.c:286
 #, c-format
 msgid "%s: Cannot resolve incomplete link %s.\n"
 msgstr "%s: Cannot resolve incomplete link %s.\n"
 
-#: src/html-url.c:695
+#: src/html-url.c:772
 #, fuzzy, c-format
 msgid "%s: Invalid URL %s: %s\n"
 msgstr "%s: %s: Invalid value `%s'.\n"
 
-#: src/http.c:367
+#: src/http.c:377
 #, c-format
 msgid "Failed writing HTTP request: %s.\n"
 msgstr "Failed writing HTTP request: %s.\n"
 
-#: src/http.c:736
+#: src/http.c:754
 msgid "No headers, assuming HTTP/0.9"
 msgstr ""
 
-#: src/http.c:1413
+#: src/http.c:1456
 msgid "Disabling SSL due to encountered errors.\n"
 msgstr ""
 
-#: src/http.c:1566
+#: src/http.c:1576
 #, c-format
-msgid "POST data file `%s' missing: %s\n"
+msgid "POST data file %s missing: %s\n"
 msgstr ""
 
-#: src/http.c:1615
+#: src/http.c:1660
 #, fuzzy, c-format
 msgid "Reusing existing connection to %s:%d.\n"
 msgstr "Reusing connection to %s:%hu.\n"
 
-#: src/http.c:1684
+#: src/http.c:1729
 #, fuzzy, c-format
 msgid "Failed reading proxy response: %s\n"
 msgstr "Failed writing HTTP request: %s.\n"
 
-#: src/http.c:1704
+#: src/http.c:1750
 #, c-format
 msgid "Proxy tunneling failed: %s"
 msgstr ""
 
-#: src/http.c:1749
+#: src/http.c:1800
 #, c-format
 msgid "%s request sent, awaiting response... "
 msgstr "%s request sent, awaiting response... "
 
-#: src/http.c:1760
+#: src/http.c:1811
 #, fuzzy
 msgid "No data received.\n"
 msgstr "No data received"
 
-#: src/http.c:1767
+#: src/http.c:1818
 #, c-format
 msgid "Read error (%s) in headers.\n"
 msgstr "Read error (%s) in headers.\n"
 
-#. If opt.noclobber is turned on and file already exists, do not
-#. retrieve the file
-#: src/http.c:1813
-#, fuzzy, c-format
-msgid ""
-"File `%s' already there; not retrieving.\n"
-"\n"
-msgstr "File `%s' already there, not retrieving.\n"
-
-#. If the authentication header is missing or
-#. unrecognized, there's no sense in retrying.
-#: src/http.c:1966
+#: src/http.c:1932
 msgid "Unknown authentication scheme.\n"
 msgstr "Unknown authentication scheme.\n"
 
-#: src/http.c:1997
+#: src/http.c:1966
 msgid "Authorization failed.\n"
 msgstr "Authorization failed.\n"
 
-#: src/http.c:2011
+#: src/http.c:2004 src/http.c:2471
+#, fuzzy, c-format
+msgid ""
+"File %s already there; not retrieving.\n"
+"\n"
+msgstr "File `%s' already there, not retrieving.\n"
+
+#: src/http.c:2093
 msgid "Malformed status line"
 msgstr "Malformed status line"
 
-#: src/http.c:2013
+#: src/http.c:2095
 msgid "(no description)"
 msgstr "(no description)"
 
-#: src/http.c:2076
+#: src/http.c:2154
 #, c-format
 msgid "Location: %s%s\n"
 msgstr "Location: %s%s\n"
 
-#: src/http.c:2077 src/http.c:2184
+#: src/http.c:2155 src/http.c:2263
 msgid "unspecified"
 msgstr "unspecified"
 
-#: src/http.c:2078
+#: src/http.c:2156
 msgid " [following]"
 msgstr " [following]"
 
-#. If `-c' is in use and the file has been fully downloaded (or
-#. the remote file has shrunk), Wget effectively requests bytes
-#. after the end of file and the server response with 416.
-#: src/http.c:2134
+#: src/http.c:2208
 msgid ""
 "\n"
 "    The file is already fully retrieved; nothing to do.\n"
@@ -632,81 +726,77 @@ msgstr ""
 "    The file is already fully retrieved; nothing to do.\n"
 "\n"
 
-#. 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:2164
+#: src/http.c:2243
 msgid "Length: "
 msgstr "Length: "
 
-#: src/http.c:2184
+#: src/http.c:2263
 msgid "ignored"
 msgstr "ignored"
 
-#: src/http.c:2255
-#, fuzzy, c-format
-msgid "Saving to: `%s'\n"
-msgstr "Skipping directory `%s'.\n"
+#: src/http.c:2365
+#, c-format
+msgid "Saving to: %s\n"
+msgstr ""
 
-#: src/http.c:2335
+#: src/http.c:2447
 msgid "Warning: wildcards not supported in HTTP.\n"
 msgstr "Warning: wildcards not supported in HTTP.\n"
 
-#: src/http.c:2364
+#: src/http.c:2518
 msgid "Spider mode enabled. Check if remote file exists.\n"
 msgstr ""
 
-#: src/http.c:2450
-#, c-format
-msgid "Cannot write to `%s' (%s).\n"
+#: src/http.c:2603
+#, fuzzy, c-format
+msgid "Cannot write to %s (%s).\n"
 msgstr "Cannot write to `%s' (%s).\n"
 
-#. Another fatal error.
-#: src/http.c:2459
+#: src/http.c:2612
 msgid "Unable to establish SSL connection.\n"
 msgstr "Unable to establish SSL connection.\n"
 
-#: src/http.c:2467
+#: src/http.c:2620
 #, c-format
 msgid "ERROR: Redirection (%d) without location.\n"
 msgstr "ERROR: Redirection (%d) without location.\n"
 
-#: src/http.c:2505
+#: src/http.c:2668
 msgid "Remote file does not exist -- broken link!!!\n"
 msgstr ""
 
-#: src/http.c:2510
+#: src/http.c:2673
 #, c-format
 msgid "%s ERROR %d: %s.\n"
 msgstr "%s ERROR %d: %s.\n"
 
-#: src/http.c:2526
+#: src/http.c:2690
 msgid "Last-modified header missing -- time-stamps turned off.\n"
 msgstr "Last-modified header missing -- time-stamps turned off.\n"
 
-#: src/http.c:2534
+#: src/http.c:2698
 msgid "Last-modified header invalid -- time-stamp ignored.\n"
 msgstr "Last-modified header invalid -- time-stamp ignored.\n"
 
-#: src/http.c:2558
-#, c-format
+#: src/http.c:2728
+#, fuzzy, c-format
 msgid ""
-"Server file no newer than local file `%s' -- not retrieving.\n"
+"Server file no newer than local file %s -- not retrieving.\n"
 "\n"
 msgstr ""
 "Server file no newer than local file `%s' -- not retrieving.\n"
 "\n"
 
-#: src/http.c:2566
+#: src/http.c:2736
 #, fuzzy, c-format
 msgid "The sizes do not match (local %s) -- retrieving.\n"
 msgstr "The sizes do not match (local %ld) -- retrieving.\n"
 
-#: src/http.c:2573
+#: src/http.c:2743
 msgid "Remote file is newer, retrieving.\n"
 msgstr "Remote file is newer, retrieving.\n"
 
-#: src/http.c:2596
+#: src/http.c:2760
 #, fuzzy
 msgid ""
 "Remote file exists and could contain links to other resources -- "
@@ -716,150 +806,200 @@ msgstr ""
 "Remote file is newer than local file `%s' -- retrieving.\n"
 "\n"
 
-#: src/http.c:2602
+#: src/http.c:2766
 #, fuzzy
 msgid ""
 "Remote file exists but does not contain any link -- not retrieving.\n"
 "\n"
 msgstr "Remote file no newer than local file `%s' -- not retrieving.\n"
 
-#: src/http.c:2610
+#: src/http.c:2775
+msgid ""
+"Remote file exists and could contain further links,\n"
+"but recursion is disabled -- not retrieving.\n"
+"\n"
+msgstr ""
+
+#: src/http.c:2781
 #, fuzzy
 msgid ""
-"Remote file exists but recursion is disabled -- not retrieving.\n"
+"Remote file exists.\n"
 "\n"
-msgstr "Remote file no newer than local file `%s' -- not retrieving.\n"
+msgstr "Remote file is newer, retrieving.\n"
+
+#: src/http.c:2790
+#, fuzzy, c-format
+msgid "%s URL: %s %2d %s\n"
+msgstr "%s ERROR %d: %s.\n"
+
+#: src/http.c:2837
+#, c-format
+msgid ""
+"%s (%s) - written to stdout %s[%s/%s]\n"
+"\n"
+msgstr ""
 
-#: src/http.c:2652
+#: src/http.c:2838
 #, fuzzy, c-format
 msgid ""
-"%s (%s) - `%s' saved [%s/%s]\n"
+"%s (%s) - %s saved [%s/%s]\n"
 "\n"
 msgstr ""
 "%s (%s) - `%s' saved [%ld/%ld]\n"
 "\n"
 
-#: src/http.c:2707
+#: src/http.c:2899
 #, fuzzy, c-format
 msgid "%s (%s) - Connection closed at byte %s. "
 msgstr "%s (%s) - Connection closed at byte %ld. "
 
-#: src/http.c:2722
+#: src/http.c:2922
 #, fuzzy, c-format
 msgid "%s (%s) - Read error at byte %s (%s)."
 msgstr "%s (%s) - Read error at byte %ld (%s)."
 
-#: src/http.c:2731
+#: src/http.c:2931
 #, fuzzy, c-format
 msgid "%s (%s) - Read error at byte %s/%s (%s). "
 msgstr "%s (%s) - Read error at byte %ld/%ld (%s). "
 
-#: src/init.c:370
+#: src/init.c:406
 #, c-format
 msgid "%s: WGETRC points to %s, which doesn't exist.\n"
 msgstr "%s: WGETRC points to %s, which doesn't exist.\n"
 
-#: src/init.c:433 src/netrc.c:267
+#: src/init.c:510 src/netrc.c:282
 #, c-format
 msgid "%s: Cannot read %s (%s).\n"
 msgstr "%s: Cannot read %s (%s).\n"
 
-#: src/init.c:451
+#: src/init.c:527
 #, c-format
 msgid "%s: Error in %s at line %d.\n"
 msgstr "%s: Error in %s at line %d.\n"
 
-#: src/init.c:457
+#: src/init.c:533
 #, fuzzy, c-format
 msgid "%s: Syntax error in %s at line %d.\n"
 msgstr "%s: Error in %s at line %d.\n"
 
-#: src/init.c:462
+#: src/init.c:538
 #, fuzzy, c-format
-msgid "%s: Unknown command `%s' in %s at line %d.\n"
+msgid "%s: Unknown command %s in %s at line %d.\n"
 msgstr "%s: Error in %s at line %d.\n"
 
-#: src/init.c:507
-#, c-format
-msgid "%s: Warning: Both system and user wgetrc point to `%s'.\n"
+#: src/init.c:587
+#, fuzzy, c-format
+msgid "%s: Warning: Both system and user wgetrc point to %s.\n"
 msgstr "%s: Warning: Both system and user wgetrc point to `%s'.\n"
 
-#: src/init.c:660
-#, c-format
-msgid "%s: Invalid --execute command `%s'\n"
+#: src/init.c:777
+#, fuzzy, c-format
+msgid "%s: Invalid --execute command %s\n"
 msgstr "%s: Invalid --execute command `%s'\n"
 
-#: src/init.c:705
+#: src/init.c:822
 #, fuzzy, c-format
-msgid "%s: %s: Invalid boolean `%s'; use `on' or `off'.\n"
+msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n"
 msgstr "%s: %s: Invalid boolean `%s', use `on' or `off'.\n"
 
-#: src/init.c:722
-#, c-format
-msgid "%s: %s: Invalid number `%s'.\n"
+#: src/init.c:839
+#, fuzzy, c-format
+msgid "%s: %s: Invalid number %s.\n"
 msgstr "%s: %s: Invalid number `%s'.\n"
 
-#: src/init.c:953 src/init.c:972
-#, c-format
-msgid "%s: %s: Invalid byte value `%s'\n"
+#: src/init.c:1044 src/init.c:1063
+#, fuzzy, c-format
+msgid "%s: %s: Invalid byte value %s\n"
 msgstr "%s: %s: Invalid byte value `%s'\n"
 
-#: src/init.c:997
-#, c-format
-msgid "%s: %s: Invalid time period `%s'\n"
+#: src/init.c:1088
+#, fuzzy, c-format
+msgid "%s: %s: Invalid time period %s\n"
 msgstr "%s: %s: Invalid time period `%s'\n"
 
-#: src/init.c:1051 src/init.c:1141 src/init.c:1244 src/init.c:1269
-#, c-format
-msgid "%s: %s: Invalid value `%s'.\n"
+#: src/init.c:1142 src/init.c:1232 src/init.c:1340 src/init.c:1365
+#, fuzzy, c-format
+msgid "%s: %s: Invalid value %s.\n"
 msgstr "%s: %s: Invalid value `%s'.\n"
 
-#: src/init.c:1088
-#, c-format
-msgid "%s: %s: Invalid header `%s'.\n"
+#: src/init.c:1179
+#, fuzzy, c-format
+msgid "%s: %s: Invalid header %s.\n"
 msgstr "%s: %s: Invalid header `%s'.\n"
 
-#: src/init.c:1154
-#, c-format
-msgid "%s: %s: Invalid progress type `%s'.\n"
+#: src/init.c:1245
+#, fuzzy, c-format
+msgid "%s: %s: Invalid progress type %s.\n"
 msgstr "%s: %s: Invalid progress type `%s'.\n"
 
-#: src/init.c:1213
+#: src/init.c:1306
 #, fuzzy, c-format
 msgid ""
-"%s: %s: Invalid restriction `%s', use [unix|windows],[lowercase|uppercase],"
-"[nocontrol].\n"
+"%s: %s: Invalid restriction %s,\n"
+"    use [unix|windows],[lowercase|uppercase],[nocontrol],[ascii].\n"
 msgstr "%s: %s: Invalid restriction `%s', use `unix' or `windows'.\n"
 
-#: src/log.c:783
+#: src/iri.c:104
+#, c-format
+msgid "Encoding %s isn't valid\n"
+msgstr ""
+
+#: src/iri.c:132
+msgid "locale_to_utf8: locale is unset\n"
+msgstr ""
+
+#: src/iri.c:142
+#, c-format
+msgid "Conversion from %s to %s isn't supported\n"
+msgstr ""
+
+#: src/iri.c:183
+msgid "Incomplete or invalid multibyte sequence encountered\n"
+msgstr ""
+
+#: src/iri.c:208
+#, c-format
+msgid "Unhandled errno %d\n"
+msgstr ""
+
+#: src/iri.c:237
+#, c-format
+msgid "idn_encode failed (%d): %s\n"
+msgstr ""
+
+#: src/iri.c:256
 #, c-format
+msgid "idn_decode failed (%d): %s\n"
+msgstr ""
+
+#: src/log.c:809
+#, fuzzy, c-format
 msgid ""
 "\n"
-"%s received, redirecting output to `%s'.\n"
+"%s received, redirecting output to %s.\n"
 msgstr ""
 "\n"
 "%s received, redirecting output to `%s'.\n"
 
-#. Eek!  Opening the alternate log file has failed.  Nothing we
-#. can do but disable printing completely.
-#: src/log.c:793
+#: src/log.c:819
 #, fuzzy, c-format
 msgid ""
 "\n"
 "%s received.\n"
 msgstr "No data received"
 
-#: src/log.c:794
+#: src/log.c:820
 #, c-format
 msgid "%s: %s; disabling logging.\n"
 msgstr "%s: %s; disabling logging.\n"
 
-#: src/main.c:353
+#: src/main.c:386
 #, c-format
 msgid "Usage: %s [OPTION]... [URL]...\n"
 msgstr "Usage: %s [OPTION]... [URL]...\n"
 
-#: src/main.c:365
+#: src/main.c:398
 #, fuzzy
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -869,553 +1009,652 @@ msgstr ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "\n"
 
-#: src/main.c:367
+#: src/main.c:400
 msgid "Startup:\n"
 msgstr ""
 
-#: src/main.c:369
+#: src/main.c:402
 msgid "  -V,  --version           display the version of Wget and exit.\n"
 msgstr ""
 
-#: src/main.c:371
+#: src/main.c:404
 msgid "  -h,  --help              print this help.\n"
 msgstr ""
 
-#: src/main.c:373
+#: src/main.c:406
 msgid "  -b,  --background        go to background after startup.\n"
 msgstr ""
 
-#: src/main.c:375
+#: src/main.c:408
 msgid "  -e,  --execute=COMMAND   execute a `.wgetrc'-style command.\n"
 msgstr ""
 
-#: src/main.c:379
+#: src/main.c:412
 msgid "Logging and input file:\n"
 msgstr ""
 
-#: src/main.c:381
+#: src/main.c:414
 msgid "  -o,  --output-file=FILE    log messages to FILE.\n"
 msgstr ""
 
-#: src/main.c:383
+#: src/main.c:416
 msgid "  -a,  --append-output=FILE  append messages to FILE.\n"
 msgstr ""
 
-#: src/main.c:386
+#: src/main.c:419
 msgid "  -d,  --debug               print lots of debugging information.\n"
 msgstr ""
 
-#: src/main.c:389
+#: src/main.c:423
+msgid "       --wdebug              print Watt-32 debug output.\n"
+msgstr ""
+
+#: src/main.c:426
 msgid "  -q,  --quiet               quiet (no output).\n"
 msgstr ""
 
-#: src/main.c:391
+#: src/main.c:428
 msgid "  -v,  --verbose             be verbose (this is the default).\n"
 msgstr ""
 
-#: src/main.c:393
+#: src/main.c:430
 msgid ""
 "  -nv, --no-verbose          turn off verboseness, without being quiet.\n"
 msgstr ""
 
-#: src/main.c:395
-msgid "  -i,  --input-file=FILE     download URLs found in FILE.\n"
+#: src/main.c:432
+msgid ""
+"  -i,  --input-file=FILE     download URLs found in local or external FILE.\n"
 msgstr ""
 
-#: src/main.c:397
+#: src/main.c:434
 msgid "  -F,  --force-html          treat input file as HTML.\n"
 msgstr ""
 
-#: src/main.c:399
+#: src/main.c:436
 msgid ""
-"  -B,  --base=URL            prepends URL to relative links in -F -i file.\n"
+"  -B,  --base=URL            resolves HTML input-file links (-i -F)\n"
+"                             relative to URL.\n"
 msgstr ""
 
-#: src/main.c:403
+#: src/main.c:441
 msgid "Download:\n"
 msgstr ""
 
-#: src/main.c:405
+#: src/main.c:443
 msgid ""
 "  -t,  --tries=NUMBER            set number of retries to NUMBER (0 "
 "unlimits).\n"
 msgstr ""
 
-#: src/main.c:407
+#: src/main.c:445
 msgid "       --retry-connrefused       retry even if connection is refused.\n"
 msgstr ""
 
-#: src/main.c:409
+#: src/main.c:447
 msgid "  -O,  --output-document=FILE    write documents to FILE.\n"
 msgstr ""
 
-#: src/main.c:411
+#: src/main.c:449
 msgid ""
 "  -nc, --no-clobber              skip downloads that would download to\n"
 "                                 existing files.\n"
 msgstr ""
 
-#: src/main.c:414
+#: src/main.c:452
 msgid ""
 "  -c,  --continue                resume getting a partially-downloaded "
 "file.\n"
 msgstr ""
 
-#: src/main.c:416
+#: src/main.c:454
 msgid "       --progress=TYPE           select progress gauge type.\n"
 msgstr ""
 
-#: src/main.c:418
+#: src/main.c:456
 msgid ""
 "  -N,  --timestamping            don't re-retrieve files unless newer than\n"
 "                                 local.\n"
 msgstr ""
 
-#: src/main.c:421
+#: src/main.c:459
 msgid "  -S,  --server-response         print server response.\n"
 msgstr ""
 
-#: src/main.c:423
+#: src/main.c:461
 msgid "       --spider                  don't download anything.\n"
 msgstr ""
 
-#: src/main.c:425
+#: src/main.c:463
 msgid "  -T,  --timeout=SECONDS         set all timeout values to SECONDS.\n"
 msgstr ""
 
-#: src/main.c:427
+#: src/main.c:465
 msgid "       --dns-timeout=SECS        set the DNS lookup timeout to SECS.\n"
 msgstr ""
 
-#: src/main.c:429
+#: src/main.c:467
 msgid "       --connect-timeout=SECS    set the connect timeout to SECS.\n"
 msgstr ""
 
-#: src/main.c:431
+#: src/main.c:469
 msgid "       --read-timeout=SECS       set the read timeout to SECS.\n"
 msgstr ""
 
-#: src/main.c:433
+#: src/main.c:471
 msgid "  -w,  --wait=SECONDS            wait SECONDS between retrievals.\n"
 msgstr ""
 
-#: src/main.c:435
+#: src/main.c:473
 msgid ""
 "       --waitretry=SECONDS       wait 1..SECONDS between retries of a "
 "retrieval.\n"
 msgstr ""
 
-#: src/main.c:437
+#: src/main.c:475
 msgid ""
 "       --random-wait             wait from 0...2*WAIT secs between "
 "retrievals.\n"
 msgstr ""
 
-#: src/main.c:439
-msgid "  -Y,  --proxy                   explicitly turn on proxy.\n"
-msgstr ""
-
-#: src/main.c:441
+#: src/main.c:477
 msgid "       --no-proxy                explicitly turn off proxy.\n"
 msgstr ""
 
-#: src/main.c:443
+#: src/main.c:479
 msgid "  -Q,  --quota=NUMBER            set retrieval quota to NUMBER.\n"
 msgstr ""
 
-#: src/main.c:445
+#: src/main.c:481
 msgid ""
 "       --bind-address=ADDRESS    bind to ADDRESS (hostname or IP) on local "
 "host.\n"
 msgstr ""
 
-#: src/main.c:447
+#: src/main.c:483
 msgid "       --limit-rate=RATE         limit download rate to RATE.\n"
 msgstr ""
 
-#: src/main.c:449
+#: src/main.c:485
 msgid "       --no-dns-cache            disable caching DNS lookups.\n"
 msgstr ""
 
-#: src/main.c:451
+#: src/main.c:487
 msgid ""
 "       --restrict-file-names=OS  restrict chars in file names to ones OS "
 "allows.\n"
 msgstr ""
 
-#: src/main.c:453
+#: src/main.c:489
 msgid ""
 "       --ignore-case             ignore case when matching files/"
 "directories.\n"
 msgstr ""
 
-#: src/main.c:456
+#: src/main.c:492
 msgid "  -4,  --inet4-only              connect only to IPv4 addresses.\n"
 msgstr ""
 
-#: src/main.c:458
+#: src/main.c:494
 msgid "  -6,  --inet6-only              connect only to IPv6 addresses.\n"
 msgstr ""
 
-#: src/main.c:460
+#: src/main.c:496
 msgid ""
 "       --prefer-family=FAMILY    connect first to addresses of specified "
 "family,\n"
 "                                 one of IPv6, IPv4, or none.\n"
 msgstr ""
 
-#: src/main.c:464
+#: src/main.c:500
 msgid "       --user=USER               set both ftp and http user to USER.\n"
 msgstr ""
 
-#: src/main.c:466
+#: src/main.c:502
 msgid ""
 "       --password=PASS           set both ftp and http password to PASS.\n"
 msgstr ""
 
-#: src/main.c:470
+#: src/main.c:504
+msgid "       --ask-password            prompt for passwords.\n"
+msgstr ""
+
+#: src/main.c:506
+msgid "       --no-iri                  turn off IRI support.\n"
+msgstr ""
+
+#: src/main.c:508
+msgid ""
+"       --local-encoding=ENC      use ENC as the local encoding for IRIs.\n"
+msgstr ""
+
+#: src/main.c:510
+msgid ""
+"       --remote-encoding=ENC     use ENC as the default remote encoding.\n"
+msgstr ""
+
+#: src/main.c:514
 #, fuzzy
 msgid "Directories:\n"
 msgstr "Directory   "
 
-#: src/main.c:472
+#: src/main.c:516
 msgid "  -nd, --no-directories           don't create directories.\n"
 msgstr ""
 
-#: src/main.c:474
+#: src/main.c:518
 msgid "  -x,  --force-directories        force creation of directories.\n"
 msgstr ""
 
-#: src/main.c:476
+#: src/main.c:520
 msgid "  -nH, --no-host-directories      don't create host directories.\n"
 msgstr ""
 
-#: src/main.c:478
+#: src/main.c:522
 msgid "       --protocol-directories     use protocol name in directories.\n"
 msgstr ""
 
-#: src/main.c:480
+#: src/main.c:524
 msgid "  -P,  --directory-prefix=PREFIX  save files to PREFIX/...\n"
 msgstr ""
 
-#: src/main.c:482
+#: src/main.c:526
 msgid ""
 "       --cut-dirs=NUMBER          ignore NUMBER remote directory "
 "components.\n"
 msgstr ""
 
-#: src/main.c:486
+#: src/main.c:530
 msgid "HTTP options:\n"
 msgstr ""
 
-#: src/main.c:488
+#: src/main.c:532
 msgid "       --http-user=USER        set http user to USER.\n"
 msgstr ""
 
-#: src/main.c:490
+#: src/main.c:534
 msgid "       --http-password=PASS    set http password to PASS.\n"
 msgstr ""
 
-#: src/main.c:492
+#: src/main.c:536
 msgid "       --no-cache              disallow server-cached data.\n"
 msgstr ""
 
-#: src/main.c:494
+#: src/main.c:538
 msgid ""
-"  -E,  --html-extension        save HTML documents with `.html' extension.\n"
+"       --default-page=NAME     Change the default page name (normally\n"
+"                               this is `index.html'.).\n"
 msgstr ""
 
-#: src/main.c:496
+#: src/main.c:541
+msgid ""
+"  -E,  --adjust-extension      save HTML/CSS documents with proper "
+"extensions.\n"
+msgstr ""
+
+#: src/main.c:543
 msgid "       --ignore-length         ignore `Content-Length' header field.\n"
 msgstr ""
 
-#: src/main.c:498
+#: src/main.c:545
 msgid "       --header=STRING         insert STRING among the headers.\n"
 msgstr ""
 
-#: src/main.c:500
+#: src/main.c:547
 msgid "       --max-redirect          maximum redirections allowed per page.\n"
 msgstr ""
 
-#: src/main.c:502
+#: src/main.c:549
 msgid "       --proxy-user=USER       set USER as proxy username.\n"
 msgstr ""
 
-#: src/main.c:504
+#: src/main.c:551
 msgid "       --proxy-password=PASS   set PASS as proxy password.\n"
 msgstr ""
 
-#: src/main.c:506
+#: src/main.c:553
 msgid ""
 "       --referer=URL           include `Referer: URL' header in HTTP "
 "request.\n"
 msgstr ""
 
-#: src/main.c:508
+#: src/main.c:555
 msgid "       --save-headers          save the HTTP headers to file.\n"
 msgstr ""
 
-#: src/main.c:510
+#: src/main.c:557
 msgid ""
 "  -U,  --user-agent=AGENT      identify as AGENT instead of Wget/VERSION.\n"
 msgstr ""
 
-#: src/main.c:512
+#: src/main.c:559
 msgid ""
 "       --no-http-keep-alive    disable HTTP keep-alive (persistent "
 "connections).\n"
 msgstr ""
 
-#: src/main.c:514
+#: src/main.c:561
 msgid "       --no-cookies            don't use cookies.\n"
 msgstr ""
 
-#: src/main.c:516
+#: src/main.c:563
 msgid "       --load-cookies=FILE     load cookies from FILE before session.\n"
 msgstr ""
 
-#: src/main.c:518
+#: src/main.c:565
 msgid "       --save-cookies=FILE     save cookies to FILE after session.\n"
 msgstr ""
 
-#: src/main.c:520
+#: src/main.c:567
 msgid ""
 "       --keep-session-cookies  load and save session (non-permanent) "
 "cookies.\n"
 msgstr ""
 
-#: src/main.c:522
+#: src/main.c:569
 msgid ""
 "       --post-data=STRING      use the POST method; send STRING as the "
 "data.\n"
 msgstr ""
 
-#: src/main.c:524
+#: src/main.c:571
 msgid ""
 "       --post-file=FILE        use the POST method; send contents of FILE.\n"
 msgstr ""
 
-#: src/main.c:526
+#: src/main.c:573
 msgid ""
-"       --no-content-disposition  don't honor Content-Disposition header.\n"
+"       --content-disposition   honor the Content-Disposition header when\n"
+"                               choosing local file names (EXPERIMENTAL).\n"
 msgstr ""
 
-#: src/main.c:531
+#: src/main.c:576
+msgid ""
+"       --auth-no-challenge     send Basic HTTP authentication information\n"
+"                               without first waiting for the server's\n"
+"                               challenge.\n"
+msgstr ""
+
+#: src/main.c:583
 msgid "HTTPS (SSL/TLS) options:\n"
 msgstr ""
 
-#: src/main.c:533
+#: src/main.c:585
 msgid ""
 "       --secure-protocol=PR     choose secure protocol, one of auto, SSLv2,\n"
 "                                SSLv3, and TLSv1.\n"
 msgstr ""
 
-#: src/main.c:536
+#: src/main.c:588
 msgid ""
 "       --no-check-certificate   don't validate the server's certificate.\n"
 msgstr ""
 
-#: src/main.c:538
+#: src/main.c:590
 msgid "       --certificate=FILE       client certificate file.\n"
 msgstr ""
 
-#: src/main.c:540
+#: src/main.c:592
 msgid "       --certificate-type=TYPE  client certificate type, PEM or DER.\n"
 msgstr ""
 
-#: src/main.c:542
+#: src/main.c:594
 msgid "       --private-key=FILE       private key file.\n"
 msgstr ""
 
-#: src/main.c:544
+#: src/main.c:596
 msgid "       --private-key-type=TYPE  private key type, PEM or DER.\n"
 msgstr ""
 
-#: src/main.c:546
+#: src/main.c:598
 msgid "       --ca-certificate=FILE    file with the bundle of CA's.\n"
 msgstr ""
 
-#: src/main.c:548
+#: src/main.c:600
 msgid ""
 "       --ca-directory=DIR       directory where hash list of CA's is "
 "stored.\n"
 msgstr ""
 
-#: src/main.c:550
+#: src/main.c:602
 msgid ""
 "       --random-file=FILE       file with random data for seeding the SSL "
 "PRNG.\n"
 msgstr ""
 
-#: src/main.c:552
+#: src/main.c:604
 msgid ""
 "       --egd-file=FILE          file naming the EGD socket with random "
 "data.\n"
 msgstr ""
 
-#: src/main.c:557
+#: src/main.c:609
 msgid "FTP options:\n"
 msgstr ""
 
-#: src/main.c:559
+#: src/main.c:612
+msgid ""
+"       --ftp-stmlf             Use Stream_LF format for all binary FTP "
+"files.\n"
+msgstr ""
+
+#: src/main.c:615
 msgid "       --ftp-user=USER         set ftp user to USER.\n"
 msgstr ""
 
-#: src/main.c:561
+#: src/main.c:617
 msgid "       --ftp-password=PASS     set ftp password to PASS.\n"
 msgstr ""
 
-#: src/main.c:563
+#: src/main.c:619
 msgid "       --no-remove-listing     don't remove `.listing' files.\n"
 msgstr ""
 
-#: src/main.c:565
+#: src/main.c:621
 msgid "       --no-glob               turn off FTP file name globbing.\n"
 msgstr ""
 
-#: src/main.c:567
+#: src/main.c:623
 msgid "       --no-passive-ftp        disable the \"passive\" transfer mode.\n"
 msgstr ""
 
-#: src/main.c:569
+#: src/main.c:625
 msgid ""
 "       --retr-symlinks         when recursing, get linked-to files (not "
 "dir).\n"
 msgstr ""
 
-#: src/main.c:571
-msgid "       --preserve-permissions  preserve remote file permissions.\n"
-msgstr ""
-
-#: src/main.c:575
+#: src/main.c:629
 msgid "Recursive download:\n"
 msgstr ""
 
-#: src/main.c:577
+#: src/main.c:631
 msgid "  -r,  --recursive          specify recursive download.\n"
 msgstr ""
 
-#: src/main.c:579
+#: src/main.c:633
 msgid ""
 "  -l,  --level=NUMBER       maximum recursion depth (inf or 0 for "
 "infinite).\n"
 msgstr ""
 
-#: src/main.c:581
+#: src/main.c:635
 msgid ""
 "       --delete-after       delete files locally after downloading them.\n"
 msgstr ""
 
-#: src/main.c:583
+#: src/main.c:637
 msgid ""
-"  -k,  --convert-links      make links in downloaded HTML point to local "
-"files.\n"
+"  -k,  --convert-links      make links in downloaded HTML or CSS point to\n"
+"                            local files.\n"
 msgstr ""
 
-#: src/main.c:585
+#: src/main.c:641
+msgid ""
+"  -K,  --backup-converted   before converting file X, back up as X_orig.\n"
+msgstr ""
+
+#: src/main.c:644
 msgid ""
 "  -K,  --backup-converted   before converting file X, back up as X.orig.\n"
 msgstr ""
 
-#: src/main.c:587
+#: src/main.c:647
 msgid ""
 "  -m,  --mirror             shortcut for -N -r -l inf --no-remove-listing.\n"
 msgstr ""
 
-#: src/main.c:589
+#: src/main.c:649
 msgid ""
 "  -p,  --page-requisites    get all images, etc. needed to display HTML "
 "page.\n"
 msgstr ""
 
-#: src/main.c:591
+#: src/main.c:651
 msgid ""
 "       --strict-comments    turn on strict (SGML) handling of HTML "
 "comments.\n"
 msgstr ""
 
-#: src/main.c:595
+#: src/main.c:655
 msgid "Recursive accept/reject:\n"
 msgstr ""
 
-#: src/main.c:597
+#: src/main.c:657
 msgid ""
 "  -A,  --accept=LIST               comma-separated list of accepted "
 "extensions.\n"
 msgstr ""
 
-#: src/main.c:599
+#: src/main.c:659
 msgid ""
 "  -R,  --reject=LIST               comma-separated list of rejected "
 "extensions.\n"
 msgstr ""
 
-#: src/main.c:601
+#: src/main.c:661
 msgid ""
 "  -D,  --domains=LIST              comma-separated list of accepted "
 "domains.\n"
 msgstr ""
 
-#: src/main.c:603
+#: src/main.c:663
 msgid ""
 "       --exclude-domains=LIST      comma-separated list of rejected "
 "domains.\n"
 msgstr ""
 
-#: src/main.c:605
+#: src/main.c:665
 msgid ""
 "       --follow-ftp                follow FTP links from HTML documents.\n"
 msgstr ""
 
-#: src/main.c:607
+#: src/main.c:667
 msgid ""
 "       --follow-tags=LIST          comma-separated list of followed HTML "
 "tags.\n"
 msgstr ""
 
-#: src/main.c:609
+#: src/main.c:669
 msgid ""
 "       --ignore-tags=LIST          comma-separated list of ignored HTML "
 "tags.\n"
 msgstr ""
 
-#: src/main.c:611
+#: src/main.c:671
 msgid ""
 "  -H,  --span-hosts                go to foreign hosts when recursive.\n"
 msgstr ""
 
-#: src/main.c:613
+#: src/main.c:673
 msgid "  -L,  --relative                  follow relative links only.\n"
 msgstr ""
 
-#: src/main.c:615
+#: src/main.c:675
 msgid "  -I,  --include-directories=LIST  list of allowed directories.\n"
 msgstr ""
 
-#: src/main.c:617
+#: src/main.c:677
 msgid "  -X,  --exclude-directories=LIST  list of excluded directories.\n"
 msgstr ""
 
-#: src/main.c:619
+#: src/main.c:679
 msgid ""
 "  -np, --no-parent                 don't ascend to the parent directory.\n"
 msgstr ""
 
-#: src/main.c:623
+#: src/main.c:683
 msgid "Mail bug reports and suggestions to <bug-wget@gnu.org>.\n"
 msgstr "Mail bug reports and suggestions to <bug-wget@gnu.org>.\n"
 
-#: src/main.c:628
+#: src/main.c:688
 #, c-format
 msgid "GNU Wget %s, a non-interactive network retriever.\n"
 msgstr "GNU Wget %s, a non-interactive network retriever.\n"
 
-#: src/main.c:668
+#: src/main.c:728
+#, c-format
+msgid "Password for user %s: "
+msgstr ""
+
+#: src/main.c:730
+#, c-format
+msgid "Password: "
+msgstr ""
+
+#: src/main.c:780
+msgid "Wgetrc: "
+msgstr ""
+
+#: src/main.c:781
+msgid "Locale: "
+msgstr ""
+
+#: src/main.c:782
+msgid "Compile: "
+msgstr ""
+
+#: src/main.c:783
+msgid "Link: "
+msgstr ""
+
+#: src/main.c:789
+#, c-format
+msgid ""
+"GNU Wget %s built on VMS %s %s.\n"
+"\n"
+msgstr ""
+
+#: src/main.c:792
+#, c-format
+msgid ""
+"GNU Wget %s built on %s.\n"
+"\n"
+msgstr ""
+
+#: src/main.c:815
+#, c-format
+msgid "    %s (env)\n"
+msgstr ""
+
+#: src/main.c:821
+#, c-format
+msgid "    %s (user)\n"
+msgstr ""
+
+#: src/main.c:825
+#, c-format
+msgid "    %s (system)\n"
+msgstr ""
+
+#. TRANSLATORS: When available, an actual copyright character
+#. (cirle-c) should be used in preference to "(C)".
+#: src/main.c:843
 #, fuzzy
-msgid "Copyright (C) 2007 Free Software Foundation, Inc.\n"
+msgid "Copyright (C) 2009 Free Software Foundation, Inc.\n"
 msgstr "Copyright (C) 2003 Free Software Foundation, Inc.\n"
 
-#: src/main.c:670
+#: src/main.c:845
 msgid ""
 "License GPLv3+: GNU GPL version 3 or later\n"
 "<http://www.gnu.org/licenses/gpl.html>.\n"
@@ -1423,7 +1662,9 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/main.c:675
+#. TRANSLATORS: When available, please use the proper diacritics for
+#. names such as this one. See en_US.po for reference.
+#: src/main.c:852
 msgid ""
 "\n"
 "Originally written by Hrvoje Niksic <hniksic@xemacs.org>.\n"
@@ -1431,59 +1672,93 @@ msgstr ""
 "\n"
 "Originally written by Hrvoje Niksic <hniksic@xemacs.org>.\n"
 
-#: src/main.c:677
+#: src/main.c:854
 msgid "Currently maintained by Micah Cowan <micah@cowan.name>.\n"
 msgstr ""
 
-#. #### Something nicer should be printed here -- similar to the
-#. pre-1.5 `--help' page.
-#: src/main.c:724 src/main.c:793 src/main.c:890
+#: src/main.c:856
+#, fuzzy
+msgid "Please send bug reports and questions to <bug-wget@gnu.org>.\n"
+msgstr "Mail bug reports and suggestions to <bug-wget@gnu.org>.\n"
+
+#: src/main.c:906 src/main.c:975 src/main.c:1097
 #, c-format
 msgid "Try `%s --help' for more options.\n"
 msgstr "Try `%s --help' for more options.\n"
 
-#: src/main.c:790
+#: src/main.c:972
 #, c-format
 msgid "%s: illegal option -- `-n%c'\n"
 msgstr "%s: illegal option -- `-n%c'\n"
 
-#: src/main.c:845
+#: src/main.c:1030
 #, c-format
 msgid "Can't be verbose and quiet at the same time.\n"
 msgstr "Can't be verbose and quiet at the same time.\n"
 
-#: src/main.c:851
+#: src/main.c:1036
 #, c-format
 msgid "Can't timestamp and not clobber old files at the same time.\n"
 msgstr "Can't timestamp and not clobber old files at the same time.\n"
 
-#: src/main.c:859
+#: src/main.c:1044
 #, c-format
 msgid "Cannot specify both --inet4-only and --inet6-only.\n"
 msgstr ""
 
-#: src/main.c:869
-#, c-format
-msgid "Cannot specify -r, -p or -N if -O is given.\n"
+#: src/main.c:1054
+msgid ""
+"Cannot specify both -k and -O if multiple URLs are given, or in combination\n"
+"with -p or -r. See the manual for details.\n"
+"\n"
+msgstr ""
+
+#: src/main.c:1063
+msgid ""
+"WARNING: combining -O with -r or -p will mean that all downloaded content\n"
+"will be placed in the single file you specified.\n"
+"\n"
+msgstr ""
+
+#: src/main.c:1069
+msgid ""
+"WARNING: timestamping does nothing in combination with -O. See the manual\n"
+"for details.\n"
+"\n"
 msgstr ""
 
-#: src/main.c:877
+#: src/main.c:1077
+#, fuzzy, c-format
+msgid "File `%s' already there; not retrieving.\n"
+msgstr "File `%s' already there, not retrieving.\n"
+
+#: src/main.c:1084
 #, c-format
-msgid "Cannot specify both -k and -O if multiple URLs are given.\n"
+msgid "Cannot specify both --ask-password and --password.\n"
 msgstr ""
 
-#. No URL specified.
-#: src/main.c:885
+#: src/main.c:1092
 #, c-format
 msgid "%s: missing URL\n"
 msgstr "%s: missing URL\n"
 
-#: src/main.c:1005
+#: src/main.c:1117
+#, c-format
+msgid "This version does not have support for IRIs\n"
+msgstr ""
+
+#: src/main.c:1181
+msgid ""
+"WARNING: Can't reopen standard output in binary mode;\n"
+"         downloaded file may contain inappropriate line endings.\n"
+msgstr ""
+
+#: src/main.c:1316
 #, c-format
 msgid "No URLs found in %s.\n"
 msgstr "No URLs found in %s.\n"
 
-#: src/main.c:1023
+#: src/main.c:1334
 #, fuzzy, c-format
 msgid ""
 "FINISHED --%s--\n"
@@ -1493,115 +1768,100 @@ msgstr ""
 "FINISHED --%s--\n"
 "Downloaded: %s bytes in %d files\n"
 
-#: src/main.c:1032
+#: src/main.c:1343
 #, fuzzy, c-format
 msgid "Download quota of %s EXCEEDED!\n"
 msgstr "Download quota (%s bytes) EXCEEDED!\n"
 
-#: src/mswindows.c:96
+#: src/mswindows.c:99
 #, c-format
 msgid "Continuing in background.\n"
 msgstr "Continuing in background.\n"
 
-#: src/mswindows.c:289
+#: src/mswindows.c:292
 #, fuzzy, c-format
 msgid "Continuing in background, pid %lu.\n"
 msgstr "Continuing in background, pid %d.\n"
 
-#: src/mswindows.c:291 src/utils.c:326
-#, c-format
-msgid "Output will be written to `%s'.\n"
+#: src/mswindows.c:294 src/utils.c:472
+#, fuzzy, c-format
+msgid "Output will be written to %s.\n"
 msgstr "Output will be written to `%s'.\n"
 
-#: src/mswindows.c:459 src/mswindows.c:466
+#: src/mswindows.c:462 src/mswindows.c:469
 #, c-format
 msgid "%s: Couldn't find usable socket driver.\n"
 msgstr "%s: Couldn't find usable socket driver.\n"
 
-#: src/netrc.c:375
-#, c-format
-msgid "%s: %s:%d: warning: \"%s\" token appears before any machine name\n"
+#: src/netrc.c:390
+#, fuzzy, c-format
+msgid "%s: %s:%d: warning: %s token appears before any machine name\n"
 msgstr "%s: %s:%d: warning: \"%s\" token appears before any machine name\n"
 
-#: src/netrc.c:406
+#: src/netrc.c:421
 #, c-format
 msgid "%s: %s:%d: unknown token \"%s\"\n"
 msgstr "%s: %s:%d: unknown token \"%s\"\n"
 
-#: src/netrc.c:470
+#: src/netrc.c:485
 #, c-format
 msgid "Usage: %s NETRC [HOSTNAME]\n"
 msgstr "Usage: %s NETRC [HOSTNAME]\n"
 
-#: src/netrc.c:480
+#: src/netrc.c:495
 #, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr "%s: cannot stat %s: %s\n"
 
-#. Still not random enough, presumably because neither /dev/random
-#. nor EGD were available.  Try to seed OpenSSL's PRNG with libc
-#. PRNG.  This is cryptographically weak and defeats the purpose
-#. of using OpenSSL, which is why it is highly discouraged.
-#: src/openssl.c:112
+#: src/openssl.c:113
 msgid "WARNING: using a weak random seed.\n"
 msgstr ""
 
-#: src/openssl.c:172
+#: src/openssl.c:173
 #, fuzzy
 msgid "Could not seed PRNG; consider using --random-file.\n"
 msgstr "Could not seed OpenSSL PRNG; disabling SSL.\n"
 
-#. If the user has specified --no-check-cert, we still want to warn
-#. him about problems with the server's certificate.
-#: src/openssl.c:487
-msgid "ERROR"
-msgstr ""
-
-#: src/openssl.c:487
-msgid "WARNING"
-msgstr ""
-
-#: src/openssl.c:496
-#, c-format
-msgid "%s: No certificate presented by %s.\n"
-msgstr ""
-
-#: src/openssl.c:517
+#: src/openssl.c:526
 #, c-format
-msgid "%s: cannot verify %s's certificate, issued by `%s':\n"
+msgid "%s: cannot verify %s's certificate, issued by %s:\n"
 msgstr ""
 
-#: src/openssl.c:525
+#: src/openssl.c:535
 msgid "  Unable to locally verify the issuer's authority.\n"
 msgstr ""
 
-#: src/openssl.c:529
+#: src/openssl.c:539
 msgid "  Self-signed certificate encountered.\n"
 msgstr ""
 
-#: src/openssl.c:532
+#: src/openssl.c:542
 msgid "  Issued certificate not yet valid.\n"
 msgstr ""
 
-#: src/openssl.c:535
+#: src/openssl.c:545
 msgid "  Issued certificate has expired.\n"
 msgstr ""
 
-#: src/openssl.c:567
+#: src/openssl.c:579
+#, c-format
+msgid "%s: certificate common name %s doesn't match requested host name %s.\n"
+msgstr ""
+
+#: src/openssl.c:610
 #, c-format
 msgid ""
-"%s: certificate common name `%s' doesn't match requested host name `%s'.\n"
+"%s: certificate common name is invalid (contains a NUL character).\n"
+"This may be an indication that the host is not who it claims to be\n"
+"(that is, it is not the real %s).\n"
 msgstr ""
 
-#: src/openssl.c:580
+#: src/openssl.c:627
 #, c-format
 msgid "To connect to %s insecurely, use `--no-check-certificate'.\n"
 msgstr ""
 
-#. Align the [ skipping ... ] line with the dots.  To do
-#. that, insert the number of spaces equal to the number of
-#. digits in the skipped amount in K.
-#: src/progress.c:238
+#: src/progress.c:242
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1610,62 +1870,57 @@ msgstr ""
 "\n"
 "%*s[ skipping %dK ]"
 
-#: src/progress.c:452
-#, c-format
-msgid "Invalid dot style specification `%s'; leaving unchanged.\n"
+#: src/progress.c:456
+#, fuzzy, c-format
+msgid "Invalid dot style specification %s; leaving unchanged.\n"
 msgstr "Invalid dot style specification `%s'; leaving unchanged.\n"
 
-#. Translation note: "ETA" is English-centric, but this must
+#. TRANSLATORS: "ETA" is English-centric, but this must
 #. be short, ideally 3 chars.  Abbreviate if necessary.
-#: src/progress.c:946
+#: src/progress.c:805
 #, c-format
 msgid "  eta %s"
 msgstr ""
 
-#. When the download is done, print the elapsed time.
-#. Note to translators: this should not take up more room than
-#. available here.  Abbreviate if necessary.
-#: src/progress.c:961
+#: src/progress.c:1050
 msgid "   in "
 msgstr ""
 
-#. If no clock was found, it means that clock_getres failed for
-#. the realtime clock.
-#: src/ptimer.c:160
+#: src/ptimer.c:162
 #, c-format
 msgid "Cannot get REALTIME clock frequency: %s\n"
 msgstr ""
 
-#: src/recur.c:377
+#: src/recur.c:439
 #, c-format
 msgid "Removing %s since it should be rejected.\n"
 msgstr "Removing %s since it should be rejected.\n"
 
-#: src/res.c:392
+#: src/res.c:391
 #, fuzzy, c-format
 msgid "Cannot open %s: %s"
 msgstr "Cannot convert links in %s: %s\n"
 
-#: src/res.c:544
+#: src/res.c:550
 msgid "Loading robots.txt; please ignore errors.\n"
 msgstr "Loading robots.txt; please ignore errors.\n"
 
-#: src/retr.c:651
+#: src/retr.c:667
 #, c-format
 msgid "Error parsing proxy URL %s: %s.\n"
 msgstr "Error parsing proxy URL %s: %s.\n"
 
-#: src/retr.c:659
+#: src/retr.c:677
 #, c-format
 msgid "Error in proxy URL %s: Must be HTTP.\n"
 msgstr "Error in proxy URL %s: Must be HTTP.\n"
 
-#: src/retr.c:745
+#: src/retr.c:775
 #, c-format
 msgid "%d redirections exceeded.\n"
 msgstr "%d redirections exceeded.\n"
 
-#: src/retr.c:880
+#: src/retr.c:1014
 msgid ""
 "Giving up.\n"
 "\n"
@@ -1673,7 +1928,7 @@ msgstr ""
 "Giving up.\n"
 "\n"
 
-#: src/retr.c:880
+#: src/retr.c:1014
 msgid ""
 "Retrying.\n"
 "\n"
@@ -1681,13 +1936,13 @@ msgstr ""
 "Retrying.\n"
 "\n"
 
-#: src/spider.c:137
+#: src/spider.c:74
 msgid ""
 "Found no broken links.\n"
 "\n"
 msgstr ""
 
-#: src/spider.c:144
+#: src/spider.c:81
 #, c-format
 msgid ""
 "Found %d broken link.\n"
@@ -1698,65 +1953,79 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/spider.c:154
+#: src/spider.c:91
 #, c-format
-msgid "%s referred by:\n"
+msgid "%s\n"
 msgstr ""
 
-#: src/spider.c:159
-#, c-format
-msgid "    %s\n"
-msgstr ""
-
-#: src/url.c:619
+#: src/url.c:633
 msgid "No error"
 msgstr "No error"
 
-#: src/url.c:621
-msgid "Unsupported scheme"
+#: src/url.c:635
+#, fuzzy, c-format
+msgid "Unsupported scheme %s"
 msgstr "Unsupported scheme"
 
-#: src/url.c:623
+#: src/url.c:637
+msgid "Scheme missing"
+msgstr ""
+
+#: src/url.c:639
 #, fuzzy
 msgid "Invalid host name"
 msgstr "Invalid user name"
 
-#: src/url.c:625
+#: src/url.c:641
 msgid "Bad port number"
 msgstr "Bad port number"
 
-#: src/url.c:627
+#: src/url.c:643
 msgid "Invalid user name"
 msgstr "Invalid user name"
 
-#: src/url.c:629
+#: src/url.c:645
 msgid "Unterminated IPv6 numeric address"
 msgstr "Unterminated IPv6 numeric address"
 
-#: src/url.c:631
+#: src/url.c:647
 msgid "IPv6 addresses not supported"
 msgstr "IPv6 addresses not supported"
 
-#: src/url.c:633
+#: src/url.c:649
 msgid "Invalid IPv6 numeric address"
 msgstr "Invalid IPv6 numeric address"
 
-#. parent, no error
-#: src/utils.c:324
-#, c-format
-msgid "Continuing in background, pid %d.\n"
-msgstr "Continuing in background, pid %d.\n"
+#: src/url.c:951
+#, fuzzy
+msgid "HTTPS support not compiled in"
+msgstr "%s: debug support not compiled in.\n"
 
-#: src/utils.c:372
+#: src/utils.c:108
 #, c-format
-msgid "Failed to unlink symlink `%s': %s\n"
-msgstr "Failed to unlink symlink `%s': %s\n"
+msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n"
+msgstr ""
 
-#: src/xmalloc.c:62
+#: src/utils.c:114
 #, c-format
 msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n"
 msgstr ""
 
+#: src/utils.c:327
+#, c-format
+msgid "%s: aprintf: text buffer is too big (%ld bytes), aborting.\n"
+msgstr ""
+
+#: src/utils.c:470
+#, c-format
+msgid "Continuing in background, pid %d.\n"
+msgstr "Continuing in background, pid %d.\n"
+
+#: src/utils.c:521
+#, fuzzy, c-format
+msgid "Failed to unlink symlink %s: %s\n"
+msgstr "Failed to unlink symlink `%s': %s\n"
+
 #~ msgid "Unable to convert `%s' to a bind address.  Reverting to ANY.\n"
 #~ msgstr "Unable to convert `%s' to a bind address.  Reverting to ANY.\n"
 
@@ -2122,9 +2391,6 @@ msgstr ""
 #~ "directory.\n"
 #~ "\n"
 
-#~ msgid "%s: debug support not compiled in.\n"
-#~ msgstr "%s: debug support not compiled in.\n"
-
 #~ msgid ""
 #~ "This program is distributed in the hope that it will be useful,\n"
 #~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"